@dynamic-labs/sdk-react-core 0.17.0-RC.21 → 0.17.0-RC.23

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

@@ -1,8 +1,8 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useEffect } from 'react';
+import { useState, useMemo, useEffect, useCallback } from 'react';
 import { isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '@dynamic-labs/utils';
-import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
@@ -12,80 +12,35 @@ import '../../constants/colors.js';
 import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
-import { isWalletConnected } from '../../functions/isWalletConnected/isWalletConnected.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
-import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/sdk-api';
-import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
+import { primaryWalletIdValidator } from './utils/primaryWalletIdValidator/primaryWalletIdValidator.js';
+import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 
 const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
-    const [wallets, setWallets] = useState([]);
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, (value) => typeof value === 'string' || typeof value === 'undefined');
+    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
+    const linkedWallets = useMemo(() => {
+        if (!authToken) {
+            return [];
+        }
+        return createLinkedWalletsFromWalletOptions({
+            authToken,
+            primaryWalletId,
+            walletOptions: availableWallets,
+        });
+    }, [availableWallets, primaryWalletId, authToken]);
+    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState(linkedWallets);
+    const wallets = useMemo(() => linkedWallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, linkedWallets]);
+    useEffect(() => {
+        computeConnectedStateForWallets();
+    }, [primaryWalletId, computeConnectedStateForWallets]);
     const setPrimaryWalletId = useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
-    const clearWalletStates = useCallback(() => {
-        setWallets([]);
-        clearPrimaryWalletId();
-    }, [clearPrimaryWalletId]);
-    const getPrimaryWallet = useCallback(() => {
-        const primaryWallet = wallets.find((wallet) => wallet.id === primaryWalletId);
-        if (!primaryWallet) {
-            return null;
-        }
-        return primaryWallet;
-    }, [primaryWalletId, wallets]);
+    const getPrimaryWallet = useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const getSecondaryWallets = useCallback(() => wallets.filter((wallet) => wallet.id !== primaryWalletId), [primaryWalletId, wallets]);
-    useEffect(() => {
-        const decodedJwt = decodeJwt(authToken);
-        // wallet state should be null while loading all the wallets or when there is no user
-        if (!availableWallets || !decodedJwt) {
-            setWallets([]);
-            return;
-        }
-        Promise.all(decodedJwt.verifiedCredentials.map((account) => __awaiter(void 0, void 0, void 0, function* () {
-            const wallet = availableWallets.find((wallet) => account.walletName &&
-                isSameWalletName(wallet.name, account.walletName));
-            // this probably shouldn't happen. this would mean that the user has an account linked
-            // with wallet W, but the customer has toggled off wallet W or the chain that
-            // supports wallet W
-            /* istanbul ignore next */
-            if (!wallet)
-                return null;
-            if (account.id === primaryWalletId &&
-                shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
-                yield wallet.walletConnector.connect();
-            }
-            if (account.address && account.chain) {
-                return {
-                    address: account.address,
-                    chain: account.chain,
-                    connected: yield isWalletConnected({
-                        address: account.address,
-                        chain: account.chain,
-                        connector: wallet.walletConnector,
-                    }),
-                    connector: wallet.walletConnector,
-                    id: account.id,
-                };
-            }
-            return null;
-        }))).then((result) => {
-            setWallets(result.filter((wc) => wc !== null));
-            return null;
-        });
-    }, [availableWallets, primaryWalletId, authToken]);
-    const computeConnectedStateForWallets = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        if (!primaryWalletId)
-            return;
-        const connectionMap = {};
-        for (const wallet of wallets) {
-            connectionMap[wallet.id] = yield isWalletConnected(wallet);
-        }
-        setWallets((currentWallets) => currentWallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: connectionMap[wallet.id] }))));
-    }), [primaryWalletId, wallets]);
     const getSelectedWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         const newWallet = wallets.find(({ id }) => id === walletId);
         if (!newWallet) {
@@ -181,8 +136,9 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
     ]);
     const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
-        clearWalletStates,
+        clearPrimaryWalletId,
         computeConnectedStateForWallets,
+        didConnectedStateLoad,
         getPrimaryWallet,
         getSecondaryWallets,
         primaryWallet: getPrimaryWallet(),

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -0,0 +1,55 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var decodeJwt = require('../../../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
+require('../../../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/utils');
+require('../../../../constants/colors.cjs');
+require('ethers');
+require('../../../../../shared/consts/index.cjs');
+var isSameWalletName = require('../../../../functions/isSameWalletName/isSameWalletName.cjs');
+require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/sdk-api');
+var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
+
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+    const decodedJwt = decodeJwt.decodeJwt(authToken);
+    // wallet state should be null while loading all the wallets or when there is no user
+    if (!walletOptions || !decodedJwt) {
+        return [];
+    }
+    return decodedJwt.verifiedCredentials
+        .map((account) => {
+        const wallet = walletOptions.find((wallet) => account.walletName &&
+            isSameWalletName.isSameWalletName(wallet.name, account.walletName));
+        // this probably shouldn't happen. this would mean that the user has an account linked
+        // with wallet W, but the customer has toggled off wallet W or the chain that
+        // supports wallet W
+        /* istanbul ignore next */
+        if (!wallet)
+            return null;
+        if (account.id === primaryWalletId &&
+            shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
+            wallet.walletConnector.connect();
+        }
+        if (account.address && account.chain) {
+            return {
+                address: account.address,
+                chain: account.chain,
+                connected: false,
+                connector: wallet.walletConnector,
+                id: account.id,
+            };
+        }
+        return null;
+    })
+        .filter((wc) => wc !== null);
+};
+
+exports.createLinkedWalletsFromWalletOptions = createLinkedWalletsFromWalletOptions;

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.d.ts

@@ -0,0 +1,8 @@
+import { Wallet, WalletOption } from '../../../../../shared';
+type CreateWalletsFromWalletOptionsProps = {
+    authToken: string;
+    primaryWalletId: string | undefined;
+    walletOptions: WalletOption[] | undefined;
+};
+export declare const createLinkedWalletsFromWalletOptions: ({ authToken, walletOptions, primaryWalletId, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
+export {};

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -0,0 +1,51 @@
+import { decodeJwt } from '../../../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '../../../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/utils';
+import '../../../../constants/colors.js';
+import 'ethers';
+import '../../../../../shared/consts/index.js';
+import { isSameWalletName } from '../../../../functions/isSameWalletName/isSameWalletName.js';
+import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/sdk-api';
+import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+    const decodedJwt = decodeJwt(authToken);
+    // wallet state should be null while loading all the wallets or when there is no user
+    if (!walletOptions || !decodedJwt) {
+        return [];
+    }
+    return decodedJwt.verifiedCredentials
+        .map((account) => {
+        const wallet = walletOptions.find((wallet) => account.walletName &&
+            isSameWalletName(wallet.name, account.walletName));
+        // this probably shouldn't happen. this would mean that the user has an account linked
+        // with wallet W, but the customer has toggled off wallet W or the chain that
+        // supports wallet W
+        /* istanbul ignore next */
+        if (!wallet)
+            return null;
+        if (account.id === primaryWalletId &&
+            shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
+            wallet.walletConnector.connect();
+        }
+        if (account.address && account.chain) {
+            return {
+                address: account.address,
+                chain: account.chain,
+                connected: false,
+                connector: wallet.walletConnector,
+                id: account.id,
+            };
+        }
+        return null;
+    })
+        .filter((wc) => wc !== null);
+};
+
+export { createLinkedWalletsFromWalletOptions };

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/index.d.ts

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

package/src/lib/utils/hooks/useWalletConnectors/utils/index.d.ts

@@ -0,0 +1,2 @@
+export * from './primaryWalletIdValidator';
+export * from './createLinkedWalletsFromWalletOptions';

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/index.d.ts

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

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const primaryWalletIdValidator = (value) => typeof value === 'string' || typeof value === 'undefined';
+
+exports.primaryWalletIdValidator = primaryWalletIdValidator;

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.d.ts

@@ -0,0 +1 @@
+export declare const primaryWalletIdValidator: (value: string | unknown) => value is string | undefined;

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.js

@@ -0,0 +1,3 @@
+const primaryWalletIdValidator = (value) => typeof value === 'string' || typeof value === 'undefined';
+
+export { primaryWalletIdValidator };

package/src/lib/utils/hooks/useWalletsConnectionState/index.d.ts

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

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

@@ -0,0 +1,42 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var React = require('react');
+require('../../constants/colors.cjs');
+require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/utils');
+require('@dynamic-labs/sdk-api');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('ethers');
+var isWalletConnected = require('../../functions/isWalletConnected/isWalletConnected.cjs');
+require('../../../shared/consts/index.cjs');
+
+const useWalletsConnectionState = (linkedWallets) => {
+    const [connectedWalletMap, setConnectedWalletMap] = React.useState();
+    const computeConnectedStateForWallets = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const connectedWalletIds = (yield Promise.all(linkedWallets.map((wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            const isConnected = yield isWalletConnected.isWalletConnected(wallet);
+            if (isConnected) {
+                return wallet.id;
+            }
+            else {
+                return undefined;
+            }
+        })))).filter((connectedWalletId) => connectedWalletId !== undefined);
+        const newConnectedStateByWalletIdMap = connectedWalletIds.reduce((result, walletId) => (Object.assign(Object.assign({}, result), { [walletId]: true })), {});
+        setConnectedWalletMap(newConnectedStateByWalletIdMap);
+    }), [linkedWallets, setConnectedWalletMap]);
+    return {
+        computeConnectedStateForWallets,
+        connectedWalletMap: connectedWalletMap !== null && connectedWalletMap !== void 0 ? connectedWalletMap : {},
+        didConnectedStateLoad: Boolean(connectedWalletMap),
+    };
+};
+
+exports.useWalletsConnectionState = useWalletsConnectionState;

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

@@ -0,0 +1,11 @@
+import { Wallet } from '../../../shared';
+type ConnectedWalletsMap = {
+    [address: string]: boolean;
+};
+type WalletsConnectionStateHook = (wallets: Wallet[]) => {
+    computeConnectedStateForWallets: () => Promise<void>;
+    connectedWalletMap: ConnectedWalletsMap;
+    didConnectedStateLoad: boolean;
+};
+export declare const useWalletsConnectionState: WalletsConnectionStateHook;
+export {};

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

@@ -0,0 +1,38 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useState, useCallback } from 'react';
+import '../../constants/colors.js';
+import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/utils';
+import '@dynamic-labs/sdk-api';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import 'ethers';
+import { isWalletConnected } from '../../functions/isWalletConnected/isWalletConnected.js';
+import '../../../shared/consts/index.js';
+
+const useWalletsConnectionState = (linkedWallets) => {
+    const [connectedWalletMap, setConnectedWalletMap] = useState();
+    const computeConnectedStateForWallets = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        const connectedWalletIds = (yield Promise.all(linkedWallets.map((wallet) => __awaiter(void 0, void 0, void 0, function* () {
+            const isConnected = yield isWalletConnected(wallet);
+            if (isConnected) {
+                return wallet.id;
+            }
+            else {
+                return undefined;
+            }
+        })))).filter((connectedWalletId) => connectedWalletId !== undefined);
+        const newConnectedStateByWalletIdMap = connectedWalletIds.reduce((result, walletId) => (Object.assign(Object.assign({}, result), { [walletId]: true })), {});
+        setConnectedWalletMap(newConnectedStateByWalletIdMap);
+    }), [linkedWallets, setConnectedWalletMap]);
+    return {
+        computeConnectedStateForWallets,
+        connectedWalletMap: connectedWalletMap !== null && connectedWalletMap !== void 0 ? connectedWalletMap : {},
+        didConnectedStateLoad: Boolean(connectedWalletMap),
+    };
+};
+
+export { useWalletsConnectionState };

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

@@ -39,15 +39,15 @@ require('../../components/Popper/PopperContext/PopperContext.cjs');
 var SendBalancePageLayout = require('../../components/SendBalancePageLayout/SendBalancePageLayout.cjs');
 var TransactionConfirmationView = require('../TransactionConfirmationView/TransactionConfirmationView.cjs');
 var TransactionStatusLayout = require('../../components/TransactionStatusLayout/TransactionStatusLayout.cjs');
+var useFetchCurrency = require('../../widgets/DynamicWidget/hooks/useFetchCurrency/useFetchCurrency.cjs');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 var usePromise = require('../../utils/hooks/usePromise/usePromise.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 
 const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBack, onClickClose, onError, onSuccess, onDone, displayPoweredByDynamicFooter = false, }) => {
-    var _a;
     const [stage, setStage] = React.useState('form');
-    const { primaryWallet, walletUiUtils } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, walletUiUtils, network } = 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);
@@ -56,14 +56,20 @@ const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBa
     }
     const { data: balance } = usePromise.usePromise(() => primaryWallet.connector.getBalance(), [primaryWallet]);
     const { data: provider } = usePromise.usePromise(() => primaryWallet.connector.getWeb3Provider(), [primaryWallet]);
+    const evmNetworks = ((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) &&
+        primaryWallet.connector.evmNetworks) ||
+        [];
+    const evmNetwork = evmNetworks.find((evmNetwork) => evmNetwork.chainId === network);
+    const networkIcon = evmNetwork && (jsxRuntime.jsx("img", { src: evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.iconUrls[0], alt: `${evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.name} icon` }));
+    const networkName = (evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.vanityName) || (evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.name);
     const ChainIconComponent = getChainIcon.getChainIcon(primaryWallet.chain);
     const chainInfo = walletConnectorCore.getChainInfo(primaryWallet.chain);
     const chainIcon = (jsxRuntime.jsx(Icon.Icon, Object.assign({ size: 'small' }, { children: jsxRuntime.jsx(ChainIconComponent, {}) })));
-    const currencySymbol = (_a = chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.symbol) !== null && _a !== void 0 ? _a : '';
+    const [currencySymbol = ''] = useFetchCurrency.useFetchCurrency(primaryWallet.connector);
     const buildFormStage = () => (jsxRuntime.jsx(SendBalancePageLayout.SendBalancePageLayout, { initialValues: {
             amount: value === null ? '' : formatBigNumber.formatBigNumber(value),
             recipient: recipientAddress,
-        }, balance: balance, onClickBack: onClickBack, chain: primaryWallet.chain, currencySymbol: currencySymbol, isLoading: false, walletAddress: shortenWalletAddress.shortenWalletAddress(primaryWallet.address, 3, 3), walletName: primaryWallet.connector.name, onClickClose: onClickClose, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSubmit: (data) => {
+        }, balance: balance, onClickBack: onClickBack, chain: primaryWallet.chain, networkName: networkName, networkIcon: networkIcon, currencySymbol: currencySymbol, isLoading: false, walletAddress: shortenWalletAddress.shortenWalletAddress(primaryWallet.address, 3, 3), walletName: primaryWallet.connector.name, onClickClose: onClickClose, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSubmit: (data) => {
             setValue(ethers.utils.parseEther(data.amount));
             setRecipientAddress(data.recipient);
             setStage('confirmation');

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

@@ -35,15 +35,15 @@ import '../../components/Popper/PopperContext/PopperContext.js';
 import { SendBalancePageLayout } from '../../components/SendBalancePageLayout/SendBalancePageLayout.js';
 import { TransactionConfirmationView } from '../TransactionConfirmationView/TransactionConfirmationView.js';
 import { TransactionStatusLayout } from '../../components/TransactionStatusLayout/TransactionStatusLayout.js';
+import { useFetchCurrency } from '../../widgets/DynamicWidget/hooks/useFetchCurrency/useFetchCurrency.js';
 import '../../context/MockContext/MockContext.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import { usePromise } from '../../utils/hooks/usePromise/usePromise.js';
 import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 
 const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBack, onClickClose, onError, onSuccess, onDone, displayPoweredByDynamicFooter = false, }) => {
-    var _a;
     const [stage, setStage] = useState('form');
-    const { primaryWallet, walletUiUtils } = useInternalDynamicContext();
+    const { primaryWallet, walletUiUtils, network } = useInternalDynamicContext();
     const [value, setValue] = useState(initialValue !== null && initialValue !== void 0 ? initialValue : null);
     const [recipientAddress, setRecipientAddress] = useState(initialRecipientAddress);
     const transactionRef = useRef(null);
@@ -52,14 +52,20 @@ const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBa
     }
     const { data: balance } = usePromise(() => primaryWallet.connector.getBalance(), [primaryWallet]);
     const { data: provider } = usePromise(() => primaryWallet.connector.getWeb3Provider(), [primaryWallet]);
+    const evmNetworks = ((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) &&
+        primaryWallet.connector.evmNetworks) ||
+        [];
+    const evmNetwork = evmNetworks.find((evmNetwork) => evmNetwork.chainId === network);
+    const networkIcon = evmNetwork && (jsx("img", { src: evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.iconUrls[0], alt: `${evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.name} icon` }));
+    const networkName = (evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.vanityName) || (evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.name);
     const ChainIconComponent = getChainIcon(primaryWallet.chain);
     const chainInfo = getChainInfo(primaryWallet.chain);
     const chainIcon = (jsx(Icon, Object.assign({ size: 'small' }, { children: jsx(ChainIconComponent, {}) })));
-    const currencySymbol = (_a = chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.symbol) !== null && _a !== void 0 ? _a : '';
+    const [currencySymbol = ''] = useFetchCurrency(primaryWallet.connector);
     const buildFormStage = () => (jsx(SendBalancePageLayout, { initialValues: {
             amount: value === null ? '' : formatBigNumber(value),
             recipient: recipientAddress,
-        }, balance: balance, onClickBack: onClickBack, chain: primaryWallet.chain, currencySymbol: currencySymbol, isLoading: false, walletAddress: shortenWalletAddress(primaryWallet.address, 3, 3), walletName: primaryWallet.connector.name, onClickClose: onClickClose, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSubmit: (data) => {
+        }, balance: balance, onClickBack: onClickBack, chain: primaryWallet.chain, networkName: networkName, networkIcon: networkIcon, currencySymbol: currencySymbol, isLoading: false, walletAddress: shortenWalletAddress(primaryWallet.address, 3, 3), walletName: primaryWallet.connector.name, onClickClose: onClickClose, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSubmit: (data) => {
             setValue(utils.parseEther(data.amount));
             setRecipientAddress(data.recipient);
             setStage('confirmation');

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

@@ -47,7 +47,7 @@ var WalletOrSocialMagicIcon = require('../../../../components/WalletOrSocialMagi
 
 const Wallet = ({ wallet, ens }) => {
     const { id: walletId, connector, address } = wallet;
-    const { computeConnectedStateForWallets, setPrimaryWallet, setSelectedWalletConnector, setShowWidgetStatePopup, setSelectedWalletWithAction, authToken, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { computeConnectedStateForWallets, setPrimaryWallet, setSelectedWalletConnector, setShowWidgetStatePopup, setSelectedWalletWithAction, authToken, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const iconSize = 20;
     const options = [
         {
@@ -76,9 +76,9 @@ const Wallet = ({ wallet, ens }) => {
         });
     }
     const onSelectWalletClick = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        if (connector.connectedChain === 'FLOW') {
-            (_a = connector.endSession) === null || _a === void 0 ? void 0 : _a.call(connector);
+        if ((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) === 'flow' &&
+            connector.connectedChain === 'FLOW') {
+            yield connector.endSession();
         }
         setShowWidgetStatePopup(true);
         setSelectedWalletWithAction({ action: 'select', wallet });

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

@@ -43,7 +43,7 @@ import { WalletOrSocialMagicIcon } from '../../../../components/WalletOrSocialMa
 
 const Wallet = ({ wallet, ens }) => {
     const { id: walletId, connector, address } = wallet;
-    const { computeConnectedStateForWallets, setPrimaryWallet, setSelectedWalletConnector, setShowWidgetStatePopup, setSelectedWalletWithAction, authToken, } = useInternalDynamicContext();
+    const { computeConnectedStateForWallets, setPrimaryWallet, setSelectedWalletConnector, setShowWidgetStatePopup, setSelectedWalletWithAction, authToken, primaryWallet, } = useInternalDynamicContext();
     const iconSize = 20;
     const options = [
         {
@@ -72,9 +72,9 @@ const Wallet = ({ wallet, ens }) => {
         });
     }
     const onSelectWalletClick = () => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        if (connector.connectedChain === 'FLOW') {
-            (_a = connector.endSession) === null || _a === void 0 ? void 0 : _a.call(connector);
+        if ((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) === 'flow' &&
+            connector.connectedChain === 'FLOW') {
+            yield connector.endSession();
         }
         setShowWidgetStatePopup(true);
         setSelectedWalletWithAction({ action: 'select', wallet });

package/src/lib/widgets/DynamicWidget/prompts/PendingConnectionModal/PendingConnectionModal.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var DefaultPromptModal = require('../DefaultPromptModal/DefaultPromptModal.cjs');
 require('react');
@@ -10,13 +11,13 @@ var Typography = require('../../../../components/Typography/Typography.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/utils');
 require('../../../../utils/constants/colors.cjs');
 require('ethers');
 require('../../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
+var getReferencedAccount = require('../../../../utils/functions/getReferencedAccount/getReferencedAccount.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('react-dom');
@@ -38,11 +39,24 @@ require('../../../../components/Popper/Popper/Popper.cjs');
 require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('../../../../components/SendBalanceForm/SendBalanceForm.cjs');
 var WalletOrSocialMagicIcon = require('../../../../components/WalletOrSocialMagicIcon/WalletOrSocialMagicIcon.cjs');
+var helpers = require('../../helpers/helpers.cjs');
 
 const PendingConnectionModal = () => {
+    var _a;
     const { selectedWalletConnector, authToken, selectedWalletWithAction } = useInternalDynamicContext.useInternalDynamicContext();
+    let title;
+    let description;
+    if (selectedWalletWithAction &&
+        walletConnectorCore.isSocialWalletConnector(selectedWalletWithAction.wallet.connector)) {
+        const account = getReferencedAccount.getReferencedAccount(authToken, selectedWalletWithAction.wallet.id);
+        title = `Reconnecting ${helpers.capitalize((_a = account === null || account === void 0 ? void 0 : account.oauthProvider) !== null && _a !== void 0 ? _a : '')}`;
+    }
+    else {
+        title = `Connect ${selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name} wallet`;
+        description = (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: ["Connect your", ' ', jsxRuntime.jsx(Typography.Typography, Object.assign({ as: 'span', weight: 'medium', color: 'primary' }, { children: selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name })), ' ', "wallet to make active."] }));
+    }
     return (jsxRuntime.jsx(DefaultPromptModal.DefaultPromptModal, Object.assign({ showCloseButton: true, dataTestId: 'pending-connection-modal', icon: jsxRuntime.jsx(WalletOrSocialMagicIcon.WalletOrSocialMagicIcon // eslint-disable-line
-        , { jwt: authToken, wallet: selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet }), title: `Connect ${selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name} wallet` }, { children: jsxRuntime.jsxs(Typography.Typography, Object.assign({ variant: 'body_normal', color: 'secondary', weight: 'regular', "data-testid": 'content' }, { children: ["Connect your", ' ', jsxRuntime.jsx(Typography.Typography, Object.assign({ as: 'span', weight: 'medium', color: 'primary' }, { children: selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name })), ' ', "wallet to make active."] })) })));
+        , { jwt: authToken, wallet: selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet }), title: title }, { children: jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'body_normal', color: 'secondary', weight: 'regular', "data-testid": 'content' }, { children: description })) })));
 };
 
 exports.PendingConnectionModal = PendingConnectionModal;

package/src/lib/widgets/DynamicWidget/prompts/PendingConnectionModal/PendingConnectionModal.js

@@ -1,4 +1,5 @@
-import { jsx, jsxs } from 'react/jsx-runtime';
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import { DefaultPromptModal } from '../DefaultPromptModal/DefaultPromptModal.js';
 import 'react';
@@ -6,13 +7,13 @@ import { Typography } from '../../../../components/Typography/Typography.js';
 import '@dynamic-labs/sdk-api';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/utils';
 import '../../../../utils/constants/colors.js';
 import 'ethers';
 import '../../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
+import { getReferencedAccount } from '../../../../utils/functions/getReferencedAccount/getReferencedAccount.js';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import 'react-dom';
@@ -34,11 +35,24 @@ import '../../../../components/Popper/Popper/Popper.js';
 import '../../../../components/Popper/PopperContext/PopperContext.js';
 import '../../../../components/SendBalanceForm/SendBalanceForm.js';
 import { WalletOrSocialMagicIcon } from '../../../../components/WalletOrSocialMagicIcon/WalletOrSocialMagicIcon.js';
+import { capitalize } from '../../helpers/helpers.js';
 
 const PendingConnectionModal = () => {
+    var _a;
     const { selectedWalletConnector, authToken, selectedWalletWithAction } = useInternalDynamicContext();
+    let title;
+    let description;
+    if (selectedWalletWithAction &&
+        isSocialWalletConnector(selectedWalletWithAction.wallet.connector)) {
+        const account = getReferencedAccount(authToken, selectedWalletWithAction.wallet.id);
+        title = `Reconnecting ${capitalize((_a = account === null || account === void 0 ? void 0 : account.oauthProvider) !== null && _a !== void 0 ? _a : '')}`;
+    }
+    else {
+        title = `Connect ${selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name} wallet`;
+        description = (jsxs(Fragment, { children: ["Connect your", ' ', jsx(Typography, Object.assign({ as: 'span', weight: 'medium', color: 'primary' }, { children: selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name })), ' ', "wallet to make active."] }));
+    }
     return (jsx(DefaultPromptModal, Object.assign({ showCloseButton: true, dataTestId: 'pending-connection-modal', icon: jsx(WalletOrSocialMagicIcon // eslint-disable-line
-        , { jwt: authToken, wallet: selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet }), title: `Connect ${selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name} wallet` }, { children: jsxs(Typography, Object.assign({ variant: 'body_normal', color: 'secondary', weight: 'regular', "data-testid": 'content' }, { children: ["Connect your", ' ', jsx(Typography, Object.assign({ as: 'span', weight: 'medium', color: 'primary' }, { children: selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name })), ' ', "wallet to make active."] })) })));
+        , { jwt: authToken, wallet: selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet }), title: title }, { children: jsx(Typography, Object.assign({ variant: 'body_normal', color: 'secondary', weight: 'regular', "data-testid": 'content' }, { children: description })) })));
 };
 
 export { PendingConnectionModal };

package/src/lib/shared/utils/hooks/useIsMounted/index.d.ts

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

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

@@ -1,18 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var React = require('react');
-
-const useIsMounted = () => {
-    const isMounted = React.useRef(false);
-    React.useEffect(() => {
-        isMounted.current = true;
-        return () => {
-            isMounted.current = false;
-        };
-    }, []);
-    return React.useCallback(() => isMounted.current, []);
-};
-
-exports.useIsMounted = useIsMounted;

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

@@ -1 +0,0 @@
-export declare const useIsMounted: () => () => boolean;