@dynamic-labs/sdk-react-core 3.9.9 → 3.9.11

package/src/lib/context/UserWalletsContext/UserWalletsContext.js

@@ -1,34 +1,39 @@
 'use client'
 import { jsx } from 'react/jsx-runtime';
-import { createContext, useContext, useState, useRef, useCallback } from 'react';
+import { createContext, useContext, useState, useRef, useCallback, useEffect } from 'react';
 import { dynamicEvents } from '../../events/dynamicEvents.js';
 
 /** Context for accessing the current user/session's wallets */
 const UserWalletsContext = createContext(undefined);
 const UserWalletsProvider = ({ children }) => {
     const [userWallets, _setUserWallets] = useState([]);
+    const prevUserWallets = useRef([]);
     const addedWalletsIds = useRef([]);
     const removedWalletsIds = useRef([]);
     const setUserWallets = useCallback((returnUpdatedWallets) => {
         _setUserWallets((prevWallets) => {
+            prevUserWallets.current = prevWallets;
             const updatedWallets = returnUpdatedWallets(prevWallets);
-            addedWalletsIds.current.forEach((walletId) => {
-                const wallet = updatedWallets.find(({ id }) => id === walletId);
-                if (!wallet)
-                    return;
-                dynamicEvents.emit('walletAdded', wallet, updatedWallets);
-            });
-            removedWalletsIds.current.forEach((walletId) => {
-                const wallet = prevWallets.find(({ id }) => id === walletId);
-                if (!wallet)
-                    return;
-                dynamicEvents.emit('walletRemoved', wallet, updatedWallets);
-            });
-            addedWalletsIds.current = [];
-            removedWalletsIds.current = [];
             return updatedWallets;
         });
     }, []);
+    // it's an useEffect because it needs to be called after the userWallets state is updated
+    useEffect(() => {
+        addedWalletsIds.current.forEach((walletId) => {
+            const wallet = userWallets.find(({ id }) => id === walletId);
+            if (!wallet)
+                return;
+            dynamicEvents.emit('walletAdded', wallet, userWallets);
+        });
+        removedWalletsIds.current.forEach((walletId) => {
+            const wallet = prevUserWallets.current.find(({ id }) => id === walletId);
+            if (!wallet)
+                return;
+            dynamicEvents.emit('walletRemoved', wallet, userWallets);
+        });
+        addedWalletsIds.current = [];
+        removedWalletsIds.current = [];
+    }, [userWallets]);
     return (jsx(UserWalletsContext.Provider, { value: {
             addedWalletsIds,
             registerUserWallet: (newWallet) => setUserWallets((userWallets) => [...userWallets, newWallet]),

package/src/lib/context/ViewContext/types/index.d.ts

@@ -1,6 +1,6 @@
 import { FC } from 'react';
 import { viewToComponentMap } from '../../../views/viewToComponentMap';
-export type ViewType = 'access-blocked' | 'select-hardware-wallet' | 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-no-wallet' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-wallet-only' | 'login-with-email-verification' | 'login-with-sms-verification' | 'network-not-supported' | 'network-not-supported-manual' | 'no-access' | 'no-qr-not-installed' | 'pending-connect' | 'pending-signature-without-back-button' | 'pending-signature' | 'qr-code' | 'verify-email' | 'verify-sms' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'sandbox-maximum-threshold-reached' | 'multi-wallet-wallet-list' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'select-wallet-in-wallet-group' | 'wait-for-email-confirmation-view' | 'email-wallet-otp-verification-view' | 'social-redirect-view' | 'wallet-locked-view' | 'social-wrong-account' | 'gate-blocked-wallet' | 'bridge-welcome' | 'bridge-summary' | 'bridge-next-wallet-connection' | 'account-exists' | 'merge-user-accounts' | 'merge-user-accounts-conflicts' | 'merge-user-accounts-with-same-email' | 'mfa-choose-device' | 'mfa-recovery' | 'mfa-secure-device' | 'mfa-secure-device-help' | 'mfa-verification' | 'mfa-display-backup-codes' | 'wallet-cannot-be-transferred' | 'passkey-intro' | 'passkey-recovery-add-email' | 'global-wallet-confirm' | 'global-wallet-malicious' | 'global-wallet-info' | 'passkey-recovery-start' | 'passkey-recovery-bundle' | 'passkey-recovery-complete' | 'passkey-new-domain-detected' | 'embedded-reveal-view' | 'embedded-reveal-account-view' | 'embedded-wallet-auth-choice' | 'rename-passkey' | 'wallet-redirect-view' | 'create-password-view' | 'wallet-claim-intro' | 'mobile-wallet-redirect-view' | 'farcaster-connect-view';
+export type ViewType = 'access-blocked' | 'select-hardware-wallet' | 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-no-wallet' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-wallet-only' | 'login-with-email-verification' | 'login-with-sms-verification' | 'network-not-supported' | 'network-not-supported-manual' | 'no-access' | 'no-qr-not-installed' | 'pending-connect' | 'pending-signature-without-back-button' | 'pending-signature' | 'qr-code' | 'verify-email' | 'verify-sms' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'sandbox-maximum-threshold-reached' | 'multi-wallet-wallet-list' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'select-wallet-in-wallet-group' | 'wait-for-email-confirmation-view' | 'email-wallet-otp-verification-view' | 'social-redirect-view' | 'wallet-locked-view' | 'social-wrong-account' | 'gate-blocked-wallet' | 'bridge-welcome' | 'bridge-summary' | 'bridge-next-wallet-connection' | 'account-exists' | 'merge-user-accounts' | 'merge-user-accounts-conflicts' | 'merge-user-accounts-with-same-email' | 'mfa-choose-device' | 'mfa-recovery' | 'mfa-secure-device' | 'mfa-secure-device-help' | 'mfa-verification' | 'mfa-display-backup-codes' | 'wallet-cannot-be-transferred' | 'passkey-intro' | 'passkey-recovery-add-email' | 'global-wallet-confirm' | 'global-wallet-malicious' | 'global-wallet-info' | 'passkey-recovery-start' | 'passkey-recovery-bundle' | 'passkey-recovery-complete' | 'passkey-new-domain-detected' | 'embedded-reveal-view' | 'embedded-reveal-account-view' | 'embedded-wallet-auth-choice' | 'rename-passkey' | 'wallet-redirect-view' | 'create-password-view' | 'wallet-claim-intro' | 'mobile-wallet-redirect-view' | 'farcaster-connect-view' | 'embedded-wallet-exists';
 export type ViewMapConstraint = Record<ViewType, FC<any>>;
 type ComponentProps<T extends FC<any>> = T extends FC<infer P> ? P : never;
 export type ViewMap = typeof viewToComponentMap;

package/src/lib/data/api/wallets/wallets.cjs

@@ -51,6 +51,9 @@ const linkWallet = (environmentId_1, _b) => _tslib.__awaiter(void 0, [environmen
     }
     catch (e) {
         const data = yield utils.logResponseError(e, 'Error linkWallet');
+        if (data.code === 'embedded_wallet_address_already_linked') {
+            throw new utils$1.EmbeddedWalletExistsError(data.code);
+        }
         if (data.code === 'reassign_wallet_confirm' ||
             data.code === 'reassign_wallet_error') {
             throw new utils$1.WalletUsedError(data.code);

package/src/lib/data/api/wallets/wallets.js

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { VerifyRequestFromJSON } from '@dynamic-labs/sdk-api-core';
-import { WalletUsedError, MergeAccountsConfirmationError, SandboxMaximumThresholdReachedError, DynamicError, WalletNotDeployedError, ChainalysisError, GateBlockedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
+import { EmbeddedWalletExistsError, WalletUsedError, MergeAccountsConfirmationError, SandboxMaximumThresholdReachedError, DynamicError, WalletNotDeployedError, ChainalysisError, GateBlockedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
 import { sdkApi } from '../api.js';
 import { storeAuthTokenAndUser } from '../../../store/state/user/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
 import '../../../store/state/user/user.js';
@@ -47,6 +47,9 @@ const linkWallet = (environmentId_1, _b) => __awaiter(void 0, [environmentId_1,
     }
     catch (e) {
         const data = yield logResponseError(e, 'Error linkWallet');
+        if (data.code === 'embedded_wallet_address_already_linked') {
+            throw new EmbeddedWalletExistsError(data.code);
+        }
         if (data.code === 'reassign_wallet_confirm' ||
             data.code === 'reassign_wallet_error') {
             throw new WalletUsedError(data.code);

package/src/lib/events/dynamicEvents.cjs

@@ -25,6 +25,10 @@ const externalEvents = [
     'primaryWalletNetworkChanged',
     'mfaCompletionSuccess',
     'mfaCompletionFailure',
+    'smsVerificationResult',
+    'walletAdded',
+    'walletRemoved',
+    'userWalletsChanged',
 ];
 // Full internal event emitter
 const dynamicEvents = new EventEmitter__default["default"]();

package/src/lib/events/dynamicEvents.d.ts

@@ -11,7 +11,7 @@ import { tokenBalancesEvents } from './tokenBalances';
 /** Maps internal event names to their listeners */
 export type DynamicEvents = AuthEvents & UIEvents & OTPEvents & WalletEvents & PasskeyEvents & SocialEvents & EmbeddedWalletEvents & MultiWalletInternalEvents & tokenBalancesEvents;
 /** Which events are accessible by our clients */
-export declare const externalEvents: ("logout" | "mfaCompletionSuccess" | "mfaCompletionFailure" | "emailVerificationResult" | "walletAdded" | "primaryWalletChanged" | "primaryWalletNetworkChanged" | "embeddedWalletCreated")[];
+export declare const externalEvents: ("logout" | "mfaCompletionSuccess" | "mfaCompletionFailure" | "emailVerificationResult" | "smsVerificationResult" | "walletAdded" | "walletRemoved" | "primaryWalletChanged" | "primaryWalletNetworkChanged" | "userWalletsChanged" | "embeddedWalletCreated")[];
 export declare const dynamicEvents: EventEmitter<DynamicEvents, any>;
-export declare const publicDynamicEvents: EventEmitter<"logout" | "mfaCompletionSuccess" | "mfaCompletionFailure" | "emailVerificationResult" | "walletAdded" | "primaryWalletChanged" | "primaryWalletNetworkChanged" | "embeddedWalletCreated", any>;
+export declare const publicDynamicEvents: EventEmitter<"logout" | "mfaCompletionSuccess" | "mfaCompletionFailure" | "emailVerificationResult" | "smsVerificationResult" | "walletAdded" | "walletRemoved" | "primaryWalletChanged" | "primaryWalletNetworkChanged" | "userWalletsChanged" | "embeddedWalletCreated", any>;
 export type DynamicEventEmitter = typeof dynamicEvents;

package/src/lib/events/dynamicEvents.js

@@ -17,6 +17,10 @@ const externalEvents = [
     'primaryWalletNetworkChanged',
     'mfaCompletionSuccess',
     'mfaCompletionFailure',
+    'smsVerificationResult',
+    'walletAdded',
+    'walletRemoved',
+    'userWalletsChanged',
 ];
 // Full internal event emitter
 const dynamicEvents = new EventEmitter();

package/src/lib/events/index.d.ts

@@ -1 +1,2 @@
 export * from './dynamicEvents';
+export { type UserWalletsChangedParams } from './wallets';

package/src/lib/events/wallets.d.ts

@@ -1,4 +1,25 @@
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { Wallet } from '../shared/types/wallets';
+export type UserWalletsUpdateType = {
+    updateType: 'walletAdded';
+    addedWallet: Wallet;
+} | {
+    updateType: 'walletRemoved';
+    removedWallet: Wallet;
+} | {
+    updateType: 'primaryWalletChanged';
+} | {
+    updateType: 'primaryWalletNetworkChanged';
+    newNetwork: string | number;
+} | {
+    updateType: 'nonPrimaryWalletNetworkChanged';
+    newNetwork: string | number;
+    affectedWallets: Wallet[];
+};
+export type UserWalletsChangedParams = {
+    userWallets: Wallet[];
+    primaryWallet: Wallet | undefined;
+} & UserWalletsUpdateType;
 export type WalletEvents = {
     /** Triggered when a new wallet is added to user wallets list */
     walletAdded: (wallet: Wallet, userWallets: Wallet[]) => void;
@@ -8,4 +29,8 @@ export type WalletEvents = {
     primaryWalletChanged: (newPrimaryWallet: Wallet) => void;
     /** Triggered when the network changes in primary wallet */
     primaryWalletNetworkChanged: (newNetwork: string | number) => void;
+    /** Triggered when the network changes in non-primary wallet */
+    nonPrimaryWalletNetworkChanged: (newNetwork: string | number, connector: WalletConnector) => void;
+    /** Triggered when there is a change in user wallets */
+    userWalletsChanged: (params: UserWalletsChangedParams) => void;
 };

package/src/lib/locale/en/translation.cjs

@@ -1233,10 +1233,11 @@ const translation = {
       }
      */
     dyn_need_help_section: {
-        info: 'Problem Signing?',
+        info: 'Need Help?',
         contact_support: 'Contact support',
         divider: 'or',
-        help_button: 'go here.',
+        help_button: 'Go here for support',
+        visit_platform: 'Visit {{platform}}',
     },
     /**
      * @description copy keys for network not supported view
@@ -2007,6 +2008,10 @@ const translation = {
         },
         log_out_button: 'Log out',
         title: 'Transfer this wallet?',
+        already_exists: {
+            title: 'Wallet Already Linked',
+            description: 'This wallet is already used as an embedded wallet. You cannot link it unless you delete the existing embedded wallet.',
+        },
     },
     /**
      * @description copy keys for connecting wallets list view

package/src/lib/locale/en/translation.d.ts

@@ -1233,6 +1233,7 @@ export declare const translation: {
         contact_support: string;
         divider: string;
         help_button: string;
+        visit_platform: string;
     };
     /**
      * @description copy keys for network not supported view
@@ -2003,6 +2004,10 @@ export declare const translation: {
         };
         log_out_button: string;
         title: string;
+        already_exists: {
+            title: string;
+            description: string;
+        };
     };
     /**
      * @description copy keys for connecting wallets list view

package/src/lib/locale/en/translation.js

@@ -1229,10 +1229,11 @@ const translation = {
       }
      */
     dyn_need_help_section: {
-        info: 'Problem Signing?',
+        info: 'Need Help?',
         contact_support: 'Contact support',
         divider: 'or',
-        help_button: 'go here.',
+        help_button: 'Go here for support',
+        visit_platform: 'Visit {{platform}}',
     },
     /**
      * @description copy keys for network not supported view
@@ -2003,6 +2004,10 @@ const translation = {
         },
         log_out_button: 'Log out',
         title: 'Transfer this wallet?',
+        already_exists: {
+            title: 'Wallet Already Linked',
+            description: 'This wallet is already used as an embedded wallet. You cannot link it unless you delete the existing embedded wallet.',
+        },
     },
     /**
      * @description copy keys for connecting wallets list view

package/src/lib/modals/SignMessageConfirmationModal/SignMessageConfirmationModal.cjs

@@ -154,7 +154,9 @@ const SignMessageConfirmationModal = ({ appLogoUrl, appName, message, handler, o
         const isSessionKeyCompatible = (primaryWallet && walletConnectorCore.isSessionKeyCompatibleWallet(primaryWallet)) ||
             (eoaWallet && walletConnectorCore.isSessionKeyCompatibleWallet(eoaWallet));
         if ((yield shouldInitRecovery()) && !isSessionKeyCompatible) {
-            yield initPasskeyRecoveryProcess('email', 'signMessage');
+            yield initPasskeyRecoveryProcess('email', {
+                type: 'signMessage',
+            });
         }
         if (signWithoutModal === true) {
             onSignMessage('callHandlerOutsideModal');

package/src/lib/modals/SignMessageConfirmationModal/SignMessageConfirmationModal.js

@@ -150,7 +150,9 @@ const SignMessageConfirmationModal = ({ appLogoUrl, appName, message, handler, o
         const isSessionKeyCompatible = (primaryWallet && isSessionKeyCompatibleWallet(primaryWallet)) ||
             (eoaWallet && isSessionKeyCompatibleWallet(eoaWallet));
         if ((yield shouldInitRecovery()) && !isSessionKeyCompatible) {
-            yield initPasskeyRecoveryProcess('email', 'signMessage');
+            yield initPasskeyRecoveryProcess('email', {
+                type: 'signMessage',
+            });
         }
         if (signWithoutModal === true) {
             onSignMessage('callHandlerOutsideModal');

package/src/lib/shared/types/embeddedWallets.d.ts

@@ -3,4 +3,10 @@ export type EmbeddedWalletSessionSettings = {
     userId: string;
     createdAt: number;
 };
-export type EmbeddedWalletCurrentAction = 'signMessage' | 'sendTransaction' | 'helpSession' | 'signTransaction' | 'reveal';
+export type EmbeddedWalletCurrentActionSettings = {
+    goBack?: () => void;
+};
+export type EmbeddedWalletCurrentAction = {
+    type: 'signMessage' | 'sendTransaction' | 'helpSession' | 'signTransaction' | 'reveal';
+    settings?: EmbeddedWalletCurrentActionSettings;
+};