@dynamic-labs/sdk-react-core 4.0.0-alpha.46 → 4.0.0-alpha.48

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -94,18 +94,20 @@ const useVerifyOnAwaitingSignature = () => {
     // this is to prevent calling runConnectAndSign multiple times
     // due to changes in legacyIsVerifying
     const isVerifying = React.useRef(false);
-    const runConnectAndSign = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const runConnectAndSign = React.useCallback((walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('runConnectAndSign', {
             selectedWalletConnector,
+            walletConnector,
         });
-        if (!selectedWalletConnector) {
+        const connector = walletConnector !== null && walletConnector !== void 0 ? walletConnector : selectedWalletConnector;
+        if (!connector) {
             return;
         }
         isVerifying.current = true;
         setLegacyIsVerifying(true);
         try {
             yield triggerConnectAndSign({
-                walletConnector: selectedWalletConnector,
+                walletConnector: connector,
             });
         }
         catch (e) {

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -90,18 +90,20 @@ const useVerifyOnAwaitingSignature = () => {
     // this is to prevent calling runConnectAndSign multiple times
     // due to changes in legacyIsVerifying
     const isVerifying = useRef(false);
-    const runConnectAndSign = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+    const runConnectAndSign = useCallback((walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('runConnectAndSign', {
             selectedWalletConnector,
+            walletConnector,
         });
-        if (!selectedWalletConnector) {
+        const connector = walletConnector !== null && walletConnector !== void 0 ? walletConnector : selectedWalletConnector;
+        if (!connector) {
             return;
         }
         isVerifying.current = true;
         setLegacyIsVerifying(true);
         try {
             yield triggerConnectAndSign({
-                walletConnector: selectedWalletConnector,
+                walletConnector: connector,
             });
         }
         catch (e) {

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

@@ -51,7 +51,7 @@ const useCreateWalletConnectorOptions = (_a) => {
         if (!projectSettings || walletConnectorOptions$1.length === 0)
             return;
         verifyRequiredConnectorsAreSetup.verifyRequiredConnectorsAreSetup(projectSettings, walletConnectorOptions$1.map(({ walletConnector }) => walletConnector));
-        walletConnectorOptions.setWalletConnectorOptions(walletConnectorOptions$1);
+        walletConnectorOptions.mergeWalletConnectorOptions(walletConnectorOptions$1);
     }, [walletConnectorOptions$1, projectSettings]);
     return { walletConnectorOptions: walletConnectorOptions$1 };
 };

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

@@ -21,7 +21,7 @@ import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import { serializeWalletConnectors } from '../../functions/serializeWalletConnectors/serializeWalletConnectors.js';
 import '../../../store/state/projectSettings/projectSettings.js';
-import { setWalletConnectorOptions } from '../../../store/state/walletConnectorOptions.js';
+import { mergeWalletConnectorOptions } from '../../../store/state/walletConnectorOptions.js';
 import { verifyRequiredConnectorsAreSetup } from './utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.js';
 
 const useCreateWalletConnectorOptions = (_a) => {
@@ -47,7 +47,7 @@ const useCreateWalletConnectorOptions = (_a) => {
         if (!projectSettings || walletConnectorOptions.length === 0)
             return;
         verifyRequiredConnectorsAreSetup(projectSettings, walletConnectorOptions.map(({ walletConnector }) => walletConnector));
-        setWalletConnectorOptions(walletConnectorOptions);
+        mergeWalletConnectorOptions(walletConnectorOptions);
     }, [walletConnectorOptions, projectSettings]);
     return { walletConnectorOptions };
 };

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

@@ -19,7 +19,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
-require('../../../events/dynamicEvents.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
@@ -182,14 +182,20 @@ const useWalletItemActions = () => {
             activeAccountAlreadyLinked,
             connectedAccounts,
             linkedWallets,
+            walletConnectorKey: walletConnector.key,
         });
-        if (activeAccountAlreadyLinked) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
-        }
-        else {
+        setSelectedWalletConnectorKey(walletConnector.key);
+        if (!activeAccountAlreadyLinked) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+            return;
         }
-        setSelectedWalletConnectorKey(walletConnector.key);
+        const isTryingToUpdateUnkownWallet = activeAccountAlreadyLinked.connector.key === 'unknown';
+        if (isTryingToUpdateUnkownWallet) {
+            //prompt the user to connect and sign with the wallet
+            dynamicEvents.dynamicEvents.emit('triggerConnectAndSign', walletConnector);
+            return;
+        }
+        setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
     });
     const openWallet = (walletKey, handlers) => {
         var _a;

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

@@ -15,7 +15,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
-import '../../../events/dynamicEvents.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
@@ -178,14 +178,20 @@ const useWalletItemActions = () => {
             activeAccountAlreadyLinked,
             connectedAccounts,
             linkedWallets,
+            walletConnectorKey: walletConnector.key,
         });
-        if (activeAccountAlreadyLinked) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
-        }
-        else {
+        setSelectedWalletConnectorKey(walletConnector.key);
+        if (!activeAccountAlreadyLinked) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+            return;
         }
-        setSelectedWalletConnectorKey(walletConnector.key);
+        const isTryingToUpdateUnkownWallet = activeAccountAlreadyLinked.connector.key === 'unknown';
+        if (isTryingToUpdateUnkownWallet) {
+            //prompt the user to connect and sign with the wallet
+            dynamicEvents.emit('triggerConnectAndSign', walletConnector);
+            return;
+        }
+        setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
     });
     const openWallet = (walletKey, handlers) => {
         var _a;

package/src/lib/views/SubdomainField/SubdomainField.cjs

@@ -94,6 +94,12 @@ const SubdomainField = ({ showDetails = false, }) => {
     const checkSubdomain = useSubdomainCheck.useSubdomainCheck();
     const { projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
     const [checkResponse, setCheckResponse] = React.useState(undefined);
+    // When the subdomain is saved, the value is stored in a metadata object
+    // instead, so we need to default to the initial value to prevent the
+    // value from disappearing
+    const subDomainValue = React.useMemo(() => values['name-service-subdomain-handle'] === undefined
+        ? initialValues['name-service-subdomain-handle'] || ''
+        : values['name-service-subdomain-handle'], [values, initialValues]);
     const ensDomain = React.useMemo(() => {
         var _a;
         const domain = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.nameService) === null || _a === void 0 ? void 0 : _a.evm.domain;
@@ -135,7 +141,7 @@ const SubdomainField = ({ showDetails = false, }) => {
         logger.logger.error('Failed to get ENS domain from settings.sdk.nameService');
         return null;
     }
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: 'subdomain-field__container', children: [jsxRuntime.jsx(Input.Input, { id: 'subdomain-field', className: 'input__container--available', value: values['name-service-subdomain-handle'] || '', onChange: onChange, label: t('dyn_subdomain_field.label'), error: message && !(checkResponse === null || checkResponse === void 0 ? void 0 : checkResponse.available) ? true : false, success: checkResponse === null || checkResponse === void 0 ? void 0 : checkResponse.available, message: message }), jsxRuntime.jsx(Typography.Typography, { as: 'span', color: 'secondary', variant: 'body_normal', children: ensDomain })] }), showDetails && (jsxRuntime.jsx(Typography.Typography, { as: 'p', color: 'secondary', variant: 'body_small', className: 'subdomain-field__details', children: t('dyn_subdomain_field.details') })), jsxRuntime.jsx(Divider.Divider, {})] }));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: 'subdomain-field__container', children: [jsxRuntime.jsx(Input.Input, { id: 'subdomain-field', className: 'input__container--available', value: subDomainValue, onChange: onChange, label: t('dyn_subdomain_field.label'), error: message && !(checkResponse === null || checkResponse === void 0 ? void 0 : checkResponse.available) ? true : false, success: checkResponse === null || checkResponse === void 0 ? void 0 : checkResponse.available, message: message }), jsxRuntime.jsx(Typography.Typography, { as: 'span', color: 'secondary', variant: 'body_normal', children: ensDomain })] }), showDetails && (jsxRuntime.jsx(Typography.Typography, { as: 'p', color: 'secondary', variant: 'body_small', className: 'subdomain-field__details', children: t('dyn_subdomain_field.details') })), jsxRuntime.jsx(Divider.Divider, {})] }));
 };
 
 exports.SubdomainField = SubdomainField;

package/src/lib/views/SubdomainField/SubdomainField.js

@@ -90,6 +90,12 @@ const SubdomainField = ({ showDetails = false, }) => {
     const checkSubdomain = useSubdomainCheck();
     const { projectSettings } = useInternalDynamicContext();
     const [checkResponse, setCheckResponse] = useState(undefined);
+    // When the subdomain is saved, the value is stored in a metadata object
+    // instead, so we need to default to the initial value to prevent the
+    // value from disappearing
+    const subDomainValue = useMemo(() => values['name-service-subdomain-handle'] === undefined
+        ? initialValues['name-service-subdomain-handle'] || ''
+        : values['name-service-subdomain-handle'], [values, initialValues]);
     const ensDomain = useMemo(() => {
         var _a;
         const domain = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.nameService) === null || _a === void 0 ? void 0 : _a.evm.domain;
@@ -131,7 +137,7 @@ const SubdomainField = ({ showDetails = false, }) => {
         logger.error('Failed to get ENS domain from settings.sdk.nameService');
         return null;
     }
-    return (jsxs(Fragment, { children: [jsxs("div", { className: 'subdomain-field__container', children: [jsx(Input, { id: 'subdomain-field', className: 'input__container--available', value: values['name-service-subdomain-handle'] || '', onChange: onChange, label: t('dyn_subdomain_field.label'), error: message && !(checkResponse === null || checkResponse === void 0 ? void 0 : checkResponse.available) ? true : false, success: checkResponse === null || checkResponse === void 0 ? void 0 : checkResponse.available, message: message }), jsx(Typography, { as: 'span', color: 'secondary', variant: 'body_normal', children: ensDomain })] }), showDetails && (jsx(Typography, { as: 'p', color: 'secondary', variant: 'body_small', className: 'subdomain-field__details', children: t('dyn_subdomain_field.details') })), jsx(Divider, {})] }));
+    return (jsxs(Fragment, { children: [jsxs("div", { className: 'subdomain-field__container', children: [jsx(Input, { id: 'subdomain-field', className: 'input__container--available', value: subDomainValue, onChange: onChange, label: t('dyn_subdomain_field.label'), error: message && !(checkResponse === null || checkResponse === void 0 ? void 0 : checkResponse.available) ? true : false, success: checkResponse === null || checkResponse === void 0 ? void 0 : checkResponse.available, message: message }), jsx(Typography, { as: 'span', color: 'secondary', variant: 'body_normal', children: ensDomain })] }), showDetails && (jsx(Typography, { as: 'p', color: 'secondary', variant: 'body_small', className: 'subdomain-field__details', children: t('dyn_subdomain_field.details') })), jsx(Divider, {})] }));
 };
 
 export { SubdomainField };

package/src/lib/views/WalletList/WalletListGridTabs/WalletListGridTabs.d.ts

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { WalletListViewTabItem } from '../../../context/DynamicContext/types';
+import { WalletListViewTabItem } from '../../../shared';
 type WalletListGridTabsProps = {
     items: WalletListViewTabItem[];
     onSelect: (index: number) => void;

package/src/lib/views/WalletList/hooks/useTabState.d.ts

@@ -4,7 +4,7 @@ export declare const useTabState: ({ settingsOverrides, }: {
     settingsOverrides: SettingsOverrides | undefined;
 }) => {
     selectedTabIndex: number;
-    selectedTabSettings: import("../../../context/DynamicContext/types").WalletListViewTabItem | undefined;
+    selectedTabSettings: import("../../../shared").WalletListViewTabItem | undefined;
     setSelectedTabIndex: import("react").Dispatch<import("react").SetStateAction<number>>;
-    tabsItems: import("../../../context/DynamicContext/types").WalletListViewTabItem[] | undefined;
+    tabsItems: import("../../../shared").WalletListViewTabItem[] | undefined;
 };

package/src/lib/views/WalletList/utils/getEffectiveRecommendedWallets.d.ts

@@ -1,3 +1,2 @@
-import { WalletListViewTabItem } from '../../../context/DynamicContext/types';
-import { RecommendedWallet } from '../../../shared';
+import { RecommendedWallet, WalletListViewTabItem } from '../../../shared';
 export declare const getEffectiveRecommendedWallets: (selectedTabSettings: WalletListViewTabItem | undefined, recommendedWallets: RecommendedWallet[] | undefined) => RecommendedWallet[] | undefined;

package/src/lib/views/WalletList/utils/getEffectiveWalletFilter.d.ts

@@ -1,2 +1,2 @@
-import { WalletListViewTabItem, WalletsFilter } from '../../../context/DynamicContext/types';
+import { WalletListViewTabItem, WalletsFilter } from '../../../shared';
 export declare const getEffectiveWalletFilter: (selectedTabSettings: WalletListViewTabItem | undefined, walletsFilter: WalletsFilter | undefined) => WalletsFilter | undefined;

package/src/lib/context/DynamicContext/types/WalletListViewTabItem.d.ts

@@ -1,11 +0,0 @@
-import { ReactElement } from 'react';
-import { RecommendedWallet, WalletOption } from '../../../shared/types/wallets';
-export type WalletsFilter = (options: WalletOption[]) => WalletOption[];
-export type WalletListViewTabItem = {
-    label: {
-        text?: string;
-        icon?: string | ReactElement;
-    };
-    walletsFilter?: WalletsFilter;
-    recommendedWallets?: RecommendedWallet[];
-};