@dynamic-labs/sdk-react-core 3.0.0-alpha.65 → 3.0.0-alpha.67

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

@@ -5,23 +5,16 @@ import { DynamicError } from '@dynamic-labs/utils';
 import { isEmbeddedConnector, isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '@dynamic-labs/sdk-api-core';
-import '../../constants/values.js';
-import '@dynamic-labs/multi-wallet';
-import '../../../shared/logger.js';
+import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
+import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../store/state/loadingAndLifecycle.js';
-import { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 import '../../../shared/consts/index.js';
-import 'react-international-phone';
-import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
-import '../../../locale/locale.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
 
@@ -37,7 +30,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
             walletConnectorOptions,
         });
     }, [user, primaryWalletId, walletConnectorOptions]);
-    logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
+    logger.logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
     const wallets = useMemo(() => {
         // Before signing the first message we are using connected wallets list
         // This is because we want the first connected wallet to have events applied by useWalletEventListeners
@@ -57,7 +50,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         return connectedWallets !== null && connectedWallets !== void 0 ? connectedWallets : [];
     }, [authMode, connectedWallets, linkedWallets, user]);
-    logVerboseTroubleshootingMessage('wallets', wallets);
+    logger.logVerboseTroubleshootingMessage('wallets', wallets);
     /**
      * This useEffect is temporary.
      * While the wallet connectors don't use the event emitter, we need to manually
@@ -71,7 +64,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     useEffect(() => {
-        logVerboseTroubleshootingMessage('[useWalletConnectors] will call setUserWallets', wallets);
+        logger.logVerboseTroubleshootingMessage('[useWalletConnectors] will call setUserWallets', wallets);
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
     }, [setUserWallets, wallets]);
     const primaryWallet = useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);

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

@@ -16,17 +16,10 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
-var logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
-require('@dynamic-labs/multi-wallet');
-require('react-international-phone');
-require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/user/user.cjs');
-require('../../../locale/locale.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, detectNewWalletsForLinking, }) => {
@@ -43,7 +36,7 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             newAddress,
         });
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
-        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleAccountChangeWhenAwaitingAccountSwitch]', { linkedSecondaryWallet });
+        logger.logger.logVerboseTroubleshootingMessage('[handleAccountChangeWhenAwaitingAccountSwitch]', { linkedSecondaryWallet });
         // this means the user is linking a new account, so we need proof of ownership...
         if (!linkedSecondaryWallet) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');

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

@@ -12,17 +12,10 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../store/state/loadingAndLifecycle.js';
-import { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
-import '@dynamic-labs/multi-wallet';
-import 'react-international-phone';
-import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
-import '../../../locale/locale.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, detectNewWalletsForLinking, }) => {
@@ -39,7 +32,7 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             newAddress,
         });
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
-        logVerboseTroubleshootingMessage('[handleAccountChangeWhenAwaitingAccountSwitch]', { linkedSecondaryWallet });
+        logger.logVerboseTroubleshootingMessage('[handleAccountChangeWhenAwaitingAccountSwitch]', { linkedSecondaryWallet });
         // this means the user is linking a new account, so we need proof of ownership...
         if (!linkedSecondaryWallet) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');

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

@@ -19,7 +19,6 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
-var logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
@@ -51,7 +50,7 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/environmentId.cjs');
-require('../../../store/state/walletConnectorOptions/walletConnectorOptions.cjs');
+require('../../../store/state/walletConnectorOptions.cjs');
 var isSelectedWalletAlreadyConnected = require('../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -81,7 +80,7 @@ require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
-require('../../../store/state/sendBalances/sendBalances.cjs');
+require('../../../store/state/sendBalances.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
@@ -100,16 +99,16 @@ require('../../../store/state/tokenBalances.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useWalletItemActions = () => {
-    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnectorKey, walletConnectorOptions, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnectorKey, walletConnectorOptions, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, authMode, } = useInternalDynamicContext.useInternalDynamicContext();
     const { mockedSDK } = MockContext.useMockContext();
-    const { setError } = ErrorContext.useErrorContext();
-    const { setView } = ViewContext.useViewContext();
+    const { setError, setErrorMessage } = ErrorContext.useErrorContext();
+    const { setView, goToInitialView } = ViewContext.useViewContext();
     const { onlyConnectUser } = useConnectAndSignSplitSteps.useConnectAndSignSplitSteps();
     const connectAndSignWallet = useConnectAndSign.useConnectAndSign();
     const handleCustodialWalletClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('handleCustodialWalletClick', walletConnector);
         const twoStepAuthentication = requiresTwoStepAuthentication.requiresTwoStepAuthentication(walletConnector);
-        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleCustodialWalletClick]', {
+        logger.logger.logVerboseTroubleshootingMessage('[handleCustodialWalletClick]', {
             twoStepAuthentication,
         });
         if (twoStepAuthentication) {
@@ -175,11 +174,9 @@ const useWalletItemActions = () => {
     const handleAlreadyConnectedWallet = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('handleAlreadyConnectedWallet', walletConnector);
         setShowAuthFlow(false);
-        const connectedAccounts = yield walletConnector.getConnectedAccounts({
-            chooseAccounts: true,
-        });
+        const connectedAccounts = yield walletConnector.getConnectedAccounts();
         const activeAccountAlreadyLinked = linkedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
-        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleAlreadyConnectedWallet]', {
+        logger.logger.logVerboseTroubleshootingMessage('[handleAlreadyConnectedWallet]', {
             activeAccountAlreadyLinked,
             connectedAccounts,
             linkedWallets,
@@ -212,7 +209,7 @@ const useWalletItemActions = () => {
         const { walletConnector, isInstalledOnBrowser } = wallet;
         const shouldEndWalletConnectorSession = walletConnector.connectedChain === 'FLOW' ||
             walletConnectorCore.isPhantomRedirectConnector(walletConnector);
-        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleWalletItemClick]', {
+        logger.logger.logVerboseTroubleshootingMessage('[handleWalletItemClick]', {
             mockedSDK,
             shouldEndWalletConnectorSession,
             wallet,
@@ -223,6 +220,19 @@ const useWalletItemActions = () => {
             yield walletConnector.endSession();
         }
         setLegacyIsVerifying(false);
+        // in connect only we only allow one account to be connected in the same wallet
+        if (authMode !== 'connect-only') {
+            try {
+                yield walletConnector.chooseAccountsToConnect();
+            }
+            catch (error) {
+                if (error instanceof utils.UserRejectedRequestError) {
+                    setErrorMessage('connection_rejected');
+                    goToInitialView();
+                    return;
+                }
+            }
+        }
         if (isSelectedWalletAlreadyConnected.isSelectedWalletAlreadyConnected(linkedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {
             // wallet is already connected

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { isMobile } from '@dynamic-labs/utils';
+import { isMobile, UserRejectedRequestError } from '@dynamic-labs/utils';
 import { isPhantomRedirectConnector } from '@dynamic-labs/wallet-connector-core';
 import 'react';
 import '../../../context/DynamicContext/DynamicContext.js';
@@ -15,7 +15,6 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../store/state/loadingAndLifecycle.js';
-import { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
@@ -47,7 +46,7 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/environmentId.js';
-import '../../../store/state/walletConnectorOptions/walletConnectorOptions.js';
+import '../../../store/state/walletConnectorOptions.js';
 import { isSelectedWalletAlreadyConnected } from '../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
@@ -77,7 +76,7 @@ import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
-import '../../../store/state/sendBalances/sendBalances.js';
+import '../../../store/state/sendBalances.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
@@ -96,16 +95,16 @@ import '../../../store/state/tokenBalances.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useWalletItemActions = () => {
-    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnectorKey, walletConnectorOptions, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, } = useInternalDynamicContext();
+    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnectorKey, walletConnectorOptions, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, authMode, } = useInternalDynamicContext();
     const { mockedSDK } = useMockContext();
-    const { setError } = useErrorContext();
-    const { setView } = useViewContext();
+    const { setError, setErrorMessage } = useErrorContext();
+    const { setView, goToInitialView } = useViewContext();
     const { onlyConnectUser } = useConnectAndSignSplitSteps();
     const connectAndSignWallet = useConnectAndSign();
     const handleCustodialWalletClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('handleCustodialWalletClick', walletConnector);
         const twoStepAuthentication = requiresTwoStepAuthentication(walletConnector);
-        logVerboseTroubleshootingMessage('[handleCustodialWalletClick]', {
+        logger.logVerboseTroubleshootingMessage('[handleCustodialWalletClick]', {
             twoStepAuthentication,
         });
         if (twoStepAuthentication) {
@@ -171,11 +170,9 @@ const useWalletItemActions = () => {
     const handleAlreadyConnectedWallet = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('handleAlreadyConnectedWallet', walletConnector);
         setShowAuthFlow(false);
-        const connectedAccounts = yield walletConnector.getConnectedAccounts({
-            chooseAccounts: true,
-        });
+        const connectedAccounts = yield walletConnector.getConnectedAccounts();
         const activeAccountAlreadyLinked = linkedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
-        logVerboseTroubleshootingMessage('[handleAlreadyConnectedWallet]', {
+        logger.logVerboseTroubleshootingMessage('[handleAlreadyConnectedWallet]', {
             activeAccountAlreadyLinked,
             connectedAccounts,
             linkedWallets,
@@ -208,7 +205,7 @@ const useWalletItemActions = () => {
         const { walletConnector, isInstalledOnBrowser } = wallet;
         const shouldEndWalletConnectorSession = walletConnector.connectedChain === 'FLOW' ||
             isPhantomRedirectConnector(walletConnector);
-        logVerboseTroubleshootingMessage('[handleWalletItemClick]', {
+        logger.logVerboseTroubleshootingMessage('[handleWalletItemClick]', {
             mockedSDK,
             shouldEndWalletConnectorSession,
             wallet,
@@ -219,6 +216,19 @@ const useWalletItemActions = () => {
             yield walletConnector.endSession();
         }
         setLegacyIsVerifying(false);
+        // in connect only we only allow one account to be connected in the same wallet
+        if (authMode !== 'connect-only') {
+            try {
+                yield walletConnector.chooseAccountsToConnect();
+            }
+            catch (error) {
+                if (error instanceof UserRejectedRequestError) {
+                    setErrorMessage('connection_rejected');
+                    goToInitialView();
+                    return;
+                }
+            }
+        }
         if (isSelectedWalletAlreadyConnected(linkedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {
             // wallet is already connected

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

@@ -10,7 +10,7 @@ var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
-require('../../../shared/logger.cjs');
+var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
@@ -19,7 +19,6 @@ require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 var isWalletGroup = require('../../functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
-var logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -48,7 +47,7 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/environmentId.cjs');
-require('../../../store/state/walletConnectorOptions/walletConnectorOptions.cjs');
+require('../../../store/state/walletConnectorOptions.cjs');
 var useWalletItemActions = require('../useWalletItemActions/useWalletItemActions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -79,7 +78,7 @@ var WalletGroupContext = require('../../../context/WalletGroupContext/WalletGrou
 var groupWalletOptions = require('../../functions/walletListBuilder/utils/groupWalletOptions/groupWalletOptions.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
-require('../../../store/state/sendBalances/sendBalances.cjs');
+require('../../../store/state/sendBalances.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
@@ -129,7 +128,7 @@ const useWalletOptions = () => {
     const selectWalletOption = (walletKey) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const group = groupWalletOptions.groupWalletOptions(walletBook$1, walletConnectorOptions);
         const walletOption = group.find((wallet) => wallet.key === walletKey);
-        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useWalletOptions] selectWalletOption', {
+        logger.logger.logVerboseTroubleshootingMessage('[useWalletOptions] selectWalletOption', {
             walletKey,
             walletOption: walletOption === null || walletOption === void 0 ? void 0 : walletOption.key,
         });

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

@@ -6,7 +6,7 @@ import { useWalletBookContext, getWalletGroup } from '@dynamic-labs/wallet-book'
 import { DynamicError } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
-import '../../../shared/logger.js';
+import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
@@ -15,7 +15,6 @@ import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import { isWalletGroup } from '../../functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.js';
 import '../../../store/state/loadingAndLifecycle.js';
-import { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -44,7 +43,7 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/environmentId.js';
-import '../../../store/state/walletConnectorOptions/walletConnectorOptions.js';
+import '../../../store/state/walletConnectorOptions.js';
 import { useWalletItemActions } from '../useWalletItemActions/useWalletItemActions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
@@ -75,7 +74,7 @@ import { useWalletGroupContext } from '../../../context/WalletGroupContext/Walle
 import { groupWalletOptions } from '../../functions/walletListBuilder/utils/groupWalletOptions/groupWalletOptions.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
-import '../../../store/state/sendBalances/sendBalances.js';
+import '../../../store/state/sendBalances.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
@@ -125,7 +124,7 @@ const useWalletOptions = () => {
     const selectWalletOption = (walletKey) => __awaiter(void 0, void 0, void 0, function* () {
         const group = groupWalletOptions(walletBook, walletConnectorOptions);
         const walletOption = group.find((wallet) => wallet.key === walletKey);
-        logVerboseTroubleshootingMessage('[useWalletOptions] selectWalletOption', {
+        logger.logVerboseTroubleshootingMessage('[useWalletOptions] selectWalletOption', {
             walletKey,
             walletOption: walletOption === null || walletOption === void 0 ? void 0 : walletOption.key,
         });

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

@@ -49,7 +49,7 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/environmentId.cjs');
-require('../../../store/state/walletConnectorOptions/walletConnectorOptions.cjs');
+require('../../../store/state/walletConnectorOptions.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('react-dom');
@@ -77,7 +77,7 @@ require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
-require('../../../store/state/sendBalances/sendBalances.cjs');
+require('../../../store/state/sendBalances.cjs');
 var CreatePasswordModal = require('../../../modals/CreatePasswordModal/CreatePasswordModal.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
@@ -87,7 +87,7 @@ var SignMessageConfirmationModal = require('../../../modals/SignMessageConfirmat
 var SyncWalletPromptModal = require('../../../modals/SyncWalletPromptModal/SyncWalletPromptModal.cjs');
 var TransactionConfirmationModal = require('../../../modals/TransactionConfirmationModal/TransactionConfirmationModal.cjs');
 
-const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalletTransactionUIs = false, }) => {
+const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUIs = false, }) => {
     const confirmationStateRef = React.useRef('enabled');
     const { t } = reactI18next.useTranslation();
     const { modal: sendTransactionModal, open: openSendTransaction } = useConfirmationModal.useConfirmationModal({
@@ -116,7 +116,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
         // prevent the modal from opening itself again
         if (!shouldConfirmAction())
             return handler();
-        return openSignMessage((resolve, reject) => (jsxRuntime.jsx(SignMessageConfirmationModal.SignMessageConfirmationModal, { appLogoUrl: appLogoUrl, appName: appName, appOrigin: getAppOrigin(), message: message, handler: handler, onSignMessage: resolve, onReject: reject, hideModal: hideEmbeddedWalletTransactionUIs &&
+        return openSignMessage((resolve, reject) => (jsxRuntime.jsx(SignMessageConfirmationModal.SignMessageConfirmationModal, { appLogoUrl: appLogoUrl, appName: appName, message: message, handler: handler, onSignMessage: resolve, onReject: reject, hideModal: hideEmbeddedWalletTransactionUIs &&
                 !(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.isGlobalTransaction) }))).then((signedMessage) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             if (signedMessage === 'callHandlerOutsideModal')
                 return handler();
@@ -126,7 +126,6 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
     }), [
         appLogoUrl,
         appName,
-        getAppOrigin,
         hideEmbeddedWalletTransactionUIs,
         openSignMessage,
         shouldConfirmAction,

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

@@ -2,7 +2,7 @@ import { ReactNode } from 'react';
 import { WalletUiUtils } from '@dynamic-labs/types';
 import { InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletUiUtilsHookProps } from './useWalletUiUtils.types';
-export declare const useWalletUiUtils: ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalletTransactionUIs, }: WalletUiUtilsHookProps) => [
+export declare const useWalletUiUtils: ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUIs, }: WalletUiUtilsHookProps) => [
     ReactNode | undefined,
     WalletUiUtils<InternalWalletConnector>
 ];

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

@@ -45,7 +45,7 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/environmentId.js';
-import '../../../store/state/walletConnectorOptions/walletConnectorOptions.js';
+import '../../../store/state/walletConnectorOptions.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import 'react-dom';
@@ -73,7 +73,7 @@ import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
-import '../../../store/state/sendBalances/sendBalances.js';
+import '../../../store/state/sendBalances.js';
 import { CreatePasswordModal } from '../../../modals/CreatePasswordModal/CreatePasswordModal.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
@@ -83,7 +83,7 @@ import { SignMessageConfirmationModal } from '../../../modals/SignMessageConfirm
 import { SyncWalletPromptModal } from '../../../modals/SyncWalletPromptModal/SyncWalletPromptModal.js';
 import { TransactionConfirmationModal } from '../../../modals/TransactionConfirmationModal/TransactionConfirmationModal.js';
 
-const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalletTransactionUIs = false, }) => {
+const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUIs = false, }) => {
     const confirmationStateRef = useRef('enabled');
     const { t } = useTranslation();
     const { modal: sendTransactionModal, open: openSendTransaction } = useConfirmationModal({
@@ -112,7 +112,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
         // prevent the modal from opening itself again
         if (!shouldConfirmAction())
             return handler();
-        return openSignMessage((resolve, reject) => (jsx(SignMessageConfirmationModal, { appLogoUrl: appLogoUrl, appName: appName, appOrigin: getAppOrigin(), message: message, handler: handler, onSignMessage: resolve, onReject: reject, hideModal: hideEmbeddedWalletTransactionUIs &&
+        return openSignMessage((resolve, reject) => (jsx(SignMessageConfirmationModal, { appLogoUrl: appLogoUrl, appName: appName, message: message, handler: handler, onSignMessage: resolve, onReject: reject, hideModal: hideEmbeddedWalletTransactionUIs &&
                 !(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.isGlobalTransaction) }))).then((signedMessage) => __awaiter(void 0, void 0, void 0, function* () {
             if (signedMessage === 'callHandlerOutsideModal')
                 return handler();
@@ -122,7 +122,6 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
     }), [
         appLogoUrl,
         appName,
-        getAppOrigin,
         hideEmbeddedWalletTransactionUIs,
         openSignMessage,
         shouldConfirmAction,

package/src/lib/utils/hooks/useWalletUiUtils/useWalletUiUtils.types.d.ts

@@ -1,6 +1,5 @@
 export type WalletUiUtilsHookProps = {
     appLogoUrl?: string;
     appName?: string;
-    getAppOrigin: () => string;
     hideEmbeddedWalletTransactionUIs?: boolean;
 };

package/src/lib/views/AccessBlockedView/AccessBlockedView.cjs

@@ -51,7 +51,7 @@ require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../store/state/environmentId.cjs');
-require('../../store/state/walletConnectorOptions/walletConnectorOptions.cjs');
+require('../../store/state/walletConnectorOptions.cjs');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
@@ -67,7 +67,7 @@ require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
-require('../../store/state/sendBalances/sendBalances.cjs');
+require('../../store/state/sendBalances.cjs');
 require('../../components/Input/Input.cjs');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');

package/src/lib/views/AccessBlockedView/AccessBlockedView.js

@@ -47,7 +47,7 @@ import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../store/state/environmentId.js';
-import '../../store/state/walletConnectorOptions/walletConnectorOptions.js';
+import '../../store/state/walletConnectorOptions.js';
 import { Typography } from '../../components/Typography/Typography.js';
 import '../../context/FooterAnimationContext/index.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
@@ -63,7 +63,7 @@ import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
-import '../../store/state/sendBalances/sendBalances.js';
+import '../../store/state/sendBalances.js';
 import '../../components/Input/Input.js';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../context/PasskeyContext/PasskeyContext.js';

package/src/lib/views/AccountExistsView/AccountExistsView.cjs

@@ -53,7 +53,7 @@ require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../store/state/environmentId.cjs');
-require('../../store/state/walletConnectorOptions/walletConnectorOptions.cjs');
+require('../../store/state/walletConnectorOptions.cjs');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
@@ -70,7 +70,7 @@ require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
-require('../../store/state/sendBalances/sendBalances.cjs');
+require('../../store/state/sendBalances.cjs');
 require('../../components/Input/Input.cjs');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');

package/src/lib/views/AccountExistsView/AccountExistsView.js

@@ -49,7 +49,7 @@ import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../store/state/environmentId.js';
-import '../../store/state/walletConnectorOptions/walletConnectorOptions.js';
+import '../../store/state/walletConnectorOptions.js';
 import { Typography } from '../../components/Typography/Typography.js';
 import '../../context/FooterAnimationContext/index.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
@@ -66,7 +66,7 @@ import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
-import '../../store/state/sendBalances/sendBalances.js';
+import '../../store/state/sendBalances.js';
 import '../../components/Input/Input.js';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../context/PasskeyContext/PasskeyContext.js';

package/src/lib/views/BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.cjs

@@ -48,7 +48,7 @@ require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../store/state/environmentId.cjs');
-require('../../store/state/walletConnectorOptions/walletConnectorOptions.cjs');
+require('../../store/state/walletConnectorOptions.cjs');
 require('react-i18next');
 require('../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../components/Alert/Alert.cjs');
@@ -77,7 +77,7 @@ require('../../context/FooterAnimationContext/index.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
-require('../../store/state/sendBalances/sendBalances.cjs');
+require('../../store/state/sendBalances.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');

package/src/lib/views/BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.js

@@ -44,7 +44,7 @@ import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../store/state/environmentId.js';
-import '../../store/state/walletConnectorOptions/walletConnectorOptions.js';
+import '../../store/state/walletConnectorOptions.js';
 import 'react-i18next';
 import '../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../components/Alert/Alert.js';
@@ -73,7 +73,7 @@ import '../../context/FooterAnimationContext/index.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
-import '../../store/state/sendBalances/sendBalances.js';
+import '../../store/state/sendBalances.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';