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

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

@@ -77,3 +77,4 @@ export * from './storeExpiresAt';
 export * from './getExpiresAt';
 export * from './getSupportedCountriesForVerificationFromProjectSettings';
 export * from './getDefaultCountriesIfEmpty';
+export * from './logVerboseTroubleshootingMessage';

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

@@ -0,0 +1 @@
+export * from './logVerboseTroubleshootingMessage';

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

@@ -0,0 +1,28 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('@dynamic-labs/sdk-api-core');
+var logger = require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/wallet-book');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+
+// use this in conjuction with dynamic_enableTroubleshootMode to see
+// more verbose logging to help troubleshoot issues
+// i.e: window.dynamic_enableTroubleshootMode = true
+const logVerboseTroubleshootingMessage = (message, ...args) => {
+    logger.logger.log(-1, message, ...args);
+};
+
+exports.logVerboseTroubleshootingMessage = logVerboseTroubleshootingMessage;

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

@@ -0,0 +1 @@
+export declare const logVerboseTroubleshootingMessage: (message: string | Error | unknown, ...args: any[]) => void;

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

@@ -0,0 +1,24 @@
+'use client'
+import '@dynamic-labs/sdk-api-core';
+import { logger } from '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+
+// use this in conjuction with dynamic_enableTroubleshootMode to see
+// more verbose logging to help troubleshoot issues
+// i.e: window.dynamic_enableTroubleshootMode = true
+const logVerboseTroubleshootingMessage = (message, ...args) => {
+    logger.log(-1, message, ...args);
+};
+
+export { logVerboseTroubleshootingMessage };

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

@@ -82,7 +82,8 @@ const walletListBuilder = ({ authMode, userWallets, multiWallet, numberOfWallets
         if (walletConnectorCore.isEmbeddedConnector(wallet.walletConnector)) {
             return;
         }
-        else if (wallet.key === 'unknown') {
+        else if (wallet.key === 'unknown' ||
+            !wallet.walletConnector.isAvailable) {
             return;
         }
         else if (isRecommendedWallet) {

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

@@ -78,7 +78,8 @@ const walletListBuilder = ({ authMode, userWallets, multiWallet, numberOfWallets
         if (isEmbeddedConnector(wallet.walletConnector)) {
             return;
         }
-        else if (wallet.key === 'unknown') {
+        else if (wallet.key === 'unknown' ||
+            !wallet.walletConnector.isAvailable) {
             return;
         }
         else if (isRecommendedWallet) {

package/src/lib/utils/hooks/events/useDynamicEvents/useDynamicEvents.cjs

@@ -18,5 +18,25 @@ const useInternalDynamicEvents = (event, listener) => {
         };
     }, [event]);
 };
+// ATTENTION
+// Everything below should be made public soon, but we need to plan this out first
+// Main issues:
+// 1. How should we map customer callback names to our dynamic event names?
+//  -> Gui's suggestion: breaking change to rename customer callbacks so they fit these events names
+// 2. We would have to remove these callbacks from the useCustomerCallbacks hook
+/** Which events are accessible by our clients */
+const externalEvents = [
+    'emailVerificationResult',
+    'embeddedWalletCreated',
+    'logout',
+    'walletAdded',
+];
+/** Allows subscribing to dynamic events directly inside components with a hook */
+const useDynamicEvents = (event, listener) => {
+    if (!externalEvents.includes(event))
+        throw new Error(`Unrecognized event "${event}" used with useDynamicEvents`);
+    useInternalDynamicEvents(event, listener);
+};
 
+exports.useDynamicEvents = useDynamicEvents;
 exports.useInternalDynamicEvents = useInternalDynamicEvents;

package/src/lib/utils/hooks/events/useDynamicEvents/useDynamicEvents.d.ts

@@ -2,7 +2,7 @@ import { DynamicEvents } from '../../../../events';
 import { EventArgs } from '../types';
 type DynamicEventListener<E extends keyof DynamicEvents> = (...args: EventArgs<DynamicEvents, E>) => void;
 /** Allows us to subscribe to all dynamicEvents with a hook, even the internal ones */
-export declare const useInternalDynamicEvents: <E extends keyof import("../../../../events/auth").AuthEvents | keyof import("../../../../events/ui").UIEvents | keyof import("../../../../events/otp").OTPEvents | keyof import("../../../../events/wallets").WalletEvents | keyof import("../../../../events/passkey").PasskeyEvents | "farcasterConnectCancelled" | keyof import("../../../../events/embeddedWallet").EmbeddedWalletEvents>(event: E, listener: DynamicEventListener<E>) => void;
+export declare const useInternalDynamicEvents: <E extends keyof import("../../../../events/auth").AuthEvents | keyof import("../../../../events/ui").UIEvents | keyof import("../../../../events/otp").OTPEvents | keyof import("../../../../events/wallets").WalletEvents | keyof import("../../../../events/passkey").PasskeyEvents | "farcasterConnectCancelled" | keyof import("../../../../events/embeddedWallet").EmbeddedWalletEvents | "triggerComputePrimaryWalletMultiWalletStateFromAccounts">(event: E, listener: DynamicEventListener<E>) => void;
 /** Allows subscribing to dynamic events directly inside components with a hook */
-export declare const useDynamicEvents: <E extends "logout" | "emailVerificationResult" | "embeddedWalletCreated">(event: E, listener: DynamicEventListener<E>) => void;
+export declare const useDynamicEvents: <E extends "logout" | "emailVerificationResult" | "walletAdded" | "embeddedWalletCreated">(event: E, listener: DynamicEventListener<E>) => void;
 export {};

package/src/lib/utils/hooks/events/useDynamicEvents/useDynamicEvents.js

@@ -14,5 +14,24 @@ const useInternalDynamicEvents = (event, listener) => {
         };
     }, [event]);
 };
+// ATTENTION
+// Everything below should be made public soon, but we need to plan this out first
+// Main issues:
+// 1. How should we map customer callback names to our dynamic event names?
+//  -> Gui's suggestion: breaking change to rename customer callbacks so they fit these events names
+// 2. We would have to remove these callbacks from the useCustomerCallbacks hook
+/** Which events are accessible by our clients */
+const externalEvents = [
+    'emailVerificationResult',
+    'embeddedWalletCreated',
+    'logout',
+    'walletAdded',
+];
+/** Allows subscribing to dynamic events directly inside components with a hook */
+const useDynamicEvents = (event, listener) => {
+    if (!externalEvents.includes(event))
+        throw new Error(`Unrecognized event "${event}" used with useDynamicEvents`);
+    useInternalDynamicEvents(event, listener);
+};
 
-export { useInternalDynamicEvents };
+export { useDynamicEvents, useInternalDynamicEvents };

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

@@ -58,3 +58,5 @@ export { useUserAuth } from './useUserAuth';
 export { useSwitchWallet } from './useSwitchWallet';
 export { useSyncEmbeddedWalletFlow } from './useSyncEmbeddedWalletFlow';
 export { useSyncOnboardingFlow } from './useSyncOnboardingFlow';
+export { useExternalAuth } from './useExternalAuth';
+export { useRefreshUser } from './useRefreshUser';

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

@@ -24,7 +24,6 @@ require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
-var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 require('react-international-phone');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
@@ -133,7 +132,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 });
                 setPrimaryWalletId(smartWallet$1.id);
             }
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, getAuthToken.getAuthToken(), updatedUser);
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, updatedUser);
             setShowAuthFlow(false, { performMultiWalletChecks: false });
         }
         catch (err) {

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

@@ -20,7 +20,6 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
@@ -129,7 +128,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 });
                 setPrimaryWalletId(smartWallet.id);
             }
-            dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, getAuthToken(), updatedUser);
+            dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, updatedUser);
             setShowAuthFlow(false, { performMultiWalletChecks: false });
         }
         catch (err) {

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

@@ -14,9 +14,10 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 var values = require('../../constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
@@ -102,7 +103,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId, setPrimaryWalletId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, projectSettings, setPrimaryWalletId } = useInternalDynamicContext.useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet.useMPCEmbeddedWallet();
     const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet.useSecureEnclaveEmbeddedWallet();
@@ -143,7 +144,8 @@ const useEmbeddedWallet = () => {
         var _a, _b;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings);
-        if (!hasEmbeddedWalletProviderEnabled || primaryWalletId) {
+        const hasPrimaryWallet = localStorage.LocalStorage.getFromLS(localStorage$1.PRIMARY_WALLET_ID);
+        if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey specific rules
@@ -166,7 +168,7 @@ const useEmbeddedWallet = () => {
             return false;
         }
         return true;
-    }, [primaryWalletId, projectSettings]);
+    }, [projectSettings, setPrimaryWalletId]);
     return {
         createEmbeddedWallet,
         createOrRestoreSession,

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

@@ -10,9 +10,10 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import { PRIMARY_WALLET_ID } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import { ChainEnumToVerifiedCredentialName } from '../../constants/values.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
@@ -98,7 +99,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId, setPrimaryWalletId } = useInternalDynamicContext();
+    const { user, projectSettings, setPrimaryWalletId } = useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet();
     const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet();
@@ -139,7 +140,8 @@ const useEmbeddedWallet = () => {
         var _a, _b;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled(projectSettings);
-        if (!hasEmbeddedWalletProviderEnabled || primaryWalletId) {
+        const hasPrimaryWallet = LocalStorage.getFromLS(PRIMARY_WALLET_ID);
+        if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey specific rules
@@ -162,7 +164,7 @@ const useEmbeddedWallet = () => {
             return false;
         }
         return true;
-    }, [primaryWalletId, projectSettings]);
+    }, [projectSettings, setPrimaryWalletId]);
     return {
         createEmbeddedWallet,
         createOrRestoreSession,

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.cjs

@@ -13,7 +13,6 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../../../functions/f
 require('../../../../constants/values.cjs');
 var errors = require('../../../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
-var getAuthToken = require('../../../../functions/getAuthToken/getAuthToken.cjs');
 var logger = require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
@@ -171,7 +170,7 @@ const useCoinbaseMPC = () => {
                 id: newSelectedCredentialWallet.id,
                 key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             };
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, getAuthToken.getAuthToken(), updatedUser);
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);
             return coinbaseMPCWallet;
         }
         catch (error) {

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.js

@@ -9,7 +9,6 @@ import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../functions
 import '../../../../constants/values.js';
 import { USER_NOT_LOGGED_IN } from '../../../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../../../functions/getAuthToken/getAuthToken.js';
 import { logger } from '../../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
@@ -167,7 +166,7 @@ const useCoinbaseMPC = () => {
                 id: newSelectedCredentialWallet.id,
                 key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             };
-            dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, getAuthToken(), updatedUser);
+            dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);
             return coinbaseMPCWallet;
         }
         catch (error) {

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.cjs

@@ -25,7 +25,6 @@ require('../../../../../context/ErrorContext/ErrorContext.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 var findTurnkeyWallet = require('../../../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 require('@dynamic-labs/multi-wallet');
-var getAuthToken = require('../../../../functions/getAuthToken/getAuthToken.cjs');
 require('react-international-phone');
 require('../../../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
@@ -213,7 +212,7 @@ const useTurnkey = () => {
                     key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
                 };
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-                dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, getAuthToken.getAuthToken(), user);
+                dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, user);
             }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false });

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.js

@@ -21,7 +21,6 @@ import '../../../../../context/ErrorContext/ErrorContext.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import { findTurnkeyWalletByChain } from '../../../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
 import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
 import '../../../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
@@ -209,7 +208,7 @@ const useTurnkey = () => {
                     key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
                 };
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-                dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, getAuthToken(), user);
+                dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, user);
             }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false });

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

@@ -0,0 +1 @@
+export * from './useExternalAuth';

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

@@ -0,0 +1,9 @@
+import { UserProfile } from '../../../..';
+type Props = {
+    externalUserId: string;
+    externalJwt?: string;
+};
+export declare const useExternalAuth: () => {
+    signInWithExternalJwt: ({ externalUserId, externalJwt, }: Props) => Promise<UserProfile | undefined>;
+};
+export {};

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

@@ -5,11 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('@dynamic-labs/sdk-api-core');
 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');
@@ -96,6 +96,9 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
             return;
         yield wallets.unlinkWallet({
             environmentId,
+            onSuccess: () => {
+                removedWalletsIds.current.push(walletId);
+            },
             primaryWalletId: currentPrimaryWalletId,
             walletId,
         });
@@ -103,14 +106,8 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         const numberOfLinkedWallets = verifiedCredentials.filter((account) => account.walletName === ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.key) || '')).length;
         // If there's only 1, it's the one being removed and we can kill the session
         if (numberOfLinkedWallets === 1) {
-            if (wallet && walletConnectorCore.isBitcoinConnector(wallet.connector)) {
-                // to avoid the infinite wallet popup issue experienced with the ME wallet
-                // we only want to clear the cached connected accounts when we unlink, but not on logout
-                yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.clearConnectedAccounts());
-            }
             yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.endSession());
         }
-        removedWalletsIds.current.push(walletId);
     }), [
         primaryWalletId,
         environmentId,

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

@@ -1,11 +1,11 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
-import { isBitcoinConnector } from '@dynamic-labs/wallet-connector-core';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '@dynamic-labs/sdk-api-core';
 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';
@@ -92,6 +92,9 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
             return;
         yield unlinkWallet({
             environmentId,
+            onSuccess: () => {
+                removedWalletsIds.current.push(walletId);
+            },
             primaryWalletId: currentPrimaryWalletId,
             walletId,
         });
@@ -99,14 +102,8 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         const numberOfLinkedWallets = verifiedCredentials.filter((account) => account.walletName === ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.key) || '')).length;
         // If there's only 1, it's the one being removed and we can kill the session
         if (numberOfLinkedWallets === 1) {
-            if (wallet && isBitcoinConnector(wallet.connector)) {
-                // to avoid the infinite wallet popup issue experienced with the ME wallet
-                // we only want to clear the cached connected accounts when we unlink, but not on logout
-                yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.clearConnectedAccounts());
-            }
             yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.endSession());
         }
-        removedWalletsIds.current.push(walletId);
     }), [
         primaryWalletId,
         environmentId,

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

@@ -22,7 +22,7 @@ require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('@dynamic-labs/store');
-require('../../../events/dynamicEvents.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -79,7 +79,7 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 var user = require('../../../data/api/user/user.cjs');
 
 const useMergeUserAccounts = () => {
-    const { environmentId, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { environmentId, setShowAuthFlow, selectedWalletConnector } = useInternalDynamicContext.useInternalDynamicContext();
     const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
     const mergeUserAccounts = (mergeConflictResolutions) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const user$1 = yield user.verifyMergeUsers(environmentId, mergeConflictResolutions);
@@ -87,6 +87,10 @@ const useMergeUserAccounts = () => {
         if (walletId) {
             addedWalletsIds.current.push(walletId);
         }
+        const accounts = yield (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.getConnectedAccounts());
+        if (accounts === null || accounts === void 0 ? void 0 : accounts.length) {
+            dynamicEvents.dynamicEvents.emit('triggerComputePrimaryWalletMultiWalletStateFromAccounts', { accounts });
+        }
         setShowAuthFlow(false);
     });
     return {

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

@@ -18,7 +18,7 @@ import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '@dynamic-labs/store';
-import '../../../events/dynamicEvents.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -75,7 +75,7 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import { verifyMergeUsers } from '../../../data/api/user/user.js';
 
 const useMergeUserAccounts = () => {
-    const { environmentId, setShowAuthFlow } = useInternalDynamicContext();
+    const { environmentId, setShowAuthFlow, selectedWalletConnector } = useInternalDynamicContext();
     const { addedWalletsIds } = useInternalUserWallets();
     const mergeUserAccounts = (mergeConflictResolutions) => __awaiter(void 0, void 0, void 0, function* () {
         const user = yield verifyMergeUsers(environmentId, mergeConflictResolutions);
@@ -83,6 +83,10 @@ const useMergeUserAccounts = () => {
         if (walletId) {
             addedWalletsIds.current.push(walletId);
         }
+        const accounts = yield (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.getConnectedAccounts());
+        if (accounts === null || accounts === void 0 ? void 0 : accounts.length) {
+            dynamicEvents.emit('triggerComputePrimaryWalletMultiWalletStateFromAccounts', { accounts });
+        }
         setShowAuthFlow(false);
     });
     return {

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

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

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

@@ -0,0 +1,90 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('@dynamic-labs/sdk-api-core');
+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('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('../../../../../_virtual/_tslib.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
+require('../../../locale/locale.cjs');
+var user = require('../../../data/api/user/user.cjs');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../context/VerificationContext/VerificationContext.cjs');
+require('react-dom');
+require('../../../context/WalletContext/WalletContext.cjs');
+require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
+require('@dynamic-labs/types');
+require('../../../context/LoadingContext/LoadingContext.cjs');
+require('yup');
+require('../../../context/MockContext/MockContext.cjs');
+require('../../../views/CollectUserDataView/useFields.cjs');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/rpc-providers');
+require('react-i18next');
+require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
+require('../../../components/Alert/Alert.cjs');
+require('../../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../../components/IconButton/IconButton.cjs');
+require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/Input/Input.cjs');
+require('../../../components/IsBrowser/IsBrowser.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
+require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../components/Popper/Popper/Popper.cjs');
+require('../../../components/Popper/PopperContext/PopperContext.cjs');
+require('react-focus-lock');
+require('qrcode');
+require('formik');
+require('../../../views/WalletList/WalletList.cjs');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
+
+/**
+ * Refresh user state
+ * @returns A callback function that can be used to refresh the user state
+ */
+const useRefreshUser = () => {
+    const { environmentId } = useInternalDynamicContext.useInternalDynamicContext();
+    return React.useCallback(() => user.refreshUserJwt({ environmentId }), [environmentId]);
+};
+
+exports.useRefreshUser = useRefreshUser;

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

@@ -0,0 +1,8 @@
+import { UserProfile } from '@dynamic-labs/types';
+type RefreshUserCallback = () => Promise<UserProfile | undefined>;
+/**
+ * Refresh user state
+ * @returns A callback function that can be used to refresh the user state
+ */
+export declare const useRefreshUser: () => RefreshUserCallback;
+export {};