Merge pull request #1583 from aeternity/drop-preclaim

Drop name preclaim

src/components/mobile/AccountSwitcherModal.vue

@@ -3,12 +3,11 @@
     <Overlay class="account-switcher-modal" @click="resolve">
       <AeCard fill="maximum">
         <ListItemAccount
-          v-for="(account, index) in accountsWithNamePending"
+          v-for="(account, index) in accounts"
           :key="account.address"
           v-bind="account"
         >
           <template slot="right">
-            <NamePending v-if="account.namePending" />
             <AeRadio :checked="index === activeIdx" @change="setActiveIdx(index)" />
           </template>
         </ListItemAccount>
@@ -45,7 +44,6 @@ import { pick } from 'lodash-es';
 import Overlay from '../Overlay.vue';
 import ListItem from '../ListItem.vue';
 import ListItemAccount from '../ListItemAccount.vue';
-import NamePending from './NamePending.vue';
 import ListItemCircle from '../ListItemCircle.vue';
 import { Plus } from '../icons';
 import AeCard from '../AeCard.vue';
@@ -58,7 +56,6 @@ export default {
     Overlay,
     ListItem,
     ListItemAccount,
-    NamePending,
     ListItemCircle,
     Plus,
     AeCard,
@@ -69,17 +66,7 @@ export default {
   props: {
     resolve: { type: Function, required: true },
   },
-  computed: {
-    ...mapState('accounts', ['activeIdx']),
-    ...mapState('names', {
-      accountsWithNamePending(state, { get, isPending }) {
-        return this.accounts.map((account) => ({
-          ...account,
-          namePending: isPending(get(account.address)),
-        }));
-      },
-    }),
-  },
+  computed: mapState('accounts', ['activeIdx']),
   subscriptions() {
     return pick(this.$store.state.observables, ['accounts', 'totalBalance']);
   },
@@ -131,10 +118,6 @@ export default {
       align-self: center;
     }
 
-    .name-pending {
-      margin-right: functions.rem(8px);
-    }
-
     .list-item.vault-new .list-item-circle {
       background-color: variables.$color-alternative;
     }

src/components/mobile/ConfirmTransactionSignModal.vue

@@ -31,7 +31,7 @@
 
 <script>
 import { mapState } from 'vuex';
-import { Tag } from '@aeternity/aepp-sdk-next';
+import { Tag, isAuctionName } from '@aeternity/aepp-sdk-next';
 import Page from '../Page.vue';
 import Guide from '../Guide.vue';
 import AeFraction from '../AeFraction.vue';
@@ -100,7 +100,7 @@ export default {
     guideTemplate() {
       const { tag } = this.transaction;
       if (tag === Tag.SpendTx) return this.$t('modal.confirm-transaction-sign.guide-spend');
-      if (tag === Tag.NameClaimTx && !+this.transaction.nameSalt) {
+      if (tag === Tag.NameClaimTx && isAuctionName(this.transaction.name)) {
         return this.$t('modal.confirm-transaction-sign.guide-name-bid');
       }
       return this.$t('modal.confirm-transaction-sign.guide', {

src/lib/constants.js

@@ -5,7 +5,6 @@ export const MAGNITUDE_MICRO = -6;
 export const MAGNITUDE_PICO = -12;
 
 export const AENS_DOMAIN = '.chain';
-export const MAX_AUCTION_NAME_LENGTH = 12 + AENS_DOMAIN.length;
 
 export const NAME_LIST_ROUTE_NAMES = ['name-list', 'auction-list', 'auction-list-character-length'];
 

src/locales/cn.json

@@ -497,7 +497,6 @@
       "confirm-bidding": "An auction for the name {name} has already started. Would you like to make a bid?",
 
       "notification": {
-        "claim-sent": "为{name} 的名称已成功发送",
         "registered": "{name} 已成功注册",
         "bid": "You bid on {name} successfully",
         "unknown-error": "因为未知原因，{name} 未注册"

src/locales/en.json

@@ -497,7 +497,6 @@
       "confirm-bidding": "An auction for the name {name} has already started. Would you like to make a bid?",
 
       "notification": {
-        "claim-sent": "Claim for {name} name was successfully sent",
         "registered": "{name} was successfully registered",
         "bid": "You bid on {name} successfully",
         "unknown-error": "{name} was not registered for unknown reason"

src/locales/es.json

@@ -497,7 +497,6 @@
       "confirm-bidding": "An auction for the name {name} has already started. Would you like to make a bid?",
 
       "notification": {
-        "claim-sent": "La solicitud de {name} nombre se envió correctamente",
         "registered": "{name} se registró correctamente",
         "bid": "You bid on {name} successfully",
         "unknown-error": "{name} no se registró por un motivo desconocido"

src/locales/ru.json

@@ -497,7 +497,6 @@
       "confirm-bidding": "Аукцион на имя {name} уже начался. Хотите сделать ставку?",
 
       "notification": {
-        "claim-sent": "Запрос на имя {name} был успешно отправлен​​",
         "registered": "{name} было успешно зарегистрировано",
         "bid": "Вы успешно поставили на {name}",
         "unknown-error": "{name} не было зарегистрировано по неизвестной причине"

src/pages/aens/AuctionDetails.vue

@@ -92,6 +92,8 @@ export default {
     async updateBids() {
       const { data } = await this.$store.getters.middleware
         // TODO: show more than 100 bids
+        // TODO: use /v3/names/auction.chain/claims instead
+        // TODO: remove previous bids after solving https://github.com/aeternity/ae_mdw/issues/2097
         .getAccountActivities(produceNameId(this.name), { limit: 100 });
       this.bids = data
         .filter(({ type }) => type === 'NameClaimEvent')

src/pages/aens/NameList.vue

@@ -15,9 +15,7 @@
           :name="entry.name"
           :to="{ name: 'name-details', params: { name: entry.name } }"
           subtitle="address"
-        >
-          <NamePending v-if="entry.status === 'pending'" slot="right" />
-        </ListItemAccount>
+        />
       </AeCard>
     </template>
 
@@ -48,7 +46,6 @@ import Page from '../../components/Page.vue';
 import NameListHeader from '../../components/mobile/NameListHeader.vue';
 import AeCard from '../../components/AeCard.vue';
 import ListItemAccount from '../../components/ListItemAccount.vue';
-import NamePending from '../../components/mobile/NamePending.vue';
 import ButtonAddFixed from '../../components/ButtonAddFixed.vue';
 import { MAGNITUDE } from '../../lib/constants';
 
@@ -58,7 +55,6 @@ export default {
     NameListHeader,
     AeCard,
     ListItemAccount,
-    NamePending,
     ButtonAddFixed,
   },
   data: () => ({ auctions: [] }),
@@ -97,11 +93,12 @@ export default {
           .map(({ tx: { name } }) => name.toLowerCase())
           .filter((name) => isNameValid(name) && isAuctionName(name)),
       );
-      const nodeNoRetry = new Node(this.$store.getters.node.$host, { retryCount: 0 });
       this.auctions = (
         await Promise.allSettled(
           recentlyClaimedNames.map((name) =>
-            nodeNoRetry.getAuctionEntryByName(name).then((entry) => ({ ...entry, name })),
+            this.$store.getters.node
+              .getAuctionEntryByName(name)
+              .then((entry) => ({ ...entry, name })),
           ),
         )
       )

src/pages/aens/NameNew.vue

@@ -39,8 +39,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { Name } from '@aeternity/aepp-sdk-next';
-import { MAX_AUCTION_NAME_LENGTH } from '../../lib/constants';
+import { Name, isAuctionName } from '@aeternity/aepp-sdk-next';
 import { handleUnknownError, isNotFoundError } from '../../lib/utils';
 import { i18n } from '../../store/plugins/ui/languages';
 import Page from '../../components/Page.vue';
@@ -83,27 +82,9 @@ export default {
       }
 
       const name = new Name(this.name, this.$store.getters.sdk.getContext());
-      let claimTxHash;
       try {
-        await name.preclaim();
-        claimTxHash = (await name.claim({ waitMined: false })).hash;
-        this.$store.dispatch('modals/open', {
-          name: 'notification',
-          text: this.$t('name.new.notification.claim-sent', { name: this.name }),
-        });
-        this.$router.push({ name: 'name-list' });
-      } catch (e) {
-        if (e.message === 'Rejected by user') return;
-        this.error = true;
-        handleUnknownError(e);
-      } finally {
-        this.busy = false;
-      }
-
-      try {
-        this.$store.dispatch('names/fetchOwned');
-        await this.$store.getters.sdk.poll(claimTxHash);
-        const isAuction = MAX_AUCTION_NAME_LENGTH >= this.name.length;
+        await name.claim();
+        const isAuction = isAuctionName(this.name);
         if (!isAuction) {
           await this.$store.dispatch('names/updatePointer', {
             name: this.name,
@@ -116,15 +97,17 @@ export default {
             ? i18n.t('name.new.notification.bid', { name: this.name })
             : i18n.t('name.new.notification.registered', { name: this.name }),
         });
+        this.$router.push({ name: 'name-list' });
       } catch (e) {
         if (e.message === 'Rejected by user') return;
+        this.error = true;
         this.$store.dispatch('modals/open', {
           name: 'notification',
           text: i18n.t('name.new.notification.unknown-error', { name: this.name }),
         });
         handleUnknownError(e);
       } finally {
-        this.$store.dispatch('names/fetchOwned');
+        this.busy = false;
       }
     },
   },

src/store/index.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
-
 import { pick } from 'lodash-es';
 import Vue from 'vue';
 import Vuex from 'vuex';

src/store/modules/accounts/airGap.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ['error', { 'ignorePropertyModificationsFor': ['state'] }] */
-
 import { encode, Encoding } from '@aeternity/aepp-sdk-next';
 import { getDesktopRemoteSignAction } from './utils';
 import {

src/store/modules/accounts/hdWallet.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ['error', { 'ignorePropertyModificationsFor': ['state'] }] */
-
 import { pick } from 'lodash-es';
 import Vue from 'vue';
 import { generateMnemonic, mnemonicToSeed } from '@aeternity/bip39';

src/store/modules/accounts/hdWalletRemote.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ['error', { 'ignorePropertyModificationsFor': ['state'] }] */
-
 import { getDesktopRemoteSignAction } from './utils';
 import { i18n } from '../../plugins/ui/languages';
 

src/store/modules/accounts/index.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ['error', { 'ignorePropertyModificationsFor': ['state'] }] */
-
 import airGap from './airGap';
 import hdWallet from './hdWallet';
 import hdWalletRemote from './hdWalletRemote';

src/store/modules/accounts/ledger.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
-
 import TransportWebUSB from '@ledgerhq/hw-transport-webusb';
 import Ae from '@aeternity/ledger-app-api';
 import { buildTx, decode, Tag } from '@aeternity/aepp-sdk-next';

src/store/modules/desktop.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
-
 export default {
   state: {
     remoteConnected: false,

src/store/modules/mobile.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
-
 import Vue from 'vue';
 import { i18n } from '../plugins/ui/languages';
 

src/store/modules/root.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
-
 import Vue from 'vue';
 import { mergeWith } from 'lodash-es';
 import networksRegistry from '../../lib/networksRegistry';

src/store/plugins/sdk.js

@@ -52,7 +52,7 @@ export default (store) => {
       networkId: '',
     },
     getters: {
-      node: (_, { currentNetwork }) => new Node(currentNetwork.url),
+      node: (_, { currentNetwork }) => new Node(currentNetwork.url, { retryCount: 0 }),
       middleware: (_, { currentNetwork }) => new Middleware(currentNetwork.middlewareUrl),
       sdk: (_, getters) => new AeSdkMethods({
         onNode: getters.node,

src/store/plugins/ui/appsMetadata.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
-
 import Vue from 'vue';
 import { handleUnknownError } from '../../../lib/utils';
 import { PROTOCOL_DEFAULT } from '../../../lib/constants';

src/store/plugins/ui/currencies.js

@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
-
 import { i18n } from './languages';
 
 const currencies = {

src/store/plugins/ui/languages.js

@@ -1,6 +1,3 @@
-/* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
-/* eslint-disable import/no-import-module-exports */
-
 import Vue from 'vue';
 import VueI18n from 'vue-i18n';
 import en from '../../../locales/en.json';

src/store/plugins/ui/modals.js

@@ -1,4 +1,3 @@
-/* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
 const modals = {};
 
 export const registerModal = ({