@dynamic-labs/sdk-react-core 4.46.3 → 4.47.1

package/src/lib/utils/functions/clientSessionKeys/getClientSessionKeys.js

@@ -2,7 +2,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { StorageService, tracing } from '@dynamic-labs/utils';
 import { CLIENT_SESSION_KEYS, CLIENT_SESSION_KEYS_STORAGE_OPTIONS } from '../../constants/sessionStorage.js';
-import { p256Sign, p256Keygen, toEncodedFormat } from '../keyService/keyService.js';
+import { p256Keygen, toEncodedFormat, p256Sign } from '../keyService/keyService.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react';

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

@@ -35,6 +35,7 @@ require('@dynamic-labs/locale');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+var getClientSessionKeys = require('../../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
@@ -130,6 +131,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         else {
             walletUiUtils.disabledConfirmationOnce();
         }
+        yield getClientSessionKeys.generateClientSessionKeys();
         yield verifyWallet({
             captchaToken,
             publicWalletAddress,

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

@@ -31,6 +31,7 @@ import '@dynamic-labs/locale';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import { generateClientSessionKeys } from '../../../functions/clientSessionKeys/getClientSessionKeys.js';
 import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
@@ -126,6 +127,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         else {
             walletUiUtils.disabledConfirmationOnce();
         }
+        yield generateClientSessionKeys();
         yield verifyWallet({
             captchaToken,
             publicWalletAddress,

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

@@ -35,6 +35,7 @@ require('@dynamic-labs/locale');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+var getClientSessionKeys = require('../../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
@@ -188,6 +189,7 @@ const useConnectAndSignSplitSteps = () => {
                 }
                 return pushView('network-not-supported');
             }
+            yield getClientSessionKeys.generateClientSessionKeys();
             yield verifyWallet({
                 captchaToken: getCaptchaToken(),
                 publicWalletAddress: connectionResult.address,

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

@@ -31,6 +31,7 @@ import '@dynamic-labs/locale';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import { generateClientSessionKeys } from '../../../functions/clientSessionKeys/getClientSessionKeys.js';
 import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
@@ -184,6 +185,7 @@ const useConnectAndSignSplitSteps = () => {
                 }
                 return pushView('network-not-supported');
             }
+            yield generateClientSessionKeys();
             yield verifyWallet({
                 captchaToken: getCaptchaToken(),
                 publicWalletAddress: connectionResult.address,

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

@@ -32,6 +32,7 @@ require('@dynamic-labs/locale');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+var getClientSessionKeys = require('../../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 require('../../../../store/state/authMode/authMode.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
@@ -136,6 +137,7 @@ const useSignConnectOnlyUser = () => {
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
+            yield getClientSessionKeys.generateClientSessionKeys();
             yield verifyWallet({
                 captchaToken: getCaptchaToken(),
                 publicWalletAddress: connectionResult.address,

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

@@ -28,6 +28,7 @@ import '@dynamic-labs/locale';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import { generateClientSessionKeys } from '../../../functions/clientSessionKeys/getClientSessionKeys.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import '../../../../store/state/authMode/authMode.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
@@ -132,6 +133,7 @@ const useSignConnectOnlyUser = () => {
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
+            yield generateClientSessionKeys();
             yield verifyWallet({
                 captchaToken: getCaptchaToken(),
                 publicWalletAddress: connectionResult.address,

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

@@ -35,12 +35,6 @@ var usePromise = require('../usePromise/usePromise.cjs');
 const useClientSessionKeys = () => {
     const user = useOnboardingCompleteUser.useOnboardingCompleteUser();
     const sessionPublicKey = getClientSessionKeys.getClientSessionPublicKey();
-    usePromise.usePromise(getClientSessionKeys.generateClientSessionKeys, {
-        deps: [sessionPublicKey],
-        enabled: !sessionPublicKey,
-        initialData: undefined,
-        retries: 2,
-    });
     const getSignedSessionId = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (!(user === null || user === void 0 ? void 0 : user.sessionId) || !sessionPublicKey) {
             throw new Error('Session ID and public key are required');

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

@@ -23,7 +23,7 @@ import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
-import { getClientSessionPublicKey, getClientSessionSignature, generateClientSessionKeys } from '../../functions/clientSessionKeys/getClientSessionKeys.js';
+import { getClientSessionPublicKey, getClientSessionSignature } from '../../functions/clientSessionKeys/getClientSessionKeys.js';
 import '../../../events/dynamicEvents.js';
 import { useOnboardingCompleteUser } from '../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.js';
 import { usePromise } from '../usePromise/usePromise.js';
@@ -31,12 +31,6 @@ import { usePromise } from '../usePromise/usePromise.js';
 const useClientSessionKeys = () => {
     const user = useOnboardingCompleteUser();
     const sessionPublicKey = getClientSessionPublicKey();
-    usePromise(generateClientSessionKeys, {
-        deps: [sessionPublicKey],
-        enabled: !sessionPublicKey,
-        initialData: undefined,
-        retries: 2,
-    });
     const getSignedSessionId = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         if (!(user === null || user === void 0 ? void 0 : user.sessionId) || !sessionPublicKey) {
             throw new Error('Session ID and public key are required');

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var client = require('@dynamic-labs-sdk/client');
+var getClientSessionKeys = require('../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
 require('@dynamic-labs-sdk/client/core');
@@ -127,6 +128,7 @@ const useExternalAuth = () => {
             const sessionPublicKey = shouldRegisterSessionKeysOnSignin()
                 ? (yield generateSessionKey()).publicKey
                 : undefined;
+            yield getClientSessionKeys.generateClientSessionKeys();
             const response = yield client.signInWithExternalJwt({
                 externalJwt,
                 sessionPublicKey,

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

@@ -2,6 +2,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback, useMemo } from 'react';
 import { signInWithExternalJwt } from '@dynamic-labs-sdk/client';
+import { generateClientSessionKeys } from '../../functions/clientSessionKeys/getClientSessionKeys.js';
 import '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs-sdk/client/core';
@@ -123,6 +124,7 @@ const useExternalAuth = () => {
             const sessionPublicKey = shouldRegisterSessionKeysOnSignin()
                 ? (yield generateSessionKey()).publicKey
                 : undefined;
+            yield generateClientSessionKeys();
             const response = yield signInWithExternalJwt({
                 externalJwt,
                 sessionPublicKey,

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

@@ -159,7 +159,8 @@ const useSocialAccounts = () => {
         }
         return true;
     }, [handleError, projectSettings]);
-    const linkSocialAccount = React.useCallback((provider_1, ...args_1) => _tslib.__awaiter(void 0, [provider_1, ...args_1], void 0, function* (provider, { redirectUrl, showWidgetAfterConnection, triggerFundFromExchangeOnSuccess, payingWithDynamic, } = {
+    const linkSocialAccount = React.useCallback((provider_1, ...args_1) => _tslib.__awaiter(void 0, [provider_1, ...args_1], void 0, function* (provider, { forcePopup, redirectUrl, showWidgetAfterConnection, triggerFundFromExchangeOnSuccess, payingWithDynamic, } = {
+        forcePopup: false,
         payingWithDynamic: undefined,
         redirectUrl: undefined,
         showWidgetAfterConnection: false,
@@ -169,6 +170,7 @@ const useSocialAccounts = () => {
         try {
             yield connectSocialAccount({
                 authMode: 'link',
+                forcePopup,
                 payingWithDynamic,
                 provider,
                 redirectUrl,

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

@@ -10,6 +10,10 @@ type ConnectSocialProps = {
      * Whether to show the widget after a connection is made
      */
     showWidgetAfterConnection?: boolean;
+    /**
+     * Forces popup strategy instead of redirect
+     */
+    forcePopup?: boolean;
     /** Exchange to be funded */
     triggerFundFromExchangeOnSuccess?: ExchangeKeyEnum;
     /**
@@ -25,7 +29,7 @@ export declare const useSocialAccounts: () => {
     readonly isLinked: (provider: ProviderEnum) => boolean;
     readonly isProcessing: boolean;
     readonly isProcessingForProvider: (provider: ProviderEnum) => boolean;
-    readonly linkSocialAccount: (provider: ProviderEnum, { redirectUrl, showWidgetAfterConnection, triggerFundFromExchangeOnSuccess, payingWithDynamic, }?: ConnectSocialProps) => Promise<void>;
+    readonly linkSocialAccount: (provider: ProviderEnum, { forcePopup, redirectUrl, showWidgetAfterConnection, triggerFundFromExchangeOnSuccess, payingWithDynamic, }?: ConnectSocialProps) => Promise<void>;
     readonly signInWithSocialAccount: (provider: ProviderEnum, { redirectUrl, payingWithDynamic, showWidgetAfterConnection, triggerFundFromExchangeOnSuccess, }?: ConnectSocialProps) => Promise<void>;
     readonly unlinkSocialAccount: (provider: ProviderEnum, verifiedCredentialId?: string) => Promise<void>;
 };

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

@@ -155,7 +155,8 @@ const useSocialAccounts = () => {
         }
         return true;
     }, [handleError, projectSettings]);
-    const linkSocialAccount = useCallback((provider_1, ...args_1) => __awaiter(void 0, [provider_1, ...args_1], void 0, function* (provider, { redirectUrl, showWidgetAfterConnection, triggerFundFromExchangeOnSuccess, payingWithDynamic, } = {
+    const linkSocialAccount = useCallback((provider_1, ...args_1) => __awaiter(void 0, [provider_1, ...args_1], void 0, function* (provider, { forcePopup, redirectUrl, showWidgetAfterConnection, triggerFundFromExchangeOnSuccess, payingWithDynamic, } = {
+        forcePopup: false,
         payingWithDynamic: undefined,
         redirectUrl: undefined,
         showWidgetAfterConnection: false,
@@ -165,6 +166,7 @@ const useSocialAccounts = () => {
         try {
             yield connectSocialAccount({
                 authMode: 'link',
+                forcePopup,
                 payingWithDynamic,
                 provider,
                 redirectUrl,

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

@@ -40,6 +40,7 @@ require('@dynamic-labs/locale');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+var getClientSessionKeys = require('../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -224,6 +225,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 }));
             }
             if (authMode === 'signin') {
+                yield getClientSessionKeys.generateClientSessionKeys();
                 if (provider === sdkApiCore.ProviderEnum.Telegram && telegramAuthToken) {
                     const apiCall = () => oauth.telegramSignIn(environmentId, {
                         captchaToken,
@@ -338,6 +340,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 const keypair = yield generateSessionKey();
                 sessionPublicKey = keypair.publicKey;
             }
+            yield getClientSessionKeys.generateClientSessionKeys();
             const apiCall = () => oauth.farcasterSignIn(environmentId, {
                 address,
                 captchaToken,
@@ -376,7 +379,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
         shouldRegisterSessionKeysOnSignin,
         signInAccount,
     ]);
-    const connectSocialAccount = React.useCallback((_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ authMode, provider, validator, captchaToken, isHeadlessSocialSignIn, payingWithDynamic, triggerFundFromExchangeOnSuccess, redirectUrl, telegramAuthToken, showWidgetAfterConnection, ssoProviderId, }) {
+    const connectSocialAccount = React.useCallback((_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ authMode, provider, validator, captchaToken, isHeadlessSocialSignIn, payingWithDynamic, triggerFundFromExchangeOnSuccess, redirectUrl, telegramAuthToken, showWidgetAfterConnection, forcePopup, ssoProviderId, }) {
         var _e, _f;
         clearError();
         setIsProcessing(true);
@@ -432,6 +435,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
         }
         const isMobile = utils.isMobile();
         try {
+            const effectiveStrategy = forcePopup ? 'popup' : strategy;
             const authCode = yield utils.Oauth2Service.getOauthCode({
                 apiProvider: getProviderByType.getProviderByType((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _f !== void 0 ? _f : [], provider),
                 getOAuthResultFromApi: () => oauth.getOAuthResult(environmentId, provider, {
@@ -450,7 +454,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 redirectUrl: redirectUrl !== null && redirectUrl !== void 0 ? redirectUrl : defaultRedirectUrl,
                 setIsProcessing,
                 state,
-                strategy,
+                strategy: effectiveStrategy,
             });
             yield completeConnection({
                 authCode,

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

@@ -16,6 +16,7 @@ export type ConnectSocialAccountProps = {
     redirectUrl?: string;
     telegramAuthToken?: string;
     showWidgetAfterConnection?: boolean;
+    forcePopup?: boolean;
     triggerFundFromExchangeOnSuccess?: ExchangeKeyEnum;
     payingWithDynamic?: PayWithDynamicProps;
     /** marks the flow as initiated by headless sign-in API */

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

@@ -36,6 +36,7 @@ import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import { generateClientSessionKeys } from '../../functions/clientSessionKeys/getClientSessionKeys.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -220,6 +221,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 }));
             }
             if (authMode === 'signin') {
+                yield generateClientSessionKeys();
                 if (provider === ProviderEnum.Telegram && telegramAuthToken) {
                     const apiCall = () => telegramSignIn(environmentId, {
                         captchaToken,
@@ -334,6 +336,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 const keypair = yield generateSessionKey();
                 sessionPublicKey = keypair.publicKey;
             }
+            yield generateClientSessionKeys();
             const apiCall = () => farcasterSignIn(environmentId, {
                 address,
                 captchaToken,
@@ -372,7 +375,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
         shouldRegisterSessionKeysOnSignin,
         signInAccount,
     ]);
-    const connectSocialAccount = useCallback((_d) => __awaiter(void 0, [_d], void 0, function* ({ authMode, provider, validator, captchaToken, isHeadlessSocialSignIn, payingWithDynamic, triggerFundFromExchangeOnSuccess, redirectUrl, telegramAuthToken, showWidgetAfterConnection, ssoProviderId, }) {
+    const connectSocialAccount = useCallback((_d) => __awaiter(void 0, [_d], void 0, function* ({ authMode, provider, validator, captchaToken, isHeadlessSocialSignIn, payingWithDynamic, triggerFundFromExchangeOnSuccess, redirectUrl, telegramAuthToken, showWidgetAfterConnection, forcePopup, ssoProviderId, }) {
         var _e, _f;
         clearError();
         setIsProcessing(true);
@@ -428,6 +431,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
         }
         const isMobile$1 = isMobile();
         try {
+            const effectiveStrategy = forcePopup ? 'popup' : strategy;
             const authCode = yield Oauth2Service.getOauthCode({
                 apiProvider: getProviderByType((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _f !== void 0 ? _f : [], provider),
                 getOAuthResultFromApi: () => getOAuthResult(environmentId, provider, {
@@ -446,7 +450,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 redirectUrl: redirectUrl !== null && redirectUrl !== void 0 ? redirectUrl : defaultRedirectUrl,
                 setIsProcessing,
                 state,
-                strategy,
+                strategy: effectiveStrategy,
             });
             yield completeConnection({
                 authCode,

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

@@ -32,6 +32,7 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 var connectedWalletsInfo = require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
+var getClientSessionKeys = require('../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 require('@dynamic-labs-sdk/client/core');
 require('../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
@@ -145,6 +146,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             const keypair = yield generateSessionKey();
             verifyArgs.sessionPublicKey = keypair.publicKey;
         }
+        yield getClientSessionKeys.generateClientSessionKeys();
         let verifyResponse;
         if (!user) {
             verifyResponse = wallets.verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,

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

@@ -28,6 +28,7 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import { resetConnectedWalletsInfo } from '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
+import { generateClientSessionKeys } from '../../functions/clientSessionKeys/getClientSessionKeys.js';
 import '@dynamic-labs-sdk/client/core';
 import '../../../client/client.js';
 import '@dynamic-labs-sdk/client';
@@ -141,6 +142,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             const keypair = yield generateSessionKey();
             verifyArgs.sessionPublicKey = keypair.publicKey;
         }
+        yield generateClientSessionKeys();
         let verifyResponse;
         if (!user) {
             verifyResponse = verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -33,6 +33,7 @@ var updatePrimaryWalletId = require('../../utils/functions/updatePrimaryWalletId
 require('../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../store/state/primaryWalletId/primaryWalletId.cjs');
+var getClientSessionKeys = require('../../utils/functions/clientSessionKeys/getClientSessionKeys.cjs');
 var email = require('../../data/api/email/email.cjs');
 require('@dynamic-labs/locale');
 var dynamicEvents = require('../../events/dynamicEvents.cjs');
@@ -281,6 +282,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                         const keypair = yield generateSessionKey();
                         sessionPublicKey = keypair.publicKey;
                     }
+                    yield getClientSessionKeys.generateClientSessionKeys();
                     return email.signInWithEmailVerification({
                         environmentId,
                         sessionPublicKey,

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -29,6 +29,7 @@ import { updatePrimaryWalletId } from '../../utils/functions/updatePrimaryWallet
 import '../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../store/state/primaryWalletId/primaryWalletId.js';
+import { generateClientSessionKeys } from '../../utils/functions/clientSessionKeys/getClientSessionKeys.js';
 import { signInWithEmailVerification, retryEmailVerification } from '../../data/api/email/email.js';
 import '@dynamic-labs/locale';
 import { dynamicEvents } from '../../events/dynamicEvents.js';
@@ -277,6 +278,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                         const keypair = yield generateSessionKey();
                         sessionPublicKey = keypair.publicKey;
                     }
+                    yield generateClientSessionKeys();
                     return signInWithEmailVerification({
                         environmentId,
                         sessionPublicKey,

package/src/lib/views/SendBalanceView/SendBalanceView.cjs

@@ -122,6 +122,7 @@ const getTransactionValue = (transaction, isNativeToken) => {
 };
 const getSupportedChainName = (connectedChain) => {
     const supportedChains = {
+        APTOS: sdkApiCore.ChainEnum.Aptos,
         EVM: sdkApiCore.ChainEnum.Evm,
         SOL: sdkApiCore.ChainEnum.Sol,
         SUI: sdkApiCore.ChainEnum.Sui,

package/src/lib/views/SendBalanceView/SendBalanceView.js

@@ -118,6 +118,7 @@ const getTransactionValue = (transaction, isNativeToken) => {
 };
 const getSupportedChainName = (connectedChain) => {
     const supportedChains = {
+        APTOS: ChainEnum.Aptos,
         EVM: ChainEnum.Evm,
         SOL: ChainEnum.Sol,
         SUI: ChainEnum.Sui,

package/src/lib/views/SmsVerification/useSmsVerification/useSmsVerification.cjs

@@ -32,6 +32,7 @@ var sms = require('../../../data/api/sms/sms.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+var getClientSessionKeys = require('../../../utils/functions/clientSessionKeys/getClientSessionKeys.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -186,6 +187,7 @@ const useSmsVerification = (type) => {
                     const keypair = yield generateSessionKey();
                     sessionPublicKey = keypair.publicKey;
                 }
+                yield getClientSessionKeys.generateClientSessionKeys();
                 return sms.signInWithSmsVerification({
                     environmentId,
                     sessionPublicKey,

package/src/lib/views/SmsVerification/useSmsVerification/useSmsVerification.js

@@ -28,6 +28,7 @@ import { signInWithSmsVerification, retrySmsVerification } from '../../../data/a
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import { generateClientSessionKeys } from '../../../utils/functions/clientSessionKeys/getClientSessionKeys.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -182,6 +183,7 @@ const useSmsVerification = (type) => {
                     const keypair = yield generateSessionKey();
                     sessionPublicKey = keypair.publicKey;
                 }
+                yield generateClientSessionKeys();
                 return signInWithSmsVerification({
                     environmentId,
                     sessionPublicKey,

package/src/lib/widgets/DynamicWidget/components/DynamicWidgetViews/mapViewToComponent.cjs

@@ -13,6 +13,8 @@ var SettingsView = require('../../views/SettingsView/SettingsView.cjs');
 var AccountAndSecuritySettingsView = require('../../views/AccountAndSecuritySettingsView/AccountAndSecuritySettingsView.cjs');
 var SessionManagementView = require('../../views/SessionManagementView/SessionManagementView.cjs');
 var WalletsDelegatedSettingsView = require('../../views/WalletsDelegatedSettingsView/WalletsDelegatedSettingsView.cjs');
+var WaasBackupView = require('../../views/WaasBackupView/WaasBackupView.cjs');
+var WaasBackupInfoView = require('../../views/WaasBackupView/WaasBackupInfoView.cjs');
 var CryptoComOnramp = require('../../views/CryptoComOnramp/CryptoComOnramp.cjs');
 var ChooseLinkedWalletView = require('../../views/ChooseLinkedWalletView/ChooseLinkedWalletView.cjs');
 var ChooseOnrampProviderView = require('../../views/ChooseOnrampProviderView/ChooseOnrampProviderView.cjs');
@@ -52,6 +54,8 @@ const mapViewToComponent = {
     'session-management-info': SessionManagementInfoView.SessionManagementInfoView,
     'session-management-revoke-access': RevokeAccessView.RevokeAccessView,
     settings: SettingsView.SettingsView,
+    'waas-backup': WaasBackupView.WaasBackupView,
+    'waas-backup-info': WaasBackupInfoView.WaasBackupInfoView,
     'wallet-delegation': WalletDelegationView.WalletDelegationView,
     wallets: WalletsView.WalletsView,
     'wallets-delegated-settings': WalletsDelegatedSettingsView.WalletsDelegatedSettingsView,

package/src/lib/widgets/DynamicWidget/components/DynamicWidgetViews/mapViewToComponent.d.ts

@@ -33,6 +33,8 @@ export declare const mapViewToComponent: {
     'session-management-info': import("react").FC;
     'session-management-revoke-access': import("react").FC<import("../../views/SessionManagementView/RevokeAccessView").RevokeAccessViewProps>;
     settings: import("react").FC;
+    'waas-backup': import("react").FC;
+    'waas-backup-info': import("react").FC;
     'wallet-delegation': import("react").FC<{
         wallets?: import("dist/packages/wallet-connector-core/src").Wallet<import("dist/packages/wallet-connector-core/src").WalletConnectorCore.WalletConnector>[] | undefined;
     }>;

package/src/lib/widgets/DynamicWidget/components/DynamicWidgetViews/mapViewToComponent.js

@@ -9,6 +9,8 @@ import { SettingsView } from '../../views/SettingsView/SettingsView.js';
 import { AccountAndSecuritySettingsView } from '../../views/AccountAndSecuritySettingsView/AccountAndSecuritySettingsView.js';
 import { SessionManagementView } from '../../views/SessionManagementView/SessionManagementView.js';
 import { WalletsDelegatedSettingsView } from '../../views/WalletsDelegatedSettingsView/WalletsDelegatedSettingsView.js';
+import { WaasBackupView } from '../../views/WaasBackupView/WaasBackupView.js';
+import { WaasBackupInfoView } from '../../views/WaasBackupView/WaasBackupInfoView.js';
 import { CryptoComOnramp } from '../../views/CryptoComOnramp/CryptoComOnramp.js';
 import { ChooseLinkedWalletView } from '../../views/ChooseLinkedWalletView/ChooseLinkedWalletView.js';
 import { ChooseOnrampProviderView } from '../../views/ChooseOnrampProviderView/ChooseOnrampProviderView.js';
@@ -48,6 +50,8 @@ const mapViewToComponent = {
     'session-management-info': SessionManagementInfoView,
     'session-management-revoke-access': RevokeAccessView,
     settings: SettingsView,
+    'waas-backup': WaasBackupView,
+    'waas-backup-info': WaasBackupInfoView,
     'wallet-delegation': WalletDelegationView,
     wallets: WalletsView,
     'wallets-delegated-settings': WalletsDelegatedSettingsView,

package/src/lib/widgets/DynamicWidget/context/DynamicWidgetContext.types.d.ts

@@ -13,7 +13,7 @@ export declare const DynamicSessionManagementViews: readonly ["session-managemen
 export type DynamicSessionManagementViewsType = typeof DynamicSessionManagementViews[number];
 export declare const DynamicTransactionsWidgetViews: readonly ["send-balance"];
 export type DynamicTransactionsWidgetViewsType = typeof DynamicTransactionsWidgetViews[number];
-export type DynamicWidgetViews = 'wallets' | 'profile' | 'edit-profile' | 'choose-wallet-funding-method' | 'receive-wallet-funds' | 'deposited-exchange' | 'receive-exchange-funds' | 'crypto-com-onramp' | DynamicTransactionsWidgetViewsType | DynamicPasskeyWidgetViewsType | DynamicMfaWidgetViewsType | DynamicSettingsType | DynamicGlobalWalletType | DynamicSessionManagementViewsType | 'connected-apps' | 'deposit-view' | 'confirm-exchange-transfer' | 'choose-onramp-provider' | 'choose-linked-wallet' | 'wallet-delegation' | 'wallets-delegated-settings';
+export type DynamicWidgetViews = 'wallets' | 'profile' | 'edit-profile' | 'choose-wallet-funding-method' | 'receive-wallet-funds' | 'deposited-exchange' | 'receive-exchange-funds' | 'crypto-com-onramp' | DynamicTransactionsWidgetViewsType | DynamicPasskeyWidgetViewsType | DynamicMfaWidgetViewsType | DynamicSettingsType | DynamicGlobalWalletType | DynamicSessionManagementViewsType | 'connected-apps' | 'deposit-view' | 'confirm-exchange-transfer' | 'choose-onramp-provider' | 'choose-linked-wallet' | 'waas-backup' | 'waas-backup-info' | 'wallet-delegation' | 'wallets-delegated-settings';
 export type DynamicWidgetViewMapConstraint = Record<DynamicWidgetViews, FC<any>>;
 export type DynamicWidgetViewMap = typeof mapViewToComponent;
 export type SetDynamicWidgetView = <T extends DynamicWidgetViews>(view: T, props?: ComponentProps<DynamicWidgetViewMap[T]>) => void;

package/src/lib/widgets/DynamicWidget/views/AccountAndSecuritySettingsView/EmbeddedWalletExportSection/EmbeddedWalletExportSection.cjs

@@ -7,6 +7,7 @@ var _tslib = require('../../../../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var Typography = require('../../../../../components/Typography/Typography.cjs');
 var TypographyButton = require('../../../../../components/TypographyButton/TypographyButton.cjs');
@@ -17,12 +18,12 @@ var chevronLeft = require('../../../../../shared/assets/chevron-left.cjs');
 var exportPrivateKey = require('../../../../../shared/assets/export-private-key.cjs');
 var exportRecoveryPhrase = require('../../../../../shared/assets/export-recovery-phrase.cjs');
 require('../../../../../context/ViewContext/ViewContext.cjs');
+var backupArrow = require('../../../../../shared/assets/backupArrow.cjs');
 require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../../../../utils/constants/colors.cjs');
 require('../../../../../utils/constants/values.cjs');
-require('@dynamic-labs/sdk-api-core');
 require('../../../../../shared/consts/index.cjs');
 require('../../../../../events/dynamicEvents.cjs');
 require('../../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -87,7 +88,7 @@ require('../../../../../context/IpConfigurationContext/IpConfigurationContext.cj
 require('../../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../../DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../../context/DynamicWidgetContext.cjs');
+var DynamicWidgetContext = require('../../../context/DynamicWidgetContext.cjs');
 require('../../../helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../../../views/ExchangeWhitelistWarning/ExchangeWhitelistWarning.cjs');
 require('../../../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
@@ -111,10 +112,11 @@ require('../../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs')
 var useInternalDynamicContext = require('../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 
 const EmbeddedWalletExportSection = () => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const { t } = reactI18next.useTranslation();
     const { theme } = ThemeContext.useThemeContext();
-    const { primaryWallet, user } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, user, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     const { getEOAWallet } = useSmartWallets.useSmartWallets();
     const { initPasskeyRecoveryProcess, shouldInitRecovery } = usePasskeyRecovery.usePasskeyRecovery();
     const { initExportProcess } = useEmbeddedReveal.useEmbeddedReveal();
@@ -146,6 +148,12 @@ const EmbeddedWalletExportSection = () => {
     const handleExportButtonClick = React.useCallback(() => handleExportClick(), [handleExportClick]);
     const handleExportWithPhraseClick = React.useCallback(() => handleExportClick(true), [handleExportClick]);
     const exportIconClasses = React.useMemo(() => `settings-view__body__section__button__icon${theme.theme.name === 'dark' ? '__stroke' : ''}`, [theme.theme.name]);
+    const isV3WaasWallet = Boolean(wallet && ((_h = (_g = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _g === void 0 ? void 0 : _g.key) === null || _h === void 0 ? void 0 : _h.startsWith('dynamicwaas')));
+    const isGoogleDriveBackupEnabled = Boolean((_l = (_k = (_j = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _j === void 0 ? void 0 : _j.waas) === null || _k === void 0 ? void 0 : _k.backupOptions) === null || _l === void 0 ? void 0 : _l.includes(sdkApiCore.WaasBackupOptionsEnum.GoogleDrive));
+    const shouldShowBackupOption = isV3WaasWallet && isGoogleDriveBackupEnabled;
+    const handleBackupClick = React.useCallback(() => {
+        setDynamicWidgetView('waas-backup');
+    }, [setDynamicWidgetView]);
     if (!isEmbeddedWallet) {
         return null;
     }
@@ -153,7 +161,9 @@ const EmbeddedWalletExportSection = () => {
                 // eslint-disable-next-line react/jsx-wrap-multilines
                 jsxRuntime.jsxs("div", { className: 'settings-view__body__section__button__start-slot', children: [jsxRuntime.jsx(exportPrivateKey.ReactComponent, { className: exportIconClasses }), jsxRuntime.jsx(Typography.Typography, { color: 'primary', weight: 'medium', copykey: 'dyn_settings.export_section.private_key_button', children: t('dyn_settings.export_section.private_key_button') })] }), endSlot: jsxRuntime.jsx(chevronLeft.ReactComponent, { className: 'settings-view__body__section__button__icon-secondary--rotate' }), showInternalLoading: false }), isTurnkeyHDWallet && (jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'embedded-reveal-button', onClick: handleExportWithPhraseClick, buttonClassName: 'settings-view__body__section__button', startSlot: 
                 // eslint-disable-next-line react/jsx-wrap-multilines
-                jsxRuntime.jsxs("div", { className: 'settings-view__body__section__button__start-slot', children: [jsxRuntime.jsx(exportRecoveryPhrase.ReactComponent, { className: exportIconClasses }), jsxRuntime.jsx(Typography.Typography, { color: 'primary', weight: 'medium', copykey: 'dyn_settings.export_section.srp_button', children: t('dyn_settings.export_section.srp_button') })] }), endSlot: jsxRuntime.jsx(chevronLeft.ReactComponent, { className: 'settings-view__body__section__button__icon-secondary--rotate' }), showInternalLoading: false }))] }));
+                jsxRuntime.jsxs("div", { className: 'settings-view__body__section__button__start-slot', children: [jsxRuntime.jsx(exportRecoveryPhrase.ReactComponent, { className: exportIconClasses }), jsxRuntime.jsx(Typography.Typography, { color: 'primary', weight: 'medium', copykey: 'dyn_settings.export_section.srp_button', children: t('dyn_settings.export_section.srp_button') })] }), endSlot: jsxRuntime.jsx(chevronLeft.ReactComponent, { className: 'settings-view__body__section__button__icon-secondary--rotate' }), showInternalLoading: false })), shouldShowBackupOption && (jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'backup-button', onClick: handleBackupClick, buttonClassName: 'settings-view__body__section__button', startSlot: 
+                // eslint-disable-next-line react/jsx-wrap-multilines
+                jsxRuntime.jsxs("div", { className: 'settings-view__body__section__button__start-slot', children: [jsxRuntime.jsx(backupArrow.ReactComponent, { className: exportIconClasses }), jsxRuntime.jsx(Typography.Typography, { color: 'primary', weight: 'medium', copykey: 'dyn_settings.export_section.backup_button', children: t('dyn_settings.export_section.backup_button') })] }), endSlot: jsxRuntime.jsx(chevronLeft.ReactComponent, { className: 'settings-view__body__section__button__icon-secondary--rotate' }), showInternalLoading: false }))] }));
 };
 
 exports.EmbeddedWalletExportSection = EmbeddedWalletExportSection;