@dynamic-labs/sdk-react-core 0.19.0-alpha.12 → 0.19.0-alpha.14

package/src/lib/utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.cjs

@@ -20,12 +20,13 @@ const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
  * @returns A promise that resolves to the transaction response.
  */
 const sendTransactionWithAutoNonce = (connector, transaction, sendTransactionHandler) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     if (transaction.nonce !== undefined) {
         return sendTransactionHandler(transaction);
     }
     const publicClient = yield connector.getRpcProvider();
     const walletClient = yield connector.getSigner();
-    const [address] = yield walletClient.getAddresses();
+    const address = (yield walletClient.getAddresses())[0] || ((_a = walletClient.account) === null || _a === void 0 ? void 0 : _a.address);
     const nonce = yield publicClient.getTransactionCount({
         address,
     });

package/src/lib/utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.js

@@ -16,12 +16,13 @@ const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
  * @returns A promise that resolves to the transaction response.
  */
 const sendTransactionWithAutoNonce = (connector, transaction, sendTransactionHandler) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     if (transaction.nonce !== undefined) {
         return sendTransactionHandler(transaction);
     }
     const publicClient = yield connector.getRpcProvider();
     const walletClient = yield connector.getSigner();
-    const [address] = yield walletClient.getAddresses();
+    const address = (yield walletClient.getAddresses())[0] || ((_a = walletClient.account) === null || _a === void 0 ? void 0 : _a.address);
     const nonce = yield publicClient.getTransactionCount({
         address,
     });

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -27,13 +27,12 @@ var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHand
 require('@dynamic-labs/multi-wallet');
 var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
-require('../../../../config/ApiEndpoint.cjs');
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -71,17 +70,14 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 }
                 return setView('network-not-supported-manual');
             }
+            setCallback('connectSuccess');
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
                 if (shouldUpdateWallets) {
-                    handleWalletsToConnect();
-                }
-                if (!isFullyConnected || walletsToConnectByChain.length) {
-                    setCallback('connectSuccess');
+                    handleWalletsToConnect({ walletConnector });
                 }
                 return;
             }
-            setCallback('connectSuccess');
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
                 setView('captcha');
                 return;

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -23,13 +23,12 @@ import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHa
 import '@dynamic-labs/multi-wallet';
 import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
-import '../../../../config/ApiEndpoint.js';
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -67,17 +66,14 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 }
                 return setView('network-not-supported-manual');
             }
+            setCallback('connectSuccess');
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
                 if (shouldUpdateWallets) {
-                    handleWalletsToConnect();
-                }
-                if (!isFullyConnected || walletsToConnectByChain.length) {
-                    setCallback('connectSuccess');
+                    handleWalletsToConnect({ walletConnector });
                 }
                 return;
             }
-            setCallback('connectSuccess');
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
                 setView('captcha');
                 return;

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -52,7 +52,7 @@ const useConnectAndSignSplitSteps = () => {
             setCallback('connectSuccess');
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
-                handleWalletsToConnect();
+                handleWalletsToConnect({ walletConnector });
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js

@@ -48,7 +48,7 @@ const useConnectAndSignSplitSteps = () => {
             setCallback('connectSuccess');
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
-                handleWalletsToConnect();
+                handleWalletsToConnect({ walletConnector });
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {

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

@@ -40,3 +40,4 @@ export * from './useUserDataForm';
 export * from './useOnUnmount';
 export { useSetWalletConnectorVerifiedCredentials } from './useSetWalletConnectorVerifiedCredentials';
 export { useEmbeddedWallet } from './useEmbeddedWallet';
+export * from './useIsLoggedIn';

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

@@ -18,9 +18,9 @@ require('viem');
 require('../../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var requiresTwoStepAuthentication = require('../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
-require('../../../../config/ApiEndpoint.cjs');
 var useConnectAndSign = require('../../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');

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

@@ -14,9 +14,9 @@ import 'viem';
 import '../../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { requiresTwoStepAuthentication } from '../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
-import '../../../../config/ApiEndpoint.js';
 import { useConnectAndSign } from '../../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
+import '../../../../config/ApiEndpoint.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';

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

@@ -22,7 +22,6 @@ var getWalletProvider = require('../../functions/getWalletProvider/getWalletProv
 var api = require('../../../data/api.cjs');
 require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
-require('../../../config/ApiEndpoint.cjs');
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLETS_INFO, []);

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

@@ -18,7 +18,6 @@ import { getWalletProvider } from '../../functions/getWalletProvider/getWalletPr
 import { createVisit } from '../../../data/api.js';
 import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
-import '../../../config/ApiEndpoint.js';
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage(CONNECTED_WALLETS_INFO, []);

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

@@ -19,7 +19,6 @@ require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
-require('../../../config/ApiEndpoint.cjs');
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();

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

@@ -15,7 +15,6 @@ import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
-import '../../../config/ApiEndpoint.js';
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext();

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

@@ -21,7 +21,6 @@ var index = require('../../functions/storeAuthToken/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/sdk-api');
-require('../../../config/ApiEndpoint.cjs');
 
 const useCreateUserProfileByJWTCallback = () => {
     const { setUser, handleLogOut } = useInternalDynamicContext.useInternalDynamicContext();

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

@@ -17,7 +17,6 @@ import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 import '@dynamic-labs/multi-wallet';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/sdk-api';
-import '../../../config/ApiEndpoint.js';
 
 const useCreateUserProfileByJWTCallback = () => {
     const { setUser, handleLogOut } = useInternalDynamicContext();

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

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
@@ -19,11 +20,10 @@ require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 require('@dynamic-labs/sdk-api');
-require('../../../config/ApiEndpoint.cjs');
 var isPasskeyEmbeddedWalletEnabled = require('../../functions/isPasskeyEmbeddedWalletEnabled/isPasskeyEmbeddedWalletEnabled.cjs');
 var isEmbeddedWalletPresent = require('../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
-var findTurnkeyWalletConnector = require('../../functions/findTurnkeyWalletConnector/findTurnkeyWalletConnector.cjs');
+var findTurnkeyWallet = require('../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
@@ -37,8 +37,8 @@ const useEmbeddedWallet = () => {
         }
         return isEmbeddedWalletPresent.isEmbeddedWalletPresent(jwt);
     };
-    const createEmbeddedWallet = () => {
-        var _a, _b;
+    const createEmbeddedWallet = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
         const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
         if (!jwt) {
             throw new Error('User is not logged in');
@@ -52,19 +52,27 @@ const useEmbeddedWallet = () => {
             internalSetShowAuthFlow(true);
             setView('passkey-intro');
             return new Promise((resolve, reject) => {
-                internalEvents.current.once('embeddedWalletCreated', (id) => resolve(id));
+                internalEvents.current.once('embeddedWalletCreated', (wallet) => resolve(wallet));
                 internalEvents.current.once('embeddedWalletFailed', (error) => reject(error));
             });
         }
         const decodedJwt = decodeJwt.decodeJwt(jwt);
+        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWallet(wallets);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
-            (_b = findTurnkeyWalletConnector.findTurnkeyWalletConnector(wallets)) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
+            (_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
             setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         }
         internalSetShowAuthFlow(false);
-        return Promise.resolve(embeddedWalletVerifiedCredential.id);
-    };
+        const passkeyWallet = {
+            address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.fetchPublicAddress())) || '',
+            chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',
+            connected: true,
+            connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
+            id: embeddedWalletVerifiedCredential.id,
+        };
+        return Promise.resolve(passkeyWallet);
+    });
     return {
         createEmbeddedWallet,
         userHasEmbeddedWallet,

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

@@ -1,4 +1,5 @@
+import { Wallet } from '../../../shared';
 export declare const useEmbeddedWallet: () => {
-    readonly createEmbeddedWallet: () => Promise<string>;
+    readonly createEmbeddedWallet: () => Promise<Wallet>;
     readonly userHasEmbeddedWallet: () => boolean;
 };

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

@@ -1,3 +1,4 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
@@ -15,11 +16,10 @@ import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import '@dynamic-labs/sdk-api';
-import '../../../config/ApiEndpoint.js';
 import { isPasskeyEmbeddedWalletEnabled } from '../../functions/isPasskeyEmbeddedWalletEnabled/isPasskeyEmbeddedWalletEnabled.js';
 import { isEmbeddedWalletPresent } from '../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
-import { findTurnkeyWalletConnector } from '../../functions/findTurnkeyWalletConnector/findTurnkeyWalletConnector.js';
+import { findTurnkeyWallet } from '../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
@@ -33,8 +33,8 @@ const useEmbeddedWallet = () => {
         }
         return isEmbeddedWalletPresent(jwt);
     };
-    const createEmbeddedWallet = () => {
-        var _a, _b;
+    const createEmbeddedWallet = () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
         const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
         if (!jwt) {
             throw new Error('User is not logged in');
@@ -48,19 +48,27 @@ const useEmbeddedWallet = () => {
             internalSetShowAuthFlow(true);
             setView('passkey-intro');
             return new Promise((resolve, reject) => {
-                internalEvents.current.once('embeddedWalletCreated', (id) => resolve(id));
+                internalEvents.current.once('embeddedWalletCreated', (wallet) => resolve(wallet));
                 internalEvents.current.once('embeddedWalletFailed', (error) => reject(error));
             });
         }
         const decodedJwt = decodeJwt(jwt);
+        const turnkeyWallet = findTurnkeyWallet(wallets);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
-            (_b = findTurnkeyWalletConnector(wallets)) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
+            (_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
             setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         }
         internalSetShowAuthFlow(false);
-        return Promise.resolve(embeddedWalletVerifiedCredential.id);
-    };
+        const passkeyWallet = {
+            address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.fetchPublicAddress())) || '',
+            chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',
+            connected: true,
+            connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
+            id: embeddedWalletVerifiedCredential.id,
+        };
+        return Promise.resolve(passkeyWallet);
+    });
     return {
         createEmbeddedWallet,
         userHasEmbeddedWallet,

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

@@ -6,9 +6,9 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 
 const useHandleWalletsToConnect = () => {
-    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, selectedWalletConnector, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
-    const handleWalletsToConnect = () => {
+    const handleWalletsToConnect = ({ walletConnector, }) => {
         if (!walletsToConnectByChain) {
             setIsFullyConnected(true);
             setShowAuthFlow(false);
@@ -19,32 +19,13 @@ const useHandleWalletsToConnect = () => {
             setShowAuthFlow(false);
             return goToInitialView();
         }
-        if (!selectedWalletConnector || !selectedWalletConnector.connectedChain) {
+        if (!walletConnector || !walletConnector.connectedChain) {
             setShowAuthFlow(false);
             return goToInitialView();
         }
-        // Assuming based on the logic above that we have at least one more chain/wallet to connect
-        // If the current connected wallet is already connected to the bridge,
-        // we can go directly to bridge-next-wallet-connection since we know there is a different chain to connect
-        const walletChainsToConnect = walletsToConnectByChain
-            .filter((wallet) => wallet.numberOfWallets > 0)
-            .map((wallet) => wallet.chain.toString());
-        if (!walletChainsToConnect.includes(selectedWalletConnector.connectedChain)) {
-            setView('bridge-next-wallet-connection');
-            return;
-        }
-        const [firstWallet, ...restOfTheWallets] = walletsToConnectByChain;
-        if (firstWallet.numberOfWallets > 1) {
-            const updatedWallets = [
-                Object.assign(Object.assign({}, firstWallet), { numberOfWallets: firstWallet.numberOfWallets - 1 }),
-                ...restOfTheWallets,
-            ];
-            setWalletsToConnectByChain(updatedWallets);
-            setView('wallet-list');
-            return;
-        }
-        setWalletsToConnectByChain(restOfTheWallets);
-        const allWalletsConnected = restOfTheWallets.length === 0;
+        const restOfWallets = walletsToConnectByChain.filter((wallet) => wallet.chain !== (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain));
+        setWalletsToConnectByChain(restOfWallets);
+        const allWalletsConnected = restOfWallets.length === 0;
         if (allWalletsConnected) {
             if (!isFullyConnected) {
                 setIsFullyConnected(true);

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

@@ -1,3 +1,6 @@
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 export declare const useHandleWalletsToConnect: () => {
-    handleWalletsToConnect: () => void;
+    handleWalletsToConnect: ({ walletConnector, }: {
+        walletConnector?: WalletConnector | undefined;
+    }) => void;
 };

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

@@ -2,9 +2,9 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useIn
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 
 const useHandleWalletsToConnect = () => {
-    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, selectedWalletConnector, isFullyConnected, } = useInternalDynamicContext();
+    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, isFullyConnected, } = useInternalDynamicContext();
     const { setView, goToInitialView } = useViewContext();
-    const handleWalletsToConnect = () => {
+    const handleWalletsToConnect = ({ walletConnector, }) => {
         if (!walletsToConnectByChain) {
             setIsFullyConnected(true);
             setShowAuthFlow(false);
@@ -15,32 +15,13 @@ const useHandleWalletsToConnect = () => {
             setShowAuthFlow(false);
             return goToInitialView();
         }
-        if (!selectedWalletConnector || !selectedWalletConnector.connectedChain) {
+        if (!walletConnector || !walletConnector.connectedChain) {
             setShowAuthFlow(false);
             return goToInitialView();
         }
-        // Assuming based on the logic above that we have at least one more chain/wallet to connect
-        // If the current connected wallet is already connected to the bridge,
-        // we can go directly to bridge-next-wallet-connection since we know there is a different chain to connect
-        const walletChainsToConnect = walletsToConnectByChain
-            .filter((wallet) => wallet.numberOfWallets > 0)
-            .map((wallet) => wallet.chain.toString());
-        if (!walletChainsToConnect.includes(selectedWalletConnector.connectedChain)) {
-            setView('bridge-next-wallet-connection');
-            return;
-        }
-        const [firstWallet, ...restOfTheWallets] = walletsToConnectByChain;
-        if (firstWallet.numberOfWallets > 1) {
-            const updatedWallets = [
-                Object.assign(Object.assign({}, firstWallet), { numberOfWallets: firstWallet.numberOfWallets - 1 }),
-                ...restOfTheWallets,
-            ];
-            setWalletsToConnectByChain(updatedWallets);
-            setView('wallet-list');
-            return;
-        }
-        setWalletsToConnectByChain(restOfTheWallets);
-        const allWalletsConnected = restOfTheWallets.length === 0;
+        const restOfWallets = walletsToConnectByChain.filter((wallet) => wallet.chain !== (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain));
+        setWalletsToConnectByChain(restOfWallets);
+        const allWalletsConnected = restOfWallets.length === 0;
         if (allWalletsConnected) {
             if (!isFullyConnected) {
                 setIsFullyConnected(true);

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

@@ -0,0 +1 @@
+export * from './useIsLoggedIn';

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

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
+
+const useIsLoggedIn = () => {
+    const { authMode, user, primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
+    if (authMode === 'connect-and-sign')
+        return Boolean(user);
+    return Boolean(primaryWallet);
+};
+
+exports.useIsLoggedIn = useIsLoggedIn;

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

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

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

@@ -0,0 +1,10 @@
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
+
+const useIsLoggedIn = () => {
+    const { authMode, user, primaryWallet } = useInternalDynamicContext();
+    if (authMode === 'connect-and-sign')
+        return Boolean(user);
+    return Boolean(primaryWallet);
+};
+
+export { useIsLoggedIn };

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

@@ -20,7 +20,6 @@ require('viem');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isSocialKycEnabled = require('../../functions/isSocialKycEnabled/isSocialKycEnabled.cjs');
-require('../../../config/ApiEndpoint.cjs');
 
 /* eslint-disable max-len */
 /**

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

@@ -16,7 +16,6 @@ import 'viem';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isSocialKycEnabled } from '../../functions/isSocialKycEnabled/isSocialKycEnabled.js';
-import '../../../config/ApiEndpoint.js';
 
 /* eslint-disable max-len */
 /**

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

@@ -19,7 +19,6 @@ var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLo
 require('../../../shared/consts/index.cjs');
 var primaryWalletIdValidator = require('../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs');
 require('@dynamic-labs/multi-wallet');
-require('../../../config/ApiEndpoint.cjs');
 
 const usePrimaryWalletId = (internalEvents) => {
     const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletIdStorage,] = useLocalStorage.useLocalStorage(localStorage.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);

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

@@ -15,7 +15,6 @@ import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/use
 import '../../../shared/consts/index.js';
 import { primaryWalletIdValidator } from '../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.js';
 import '@dynamic-labs/multi-wallet';
-import '../../../config/ApiEndpoint.js';
 
 const usePrimaryWalletId = (internalEvents) => {
     const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletIdStorage,] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);

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

@@ -25,7 +25,6 @@ require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 var index = require('../../functions/getEnabledOAuthProviders/index.cjs');
 var isSocialKycEnabled = require('../../functions/isSocialKycEnabled/isSocialKycEnabled.cjs');
-require('../../../config/ApiEndpoint.cjs');
 var useSocialAuth = require('../useSocialAuth/useSocialAuth.cjs');
 
 // Hook exposed to customers and used internally to handle social account linking

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

@@ -21,7 +21,6 @@ import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import { getEnabledOAuthProviders } from '../../functions/getEnabledOAuthProviders/index.js';
 import { isSocialKycEnabled } from '../../functions/isSocialKycEnabled/isSocialKycEnabled.js';
-import '../../../config/ApiEndpoint.js';
 import { useSocialAuth } from '../useSocialAuth/useSocialAuth.js';
 
 // Hook exposed to customers and used internally to handle social account linking

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

@@ -216,7 +216,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
             setIsProcessing(false);
         });
-        const loginUrl = getOauthLoginUrl.getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider, environmentId);
+        const loginUrl = getOauthLoginUrl.getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider);
         if (!loginUrl) {
             handleError(types.SocialOAuthErrorCode.NO_OAUTH_URL, `Failed to get login url to connect social account: ${provider}`);
             return;

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

@@ -212,7 +212,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
             setIsProcessing(false);
         });
-        const loginUrl = getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider, environmentId);
+        const loginUrl = getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider);
         if (!loginUrl) {
             handleError(SocialOAuthErrorCode.NO_OAUTH_URL, `Failed to get login url to connect social account: ${provider}`);
             return;

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs

@@ -24,7 +24,6 @@ var isEmailVerificationRequired = require('../../../functions/authenication/isEm
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
-require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js

@@ -20,7 +20,6 @@ import { isEmailVerificationRequired } from '../../../functions/authenication/is
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
-import '../../../../config/ApiEndpoint.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';

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

@@ -23,7 +23,6 @@ require('../../../shared/consts/index.cjs');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/sdk-api');
-require('../../../config/ApiEndpoint.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');

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

@@ -19,7 +19,6 @@ import '../../../shared/consts/index.js';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/sdk-api';
-import '../../../config/ApiEndpoint.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';