@dynamic-labs/sdk-react-core 0.19.0-alpha.6 → 0.19.0-alpha.8

package/src/lib/utils/functions/getSocialSignInProviderFromString/getSocialSignInProviderFromString.js

@@ -0,0 +1,15 @@
+import { SocialSignInProviderEnum } from '@dynamic-labs/sdk-api';
+
+const getSocialSignInProviderFromString = (provider) => {
+    if (!provider)
+        return;
+    const values = Object.values(SocialSignInProviderEnum);
+    for (const value of values) {
+        if (value === provider) {
+            return value;
+        }
+    }
+    return undefined;
+};
+
+export { getSocialSignInProviderFromString };

package/src/lib/utils/functions/getSocialSignInProviderFromString/index.d.ts

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

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

@@ -29,3 +29,8 @@ export * from './digestSHA256';
 export * from './encodeBase64URL';
 export * from './getRedirectURIOrigin';
 export * from './sendTransactionWithAutoNonce';
+export * from './getProviderEnumForSocialSignInProvider';
+export * from './getEnabledSocialSignInProvidersAsProviderEnum';
+export * from './getActiveOauthCredential';
+export * from './getSocialSignInProviderForProviderEnum';
+export * from './getSocialSignInProviderFromString';

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/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)
@@ -97,8 +97,12 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
                     handleLogOut();
                     return;
                 }
-                setShowAuthFlow(true);
-                setView('wallet-locked-view');
+                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)
@@ -93,8 +93,12 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
                     handleLogOut();
                     return;
                 }
-                setShowAuthFlow(true);
-                setView('wallet-locked-view');
+                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' ||
@@ -39,7 +39,8 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'email-wallet-otp-verification-view' &&
         view !== 'bridge-welcome' &&
         view !== 'bridge-summary' &&
-        view !== 'bridge-next-wallet-connection';
+        view !== 'bridge-next-wallet-connection' &&
+        view !== 'social-redirect-view';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view === 'wallet-list' ||
             view === 'qr-code' ||

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' ||
@@ -35,7 +35,8 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'email-wallet-otp-verification-view' &&
         view !== 'bridge-welcome' &&
         view !== 'bridge-summary' &&
-        view !== 'bridge-next-wallet-connection';
+        view !== 'bridge-next-wallet-connection' &&
+        view !== 'social-redirect-view';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view === 'wallet-list' ||
             view === 'qr-code' ||

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

@@ -37,7 +37,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return;
         }
         const nextConnectedWallets = (yield Promise.all(connectedWalletsInfo.map((storedConnectedWalletInfo) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            const walletConnector = walletConnectorCore.getWalletConnectorByName(walletConnectors, storedConnectedWalletInfo.walletConnectorKey);
+            const walletConnector = walletConnectorCore.getWalletConnectorByKey(walletConnectors, storedConnectedWalletInfo.walletConnectorKey);
             if (!walletConnector) {
                 walletConnectorCore.logger.error('Could not find walletConnector: ' +
                     storedConnectedWalletInfo.walletConnectorKey);
@@ -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;
@@ -155,7 +149,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             setPrimaryWalletId(walletId);
         }
         const walletChain = walletConnector.connectedChain;
-        const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.name);
+        const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.key);
         if (isWalletStored) {
             yield updateConnectedWalletsList();
         }
@@ -164,7 +158,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 provider: getWalletProvider.getWalletProvider(walletConnector),
                 walletAddress: publicWalletAddress,
                 walletChain,
-                walletConnectorKey: walletConnector.name,
+                walletConnectorKey: walletConnector.key,
                 walletId,
             });
             if (!shouldSkipCreatingVisit) {
@@ -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 {};