Merge pull request #248 from aeternity/feature/set-active-name

Set active name

src/popup/router/pages/Names.vue

@@ -207,7 +207,6 @@ import UserAvatar from '../components/UserAvatar';
 import Badge from '../components/Badge';
 
 export default {
-  props: ['activateName'],
   components: {
     Input,
     Button,
@@ -282,7 +281,6 @@ export default {
     },
   },
   created() {
-    if (this.activateName) this.tab = 'registered';
     this.loading = true;
     this.polling = setInterval(async () => {
       if (!this.middleware) {

src/popup/router/routes.js

@@ -226,6 +226,8 @@ export default [
   {
     path: '/names',
     component: Names,
+    props: true,
+    name: 'names',
     meta: {
       title: 'names',
     },

src/store/actions.js

@@ -65,12 +65,16 @@ export default {
     commit(types.UPDATE_LATEST_TRANSACTIONS, payload);
   },
   setAccountName({ commit }, payload) {
-    commit(types.SET_ACCOUNT_NAME, payload);
+    commit(types.SET_ACCOUNT_AENS, {
+      account: 0,
+      aename: payload.name,
+      pending: false,
+    });
   },
   initSdk({ commit }, payload) {
     commit(types.INIT_SDK, payload);
   },
-  async getRegisteredNames({ commit, state, dispatch }) {
+  async getRegisteredNames({ commit, state, getters, dispatch }) {
     if (!state.middleware) return;
     const { middlewareUrl } = state.network[state.current.network];
     const res = await Promise.all(
@@ -114,11 +118,13 @@ export default {
           names = uniqBy(names, 'name');
           if (!process.env.RUNNING_IN_TESTS) {
             if (names.length) {
-              commit(types.SET_ACCOUNT_AENS, {
-                account: index,
-                aename: names[0].name,
-                pending: !!names[0].pending,
-              });
+              if (!getters.activeAccountName.includes('.chain')) {
+                commit(types.SET_ACCOUNT_AENS, {
+                  account: index,
+                  aename: names[0].name,
+                  pending: !!names[0].pending,
+                });
+              }
             } else {
               commit(types.SET_ACCOUNT_AENS, { account: index, aename: null, pending: false });
             }

src/store/mutations.js

@@ -42,7 +42,7 @@ export default {
     state.subaccounts[payload.account].balance = payload.balance;
   },
   [types.SET_ACCOUNT_NAME](state, payload) {
-    state.subaccounts[state.activeAccount].name = payload;
+    state.subaccounts[state.activeAccount].aename = payload;
   },
   [types.SET_ACCOUNT_AENS](state, { account, aename, pending }) {
     state.subaccounts[account].aename = aename;