Attempt to unlock MetaMask onClick, and provide existing flow with no…

…tification when unlock fails.
MyCryptoHQ · Dec 29, 2017 · 4fd3330 · 4fd3330
1 parent 901c99e
commit 4fd3330
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/common/components/WalletDecrypt/WalletDecrypt.tsx b/common/components/WalletDecrypt/WalletDecrypt.tsx
@@ -69,6 +69,7 @@ interface BaseWalletInfo {
   unlock: any;
   helpLink?: string;
   isReadOnly?: boolean;
+  attemptUnlock?: boolean;
 }
 
 export interface SecureWalletInfo extends BaseWalletInfo {
@@ -105,6 +106,7 @@ export class WalletDecrypt extends Component<Props, State> {
       component: Web3Decrypt,
       initialParams: {},
       unlock: this.props.unlockWeb3,
+      attemptUnlock: true,
       helpLink: `${knowledgeBaseURL}/migration/moving-from-private-key-to-metamask`
     },
     'ledger-nano-s': {
@@ -282,10 +284,19 @@ export class WalletDecrypt extends Component<Props, State> {
       return;
     }
 
-    this.setState({
-      selectedWalletKey: walletType,
-      value: wallet.initialParams
-    });
+    let timeout = 0;
+
+    if (wallet.attemptUnlock) {
+      timeout = 250;
+      wallet.unlock();
+    }
+
+    setTimeout(() => {
+      this.setState({
+        selectedWalletKey: walletType,
+        value: wallet.initialParams
+      });
+    }, timeout);
   };
 
   public clearWalletChoice = () => {