@dynamic-labs/sdk-react-core 0.18.0-RC.1 → 0.18.0-RC.11

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

@@ -10,26 +10,30 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/sdk-api');
-require('../../../../shared/logger.cjs');
-require('../../../../config/LSSuffix.cjs');
-var setToLS = require('../../../../shared/utils/functions/storage/setToLS.cjs');
+var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
-var localStorage = require('../../../constants/localStorage.cjs');
+var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
+var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../../shared/consts/index.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
+var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
+require('@dynamic-labs/multi-wallet');
+var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
+var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
 
 const useConnectAndSign = () => {
-    const { setView } = ViewContext.useViewContext();
+    const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, setShowAuthFlow, user, walletUiUtils, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setNetwork, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
         displayTermsOfService,
@@ -51,9 +55,21 @@ const useConnectAndSign = () => {
             }
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
             setCallback('connectSuccess');
+            const walletNetwork = yield walletConnector.getNetwork();
+            setNetwork(walletNetwork);
+            const usesSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
+                network: walletNetwork,
+                walletConnector,
+            });
+            if (!usesSupportedNetwork) {
+                if (isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
+                    return setView('network-not-supported');
+                }
+                return setView('network-not-supported-manual');
+            }
             if (isConnectOnly.isConnectOnly(user, authMode)) {
-                setToLS.setToLS(localStorage.LAST_USED_WALLET, walletConnector.name);
-                setShowAuthFlow(false);
+                localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
+                handleWalletsToConnect();
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
@@ -73,8 +89,9 @@ const useConnectAndSign = () => {
             });
         }
         catch (err) {
+            logger.logger.debug(err);
             setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });

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

@@ -6,9 +6,7 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/sdk-api';
-import '../../../../shared/logger.js';
-import '../../../../config/LSSuffix.js';
-import { setToLS } from '../../../../shared/utils/functions/storage/setToLS.js';
+import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import 'react';
@@ -16,16 +14,22 @@ import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
+import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../../shared/consts/index.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
+import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
+import '@dynamic-labs/multi-wallet';
+import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
+import { isProgrammableNetworkSwitchSupported } from '../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
 
 const useConnectAndSign = () => {
-    const { setView } = useViewContext();
+    const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, setShowAuthFlow, user, walletUiUtils, setCallback, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setNetwork, } = useInternalDynamicContext();
+    const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
         displayTermsOfService,
@@ -47,9 +51,21 @@ const useConnectAndSign = () => {
             }
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
             setCallback('connectSuccess');
+            const walletNetwork = yield walletConnector.getNetwork();
+            setNetwork(walletNetwork);
+            const usesSupportedNetwork = isSupportedNetwork({
+                network: walletNetwork,
+                walletConnector,
+            });
+            if (!usesSupportedNetwork) {
+                if (isProgrammableNetworkSwitchSupported(walletConnector)) {
+                    return setView('network-not-supported');
+                }
+                return setView('network-not-supported-manual');
+            }
             if (isConnectOnly(user, authMode)) {
-                setToLS(LAST_USED_WALLET, walletConnector.name);
-                setShowAuthFlow(false);
+                LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
+                handleWalletsToConnect();
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
@@ -69,8 +85,9 @@ const useConnectAndSign = () => {
             });
         }
         catch (err) {
+            logger.debug(err);
             setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });

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

@@ -10,26 +10,27 @@ var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
 var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 require('@dynamic-labs/sdk-api');
-require('../../../../shared/logger.cjs');
-require('../../../../config/LSSuffix.cjs');
-var setToLS = require('../../../../shared/utils/functions/storage/setToLS.cjs');
+var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
-var localStorage = require('../../../constants/localStorage.cjs');
+var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
+var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../../shared/consts/index.cjs');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
+var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
 
 const useConnectAndSignSplitSteps = () => {
-    const { setView } = ViewContext.useViewContext();
+    const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
     const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
         displayTermsOfService,
@@ -48,8 +49,8 @@ const useConnectAndSignSplitSteps = () => {
             yield connectWallet(walletConnector, fetchPublicAddressOpts);
             setCallback('connectSuccess');
             if (isConnectOnly.isConnectOnly(user, authMode)) {
-                setToLS.setToLS(localStorage.LAST_USED_WALLET, walletConnector.name);
-                setShowAuthFlow(false);
+                localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
+                handleWalletsToConnect();
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
@@ -60,8 +61,9 @@ const useConnectAndSignSplitSteps = () => {
             setView('pending-signature');
         }
         catch (err) {
+            logger.logger.debug(err);
             setErrorMessage(err.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });
@@ -77,8 +79,9 @@ const useConnectAndSignSplitSteps = () => {
             });
         }
         catch (err) {
+            logger.logger.debug(err);
             setErrorMessage(err.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });

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

@@ -6,9 +6,7 @@ import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import '@dynamic-labs/sdk-api';
-import '../../../../shared/logger.js';
-import '../../../../config/LSSuffix.js';
-import { setToLS } from '../../../../shared/utils/functions/storage/setToLS.js';
+import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
@@ -17,15 +15,18 @@ import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
+import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../../shared/consts/index.js';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
+import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
 
 const useConnectAndSignSplitSteps = () => {
-    const { setView } = useViewContext();
+    const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
     const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, } = useInternalDynamicContext();
+    const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
         displayTermsOfService,
@@ -44,8 +45,8 @@ const useConnectAndSignSplitSteps = () => {
             yield connectWallet(walletConnector, fetchPublicAddressOpts);
             setCallback('connectSuccess');
             if (isConnectOnly(user, authMode)) {
-                setToLS(LAST_USED_WALLET, walletConnector.name);
-                setShowAuthFlow(false);
+                LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
+                handleWalletsToConnect();
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
@@ -56,8 +57,9 @@ const useConnectAndSignSplitSteps = () => {
             setView('pending-signature');
         }
         catch (err) {
+            logger.debug(err);
             setErrorMessage(err.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });
@@ -73,8 +75,9 @@ const useConnectAndSignSplitSteps = () => {
             });
         }
         catch (err) {
+            logger.debug(err);
             setErrorMessage(err.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });

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

@@ -6,20 +6,6 @@ var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var api = require('../../../../data/api.cjs');
-var index = require('../../../functions/storeAuthToken/index.cjs');
-require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/utils');
-require('../../../constants/colors.cjs');
-require('@dynamic-labs/sdk-api');
-require('../../../../shared/logger.cjs');
-require('../../../../config/LSSuffix.cjs');
-require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
-require('react/jsx-runtime');
-require('../../../../context/ViewContext/ViewContext.cjs');
-require('@dynamic-labs/wallet-book');
-require('ethers');
-require('../../../../shared/consts/index.cjs');
 var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 var EmailVerificationContext = require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 
@@ -41,8 +27,7 @@ const useEmailVerificationRequest = () => {
             verificationToken,
             verificationUUID: String(verificationUUID || emailVerificationContextVerificationUUID),
         }, jwtToken);
-        updateUserProfileByJWT(verifyEmailResponse.jwt);
-        index.storeAuthToken(verifyEmailResponse.jwt);
+        yield updateUserProfileByJWT(verifyEmailResponse.jwt);
         return verifyEmailResponse;
     }), [
         emailVerificationContextVerificationUUID,

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

@@ -2,20 +2,6 @@ import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import { verifyEmail } from '../../../../data/api.js';
-import { storeAuthToken } from '../../../functions/storeAuthToken/index.js';
-import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/utils';
-import '../../../constants/colors.js';
-import '@dynamic-labs/sdk-api';
-import '../../../../shared/logger.js';
-import '../../../../config/LSSuffix.js';
-import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
-import 'react/jsx-runtime';
-import '../../../../context/ViewContext/ViewContext.js';
-import '@dynamic-labs/wallet-book';
-import 'ethers';
-import '../../../../shared/consts/index.js';
 import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import { useEmailVerificationContext } from '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
 
@@ -37,8 +23,7 @@ const useEmailVerificationRequest = () => {
             verificationToken,
             verificationUUID: String(verificationUUID || emailVerificationContextVerificationUUID),
         }, jwtToken);
-        updateUserProfileByJWT(verifyEmailResponse.jwt);
-        storeAuthToken(verifyEmailResponse.jwt);
+        yield updateUserProfileByJWT(verifyEmailResponse.jwt);
         return verifyEmailResponse;
     }), [
         emailVerificationContextVerificationUUID,

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

@@ -7,6 +7,18 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
+require('@dynamic-labs/sdk-api');
+var logger = require('../../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('react');
+require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
+require('../../../constants/colors.cjs');
+require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('ethers');
+require('../../../../shared/consts/index.cjs');
 
 const useSignConnectOnlyUser = () => {
     const { setView } = ViewContext.useViewContext();
@@ -37,6 +49,7 @@ const useSignConnectOnlyUser = () => {
             });
         }
         catch (err) {
+            logger.logger.debug(err);
             setErrorMessage(err.toString());
             setShowAuthFlow(false);
             return;

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

@@ -3,6 +3,18 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
+import '@dynamic-labs/sdk-api';
+import { logger } from '../../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import '../../../constants/colors.js';
+import '../../../../shared/utils/classes/storage/localStorage.js';
+import 'ethers';
+import '../../../../shared/consts/index.js';
 
 const useSignConnectOnlyUser = () => {
     const { setView } = useViewContext();
@@ -33,6 +45,7 @@ const useSignConnectOnlyUser = () => {
             });
         }
         catch (err) {
+            logger.debug(err);
             setErrorMessage(err.toString());
             setShowAuthFlow(false);
             return;

package/src/lib/utils/hooks/index.d.ts

@@ -24,3 +24,7 @@ export { useColorSchemePreference } from './useColorSchemePreference';
 export { useGetSocialIcon } from './useGetSocialIcon';
 export { useIconThemeVariant } from './useIconThemeVariant';
 export type { IconThemeVariant } from './useIconThemeVariant';
+export { useIsomorphicLayoutEffect } from './useIsomorphicLayoutEffect/useIsomorphicLayoutEffect';
+export { useTimeout } from './useTimeout/useTimeout';
+export { useInterval } from './useInterval/useInterval';
+export { useCountdown } from './useCountdown/useCountdown';

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.cjs

@@ -5,8 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var isWalletLinked = require('../../../functions/isWalletLinked/isWalletLinked.cjs');
+var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
+var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 
 const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync = true, }) => {
+    const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setView } = ViewContext.useViewContext();
     const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
         if (!primaryWallet)
             return;
@@ -15,7 +19,10 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
             ...secondaryWallets,
         ]);
         if (!connectedWalletIsLinked) {
-            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
+            // MM returns all connected wallets now, so we need to check if the active account
+            // is not in the same wallet as the primary wallet before automatically switching
+            // to a connected secondary wallet as it was causing an infinite loop
+            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected && primaryWallet.connector !== wallet.connector);
             if (!connectedSecondaryWallet) {
                 setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
                 return;
@@ -72,7 +79,9 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
                 computeConnectedStateForWallets();
                 return;
             }
-            handleLogOut();
+            // no wallet is connected
+            setShowAuthFlow(true);
+            setView('wallet-locked-view');
         });
     }, [
         primaryWallet,
@@ -84,6 +93,8 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
         handleLogOut,
         setPrimaryWallet,
         canSync,
+        setView,
+        setShowAuthFlow,
     ]);
 };
 

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.js

@@ -1,8 +1,12 @@
 import { useCallback, useEffect } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import { isWalletLinked } from '../../../functions/isWalletLinked/isWalletLinked.js';
+import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
+import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 
 const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync = true, }) => {
+    const { setShowAuthFlow } = useInternalDynamicContext();
+    const { setView } = useViewContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
         if (!primaryWallet)
             return;
@@ -11,7 +15,10 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
             ...secondaryWallets,
         ]);
         if (!connectedWalletIsLinked) {
-            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
+            // MM returns all connected wallets now, so we need to check if the active account
+            // is not in the same wallet as the primary wallet before automatically switching
+            // to a connected secondary wallet as it was causing an infinite loop
+            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected && primaryWallet.connector !== wallet.connector);
             if (!connectedSecondaryWallet) {
                 setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
                 return;
@@ -68,7 +75,9 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
                 computeConnectedStateForWallets();
                 return;
             }
-            handleLogOut();
+            // no wallet is connected
+            setShowAuthFlow(true);
+            setView('wallet-locked-view');
         });
     }, [
         primaryWallet,
@@ -80,6 +89,8 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
         handleLogOut,
         setPrimaryWallet,
         canSync,
+        setView,
+        setShowAuthFlow,
     ]);
 };
 

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -6,7 +6,6 @@ var React = require('react');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../../shared/logger.cjs');
-require('../../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
@@ -14,6 +13,7 @@ require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../../constants/colors.cjs');
+require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -2,7 +2,6 @@ import { useEffect } from 'react';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../../shared/logger.js';
-import '../../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
@@ -10,6 +9,7 @@ import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
+import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';

package/src/lib/utils/hooks/useAuthLayoutChecks/index.d.ts

@@ -0,0 +1 @@
+export { useAuthLayoutChecks } from './useAuthLayoutChecks';

package/src/lib/utils/hooks/useAuthLayoutChecks/useAuthLayoutChecks.cjs

@@ -0,0 +1,82 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
+var MockContext = require('../../../context/MockContext/MockContext.cjs');
+var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+var isUserLinkingWallet = require('../../../shared/utils/functions/isUserLinkingWallet/isUserLinkingWallet.cjs');
+var QrCodeContext = require('../../../context/QrCodeContext/QrCodeContext.cjs');
+var getDynamicLayoutData = require('../../functions/getDynamicLayoutData/getDynamicLayoutData.cjs');
+
+const useAuthLayoutChecks = (walletConnector) => {
+    const { view } = ViewContext.useViewContext();
+    const { user, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { showQrCodeMessage, showQrCodeImage } = QrCodeContext.useQrCodeContext();
+    const { mockedSDK } = MockContext.useMockContext();
+    const { helpHeaderData } = getDynamicLayoutData.getDynamicLayoutData({ view });
+    const isWalletListTypeView = view === 'wallet-connect-mobile-wallets-list' ||
+        view === 'wallet-list' ||
+        view === 'login-with-email-or-wallet-full-wallet-list';
+    const showHelpContent = Boolean(helpHeaderData &&
+        // Notice the negation here
+        !((view === 'qr-code' && !(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.canConnectViaQrCode)) ||
+            view === 'no-qr-not-installed' ||
+            view === 'wallet-used' ||
+            view === 'chainalysis-blocked-wallet' ||
+            view === 'wallet-sign' ||
+            view === 'collect-user-data' ||
+            isUserLinkingWallet.isUserLinkingWallet(user, view, mockedSDK)));
+    const showHeader = view !== 'collect-user-data' &&
+        view !== 'no-access' &&
+        view !== 'chainalysis-blocked-wallet' &&
+        view !== 'update-email' &&
+        view !== 'verify-email' &&
+        view !== 'network-not-supported' &&
+        view !== 'wallet-locked-view' &&
+        view !== 'gate-blocked-wallet' &&
+        view !== 'email-wallet-otp-verification-view' &&
+        view !== 'bridge-welcome' &&
+        view !== 'bridge-summary' &&
+        view !== 'bridge-next-wallet-connection';
+    const showConnectedWalletProgress = isBridgeFlow &&
+        (view === 'wallet-list' ||
+            view === 'qr-code' ||
+            view === 'wallet-connect-mobile-wallets-list' ||
+            view === 'pending-connect' ||
+            view === 'pending-signature' ||
+            view === 'pending-signature-without-back-button' ||
+            view === 'bridge-next-wallet-connection' ||
+            view === 'bridge-summary');
+    const showToSFooter = Boolean(!isUserLinkingWallet.isUserLinkingWallet(user, view, mockedSDK) &&
+        (view === 'wallet-list' ||
+            view === 'wallet-connect-mobile-wallets-list' ||
+            // Don't show empty footer on login-with-email-or-wallet-full-wallet-list
+            (view === 'login-with-email-or-wallet' &&
+                termsOfServiceUrl &&
+                privacyPolicyUrl) ||
+            view === 'login-with-email-or-wallet-full-wallet-list'));
+    const showCloseButton = view !== 'login-with-email-or-wallet-full-wallet-list' &&
+        view !== 'login-with-email-verification';
+    const showBackButton = view === 'qr-code' ||
+        view === 'pending-signature' ||
+        view === 'no-qr-not-installed' ||
+        view === 'wallet-connect-mobile-wallets-list' ||
+        view === 'login-with-email-verification' ||
+        view === 'login-with-email-or-wallet-full-wallet-list' ||
+        view === 'wallet-group' ||
+        view === 'pending-connect';
+    const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
+    return {
+        isWalletListTypeView,
+        showBackButton,
+        showCloseButton,
+        showConnectedWalletProgress,
+        showHeader,
+        showHelpContent,
+        showQrCodePreHeader,
+        showToSFooter,
+    };
+};
+
+exports.useAuthLayoutChecks = useAuthLayoutChecks;

package/src/lib/utils/hooks/useAuthLayoutChecks/useAuthLayoutChecks.d.ts

@@ -0,0 +1,11 @@
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+export declare const useAuthLayoutChecks: (walletConnector?: WalletConnector | null) => {
+    isWalletListTypeView: boolean;
+    showBackButton: boolean;
+    showCloseButton: boolean;
+    showConnectedWalletProgress: boolean;
+    showHeader: boolean;
+    showHelpContent: boolean;
+    showQrCodePreHeader: boolean;
+    showToSFooter: boolean;
+};