@dynamic-labs/sdk-react-core 0.18.100-viem.10 → 0.18.100-viem.12

package/CHANGELOG.md

@@ -1,4 +1,26 @@
 
+### [0.18.100-viem.12](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.100-viem.11...v0.18.100-viem.12) (2023-08-30)
+
+
+### Features
+
+* add deepLinkPreference prop ([#3174](https://github.com/dynamic-labs/DynamicAuth/issues/3174)) ([#3177](https://github.com/dynamic-labs/DynamicAuth/issues/3177)) ([d5a4052](https://github.com/dynamic-labs/DynamicAuth/commit/d5a4052ce6547289fff08ba57728af227d334dfa))
+
+
+### Bug Fixes
+
+* end connector session when unlinking from bridge ([#3120](https://github.com/dynamic-labs/DynamicAuth/issues/3120)) ([#3179](https://github.com/dynamic-labs/DynamicAuth/issues/3179)) ([d1f9898](https://github.com/dynamic-labs/DynamicAuth/commit/d1f9898fd678c9b342afe0dc1ea9ab21914c610f))
+* **bridge:** update address when switching networks ([#3171](https://github.com/dynamic-labs/DynamicAuth/issues/3171)) ([#3181](https://github.com/dynamic-labs/DynamicAuth/issues/3181)) ([0e138e0](https://github.com/dynamic-labs/DynamicAuth/commit/0e138e0f824cda7e67f6ffce3057deb0a92ee7ae))
+
+### [0.18.100-viem.11](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.100-viem.10...v0.18.100-viem.11) (2023-08-29)
+
+
+### Bug Fixes
+
+* **bridge:** connect L2 wallet after updating network ([#3164](https://github.com/dynamic-labs/DynamicAuth/issues/3164)) ([b775408](https://github.com/dynamic-labs/DynamicAuth/commit/b775408f98c1436383ae781dffb4a832f86a7d0d))
+* resend magic OTP on back click ([#3123](https://github.com/dynamic-labs/DynamicAuth/issues/3123)) ([#3151](https://github.com/dynamic-labs/DynamicAuth/issues/3151)) ([eee2b0c](https://github.com/dynamic-labs/DynamicAuth/commit/eee2b0c0db0d9538b39c8e6ee76baf36c3479af5))
+* **WagmiConnector:** sync wagmi with wallet connector events ([#3160](https://github.com/dynamic-labs/DynamicAuth/issues/3160)) ([5618903](https://github.com/dynamic-labs/DynamicAuth/commit/561890334f4ae28ffaf40f02d793da75865a0885)), closes [#3149](https://github.com/dynamic-labs/DynamicAuth/issues/3149)
+
 ### [0.18.100-viem.10](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.100-viem.9...v0.18.100-viem.10) (2023-08-25)
 
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.18.100-viem.10";
+var version = "0.18.100-viem.12";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.27",

package/package.js

@@ -1,4 +1,4 @@
-var version = "0.18.100-viem.10";
+var version = "0.18.100-viem.12";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.27",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.18.100-viem.10",
+  "version": "0.18.100-viem.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -15,13 +15,13 @@
     "yup": "0.32.11",
     "formik": "2.2.9",
     "qrcode": "1.5.1",
-    "@dynamic-labs/logger": "0.18.100-viem.10",
-    "@dynamic-labs/multi-wallet": "0.18.100-viem.10",
-    "@dynamic-labs/rpc-providers": "0.18.100-viem.10",
-    "@dynamic-labs/types": "0.18.100-viem.10",
-    "@dynamic-labs/utils": "0.18.100-viem.10",
-    "@dynamic-labs/wallet-book": "0.18.100-viem.10",
-    "@dynamic-labs/wallet-connector-core": "0.18.100-viem.10",
+    "@dynamic-labs/logger": "0.18.100-viem.12",
+    "@dynamic-labs/multi-wallet": "0.18.100-viem.12",
+    "@dynamic-labs/rpc-providers": "0.18.100-viem.12",
+    "@dynamic-labs/types": "0.18.100-viem.12",
+    "@dynamic-labs/utils": "0.18.100-viem.12",
+    "@dynamic-labs/wallet-book": "0.18.100-viem.12",
+    "@dynamic-labs/wallet-connector-core": "0.18.100-viem.12",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/context/DynamicContext/DynamicContext.cjs

@@ -101,7 +101,7 @@ const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = React.createContext(undefined);
 const DynamicContextProvider = ({ children, theme, settings, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, } = settings;
+    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, deepLinkPreference = 'native', walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, } = settings;
     // The following event related methods are temporary and should be removed after QNTM-180 is done
     // ============ START REMOVE AFTER QNTM-180 ============
     const internalEventsRef = React.useRef(internalEvents.getInternalEvents());
@@ -174,6 +174,7 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
     const { wallets } = useWallets.useWallets({
         appLogoUrl,
         appName,
+        deepLinkPreference,
         flowNetwork,
         networkConfigurations: serverNetworkConfigurations,
         projectSettings,

package/src/lib/context/DynamicContext/DynamicContext.d.ts

@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 import { LogLevel } from '@dynamic-labs/logger';
 import { EvmNetwork, SocialProviderFilter } from '@dynamic-labs/types';
-import { WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
+import { DeepLinkVariant, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
 import { AccessDeniedCustomButton, AuthModeType, ChainToWalletMap, DynamicEventsCallbacks, WalletOption } from '../../shared';
 import { SocialNetworkIconType } from '../../utils/functions/getSocialNetworkIcon';
 import { ThemeData, ThemeSetting } from '../ThemeContext';
@@ -19,6 +19,15 @@ export interface DynamicContextProps {
         appName?: string;
         cssOverrides?: string | JSX.Element;
         debugError?: boolean;
+        /**
+         * Used to control the type of deep link used when connecting
+         * a mobile wallet. Defaults to 'native'. This is useful for
+         * example if your app is running in a webview of a native
+         * mobile app, and you want to be able to link out to any
+         * wallet without having to modify your iOS build config.
+         * In this case, you can set this to 'universal'.
+         */
+        deepLinkPreference?: DeepLinkVariant;
         defaultNumberOfWalletsToShow?: number;
         displaySiweStatement?: boolean;
         enableVisitTrackingOnConnectOnly?: boolean;

package/src/lib/context/DynamicContext/DynamicContext.js

@@ -97,7 +97,7 @@ const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = createContext(undefined);
 const DynamicContextProvider = ({ children, theme, settings, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, } = settings;
+    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, deepLinkPreference = 'native', walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, } = settings;
     // The following event related methods are temporary and should be removed after QNTM-180 is done
     // ============ START REMOVE AFTER QNTM-180 ============
     const internalEventsRef = useRef(getInternalEvents());
@@ -170,6 +170,7 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
     const { wallets } = useWallets({
         appLogoUrl,
         appName,
+        deepLinkPreference,
         flowNetwork,
         networkConfigurations: serverNetworkConfigurations,
         projectSettings,

package/src/lib/context/ErrorContext/ErrorContext.cjs

@@ -20,6 +20,7 @@ const errorMessageMap = {
     'missing-nonce': 'Something went wrong. Please try again.',
     'missing-public-address': 'Connection cancelled. Please try again',
     too_many_email_verification_attempts: 'Too many email verification attempts, please try again later',
+    'user-cancelled': '',
     wallet_not_deployed: 'Your smart wallet has not been deployed.',
     wrong_email_verification_token: 'The code you entered is incorrect. Please try again.',
 };

package/src/lib/context/ErrorContext/ErrorContext.js

@@ -16,6 +16,7 @@ const errorMessageMap = {
     'missing-nonce': 'Something went wrong. Please try again.',
     'missing-public-address': 'Connection cancelled. Please try again',
     too_many_email_verification_attempts: 'Too many email verification attempts, please try again later',
+    'user-cancelled': '',
     wallet_not_deployed: 'Your smart wallet has not been deployed.',
     wrong_email_verification_token: 'The code you entered is incorrect. Please try again.',
 };

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
 var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
@@ -15,7 +16,6 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
@@ -32,7 +32,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain, connectedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], connectedWallets, isBridgeFlow, selectedWalletConnector, walletsByChain, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -42,7 +42,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         setIsSingleWalletAccount,
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
@@ -72,22 +72,32 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             }
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
-                // we don't want to re-calculate wallets to connect state if wallet is already connected.
-                // it may happen when user switch network in connect flow on already connected wallet
-                const isAlreadyConnected = connectedWallets.find((wallet) => walletConnectorCore.isSameAddress(publicWalletAddress, wallet.address, wallet.chain));
-                if (shouldUpdateWallets && !isAlreadyConnected) {
-                    handleWalletsToConnect();
+                if (isBridgeFlow) {
+                    const didConnectLastWallet = (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.connectedChain) ===
+                        ((_a = utils.last(walletsByChain || [])) === null || _a === void 0 ? void 0 : _a.chain);
+                    // we don't want to re-calculate wallets to connect state if wallet is already connected.
+                    // it may happen when user switch network in connect flow on already connected wallet
+                    const isAlreadyConnected = connectedWallets.find((wallet) => walletConnectorCore.isSameAddress(publicWalletAddress, wallet.address, wallet.chain));
+                    if (shouldUpdateWallets &&
+                        (!isAlreadyConnected || didConnectLastWallet)) {
+                        handleWalletsToConnect();
+                    }
+                    if (isAlreadyConnected && !didConnectLastWallet) {
+                        setView('bridge-next-wallet-connection');
+                    }
                 }
-                if (isAlreadyConnected) {
-                    setView('bridge-next-wallet-connection');
+                else {
+                    if (shouldUpdateWallets) {
+                        handleWalletsToConnect();
+                    }
                 }
-                if (!isFullyConnected || (walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)) {
+                if (!isFullyConnected || walletsToConnectByChain.length) {
                     setCallback('connectSuccess');
                 }
                 return;
             }
             setCallback('connectSuccess');
-            if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
+            if ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _b === void 0 ? void 0 : _b.enabled) {
                 setView('captcha');
                 return;
             }
@@ -105,11 +115,16 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             });
         }
         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());
+            const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
+            if (!userCancelled)
+                logger.logger.debug(err);
+            setErrorMessage((_c = err === null || err === void 0 ? void 0 : err.code) === null || _c === void 0 ? void 0 : _c.toString());
             goToInitialView();
-            // Since auth failed, lower flag
-            setIsVerificationInProgress(false);
+            // Since auth failed, clear verification flag
+            // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid
+            // clearing again since that would trigger a warning
+            if (!userCancelled)
+                setIsVerificationInProgress(false);
             return;
         }
     });

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

@@ -1,5 +1,6 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector, isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { last } from '@dynamic-labs/utils';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
@@ -11,7 +12,6 @@ import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import 'react';
 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';
@@ -28,7 +28,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain, connectedWallets, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], connectedWallets, isBridgeFlow, selectedWalletConnector, walletsByChain, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -38,7 +38,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         setIsSingleWalletAccount,
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
@@ -68,22 +68,32 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             }
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
-                // we don't want to re-calculate wallets to connect state if wallet is already connected.
-                // it may happen when user switch network in connect flow on already connected wallet
-                const isAlreadyConnected = connectedWallets.find((wallet) => isSameAddress(publicWalletAddress, wallet.address, wallet.chain));
-                if (shouldUpdateWallets && !isAlreadyConnected) {
-                    handleWalletsToConnect();
+                if (isBridgeFlow) {
+                    const didConnectLastWallet = (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.connectedChain) ===
+                        ((_a = last(walletsByChain || [])) === null || _a === void 0 ? void 0 : _a.chain);
+                    // we don't want to re-calculate wallets to connect state if wallet is already connected.
+                    // it may happen when user switch network in connect flow on already connected wallet
+                    const isAlreadyConnected = connectedWallets.find((wallet) => isSameAddress(publicWalletAddress, wallet.address, wallet.chain));
+                    if (shouldUpdateWallets &&
+                        (!isAlreadyConnected || didConnectLastWallet)) {
+                        handleWalletsToConnect();
+                    }
+                    if (isAlreadyConnected && !didConnectLastWallet) {
+                        setView('bridge-next-wallet-connection');
+                    }
                 }
-                if (isAlreadyConnected) {
-                    setView('bridge-next-wallet-connection');
+                else {
+                    if (shouldUpdateWallets) {
+                        handleWalletsToConnect();
+                    }
                 }
-                if (!isFullyConnected || (walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)) {
+                if (!isFullyConnected || walletsToConnectByChain.length) {
                     setCallback('connectSuccess');
                 }
                 return;
             }
             setCallback('connectSuccess');
-            if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
+            if ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _b === void 0 ? void 0 : _b.enabled) {
                 setView('captcha');
                 return;
             }
@@ -101,11 +111,16 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             });
         }
         catch (err) {
-            logger.debug(err);
-            setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
+            const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
+            if (!userCancelled)
+                logger.debug(err);
+            setErrorMessage((_c = err === null || err === void 0 ? void 0 : err.code) === null || _c === void 0 ? void 0 : _c.toString());
             goToInitialView();
-            // Since auth failed, lower flag
-            setIsVerificationInProgress(false);
+            // Since auth failed, clear verification flag
+            // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid
+            // clearing again since that would trigger a warning
+            if (!userCancelled)
+                setIsVerificationInProgress(false);
             return;
         }
     });

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

@@ -47,12 +47,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             const walletNetwork = yield walletConnector.getNetwork();
             const walletChain = walletConnector.connectedChain;
             const walletObject = {
-                address: 
-                // We use `storedConnectedWalletInfo.lastWalletAddress` as a workaround to Braavos issue
-                // Braavos during initialization returns an empty string as a wallet address
-                walletAddress ||
-                    storedConnectedWalletInfo.lastWalletAddress ||
-                    '',
+                address: walletAddress || '',
                 chain: walletChain || '',
                 connected: true,
                 connector: walletConnector,
@@ -89,11 +84,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     }, [connectedWallets]);
     const connectedWallet = connectedWallets[0] || null;
     // Keeps connected wallet data inside localStorage
-    const applyConnectedWalletToStore = ({ walletId, walletAddress, walletConnectorKey, walletChain, provider, }) => {
+    const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {
         const nextConnectedWalletsInfo = [...connectedWalletsInfo];
         nextConnectedWalletsInfo.push({
             id: walletId,
-            lastWalletAddress: walletAddress,
             provider,
             walletChain,
             walletConnectorKey,
@@ -124,10 +118,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             walletConnectorCore.logger.error('Could not refresh the wallet. The wallet address is not available');
             return;
         }
-        const currentWalletConnectoNetwork = yield walletConnector.getNetwork();
+        const currentWalletConnectorNetwork = yield walletConnector.getNetwork();
         updateConnectedWalletById(walletId, {
             address: currentWalletConnectorAddress,
-            network: currentWalletConnectoNetwork,
+            network: currentWalletConnectorNetwork,
         });
     });
     const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
@@ -183,14 +177,16 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         }
         return Promise.resolve(publicWalletAddress);
     });
-    const unlinkConnectedWallet = (walletId) => {
+    const unlinkConnectedWallet = (walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const connectedWalletToUnlink = connectedWallets.find((wallet) => wallet.id === walletId);
+        yield (connectedWalletToUnlink === null || connectedWalletToUnlink === void 0 ? void 0 : connectedWalletToUnlink.connector.endSession());
         const filteredWallets = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
         if (walletId === primaryWalletId) {
             clearPrimaryWalletId();
         }
         setConnectedWalletsInfo(filteredWallets);
         onUnlink === null || onUnlink === void 0 ? void 0 : onUnlink(walletId, filteredWallets);
-    };
+    });
     const getConnectedWalletById = React.useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {
         connectWallet,

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

@@ -6,7 +6,6 @@ export type ConnectedWalletConnectorType = {
     walletChain?: Chain;
     walletConnectorKey: string;
     provider: string;
-    lastWalletAddress?: string;
 };
 type Props = {
     authMode: AuthModeType;
@@ -28,6 +27,6 @@ export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enable
     getConnectedWalletById: (walletId: string) => Wallet | undefined;
     refreshConnectedWallet: (walletId: string, walletConnector: WalletConnector) => Promise<void>;
     removeConnectedWalletsInfo: () => void;
-    unlinkConnectedWallet: (walletId: string) => void;
+    unlinkConnectedWallet: (walletId: string) => Promise<void>;
 };
 export {};

package/src/lib/utils/hooks/useConnectWallet/useConnectWallet.js

@@ -43,12 +43,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             const walletNetwork = yield walletConnector.getNetwork();
             const walletChain = walletConnector.connectedChain;
             const walletObject = {
-                address: 
-                // We use `storedConnectedWalletInfo.lastWalletAddress` as a workaround to Braavos issue
-                // Braavos during initialization returns an empty string as a wallet address
-                walletAddress ||
-                    storedConnectedWalletInfo.lastWalletAddress ||
-                    '',
+                address: walletAddress || '',
                 chain: walletChain || '',
                 connected: true,
                 connector: walletConnector,
@@ -85,11 +80,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     }, [connectedWallets]);
     const connectedWallet = connectedWallets[0] || null;
     // Keeps connected wallet data inside localStorage
-    const applyConnectedWalletToStore = ({ walletId, walletAddress, walletConnectorKey, walletChain, provider, }) => {
+    const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {
         const nextConnectedWalletsInfo = [...connectedWalletsInfo];
         nextConnectedWalletsInfo.push({
             id: walletId,
-            lastWalletAddress: walletAddress,
             provider,
             walletChain,
             walletConnectorKey,
@@ -120,10 +114,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             logger.error('Could not refresh the wallet. The wallet address is not available');
             return;
         }
-        const currentWalletConnectoNetwork = yield walletConnector.getNetwork();
+        const currentWalletConnectorNetwork = yield walletConnector.getNetwork();
         updateConnectedWalletById(walletId, {
             address: currentWalletConnectorAddress,
-            network: currentWalletConnectoNetwork,
+            network: currentWalletConnectorNetwork,
         });
     });
     const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
@@ -179,14 +173,16 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         }
         return Promise.resolve(publicWalletAddress);
     });
-    const unlinkConnectedWallet = (walletId) => {
+    const unlinkConnectedWallet = (walletId) => __awaiter(void 0, void 0, void 0, function* () {
+        const connectedWalletToUnlink = connectedWallets.find((wallet) => wallet.id === walletId);
+        yield (connectedWalletToUnlink === null || connectedWalletToUnlink === void 0 ? void 0 : connectedWalletToUnlink.connector.endSession());
         const filteredWallets = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
         if (walletId === primaryWalletId) {
             clearPrimaryWalletId();
         }
         setConnectedWalletsInfo(filteredWallets);
         onUnlink === null || onUnlink === void 0 ? void 0 : onUnlink(walletId, filteredWallets);
-    };
+    });
     const getConnectedWalletById = useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {
         connectWallet,

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

@@ -6,7 +6,7 @@ var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
 var verifyMagicIsSetup = require('./utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
+const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
     const wallets = React.useMemo(() => {
         if (!projectSettings || !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length)
             return [];
@@ -14,6 +14,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             appLogoUrl,
             appName,
             customerApiProviders: projectSettings.providers || [],
+            deepLinkPreference,
             flowNetwork,
             networkConfigurations,
             skipMemo: true,
@@ -26,6 +27,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             appLogoUrl,
             appName,
             customerApiProviders: projectSettings.providers || [],
+            deepLinkPreference,
             flowNetwork,
             networkConfigurations,
             skipMemo: true,

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

@@ -1,10 +1,11 @@
 import { ProjectSettings } from '@dynamic-labs/sdk-api';
 import { NetworkConfigurationMap, WalletUiUtils } from '@dynamic-labs/types';
-import { WalletConnector, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
+import { DeepLinkVariant, WalletConnector, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 type Props = {
     appLogoUrl?: string;
     appName?: string;
+    deepLinkPreference?: DeepLinkVariant;
     flowNetwork?: 'mainnet' | 'testnet';
     networkConfigurations: NetworkConfigurationMap | undefined;
     projectSettings: ProjectSettings | undefined;
@@ -13,7 +14,7 @@ type Props = {
     walletConnectorsProp?: WalletConnectorsMethod[];
     walletUiUtils: WalletUiUtils<WalletConnector>;
 };
-export declare const useWallets: ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }: Props) => {
+export declare const useWallets: ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }: Props) => {
     wallets: import("../../../shared").WalletOption[];
 };
 export {};

package/src/lib/utils/hooks/useWallets/useWallets.js

@@ -2,7 +2,7 @@ import { useMemo, useEffect } from 'react';
 import { getInstalledWallets, getNotInstalledWallets } from '../../../views/WalletList/data.js';
 import { verifyMagicIsSetup } from './utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
+const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
     const wallets = useMemo(() => {
         if (!projectSettings || !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length)
             return [];
@@ -10,6 +10,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             appLogoUrl,
             appName,
             customerApiProviders: projectSettings.providers || [],
+            deepLinkPreference,
             flowNetwork,
             networkConfigurations,
             skipMemo: true,
@@ -22,6 +23,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             appLogoUrl,
             appName,
             customerApiProviders: projectSettings.providers || [],
+            deepLinkPreference,
             flowNetwork,
             networkConfigurations,
             skipMemo: true,