Fix modal not triggering cancel function on close

Concordium · Apr 4, 2024 · c7af889 · c7af889
1 parent 3004b8c
commit c7af889
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/packages/react-components/package.json b/packages/react-components/package.json
@@ -27,7 +27,7 @@
         "build": "tsc"
     },
     "dependencies": {
-        "@concordium/wallet-connectors": "^0.6.0-alpha.4"
+        "@concordium/wallet-connectors": "^0.6.0-alpha.5"
     },
     "devDependencies": {
         "@tsconfig/recommended": "^1.0.1",

diff --git a/packages/wallet-connectors/package.json b/packages/wallet-connectors/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@concordium/wallet-connectors",
-    "version": "0.6.0-alpha.4",
+    "version": "0.6.0-alpha.5",
     "description": "Utility interface for dApps to interact with wallets without depending on the underlying protocol and implementations for Concordium Browser Wallet and Wallet Connect v2.",
     "author": "Concordium Software",
     "license": "Apache-2.0",

diff --git a/packages/wallet-connectors/src/WalletConnect.ts b/packages/wallet-connectors/src/WalletConnect.ts
@@ -138,8 +138,13 @@ async function connect(
                 walletImages,
                 enableExplorer,
             });
+            modal.subscribeModal(({ open }) => {
+                if (!open) {
+                    return cancel();
+                }
+            });
             // Open modal as we're not connecting to an existing pairing.
-            modal.openModal({ uri });
+            await modal.openModal({ uri });
         }
         return await approval();
     } catch (e) {
@@ -552,8 +557,8 @@ export class WalletConnectConnector implements WalletConnector {
             this.network === MAINNET
                 ? [cryptoXWalletMainnet, concordiumWalletMainnet]
                 : this.network === TESTNET
-                    ? [cryptoXWalletTestnet, concordiumWalletTestnet]
-                    : undefined
+                ? [cryptoXWalletTestnet, concordiumWalletTestnet]
+                : undefined
         );
     }