@dynamic-labs/sdk-react-core 4.9.7 → 4.9.9

package/CHANGELOG.md

@@ -1,4 +1,23 @@
 
+### [4.9.9](https://github.com/dynamic-labs/dynamic-auth/compare/v4.9.8...v4.9.9) (2025-03-26)
+
+
+### Bug Fixes
+
+* **global-wallet-client:** properly clean up the popup state when popup is closed ([#8379](https://github.com/dynamic-labs/dynamic-auth/issues/8379)) ([782963f](https://github.com/dynamic-labs/dynamic-auth/commit/782963f87fcb2658b921ff6cc6f22c63be9714fb))
+* hanging promises when a starknet wallet is connected but locked ([#8376](https://github.com/dynamic-labs/dynamic-auth/issues/8376)) ([a753939](https://github.com/dynamic-labs/dynamic-auth/commit/a7539395d4653be49f000ae51d15347a176b5b6c))
+* token balance list should respect sort from backend ([#8383](https://github.com/dynamic-labs/dynamic-auth/issues/8383)) ([1c3bef4](https://github.com/dynamic-labs/dynamic-auth/commit/1c3bef47dbfd319e2444368a4a503b0839b5ad4b))
+
+
+* add message auth code to global wallet ([#8354](https://github.com/dynamic-labs/dynamic-auth/issues/8354)) ([c847bf8](https://github.com/dynamic-labs/dynamic-auth/commit/c847bf8d66db54534348622255997f30f4309542))
+
+### [4.9.8](https://github.com/dynamic-labs/dynamic-auth/compare/v4.9.7...v4.9.8) (2025-03-24)
+
+
+### Bug Fixes
+
+* unlink wallets when using 7702 account ([#8367](https://github.com/dynamic-labs/dynamic-auth/issues/8367)) ([f5acf05](https://github.com/dynamic-labs/dynamic-auth/commit/f5acf05ef31b8f411f3b0cd0e90e919e71f4ad50))
+
 ### [4.9.7](https://github.com/dynamic-labs/dynamic-auth/compare/v4.9.6...v4.9.7) (2025-03-21)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.9.7";
+var version = "4.9.9";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.644",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "4.9.7";
+var version = "4.9.9";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.644",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.9.7",
+  "version": "4.9.9",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.644",
     "@hcaptcha/react-hcaptcha": "1.4.4",
@@ -14,16 +14,16 @@
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
     "bs58": "5.0.0",
-    "@dynamic-labs/assert-package-version": "4.9.7",
-    "@dynamic-labs/iconic": "4.9.7",
-    "@dynamic-labs/logger": "4.9.7",
-    "@dynamic-labs/multi-wallet": "4.9.7",
-    "@dynamic-labs/rpc-providers": "4.9.7",
-    "@dynamic-labs/store": "4.9.7",
-    "@dynamic-labs/types": "4.9.7",
-    "@dynamic-labs/utils": "4.9.7",
-    "@dynamic-labs/wallet-book": "4.9.7",
-    "@dynamic-labs/wallet-connector-core": "4.9.7",
+    "@dynamic-labs/assert-package-version": "4.9.9",
+    "@dynamic-labs/iconic": "4.9.9",
+    "@dynamic-labs/logger": "4.9.9",
+    "@dynamic-labs/multi-wallet": "4.9.9",
+    "@dynamic-labs/rpc-providers": "4.9.9",
+    "@dynamic-labs/store": "4.9.9",
+    "@dynamic-labs/types": "4.9.9",
+    "@dynamic-labs/utils": "4.9.9",
+    "@dynamic-labs/wallet-book": "4.9.9",
+    "@dynamic-labs/wallet-connector-core": "4.9.9",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/ModalHeader/ModalHeader.cjs

@@ -6,19 +6,21 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var classNames = require('../../utils/functions/classNames/classNames.cjs');
+var isGlobalWalletPopup = require('../../shared/utils/functions/isGlobalWalletPopup/isGlobalWalletPopup.cjs');
 
 const ModalHeader = ({ alignContent, children, leading, displayLeading = true, trailing, displayTrailing = true, style, displayBorder, description, }) => {
     const hasLeading = displayLeading && leading && React.Children.count(leading);
     const hasTrailing = displayTrailing && trailing && React.Children.count(trailing);
+    const trailingClassName = classNames.classNames('modal-header__content__trailing', {
+        'modal-header__content__trailing--empty': !hasTrailing,
+    });
     return (jsxRuntime.jsxs("div", { className: classNames.classNames('modal-header', {
             'modal-header--border': displayBorder,
             'modal-header--empty': !hasLeading && !children && !hasTrailing,
         }), style: style, children: [jsxRuntime.jsxs("div", { className: classNames.classNames('modal-header__content', alignContent &&
                     `modal-header__content--align-content-${alignContent}`), children: [displayLeading && (jsxRuntime.jsx("div", { className: classNames.classNames('modal-header__content__leading', {
                             'modal-header__content__leading--empty': !hasLeading,
-                        }), children: leading })), children, displayTrailing && (jsxRuntime.jsx("div", { className: classNames.classNames('modal-header__content__trailing', {
-                            'modal-header__content__trailing--empty': !hasTrailing,
-                        }), children: trailing }))] }), description] }));
+                        }), children: leading })), children, isGlobalWalletPopup.isGlobalWalletPopup() && (jsxRuntime.jsx("div", { id: 'modal-header-gw-menu', className: trailingClassName })), displayTrailing && !isGlobalWalletPopup.isGlobalWalletPopup() && (jsxRuntime.jsx("div", { className: trailingClassName, children: trailing }))] }), description] }));
 };
 
 exports.ModalHeader = ModalHeader;

package/src/lib/components/ModalHeader/ModalHeader.js

@@ -2,19 +2,21 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { Children } from 'react';
 import { classNames } from '../../utils/functions/classNames/classNames.js';
+import { isGlobalWalletPopup } from '../../shared/utils/functions/isGlobalWalletPopup/isGlobalWalletPopup.js';
 
 const ModalHeader = ({ alignContent, children, leading, displayLeading = true, trailing, displayTrailing = true, style, displayBorder, description, }) => {
     const hasLeading = displayLeading && leading && Children.count(leading);
     const hasTrailing = displayTrailing && trailing && Children.count(trailing);
+    const trailingClassName = classNames('modal-header__content__trailing', {
+        'modal-header__content__trailing--empty': !hasTrailing,
+    });
     return (jsxs("div", { className: classNames('modal-header', {
             'modal-header--border': displayBorder,
             'modal-header--empty': !hasLeading && !children && !hasTrailing,
         }), style: style, children: [jsxs("div", { className: classNames('modal-header__content', alignContent &&
                     `modal-header__content--align-content-${alignContent}`), children: [displayLeading && (jsx("div", { className: classNames('modal-header__content__leading', {
                             'modal-header__content__leading--empty': !hasLeading,
-                        }), children: leading })), children, displayTrailing && (jsx("div", { className: classNames('modal-header__content__trailing', {
-                            'modal-header__content__trailing--empty': !hasTrailing,
-                        }), children: trailing }))] }), description] }));
+                        }), children: leading })), children, isGlobalWalletPopup() && (jsx("div", { id: 'modal-header-gw-menu', className: trailingClassName })), displayTrailing && !isGlobalWalletPopup() && (jsx("div", { className: trailingClassName, children: trailing }))] }), description] }));
 };
 
 export { ModalHeader };

package/src/lib/components/NetworkPicker/components/NetworkControl/NetworkControl.cjs

@@ -20,7 +20,7 @@ const NetworkControl = ({ loading, walletConnector, buttonClassName, network, ac
         return jsxRuntime.jsx(NetworkControlSkeleton.NetworkControlSkeleton, { className: buttonClassName });
     }
     if (!walletConnector.supportsNetworkSwitching()) {
-        return (jsxRuntime.jsx(NonNetworkSwitchingSupportedControl.NonNetworkSwitchingSupportedControl, { className: buttonClassName, showNetworkName: showNetworkName, walletConnector: walletConnector }));
+        return (jsxRuntime.jsx(NonNetworkSwitchingSupportedControl.NonNetworkSwitchingSupportedControl, { className: buttonClassName, showNetworkName: showNetworkName, walletConnector: walletConnector, network: network, enabledNetworks: enabledNetworks }));
     }
     return (jsxRuntime.jsx(NetworkSwitchControl.NetworkSwitchControl, { showNetworkName: showNetworkName, enabledNetworks: enabledNetworks, activeClassName: activeClassName, className: buttonClassName, network: network, loading: loading, isOpen: isOpen, walletConnector: walletConnector, setIsOpen: setIsOpen }));
 };

package/src/lib/components/NetworkPicker/components/NetworkControl/NetworkControl.js

@@ -16,7 +16,7 @@ const NetworkControl = ({ loading, walletConnector, buttonClassName, network, ac
         return jsx(NetworkControlSkeleton, { className: buttonClassName });
     }
     if (!walletConnector.supportsNetworkSwitching()) {
-        return (jsx(NonNetworkSwitchingSupportedControl, { className: buttonClassName, showNetworkName: showNetworkName, walletConnector: walletConnector }));
+        return (jsx(NonNetworkSwitchingSupportedControl, { className: buttonClassName, showNetworkName: showNetworkName, walletConnector: walletConnector, network: network, enabledNetworks: enabledNetworks }));
     }
     return (jsx(NetworkSwitchControl, { showNetworkName: showNetworkName, enabledNetworks: enabledNetworks, activeClassName: activeClassName, className: buttonClassName, network: network, loading: loading, isOpen: isOpen, walletConnector: walletConnector, setIsOpen: setIsOpen }));
 };

package/src/lib/components/NetworkPicker/components/NonNetworkSwitchingSupportedControl/NonNetworkSwitchingSupportedControl.cjs

@@ -4,10 +4,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
+var React = require('react');
 var classNames = require('../../../../utils/functions/classNames/classNames.cjs');
 require('../../../Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../Alert/Alert.cjs');
-require('react');
 require('../../../../events/dynamicEvents.cjs');
 require('../../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/utils');
@@ -101,14 +101,22 @@ require('../../../IsBrowser/IsBrowser.cjs');
 require('../../../Popper/Popper/Popper.cjs');
 require('../../../Popper/PopperContext/PopperContext.cjs');
 
-const NonNetworkSwitchingSupportedControl = ({ walletConnector, className, showNetworkName = false, }) => {
+const NonNetworkSwitchingSupportedControl = ({ walletConnector, className, showNetworkName = false, network, enabledNetworks, }) => {
     const { chain, isLoading } = useFetchChain.useFetchChain(walletConnector);
     const chainName = (chain === null || chain === void 0 ? void 0 : chain.name) || '';
     const ChainIcon = getChainIcon.getChainIcon(walletConnector.connectedChain || '');
+    const currentNetwork = React.useMemo(() => {
+        var _a;
+        let networkName;
+        if (network && enabledNetworks) {
+            networkName = (_a = enabledNetworks.find((element) => element.chainId.toString() === network.toString())) === null || _a === void 0 ? void 0 : _a.name;
+        }
+        return capitalize.capitalize(networkName !== null && networkName !== void 0 ? networkName : chainName);
+    }, [enabledNetworks, network, chainName]);
     if (isLoading) {
         return jsxRuntime.jsx(NetworkControlSkeleton.NetworkControlSkeleton, { className: className });
     }
-    return (jsxRuntime.jsxs("div", { "data-testid": 'NonNetworkSwitchingSupportedControl', className: classNames.classNames('non-network-switching-supported-control', className), children: [jsxRuntime.jsx(Icon.Icon, { size: 'small', children: (chain === null || chain === void 0 ? void 0 : chain.icon) ? (jsxRuntime.jsx("img", { src: chain.icon, alt: `${chain.name} icon` })) : (jsxRuntime.jsx(ChainIcon, {})) }), showNetworkName && (jsxRuntime.jsx(Typography.Typography, { className: classNames.classNames('non-network-switching-supported-control__network-name'), as: 'span', variant: 'body_small', children: capitalize.capitalize(chainName) }))] }));
+    return (jsxRuntime.jsxs("div", { "data-testid": 'NonNetworkSwitchingSupportedControl', className: classNames.classNames('non-network-switching-supported-control', className), children: [jsxRuntime.jsx(Icon.Icon, { size: 'small', children: (chain === null || chain === void 0 ? void 0 : chain.icon) ? (jsxRuntime.jsx("img", { src: chain.icon, alt: `${chain.name} icon` })) : (jsxRuntime.jsx(ChainIcon, {})) }), showNetworkName && (jsxRuntime.jsx(Typography.Typography, { className: classNames.classNames('non-network-switching-supported-control__network-name'), as: 'span', variant: 'body_small', children: currentNetwork }))] }));
 };
 
 exports.NonNetworkSwitchingSupportedControl = NonNetworkSwitchingSupportedControl;

package/src/lib/components/NetworkPicker/components/NonNetworkSwitchingSupportedControl/NonNetworkSwitchingSupportedControl.d.ts

@@ -1,9 +1,12 @@
 /// <reference types="react" />
 import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { GenericNetwork } from '@dynamic-labs/types';
 type Props = {
     className?: string;
     showNetworkName?: boolean;
     walletConnector: WalletConnector;
+    network?: string | number;
+    enabledNetworks?: GenericNetwork[];
 };
-export declare const NonNetworkSwitchingSupportedControl: ({ walletConnector, className, showNetworkName, }: Props) => JSX.Element;
+export declare const NonNetworkSwitchingSupportedControl: ({ walletConnector, className, showNetworkName, network, enabledNetworks, }: Props) => JSX.Element;
 export {};

package/src/lib/components/NetworkPicker/components/NonNetworkSwitchingSupportedControl/NonNetworkSwitchingSupportedControl.js

@@ -1,9 +1,9 @@
 'use client'
 import { jsx, jsxs } from 'react/jsx-runtime';
+import { useMemo } from 'react';
 import { classNames } from '../../../../utils/functions/classNames/classNames.js';
 import '../../../Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../Alert/Alert.js';
-import 'react';
 import '../../../../events/dynamicEvents.js';
 import '../../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/utils';
@@ -97,14 +97,22 @@ import '../../../IsBrowser/IsBrowser.js';
 import '../../../Popper/Popper/Popper.js';
 import '../../../Popper/PopperContext/PopperContext.js';
 
-const NonNetworkSwitchingSupportedControl = ({ walletConnector, className, showNetworkName = false, }) => {
+const NonNetworkSwitchingSupportedControl = ({ walletConnector, className, showNetworkName = false, network, enabledNetworks, }) => {
     const { chain, isLoading } = useFetchChain(walletConnector);
     const chainName = (chain === null || chain === void 0 ? void 0 : chain.name) || '';
     const ChainIcon = getChainIcon(walletConnector.connectedChain || '');
+    const currentNetwork = useMemo(() => {
+        var _a;
+        let networkName;
+        if (network && enabledNetworks) {
+            networkName = (_a = enabledNetworks.find((element) => element.chainId.toString() === network.toString())) === null || _a === void 0 ? void 0 : _a.name;
+        }
+        return capitalize(networkName !== null && networkName !== void 0 ? networkName : chainName);
+    }, [enabledNetworks, network, chainName]);
     if (isLoading) {
         return jsx(NetworkControlSkeleton, { className: className });
     }
-    return (jsxs("div", { "data-testid": 'NonNetworkSwitchingSupportedControl', className: classNames('non-network-switching-supported-control', className), children: [jsx(Icon, { size: 'small', children: (chain === null || chain === void 0 ? void 0 : chain.icon) ? (jsx("img", { src: chain.icon, alt: `${chain.name} icon` })) : (jsx(ChainIcon, {})) }), showNetworkName && (jsx(Typography, { className: classNames('non-network-switching-supported-control__network-name'), as: 'span', variant: 'body_small', children: capitalize(chainName) }))] }));
+    return (jsxs("div", { "data-testid": 'NonNetworkSwitchingSupportedControl', className: classNames('non-network-switching-supported-control', className), children: [jsx(Icon, { size: 'small', children: (chain === null || chain === void 0 ? void 0 : chain.icon) ? (jsx("img", { src: chain.icon, alt: `${chain.name} icon` })) : (jsx(ChainIcon, {})) }), showNetworkName && (jsx(Typography, { className: classNames('non-network-switching-supported-control__network-name'), as: 'span', variant: 'body_small', children: currentNetwork }))] }));
 };
 
 export { NonNetworkSwitchingSupportedControl };

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

@@ -70,11 +70,13 @@ const linkWallet = (environmentId_1, _b) => _tslib.__awaiter(void 0, [environmen
     }
 });
 const unlinkWallet = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ environmentId, primaryWalletId, walletId, onSuccess, }) {
+    // 7702 wallets have a -zerodev suffix because it's a credential created on the fly
+    const normalizedPrimaryWalletId = primaryWalletId === null || primaryWalletId === void 0 ? void 0 : primaryWalletId.replace('-zerodev', '');
     try {
         const response = yield api.sdkApi().verifyUnlink({
             environmentId,
             verifyUnlinkRequest: {
-                primaryWalletId,
+                primaryWalletId: normalizedPrimaryWalletId,
                 walletId,
             },
         });

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

@@ -66,11 +66,13 @@ const linkWallet = (environmentId_1, _b) => __awaiter(void 0, [environmentId_1,
     }
 });
 const unlinkWallet = (_c) => __awaiter(void 0, [_c], void 0, function* ({ environmentId, primaryWalletId, walletId, onSuccess, }) {
+    // 7702 wallets have a -zerodev suffix because it's a credential created on the fly
+    const normalizedPrimaryWalletId = primaryWalletId === null || primaryWalletId === void 0 ? void 0 : primaryWalletId.replace('-zerodev', '');
     try {
         const response = yield sdkApi().verifyUnlink({
             environmentId,
             verifyUnlinkRequest: {
-                primaryWalletId,
+                primaryWalletId: normalizedPrimaryWalletId,
                 walletId,
             },
         });

package/src/lib/shared/utils/functions/isGlobalWalletPopup/index.d.ts

@@ -0,0 +1 @@
+export { isGlobalWalletPopup } from './isGlobalWalletPopup';

package/src/lib/shared/utils/functions/isGlobalWalletPopup/isGlobalWalletPopup.cjs

@@ -0,0 +1,8 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isGlobalWalletPopup = () => typeof window !== 'undefined' && window.isGlobalWalletPopup;
+
+exports.isGlobalWalletPopup = isGlobalWalletPopup;

package/src/lib/shared/utils/functions/isGlobalWalletPopup/isGlobalWalletPopup.d.ts

@@ -0,0 +1,6 @@
+declare global {
+    interface Window {
+        isGlobalWalletPopup: boolean;
+    }
+}
+export declare const isGlobalWalletPopup: () => boolean;

package/src/lib/shared/utils/functions/isGlobalWalletPopup/isGlobalWalletPopup.js

@@ -0,0 +1,4 @@
+'use client'
+const isGlobalWalletPopup = () => typeof window !== 'undefined' && window.isGlobalWalletPopup;
+
+export { isGlobalWalletPopup };

package/src/lib/store/state/dynamicContextProps/dynamicContextProps.cjs

@@ -41,7 +41,6 @@ const useSyncDynamicContextProps = ({ settings, emitErrors, enableInstrumentatio
     // If it changes, the user should be logged out and we will detect that in useValidateSession.
     settings.environmentId = environmentId;
     React.useEffect(() => {
-        var _a;
         if (environmentId === defaultDynamicSettings.PUBLIC_PROJECT_LIVE_ENVIRONMENT_ID) {
             logger.logger.warn(`WARNING: DYNAMIC is using a test environment ID ${environmentId}. Please sign up on https://app.dynamic.xyz/ to get your production environment ID.`);
         }
@@ -49,7 +48,8 @@ const useSyncDynamicContextProps = ({ settings, emitErrors, enableInstrumentatio
             logger.logger.setLogLevel(settings.logLevel);
             walletConnectorCore.logger.setLogLevel(settings.logLevel);
         }
-        ApiEndpoint.setBaseUrl((_a = process.env.DYNAMIC_API_BASE_URL) !== null && _a !== void 0 ? _a : settings.apiBaseUrl);
+        const apiBaseUrl = utils.getEnvVarWithFallback('DYNAMIC_API_BASE_URL', settings.apiBaseUrl || '');
+        ApiEndpoint.setBaseUrl(apiBaseUrl);
         setDynamicContextProps({
             emitErrors,
             enableInstrumentation,

package/src/lib/store/state/dynamicContextProps/dynamicContextProps.js

@@ -1,6 +1,6 @@
 'use client'
 import { useEffect } from 'react';
-import { MissingEnvironmentIdError } from '@dynamic-labs/utils';
+import { MissingEnvironmentIdError, getEnvVarWithFallback } from '@dynamic-labs/utils';
 import { logger as logger$1 } from '@dynamic-labs/wallet-connector-core';
 import ApiEndpoint from '../../../config/ApiEndpoint.js';
 import { logger } from '../../../shared/logger.js';
@@ -37,7 +37,6 @@ const useSyncDynamicContextProps = ({ settings, emitErrors, enableInstrumentatio
     // If it changes, the user should be logged out and we will detect that in useValidateSession.
     settings.environmentId = environmentId;
     useEffect(() => {
-        var _a;
         if (environmentId === PUBLIC_PROJECT_LIVE_ENVIRONMENT_ID) {
             logger.warn(`WARNING: DYNAMIC is using a test environment ID ${environmentId}. Please sign up on https://app.dynamic.xyz/ to get your production environment ID.`);
         }
@@ -45,7 +44,8 @@ const useSyncDynamicContextProps = ({ settings, emitErrors, enableInstrumentatio
             logger.setLogLevel(settings.logLevel);
             logger$1.setLogLevel(settings.logLevel);
         }
-        ApiEndpoint.setBaseUrl((_a = process.env.DYNAMIC_API_BASE_URL) !== null && _a !== void 0 ? _a : settings.apiBaseUrl);
+        const apiBaseUrl = getEnvVarWithFallback('DYNAMIC_API_BASE_URL', settings.apiBaseUrl || '');
+        ApiEndpoint.setBaseUrl(apiBaseUrl);
         setDynamicContextProps({
             emitErrors,
             enableInstrumentation,

package/src/lib/utils/functions/generateMessages/index.cjs

@@ -13,6 +13,9 @@ const getChainIdForMessage = (walletConnector) => _tslib.__awaiter(void 0, void
     if (walletConnector.connectedChain === 'SOL') {
         return undefined;
     }
+    if (walletConnector.connectedChain === 'SUI') {
+        return undefined;
+    }
     const chain = yield walletConnector.getNetwork(true);
     if (chain) {
         return chain;

package/src/lib/utils/functions/generateMessages/index.js

@@ -9,6 +9,9 @@ const getChainIdForMessage = (walletConnector) => __awaiter(void 0, void 0, void
     if (walletConnector.connectedChain === 'SOL') {
         return undefined;
     }
+    if (walletConnector.connectedChain === 'SUI') {
+        return undefined;
+    }
     const chain = yield walletConnector.getNetwork(true);
     if (chain) {
         return chain;

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

@@ -182,10 +182,16 @@ const useDynamicWaas = () => {
     }), [getWalletConnector, primaryChain, enabledChainNames, refresh]);
     const shouldAutoCreateDynamicWaasWallet = React.useMemo(() => {
         const hasDynamicWaasWallet = user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials.some((wallet) => { var _a; return (_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes('dynamicwaas'); });
+        const hasExistingV1orV2Wallet = user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials.some((wallet) => {
+            var _a, _b;
+            return ((_a = wallet.walletProperties) === null || _a === void 0 ? void 0 : _a.version) === sdkApiCore.EmbeddedWalletVersionEnum.V1 || // V1 wallet
+                ((_b = wallet.walletProperties) === null || _b === void 0 ? void 0 : _b.version) === sdkApiCore.EmbeddedWalletVersionEnum.V2;
+        });
         if (!user$1 ||
-            hasDynamicWaasWallet || // already has a dynamic waas wallet
+            hasDynamicWaasWallet || // already has a dynamic waas wallet for all enabled chains
             !dynamicWaasIsEnabled || // dynamic waas is not enabled
-            !automaticEmbeddedWalletCreationEnabled // automatic embedded wallet creation is not enabled
+            !automaticEmbeddedWalletCreationEnabled || // automatic embedded wallet creation is not enabled
+            hasExistingV1orV2Wallet // already has a v2 or v1 wallet
         )
             return false;
         const hasExternalWallet = user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials.some((vc) => vc.format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain &&

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

@@ -178,10 +178,16 @@ const useDynamicWaas = () => {
     }), [getWalletConnector, primaryChain, enabledChainNames, refresh]);
     const shouldAutoCreateDynamicWaasWallet = useMemo(() => {
         const hasDynamicWaasWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.some((wallet) => { var _a; return (_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes('dynamicwaas'); });
+        const hasExistingV1orV2Wallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.some((wallet) => {
+            var _a, _b;
+            return ((_a = wallet.walletProperties) === null || _a === void 0 ? void 0 : _a.version) === EmbeddedWalletVersionEnum.V1 || // V1 wallet
+                ((_b = wallet.walletProperties) === null || _b === void 0 ? void 0 : _b.version) === EmbeddedWalletVersionEnum.V2;
+        });
         if (!user ||
-            hasDynamicWaasWallet || // already has a dynamic waas wallet
+            hasDynamicWaasWallet || // already has a dynamic waas wallet for all enabled chains
             !dynamicWaasIsEnabled || // dynamic waas is not enabled
-            !automaticEmbeddedWalletCreationEnabled // automatic embedded wallet creation is not enabled
+            !automaticEmbeddedWalletCreationEnabled || // automatic embedded wallet creation is not enabled
+            hasExistingV1orV2Wallet // already has a v2 or v1 wallet
         )
             return false;
         const hasExternalWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.some((vc) => vc.format === JwtVerifiedCredentialFormatEnum.Blockchain &&

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 
 const useNetworkConfigurationsFromProjectSettings = ({ projectSettings, cosmosNetworkOverrides, evmNetworksOverrides, solanaNetworksOverrides, }) => React.useMemo(() => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const networks = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.networks;
     if (!networks)
         return {};
@@ -15,6 +15,7 @@ const useNetworkConfigurationsFromProjectSettings = ({ projectSettings, cosmosNe
     const cosmos = networks.find((configurations) => configurations.chainName === 'cosmos');
     const starknet = networks.find((configurations) => configurations.chainName === 'starknet');
     const eclipse = networks.find((configurations) => configurations.chainName === 'eclipse');
+    const sui = networks.find((configurations) => configurations.chainName === 'sui');
     let cosmosNetworks = (_a = cosmos === null || cosmos === void 0 ? void 0 : cosmos.networks) === null || _a === void 0 ? void 0 : _a.map((net) => createNetwork(net, Number.parseInt));
     cosmosNetworks = overrideNetworks(cosmosNetworkOverrides, cosmosNetworks);
     let evmNetworks = (_b = evm === null || evm === void 0 ? void 0 : evm.networks) === null || _b === void 0 ? void 0 : _b.map((net) => createNetwork(net, Number.parseInt));
@@ -31,12 +32,14 @@ const useNetworkConfigurationsFromProjectSettings = ({ projectSettings, cosmosNe
             evmNetworks = evmNetworksOverrides(evmNetworks !== null && evmNetworks !== void 0 ? evmNetworks : []);
         }
     }
+    const suiNetworks = (_f = sui === null || sui === void 0 ? void 0 : sui.networks) === null || _f === void 0 ? void 0 : _f.map((net) => createNetwork(net));
     const networkConfigurations = {
         cosmos: cosmosNetworks,
         eclipse: eclipseNetworks,
         evm: evmNetworks,
         solana: solanaNetworks,
         starknet: starknetNetworks,
+        sui: suiNetworks,
     };
     return networkConfigurations;
 }, [

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

@@ -2,7 +2,7 @@
 import { useMemo } from 'react';
 
 const useNetworkConfigurationsFromProjectSettings = ({ projectSettings, cosmosNetworkOverrides, evmNetworksOverrides, solanaNetworksOverrides, }) => useMemo(() => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const networks = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.networks;
     if (!networks)
         return {};
@@ -11,6 +11,7 @@ const useNetworkConfigurationsFromProjectSettings = ({ projectSettings, cosmosNe
     const cosmos = networks.find((configurations) => configurations.chainName === 'cosmos');
     const starknet = networks.find((configurations) => configurations.chainName === 'starknet');
     const eclipse = networks.find((configurations) => configurations.chainName === 'eclipse');
+    const sui = networks.find((configurations) => configurations.chainName === 'sui');
     let cosmosNetworks = (_a = cosmos === null || cosmos === void 0 ? void 0 : cosmos.networks) === null || _a === void 0 ? void 0 : _a.map((net) => createNetwork(net, Number.parseInt));
     cosmosNetworks = overrideNetworks(cosmosNetworkOverrides, cosmosNetworks);
     let evmNetworks = (_b = evm === null || evm === void 0 ? void 0 : evm.networks) === null || _b === void 0 ? void 0 : _b.map((net) => createNetwork(net, Number.parseInt));
@@ -27,12 +28,14 @@ const useNetworkConfigurationsFromProjectSettings = ({ projectSettings, cosmosNe
             evmNetworks = evmNetworksOverrides(evmNetworks !== null && evmNetworks !== void 0 ? evmNetworks : []);
         }
     }
+    const suiNetworks = (_f = sui === null || sui === void 0 ? void 0 : sui.networks) === null || _f === void 0 ? void 0 : _f.map((net) => createNetwork(net));
     const networkConfigurations = {
         cosmos: cosmosNetworks,
         eclipse: eclipseNetworks,
         evm: evmNetworks,
         solana: solanaNetworks,
         starknet: starknetNetworks,
+        sui: suiNetworks,
     };
     return networkConfigurations;
 }, [

package/src/lib/widgets/DynamicWidget/components/ActiveWalletBalance/ActiveWalletBalance.cjs

@@ -118,11 +118,7 @@ const ActiveWalletBalance = () => {
         includeNativeBalance: true,
     });
     const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
-    const filteredTokenBalances = React.useMemo(() => {
-        const balances = (tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.filter((token) => token.name)) || [];
-        balances.sort((a, b) => ((b === null || b === void 0 ? void 0 : b.marketValue) || 0) - ((a === null || a === void 0 ? void 0 : a.marketValue) || 0));
-        return balances;
-    }, [tokenBalances]);
+    const filteredTokenBalances = React.useMemo(() => (tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.filter((token) => token.name)) || [], [tokenBalances]);
     const totalValue = React.useMemo(() => filteredTokenBalances.reduce((acc, token) => acc + ((token === null || token === void 0 ? void 0 : token.marketValue) || 0), 0), [filteredTokenBalances]);
     const enableMultiAsset = (authMode === 'connect-and-sign' ||
         (authMode === 'connect-only' &&

package/src/lib/widgets/DynamicWidget/components/ActiveWalletBalance/ActiveWalletBalance.js

@@ -114,11 +114,7 @@ const ActiveWalletBalance = () => {
         includeNativeBalance: true,
     });
     const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
-    const filteredTokenBalances = useMemo(() => {
-        const balances = (tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.filter((token) => token.name)) || [];
-        balances.sort((a, b) => ((b === null || b === void 0 ? void 0 : b.marketValue) || 0) - ((a === null || a === void 0 ? void 0 : a.marketValue) || 0));
-        return balances;
-    }, [tokenBalances]);
+    const filteredTokenBalances = useMemo(() => (tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.filter((token) => token.name)) || [], [tokenBalances]);
     const totalValue = useMemo(() => filteredTokenBalances.reduce((acc, token) => acc + ((token === null || token === void 0 ? void 0 : token.marketValue) || 0), 0), [filteredTokenBalances]);
     const enableMultiAsset = (authMode === 'connect-and-sign' ||
         (authMode === 'connect-only' &&