Fixed issue where "Upgrade Wallet" wouldn't always resolve issues.

Fixes #556
greymass · Feb 24, 2019 · 45fe2d6 · 45fe2d6
1 parent 755d92f
commit 45fe2d6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/app/shared/actions/wallets.js b/app/shared/actions/wallets.js
@@ -265,11 +265,14 @@ export function upgradeWallet(chainId, account, authorization, password = false,
       connection,
       wallets
     } = getState();
-    const [current] = partition(wallets, {
+    const partitionQuery = {
       account,
-      authorization,
       chainId
-    });
+    };
+    if (authorization) {
+      partitionQuery.authorization = authorization
+    }
+    const [current] = partition(wallets, partitionQuery);
     if (current.length > 0) {
       eos(connection).getAccount(account).then((accountData) => {
         const wallet = current[0];
@@ -290,7 +293,7 @@ export function upgradeWallet(chainId, account, authorization, password = false,
           }
         });
         if (swap === true) {
-          dispatch(useWallet(current.chainId, account, auth));
+          dispatch(useWallet(chainId, account, auth));
         }
         return false;
       }).catch((err) => dispatch({

diff --git a/app/shared/reducers/wallets.js b/app/shared/reducers/wallets.js
@@ -110,11 +110,14 @@ export default function wallets(state = initialState, action) {
       return other;
     }
     case types.UPGRADE_WALLET: {
-      const [current, other] = partition(state, {
+      const partitionQuery = {
         account: action.payload.account,
-        authorization: action.payload.oldAuthorization,
         chainId: action.payload.chainId,
-      });
+      };
+      if (action.payload.oldAuthorization) {
+        partitionQuery.authorization = action.payload.oldAuthorization;
+      }
+      const [current, other] = partition(state, partitionQuery);
       if (current.length > 0) {
         const modified = Object.assign({}, current[0]);
         modified.accountData = action.payload.accountData;