@dynamic-labs/sdk-react-core 4.31.1 → 4.31.2

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [4.31.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.31.1...v4.31.2) (2025-09-11)
+
+
+### Bug Fixes
+
+* issue with Safe Wallet not auto-connecting on a Safe App ([#9479](https://github.com/dynamic-labs/dynamic-auth/issues/9479)) ([fc7458d](https://github.com/dynamic-labs/dynamic-auth/commit/fc7458db2481ed1d4cba62297f768f5e409ea0b5))
+
 ### [4.31.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.31.0...v4.31.1) (2025-09-10)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.31.1";
+var version = "4.31.2";
 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.1";
+var version = "4.31.2";
 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.1",
+  "version": "4.31.2",
   "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.1",
-    "@dynamic-labs/iconic": "4.31.1",
-    "@dynamic-labs/logger": "4.31.1",
-    "@dynamic-labs/multi-wallet": "4.31.1",
-    "@dynamic-labs/rpc-providers": "4.31.1",
-    "@dynamic-labs/store": "4.31.1",
-    "@dynamic-labs/types": "4.31.1",
-    "@dynamic-labs/utils": "4.31.1",
-    "@dynamic-labs/wallet-book": "4.31.1",
-    "@dynamic-labs/wallet-connector-core": "4.31.1",
+    "@dynamic-labs/assert-package-version": "4.31.2",
+    "@dynamic-labs/iconic": "4.31.2",
+    "@dynamic-labs/logger": "4.31.2",
+    "@dynamic-labs/multi-wallet": "4.31.2",
+    "@dynamic-labs/rpc-providers": "4.31.2",
+    "@dynamic-labs/store": "4.31.2",
+    "@dynamic-labs/types": "4.31.2",
+    "@dynamic-labs/utils": "4.31.2",
+    "@dynamic-labs/wallet-book": "4.31.2",
+    "@dynamic-labs/wallet-connector-core": "4.31.2",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/WalletConnectorEvents/WalletConnectorEvents.cjs

@@ -9,8 +9,6 @@ var multiWallet = require('@dynamic-labs/multi-wallet');
 var rpcProviders = require('@dynamic-labs/rpc-providers');
 var walletBook = require('@dynamic-labs/wallet-book');
 var useWalletItemActions = require('../../utils/hooks/useWalletItemActions/useWalletItemActions.cjs');
-require('../../context/DynamicContext/DynamicContext.cjs');
-require('../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -21,6 +19,10 @@ require('@dynamic-labs/utils');
 require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
 require('../../shared/consts/index.cjs');
+var walletOptions = require('../../store/state/walletOptions/walletOptions.cjs');
+var connectorsInitializing = require('../../store/state/connectorsInitializing/connectorsInitializing.cjs');
+require('../../context/DynamicContext/DynamicContext.cjs');
+require('../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../events/dynamicEvents.cjs');
 require('../../../../_virtual/_tslib.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
@@ -57,7 +59,6 @@ require('../../context/MockContext/MockContext.cjs');
 require('../../views/CollectUserDataView/useFields.cjs');
 require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-var walletOptions = require('../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../Alert/Alert.cjs');
@@ -92,7 +93,6 @@ require('../../views/MfaChooseDeviceView/useGetMfaOptions/useGetMfaOptions.cjs')
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../context/OnrampContext/OnrampContext.cjs');
 require('../../store/state/sendBalances.cjs');
-var connectorsInitializing = require('../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
@@ -179,12 +179,18 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
             });
             const walletConnectorOptions = walletOptions.getWalletConnectorOptions();
             const updatedConnectors = [...walletConnectorOptions];
-            pendingReadyConnectorsRef.current.forEach((connector) => {
+            let walletOptionToAutoConnect;
+            pendingReadyConnectorsRef.current.forEach(({ connector, shouldAutoConnect }) => {
                 let foundWallet = false;
                 for (let i = 0; i < updatedConnectors.length; i++) {
-                    if (updatedConnectors[i].key === connector.key) {
-                        foundWallet = true;
+                    const hasSameKey = updatedConnectors[i].key === connector.key;
+                    const isReplacingNonWalletConnectWithWalletConnect = !updatedConnectors[i].walletConnector.isWalletConnect &&
+                        connector.isWalletConnect;
+                    if (hasSameKey && !isReplacingNonWalletConnectWithWalletConnect) {
                         updatedConnectors[i] = Object.assign(Object.assign({}, updatedConnectors[i]), { isInstalledOnBrowser: connector.isInstalledOnBrowser(), walletConnector: connector });
+                    }
+                    if (hasSameKey) {
+                        foundWallet = true;
                         break;
                     }
                 }
@@ -192,15 +198,23 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
                     const newWalletOption = createWallet.createWallet(connectorProps.walletBook, connector);
                     updatedConnectors.push(newWalletOption);
                 }
+                if (shouldAutoConnect) {
+                    walletOptionToAutoConnect = updatedConnectors.find((wallet) => wallet.key === connector.key &&
+                        !wallet.walletConnector.isWalletConnect);
+                }
             });
             walletOptions.mergeWalletConnectorOptions(updatedConnectors);
             pendingReadyConnectorsRef.current = [];
-        };
-        const handleProviderReady = ({ connector, }) => {
-            logger.logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] handleProviderReady', {
-                connector,
+            logger.logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] processReadyConnectors', {
+                walletOptionToAutoConnect,
             });
-            pendingReadyConnectorsRef.current.push(connector);
+            if (walletOptionToAutoConnect && !primaryWallet) {
+                handleWalletItemClick(walletOptionToAutoConnect);
+            }
+        };
+        const handleProviderReady = (props) => {
+            logger.logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] handleProviderReady', props);
+            pendingReadyConnectorsRef.current.push(props);
             if (readyDebounceTimeoutRef.current) {
                 clearTimeout(readyDebounceTimeoutRef.current);
             }
@@ -220,27 +234,7 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
             // Process any remaining connectors on cleanup
             processReadyConnectors();
         };
-    }, [connectorProps.walletBook]);
-    // add listener for autoConnect event
-    React.useEffect(() => {
-        const handleAutoConnect = ({ connector, }) => {
-            logger.logger.debug('[WalletConnectorEvents] handleAutoConnect', { connector });
-            const walletConnectorOptions = walletOptions.getWalletConnectorOptions();
-            const walletOption = walletConnectorOptions.find((wallet) => wallet.walletConnector.key === connector.key);
-            logger.logger.debug('[WalletConnectorEvents] handleAutoConnect - found walletOption', Boolean(walletOption));
-            if (!walletOption)
-                return;
-            handleWalletItemClick(walletOption);
-        };
-        // if there's a connected wallet, we should not auto connect another wallet
-        if (primaryWallet) {
-            return;
-        }
-        walletConnectorCore.walletConnectorEvents.on('autoConnect', handleAutoConnect);
-        return () => {
-            walletConnectorCore.walletConnectorEvents.off('autoConnect', handleAutoConnect);
-        };
-    }, [handleWalletItemClick, primaryWallet]);
+    }, [connectorProps.walletBook, handleWalletItemClick]);
     // add listener for connectorInitStarted and connectorInitCompleted events
     React.useEffect(() => {
         const handleConnectorInitStarted = (key) => {

package/src/lib/components/WalletConnectorEvents/WalletConnectorEvents.js

@@ -5,8 +5,6 @@ import { getWalletConnectorConstructorOptions } from '@dynamic-labs/multi-wallet
 import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
 import { isWalletBookPopulated } from '@dynamic-labs/wallet-book';
 import { useWalletItemActions } from '../../utils/hooks/useWalletItemActions/useWalletItemActions.js';
-import '../../context/DynamicContext/DynamicContext.js';
-import '../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -17,6 +15,10 @@ import '@dynamic-labs/utils';
 import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
 import '../../shared/consts/index.js';
+import { getWalletConnectorOptions, mergeWalletConnectorOptions } from '../../store/state/walletOptions/walletOptions.js';
+import { setConnectorInitializing } from '../../store/state/connectorsInitializing/connectorsInitializing.js';
+import '../../context/DynamicContext/DynamicContext.js';
+import '../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '../../events/dynamicEvents.js';
 import '../../../../_virtual/_tslib.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
@@ -53,7 +55,6 @@ import '../../context/MockContext/MockContext.js';
 import '../../views/CollectUserDataView/useFields.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import { getWalletConnectorOptions, mergeWalletConnectorOptions } from '../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../Accordion/components/AccordionItem/AccordionItem.js';
 import '../Alert/Alert.js';
@@ -88,7 +89,6 @@ import '../../views/MfaChooseDeviceView/useGetMfaOptions/useGetMfaOptions.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../context/OnrampContext/OnrampContext.js';
 import '../../store/state/sendBalances.js';
-import { setConnectorInitializing } from '../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../views/TransactionConfirmationView/TransactionConfirmationView.js';
@@ -175,12 +175,18 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
             });
             const walletConnectorOptions = getWalletConnectorOptions();
             const updatedConnectors = [...walletConnectorOptions];
-            pendingReadyConnectorsRef.current.forEach((connector) => {
+            let walletOptionToAutoConnect;
+            pendingReadyConnectorsRef.current.forEach(({ connector, shouldAutoConnect }) => {
                 let foundWallet = false;
                 for (let i = 0; i < updatedConnectors.length; i++) {
-                    if (updatedConnectors[i].key === connector.key) {
-                        foundWallet = true;
+                    const hasSameKey = updatedConnectors[i].key === connector.key;
+                    const isReplacingNonWalletConnectWithWalletConnect = !updatedConnectors[i].walletConnector.isWalletConnect &&
+                        connector.isWalletConnect;
+                    if (hasSameKey && !isReplacingNonWalletConnectWithWalletConnect) {
                         updatedConnectors[i] = Object.assign(Object.assign({}, updatedConnectors[i]), { isInstalledOnBrowser: connector.isInstalledOnBrowser(), walletConnector: connector });
+                    }
+                    if (hasSameKey) {
+                        foundWallet = true;
                         break;
                     }
                 }
@@ -188,15 +194,23 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
                     const newWalletOption = createWallet(connectorProps.walletBook, connector);
                     updatedConnectors.push(newWalletOption);
                 }
+                if (shouldAutoConnect) {
+                    walletOptionToAutoConnect = updatedConnectors.find((wallet) => wallet.key === connector.key &&
+                        !wallet.walletConnector.isWalletConnect);
+                }
             });
             mergeWalletConnectorOptions(updatedConnectors);
             pendingReadyConnectorsRef.current = [];
-        };
-        const handleProviderReady = ({ connector, }) => {
-            logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] handleProviderReady', {
-                connector,
+            logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] processReadyConnectors', {
+                walletOptionToAutoConnect,
             });
-            pendingReadyConnectorsRef.current.push(connector);
+            if (walletOptionToAutoConnect && !primaryWallet) {
+                handleWalletItemClick(walletOptionToAutoConnect);
+            }
+        };
+        const handleProviderReady = (props) => {
+            logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] handleProviderReady', props);
+            pendingReadyConnectorsRef.current.push(props);
             if (readyDebounceTimeoutRef.current) {
                 clearTimeout(readyDebounceTimeoutRef.current);
             }
@@ -216,27 +230,7 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
             // Process any remaining connectors on cleanup
             processReadyConnectors();
         };
-    }, [connectorProps.walletBook]);
-    // add listener for autoConnect event
-    useEffect(() => {
-        const handleAutoConnect = ({ connector, }) => {
-            logger.debug('[WalletConnectorEvents] handleAutoConnect', { connector });
-            const walletConnectorOptions = getWalletConnectorOptions();
-            const walletOption = walletConnectorOptions.find((wallet) => wallet.walletConnector.key === connector.key);
-            logger.debug('[WalletConnectorEvents] handleAutoConnect - found walletOption', Boolean(walletOption));
-            if (!walletOption)
-                return;
-            handleWalletItemClick(walletOption);
-        };
-        // if there's a connected wallet, we should not auto connect another wallet
-        if (primaryWallet) {
-            return;
-        }
-        walletConnectorEvents.on('autoConnect', handleAutoConnect);
-        return () => {
-            walletConnectorEvents.off('autoConnect', handleAutoConnect);
-        };
-    }, [handleWalletItemClick, primaryWallet]);
+    }, [connectorProps.walletBook, handleWalletItemClick]);
     // add listener for connectorInitStarted and connectorInitCompleted events
     useEffect(() => {
         const handleConnectorInitStarted = (key) => {