@dynamic-labs/sdk-react-core 4.31.3 → 4.31.4

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [4.31.4](https://github.com/dynamic-labs/dynamic-auth/compare/v4.31.3...v4.31.4) (2025-09-16)
+
+
+### Bug Fixes
+
+* prevent useUserWallets from returning empty array when cancelling wallet connect connection ([#9500](https://github.com/dynamic-labs/dynamic-auth/issues/9500)) ([850f03c](https://github.com/dynamic-labs/dynamic-auth/commit/850f03cdc954da5a2af5285d873fc02a2f95e09e))
+
 ### [4.31.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.31.2...v4.31.3) (2025-09-15)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.31.3";
+var version = "4.31.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.762",
 	"@dynamic-labs-sdk/client": "0.1.0-alpha.3",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "4.31.3";
+var version = "4.31.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.762",
 	"@dynamic-labs-sdk/client": "0.1.0-alpha.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.31.3",
+  "version": "4.31.4",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.762",
     "@dynamic-labs-sdk/client": "0.1.0-alpha.3",
@@ -15,16 +15,16 @@
     "yup": "0.32.11",
     "react-international-phone": "4.5.0",
     "bs58": "5.0.0",
-    "@dynamic-labs/assert-package-version": "4.31.3",
-    "@dynamic-labs/iconic": "4.31.3",
-    "@dynamic-labs/logger": "4.31.3",
-    "@dynamic-labs/multi-wallet": "4.31.3",
-    "@dynamic-labs/rpc-providers": "4.31.3",
-    "@dynamic-labs/store": "4.31.3",
-    "@dynamic-labs/types": "4.31.3",
-    "@dynamic-labs/utils": "4.31.3",
-    "@dynamic-labs/wallet-book": "4.31.3",
-    "@dynamic-labs/wallet-connector-core": "4.31.3",
+    "@dynamic-labs/assert-package-version": "4.31.4",
+    "@dynamic-labs/iconic": "4.31.4",
+    "@dynamic-labs/logger": "4.31.4",
+    "@dynamic-labs/multi-wallet": "4.31.4",
+    "@dynamic-labs/rpc-providers": "4.31.4",
+    "@dynamic-labs/store": "4.31.4",
+    "@dynamic-labs/types": "4.31.4",
+    "@dynamic-labs/utils": "4.31.4",
+    "@dynamic-labs/wallet-book": "4.31.4",
+    "@dynamic-labs/wallet-connector-core": "4.31.4",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/context/ViewContext/ViewContext.cjs

@@ -7,6 +7,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var useDynamicEvents = require('../../utils/hooks/events/useDynamicEvents/useDynamicEvents.cjs');
 var ErrorContext = require('../ErrorContext/ErrorContext.cjs');
+var dynamicEvents = require('../../events/dynamicEvents.cjs');
 
 const ViewContext = React.createContext(undefined);
 const ViewContextProvider = ({ children, initialViewType }) => {
@@ -45,6 +46,7 @@ const ViewContextProvider = ({ children, initialViewType }) => {
             return;
         clearError();
         setStack((prev) => prev.slice(0, -1));
+        dynamicEvents.dynamicEvents.emit('goBack');
     }, [canGoBack, clearError]);
     const clearStackAndPush = React.useCallback((type, props, events) => {
         clearError();

package/src/lib/context/ViewContext/ViewContext.js

@@ -3,6 +3,7 @@ import { jsx } from 'react/jsx-runtime';
 import { createContext, useContext, useState, useMemo, useCallback } from 'react';
 import { useInternalDynamicEvents } from '../../utils/hooks/events/useDynamicEvents/useDynamicEvents.js';
 import { useErrorContext } from '../ErrorContext/ErrorContext.js';
+import { dynamicEvents } from '../../events/dynamicEvents.js';
 
 const ViewContext = createContext(undefined);
 const ViewContextProvider = ({ children, initialViewType }) => {
@@ -41,6 +42,7 @@ const ViewContextProvider = ({ children, initialViewType }) => {
             return;
         clearError();
         setStack((prev) => prev.slice(0, -1));
+        dynamicEvents.emit('goBack');
     }, [canGoBack, clearError]);
     const clearStackAndPush = useCallback((type, props, events) => {
         clearError();

package/src/lib/events/ui.d.ts

@@ -17,4 +17,8 @@ export type UIEvents = {
     }) => void;
     userProfileOpen: () => void;
     userProfileClose: () => void;
+    /**
+     * Triggered when the user clicks the back button
+     */
+    goBack: () => void;
 };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -163,11 +163,18 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     };
     return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts = undefined, }) {
         var _b;
+        const connectionCancelPromise = new utils.DeferredPromise();
+        const onGoBack = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            loadingAndLifecycle.setIsInitialWalletVerificationInProgress(false);
+            connectionCancelPromise.reject(new utils.GetAddressCancelledError());
+        });
         try {
+            dynamicEvents.dynamicEvents.on('goBack', onGoBack);
+            dynamicEvents.dynamicEvents.on('authFlowClose', onGoBack);
+            dynamicEvents.dynamicEvents.once('walletAdded', unsetInitialWalletVerificationFlag.unsetInitialWalletVerificationFlag);
             // Lock the variable that indicates that the login wallet verification is in progress
             // Read UserWalletsContext.tsx explanation for more context
             loadingAndLifecycle.setIsInitialWalletVerificationInProgress(true);
-            dynamicEvents.dynamicEvents.once('walletAdded', unsetInitialWalletVerificationFlag.unsetInitialWalletVerificationFlag);
             yield showPendingConnectView.showPendingConnectView(walletConnector, pushView);
             if (walletConnectorCore.isEmailWalletConnector(walletConnector)) {
                 if (walletConnectorCore.isEmailOTPWalletConnector(walletConnector)) {
@@ -177,16 +184,20 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     pushView('wait-for-email-confirmation-view');
                 }
             }
-            let connectionResult;
+            const connectionPromise = connectWallet(walletConnector, getAddressOpts, {
+                applyHandleConnectedWallet: shouldCallCallback,
+            });
             try {
-                connectionResult = yield connectWallet(walletConnector, getAddressOpts, {
-                    applyHandleConnectedWallet: shouldCallCallback,
-                });
+                yield Promise.race([
+                    connectionPromise,
+                    connectionCancelPromise.promise,
+                ]);
             }
             catch (error) {
                 handleWalletConnectionError(error);
                 return;
             }
+            const connectionResult = yield connectionPromise;
             // Fallback to catch any errors that were missed.
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 handleWalletConnectionError();
@@ -246,6 +257,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             // 3. The SDK will enter a broken state. Try signing a message with wagmi.
             // You can also add a "pause on exception" breakpoint in the debugger and see what happens during verification.
             unsetInitialWalletVerificationFlag.unsetInitialWalletVerificationFlagWithTimeout();
+            dynamicEvents.dynamicEvents.removeListener('goBack', onGoBack);
+            dynamicEvents.dynamicEvents.removeListener('authFlowClose', onGoBack);
         }
     });
 };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { StorageService, CustomError, GetAddressCancelledError } from '@dynamic-labs/utils';
+import { DeferredPromise, StorageService, CustomError, GetAddressCancelledError } from '@dynamic-labs/utils';
 import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import 'react';
@@ -159,11 +159,18 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     };
     return (_a) => __awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts = undefined, }) {
         var _b;
+        const connectionCancelPromise = new DeferredPromise();
+        const onGoBack = () => __awaiter(void 0, void 0, void 0, function* () {
+            setIsInitialWalletVerificationInProgress(false);
+            connectionCancelPromise.reject(new GetAddressCancelledError());
+        });
         try {
+            dynamicEvents.on('goBack', onGoBack);
+            dynamicEvents.on('authFlowClose', onGoBack);
+            dynamicEvents.once('walletAdded', unsetInitialWalletVerificationFlag);
             // Lock the variable that indicates that the login wallet verification is in progress
             // Read UserWalletsContext.tsx explanation for more context
             setIsInitialWalletVerificationInProgress(true);
-            dynamicEvents.once('walletAdded', unsetInitialWalletVerificationFlag);
             yield showPendingConnectView(walletConnector, pushView);
             if (isEmailWalletConnector(walletConnector)) {
                 if (isEmailOTPWalletConnector(walletConnector)) {
@@ -173,16 +180,20 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     pushView('wait-for-email-confirmation-view');
                 }
             }
-            let connectionResult;
+            const connectionPromise = connectWallet(walletConnector, getAddressOpts, {
+                applyHandleConnectedWallet: shouldCallCallback,
+            });
             try {
-                connectionResult = yield connectWallet(walletConnector, getAddressOpts, {
-                    applyHandleConnectedWallet: shouldCallCallback,
-                });
+                yield Promise.race([
+                    connectionPromise,
+                    connectionCancelPromise.promise,
+                ]);
             }
             catch (error) {
                 handleWalletConnectionError(error);
                 return;
             }
+            const connectionResult = yield connectionPromise;
             // Fallback to catch any errors that were missed.
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 handleWalletConnectionError();
@@ -242,6 +253,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             // 3. The SDK will enter a broken state. Try signing a message with wagmi.
             // You can also add a "pause on exception" breakpoint in the debugger and see what happens during verification.
             unsetInitialWalletVerificationFlagWithTimeout();
+            dynamicEvents.removeListener('goBack', onGoBack);
+            dynamicEvents.removeListener('authFlowClose', onGoBack);
         }
     });
 };