Reset Wallet Selection on Permission Failure (#222)

* Reset Wallet Selection on Permission Failure * Remove console log
tqtezos · Mar 8, 2021 · d7174e5 · d7174e5
1 parent 62a7591
commit d7174e5
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/client/src/lib/system.ts b/client/src/lib/system.ts
@@ -170,15 +170,21 @@ async function initWallet(
 
   if (!activeAccount) {
     if (forceConnect) {
-      await wallet.requestPermissions({
-        network: {
-          type:
-            system.config.network === 'edo2net'
-              ? (system.config.network as NetworkType)
-              : network,
-          rpcUrl: system.config.rpc
-        }
-      });
+      try {
+        await wallet.requestPermissions({
+          network: {
+            type:
+              system.config.network === 'edo2net'
+                ? (system.config.network as NetworkType)
+                : network,
+            rpcUrl: system.config.rpc
+          }
+        });
+      } catch (error) {
+        // requestPermissions failed - reset wallet selection
+        wallet.clearActiveAccount();
+        throw error;
+      }
     } else {
       return false;
     }