npm - @dynamic-labs/sdk-react-core - Versions diffs - 3.0.0-alpha.9 → 3.0.1 - Mend

@dynamic-labs/sdk-react-core 3.0.0-alpha.9 → 3.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1376) hide show

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs CHANGED Viewed

@@ -14,11 +14,10 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-var localStorage$1 = require('../../../constants/localStorage.cjs');
+var localStorage = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
-var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('../../../../store/state/loadingAndLifecycle.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -27,17 +26,18 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../../functions/find
 var findTurnkeyWallet = require('../../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
+var getUserWalletsFromVerifiedCredentials = require('../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
+var addPasskeyIdentifierToWalletConnector = require('../../../functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.cjs');
 require('../../../../config/ApiEndpoint.cjs');
 var embeddedWallets = require('../../../../data/api/embeddedWallets/embeddedWallets.cjs');
-require('@dynamic-labs/store');
+require('../../../../store/state/user/user.cjs');
 require('../../../../locale/locale.cjs');
-var getUserWalletsFromVerifiedCredentials = require('../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
-var addPasskeyIdentifierToWalletConnector = require('../../../functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.cjs');
-var getEOAWallet = require('../../../functions/getEOAWallet/getEOAWallet.cjs');
+var user = require('../../../../data/api/user/user.cjs');
 var getUserVerifiedCredentialType = require('../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.cjs');
 var hasEmbeddedWallet = require('../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
 var getEmbeddedWalletAuthHandler = require('../../../functions/getEmbeddedWalletAuthHandler/getEmbeddedWalletAuthHandler.cjs');
 var getEmbeddedWalletSessionExpiration = require('../../../functions/getEmbeddedWalletSessionExpiration/getEmbeddedWalletSessionExpiration.cjs');
+require('../../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -47,11 +47,13 @@ require('react-dom');
 var useElementById = require('../../useElementById/useElementById.cjs');
 var WalletContext = require('../../../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
-var validateTurnkeyProviderEnabled = require('../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.cjs');
-var passkeyRecovery = require('../../../../views/Passkey/utils/passkeyRecovery/passkeyRecovery.cjs');
 var turnkeyExport = require('../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.cjs');
-var useTurnkey = require('./useTurnkey/useTurnkey.cjs');
+var passkeyRecovery = require('../../../../views/Passkey/utils/passkeyRecovery/passkeyRecovery.cjs');
+var validateTurnkeyProviderEnabled = require('../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.cjs');
+var usePasskeyRecovery = require('../../usePasskeyRecovery/usePasskeyRecovery.cjs');
+var useSmartWallets = require('../../useSmartWallets/useSmartWallets.cjs');
 var constants = require('./constants.cjs');
+var useTurnkey = require('./useTurnkey/useTurnkey.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
@@ -62,6 +64,8 @@ require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('../../../../store/state/environmentId.cjs');
+require('../../../../store/state/walletConnectorOptions.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../components/Alert/Alert.cjs');
@@ -81,21 +85,38 @@ require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
 require('qrcode');
 require('formik');
-require('../../../../views/WalletList/WalletList.cjs');
+require('../../../../context/FooterAnimationContext/index.cjs');
+require('../../../../context/WalletGroupContext/WalletGroupContext.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('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../../store/state/sendBalances.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');
+require('../../../../../polyfills.cjs');
+require('../../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../../context/FundingContext/FundingContext.cjs');
+require('../../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
+require('../../../../store/state/tokenBalances.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
+const isConnectorSessionKeyActive = (connector) => {
+    var _a;
+    if (!connector || !walletConnectorCore.isSessionKeyCompatibleWalletConnector(connector))
+        return false;
+    return Boolean((_a = connector.sessionKeys) === null || _a === void 0 ? void 0 : _a.publicKey);
+};
 // Hook exposed to customers
 /**
  *
@@ -112,14 +133,22 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
  * }
  */
 const useSecureEnclaveEmbeddedWallet = () => {
-    var _a, _b, _c, _d, _e, _f;
-    const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
+    var _a, _b, _c, _d;
+    const { projectSettings, primaryWallet, user: user$1, environmentId, walletConnectorOptions, } = useInternalDynamicContext.useInternalDynamicContext();
     const { createTurnkeyWallet } = useTurnkey.useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createRootElement } = useElementById.useElementById();
     const { isLoadingEmbeddedWallet, setIsLoadingEmbeddedWallet } = WalletContext.useWalletContext();
-    const wallet = getEOAWallet.getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
-    const userHasEmbeddedWallet = React.useCallback(() => hasEmbeddedWallet.hasEmbeddedWallet(user, 'turnkey'), [user]);
+    const { getEOAWallet } = useSmartWallets.useSmartWallets();
+    const wallet = (_a = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _a !== void 0 ? _a : primaryWallet;
+    const userHasEmbeddedWallet = React.useCallback(() => hasEmbeddedWallet.hasEmbeddedWallet(user$1, 'turnkey'), [user$1]);
+    const getWalletVersion = React.useCallback(() => {
+        if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
+            return constants.EmbeddedWalletVersion.V2;
+        }
+        return constants.EmbeddedWalletVersion.V1;
+    }, [wallet === null || wallet === void 0 ? void 0 : wallet.connector]);
+    const { shouldInitRecovery, initPasskeyRecoveryProcess } = usePasskeyRecovery.usePasskeyRecovery();
     /**
      * Creates a new secure enclave embedded wallet according to the settings from the dashboard
      * @param chain - optional chain parameter to create the wallet for
@@ -127,13 +156,13 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _g;
-        if (!user) {
+        var _e;
+        if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains);
-        const isManualMode = ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation) === false;
+        const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user$1);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user$1, chains);
+        const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
         // if user has a wallet and it's not embedded,
         // throw error to follow another flow and set up the right wallet
         // However, if the user is in manual mode continue.
@@ -146,7 +175,51 @@ const useSecureEnclaveEmbeddedWallet = () => {
         // TEMP: immediately disable loading state
         setIsLoadingEmbeddedWallet(false);
         return createTurnkeyWallet(chains, options);
-    }), [createTurnkeyWallet, projectSettings, setIsLoadingEmbeddedWallet, user]);
+    }), [createTurnkeyWallet, projectSettings, setIsLoadingEmbeddedWallet, user$1]);
+    /**
+     * Creates a new secure enclave embedded wallet account
+     * @param chain - chain parameter to create the wallet for
+     * @returns Promise<UserProfile | undefined>
+     */
+    const createEmbeddedWalletAccount = React.useCallback((_f) => _tslib.__awaiter(void 0, [_f], void 0, function* ({ chain }) {
+        var _g, _h, _j;
+        if (!user$1) {
+            throw new Error(errors.USER_NOT_LOGGED_IN);
+        }
+        validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user$1);
+        const turnkeyWalletId = (_g = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _g === void 0 ? void 0 : _g.turnkeyHDWalletId;
+        if (!turnkeyWalletId) {
+            throw new utils.DynamicError('No HD wallet was found for this user to derive a wallet account. Use createEmbeddedWallet first', 'NoHdWalletFound');
+        }
+        const requestToStamp = yield embeddedWallets.getCreateEmbeddedWalletAccountRequest({
+            chain,
+            environmentId,
+        });
+        if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
+            yield ((_h = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _h === void 0 ? void 0 : _h.createOrRestoreSession({
+                ignoreRestore: true,
+            }));
+        }
+        else if (yield shouldInitRecovery()) {
+            yield initPasskeyRecoveryProcess('email');
+        }
+        const signedRequest = yield ((_j = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _j === void 0 ? void 0 : _j.stampCreateWalletAccountRequest({
+            request: requestToStamp,
+        }));
+        yield embeddedWallets.createEmbeddedWalletAccount({
+            createEmbeddedWalletAccountRequest: signedRequest,
+            environmentId,
+        });
+        return user.refreshUserJwt({ environmentId });
+    }), [
+        environmentId,
+        wallet === null || wallet === void 0 ? void 0 : wallet.connector,
+        initPasskeyRecoveryProcess,
+        projectSettings,
+        shouldInitRecovery,
+        user$1,
+    ]);
     /**
      * Creates or restores a secure enclave embedded wallet session
      * If it detects that the session is possible to be restored, it will restore it
@@ -154,13 +227,18 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'session_created' | 'session_restored'> - returns a string indicating the status of the session
      */
     const createOrRestoreSession = React.useCallback((options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j, _k, _l, _m, _o;
-        if (!user) {
+        var _k, _l, _m, _o, _p, _q;
+        if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector)) {
-            const publicKey = yield walletConnector.createOrRestoreSession();
-            return publicKey;
+        const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
+        if (primaryConnector &&
+            walletConnectorCore.isSessionKeyCompatibleWalletConnector(primaryConnector)) {
+            return primaryConnector.createOrRestoreSession();
+        }
+        const eoaConnector = wallet === null || wallet === void 0 ? void 0 : wallet.connector;
+        if (eoaConnector && walletConnectorCore.isSessionKeyCompatibleWalletConnector(eoaConnector)) {
+            return eoaConnector.createOrRestoreSession();
         }
         const turnkeyRecoveryHandler = getEmbeddedWalletAuthHandler.getEmbeddedWalletAuthHandler(wallet === null || wallet === void 0 ? void 0 : wallet.connector);
         if (turnkeyRecoveryHandler.isSessionActive()) {
@@ -168,13 +246,13 @@ const useSecureEnclaveEmbeddedWallet = () => {
         }
         const turnkeyAuthIframeContainerRef = createRootElement(constants.iframeContainerId);
         // try to restore session if possible
-        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration)) {
+        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_k = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _k === void 0 ? void 0 : _k.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield passkeyRecovery.restoreEmbeddedWalletSession({
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId: constants.iframeElementId,
-                    sessionExpiration: getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_k = (_j = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _j === void 0 ? void 0 : _j.embeddedWallets) === null || _k === void 0 ? void 0 : _k.sessionKeyDuration),
-                    user,
+                    sessionExpiration: getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_m = (_l = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _l === void 0 ? void 0 : _l.embeddedWallets) === null || _m === void 0 ? void 0 : _m.sessionKeyDuration),
+                    user: user$1,
                     wallet: primaryWallet,
                 });
                 if (sessionRestored)
@@ -192,21 +270,21 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!userHasEmbeddedWallet() || !hasRecoveryEmail) {
             throw new utils.DynamicError('User does not have a secure enclave wallet or a verified email', errors.INVALID_WALLET_DATA);
         }
-        const organizationId = (_o = (_m = (_l = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _l === void 0 ? void 0 : _l.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _m === void 0 ? void 0 : _m.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeySubOrganizationId;
+        const organizationId = (_q = (_p = (_o = user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials) === null || _o === void 0 ? void 0 : _o.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _p === void 0 ? void 0 : _p.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),
             emailCode: options.oneTimeCode,
             userId: turnkeyRecoveryHandler.recoveryUserId,
         };
-        localStorage.LocalStorage.setToLS(localStorage$1.EMBEDDED_WALLET_SESSION_SETTINGS, sessionSettings);
+        utils.StorageService.setItem(localStorage.EMBEDDED_WALLET_SESSION_SETTINGS, sessionSettings);
         return errors.SESSION_CREATED;
     }), [
         createRootElement,
-        user,
+        user$1,
         hasRecoveryEmail,
         primaryWallet,
-        (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.sessionKeyDuration,
+        (_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.embeddedWallets) === null || _c === void 0 ? void 0 : _c.sessionKeyDuration,
         userHasEmbeddedWallet,
         wallet === null || wallet === void 0 ? void 0 : wallet.connector,
     ]);
@@ -216,27 +294,27 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = React.useCallback((options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _p, _q;
-        if (!user) {
+        var _r, _s;
+        if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _p === void 0 ? void 0 : _p.chainConfigurations, user.verifiedCredentials);
+        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_r = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _r === void 0 ? void 0 : _r.chainConfigurations, user$1.verifiedCredentials);
         if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
             throw new utils.DynamicError('Wallet connector not found', errors.INVALID_WALLET_DATA);
         }
         const walletConnector = turnkeyWallet.walletConnector;
-        walletConnector.setEmail(user === null || user === void 0 ? void 0 : user.email);
-        if (user && !(user === null || user === void 0 ? void 0 : user.email)) {
-            addPasskeyIdentifierToWalletConnector.addPasskeyIdentifierToWalletConnector(walletConnector, user);
+        walletConnector.setEmail(user$1 === null || user$1 === void 0 ? void 0 : user$1.email);
+        if (user$1 && !(user$1 === null || user$1 === void 0 ? void 0 : user$1.email)) {
+            addPasskeyIdentifierToWalletConnector.addPasskeyIdentifierToWalletConnector(walletConnector, user$1);
         }
-        const hasEmailVC = getUserVerifiedCredentialType.getUserVerifiedCredentialType(user, sdkApiCore.JwtVerifiedCredentialFormatEnum.Email);
+        const hasEmailVC = getUserVerifiedCredentialType.getUserVerifiedCredentialType(user$1, sdkApiCore.JwtVerifiedCredentialFormatEnum.Email);
         // return a new passkey if the user doesn't have a wallet yet or
         // none of the requirements to add a passkey to an existing wallet are met
         if (!('id' in turnkeyWallet) || !hasEmailVC) {
             return walletConnector.getWebAuthnAttestation();
         }
-        const turnkeySubOrganizationId = (_q = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
+        const turnkeySubOrganizationId = (_s = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _s === void 0 ? void 0 : _s.turnkeySubOrganizationId;
         if (!turnkeySubOrganizationId) {
             throw new utils.DynamicError('No sub organization id found for the wallet', errors.INVALID_WALLET_DATA);
         }
@@ -263,7 +341,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         createOrRestoreSession,
         environmentId,
         projectSettings,
-        user,
+        user$1,
         walletConnectorOptions,
     ]);
     /**
@@ -271,41 +349,45 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Passkey[]>
      */
     const getPasskeys = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (!user) {
+        if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         const data = yield embeddedWallets.getUserPasskeys({
             environmentId: environmentId,
         });
         return data.passkeys;
-    }), [user, environmentId]);
-    const isEmailAuthSessionActive = (_d = ((wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
-        'getAuthenticatorHandler' in wallet.connector &&
-        ((_c = getEmbeddedWalletAuthHandler.getEmbeddedWalletAuthHandler(wallet.connector)) === null || _c === void 0 ? void 0 : _c.isSessionActive()))) !== null && _d !== void 0 ? _d : false;
-    const isSessionKeySessionActive = (_f = Boolean(walletConnector &&
-        walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector) &&
-        ((_e = walletConnector.sessionKeys) === null || _e === void 0 ? void 0 : _e.publicKey))) !== null && _f !== void 0 ? _f : false;
+    }), [user$1, environmentId]);
+    const isEmailAuthSessionActive = React.useMemo(() => {
+        var _a;
+        const eoaConnector = wallet === null || wallet === void 0 ? void 0 : wallet.connector;
+        if (!eoaConnector || !('getAuthenticatorHandler' in eoaConnector))
+            return false;
+        return (_a = getEmbeddedWalletAuthHandler.getEmbeddedWalletAuthHandler(eoaConnector)) === null || _a === void 0 ? void 0 : _a.isSessionActive();
+    }, [wallet === null || wallet === void 0 ? void 0 : wallet.connector]);
+    const isSessionKeySessionAAActive = React.useMemo(() => isConnectorSessionKeyActive(wallet === null || wallet === void 0 ? void 0 : wallet.connector), [wallet === null || wallet === void 0 ? void 0 : wallet.connector]);
+    const isSessionKeySessionActive = React.useMemo(() => isConnectorSessionKeyActive(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector), [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector]);
     /**
      * Checks if the embedded wallet session is active
-     * @returns boolean
      */
-    const isSessionActive = isEmailAuthSessionActive || isSessionKeySessionActive;
+    const isSessionActive = isEmailAuthSessionActive ||
+        isSessionKeySessionActive ||
+        isSessionKeySessionAAActive;
     /**
      * export the recovery phrase or private key of the embedded wallet
      * @param options - optional parameter object containing the type of key to reveal 'recoveryPhrase' | 'privateKey'
      * and the html container id to render the iframe into
      * @returns Promise<string> - returns the embedded wallet recovery phrase or private key
      */
-    const revealEmbeddedWalletKey = (_r) => _tslib.__awaiter(void 0, [_r], void 0, function* ({ type, htmlContainerId, }) {
-        var _s, _t;
-        if (!user) {
+    const revealEmbeddedWalletKey = React.useCallback((_t) => _tslib.__awaiter(void 0, [_t], void 0, function* ({ type, htmlContainerId, }) {
+        var _u, _v, _w, _x, _y, _z;
+        if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         yield turnkeyExport.cleanupExport({
-            wallet,
+            wallet: wallet,
         });
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_s = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _s === void 0 ? void 0 : _s.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
-        const turnkeyHDWalletId = (_t = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _t === void 0 ? void 0 : _t.turnkeyHDWalletId;
+        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_u = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _u === void 0 ? void 0 : _u.chainConfigurations, user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials);
+        const turnkeyHDWalletId = (_v = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _v === void 0 ? void 0 : _v.turnkeyHDWalletId;
         if (type === 'recoveryPhrase' && !turnkeyHDWalletId) {
             type = 'privateKey';
         }
@@ -313,32 +395,59 @@ const useSecureEnclaveEmbeddedWallet = () => {
         // hide the iframe container until the export is done
         // since it will show unrelated turnkey content
         iframeContainerElement.current.style.display = 'none';
+        if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
+            yield ((_w = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _w === void 0 ? void 0 : _w.createOrRestoreSession());
+        }
         yield turnkeyExport.initExport({
             iframeContainer: iframeContainerElement.current,
             iframeElementId: constants.revealIframeElementId,
-            wallet,
-        });
-        yield turnkeyExport.exportCredential({
-            address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
-            environmentId,
-            user,
-            wallet,
+            wallet: wallet,
         });
+        try {
+            yield turnkeyExport.exportCredential({
+                address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user: user$1,
+                wallet: wallet,
+            });
+        }
+        catch (_0) {
+            if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
+                ((_x = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _x === void 0 ? void 0 : _x.removeSessionKeys)) {
+                yield ((_y = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _y === void 0 ? void 0 : _y.removeSessionKeys());
+                yield ((_z = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _z === void 0 ? void 0 : _z.createOrRestoreSession({
+                    ignoreRestore: true,
+                }));
+            }
+            yield turnkeyExport.exportCredential({
+                address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user: user$1,
+                wallet: wallet,
+            });
+        }
         // show the iframe container after the export is done
         // to show the exported content only
         iframeContainerElement.current.style.display = 'block';
         return true;
-    });
+    }), [
+        createRootElement,
+        environmentId,
+        wallet,
+        (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.chainConfigurations,
+        user$1,
+        walletConnectorOptions,
+    ]);
     /**
      * Sends a one-time code to the user so they can create a session or add a new passkey
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _u, _v;
-        if (!user) {
+        var _1, _2;
+        if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_u = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _u === void 0 ? void 0 : _u.chainConfigurations, user.verifiedCredentials);
+        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_1 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _1 === void 0 ? void 0 : _1.chainConfigurations, user$1.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new utils.DynamicError('User does not have a valid secure enclave wallet', errors.INVALID_WALLET_DATA);
         }
@@ -349,7 +458,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new utils.DynamicError('Session is active. No need to create a new one', errors.ACTIVE_SESSION);
         }
         const turnkeyAuthIframeContainerRef = createRootElement(constants.iframeContainerId);
-        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, constants.iframeElementId, getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_v = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _v === void 0 ? void 0 : _v.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, constants.iframeElementId, getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_2 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _2 === void 0 ? void 0 : _2.sessionKeyDuration));
         if (!publicKey) {
             throw new utils.DynamicError(errors.ERROR_SENDING_CODE);
         }
@@ -363,22 +472,37 @@ const useSecureEnclaveEmbeddedWallet = () => {
         return errors.CODE_SENT;
     }), [
         createRootElement,
-        user,
+        user$1,
         environmentId,
         projectSettings,
         walletConnectorOptions,
     ]);
-    return {
+    return React.useMemo(() => ({
+        createEmbeddedWallet,
+        createEmbeddedWalletAccount,
+        createOrRestoreSession,
+        createPasskey,
+        getPasskeys,
+        getWalletVersion,
+        isLoadingEmbeddedWallet,
+        isSessionActive,
+        revealEmbeddedWalletKey,
+        sendOneTimeCode,
+        userHasEmbeddedWallet,
+    }), [
         createEmbeddedWallet,
+        createEmbeddedWalletAccount,
         createOrRestoreSession,
         createPasskey,
         getPasskeys,
+        getWalletVersion,
         isLoadingEmbeddedWallet,
         isSessionActive,
         revealEmbeddedWalletKey,
         sendOneTimeCode,
         userHasEmbeddedWallet,
-    };
+    ]);
 };
+exports.isConnectorSessionKeyActive = isConnectorSessionKeyActive;
 exports.useSecureEnclaveEmbeddedWallet = useSecureEnclaveEmbeddedWallet;

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
-import { ChainEnum } from '@dynamic-labs/sdk-api-core';
-import { WebAuthnAttestation } from '@dynamic-labs/wallet-connector-core';
-import { Wallet } from '../../../../shared';
+import { EmbeddedWalletChainEnum } from '@dynamic-labs/sdk-api-core';
+import { Wallet, WalletConnector, WebAuthnAttestation } from '@dynamic-labs/wallet-connector-core';
+import { EmbeddedWalletVersion } from './constants';
+export declare const isConnectorSessionKeyActive: (connector: WalletConnector | undefined) => boolean;
 /**
  *
  * @returns {
@@ -16,9 +17,12 @@ import { Wallet } from '../../../../shared';
  * }
  */
 export declare const useSecureEnclaveEmbeddedWallet: () => {
-    readonly createEmbeddedWallet: (chains?: ChainEnum[], options?: {
+    readonly createEmbeddedWallet: (chains?: EmbeddedWalletChainEnum[], options?: {
         webAuthnAttestation: WebAuthnAttestation;
     }) => Promise<Wallet | undefined>;
+    readonly createEmbeddedWalletAccount: ({ chain }: {
+        chain: EmbeddedWalletChainEnum;
+    }) => Promise<import("dist/packages/types/src").UserProfile | undefined>;
     readonly createOrRestoreSession: (options?: {
         oneTimeCode: string;
     } | undefined) => Promise<string | undefined>;
@@ -26,6 +30,7 @@ export declare const useSecureEnclaveEmbeddedWallet: () => {
         oneTimeCode: string;
     } | undefined) => Promise<WebAuthnAttestation>;
     readonly getPasskeys: () => Promise<import("@dynamic-labs/sdk-api-core").UserPasskey[]>;
+    readonly getWalletVersion: () => EmbeddedWalletVersion;
     readonly isLoadingEmbeddedWallet: boolean;
     readonly isSessionActive: boolean;
     readonly revealEmbeddedWalletKey: ({ type, htmlContainerId, }: {