@dynamic-labs/sdk-react-core 0.18.100-viem.3 → 0.18.100-viem.30

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

@@ -6,35 +6,28 @@ var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
 var verifyMagicIsSetup = require('./utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
+const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
     const wallets = React.useMemo(() => {
-        if (!projectSettings || !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length)
+        if (!projectSettings ||
+            !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
+            !networkConfigurations)
             return [];
-        const installedWallets = data.getInstalledWallets(projectSettings, {
-            appLogoUrl,
-            appName,
-            customerApiProviders: projectSettings.providers || [],
-            flowNetwork,
-            networkConfigurations,
-            skipMemo: true,
-            walletBook,
-            walletConnectV1Bridge,
-            walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
-            walletUiUtils,
+        return data.getWallets({
+            getSupportedWalletOpts: {
+                appLogoUrl,
+                appName,
+                customerApiProviders: projectSettings.providers || [],
+                deepLinkPreference,
+                flowNetwork,
+                networkConfigurations,
+                skipMemo: true,
+                walletBook,
+                walletConnectV1Bridge,
+                walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
+                walletUiUtils,
+            },
+            settings: projectSettings,
         });
-        const notInstalledWallets = data.getNotInstalledWallets(projectSettings, {
-            appLogoUrl,
-            appName,
-            customerApiProviders: projectSettings.providers || [],
-            flowNetwork,
-            networkConfigurations,
-            skipMemo: true,
-            walletBook,
-            walletConnectV1Bridge,
-            walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
-            walletUiUtils,
-        });
-        return [...installedWallets, ...notInstalledWallets];
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
     }, [
         appLogoUrl,
@@ -45,6 +38,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
         walletConnectV1Bridge,
         flowNetwork,
         Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length,
+        networkConfigurations,
     ]);
     React.useEffect(() => {
         if (!projectSettings || wallets.length === 0)

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

@@ -1,10 +1,11 @@
 import { ProjectSettings } from '@dynamic-labs/sdk-api';
 import { NetworkConfigurationMap, WalletUiUtils } from '@dynamic-labs/types';
-import { WalletConnector, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
+import { DeepLinkVariant, WalletConnector, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 type Props = {
     appLogoUrl?: string;
     appName?: string;
+    deepLinkPreference?: DeepLinkVariant;
     flowNetwork?: 'mainnet' | 'testnet';
     networkConfigurations: NetworkConfigurationMap | undefined;
     projectSettings: ProjectSettings | undefined;
@@ -13,7 +14,7 @@ type Props = {
     walletConnectorsProp?: WalletConnectorsMethod[];
     walletUiUtils: WalletUiUtils<WalletConnector>;
 };
-export declare const useWallets: ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }: Props) => {
+export declare const useWallets: ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }: Props) => {
     wallets: import("../../../shared").WalletOption[];
 };
 export {};

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

@@ -1,36 +1,29 @@
 import { useMemo, useEffect } from 'react';
-import { getInstalledWallets, getNotInstalledWallets } from '../../../views/WalletList/data.js';
+import { getWallets } from '../../../views/WalletList/data.js';
 import { verifyMagicIsSetup } from './utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
+const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
     const wallets = useMemo(() => {
-        if (!projectSettings || !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length)
+        if (!projectSettings ||
+            !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
+            !networkConfigurations)
             return [];
-        const installedWallets = getInstalledWallets(projectSettings, {
-            appLogoUrl,
-            appName,
-            customerApiProviders: projectSettings.providers || [],
-            flowNetwork,
-            networkConfigurations,
-            skipMemo: true,
-            walletBook,
-            walletConnectV1Bridge,
-            walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
-            walletUiUtils,
+        return getWallets({
+            getSupportedWalletOpts: {
+                appLogoUrl,
+                appName,
+                customerApiProviders: projectSettings.providers || [],
+                deepLinkPreference,
+                flowNetwork,
+                networkConfigurations,
+                skipMemo: true,
+                walletBook,
+                walletConnectV1Bridge,
+                walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
+                walletUiUtils,
+            },
+            settings: projectSettings,
         });
-        const notInstalledWallets = getNotInstalledWallets(projectSettings, {
-            appLogoUrl,
-            appName,
-            customerApiProviders: projectSettings.providers || [],
-            flowNetwork,
-            networkConfigurations,
-            skipMemo: true,
-            walletBook,
-            walletConnectV1Bridge,
-            walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
-            walletUiUtils,
-        });
-        return [...installedWallets, ...notInstalledWallets];
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
     }, [
         appLogoUrl,
@@ -41,6 +34,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
         walletConnectV1Bridge,
         flowNetwork,
         Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length,
+        networkConfigurations,
     ]);
     useEffect(() => {
         if (!projectSettings || wallets.length === 0)

package/src/lib/views/CollectUserDataView/OnboardingUserDataForm/OnboardingUserDataForm.cjs

@@ -48,7 +48,7 @@ var index = require('../UserDataFields/index.cjs');
 var useUserDataForm = require('../../../utils/hooks/useUserDataForm/useUserDataForm.cjs');
 
 const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
-    const { policiesConsentInnerComponent, onboardingOnlyJwt, setShowAuthFlow, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { policiesConsentInnerComponent, onboardingOnlyJwt, internalSetShowAuthFlow, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView, view } = ViewContext.useViewContext();
     const decodedJwt = decodeJwt.decodeJwt(onboardingOnlyJwt);
     const { updateUser } = useUserUpdateRequest.useUserUpdateRequestInternal({
@@ -67,9 +67,9 @@ const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
             setView(view);
             return;
         }
-        setShowAuthFlow(false);
+        internalSetShowAuthFlow(false);
         setCallback('authSuccess');
-    }), [setCallback, setShowAuthFlow, setView, updateUser]);
+    }), [setCallback, internalSetShowAuthFlow, setView, updateUser]);
     const { fetch: loading, formikInitialValues, formikValidationSchema, enforcePolicies, onFormSubmit, } = useUserDataForm.useUserDataForm({
         fields: (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) || [],
         onSubmit,

package/src/lib/views/CollectUserDataView/OnboardingUserDataForm/OnboardingUserDataForm.js

@@ -44,7 +44,7 @@ import { UserDataFields } from '../UserDataFields/index.js';
 import { useUserDataForm } from '../../../utils/hooks/useUserDataForm/useUserDataForm.js';
 
 const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
-    const { policiesConsentInnerComponent, onboardingOnlyJwt, setShowAuthFlow, setCallback, } = useInternalDynamicContext();
+    const { policiesConsentInnerComponent, onboardingOnlyJwt, internalSetShowAuthFlow, setCallback, } = useInternalDynamicContext();
     const { setView, view } = useViewContext();
     const decodedJwt = decodeJwt(onboardingOnlyJwt);
     const { updateUser } = useUserUpdateRequestInternal({
@@ -63,9 +63,9 @@ const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
             setView(view);
             return;
         }
-        setShowAuthFlow(false);
+        internalSetShowAuthFlow(false);
         setCallback('authSuccess');
-    }), [setCallback, setShowAuthFlow, setView, updateUser]);
+    }), [setCallback, internalSetShowAuthFlow, setView, updateUser]);
     const { fetch: loading, formikInitialValues, formikValidationSchema, enforcePolicies, onFormSubmit, } = useUserDataForm({
         fields: (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) || [],
         onSubmit,

package/src/lib/views/EmailWalletOTPVerificationView/EmailWalletOTPVerificationView.cjs

@@ -65,7 +65,7 @@ const EmailWalletOTPVerificationView = () => {
     const { data: isValid, isLoading, mutate: onSubmit, } = useMutation.useMutation((otp) => emailWalletConnector.verifyOneTimePassword(otp), {
         onFailure: (error) => setError(error),
     });
-    return (jsxRuntime.jsx(OTPVerificationView.OTPVerificationView, { email: email, error: error, onClickBack: handleBackClick, isLoading: isLoading, onPinComplete: onSubmit, isValid: isValid === true, onPinChange: () => setError(undefined), onClickClose: handleOnClickClose, onClickEditEmail: handleBackClick, displayPoweredByDynamic: true }));
+    return (jsxRuntime.jsx(OTPVerificationView.OTPVerificationView, { email: email, error: error, onClickBack: handleBackClick, isLoading: isLoading, onPinComplete: onSubmit, isValid: isValid === true, onPinChange: () => setError(undefined), onClickClose: handleOnClickClose, onClickEditEmail: handleBackClick, displayPoweredByDynamic: true, successBannerText: 'Sign in to access your email based wallet' }));
 };
 
 exports.EmailWalletOTPVerificationView = EmailWalletOTPVerificationView;

package/src/lib/views/EmailWalletOTPVerificationView/EmailWalletOTPVerificationView.js

@@ -61,7 +61,7 @@ const EmailWalletOTPVerificationView = () => {
     const { data: isValid, isLoading, mutate: onSubmit, } = useMutation((otp) => emailWalletConnector.verifyOneTimePassword(otp), {
         onFailure: (error) => setError(error),
     });
-    return (jsx(OTPVerificationView, { email: email, error: error, onClickBack: handleBackClick, isLoading: isLoading, onPinComplete: onSubmit, isValid: isValid === true, onPinChange: () => setError(undefined), onClickClose: handleOnClickClose, onClickEditEmail: handleBackClick, displayPoweredByDynamic: true }));
+    return (jsx(OTPVerificationView, { email: email, error: error, onClickBack: handleBackClick, isLoading: isLoading, onPinComplete: onSubmit, isValid: isValid === true, onPinChange: () => setError(undefined), onClickClose: handleOnClickClose, onClickEditEmail: handleBackClick, displayPoweredByDynamic: true, successBannerText: 'Sign in to access your email based wallet' }));
 };
 
 export { EmailWalletOTPVerificationView };

package/src/lib/views/LoginWithEmailView/components/SocialSignIn/SocialSignIn.cjs

@@ -51,10 +51,10 @@ require('formik');
 require('yup');
 require('../../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
+var capitalize = require('../../../../shared/utils/functions/capitalize/capitalize.cjs');
 var SocialRedirectContext = require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 var OverlayCard = require('../../../../components/OverlayCard/OverlayCard.cjs');
 require('../../../../components/OverlayCard/OverlayCard.context.cjs');
-var capitalize = require('../../../../shared/utils/functions/capitalize/capitalize.cjs');
 
 const SocialSignIn = () => {
     const { socialProvidersFilter = (providers) => providers } = useInternalDynamicContext.useInternalDynamicContext();

package/src/lib/views/LoginWithEmailView/components/SocialSignIn/SocialSignIn.js

@@ -47,10 +47,10 @@ import 'formik';
 import 'yup';
 import '../../../../components/InlineWidget/InlineWidget.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
+import { capitalize } from '../../../../shared/utils/functions/capitalize/capitalize.js';
 import { useSocialRedirectContext } from '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import { OverlayCard } from '../../../../components/OverlayCard/OverlayCard.js';
 import '../../../../components/OverlayCard/OverlayCard.context.js';
-import { capitalize } from '../../../../shared/utils/functions/capitalize/capitalize.js';
 
 const SocialSignIn = () => {
     const { socialProvidersFilter = (providers) => providers } = useInternalDynamicContext();

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.cjs

@@ -53,12 +53,13 @@ var SelectNetworkButton = require('../../components/SelectNetworkButton/SelectNe
 var useApplyWalletConnectorNetwork = require('../../utils/hooks/useApplyWalletConnectorNetwork/useApplyWalletConnectorNetwork.cjs');
 
 const NetworkNotSupported = () => {
-    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext.useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise.usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), { deps: [primaryWallet, walletConnector, connectedWallets] });
     const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
         shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = React.useState(false);
     // Finishes auth flow when wallet switches to proper network

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.js

@@ -49,12 +49,13 @@ import { SelectNetworkButton } from '../../components/SelectNetworkButton/Select
 import { useApplyWalletConnectorNetwork } from '../../utils/hooks/useApplyWalletConnectorNetwork/useApplyWalletConnectorNetwork.js';
 
 const NetworkNotSupported = () => {
-    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext();
+    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), { deps: [primaryWallet, walletConnector, connectedWallets] });
     const finishConnectAndSign = useConnectAndSign({
         shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = useState(false);
     // Finishes auth flow when wallet switches to proper network

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.cjs

@@ -54,14 +54,15 @@ var useApplyWalletConnectorNetwork = require('../../utils/hooks/useApplyWalletCo
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext.useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise.usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), {
         deps: [walletConnector, connectedWallets],
     });
     const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
         shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     // Finishes auth flow when wallet switches to proper network
     React.useEffect(() => {

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.js

@@ -50,14 +50,15 @@ import { useApplyWalletConnectorNetwork } from '../../utils/hooks/useApplyWallet
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext();
+    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), {
         deps: [walletConnector, connectedWallets],
     });
     const finishConnectAndSign = useConnectAndSign({
         shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     // Finishes auth flow when wallet switches to proper network
     useEffect(() => {

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

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var viem = require('viem');
@@ -51,7 +52,7 @@ require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 
 const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBack, onClickClose, onError, onSuccess, onDone, displayPoweredByDynamicFooter = false, }) => {
     const [stage, setStage] = React.useState('form');
-    const { primaryWallet, network } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, network, walletUiUtils } = useInternalDynamicContext.useInternalDynamicContext();
     const [value, setValue] = React.useState(initialValue !== null && initialValue !== void 0 ? initialValue : null);
     const [recipientAddress, setRecipientAddress] = React.useState(initialRecipientAddress);
     const transactionRef = React.useRef(null);
@@ -86,10 +87,25 @@ const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBa
         const transaction = {
             from: primaryWallet.address,
             to: recipientAddress,
-            type: 'eip2930',
             value,
         };
-        return (jsxRuntime.jsx(TransactionStage.TransactionStage, { walletConnector: walletConnector, provider: provider, transaction: transaction, title: 'Confirm transaction', onClickBack: () => setStage('form'), onError: onError, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSuccess: (transaction) => {
+        return (jsxRuntime.jsx(TransactionStage.TransactionStage, { walletConnector: walletConnector, provider: provider, transaction: transaction, title: 'Confirm transaction', onClickBack: () => setStage('form'), onError: onError, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, mutation: ({ to, value, gasPrice, nonce }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                walletUiUtils.disabledConfirmationOnce();
+                const signer = yield walletConnector.getSigner();
+                const sentTransaction = yield signer.sendTransaction({
+                    account: signer.account || primaryWallet.address,
+                    /**
+                     * chain is set to null because viem already have the correct chain from the wallet connector
+                     * docs: https://viem.sh/docs/actions/wallet/sendTransaction.html#chain-optional
+                     */
+                    chain: null,
+                    gasPrice,
+                    nonce,
+                    to,
+                    value,
+                });
+                return sentTransaction;
+            }), onSuccess: (transaction) => {
                 transactionRef.current = transaction;
                 setStage('success');
                 onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(transactionRef.current);

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

@@ -1,3 +1,4 @@
+import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import { useState, useRef } from 'react';
 import { parseEther } from 'viem';
@@ -47,7 +48,7 @@ import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 
 const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBack, onClickClose, onError, onSuccess, onDone, displayPoweredByDynamicFooter = false, }) => {
     const [stage, setStage] = useState('form');
-    const { primaryWallet, network } = useInternalDynamicContext();
+    const { primaryWallet, network, walletUiUtils } = useInternalDynamicContext();
     const [value, setValue] = useState(initialValue !== null && initialValue !== void 0 ? initialValue : null);
     const [recipientAddress, setRecipientAddress] = useState(initialRecipientAddress);
     const transactionRef = useRef(null);
@@ -82,10 +83,25 @@ const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBa
         const transaction = {
             from: primaryWallet.address,
             to: recipientAddress,
-            type: 'eip2930',
             value,
         };
-        return (jsx(TransactionStage, { walletConnector: walletConnector, provider: provider, transaction: transaction, title: 'Confirm transaction', onClickBack: () => setStage('form'), onError: onError, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSuccess: (transaction) => {
+        return (jsx(TransactionStage, { walletConnector: walletConnector, provider: provider, transaction: transaction, title: 'Confirm transaction', onClickBack: () => setStage('form'), onError: onError, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, mutation: ({ to, value, gasPrice, nonce }) => __awaiter(void 0, void 0, void 0, function* () {
+                walletUiUtils.disabledConfirmationOnce();
+                const signer = yield walletConnector.getSigner();
+                const sentTransaction = yield signer.sendTransaction({
+                    account: signer.account || primaryWallet.address,
+                    /**
+                     * chain is set to null because viem already have the correct chain from the wallet connector
+                     * docs: https://viem.sh/docs/actions/wallet/sendTransaction.html#chain-optional
+                     */
+                    chain: null,
+                    gasPrice,
+                    nonce,
+                    to,
+                    value,
+                });
+                return sentTransaction;
+            }), onSuccess: (transaction) => {
                 transactionRef.current = transaction;
                 setStage('success');
                 onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(transactionRef.current);

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

@@ -19,9 +19,10 @@ require('viem');
 require('../../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isMagicConnector = require('../../../../utils/functions/isMagicConnector/isMagicConnector.cjs');
+var sendTransactionWithAutoNonce = require('../../../../utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
-var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
+require('../../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -47,27 +48,14 @@ require('../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs')
 var useTransactionWithGasPrice = require('../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 
 const TransactionStage = (_a) => {
-    var { transaction, provider, walletConnector } = _a, rest = _tslib.__rest(_a, ["transaction", "provider", "walletConnector"]);
-    const { walletUiUtils } = useInternalDynamicContext.useInternalDynamicContext();
+    var { transaction, provider, walletConnector, mutation } = _a, rest = _tslib.__rest(_a, ["transaction", "provider", "walletConnector", "mutation"]);
     const transactionWithGasPrice = useTransactionWithGasPrice.useTransactionWithGasPrice({
         enabled: isMagicConnector.isMagicConnector(walletConnector),
         increasePercentage: 5,
         provider,
         transaction,
     });
-    return (jsxRuntime.jsx(TransactionConfirmationView.TransactionConfirmationView, Object.assign({ provider: provider, transaction: transactionWithGasPrice, mutation: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            walletUiUtils.disabledConfirmationOnce();
-            const signer = yield walletConnector.getSigner();
-            const sentTransaction = yield signer.sendTransaction({
-                account: transactionWithGasPrice.from,
-                chain: null,
-                gasPrice: transactionWithGasPrice.gasPrice,
-                to: transactionWithGasPrice.to,
-                type: 'eip2930',
-                value: transactionWithGasPrice.value,
-            });
-            return sentTransaction;
-        }) }, rest)));
+    return (jsxRuntime.jsx(TransactionConfirmationView.TransactionConfirmationView, Object.assign({ provider: provider, transaction: transactionWithGasPrice, mutation: () => sendTransactionWithAutoNonce.sendTransactionWithAutoNonce(walletConnector, transactionWithGasPrice, mutation) }, rest)));
 };
 
 exports.TransactionStage = TransactionStage;

package/src/lib/views/SendBalanceView/components/TransactionStage/TransactionStage.d.ts

@@ -1,8 +1,10 @@
 import { FC } from 'react';
+import { Hex, TransactionRequest } from 'viem';
 import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { TransactionConfirmationViewProps } from '../../../TransactionConfirmationView';
 type TransactionStageProps = Omit<TransactionConfirmationViewProps, 'mutation'> & {
     walletConnector: WalletConnector;
+    mutation: (transaction: TransactionRequest) => Promise<Hex>;
 };
 export declare const TransactionStage: FC<TransactionStageProps>;
 export {};

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

@@ -1,4 +1,4 @@
-import { __rest, __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { __rest } from '../../../../../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import 'react';
 import '@dynamic-labs/utils';
@@ -15,9 +15,10 @@ import 'viem';
 import '../../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isMagicConnector } from '../../../../utils/functions/isMagicConnector/isMagicConnector.js';
+import { sendTransactionWithAutoNonce } from '../../../../utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
-import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
+import '../../../../context/DynamicContext/DynamicContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -43,27 +44,14 @@ import '../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 import { useTransactionWithGasPrice } from '../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 
 const TransactionStage = (_a) => {
-    var { transaction, provider, walletConnector } = _a, rest = __rest(_a, ["transaction", "provider", "walletConnector"]);
-    const { walletUiUtils } = useInternalDynamicContext();
+    var { transaction, provider, walletConnector, mutation } = _a, rest = __rest(_a, ["transaction", "provider", "walletConnector", "mutation"]);
     const transactionWithGasPrice = useTransactionWithGasPrice({
         enabled: isMagicConnector(walletConnector),
         increasePercentage: 5,
         provider,
         transaction,
     });
-    return (jsx(TransactionConfirmationView, Object.assign({ provider: provider, transaction: transactionWithGasPrice, mutation: () => __awaiter(void 0, void 0, void 0, function* () {
-            walletUiUtils.disabledConfirmationOnce();
-            const signer = yield walletConnector.getSigner();
-            const sentTransaction = yield signer.sendTransaction({
-                account: transactionWithGasPrice.from,
-                chain: null,
-                gasPrice: transactionWithGasPrice.gasPrice,
-                to: transactionWithGasPrice.to,
-                type: 'eip2930',
-                value: transactionWithGasPrice.value,
-            });
-            return sentTransaction;
-        }) }, rest)));
+    return (jsx(TransactionConfirmationView, Object.assign({ provider: provider, transaction: transactionWithGasPrice, mutation: () => sendTransactionWithAutoNonce(walletConnector, transactionWithGasPrice, mutation) }, rest)));
 };
 
 export { TransactionStage };

package/src/lib/views/WalletGroupView/components/WalletGroupItem/WalletGroupItem.cjs

@@ -13,6 +13,7 @@ require('@dynamic-labs/wallet-book');
 var getWalletListItemLabel = require('../../../../shared/utils/functions/getWalletListItemLabel/getWalletListItemLabel.cjs');
 require('viem');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../../context/ViewContext/ViewContext.cjs');
 var stroke = require('../../../../shared/assets/stroke.cjs');
 require('../../../../shared/consts/index.cjs');

package/src/lib/views/WalletGroupView/components/WalletGroupItem/WalletGroupItem.js

@@ -9,6 +9,7 @@ import '@dynamic-labs/wallet-book';
 import { getWalletListItemLabel } from '../../../../shared/utils/functions/getWalletListItemLabel/getWalletListItemLabel.js';
 import 'viem';
 import '../../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
 import '../../../../context/ViewContext/ViewContext.js';
 import { ReactComponent as SvgStroke } from '../../../../shared/assets/stroke.js';
 import '../../../../shared/consts/index.js';

package/src/lib/views/WalletList/WalletListItem/WalletListItem.cjs

@@ -16,11 +16,11 @@ require('@dynamic-labs/wallet-connector-core');
 var getWalletListItemLabel = require('../../../shared/utils/functions/getWalletListItemLabel/getWalletListItemLabel.cjs');
 require('viem');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../utils/constants/colors.cjs');
 require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/utils');
 var pixelToRem = require('../../../utils/functions/pixelToRem/pixelToRem.cjs');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');

package/src/lib/views/WalletList/WalletListItem/WalletListItem.js

@@ -12,11 +12,11 @@ import '@dynamic-labs/wallet-connector-core';
 import { getWalletListItemLabel } from '../../../shared/utils/functions/getWalletListItemLabel/getWalletListItemLabel.js';
 import 'viem';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../utils/constants/colors.js';
 import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/utils';
 import { pixelToRem } from '../../../utils/functions/pixelToRem/pixelToRem.js';
 import '../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../context/ThemeContext/ThemeContext.js';

package/src/lib/views/WalletList/data.cjs

@@ -22,7 +22,7 @@ const getEnabledChains = (chains) => chains
     .filter(({ enabled }) => enabled)
     .map(({ name }) => { var _a; return (_a = walletConnectorCore.getChainInfo(name)) === null || _a === void 0 ? void 0 : _a.symbol; })
     .filter((chain) => Boolean(chain));
-const createWallets = (props) => {
+const getWallets = (props) => {
     var _a, _b, _c, _d;
     return multiWallet.getEnabledWallets({
         enabledChains: getEnabledChains(props.settings.chains),
@@ -31,20 +31,8 @@ const createWallets = (props) => {
                 ((_b = props.settings.sdk.walletConnect) === null || _b === void 0 ? void 0 : _b.projectId)
                 ? (_c = props.settings.sdk.walletConnect) === null || _c === void 0 ? void 0 : _c.v2Enabled
                 : false, walletConnectProjectId: (_d = props.settings.sdk.walletConnect) === null || _d === void 0 ? void 0 : _d.projectId }),
-        installed: props.installed,
     }).map((wallet) => createWallet.createWallet(props.getSupportedWalletOpts.walletBook, wallet));
 };
-const getInstalledWallets = (settings, getSupportedWalletOpts) => createWallets({
-    getSupportedWalletOpts,
-    installed: true,
-    settings,
-});
-const getNotInstalledWallets = (settings, getSupportedWalletOpts) => createWallets({
-    getSupportedWalletOpts,
-    installed: false,
-    settings,
-});
 
 exports.getEnabledChains = getEnabledChains;
-exports.getInstalledWallets = getInstalledWallets;
-exports.getNotInstalledWallets = getNotInstalledWallets;
+exports.getWallets = getWallets;

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

@@ -6,6 +6,8 @@ interface IChain {
 }
 export declare const getEnabledChains: (chains: IChain[]) => ("ETH" | "FLOW" | "SOL" | "EVM" | "ALGO" | "STARK" | "ATOM" | "COSMOS")[];
 type BaseGetSupportedWalletOpts = Omit<GetSupportedWalletsOpts, 'isWalletConnectV2Enabled' | 'walletConnectProjectId' | 'chainRpcProviders'>;
-export declare const getInstalledWallets: (settings: ProjectSettings, getSupportedWalletOpts: BaseGetSupportedWalletOpts) => import("../../shared").WalletOption[];
-export declare const getNotInstalledWallets: (settings: ProjectSettings, getSupportedWalletOpts: BaseGetSupportedWalletOpts) => import("../../shared").WalletOption[];
+export declare const getWallets: (props: {
+    getSupportedWalletOpts: BaseGetSupportedWalletOpts;
+    settings: ProjectSettings;
+}) => import("../../shared").WalletOption[];
 export {};