From b115c610c2fd6e4f4540964e24c87fd1e661d04f Mon Sep 17 00:00:00 2001
From: Valentin Angelov <43376240+vmangelovv@users.noreply.github.com>
Date: Thu, 30 Apr 2020 15:41:51 +0300
Subject: [PATCH 1/2] closes #205

---
 src/popup/router/components/AccountInfo.vue | 12 +++++++++++-
 src/popup/router/routes.js                  |  2 ++
 src/store/actions.js                        | 14 ++++++--------
 src/store/mutations.js                      |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/popup/router/components/AccountInfo.vue b/src/popup/router/components/AccountInfo.vue
index adf472d87..bdd67c426 100644
--- a/src/popup/router/components/AccountInfo.vue
+++ b/src/popup/router/components/AccountInfo.vue
@@ -3,7 +3,12 @@
     <div class="title">
       <div class="account-name" data-cy="account-name">
         <template v-if="chainName">{{ activeAccountName }}</template>
-        <router-link to="/names" v-else>Claim your .chain name</router-link>
+        <router-link to="/names" v-if="!availNames">Claim your .chain name</router-link>
+        <router-link
+          :to="{ name: 'names', params: { activateName: availNames } }"
+          v-if="availNames && !chainName"
+          >Set your active name</router-link
+        >
       </div>
       <div class="copied-alert" v-if="copied">{{ $t('pages.account.copied') }}</div>
       <button data-cy="copy" @click="copy" v-clipboard:copy="account.publicKey">
@@ -26,6 +31,7 @@ export default {
   components: { Copyicon, UserAvatar },
   data: () => ({
     copied: false,
+    availNames: false,
   }),
   computed: {
     ...mapGetters(['account', 'activeAccountName']),
@@ -33,6 +39,10 @@ export default {
       return this.activeAccountName.includes('.chain');
     },
   },
+  created() {
+    const { names } = this.$store.state;
+    this.availNames = !!names.length;
+  },
   methods: {
     copy() {
       this.copied = true;
diff --git a/src/popup/router/routes.js b/src/popup/router/routes.js
index 618ddaeab..a290c0e3c 100644
--- a/src/popup/router/routes.js
+++ b/src/popup/router/routes.js
@@ -226,6 +226,8 @@ export default [
   {
     path: '/names',
     component: Names,
+    props: true,
+    name: 'names',
     meta: {
       title: 'names',
     },
diff --git a/src/store/actions.js b/src/store/actions.js
index d76ab0ba8..0e8b0abad 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -65,7 +65,11 @@ 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);
@@ -113,13 +117,7 @@ export default {
           names = flatten(names);
           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,
-              });
-            } else {
+            if (!names.length) {
               commit(types.SET_ACCOUNT_AENS, { account: index, aename: null, pending: false });
             }
           }
diff --git a/src/store/mutations.js b/src/store/mutations.js
index c2734d018..e25a44f19 100644
--- a/src/store/mutations.js
+++ b/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;

From 4f0bcf2e403cdb09949293a8c7237c7b76f50c90 Mon Sep 17 00:00:00 2001
From: Valentin Angelov <43376240+vmangelovv@users.noreply.github.com>
Date: Thu, 30 Apr 2020 16:52:27 +0300
Subject: [PATCH 2/2] show a name if no activated

---
 src/popup/router/components/AccountInfo.vue | 12 +-----------
 src/popup/router/pages/Names.vue            |  2 --
 src/store/actions.js                        | 12 ++++++++++--
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/popup/router/components/AccountInfo.vue b/src/popup/router/components/AccountInfo.vue
index bdd67c426..adf472d87 100644
--- a/src/popup/router/components/AccountInfo.vue
+++ b/src/popup/router/components/AccountInfo.vue
@@ -3,12 +3,7 @@
     <div class="title">
       <div class="account-name" data-cy="account-name">
         <template v-if="chainName">{{ activeAccountName }}</template>
-        <router-link to="/names" v-if="!availNames">Claim your .chain name</router-link>
-        <router-link
-          :to="{ name: 'names', params: { activateName: availNames } }"
-          v-if="availNames && !chainName"
-          >Set your active name</router-link
-        >
+        <router-link to="/names" v-else>Claim your .chain name</router-link>
       </div>
       <div class="copied-alert" v-if="copied">{{ $t('pages.account.copied') }}</div>
       <button data-cy="copy" @click="copy" v-clipboard:copy="account.publicKey">
@@ -31,7 +26,6 @@ export default {
   components: { Copyicon, UserAvatar },
   data: () => ({
     copied: false,
-    availNames: false,
   }),
   computed: {
     ...mapGetters(['account', 'activeAccountName']),
@@ -39,10 +33,6 @@ export default {
       return this.activeAccountName.includes('.chain');
     },
   },
-  created() {
-    const { names } = this.$store.state;
-    this.availNames = !!names.length;
-  },
   methods: {
     copy() {
       this.copied = true;
diff --git a/src/popup/router/pages/Names.vue b/src/popup/router/pages/Names.vue
index fe7be00bc..6eeeb3135 100644
--- a/src/popup/router/pages/Names.vue
+++ b/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) {
diff --git a/src/store/actions.js b/src/store/actions.js
index 0e8b0abad..e60710cb4 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -74,7 +74,7 @@ export default {
   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(
@@ -117,7 +117,15 @@ export default {
           names = flatten(names);
           names = uniqBy(names, 'name');
           if (!process.env.RUNNING_IN_TESTS) {
-            if (!names.length) {
+            if (names.length) {
+              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 });
             }
           }