Fixing account switching and adding accounts

Issue was due to id/name mixup

Author: grctest

src/components/account-select.vue

@@ -56,7 +56,12 @@
             selectedAccount.value = accounts.value[newVal];
             store.dispatch(
                 "AccountStore/selectAccount",
-                {chain: accounts.value[newVal].chain, accountID: accounts.value[newVal].accountID}
+                {
+                    chain: accounts.value[newVal].chain,
+                    accountID: accounts.value[newVal].accountID
+                        ? accounts.value[newVal].accountID
+                        : accounts.value[newVal].accountName
+                }
             );
         }
     }, {immediate: true});

src/components/dapps.vue

@@ -17,7 +17,12 @@
     function fetchDapps() {
         let storedDapps = [];
         for (let i = 0; i < store.state.AccountStore.accountlist.length; i++) {
-            let apps = store.getters['OriginStore/walletAccessibleDapps'](store.state.AccountStore.accountlist[i].accountID, store.state.AccountStore.accountlist[i].chain);
+            let apps = store.getters['OriginStore/walletAccessibleDapps'](
+                store.state.AccountStore.accountlist[i].accountID
+                    ? store.state.AccountStore.accountlist[i].accountID
+                    : store.state.AccountStore.accountlist[i].accountName,
+                store.state.AccountStore.accountlist[i].chain
+            );
             if (typeof apps != 'undefined') {
                 storedDapps = storedDapps.concat(apps);
             }
@@ -28,7 +33,12 @@
     let dapps = computed(() => {
         let storedDapps = [];
         for (let i = 0; i < store.state.AccountStore.accountlist.length; i++) {
-            let apps = store.getters['OriginStore/walletAccessibleDapps'](store.state.AccountStore.accountlist[i].accountID, store.state.AccountStore.accountlist[i].chain);
+            let apps = store.getters['OriginStore/walletAccessibleDapps'](
+                store.state.AccountStore.accountlist[i].accountID
+                    ? store.state.AccountStore.accountlist[i].accountID
+                    : store.state.AccountStore.accountlist[i].accountName,
+                store.state.AccountStore.accountlist[i].chain
+            );
             if (typeof apps != 'undefined') {
                 storedDapps = storedDapps.concat(apps);
             }

src/components/popups/identityrequestpopup.vue

@@ -28,7 +28,9 @@
         if (!props.accounts || !props.accounts.length) {
             return '';
         }
-        return props.accounts[0].accountID;
+        return props.accounts[0].accountID
+            ? props.accounts[0].accountID
+            : props.accounts[0].accountName;
     });
 
     let accountName = computed(() => {

src/components/popups/relinkrequestpopup.vue

@@ -36,6 +36,8 @@
                 origin: props.request.origin,
                 chain: props.request.chain,
                 accountId: props.accounts[0].accountID
+                    ? props.accounts[0].accountID
+                    : props.accounts[0].accountName
             }
         );
     });
@@ -52,7 +54,9 @@
                     identityhash: props.request.payload.identityhash,
                     name: props.accounts[0].accountName,
                     chain: props.accounts[0].chain,
-                    id: props.accounts[0].accountID,
+                    id: props.accounts[0].accountID
+                        ? props.accounts[0].accountID
+                        : props.accounts[0].accountName,
                     success: true
                 },
                 request: {

src/store/modules/AccountStore.js

@@ -33,7 +33,10 @@ const actions = {
         state
     }, payload) {
         return new Promise((resolve, reject) => {
-            let existingAccount = state.accountlist.find(x => x.chain == payload.account.chain && x.accountID == payload.account.accountID)
+            let existingAccount = state.accountlist.find(
+                x => x.chain == payload.account.chain &&
+                (x.accountID == payload.account.accountName || x.accountName === payload.account.accountName)
+            );
 
             if (!existingAccount) {
                 for (let keytype in payload.account.keys) {
@@ -83,7 +86,14 @@ const actions = {
         return new Promise((resolve, reject) => {
             let index = -1;
             for (let i = 0; i < state.accountlist.length; i++) {
-                if ((payload.chain == state.accountlist[i].chain) && (payload.accountID == state.accountlist[i].accountID)) {
+                if (
+                    (payload.chain == state.accountlist[i].chain) &&
+                    (
+                        payload.accountID == state.accountlist[i].accountID ||
+                        payload.accountID == state.accountlist[i].accountName ||
+                        payload.accountName == state.accountlist[i].accountName
+                    )
+                ) {
                     index = i;
                     break;
                 }