Fixed account not properly loading after unlock and loading of some account based auths

Author: aaroncox

app/modules/handler/actions/uri.js

@@ -1,7 +1,7 @@
 import { find } from 'lodash';
 import { get } from 'dot-prop-immutable';
 import { Serialize } from 'eosjs2';
-import { PrivateKey, Signature } from '@greymass/eosio';
+import { PrivateKey, PublicKey, Signature } from '@greymass/eosio';
 
 import * as types from '../../../shared/actions/types';
 import eos from '../../../shared/actions/helpers/eos';
@@ -357,9 +357,10 @@ export function signIdentityRequest(
     const signer = eos(networkConfig, true, true);
     setTimeout(async () => {
       try {
+        const requiredKeys = [String(PublicKey.from(wallet.pubkey))]
         const signed = await signer.sign({
           chainId: blockchain.chainId,
-          requiredKeys: [signer.convert(wallet.pubkey)],
+          requiredKeys,
           serializedTransaction: prompt.resolved.serializedTransaction,
         });
         const callbackParams = prompt.resolved.getCallback(signed.signatures, 0);

app/modules/handler/containers/Prompt.js

@@ -160,9 +160,15 @@ class PromptContainer extends Component<Props> {
     }
   };
   swapAccount = (e, { value }) => {
-    const { actions } = this.props;
+    const { actions, wallets } = this.props;
     const { blockchain } = this.state;
-    const wallet = pick(value, ['account', 'authorization', 'mode', 'path', 'pubkey']);
+    const wallet = pick(value, ['account', 'authorization', 'authAccount', 'authAuthorization', 'chainId', 'mode', 'path', 'pubkey']);
+    if (!wallet.pubkey && wallet.authAccount && wallet.authAuthorization) {
+        const authority = find(wallets, { chainId: wallet.chainId, account: wallet.authAccount, authorization: wallet.authAuthorization })
+        if (authority) {
+            wallet.pubkey = authority.pubkey
+        }
+    }
     this.setState({
       displayShareLink: initialState.displayShareLink,
       enableWhitelist: initialState.enableWhitelist,

app/modules/handler/containers/Stage.js

@@ -175,7 +175,9 @@ class PromptStage extends Component<Props> {
       password,
       blockchain.chainId,
       // callback
-      () => actions.signURI(resolved.transaction, blockchain, wallet, broadcast, prompt.callback)
+      () => actions.signURI(resolved.transaction, blockchain, wallet, broadcast, prompt.callback),
+      wallet.authAccount,
+      wallet.authAuthorization
     );
   }
   onUnlockAndSignIdentity= (password) => {
@@ -195,7 +197,9 @@ class PromptStage extends Component<Props> {
         prompt,
         blockchain,
         wallet,
-      )
+      ),
+      wallet.authAccount,
+      wallet.authAuthorization
     );
   }
   render() {
@@ -264,8 +268,9 @@ class PromptStage extends Component<Props> {
       ([reqType] = prompt.req);
     }
 
-
-    const hasWallet = !!(wallet.account && wallet.authorization && wallet.mode && wallet.pubkey);
+    const hasPublicKey = !!wallet.pubkey
+    const hasAccountAuth = !!(wallet.authAccount && wallet.authAuthorization)
+    const hasWallet = !!(wallet.account && wallet.authorization && wallet.mode && (hasPublicKey || hasAccountAuth));
     const hasCallback = !!(prompt && prompt.callback);
 
     const hasForegroundCallback = !!(

app/modules/handler/containers/Stage/Identity.js

@@ -55,6 +55,8 @@ class PromptStageIdentity extends Component<Props> {
     const {
       account,
       authorization,
+      authAccount,
+      authAuthorization,
       mode,
       pubkey,
     } = wallet;
@@ -99,6 +101,8 @@ class PromptStageIdentity extends Component<Props> {
                   <GlobalAccountDropdownSelect
                     account={account}
                     authorization={authorization}
+                    authAccount={authAccount}
+                    authAuthorization={authAuthorization}
                     mode={mode}
                     pubkey={pubkey}
                     chainId={chainId}

app/shared/actions/wallet.js

@@ -289,7 +289,15 @@ export function unlockWallet(password, useWallet = false, unlockAll = true) {
   };
 }
 
-export function unlockWalletByAuth(account, authorization, password, chainId = false, callback = false) {
+export function unlockWalletByAuth(
+  account, 
+  authorization, 
+  password, 
+  chainId = false, 
+  callback = false,
+  authAccount = false,
+  authAuthorization = false,
+) {
   return async (dispatch: () => void, getState) => {
     const state = getState();
     const {
@@ -306,6 +314,15 @@ export function unlockWalletByAuth(account, authorization, password, chainId = f
       query.chainId = chainId;
     }
     const wallet = find(wallets, query);
+    // get the appropriate public key if this is account based auth
+    if (authAccount && authAuthorization) {
+      const authority = find(wallets, {
+        ...query,
+        account: authAccount,
+        authorization: authAuthorization,
+      });
+      wallet.pubkey = authority.pubkey;
+    }
 
     const accountData = accounts[wallet.account];
     const blockchain = find(blockchains, { chainId: wallet.chainId });

app/shared/containers/Global/Account/Dropdown/Select.js

@@ -25,6 +25,8 @@ class GlobalAccountDropdownSelect extends Component<Props> {
     const {
       account,
       authorization,
+      authAccount,
+      authAuthorization,
       chainId,
       disabled,
       fluid,
@@ -48,6 +50,8 @@ class GlobalAccountDropdownSelect extends Component<Props> {
       <GlobalFragmentWallet
         account={account}
         authorization={authorization}
+        authAccount={authAccount}
+        authAuthorization={authAuthorization}
         mode={mode}
         pubkey={pubkey}
       />