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

package/src/lib/utils/functions/getUserProfileFields/getUserProfileFields.cjs

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var sdkApi = require('@dynamic-labs/sdk-api');
 var index = require('../getEnabledKYC/index.cjs');
 
 /**
@@ -53,19 +54,30 @@ const getNonEditableUserProfileFields = ({ projectSettingsKyc = [], user, }) =>
  * Get all user profile fields that exist in the user profile and are defined in the project
  * @param {Object} options - The function options object.
  * @param {ProjectSettingsKyc[]} options.projectSettingsKyc - The project settings KYC object array.
- * @param {UserFields} options.user - The user profile object.
+ * @param {UserProfile} options.user - The user profile object.
  * @returns {ProjectSettingsKyc[]} - The list of all user profile fields based on project settings.
  */
 const getUserProfileFields = ({ projectSettingsKyc = [], user, }) => {
+    var _a;
     const editableUserProfileFields = getEditableUserProfileFields(projectSettingsKyc);
     const nonEditableUserProfileFields = getNonEditableUserProfileFields({
         projectSettingsKyc,
         user,
     });
-    const concatedList = [
+    let concatedList = [
         ...editableUserProfileFields,
         ...nonEditableUserProfileFields,
     ];
+    const hasEmbeddedWalletLinkedToEmail = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find((credential) => credential.format === sdkApi.JwtVerifiedCredentialFormatEnum.Email &&
+        Boolean(credential.embeddedWalletId));
+    if (hasEmbeddedWalletLinkedToEmail) {
+        concatedList = concatedList.map((field) => {
+            if (field.name !== 'email') {
+                return field;
+            }
+            return Object.assign(Object.assign({}, field), { enabled: false });
+        });
+    }
     return concatedList.sort((a, b) => {
         const indexA = projectSettingsKyc.findIndex((field) => field.name === a.name);
         const indexB = projectSettingsKyc.findIndex((field) => field.name === b.name);

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

@@ -1,4 +1,5 @@
 import { ProjectSettingsKyc, UserFields } from '@dynamic-labs/sdk-api';
+import { UserProfile } from '../../../shared';
 /**
  * Get editable user profile fields based on the project settings.
  * @param {ProjectSettingsKyc[]} projectSettings - The project settings KYC object array.
@@ -20,10 +21,10 @@ export declare const getNonEditableUserProfileFields: ({ projectSettingsKyc, use
  * Get all user profile fields that exist in the user profile and are defined in the project
  * @param {Object} options - The function options object.
  * @param {ProjectSettingsKyc[]} options.projectSettingsKyc - The project settings KYC object array.
- * @param {UserFields} options.user - The user profile object.
+ * @param {UserProfile} options.user - The user profile object.
  * @returns {ProjectSettingsKyc[]} - The list of all user profile fields based on project settings.
  */
 export declare const getUserProfileFields: ({ projectSettingsKyc, user, }: {
     projectSettingsKyc?: ProjectSettingsKyc[] | undefined;
-    user?: UserFields | undefined;
+    user?: UserProfile | undefined;
 }) => ProjectSettingsKyc[];

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

@@ -1,3 +1,4 @@
+import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api';
 import { getEnabledKYC } from '../getEnabledKYC/index.js';
 
 /**
@@ -49,19 +50,30 @@ const getNonEditableUserProfileFields = ({ projectSettingsKyc = [], user, }) =>
  * Get all user profile fields that exist in the user profile and are defined in the project
  * @param {Object} options - The function options object.
  * @param {ProjectSettingsKyc[]} options.projectSettingsKyc - The project settings KYC object array.
- * @param {UserFields} options.user - The user profile object.
+ * @param {UserProfile} options.user - The user profile object.
  * @returns {ProjectSettingsKyc[]} - The list of all user profile fields based on project settings.
  */
 const getUserProfileFields = ({ projectSettingsKyc = [], user, }) => {
+    var _a;
     const editableUserProfileFields = getEditableUserProfileFields(projectSettingsKyc);
     const nonEditableUserProfileFields = getNonEditableUserProfileFields({
         projectSettingsKyc,
         user,
     });
-    const concatedList = [
+    let concatedList = [
         ...editableUserProfileFields,
         ...nonEditableUserProfileFields,
     ];
+    const hasEmbeddedWalletLinkedToEmail = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find((credential) => credential.format === JwtVerifiedCredentialFormatEnum.Email &&
+        Boolean(credential.embeddedWalletId));
+    if (hasEmbeddedWalletLinkedToEmail) {
+        concatedList = concatedList.map((field) => {
+            if (field.name !== 'email') {
+                return field;
+            }
+            return Object.assign(Object.assign({}, field), { enabled: false });
+        });
+    }
     return concatedList.sort((a, b) => {
         const indexA = projectSettingsKyc.findIndex((field) => field.name === a.name);
         const indexB = projectSettingsKyc.findIndex((field) => field.name === b.name);

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

@@ -21,3 +21,10 @@ export * from './isProviderEnabled';
 export * from './isOnrampProvider';
 export * from './getWalletConnectorNetworks/getWalletConnectorNetworks';
 export * from './isSocialKycEnabled';
+export * from './isMagicConnector';
+export * from './randomString';
+export * from './stringifyURIQuery';
+export * from './digestSHA256';
+export * from './encodeBase64URL';
+export * from './getRedirectURIOrigin';
+export * from './sendTransactionWithAutoNonce';

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

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

package/src/lib/utils/functions/isMagicConnector/isMagicConnector.cjs

@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const magicEmailOtpWalletConnectorKey = 'magicemailotp';
+const magicSocialWalletConnectorKey = 'magicsocial';
+const isMagicConnector = (connector) => connector.key === magicEmailOtpWalletConnectorKey ||
+    connector.key === magicSocialWalletConnectorKey;
+
+exports.isMagicConnector = isMagicConnector;

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

@@ -0,0 +1,2 @@
+import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+export declare const isMagicConnector: (connector: WalletConnectorBase) => boolean;

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

@@ -0,0 +1,6 @@
+const magicEmailOtpWalletConnectorKey = 'magicemailotp';
+const magicSocialWalletConnectorKey = 'magicsocial';
+const isMagicConnector = (connector) => connector.key === magicEmailOtpWalletConnectorKey ||
+    connector.key === magicSocialWalletConnectorKey;
+
+export { isMagicConnector };

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

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

package/src/lib/utils/functions/randomString/randomString.cjs

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const randomString = (length) => {
+    const CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
+    let result = '';
+    for (let i = length; i > 0; --i) {
+        result += CHARS[Math.floor(Math.random() * CHARS.length)];
+    }
+    return result;
+};
+
+exports.randomString = randomString;

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

@@ -0,0 +1 @@
+export declare const randomString: (length: number) => string;

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

@@ -0,0 +1,10 @@
+const randomString = (length) => {
+    const CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
+    let result = '';
+    for (let i = length; i > 0; --i) {
+        result += CHARS[Math.floor(Math.random() * CHARS.length)];
+    }
+    return result;
+};
+
+export { randomString };

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

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

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

@@ -0,0 +1,48 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+
+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) => _tslib.__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;
+    }
+});
+
+exports.MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE;
+exports.sendTransactionWithAutoNonce = sendTransactionWithAutoNonce;

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

@@ -0,0 +1,18 @@
+import { TransactionRequest, Address } from 'viem';
+import { WalletConnector } from '../../../..';
+export declare 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.
+ */
+export declare const sendTransactionWithAutoNonce: (connector: WalletConnector, transaction: TransactionRequest, sendTransactionHandler: (transaction: TransactionRequest) => Promise<Address>) => Promise<`0x${string}`>;

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/functions/stringifyURIQuery/index.d.ts

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

package/src/lib/utils/functions/stringifyURIQuery/stringifyURIQuery.cjs

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const stringifyURIQuery = (obj) => {
+    const str = [];
+    for (const prop in obj) {
+        str.push(encodeURIComponent(prop) + '=' + encodeURIComponent(obj[prop]));
+    }
+    return str.join('&');
+};
+
+exports.stringifyURIQuery = stringifyURIQuery;

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

@@ -0,0 +1 @@
+export declare const stringifyURIQuery: (obj: any) => string;

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

@@ -0,0 +1,9 @@
+const stringifyURIQuery = (obj) => {
+    const str = [];
+    for (const prop in obj) {
+        str.push(encodeURIComponent(prop) + '=' + encodeURIComponent(obj[prop]));
+    }
+    return str.join('&');
+};
+
+export { stringifyURIQuery };

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

@@ -28,11 +28,11 @@ require('@dynamic-labs/multi-wallet');
 var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
 
-const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
+const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     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, connectedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -55,7 +55,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
                     setView('wait-for-email-confirmation-view');
                 }
             }
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
             if (!publicWalletAddress) {
                 return;
             }
@@ -72,9 +72,15 @@ const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
             }
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
-                if (shouldUpdateWallets) {
+                // 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 (isAlreadyConnected) {
+                    setView('bridge-next-wallet-connection');
+                }
                 if (!isFullyConnected || (walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)) {
                     setCallback('connectSuccess');
                 }

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.d.ts

@@ -3,7 +3,8 @@ type Props = {
     fetchPublicAddressOpts?: FetchPublicAddressOpts;
     walletConnector: WalletConnector;
 };
-export declare const useConnectAndSign: ({ shouldUpdateWallets }?: {
+export declare const useConnectAndSign: ({ shouldUpdateWallets, shouldCallCallback, }?: {
     shouldUpdateWallets?: boolean | undefined;
+    shouldCallCallback?: boolean | undefined;
 }) => ({ walletConnector, fetchPublicAddressOpts, }: Props) => Promise<void>;
 export {};

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

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
+import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector, isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
@@ -24,11 +24,11 @@ import '@dynamic-labs/multi-wallet';
 import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
 
-const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
+const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     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, connectedWallets, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -51,7 +51,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
                     setView('wait-for-email-confirmation-view');
                 }
             }
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
             if (!publicWalletAddress) {
                 return;
             }
@@ -68,9 +68,15 @@ const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
             }
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
-                if (shouldUpdateWallets) {
+                // 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 (isAlreadyConnected) {
+                    setView('bridge-next-wallet-connection');
+                }
                 if (!isFullyConnected || (walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)) {
                     setCallback('connectSuccess');
                 }

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

@@ -31,3 +31,5 @@ export { useCountdown } from './useCountdown/useCountdown';
 export { useValidateSession } from './useValidateSession';
 export { useEventListener } from './useEventListener';
 export { useWalletConnectorEvent } from './useWalletConnectorEvent';
+export { useTransactionWithGasPrice } from './useTransactionWithGasPrice';
+export { useTransactionEstimatedGas } from './useTransactionEstimatedGas';

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

@@ -3,13 +3,29 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
+require('@dynamic-labs/sdk-api');
+require('../../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
+var localStorage = require('../../../constants/localStorage.cjs');
+require('../../../constants/colors.cjs');
+require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('viem');
+var useLocalStorage = require('../../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
+require('../../../../shared/consts/index.cjs');
 
 const useMultiWallet = (multiWalletSettings) => {
     const isMultiWalletEnabled = multiWalletSettings !== null && multiWalletSettings !== void 0 ? multiWalletSettings : false;
-    const [multiWallet, setMultiWallet] = React.useState(isMultiWalletEnabled);
+    const [multiWallet, setMultiWallet] = useLocalStorage.useLocalStorage(localStorage.IS_MULTI_WALLET_ENABLED, isMultiWalletEnabled);
     React.useEffect(() => {
-        setMultiWallet(isMultiWalletEnabled);
-    }, [isMultiWalletEnabled]);
+        if (multiWalletSettings) {
+            setMultiWallet(multiWalletSettings);
+        }
+    }, [multiWalletSettings]);
     return { multiWallet, setMultiWallet };
 };
 

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

@@ -1,5 +1,4 @@
-/// <reference types="react" />
 export declare const useMultiWallet: (multiWalletSettings?: boolean) => {
     multiWallet: boolean;
-    setMultiWallet: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    setMultiWallet: (value: boolean | ((val: boolean) => boolean)) => void;
 };

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

@@ -1,11 +1,27 @@
-import { useState, useEffect } from 'react';
+import { useEffect } from 'react';
+import '@dynamic-labs/sdk-api';
+import '../../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import { IS_MULTI_WALLET_ENABLED } from '../../../constants/localStorage.js';
+import '../../../constants/colors.js';
+import '../../../../shared/utils/classes/storage/localStorage.js';
+import 'viem';
+import { useLocalStorage } from '../../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
+import '../../../../shared/consts/index.js';
 
 const useMultiWallet = (multiWalletSettings) => {
     const isMultiWalletEnabled = multiWalletSettings !== null && multiWalletSettings !== void 0 ? multiWalletSettings : false;
-    const [multiWallet, setMultiWallet] = useState(isMultiWalletEnabled);
+    const [multiWallet, setMultiWallet] = useLocalStorage(IS_MULTI_WALLET_ENABLED, isMultiWalletEnabled);
     useEffect(() => {
-        setMultiWallet(isMultiWalletEnabled);
-    }, [isMultiWalletEnabled]);
+        if (multiWalletSettings) {
+            setMultiWallet(multiWalletSettings);
+        }
+    }, [multiWalletSettings]);
     return { multiWallet, setMultiWallet };
 };
 

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

@@ -4,15 +4,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 var isWalletLinked = require('../../../functions/isWalletLinked/isWalletLinked.cjs');
 var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
-var AccountExistsContext = require('../../../../context/AccountExistsContext/AccountExistsContext.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 } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
-    const { existentAccountData } = AccountExistsContext.useAccountExistsContext();
     const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
         if (!primaryWallet)
             return;
@@ -76,23 +76,28 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
             .getConnectedAccounts()
             .then((accounts) => {
             const [connectedAddress] = accounts;
+            if (!connectedAddress) {
+                throw new utils.DynamicError('Missing wallet address', errors.MISSING_ADDRESS_ERROR);
+            }
             if (walletConnectorCore.isSameAddress(connectedAddress, primaryWallet.address, primaryWallet.chain)) {
                 return;
             }
             handlePrimaryWalletNotActive(connectedAddress);
         })
-            .catch(() => {
+            .catch((e) => {
             const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
             if (connectedSecondaryWallet) {
                 setPrimaryWallet(connectedSecondaryWallet.id);
                 computeConnectedStateForWallets();
                 return;
             }
-            // no wallet is connected
-            setShowAuthFlow(true);
-            // check needed so 'wallet-locked-view'
-            // doesn't overwrite 'account-exists' view
-            if (!existentAccountData) {
+            // user is logged in (has valid jwt), but no wallet is connected
+            if (isAuthenticated && e.code === errors.MISSING_ADDRESS_ERROR) {
+                if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    handleLogOut();
+                    return;
+                }
+                setShowAuthFlow(true);
                 setView('wallet-locked-view');
             }
         });
@@ -109,6 +114,7 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
         setView,
         setShowAuthFlow,
         authMode,
+        isAuthenticated,
     ]);
 };
 

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

@@ -4,7 +4,7 @@ import { AuthModeType, MultiWalletWidgetState, Wallet } from '../../../../shared
 import { MultiWalletWidgetStateSetter } from '../useMultiWalletWidgetState';
 export type UseSyncPrimaryWalletArgs = {
     canSync?: boolean;
-    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts) => Promise<string | undefined>;
+    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, shouldCallCallback?: boolean) => Promise<string | undefined>;
     computeConnectedStateForWallets: () => Promise<void>;
     handleLogOut: () => Promise<void>;
     multiWalletWidgetState: MultiWalletWidgetState;

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

@@ -1,14 +1,14 @@
 import { useCallback, useEffect } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { DynamicError } from '@dynamic-labs/utils';
 import { isWalletLinked } from '../../../functions/isWalletLinked/isWalletLinked.js';
 import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
-import { useAccountExistsContext } from '../../../../context/AccountExistsContext/AccountExistsContext.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 } = useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated } = useInternalDynamicContext();
     const { setView } = useViewContext();
-    const { existentAccountData } = useAccountExistsContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
         if (!primaryWallet)
             return;
@@ -72,23 +72,28 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
             .getConnectedAccounts()
             .then((accounts) => {
             const [connectedAddress] = accounts;
+            if (!connectedAddress) {
+                throw new DynamicError('Missing wallet address', MISSING_ADDRESS_ERROR);
+            }
             if (isSameAddress(connectedAddress, primaryWallet.address, primaryWallet.chain)) {
                 return;
             }
             handlePrimaryWalletNotActive(connectedAddress);
         })
-            .catch(() => {
+            .catch((e) => {
             const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
             if (connectedSecondaryWallet) {
                 setPrimaryWallet(connectedSecondaryWallet.id);
                 computeConnectedStateForWallets();
                 return;
             }
-            // no wallet is connected
-            setShowAuthFlow(true);
-            // check needed so 'wallet-locked-view'
-            // doesn't overwrite 'account-exists' view
-            if (!existentAccountData) {
+            // user is logged in (has valid jwt), but no wallet is connected
+            if (isAuthenticated && e.code === MISSING_ADDRESS_ERROR) {
+                if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    handleLogOut();
+                    return;
+                }
+                setShowAuthFlow(true);
                 setView('wallet-locked-view');
             }
         });
@@ -105,6 +110,7 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
         setView,
         setShowAuthFlow,
         authMode,
+        isAuthenticated,
     ]);
 };