@dynamic-labs/sdk-react-core 4.89.0 → 4.90.0

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

@@ -16,12 +16,13 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';
-import { serializeWalletConnectors } from '../../functions/serializeWalletConnectors/serializeWalletConnectors.js';
+import '@dynamic-labs-wallet/browser-wallet-client';
 import '@dynamic-labs-sdk/client/core';
 import 'eventemitter3';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '../../../events/dynamicEvents.js';
+import { serializeWalletConnectors } from '../../functions/serializeWalletConnectors/serializeWalletConnectors.js';
 import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs

@@ -20,6 +20,7 @@ require('@dynamic-labs/wallet-book');
 require('../../../../../shared/consts/index.cjs');
 require('../../../../../store/state/nonce/nonce.cjs');
 var isProviderEnabled = require('../../../../functions/isProviderEnabled/isProviderEnabled.cjs');
+require('@dynamic-labs-wallet/browser-wallet-client');
 require('@dynamic-labs-sdk/client/core');
 require('eventemitter3');
 require('@dynamic-labs-sdk/client');

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.js

@@ -16,6 +16,7 @@ import '@dynamic-labs/wallet-book';
 import '../../../../../shared/consts/index.js';
 import '../../../../../store/state/nonce/nonce.js';
 import { isProviderEnabled } from '../../../../functions/isProviderEnabled/isProviderEnabled.js';
+import '@dynamic-labs-wallet/browser-wallet-client';
 import '@dynamic-labs-sdk/client/core';
 import 'eventemitter3';
 import '@dynamic-labs-sdk/client';

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.cjs

@@ -20,6 +20,7 @@ require('@dynamic-labs/wallet-book');
 require('../../../../../shared/consts/index.cjs');
 require('../../../../../store/state/nonce/nonce.cjs');
 var isProviderEnabled = require('../../../../functions/isProviderEnabled/isProviderEnabled.cjs');
+require('@dynamic-labs-wallet/browser-wallet-client');
 require('@dynamic-labs-sdk/client/core');
 require('eventemitter3');
 require('@dynamic-labs-sdk/client');

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.js

@@ -16,6 +16,7 @@ import '@dynamic-labs/wallet-book';
 import '../../../../../shared/consts/index.js';
 import '../../../../../store/state/nonce/nonce.js';
 import { isProviderEnabled } from '../../../../functions/isProviderEnabled/isProviderEnabled.js';
+import '@dynamic-labs-wallet/browser-wallet-client';
 import '@dynamic-labs-sdk/client/core';
 import 'eventemitter3';
 import '@dynamic-labs-sdk/client';

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

@@ -23,6 +23,7 @@ require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
+require('@dynamic-labs-wallet/browser-wallet-client');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');

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

@@ -19,6 +19,7 @@ import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
+import '@dynamic-labs-wallet/browser-wallet-client';
 import { useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';

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

@@ -21,12 +21,13 @@ var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../shared/consts/index.cjs');
 require('../../../store/state/nonce/nonce.cjs');
-var isAllowedToLinkWallet = require('../../functions/isAllowedToLinkWallet/isAllowedToLinkWallet.cjs');
+require('@dynamic-labs-wallet/browser-wallet-client');
 require('@dynamic-labs-sdk/client/core');
 require('eventemitter3');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../events/dynamicEvents.cjs');
+var isAllowedToLinkWallet = require('../../functions/isAllowedToLinkWallet/isAllowedToLinkWallet.cjs');
 require('@dynamic-labs/locale');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -17,12 +17,13 @@ import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';
-import { isAllowedToLinkWallet } from '../../functions/isAllowedToLinkWallet/isAllowedToLinkWallet.js';
+import '@dynamic-labs-wallet/browser-wallet-client';
 import '@dynamic-labs-sdk/client/core';
 import 'eventemitter3';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '../../../events/dynamicEvents.js';
+import { isAllowedToLinkWallet } from '../../functions/isAllowedToLinkWallet/isAllowedToLinkWallet.js';
 import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -24,6 +24,8 @@ require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
+require('@dynamic-labs-wallet/browser-wallet-client');
+var apiUrl = require('../../constants/waas/apiUrl.cjs');
 var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updatePrimaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
@@ -41,7 +43,6 @@ require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var walletOptions = require('../../../store/state/walletOptions/walletOptions.cjs');
-var apiUrl = require('../../constants/waas/apiUrl.cjs');
 var compareChains = require('../../functions/compareChains/compareChains.cjs');
 var getNewVerifiedCredentialsFromDiff = require('../../functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.cjs');
 var useGetMfaToken = require('../useGetMfaToken/useGetMfaToken.cjs');
@@ -54,7 +55,7 @@ var normalizeWaasChainName = require('./normalizeWaasChainName.cjs');
 var normalizeWalletRequirements = require('./normalizeWalletRequirements.cjs');
 
 const dynamicWaasKey = 'dynamicwaas';
-const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, relayUrl, baseClientKeysharesRelayApiUrl, authMode = 'header', getSignedSessionId, getMfaToken, getWalletPassword, getSvmGasSponsorshipEnabled = () => false, getElevatedAccessToken, onUnauthorized, }) => {
+const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, relayUrl, baseClientKeysharesRelayApiUrl, authMode = 'header', getSignedSessionId, getMfaToken, getWalletPassword, getSvmGasSponsorshipEnabled = () => false, getElevatedAccessToken, }) => {
     var _a;
     walletConnector.setEnvironmentId(environmentId);
     walletConnector.setBaseApiUrl((_a = (apiBaseUrl || apiUrl.DEFAULT_WAAS_API_URL)) === null || _a === void 0 ? void 0 : _a.replace('/api/v0', ''));
@@ -78,10 +79,6 @@ const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl,
     if (getWalletPassword) {
         walletConnector.setGetWalletPasswordFunction(getWalletPassword);
     }
-    // Log the user out when the iframe reports a 401 (e.g. token forcibly revoked)
-    if (onUnauthorized) {
-        walletConnector.setOnUnauthorizedFunction(onUnauthorized);
-    }
     // Sync SVM gas sponsorship setting for SOL connectors
     const isSolConnector = walletConnector.connectedChain === 'SOL';
     const supportsSponsorshipSetting = 'setSvmGasSponsorshipEnabled' in walletConnector;
@@ -92,7 +89,7 @@ const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl,
 };
 const useDynamicWaas = () => {
     var _a, _b, _c, _d, _e, _f;
-    const { setShowAuthFlow, handleLogOutWithReason } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { addedWalletsIds, userWallets } = UserWalletsContext.useInternalUserWallets();
     const user = useUser.useUser();
     const apiBaseUrl = dynamicContextProps.useApiBaseUrl();
@@ -120,10 +117,21 @@ const useDynamicWaas = () => {
     const getElevatedAccessToken = useGetElevatedAccessToken.useGetElevatedAccessToken();
     const isCookieAuthEnabled = projectSettings && isCookieEnabled.isCookieEnabled();
     const isUpgrading = React.useRef(false);
-    const [recoveredWallets, setRecoveredWallets] = React.useState(() => new Set());
+    // Gates settings; the SDK recovers key shares itself (eagerlyRecoverKeyShares).
+    const [hasWaasInitialized, setHasWaasInitialized] = React.useState(false);
+    // Live session id, so an in-flight init can detect a logout/user-swap.
+    const currentSessionIdRef = React.useRef(user === null || user === void 0 ? void 0 : user.sessionId);
+    currentSessionIdRef.current = user === null || user === void 0 ? void 0 : user.sessionId;
     const getWaasWalletConnector = React.useCallback((chainName) => {
         var _a;
-        if (!isCookieAuthEnabled && !authToken) {
+        // Read the token live (not the render-captured `authToken`): during a
+        // re-login the token is transiently null while the render value is still
+        // the stale pre-logout one. Using the stale value here would let init
+        // proceed to build the client, where createDynamicWaasClient reads the
+        // live (null) token and throws "Auth token is required", crashing the app.
+        // Returning undefined defers init until the token is back (initializeWaas
+        // skips connectors it can't resolve and re-runs when auth state settles).
+        if (!isCookieAuthEnabled && !getMinAuthToken.getMinAuthToken()) {
             return undefined;
         }
         if (!walletConnectorOptions.length || !environmentId)
@@ -144,7 +152,6 @@ const useDynamicWaas = () => {
             getSignedSessionId: generateChainingSignature.generateChainingSignature,
             getSvmGasSponsorshipEnabled: () => svmGasSponsorshipEnabledRef.current,
             getWalletPassword,
-            onUnauthorized: () => handleLogOutWithReason('session-refresh-unauthorized'),
             relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',
             walletConnector,
         });
@@ -158,7 +165,6 @@ const useDynamicWaas = () => {
         getElevatedAccessToken,
         getMfaToken,
         getWalletPassword,
-        handleLogOutWithReason,
         relayUrl,
         baseClientKeysharesRelayApiUrl,
     ]);
@@ -181,11 +187,13 @@ const useDynamicWaas = () => {
         enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length,
         walletConnectorOptions.length,
     ]);
-    const initializeWaas = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const initializeWaas = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* ({ forceClientRebuild = false, } = {}) {
         if (!shouldInitializeWaas || !user)
             return;
         try {
             const initializationStart = new Date().getTime();
+            // Session this run belongs to; checked before flipping the flag.
+            const initSessionId = user.sessionId;
             const userWaasWallets = user.verifiedCredentials.filter((vc) => vc.walletName === dynamicWaasKey && vc.address && vc.chain);
             const chainsWithWallets = [
                 ...new Set(userWaasWallets.map((vc) => { var _a; return values.VerifiedCredentialNameToChainEnum[(_a = vc.chain) !== null && _a !== void 0 ? _a : '']; })),
@@ -195,86 +203,40 @@ const useDynamicWaas = () => {
             const allChainsToProcess = [
                 ...new Set([...(enabledChainNames || []), ...chainsWithWallets]),
             ];
-            yield Promise.all(allChainsToProcess.map((chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                const walletConnector = getWaasWalletConnector(chain);
+            const initializationResults = yield Promise.all(allChainsToProcess.map((chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                // Contain per-chain: getWaasWalletConnector throws for an unconfigured
+                // chain, which would otherwise reject Promise.all and block all chains.
+                let walletConnector;
+                try {
+                    walletConnector = getWaasWalletConnector(chain);
+                }
+                catch (error) {
+                    walletConnectorCore.logger.warn('Waas connector not found for chain', {
+                        chain,
+                        error,
+                    });
+                    return false;
+                }
                 if (!walletConnector)
-                    return;
-                // Filter for waas wallets on this chain
-                const waasWallets = user.verifiedCredentials.filter((credential) => {
-                    var _a;
-                    return credential.walletName === dynamicWaasKey &&
-                        credential.address &&
-                        values.VerifiedCredentialNameToChainEnum[(_a = credential.chain) !== null && _a !== void 0 ? _a : ''] ===
-                            walletConnector.connectedChain;
-                });
+                    return false;
                 try {
-                    // Initialize waas iframe
-                    const client = yield walletConnector.getWaasWalletClient();
-                    walletConnectorCore.logger.debug('[useDynamicWaas] initialized waas iframe');
+                    // Init the iframe only; the SDK self-recovers key shares
+                    // (eagerlyRecoverKeyShares). forceRebuild drops the cached client
+                    // after a step-up reauth so it re-auths with the fresh token.
+                    yield walletConnector.getWaasWalletClient(undefined, {
+                        forceRebuild: forceClientRebuild,
+                    });
                     const iframeInitializationEnd = new Date().getTime();
-                    const iframeLoadingTime = iframeInitializationEnd - initializationStart;
                     walletConnectorCore.logger.instrument('Waas iframe initialized', {
                         chain,
                         end: iframeInitializationEnd,
                         environmentId: user.projectEnvironmentId,
                         key: 'waasIframeInitialized',
                         start: initializationStart,
-                        time: iframeLoadingTime,
+                        time: iframeInitializationEnd - initializationStart,
                         userId: user === null || user === void 0 ? void 0 : user.id,
                     });
-                    // If user has waas wallets, restore keyshares to the iframe
-                    if (waasWallets.length > 0) {
-                        yield Promise.all(waasWallets
-                            .filter((wallet) => wallet.address)
-                            .map((wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                            try {
-                                walletConnectorCore.logger.debug('[useDynamicWaas] restoring wallet keyshare', {
-                                    chain: wallet.chain,
-                                    sessionId: user.sessionId,
-                                    userId: user.id,
-                                    walletAddress: wallet.address,
-                                });
-                                const keyshareRestorationStart = new Date().getTime();
-                                const signedSessionId = yield generateChainingSignature.generateChainingSignature();
-                                yield client.getWallet({
-                                    accountAddress: wallet.address,
-                                    authToken: getMinAuthToken.getMinAuthToken(),
-                                    signedSessionId,
-                                    walletOperation: 'RECOVER',
-                                });
-                                const keyshareRestorationEnd = new Date().getTime();
-                                const keyshareRestorationTime = keyshareRestorationEnd - keyshareRestorationStart;
-                                const totalElapsedTime = keyshareRestorationEnd - initializationStart;
-                                walletConnectorCore.logger.instrument('Waas wallet keyshare restored', {
-                                    accountAddress: wallet.address,
-                                    chain,
-                                    end: keyshareRestorationEnd,
-                                    environmentId: user.projectEnvironmentId,
-                                    key: 'waasWalletKeyshareRestored',
-                                    keyshareRestorationTime: keyshareRestorationTime,
-                                    start: initializationStart,
-                                    time: totalElapsedTime,
-                                    userId: user === null || user === void 0 ? void 0 : user.id,
-                                });
-                                // Track successfully recovered wallet
-                                setRecoveredWallets((prev) => {
-                                    var _a;
-                                    const next = new Set(prev);
-                                    next.add((_a = wallet.address) === null || _a === void 0 ? void 0 : _a.toLowerCase());
-                                    return next;
-                                });
-                            }
-                            catch (error) {
-                                walletConnectorCore.logger.warn('[useDynamicWaas] Error restoring wallet keyshare', {
-                                    chain,
-                                    error,
-                                    sessionId: user.sessionId,
-                                    userId: user.id,
-                                    walletAddress: wallet.address,
-                                });
-                            }
-                        })));
-                    }
+                    return true;
                 }
                 catch (error) {
                     walletConnectorCore.logger.error('Error initializing waas wallet client', {
@@ -283,8 +245,14 @@ const useDynamicWaas = () => {
                         sessionId: user.sessionId,
                         userId: user.id,
                     });
+                    return false;
                 }
             })));
+            // Flag only if a client came up and the session is still current.
+            if (initializationResults.some(Boolean) &&
+                currentSessionIdRef.current === initSessionId) {
+                setHasWaasInitialized(true);
+            }
         }
         catch (error) {
             walletConnectorCore.logger.error('Error initializing waas', {
@@ -614,16 +582,12 @@ const useDynamicWaas = () => {
     }, [user, dynamicWaasIsEnabled]);
     // Derived from walletsNeedingSettings for backward compatibility
     const needsSettingsProcessing = walletsNeedingSettings.length > 0;
-    // Check if all wallets needing settings have been recovered
-    const areWalletsReadyForSettings = React.useCallback(() => {
-        if (walletsNeedingSettings.length === 0) {
-            return false;
-        }
-        return walletsNeedingSettings.every((wallet) => { var _a; return recoveredWallets.has((_a = wallet.address) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
-    }, [walletsNeedingSettings, recoveredWallets]);
-    // Clear recovered wallets tracking (call on logout)
+    // Ready once the iframe is up and settings are pending; recovery is not a
+    // precondition since the ceremonies recover their shares on-demand.
+    const areWalletsReadyForSettings = React.useCallback(() => hasWaasInitialized && walletsNeedingSettings.length > 0, [hasWaasInitialized, walletsNeedingSettings]);
+    // Reset waas-init tracking (call on logout)
     const clearRecoveredWallets = React.useCallback(() => {
-        setRecoveredWallets(new Set());
+        setHasWaasInitialized(false);
     }, []);
     return {
         areWalletsReadyForSettings,

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

@@ -12,7 +12,7 @@ export type WalletCreationRequirement = {
         network?: string;
     };
 };
-export declare const configWaasWalletConnector: ({ walletConnector, environmentId, apiBaseUrl, relayUrl, baseClientKeysharesRelayApiUrl, authMode, getSignedSessionId, getMfaToken, getWalletPassword, getSvmGasSponsorshipEnabled, getElevatedAccessToken, onUnauthorized, }: {
+export declare const configWaasWalletConnector: ({ walletConnector, environmentId, apiBaseUrl, relayUrl, baseClientKeysharesRelayApiUrl, authMode, getSignedSessionId, getMfaToken, getWalletPassword, getSvmGasSponsorshipEnabled, getElevatedAccessToken, }: {
     walletConnector: IDynamicWaasConnector;
     environmentId: string;
     apiBaseUrl: string;
@@ -28,7 +28,6 @@ export declare const configWaasWalletConnector: ({ walletConnector, environmentI
     getElevatedAccessToken?: (params: {
         scope: TokenScope;
     }) => Promise<string | undefined>;
-    onUnauthorized?: () => void | Promise<void>;
 }) => IDynamicWaasConnector;
 export declare const useDynamicWaas: () => {
     areWalletsReadyForSettings: () => boolean;
@@ -50,7 +49,9 @@ export declare const useDynamicWaas: () => {
         legacyWalletId?: string;
         password?: string;
     }) => Promise<void>;
-    initializeWaas: () => Promise<void>;
+    initializeWaas: ({ forceClientRebuild, }?: {
+        forceClientRebuild?: boolean;
+    }) => Promise<void>;
     needsAutoCreateWalletChains: WalletCreationRequirement[];
     needsSettingsProcessing: boolean;
     processSignOnWalletSettings: () => Promise<void>;

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

@@ -20,6 +20,8 @@ import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
+import '@dynamic-labs-wallet/browser-wallet-client';
+import { DEFAULT_WAAS_API_URL } from '../../constants/waas/apiUrl.js';
 import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/updatePrimaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { useApiBaseUrl, useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
@@ -37,7 +39,6 @@ import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import { useWalletConnectorOptions } from '../../../store/state/walletOptions/walletOptions.js';
-import { DEFAULT_WAAS_API_URL } from '../../constants/waas/apiUrl.js';
 import { compareChains } from '../../functions/compareChains/compareChains.js';
 import { getNewVerifiedCredentialsFromDiff } from '../../functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.js';
 import { useGetMfaToken } from '../useGetMfaToken/useGetMfaToken.js';
@@ -50,7 +51,7 @@ import { normalizeWaasChainName } from './normalizeWaasChainName.js';
 import { normalizeWalletRequirements } from './normalizeWalletRequirements.js';
 
 const dynamicWaasKey = 'dynamicwaas';
-const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, relayUrl, baseClientKeysharesRelayApiUrl, authMode = 'header', getSignedSessionId, getMfaToken, getWalletPassword, getSvmGasSponsorshipEnabled = () => false, getElevatedAccessToken, onUnauthorized, }) => {
+const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, relayUrl, baseClientKeysharesRelayApiUrl, authMode = 'header', getSignedSessionId, getMfaToken, getWalletPassword, getSvmGasSponsorshipEnabled = () => false, getElevatedAccessToken, }) => {
     var _a;
     walletConnector.setEnvironmentId(environmentId);
     walletConnector.setBaseApiUrl((_a = (apiBaseUrl || DEFAULT_WAAS_API_URL)) === null || _a === void 0 ? void 0 : _a.replace('/api/v0', ''));
@@ -74,10 +75,6 @@ const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl,
     if (getWalletPassword) {
         walletConnector.setGetWalletPasswordFunction(getWalletPassword);
     }
-    // Log the user out when the iframe reports a 401 (e.g. token forcibly revoked)
-    if (onUnauthorized) {
-        walletConnector.setOnUnauthorizedFunction(onUnauthorized);
-    }
     // Sync SVM gas sponsorship setting for SOL connectors
     const isSolConnector = walletConnector.connectedChain === 'SOL';
     const supportsSponsorshipSetting = 'setSvmGasSponsorshipEnabled' in walletConnector;
@@ -88,7 +85,7 @@ const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl,
 };
 const useDynamicWaas = () => {
     var _a, _b, _c, _d, _e, _f;
-    const { setShowAuthFlow, handleLogOutWithReason } = useInternalDynamicContext();
+    const { setShowAuthFlow } = useInternalDynamicContext();
     const { addedWalletsIds, userWallets } = useInternalUserWallets();
     const user = useUser();
     const apiBaseUrl = useApiBaseUrl();
@@ -116,10 +113,21 @@ const useDynamicWaas = () => {
     const getElevatedAccessToken = useGetElevatedAccessToken();
     const isCookieAuthEnabled = projectSettings && isCookieEnabled();
     const isUpgrading = useRef(false);
-    const [recoveredWallets, setRecoveredWallets] = useState(() => new Set());
+    // Gates settings; the SDK recovers key shares itself (eagerlyRecoverKeyShares).
+    const [hasWaasInitialized, setHasWaasInitialized] = useState(false);
+    // Live session id, so an in-flight init can detect a logout/user-swap.
+    const currentSessionIdRef = useRef(user === null || user === void 0 ? void 0 : user.sessionId);
+    currentSessionIdRef.current = user === null || user === void 0 ? void 0 : user.sessionId;
     const getWaasWalletConnector = useCallback((chainName) => {
         var _a;
-        if (!isCookieAuthEnabled && !authToken) {
+        // Read the token live (not the render-captured `authToken`): during a
+        // re-login the token is transiently null while the render value is still
+        // the stale pre-logout one. Using the stale value here would let init
+        // proceed to build the client, where createDynamicWaasClient reads the
+        // live (null) token and throws "Auth token is required", crashing the app.
+        // Returning undefined defers init until the token is back (initializeWaas
+        // skips connectors it can't resolve and re-runs when auth state settles).
+        if (!isCookieAuthEnabled && !getMinAuthToken()) {
             return undefined;
         }
         if (!walletConnectorOptions.length || !environmentId)
@@ -140,7 +148,6 @@ const useDynamicWaas = () => {
             getSignedSessionId: generateChainingSignature,
             getSvmGasSponsorshipEnabled: () => svmGasSponsorshipEnabledRef.current,
             getWalletPassword,
-            onUnauthorized: () => handleLogOutWithReason('session-refresh-unauthorized'),
             relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',
             walletConnector,
         });
@@ -154,7 +161,6 @@ const useDynamicWaas = () => {
         getElevatedAccessToken,
         getMfaToken,
         getWalletPassword,
-        handleLogOutWithReason,
         relayUrl,
         baseClientKeysharesRelayApiUrl,
     ]);
@@ -177,11 +183,13 @@ const useDynamicWaas = () => {
         enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length,
         walletConnectorOptions.length,
     ]);
-    const initializeWaas = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+    const initializeWaas = useCallback((...args_1) => __awaiter(void 0, [...args_1], void 0, function* ({ forceClientRebuild = false, } = {}) {
         if (!shouldInitializeWaas || !user)
             return;
         try {
             const initializationStart = new Date().getTime();
+            // Session this run belongs to; checked before flipping the flag.
+            const initSessionId = user.sessionId;
             const userWaasWallets = user.verifiedCredentials.filter((vc) => vc.walletName === dynamicWaasKey && vc.address && vc.chain);
             const chainsWithWallets = [
                 ...new Set(userWaasWallets.map((vc) => { var _a; return VerifiedCredentialNameToChainEnum[(_a = vc.chain) !== null && _a !== void 0 ? _a : '']; })),
@@ -191,86 +199,40 @@ const useDynamicWaas = () => {
             const allChainsToProcess = [
                 ...new Set([...(enabledChainNames || []), ...chainsWithWallets]),
             ];
-            yield Promise.all(allChainsToProcess.map((chain) => __awaiter(void 0, void 0, void 0, function* () {
-                const walletConnector = getWaasWalletConnector(chain);
+            const initializationResults = yield Promise.all(allChainsToProcess.map((chain) => __awaiter(void 0, void 0, void 0, function* () {
+                // Contain per-chain: getWaasWalletConnector throws for an unconfigured
+                // chain, which would otherwise reject Promise.all and block all chains.
+                let walletConnector;
+                try {
+                    walletConnector = getWaasWalletConnector(chain);
+                }
+                catch (error) {
+                    logger.warn('Waas connector not found for chain', {
+                        chain,
+                        error,
+                    });
+                    return false;
+                }
                 if (!walletConnector)
-                    return;
-                // Filter for waas wallets on this chain
-                const waasWallets = user.verifiedCredentials.filter((credential) => {
-                    var _a;
-                    return credential.walletName === dynamicWaasKey &&
-                        credential.address &&
-                        VerifiedCredentialNameToChainEnum[(_a = credential.chain) !== null && _a !== void 0 ? _a : ''] ===
-                            walletConnector.connectedChain;
-                });
+                    return false;
                 try {
-                    // Initialize waas iframe
-                    const client = yield walletConnector.getWaasWalletClient();
-                    logger.debug('[useDynamicWaas] initialized waas iframe');
+                    // Init the iframe only; the SDK self-recovers key shares
+                    // (eagerlyRecoverKeyShares). forceRebuild drops the cached client
+                    // after a step-up reauth so it re-auths with the fresh token.
+                    yield walletConnector.getWaasWalletClient(undefined, {
+                        forceRebuild: forceClientRebuild,
+                    });
                     const iframeInitializationEnd = new Date().getTime();
-                    const iframeLoadingTime = iframeInitializationEnd - initializationStart;
                     logger.instrument('Waas iframe initialized', {
                         chain,
                         end: iframeInitializationEnd,
                         environmentId: user.projectEnvironmentId,
                         key: 'waasIframeInitialized',
                         start: initializationStart,
-                        time: iframeLoadingTime,
+                        time: iframeInitializationEnd - initializationStart,
                         userId: user === null || user === void 0 ? void 0 : user.id,
                     });
-                    // If user has waas wallets, restore keyshares to the iframe
-                    if (waasWallets.length > 0) {
-                        yield Promise.all(waasWallets
-                            .filter((wallet) => wallet.address)
-                            .map((wallet) => __awaiter(void 0, void 0, void 0, function* () {
-                            try {
-                                logger.debug('[useDynamicWaas] restoring wallet keyshare', {
-                                    chain: wallet.chain,
-                                    sessionId: user.sessionId,
-                                    userId: user.id,
-                                    walletAddress: wallet.address,
-                                });
-                                const keyshareRestorationStart = new Date().getTime();
-                                const signedSessionId = yield generateChainingSignature();
-                                yield client.getWallet({
-                                    accountAddress: wallet.address,
-                                    authToken: getMinAuthToken(),
-                                    signedSessionId,
-                                    walletOperation: 'RECOVER',
-                                });
-                                const keyshareRestorationEnd = new Date().getTime();
-                                const keyshareRestorationTime = keyshareRestorationEnd - keyshareRestorationStart;
-                                const totalElapsedTime = keyshareRestorationEnd - initializationStart;
-                                logger.instrument('Waas wallet keyshare restored', {
-                                    accountAddress: wallet.address,
-                                    chain,
-                                    end: keyshareRestorationEnd,
-                                    environmentId: user.projectEnvironmentId,
-                                    key: 'waasWalletKeyshareRestored',
-                                    keyshareRestorationTime: keyshareRestorationTime,
-                                    start: initializationStart,
-                                    time: totalElapsedTime,
-                                    userId: user === null || user === void 0 ? void 0 : user.id,
-                                });
-                                // Track successfully recovered wallet
-                                setRecoveredWallets((prev) => {
-                                    var _a;
-                                    const next = new Set(prev);
-                                    next.add((_a = wallet.address) === null || _a === void 0 ? void 0 : _a.toLowerCase());
-                                    return next;
-                                });
-                            }
-                            catch (error) {
-                                logger.warn('[useDynamicWaas] Error restoring wallet keyshare', {
-                                    chain,
-                                    error,
-                                    sessionId: user.sessionId,
-                                    userId: user.id,
-                                    walletAddress: wallet.address,
-                                });
-                            }
-                        })));
-                    }
+                    return true;
                 }
                 catch (error) {
                     logger.error('Error initializing waas wallet client', {
@@ -279,8 +241,14 @@ const useDynamicWaas = () => {
                         sessionId: user.sessionId,
                         userId: user.id,
                     });
+                    return false;
                 }
             })));
+            // Flag only if a client came up and the session is still current.
+            if (initializationResults.some(Boolean) &&
+                currentSessionIdRef.current === initSessionId) {
+                setHasWaasInitialized(true);
+            }
         }
         catch (error) {
             logger.error('Error initializing waas', {
@@ -610,16 +578,12 @@ const useDynamicWaas = () => {
     }, [user, dynamicWaasIsEnabled]);
     // Derived from walletsNeedingSettings for backward compatibility
     const needsSettingsProcessing = walletsNeedingSettings.length > 0;
-    // Check if all wallets needing settings have been recovered
-    const areWalletsReadyForSettings = useCallback(() => {
-        if (walletsNeedingSettings.length === 0) {
-            return false;
-        }
-        return walletsNeedingSettings.every((wallet) => { var _a; return recoveredWallets.has((_a = wallet.address) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
-    }, [walletsNeedingSettings, recoveredWallets]);
-    // Clear recovered wallets tracking (call on logout)
+    // Ready once the iframe is up and settings are pending; recovery is not a
+    // precondition since the ceremonies recover their shares on-demand.
+    const areWalletsReadyForSettings = useCallback(() => hasWaasInitialized && walletsNeedingSettings.length > 0, [hasWaasInitialized, walletsNeedingSettings]);
+    // Reset waas-init tracking (call on logout)
     const clearRecoveredWallets = useCallback(() => {
-        setRecoveredWallets(new Set());
+        setHasWaasInitialized(false);
     }, []);
     return {
         areWalletsReadyForSettings,