@dynamic-labs/sdk-react-core 2.0.0-alpha.6 → 2.0.0-alpha.8

package/src/lib/context/PasskeyContext/PasskeyContext.js

@@ -65,6 +65,7 @@ import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/Secondary
 import 'i18next';
 import '@hcaptcha/react-hcaptcha';
 import '../LoadingContext/LoadingContext.js';
+import '../../config/ApiEndpoint.js';
 import '../FooterAnimationContext/index.js';
 import '../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../WalletGroupContext/WalletGroupContext.js';

package/src/lib/context/ViewContext/ViewContext.cjs

@@ -5,15 +5,22 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var useDynamicEvents = require('../../utils/hooks/events/useDynamicEvents/useDynamicEvents.cjs');
+var ErrorContext = require('../ErrorContext/ErrorContext.cjs');
 
 const ViewContext = React.createContext(undefined);
 const ViewContextProvider = ({ children, initialView = { props: { isWalletConnectList: true }, type: 'wallet-list' }, }) => {
     const [_view, _setView] = React.useState(null);
     const view = _view || initialView;
+    const { clearError } = ErrorContext.useErrorContext();
     const goToInitialView = React.useCallback(() => {
         _setView(null);
     }, []);
     const setView = React.useCallback((type, props) => {
+        // we need to clear errors before proceeding to the next view
+        // but only if the next view is different from the current view
+        // this is to prevent the error from being cleared when the same view is re-rendered
+        if (view.type !== type)
+            clearError();
         _setView({ props, type });
     }, []);
     useDynamicEvents.useInternalDynamicEvents('logout', () => goToInitialView());

package/src/lib/context/ViewContext/ViewContext.js

@@ -1,15 +1,22 @@
 import { jsx } from 'react/jsx-runtime';
 import { createContext, useContext, useState, useCallback, useMemo } from 'react';
 import { useInternalDynamicEvents } from '../../utils/hooks/events/useDynamicEvents/useDynamicEvents.js';
+import { useErrorContext } from '../ErrorContext/ErrorContext.js';
 
 const ViewContext = createContext(undefined);
 const ViewContextProvider = ({ children, initialView = { props: { isWalletConnectList: true }, type: 'wallet-list' }, }) => {
     const [_view, _setView] = useState(null);
     const view = _view || initialView;
+    const { clearError } = useErrorContext();
     const goToInitialView = useCallback(() => {
         _setView(null);
     }, []);
     const setView = useCallback((type, props) => {
+        // we need to clear errors before proceeding to the next view
+        // but only if the next view is different from the current view
+        // this is to prevent the error from being cleared when the same view is re-rendered
+        if (view.type !== type)
+            clearError();
         _setView({ props, type });
     }, []);
     useInternalDynamicEvents('logout', () => goToInitialView());

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

@@ -1,7 +1,9 @@
 import { FC } from 'react';
-export type ViewType = 'select-hardware-wallet' | 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-with-email' | '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' | 'update-email' | 'verify-email' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | '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' | 'wallet-cannot-be-transferred' | 'passkey-intro' | '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';
-export type ViewMap = Record<ViewType, FC<any>>;
-type ComponentProps<T extends FC<any>> = T extends FC<infer P> ? P : undefined;
+import { viewToComponentMap } from '../../../views/viewToComponentMap';
+export type ViewType = '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' | 'update-email' | 'verify-email' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | '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' | 'wallet-cannot-be-transferred' | 'passkey-intro' | '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';
+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;
 export type ViewState<T extends ViewType> = {
     type: T;
     props?: ComponentProps<ViewMap[T]>;

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

@@ -234,6 +234,7 @@ const translation = {
         errors: {
           invalid_current_password: 'Invalid current passcode',
           error_changing_password: 'Error changing passcode',
+          new_password_same_as_old: 'New passcode cannot be the same as the old passcode',
           password_mismatch: 'Passcodes do not match',
           user_closed_view: 'User closed the view',
         },
@@ -242,9 +243,9 @@ const translation = {
           description: {
             title: 'Add a passcode to protect your account',
             additional_protection: {
-              title: 'Additional Protection',
+              title: 'Passcode Security',
               description:
-                'Add a secure passcode to prevent un-authorized access to your account',
+                'Add a secure passcode to further prevent un-authrized access to your account.',
             },
             restore_access: {
               title: 'Restore Access',
@@ -252,11 +253,11 @@ const translation = {
                 'You will be asked to enter it when signing on to a new device.',
             },
           },
-          title: 'Secure your account',
+          title: 'Add a Passcode',
         },
         logout: 'Log out',
         title: {
-          create: 'Create backup passcode',
+          create: 'Create passcode',
           update: 'Create new passcode',
         },
         update_input: {
@@ -283,6 +284,7 @@ const translation = {
         errors: {
             invalid_current_password: 'Invalid current passcode',
             error_changing_password: 'Error changing passcode',
+            new_password_same_as_old: 'New passcode cannot be the same as the old passcode',
             password_mismatch: 'Passcodes do not match',
             user_closed_view: 'User closed the view',
         },
@@ -291,19 +293,19 @@ const translation = {
             description: {
                 title: 'Add a passcode to protect your account',
                 additional_protection: {
-                    title: 'Additional Protection',
-                    description: 'Add a secure passcode to prevent un-authorized access to your account',
+                    title: 'Passcode Security',
+                    description: 'Add a secure passcode to further prevent un-authrized access to your account.',
                 },
                 restore_access: {
                     title: 'Restore Access',
                     description: 'You will be asked to enter it when signing on to a new device.',
                 },
             },
-            title: 'Secure your account',
+            title: 'Add a Passcode',
         },
         logout: 'Log out',
         title: {
-            create: 'Create backup passcode',
+            create: 'Create passcode',
             update: 'Create new passcode',
         },
         update_input: {
@@ -311,6 +313,16 @@ const translation = {
             placeholder: 'New passcode',
         },
     },
+    /**
+     * @description copy keys for creating wallet wallet message
+     * @default
+     * {
+        loading_message: 'Your wallet is being created...',
+      }
+     */
+    dyn_creating_wallet: {
+        loading_message: 'Your wallet is being created...',
+    },
     /**
      * @description copy keys for email verification view after email logging in with magiclink
      * @default
@@ -689,7 +701,8 @@ const translation = {
         signing_section: {
           email_auth_button: 'One time code',
           passkey_button: 'Passkeys',
-          title: 'Security & Signing Methods',
+          password_button: 'Passcode',
+          title: 'Security Methods',
         },
         title: 'Wallet settings',
       }
@@ -703,7 +716,8 @@ const translation = {
         signing_section: {
             email_auth_button: 'One time code',
             passkey_button: 'Passkeys',
-            title: 'Security & Signing Methods',
+            password_button: 'Passcode',
+            title: 'Security Methods',
         },
         title: 'Wallet settings',
     },
@@ -1131,10 +1145,10 @@ const translation = {
         download_button: 'Download',
         logout: 'Log out',
         password_input: {
-          label: 'Backup Passcode',
-          placeholder: 'Backup Passcode',
+          label: 'Passcode',
+          placeholder: 'Passcode',
         },
-        title: 'Save backup passcode',
+        title: 'Save passcode',
         warning:
           'If you lose your passcode, you cannot recover access to your account.',
       }
@@ -1151,10 +1165,10 @@ const translation = {
         download_button: 'Download',
         logout: 'Log out',
         password_input: {
-            label: 'Backup Passcode',
-            placeholder: 'Backup Passcode',
+            label: 'Passcode',
+            placeholder: 'Passcode',
         },
-        title: 'Save backup passcode',
+        title: 'Save passcode',
         warning: 'If you lose your passcode, you cannot recover access to your account.',
     },
     /**

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

@@ -229,6 +229,7 @@ export declare const translation: {
         errors: {
           invalid_current_password: 'Invalid current passcode',
           error_changing_password: 'Error changing passcode',
+          new_password_same_as_old: 'New passcode cannot be the same as the old passcode',
           password_mismatch: 'Passcodes do not match',
           user_closed_view: 'User closed the view',
         },
@@ -237,9 +238,9 @@ export declare const translation: {
           description: {
             title: 'Add a passcode to protect your account',
             additional_protection: {
-              title: 'Additional Protection',
+              title: 'Passcode Security',
               description:
-                'Add a secure passcode to prevent un-authorized access to your account',
+                'Add a secure passcode to further prevent un-authrized access to your account.',
             },
             restore_access: {
               title: 'Restore Access',
@@ -247,11 +248,11 @@ export declare const translation: {
                 'You will be asked to enter it when signing on to a new device.',
             },
           },
-          title: 'Secure your account',
+          title: 'Add a Passcode',
         },
         logout: 'Log out',
         title: {
-          create: 'Create backup passcode',
+          create: 'Create passcode',
           update: 'Create new passcode',
         },
         update_input: {
@@ -278,6 +279,7 @@ export declare const translation: {
         errors: {
             invalid_current_password: string;
             error_changing_password: string;
+            new_password_same_as_old: string;
             password_mismatch: string;
             user_closed_view: string;
         };
@@ -306,6 +308,16 @@ export declare const translation: {
             placeholder: string;
         };
     };
+    /**
+     * @description copy keys for creating wallet wallet message
+     * @default
+     * {
+        loading_message: 'Your wallet is being created...',
+      }
+     */
+    dyn_creating_wallet: {
+        loading_message: string;
+    };
     /**
      * @description copy keys for email verification view after email logging in with magiclink
      * @default
@@ -684,7 +696,8 @@ export declare const translation: {
         signing_section: {
           email_auth_button: 'One time code',
           passkey_button: 'Passkeys',
-          title: 'Security & Signing Methods',
+          password_button: 'Passcode',
+          title: 'Security Methods',
         },
         title: 'Wallet settings',
       }
@@ -698,6 +711,7 @@ export declare const translation: {
         signing_section: {
             email_auth_button: string;
             passkey_button: string;
+            password_button: string;
             title: string;
         };
         title: string;
@@ -1126,10 +1140,10 @@ export declare const translation: {
         download_button: 'Download',
         logout: 'Log out',
         password_input: {
-          label: 'Backup Passcode',
-          placeholder: 'Backup Passcode',
+          label: 'Passcode',
+          placeholder: 'Passcode',
         },
-        title: 'Save backup passcode',
+        title: 'Save passcode',
         warning:
           'If you lose your passcode, you cannot recover access to your account.',
       }

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

@@ -230,6 +230,7 @@ const translation = {
         errors: {
           invalid_current_password: 'Invalid current passcode',
           error_changing_password: 'Error changing passcode',
+          new_password_same_as_old: 'New passcode cannot be the same as the old passcode',
           password_mismatch: 'Passcodes do not match',
           user_closed_view: 'User closed the view',
         },
@@ -238,9 +239,9 @@ const translation = {
           description: {
             title: 'Add a passcode to protect your account',
             additional_protection: {
-              title: 'Additional Protection',
+              title: 'Passcode Security',
               description:
-                'Add a secure passcode to prevent un-authorized access to your account',
+                'Add a secure passcode to further prevent un-authrized access to your account.',
             },
             restore_access: {
               title: 'Restore Access',
@@ -248,11 +249,11 @@ const translation = {
                 'You will be asked to enter it when signing on to a new device.',
             },
           },
-          title: 'Secure your account',
+          title: 'Add a Passcode',
         },
         logout: 'Log out',
         title: {
-          create: 'Create backup passcode',
+          create: 'Create passcode',
           update: 'Create new passcode',
         },
         update_input: {
@@ -279,6 +280,7 @@ const translation = {
         errors: {
             invalid_current_password: 'Invalid current passcode',
             error_changing_password: 'Error changing passcode',
+            new_password_same_as_old: 'New passcode cannot be the same as the old passcode',
             password_mismatch: 'Passcodes do not match',
             user_closed_view: 'User closed the view',
         },
@@ -287,19 +289,19 @@ const translation = {
             description: {
                 title: 'Add a passcode to protect your account',
                 additional_protection: {
-                    title: 'Additional Protection',
-                    description: 'Add a secure passcode to prevent un-authorized access to your account',
+                    title: 'Passcode Security',
+                    description: 'Add a secure passcode to further prevent un-authrized access to your account.',
                 },
                 restore_access: {
                     title: 'Restore Access',
                     description: 'You will be asked to enter it when signing on to a new device.',
                 },
             },
-            title: 'Secure your account',
+            title: 'Add a Passcode',
         },
         logout: 'Log out',
         title: {
-            create: 'Create backup passcode',
+            create: 'Create passcode',
             update: 'Create new passcode',
         },
         update_input: {
@@ -307,6 +309,16 @@ const translation = {
             placeholder: 'New passcode',
         },
     },
+    /**
+     * @description copy keys for creating wallet wallet message
+     * @default
+     * {
+        loading_message: 'Your wallet is being created...',
+      }
+     */
+    dyn_creating_wallet: {
+        loading_message: 'Your wallet is being created...',
+    },
     /**
      * @description copy keys for email verification view after email logging in with magiclink
      * @default
@@ -685,7 +697,8 @@ const translation = {
         signing_section: {
           email_auth_button: 'One time code',
           passkey_button: 'Passkeys',
-          title: 'Security & Signing Methods',
+          password_button: 'Passcode',
+          title: 'Security Methods',
         },
         title: 'Wallet settings',
       }
@@ -699,7 +712,8 @@ const translation = {
         signing_section: {
             email_auth_button: 'One time code',
             passkey_button: 'Passkeys',
-            title: 'Security & Signing Methods',
+            password_button: 'Passcode',
+            title: 'Security Methods',
         },
         title: 'Wallet settings',
     },
@@ -1127,10 +1141,10 @@ const translation = {
         download_button: 'Download',
         logout: 'Log out',
         password_input: {
-          label: 'Backup Passcode',
-          placeholder: 'Backup Passcode',
+          label: 'Passcode',
+          placeholder: 'Passcode',
         },
-        title: 'Save backup passcode',
+        title: 'Save passcode',
         warning:
           'If you lose your passcode, you cannot recover access to your account.',
       }
@@ -1147,10 +1161,10 @@ const translation = {
         download_button: 'Download',
         logout: 'Log out',
         password_input: {
-            label: 'Backup Passcode',
-            placeholder: 'Backup Passcode',
+            label: 'Passcode',
+            placeholder: 'Passcode',
         },
-        title: 'Save backup passcode',
+        title: 'Save passcode',
         warning: 'If you lose your passcode, you cannot recover access to your account.',
     },
     /**

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

@@ -6,7 +6,7 @@ export type LocalStorageNonce = {
     value: string | undefined;
 };
 export type LocalStorageNetworks = {
-    configurations: NetworkConfigurationMap;
+    networkConfigurations: NetworkConfigurationMap;
     environmentId?: string;
     expiry: number;
     version: number;

package/src/lib/shared/utils/hooks/useGlobalLoading/useGlobalLoading.cjs

@@ -2,41 +2,23 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
 var index = require('../../functions/lastAuthenticatedAccount/index.cjs');
 
 const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWallet, user, walletBook, }) => {
-    var _a;
-    const [sdkHasLoaded, setSdkHasLoaded] = React.useState(false);
-    const primaryWalletIsLoading = user &&
+    var _a, _b;
+    const isPrimaryWalletLoading = user &&
         ((_a = index.lastAuthenticatedAccount(user)) === null || _a === void 0 ? void 0 : _a.format) === 'blockchain' &&
         !primaryWallet;
-    const connectOnlyUserIsLoading = authMode === 'connect-only' &&
+    const isConnectOnlyWalletsLoading = authMode === 'connect-only' &&
         connectedInfo &&
         connectedWallets.length === 0;
-    React.useEffect(() => {
-        var _a;
-        if (!Object.keys((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).length) {
-            return;
-        }
-        if (projectSettings) {
-            if (primaryWalletIsLoading || connectOnlyUserIsLoading) {
-                return;
-            }
-            setSdkHasLoaded(true);
-        }
-    }, [
-        projectSettings,
-        primaryWallet,
-        user,
-        primaryWalletIsLoading,
-        connectOnlyUserIsLoading,
-        walletBook,
-    ]);
-    return {
-        sdkHasLoaded,
-        setSdkHasLoaded,
-    };
+    const hasWalletBookLoaded = Boolean(Object.keys((_b = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _b !== void 0 ? _b : {}).length);
+    if (!hasWalletBookLoaded ||
+        !projectSettings ||
+        isPrimaryWalletLoading ||
+        isConnectOnlyWalletsLoading)
+        return false;
+    return true;
 };
 
 exports.useGlobalLoading = useGlobalLoading;

package/src/lib/shared/utils/hooks/useGlobalLoading/useGlobalLoading.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProjectSettings } from '@dynamic-labs/sdk-api';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { UserProfile, Wallet } from '../../../types';
@@ -12,8 +11,5 @@ type Props = {
     user: UserProfile | undefined;
     walletBook: WalletBookSchema;
 };
-export declare const useGlobalLoading: ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWallet, user, walletBook, }: Props) => {
-    sdkHasLoaded: boolean;
-    setSdkHasLoaded: import("react").Dispatch<import("react").SetStateAction<boolean>>;
-};
+export declare const useGlobalLoading: ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWallet, user, walletBook, }: Props) => boolean;
 export {};

package/src/lib/shared/utils/hooks/useGlobalLoading/useGlobalLoading.js

@@ -1,38 +1,20 @@
-import { useState, useEffect } from 'react';
 import { lastAuthenticatedAccount } from '../../functions/lastAuthenticatedAccount/index.js';
 
 const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWallet, user, walletBook, }) => {
-    var _a;
-    const [sdkHasLoaded, setSdkHasLoaded] = useState(false);
-    const primaryWalletIsLoading = user &&
+    var _a, _b;
+    const isPrimaryWalletLoading = user &&
         ((_a = lastAuthenticatedAccount(user)) === null || _a === void 0 ? void 0 : _a.format) === 'blockchain' &&
         !primaryWallet;
-    const connectOnlyUserIsLoading = authMode === 'connect-only' &&
+    const isConnectOnlyWalletsLoading = authMode === 'connect-only' &&
         connectedInfo &&
         connectedWallets.length === 0;
-    useEffect(() => {
-        var _a;
-        if (!Object.keys((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).length) {
-            return;
-        }
-        if (projectSettings) {
-            if (primaryWalletIsLoading || connectOnlyUserIsLoading) {
-                return;
-            }
-            setSdkHasLoaded(true);
-        }
-    }, [
-        projectSettings,
-        primaryWallet,
-        user,
-        primaryWalletIsLoading,
-        connectOnlyUserIsLoading,
-        walletBook,
-    ]);
-    return {
-        sdkHasLoaded,
-        setSdkHasLoaded,
-    };
+    const hasWalletBookLoaded = Boolean(Object.keys((_b = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _b !== void 0 ? _b : {}).length);
+    if (!hasWalletBookLoaded ||
+        !projectSettings ||
+        isPrimaryWalletLoading ||
+        isConnectOnlyWalletsLoading)
+        return false;
+    return true;
 };
 
 export { useGlobalLoading };