@dynamic-labs/sdk-react-core 0.19.0-alpha.5 → 0.19.0-alpha.7

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/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
@@ -10,7 +11,6 @@ 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');
@@ -23,7 +23,7 @@ require('../../../../shared/consts/index.cjs');
 const useSignConnectOnlyUser = () => {
     const { setView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
         displaySiweStatement,
@@ -33,6 +33,10 @@ const useSignConnectOnlyUser = () => {
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         try {
+            if (walletConnectorCore.isEmbeddedConnector(walletConnector) &&
+                !walletConnectorCore.isBloctoConnector(walletConnector)) {
+                walletUiUtils.disabledConfirmationOnce();
+            }
             // Prepare states to show the pending signature view (without back button)
             // We need this because in connect-only we don't want to show wallet-list
             // We don't want to show the back button in the pending signature view

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

@@ -1,4 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { isEmbeddedConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
@@ -6,7 +7,6 @@ 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';
@@ -19,7 +19,7 @@ import '../../../../shared/consts/index.js';
 const useSignConnectOnlyUser = () => {
     const { setView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
-    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, walletUiUtils, } = useInternalDynamicContext();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
         displaySiweStatement,
@@ -29,6 +29,10 @@ const useSignConnectOnlyUser = () => {
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
         try {
+            if (isEmbeddedConnector(walletConnector) &&
+                !isBloctoConnector(walletConnector)) {
+                walletUiUtils.disabledConfirmationOnce();
+            }
             // Prepare states to show the pending signature view (without back button)
             // We need this because in connect-only we don't want to show wallet-list
             // We don't want to show the back button in the pending signature view

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

@@ -10,8 +10,8 @@ var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var errors = require('../../../constants/errors.cjs');
 
-const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync = true, authMode, }) => {
-    const { setShowAuthFlow, isAuthenticated } = useInternalDynamicContext.useInternalDynamicContext();
+const useSyncPrimaryWallet = (canSync = true) => {
+    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
         if (!primaryWallet)
@@ -91,14 +91,18 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
                 computeConnectedStateForWallets();
                 return;
             }
-            if (!primaryWallet.connector.isInstalledOnBrowser()) {
-                handleLogOut();
-                return;
-            }
             // user is logged in (has valid jwt), but no wallet is connected
             if (isAuthenticated && e.code === errors.MISSING_ADDRESS_ERROR) {
-                setShowAuthFlow(true);
-                setView('wallet-locked-view');
+                if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    handleLogOut();
+                    return;
+                }
+                if (showLockedWalletView) {
+                    setShowAuthFlow(true);
+                    setView('wallet-locked-view');
+                    return;
+                }
+                handleLogOut();
             }
         });
     }, [
@@ -115,6 +119,7 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
         setShowAuthFlow,
         authMode,
         isAuthenticated,
+        showLockedWalletView,
     ]);
 };
 

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.d.ts

@@ -1,19 +1 @@
-import { Dispatch, SetStateAction } from 'react';
-import { FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { AuthModeType, MultiWalletWidgetState, Wallet } from '../../../../shared/types';
-import { MultiWalletWidgetStateSetter } from '../useMultiWalletWidgetState';
-export type UseSyncPrimaryWalletArgs = {
-    canSync?: boolean;
-    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, shouldCallCallback?: boolean) => Promise<string | undefined>;
-    computeConnectedStateForWallets: () => Promise<void>;
-    handleLogOut: () => Promise<void>;
-    multiWalletWidgetState: MultiWalletWidgetState;
-    primaryWallet: Wallet | null;
-    secondaryWallets: Wallet[];
-    setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
-    setPrimaryWallet: (walletId: string) => Promise<void>;
-    setShowWidgetStatePopup: Dispatch<SetStateAction<boolean>>;
-    showWidgetStatePopup: boolean;
-    authMode: AuthModeType;
-};
-export declare const useSyncPrimaryWallet: ({ connectWallet, computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync, authMode, }: UseSyncPrimaryWalletArgs) => void;
+export declare const useSyncPrimaryWallet: (canSync?: boolean) => void;

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

@@ -6,8 +6,8 @@ import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import { MISSING_ADDRESS_ERROR } from '../../../constants/errors.js';
 
-const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync = true, authMode, }) => {
-    const { setShowAuthFlow, isAuthenticated } = useInternalDynamicContext();
+const useSyncPrimaryWallet = (canSync = true) => {
+    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
         if (!primaryWallet)
@@ -87,14 +87,18 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
                 computeConnectedStateForWallets();
                 return;
             }
-            if (!primaryWallet.connector.isInstalledOnBrowser()) {
-                handleLogOut();
-                return;
-            }
             // user is logged in (has valid jwt), but no wallet is connected
             if (isAuthenticated && e.code === MISSING_ADDRESS_ERROR) {
-                setShowAuthFlow(true);
-                setView('wallet-locked-view');
+                if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    handleLogOut();
+                    return;
+                }
+                if (showLockedWalletView) {
+                    setShowAuthFlow(true);
+                    setView('wallet-locked-view');
+                    return;
+                }
+                handleLogOut();
             }
         });
     }, [
@@ -111,6 +115,7 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
         setShowAuthFlow,
         authMode,
         isAuthenticated,
+        showLockedWalletView,
     ]);
 };
 

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

@@ -7,14 +7,14 @@ 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');
+var useDynamicLayoutData = require('../useDynamicLayoutData/useDynamicLayoutData.cjs');
 
 const useAuthLayoutChecks = (walletConnector) => {
     const { view } = ViewContext.useViewContext();
     const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();
     const { showQrCodeMessage, showQrCodeImage } = QrCodeContext.useQrCodeContext();
     const { mockedSDK } = MockContext.useMockContext();
-    const { helpHeaderData } = getDynamicLayoutData.getDynamicLayoutData({ view });
+    const { helpHeaderData } = useDynamicLayoutData.useDynamicLayoutData({ view });
     const isWalletListTypeView = view === 'wallet-connect-mobile-wallets-list' ||
         view === 'wallet-list' ||
         view === 'login-with-email-or-wallet-full-wallet-list' ||

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

@@ -3,14 +3,14 @@ import { useMockContext } from '../../../context/MockContext/MockContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { isUserLinkingWallet } from '../../../shared/utils/functions/isUserLinkingWallet/isUserLinkingWallet.js';
 import { useQrCodeContext } from '../../../context/QrCodeContext/QrCodeContext.js';
-import { getDynamicLayoutData } from '../../functions/getDynamicLayoutData/getDynamicLayoutData.js';
+import { useDynamicLayoutData } from '../useDynamicLayoutData/useDynamicLayoutData.js';
 
 const useAuthLayoutChecks = (walletConnector) => {
     const { view } = useViewContext();
     const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, } = useInternalDynamicContext();
     const { showQrCodeMessage, showQrCodeImage } = useQrCodeContext();
     const { mockedSDK } = useMockContext();
-    const { helpHeaderData } = getDynamicLayoutData({ view });
+    const { helpHeaderData } = useDynamicLayoutData({ view });
     const isWalletListTypeView = view === 'wallet-connect-mobile-wallets-list' ||
         view === 'wallet-list' ||
         view === 'login-with-email-or-wallet-full-wallet-list' ||

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,14 +118,13 @@ 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 = React.useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
-        connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
+    const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!publicWalletAddress) {
@@ -168,31 +161,32 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnectorKey: walletConnector.name,
                 walletId,
             });
+            if (!shouldSkipCreatingVisit) {
+                // send information to backend to kick off background jobs
+                // so verify/sign on the next step could go by more quickly
+                // this is async work, but DO NOT AWAIT
+                api.createVisit({
+                    authMode,
+                    chain: walletChain || '',
+                    environmentId,
+                    publicWalletAddress,
+                    walletName: walletConnector.name,
+                    walletProvider: getWalletProvider.getWalletProvider(walletConnector),
+                });
+            }
         }
-        if (shouldSkipCreatingVisit) {
-            return Promise.resolve(publicWalletAddress);
-        }
-        // send information to backend to kick off background jobs
-        // so verify/sign on the next step could go by more quickly
-        // this is async work, but DO NOT AWAIT
-        api.createVisit({
-            authMode,
-            chain: walletChain || '',
-            environmentId,
-            publicWalletAddress,
-            walletName: walletConnector.name,
-            walletProvider: getWalletProvider.getWalletProvider(walletConnector),
-        });
         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

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useEffect, useMemo } from 'react';
+import { useState, useCallback, useEffect } from 'react';
 import { getWalletConnectorByName, logger } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.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,14 +114,13 @@ 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 = useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
-        connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
+    const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => __awaiter(void 0, void 0, void 0, function* () {
         const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!publicWalletAddress) {
@@ -164,31 +157,32 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnectorKey: walletConnector.name,
                 walletId,
             });
+            if (!shouldSkipCreatingVisit) {
+                // send information to backend to kick off background jobs
+                // so verify/sign on the next step could go by more quickly
+                // this is async work, but DO NOT AWAIT
+                createVisit({
+                    authMode,
+                    chain: walletChain || '',
+                    environmentId,
+                    publicWalletAddress,
+                    walletName: walletConnector.name,
+                    walletProvider: getWalletProvider(walletConnector),
+                });
+            }
         }
-        if (shouldSkipCreatingVisit) {
-            return Promise.resolve(publicWalletAddress);
-        }
-        // send information to backend to kick off background jobs
-        // so verify/sign on the next step could go by more quickly
-        // this is async work, but DO NOT AWAIT
-        createVisit({
-            authMode,
-            chain: walletChain || '',
-            environmentId,
-            publicWalletAddress,
-            walletName: walletConnector.name,
-            walletProvider: getWalletProvider(walletConnector),
-        });
         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/useDynamicLayoutData/useDynamicLayoutData.cjs

@@ -0,0 +1,74 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsxRuntime = require('react/jsx-runtime');
+var reactI18next = require('react-i18next');
+var iconic = require('@dynamic-labs/iconic');
+
+const useDynamicLayoutData = ({ view }) => {
+    const { t } = reactI18next.useTranslation();
+    if (view === 'no-access') {
+        const headerData = {
+            heading: t('dyn_no_access.title'),
+        };
+        return { headerData };
+    }
+    const helpHeaderMap = {
+        'login-with-email-or-wallet-full-wallet-list': {
+            heading: t('dyn_login.helper.all_wallet_list'),
+        },
+        'login-with-wallet-only': {
+            heading: t('dyn_login.helper.wallet_only'),
+        },
+        'pending-connect': {
+            heading: t('dyn_login.helper.pending_connect'),
+        },
+        'pending-signature': {
+            heading: t('dyn_login.helper.pending_signature'),
+        },
+        'pending-signature-without-back-button': {
+            heading: t('dyn_login.helper.pending_signature_without_back_button'),
+        },
+        'qr-code': {
+            heading: t('dyn_login.helper.qr_code.title'),
+        },
+        'wallet-connect-mobile-wallets-list': {
+            heading: t('dyn_wallet_conect.mobile.wallet_list.helper'),
+        },
+        'wallet-list': {
+            heading: t('dyn_wallet_list.helper'),
+        },
+    };
+    const headerMap = {
+        'account-exists': { heading: t('dyn_account_exists.title') },
+        'chainalysis-blocked-wallet': {
+            heading: t('dyn_chainalysis_blocked_wallet.title'),
+        },
+        'login-with-email-or-wallet': { heading: t('dyn_login.title.all') },
+        'login-with-email-or-wallet-full-wallet-list': {
+            heading: t('dyn_login.title.all_wallet_list'),
+        },
+        'login-with-wallet-only': {
+            heading: t('dyn_login.title.wallet_only'),
+        },
+        'multi-wallet-wallet-list': {
+            heading: t('dyn_wallet_list.title.link'),
+        },
+        'wallet-connect-mobile-wallets-list': {
+            heading: (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(iconic.WalletConnectIcon, { style: { height: '1.5rem', width: '1.5rem' } }), ' ', t('dyn_wallet_conect.mobile.wallet_list.title')] })),
+        },
+        'wallet-list': {
+            heading: t('dyn_wallet_list.title.select'),
+        },
+        'wallet-sign': { heading: t('dyn_wallet_transfer.sign.title') },
+    };
+    const helpHeaderData = helpHeaderMap[view];
+    const headerData = headerMap[view];
+    return {
+        headerData,
+        helpHeaderData,
+    };
+};
+
+exports.useDynamicLayoutData = useDynamicLayoutData;

package/src/lib/utils/{functions/getDynamicLayoutData/getDynamicLayoutData.d.ts → hooks/useDynamicLayoutData/useDynamicLayoutData.d.ts}

@@ -9,9 +9,9 @@ interface HeaderContentProps {
 interface DynamicLayoutProps {
     view: ViewType;
 }
-export declare const getDynamicLayoutData: ({ view }: DynamicLayoutProps) => {
+export declare const useDynamicLayoutData: ({ view }: DynamicLayoutProps) => {
     headerData: {
-        heading: string;
+        heading: any;
     };
     helpHeaderData?: undefined;
 } | {