@dynamic-labs/sdk-react-core 4.19.6 → 4.19.7

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

@@ -21,7 +21,10 @@ const getSessionInformationExpiration = (session) => {
 /** Returns the spending limit of the session in ETH */
 const getSessionInformationSpendingLimit = (session) => {
     const { limit } = session.session.feeLimit;
-    const ethString = (Number(limit) / Math.pow(10, 18)).toFixed(6);
+    const formatter = new Intl.NumberFormat(undefined, {
+        maximumFractionDigits: 6,
+    });
+    const ethString = formatter.format(Number(limit) / Math.pow(10, 18));
     return `~${ethString} ETH`;
 };
 /** Exports the session information as a JSON string with a helper to process bigints */

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

@@ -17,7 +17,10 @@ const getSessionInformationExpiration = (session) => {
 /** Returns the spending limit of the session in ETH */
 const getSessionInformationSpendingLimit = (session) => {
     const { limit } = session.session.feeLimit;
-    const ethString = (Number(limit) / Math.pow(10, 18)).toFixed(6);
+    const formatter = new Intl.NumberFormat(undefined, {
+        maximumFractionDigits: 6,
+    });
+    const ethString = formatter.format(Number(limit) / Math.pow(10, 18));
     return `~${ethString} ETH`;
 };
 /** Exports the session information as a JSON string with a helper to process bigints */

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

@@ -14,13 +14,16 @@ var loadingAndLifecycle = require('../../../../../store/state/loadingAndLifecycl
  */
 const UNSET_TIMEOUT = 5500;
 const unsetInitialWalletVerificationFlag = () => {
-    const resolve = () => {
-        loadingAndLifecycle.setIsInitialWalletVerificationInProgress(false);
+    loadingAndLifecycle.setIsInitialWalletVerificationInProgress(false);
+};
+const unsetInitialWalletVerificationFlagWithTimeout = () => {
+    const timeout = setTimeout(() => {
+        unsetInitialWalletVerificationFlag();
         clearTimeout(timeout);
-        dynamicEvents.dynamicEvents.removeListener('walletAdded', resolve);
-    };
-    const timeout = setTimeout(resolve, UNSET_TIMEOUT);
-    dynamicEvents.dynamicEvents.once('walletAdded', resolve);
+        dynamicEvents.dynamicEvents.removeListener('walletAdded', unsetInitialWalletVerificationFlag);
+    }, UNSET_TIMEOUT);
 };
 
+exports.UNSET_TIMEOUT = UNSET_TIMEOUT;
 exports.unsetInitialWalletVerificationFlag = unsetInitialWalletVerificationFlag;
+exports.unsetInitialWalletVerificationFlagWithTimeout = unsetInitialWalletVerificationFlagWithTimeout;

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

@@ -1 +1,9 @@
+/**
+ * The max time the SDK will wait before unsetting the initial wallet verification flag.
+ * If the corresponding walletAdded event is triggered before this timeout, the flag will be unset immediately.
+ *
+ * See justification for this in comments where it is being called.
+ */
+export declare const UNSET_TIMEOUT = 5500;
 export declare const unsetInitialWalletVerificationFlag: () => void;
+export declare const unsetInitialWalletVerificationFlagWithTimeout: () => void;

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

@@ -10,13 +10,14 @@ import { setIsInitialWalletVerificationInProgress } from '../../../../../store/s
  */
 const UNSET_TIMEOUT = 5500;
 const unsetInitialWalletVerificationFlag = () => {
-    const resolve = () => {
-        setIsInitialWalletVerificationInProgress(false);
+    setIsInitialWalletVerificationInProgress(false);
+};
+const unsetInitialWalletVerificationFlagWithTimeout = () => {
+    const timeout = setTimeout(() => {
+        unsetInitialWalletVerificationFlag();
         clearTimeout(timeout);
-        dynamicEvents.removeListener('walletAdded', resolve);
-    };
-    const timeout = setTimeout(resolve, UNSET_TIMEOUT);
-    dynamicEvents.once('walletAdded', resolve);
+        dynamicEvents.removeListener('walletAdded', unsetInitialWalletVerificationFlag);
+    }, UNSET_TIMEOUT);
 };
 
-export { unsetInitialWalletVerificationFlag };
+export { UNSET_TIMEOUT, unsetInitialWalletVerificationFlag, unsetInitialWalletVerificationFlagWithTimeout };

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

@@ -20,7 +20,7 @@ var localStorage = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
 require('../../../../shared/consts/index.cjs');
-require('../../../../events/dynamicEvents.cjs');
+var dynamicEvents = require('../../../../events/dynamicEvents.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
@@ -161,6 +161,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             // Lock the variable that indicates that the login wallet verification is in progress
             // Read UserWalletsContext.tsx explanation for more context
             loadingAndLifecycle.setIsInitialWalletVerificationInProgress(true);
+            dynamicEvents.dynamicEvents.once('walletAdded', unsetInitialWalletVerificationFlag.unsetInitialWalletVerificationFlag);
             yield showPendingConnectView.showPendingConnectView(walletConnector, pushView);
             if (walletConnectorCore.isEmailWalletConnector(walletConnector)) {
                 if (walletConnectorCore.isEmailOTPWalletConnector(walletConnector)) {
@@ -238,7 +239,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             // 2. Add a useEffect somewhere that does primaryWallet.switchNetwork() and depends on primaryWallet
             // 3. The SDK will enter a broken state. Try signing a message with wagmi.
             // You can also add a "pause on exception" breakpoint in the debugger and see what happens during verification.
-            unsetInitialWalletVerificationFlag.unsetInitialWalletVerificationFlag();
+            unsetInitialWalletVerificationFlag.unsetInitialWalletVerificationFlagWithTimeout();
         }
     });
 };

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

@@ -16,7 +16,7 @@ import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import '../../../constants/values.js';
 import '../../../../shared/consts/index.js';
-import '../../../../events/dynamicEvents.js';
+import { dynamicEvents } from '../../../../events/dynamicEvents.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
@@ -34,7 +34,7 @@ import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHa
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
-import { unsetInitialWalletVerificationFlag } from './unsetInitialWalletVerificationFlag/unsetInitialWalletVerificationFlag.js';
+import { unsetInitialWalletVerificationFlag, unsetInitialWalletVerificationFlagWithTimeout } from './unsetInitialWalletVerificationFlag/unsetInitialWalletVerificationFlag.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../functions/compareChains/compareChains.js';
@@ -157,6 +157,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             // Lock the variable that indicates that the login wallet verification is in progress
             // Read UserWalletsContext.tsx explanation for more context
             setIsInitialWalletVerificationInProgress(true);
+            dynamicEvents.once('walletAdded', unsetInitialWalletVerificationFlag);
             yield showPendingConnectView(walletConnector, pushView);
             if (isEmailWalletConnector(walletConnector)) {
                 if (isEmailOTPWalletConnector(walletConnector)) {
@@ -234,7 +235,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             // 2. Add a useEffect somewhere that does primaryWallet.switchNetwork() and depends on primaryWallet
             // 3. The SDK will enter a broken state. Try signing a message with wagmi.
             // You can also add a "pause on exception" breakpoint in the debugger and see what happens during verification.
-            unsetInitialWalletVerificationFlag();
+            unsetInitialWalletVerificationFlagWithTimeout();
         }
     });
 };

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

@@ -7,6 +7,7 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var utils = require('@dynamic-labs/utils');
+var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../constants/values.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
@@ -36,7 +37,6 @@ require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/authMode/authMode.cjs');
@@ -122,6 +122,7 @@ const useDynamicWaas = () => {
     const walletConnectorOptions = walletOptions.useWalletConnectorOptions();
     const refresh = useRefreshUser.useRefreshUser();
     const relayUrl = (_b = (_a = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.sdk) === null || _a === void 0 ? void 0 : _a.waas) === null || _b === void 0 ? void 0 : _b.relayUrl;
+    const userWallets = UserWalletsContext.useUserWallets();
     const embeddedWalletSettings = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.sdk.embeddedWallets;
     const enabledChains = (_c = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.chainConfigurations) === null || _c === void 0 ? void 0 : _c.filter((c) => c.enabled);
     const primaryChain = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.find((chain) => chain.primary);
@@ -225,9 +226,11 @@ const useDynamicWaas = () => {
         });
         yield refresh();
     });
+    const getWaasWallets = React.useCallback(() => userWallets.filter((w) => w.key === 'dynamicwaas'), [userWallets]);
     return {
         createWalletAccount,
         dynamicWaasIsEnabled,
+        getWaasWallets,
         getWalletConnector,
         importPrivateKey,
         shouldAutoCreateDynamicWaasWallet,

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

@@ -14,6 +14,7 @@ export declare const useDynamicWaas: () => {
         rawPublicKey: string | Uint8Array | undefined;
     } | undefined)[]>;
     dynamicWaasIsEnabled: boolean;
+    getWaasWallets: () => import("@dynamic-labs/wallet-connector-core").Wallet<import("@dynamic-labs/wallet-connector-core").WalletConnectorCore.WalletConnector>[];
     getWalletConnector: (chainName: string) => IDynamicWaasConnector | undefined;
     importPrivateKey: ({ chainName, privateKey, }: {
         chainName: string;

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

@@ -3,6 +3,7 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback, useMemo } from 'react';
 import { EmbeddedWalletVersionEnum, JwtVerifiedCredentialFormatEnum, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { DynamicError } from '@dynamic-labs/utils';
+import { useUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../constants/values.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
@@ -32,7 +33,6 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../config/ApiEndpoint.js';
 import '../../../locale/locale.js';
 import '../../../store/state/authMode/authMode.js';
@@ -118,6 +118,7 @@ const useDynamicWaas = () => {
     const walletConnectorOptions = useWalletConnectorOptions();
     const refresh = useRefreshUser();
     const relayUrl = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.waas) === null || _b === void 0 ? void 0 : _b.relayUrl;
+    const userWallets = useUserWallets();
     const embeddedWalletSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets;
     const enabledChains = (_c = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.chainConfigurations) === null || _c === void 0 ? void 0 : _c.filter((c) => c.enabled);
     const primaryChain = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.find((chain) => chain.primary);
@@ -221,9 +222,11 @@ const useDynamicWaas = () => {
         });
         yield refresh();
     });
+    const getWaasWallets = useCallback(() => userWallets.filter((w) => w.key === 'dynamicwaas'), [userWallets]);
     return {
         createWalletAccount,
         dynamicWaasIsEnabled,
+        getWaasWallets,
         getWalletConnector,
         importPrivateKey,
         shouldAutoCreateDynamicWaasWallet,

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.cjs

@@ -120,16 +120,11 @@ require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 
 const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     const { primaryWallet, user, setShowAuthFlow, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleAcknowledgeExportPrompt } = useSyncEmbeddedWalletFlow.useSyncEmbeddedWalletFlow();
     const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
-    //should use useIsWaasWallet hook
     const isWaasWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((vc) => { var _a; return (_a = vc.walletName) === null || _a === void 0 ? void 0 : _a.startsWith('dynamicwaas'); });
-    // Check if it's a Sui wallet
-    const isSuiWallet = ((_a = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _a === void 0 ? void 0 : _a.connectedChain) === 'SUI';
-    // Check if it's a SOL wallet
-    const isSolWallet = ((_b = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _b === void 0 ? void 0 : _b.connectedChain) === 'SOL';
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     const { pushView } = ViewContext.useViewContext();
     const { getEOAWallet, isSmartWallet } = useSmartWallets.useSmartWallets();
@@ -145,9 +140,9 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
     catch (error) {
         // waas wallet
     }
-    const walletProperties = (_d = (_c = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId)) === null || _d === void 0 ? void 0 : _d.walletProperties;
+    const walletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId)) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const isTurnkeyHDWallet = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
-    const wallet = (_e = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _e !== void 0 ? _e : primaryWallet;
+    const wallet = (_c = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _c !== void 0 ? _c : primaryWallet;
     const [showSkeleton, setShowSkeleton] = React.useState(false);
     // eslint-disable-next-line arrow-body-style
     React.useEffect(() => {
@@ -167,14 +162,14 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     const { isLoading: exportLoading } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _f, _g;
+        var _d, _e;
         const iframeContainerElement = iframeContainerRef.current;
         if (!iframeContainerElement ||
-            ((_f = iframeContainerElement === null || iframeContainerElement === void 0 ? void 0 : iframeContainerElement.children) === null || _f === void 0 ? void 0 : _f.length) > 0) {
+            ((_d = iframeContainerElement === null || iframeContainerElement === void 0 ? void 0 : iframeContainerElement.children) === null || _d === void 0 ? void 0 : _d.length) > 0) {
             return;
         }
         if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-            yield ((_g = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _g === void 0 ? void 0 : _g.createOrRestoreSession());
+            yield ((_e = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _e === void 0 ? void 0 : _e.createOrRestoreSession());
         }
         if (isTurnkeyWallet) {
             return turnkeyExport.initExport({
@@ -186,7 +181,7 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         return;
     }));
     const { mutate: handleExportWallet, isLoading, error, data, } = useMutation.useMutation(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j, _k;
+        var _f, _g, _h;
         handleAcknowledgeExportPrompt();
         if (isTurnkeyWallet) {
             try {
@@ -197,11 +192,11 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
                     wallet: wallet,
                 });
             }
-            catch (_l) {
+            catch (_j) {
                 if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
-                    ((_h = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _h === void 0 ? void 0 : _h.removeSessionKeys)) {
-                    yield ((_j = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _j === void 0 ? void 0 : _j.removeSessionKeys());
-                    yield ((_k = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _k === void 0 ? void 0 : _k.createOrRestoreSession({
+                    ((_f = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _f === void 0 ? void 0 : _f.removeSessionKeys)) {
+                    yield ((_g = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _g === void 0 ? void 0 : _g.removeSessionKeys());
+                    yield ((_h = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _h === void 0 ? void 0 : _h.createOrRestoreSession({
                         ignoreRestore: true,
                     }));
                 }
@@ -222,7 +217,7 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
                     wallet: wallet,
                 });
             }
-            catch (_m) {
+            catch (_k) {
                 return undefined;
             }
         }
@@ -259,44 +254,6 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
                                     setShowAuthFlow(false);
                                     setDynamicWidgetView('send-balance');
                                 }, className: 'embedded-reveal-view__zerodev-warning__link-button', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'primary', className: 'underline', copykey: 'dyn_embedded_reveal.aa_warning.button', children: t('dyn_embedded_reveal.aa_warning.button') }) })] })] })), jsxRuntime.jsx("div", { className: 'embedded-reveal-view__body__description', children: !(!isLoading && data && !error) && (jsxRuntime.jsx("div", { className: 'embedded-reveal-view__header', children: jsxRuntime.jsx("div", { className: 'embedded-reveal-view__header__hero', children: jsxRuntime.jsx(exportEmbeddedHero.ReactComponent, {}) }) })) })] }));
-    React.useEffect(() => {
-        var _a;
-        if (((_a = iframeContainerRef === null || iframeContainerRef === void 0 ? void 0 : iframeContainerRef.current) === null || _a === void 0 ? void 0 : _a.children) && data) {
-            // eslint-disable-next-line prefer-destructuring
-            const iframeElement = iframeContainerRef.current.children[0];
-            let height = '88px';
-            let minHeight = '88px';
-            // Determine height based on wallet type and other conditions
-            if (!isTurnkeyHDWallet || exportPrivateKey) {
-                if (isSolWallet) {
-                    height = '140px';
-                    minHeight = '140px';
-                }
-                else if (isSuiWallet) {
-                    height = '100px';
-                    minHeight = '100px';
-                }
-                else {
-                    height = '88px';
-                    minHeight = '88px';
-                }
-            }
-            else {
-                // Turnkey HD wallet case
-                height = '120px';
-                minHeight = '120px';
-            }
-            iframeElement === null || iframeElement === void 0 ? void 0 : iframeElement.setAttribute('style', `height: ${height}; min-height: ${minHeight}; width: 100%; border: none; background: transparent; overflow: hidden;`);
-        }
-    }, [
-        iframeContainerRef,
-        data,
-        isTurnkeyHDWallet,
-        isWaasWallet,
-        exportPrivateKey,
-        isSuiWallet,
-        isSolWallet,
-    ]);
     React.useEffect(() => {
         if (data) {
             // Show skeleton first
@@ -343,14 +300,7 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
             return `${baseClass} ${baseClass}--hidden`;
         }
         if (isWaasWallet) {
-            const waasClass = `${baseClass} ${baseClass}--waas`;
-            if (isSuiWallet) {
-                return `${waasClass} ${baseClass}--sui`;
-            }
-            if (isSolWallet) {
-                return `${waasClass} ${baseClass}--sol`;
-            }
-            return waasClass;
+            return `${baseClass} ${baseClass}--waas`;
         }
         return baseClass;
     };
@@ -362,29 +312,10 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         if (showSkeleton) {
             return `${baseClass} ${baseClass}--invisible`;
         }
-        if (isWaasWallet) {
-            if (isSuiWallet) {
-                return `${baseClass} ${baseClass}--sui`;
-            }
-            if (isSolWallet) {
-                return `${baseClass} ${baseClass}--sol`;
-            }
-        }
         return baseClass;
     };
     const getSkeletonLines = () => {
-        let lineCount = 4; // Default for 88px height
-        if (isWaasWallet) {
-            if (isSolWallet) {
-                lineCount = 7; // For 140px height
-            }
-            else if (isSuiWallet) {
-                lineCount = 5; // For 100px height
-            }
-        }
-        else if (isTurnkeyHDWallet && !exportPrivateKey) {
-            lineCount = 6; // For 120px height
-        }
+        const lineCount = 5; // Updated for 110px height
         const lines = [];
         for (let i = 0; i < lineCount; i++) {
             const isLastLine = i === lineCount - 1;
@@ -398,11 +329,7 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { trailing: isPromptForExport ? null : closeButton, children: jsxRuntime.jsx(Typography.Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: title }) }), jsxRuntime.jsx("div", { className: 'embedded-reveal-view', children: jsxRuntime.jsxs("div", { className: getBodyClassName(), children: [(!isWaasWallet ||
                             !hasInjectedCredential ||
                             title !== credentialTitle) &&
-                            contentHeader, isTurnkeyWallet || isWaasWallet ? (jsxRuntime.jsxs("div", { className: getCredentialContainerClassName(), children: [jsxRuntime.jsx("div", { id: constants.iframeContainerId, className: getIframeContainerClassName(), ref: iframeContainerRef }), showSkeleton && data && (jsxRuntime.jsx("div", { className: `embedded-reveal-view__body__skeleton-container${isWaasWallet && isSuiWallet
-                                        ? ' embedded-reveal-view__body__skeleton-container--sui'
-                                        : isWaasWallet && isSolWallet
-                                            ? ' embedded-reveal-view__body__skeleton-container--sol'
-                                            : ''}`, children: getSkeletonLines() }))] })) : null, hasInjectedCredential ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonPadding: 'medium', buttonVariant: 'brand-primary', onClick: () => {
+                            contentHeader, isTurnkeyWallet || isWaasWallet ? (jsxRuntime.jsxs("div", { className: getCredentialContainerClassName(), children: [jsxRuntime.jsx("div", { id: constants.iframeContainerId, className: getIframeContainerClassName(), ref: iframeContainerRef }), showSkeleton && data && (jsxRuntime.jsx("div", { className: 'embedded-reveal-view__body__skeleton-container', children: getSkeletonLines() }))] })) : null, hasInjectedCredential ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonPadding: 'medium', buttonVariant: 'brand-primary', onClick: () => {
                                         setShowAuthFlow(false);
                                     }, loading: isLoading, copykey: 'dyn_embedded_reveal.done_button_label', typographyProps: {
                                         color: 'inherit',

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.js

@@ -116,16 +116,11 @@ import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 
 const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     const { primaryWallet, user, setShowAuthFlow, environmentId } = useInternalDynamicContext();
     const { handleAcknowledgeExportPrompt } = useSyncEmbeddedWalletFlow();
     const { isTurnkeyWallet } = useIsTurnkeyWallet();
-    //should use useIsWaasWallet hook
     const isWaasWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((vc) => { var _a; return (_a = vc.walletName) === null || _a === void 0 ? void 0 : _a.startsWith('dynamicwaas'); });
-    // Check if it's a Sui wallet
-    const isSuiWallet = ((_a = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _a === void 0 ? void 0 : _a.connectedChain) === 'SUI';
-    // Check if it's a SOL wallet
-    const isSolWallet = ((_b = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _b === void 0 ? void 0 : _b.connectedChain) === 'SOL';
     const { setDynamicWidgetView } = useWidgetContext();
     const { pushView } = useViewContext();
     const { getEOAWallet, isSmartWallet } = useSmartWallets();
@@ -141,9 +136,9 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
     catch (error) {
         // waas wallet
     }
-    const walletProperties = (_d = (_c = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId)) === null || _d === void 0 ? void 0 : _d.walletProperties;
+    const walletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId)) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const isTurnkeyHDWallet = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
-    const wallet = (_e = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _e !== void 0 ? _e : primaryWallet;
+    const wallet = (_c = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _c !== void 0 ? _c : primaryWallet;
     const [showSkeleton, setShowSkeleton] = useState(false);
     // eslint-disable-next-line arrow-body-style
     useEffect(() => {
@@ -163,14 +158,14 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     const { isLoading: exportLoading } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _f, _g;
+        var _d, _e;
         const iframeContainerElement = iframeContainerRef.current;
         if (!iframeContainerElement ||
-            ((_f = iframeContainerElement === null || iframeContainerElement === void 0 ? void 0 : iframeContainerElement.children) === null || _f === void 0 ? void 0 : _f.length) > 0) {
+            ((_d = iframeContainerElement === null || iframeContainerElement === void 0 ? void 0 : iframeContainerElement.children) === null || _d === void 0 ? void 0 : _d.length) > 0) {
             return;
         }
         if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-            yield ((_g = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _g === void 0 ? void 0 : _g.createOrRestoreSession());
+            yield ((_e = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _e === void 0 ? void 0 : _e.createOrRestoreSession());
         }
         if (isTurnkeyWallet) {
             return initExport({
@@ -182,7 +177,7 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         return;
     }));
     const { mutate: handleExportWallet, isLoading, error, data, } = useMutation(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j, _k;
+        var _f, _g, _h;
         handleAcknowledgeExportPrompt();
         if (isTurnkeyWallet) {
             try {
@@ -193,11 +188,11 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
                     wallet: wallet,
                 });
             }
-            catch (_l) {
+            catch (_j) {
                 if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
-                    ((_h = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _h === void 0 ? void 0 : _h.removeSessionKeys)) {
-                    yield ((_j = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _j === void 0 ? void 0 : _j.removeSessionKeys());
-                    yield ((_k = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _k === void 0 ? void 0 : _k.createOrRestoreSession({
+                    ((_f = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _f === void 0 ? void 0 : _f.removeSessionKeys)) {
+                    yield ((_g = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _g === void 0 ? void 0 : _g.removeSessionKeys());
+                    yield ((_h = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _h === void 0 ? void 0 : _h.createOrRestoreSession({
                         ignoreRestore: true,
                     }));
                 }
@@ -218,7 +213,7 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
                     wallet: wallet,
                 });
             }
-            catch (_m) {
+            catch (_k) {
                 return undefined;
             }
         }
@@ -255,44 +250,6 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
                                     setShowAuthFlow(false);
                                     setDynamicWidgetView('send-balance');
                                 }, className: 'embedded-reveal-view__zerodev-warning__link-button', children: jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'primary', className: 'underline', copykey: 'dyn_embedded_reveal.aa_warning.button', children: t('dyn_embedded_reveal.aa_warning.button') }) })] })] })), jsx("div", { className: 'embedded-reveal-view__body__description', children: !(!isLoading && data && !error) && (jsx("div", { className: 'embedded-reveal-view__header', children: jsx("div", { className: 'embedded-reveal-view__header__hero', children: jsx(SvgExportEmbeddedHero, {}) }) })) })] }));
-    useEffect(() => {
-        var _a;
-        if (((_a = iframeContainerRef === null || iframeContainerRef === void 0 ? void 0 : iframeContainerRef.current) === null || _a === void 0 ? void 0 : _a.children) && data) {
-            // eslint-disable-next-line prefer-destructuring
-            const iframeElement = iframeContainerRef.current.children[0];
-            let height = '88px';
-            let minHeight = '88px';
-            // Determine height based on wallet type and other conditions
-            if (!isTurnkeyHDWallet || exportPrivateKey) {
-                if (isSolWallet) {
-                    height = '140px';
-                    minHeight = '140px';
-                }
-                else if (isSuiWallet) {
-                    height = '100px';
-                    minHeight = '100px';
-                }
-                else {
-                    height = '88px';
-                    minHeight = '88px';
-                }
-            }
-            else {
-                // Turnkey HD wallet case
-                height = '120px';
-                minHeight = '120px';
-            }
-            iframeElement === null || iframeElement === void 0 ? void 0 : iframeElement.setAttribute('style', `height: ${height}; min-height: ${minHeight}; width: 100%; border: none; background: transparent; overflow: hidden;`);
-        }
-    }, [
-        iframeContainerRef,
-        data,
-        isTurnkeyHDWallet,
-        isWaasWallet,
-        exportPrivateKey,
-        isSuiWallet,
-        isSolWallet,
-    ]);
     useEffect(() => {
         if (data) {
             // Show skeleton first
@@ -339,14 +296,7 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
             return `${baseClass} ${baseClass}--hidden`;
         }
         if (isWaasWallet) {
-            const waasClass = `${baseClass} ${baseClass}--waas`;
-            if (isSuiWallet) {
-                return `${waasClass} ${baseClass}--sui`;
-            }
-            if (isSolWallet) {
-                return `${waasClass} ${baseClass}--sol`;
-            }
-            return waasClass;
+            return `${baseClass} ${baseClass}--waas`;
         }
         return baseClass;
     };
@@ -358,29 +308,10 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         if (showSkeleton) {
             return `${baseClass} ${baseClass}--invisible`;
         }
-        if (isWaasWallet) {
-            if (isSuiWallet) {
-                return `${baseClass} ${baseClass}--sui`;
-            }
-            if (isSolWallet) {
-                return `${baseClass} ${baseClass}--sol`;
-            }
-        }
         return baseClass;
     };
     const getSkeletonLines = () => {
-        let lineCount = 4; // Default for 88px height
-        if (isWaasWallet) {
-            if (isSolWallet) {
-                lineCount = 7; // For 140px height
-            }
-            else if (isSuiWallet) {
-                lineCount = 5; // For 100px height
-            }
-        }
-        else if (isTurnkeyHDWallet && !exportPrivateKey) {
-            lineCount = 6; // For 120px height
-        }
+        const lineCount = 5; // Updated for 110px height
         const lines = [];
         for (let i = 0; i < lineCount; i++) {
             const isLastLine = i === lineCount - 1;
@@ -394,11 +325,7 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
     return (jsxs(Fragment, { children: [jsx(ModalHeader, { trailing: isPromptForExport ? null : closeButton, children: jsx(Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: title }) }), jsx("div", { className: 'embedded-reveal-view', children: jsxs("div", { className: getBodyClassName(), children: [(!isWaasWallet ||
                             !hasInjectedCredential ||
                             title !== credentialTitle) &&
-                            contentHeader, isTurnkeyWallet || isWaasWallet ? (jsxs("div", { className: getCredentialContainerClassName(), children: [jsx("div", { id: iframeContainerId, className: getIframeContainerClassName(), ref: iframeContainerRef }), showSkeleton && data && (jsx("div", { className: `embedded-reveal-view__body__skeleton-container${isWaasWallet && isSuiWallet
-                                        ? ' embedded-reveal-view__body__skeleton-container--sui'
-                                        : isWaasWallet && isSolWallet
-                                            ? ' embedded-reveal-view__body__skeleton-container--sol'
-                                            : ''}`, children: getSkeletonLines() }))] })) : null, hasInjectedCredential ? (jsxs(Fragment, { children: [jsx(TypographyButton, { buttonPadding: 'medium', buttonVariant: 'brand-primary', onClick: () => {
+                            contentHeader, isTurnkeyWallet || isWaasWallet ? (jsxs("div", { className: getCredentialContainerClassName(), children: [jsx("div", { id: iframeContainerId, className: getIframeContainerClassName(), ref: iframeContainerRef }), showSkeleton && data && (jsx("div", { className: 'embedded-reveal-view__body__skeleton-container', children: getSkeletonLines() }))] })) : null, hasInjectedCredential ? (jsxs(Fragment, { children: [jsx(TypographyButton, { buttonPadding: 'medium', buttonVariant: 'brand-primary', onClick: () => {
                                         setShowAuthFlow(false);
                                     }, loading: isLoading, copykey: 'dyn_embedded_reveal.done_button_label', typographyProps: {
                                         color: 'inherit',