@dynamic-labs/sdk-react-core 0.18.100-viem.3 → 0.18.100-viem.30

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

@@ -0,0 +1,43 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+
+const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
+/**
+ * Sends a transaction with an automatically determined nonce, if not provided.
+ *
+ * In Ethereum, each transaction sent from a particular address must have a unique nonce.
+ * If the transaction does not already have a nonce, this function helps to automatically set it.
+ * If a transaction with a particular nonce fails due to a "could not replace transaction" error,
+ * this function will automatically retry with the next nonce.
+ *
+ * @param connector - A Dynamic connector to interact with the Ethereum network.
+ * @param transaction - The transaction details.
+ * @param sendTransactionHandler - A handler function to send the transaction.
+ *
+ * @returns A promise that resolves to the transaction response.
+ */
+const sendTransactionWithAutoNonce = (connector, transaction, sendTransactionHandler) => __awaiter(void 0, void 0, void 0, function* () {
+    if (transaction.nonce !== undefined) {
+        return sendTransactionHandler(transaction);
+    }
+    const publicClient = yield connector.getRpcProvider();
+    const walletClient = yield connector.getSigner();
+    const [address] = yield walletClient.getAddresses();
+    const nonce = yield publicClient.getTransactionCount({
+        address,
+    });
+    const transactionWithNonce = Object.assign(Object.assign({}, transaction), { nonce });
+    try {
+        const response = yield sendTransactionHandler(transactionWithNonce);
+        return response;
+    }
+    catch (err) {
+        if (err.code ===
+            MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE) {
+            const transactionWithNextNonce = Object.assign(Object.assign({}, transaction), { nonce: nonce + 1 });
+            return sendTransactionHandler(transactionWithNextNonce);
+        }
+        throw err;
+    }
+});
+
+export { MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE, sendTransactionWithAutoNonce };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.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, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -75,7 +75,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 if (shouldUpdateWallets) {
                     handleWalletsToConnect();
                 }
-                if (!isFullyConnected || (walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)) {
+                if (!isFullyConnected || walletsToConnectByChain.length) {
                     setCallback('connectSuccess');
                 }
                 return;
@@ -99,11 +99,16 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             });
         }
         catch (err) {
-            logger.logger.debug(err);
+            const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
+            if (!userCancelled)
+                logger.logger.debug(err);
             setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.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

@@ -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, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -71,7 +71,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 if (shouldUpdateWallets) {
                     handleWalletsToConnect();
                 }
-                if (!isFullyConnected || (walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)) {
+                if (!isFullyConnected || walletsToConnectByChain.length) {
                     setCallback('connectSuccess');
                 }
                 return;
@@ -95,11 +95,16 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             });
         }
         catch (err) {
-            logger.debug(err);
+            const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
+            if (!userCancelled)
+                logger.debug(err);
             setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.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)
@@ -93,8 +93,16 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
             }
             // 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();
             }
         });
     }, [
@@ -111,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)
@@ -89,8 +89,16 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
             }
             // 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();
             }
         });
     }, [
@@ -107,6 +115,7 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
         setShowAuthFlow,
         authMode,
         isAuthenticated,
+        showLockedWalletView,
     ]);
 };
 

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,
@@ -120,18 +114,13 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 return;
             }
         }
-        if (!currentWalletConnectorAddress) {
-            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 +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
+                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,
@@ -116,18 +110,13 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 return;
             }
         }
-        if (!currentWalletConnectorAddress) {
-            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 +153,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/useConnectedWalletsNetworkValidation/useConnectedWalletsNetworkValidation.cjs

@@ -22,7 +22,7 @@ var isProgrammableNetworkSwitchSupported = require('../../functions/isProgrammab
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { view, setView } = ViewContext.useViewContext();
+    const { setView } = ViewContext.useViewContext();
     React.useEffect(() => {
         if (!isBridgeFlow) {
             return;
@@ -53,16 +53,17 @@ const useConnectedWalletsNetworkValidation = () => {
             }
             setView(networkNotSupportedView);
         }
+        // we need it to remove 'showAuthFlow' property. we don't want to react to it,
+        // because closing modal on network switch causes it to re-open
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        isBridgeFlow,
         connectedWallets,
-        view,
+        isBridgeFlow,
         selectedWalletConnector,
-        walletsToConnectByChain,
-        showAuthFlow,
-        setView,
         setSelectedWalletConnector,
         setShowAuthFlow,
+        setView,
+        walletsToConnectByChain,
     ]);
 };
 

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

@@ -18,7 +18,7 @@ import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgramm
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext();
-    const { view, setView } = useViewContext();
+    const { setView } = useViewContext();
     useEffect(() => {
         if (!isBridgeFlow) {
             return;
@@ -49,16 +49,17 @@ const useConnectedWalletsNetworkValidation = () => {
             }
             setView(networkNotSupportedView);
         }
+        // we need it to remove 'showAuthFlow' property. we don't want to react to it,
+        // because closing modal on network switch causes it to re-open
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        isBridgeFlow,
         connectedWallets,
-        view,
+        isBridgeFlow,
         selectedWalletConnector,
-        walletsToConnectByChain,
-        showAuthFlow,
-        setView,
         setSelectedWalletConnector,
         setShowAuthFlow,
+        setView,
+        walletsToConnectByChain,
     ]);
 };
 

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

@@ -44,7 +44,16 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
             environmentId &&
             retries < maxRetries) {
             setLoading(true);
-            api.sendDynamicProps(environmentId, { dynamicContextProps });
+            // we ReactNode components are not being serialized properly
+            // remove them for now and deal with them later
+            // context: https://linear.app/dynamic-labs/issue/GVTY-328/[starknet]-sdk-api-is-not-serializing-react-components
+            // future work: https://linear.app/dynamic-labs/issue/GVTY-330/bug-figure-out-why-react-components-are-not
+            const updatedDynamicProps = {
+                settings: Object.assign(Object.assign({}, dynamicContextProps.settings), { customPrivacyPolicy: Boolean(dynamicContextProps.settings.customPrivacyPolicy), customTermsOfServices: Boolean(dynamicContextProps.settings.customTermsOfServices), policiesConsentInnerComponent: Boolean(dynamicContextProps.settings.policiesConsentInnerComponent) }),
+            };
+            api.sendDynamicProps(environmentId, {
+                dynamicContextProps: updatedDynamicProps,
+            });
             api.fetchProjectSettings(environmentId)
                 .then((response) => {
                 if (!response)

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

@@ -40,7 +40,16 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
             environmentId &&
             retries < maxRetries) {
             setLoading(true);
-            sendDynamicProps(environmentId, { dynamicContextProps });
+            // we ReactNode components are not being serialized properly
+            // remove them for now and deal with them later
+            // context: https://linear.app/dynamic-labs/issue/GVTY-328/[starknet]-sdk-api-is-not-serializing-react-components
+            // future work: https://linear.app/dynamic-labs/issue/GVTY-330/bug-figure-out-why-react-components-are-not
+            const updatedDynamicProps = {
+                settings: Object.assign(Object.assign({}, dynamicContextProps.settings), { customPrivacyPolicy: Boolean(dynamicContextProps.settings.customPrivacyPolicy), customTermsOfServices: Boolean(dynamicContextProps.settings.customTermsOfServices), policiesConsentInnerComponent: Boolean(dynamicContextProps.settings.policiesConsentInnerComponent) }),
+            };
+            sendDynamicProps(environmentId, {
+                dynamicContextProps: updatedDynamicProps,
+            });
             fetchProjectSettings(environmentId)
                 .then((response) => {
                 if (!response)

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

@@ -6,7 +6,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 
 const useHandleWalletsToConnect = () => {
-    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, selectedWalletConnector, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const handleWalletsToConnect = () => {
         if (!walletsToConnectByChain) {
@@ -19,6 +19,20 @@ const useHandleWalletsToConnect = () => {
             setShowAuthFlow(false);
             return goToInitialView();
         }
+        if (!selectedWalletConnector || !selectedWalletConnector.connectedChain) {
+            setShowAuthFlow(false);
+            return goToInitialView();
+        }
+        // Assuming based on the logic above that we have at least one more chain/wallet to connect
+        // If the current connected wallet is already connected to the bridge,
+        // we can go directly to bridge-next-wallet-connection since we know there is a different chain to connect
+        const walletChainsToConnect = walletsToConnectByChain
+            .filter((wallet) => wallet.numberOfWallets > 0)
+            .map((wallet) => wallet.chain.toString());
+        if (!walletChainsToConnect.includes(selectedWalletConnector.connectedChain)) {
+            setView('bridge-next-wallet-connection');
+            return;
+        }
         const [firstWallet, ...restOfTheWallets] = walletsToConnectByChain;
         if (firstWallet.numberOfWallets > 1) {
             const updatedWallets = [