@dynamic-labs/sdk-react-core 0.18.0-RC.2 → 0.18.0-RC.21

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

@@ -4,19 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var iconic = require('@dynamic-labs/iconic');
-require('@dynamic-labs/sdk-api');
-require('../../../shared/logger.cjs');
-require('@dynamic-labs/wallet-connector-core');
-require('../../../context/ViewContext/ViewContext.cjs');
-require('react');
-var walletOutline = require('../../../shared/assets/wallet-outline.cjs');
-var footerInfoIcon = require('../../../shared/assets/footer-info-icon.cjs');
-require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
-require('../../constants/colors.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('ethers');
-require('../../../shared/consts/index.cjs');
 
 const getDynamicLayoutData = ({ view }) => {
     if (view === 'no-access') {
@@ -25,34 +12,27 @@ const getDynamicLayoutData = ({ view }) => {
         };
         return { headerData };
     }
-    const footerMap = {
+    const helpHeaderMap = {
         'login-with-email-or-wallet-full-wallet-list': {
             heading: 'Get your first wallet',
-            icon: jsxRuntime.jsx(walletOutline.ReactComponent, {}),
         },
         'pending-connect': {
-            heading: 'Learn about connecting your wallet',
-            icon: jsxRuntime.jsx(footerInfoIcon.ReactComponent, {}),
+            heading: 'Connecting a wallet',
         },
         'pending-signature': {
-            heading: 'Learn about signing / logging in',
-            icon: jsxRuntime.jsx(footerInfoIcon.ReactComponent, {}),
+            heading: 'Signing a wallet',
         },
         'pending-signature-without-back-button': {
-            heading: 'Learn about signing / logging in',
-            icon: jsxRuntime.jsx(footerInfoIcon.ReactComponent, {}),
+            heading: 'Signing a wallet',
         },
         'qr-code': {
-            heading: 'Learn about connecting your wallet',
-            icon: jsxRuntime.jsx(footerInfoIcon.ReactComponent, {}),
+            heading: 'Connecting a wallet',
         },
         'wallet-connect-mobile-wallets-list': {
             heading: 'Get your first wallet',
-            icon: jsxRuntime.jsx(walletOutline.ReactComponent, {}),
         },
         'wallet-list': {
             heading: 'Get your first wallet',
-            icon: jsxRuntime.jsx(walletOutline.ReactComponent, {}),
         },
     };
     const headerMap = {
@@ -69,11 +49,11 @@ const getDynamicLayoutData = ({ view }) => {
         'wallet-list': { heading: 'Select your wallet' },
         'wallet-sign': { heading: 'Sign to confirm transfer' },
     };
-    const footerData = footerMap[view];
+    const helpHeaderData = helpHeaderMap[view];
     const headerData = headerMap[view];
     return {
-        footerData,
         headerData,
+        helpHeaderData,
     };
 };
 

package/src/lib/utils/functions/getDynamicLayoutData/getDynamicLayoutData.d.ts

@@ -1,8 +1,7 @@
-import { ReactNode } from 'react';
+/// <reference types="react" />
 import { ViewType } from '../../../context/ViewContext';
 interface FooterContentProps {
     heading: string;
-    icon: ReactNode;
 }
 interface HeaderContentProps {
     heading: string | JSX.Element;
@@ -14,9 +13,9 @@ export declare const getDynamicLayoutData: ({ view }: DynamicLayoutProps) => {
     headerData: {
         heading: string;
     };
-    footerData?: undefined;
+    helpHeaderData?: undefined;
 } | {
-    footerData: FooterContentProps | undefined;
     headerData: HeaderContentProps | undefined;
+    helpHeaderData: FooterContentProps | undefined;
 };
 export {};

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

@@ -1,18 +1,5 @@
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { WalletConnectIcon } from '@dynamic-labs/iconic';
-import '@dynamic-labs/sdk-api';
-import '../../../shared/logger.js';
-import '@dynamic-labs/wallet-connector-core';
-import '../../../context/ViewContext/ViewContext.js';
-import 'react';
-import { ReactComponent as SvgWalletOutline } from '../../../shared/assets/wallet-outline.js';
-import { ReactComponent as SvgFooterInfoIcon } from '../../../shared/assets/footer-info-icon.js';
-import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
-import '../../constants/colors.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
-import 'ethers';
-import '../../../shared/consts/index.js';
 
 const getDynamicLayoutData = ({ view }) => {
     if (view === 'no-access') {
@@ -21,34 +8,27 @@ const getDynamicLayoutData = ({ view }) => {
         };
         return { headerData };
     }
-    const footerMap = {
+    const helpHeaderMap = {
         'login-with-email-or-wallet-full-wallet-list': {
             heading: 'Get your first wallet',
-            icon: jsx(SvgWalletOutline, {}),
         },
         'pending-connect': {
-            heading: 'Learn about connecting your wallet',
-            icon: jsx(SvgFooterInfoIcon, {}),
+            heading: 'Connecting a wallet',
         },
         'pending-signature': {
-            heading: 'Learn about signing / logging in',
-            icon: jsx(SvgFooterInfoIcon, {}),
+            heading: 'Signing a wallet',
         },
         'pending-signature-without-back-button': {
-            heading: 'Learn about signing / logging in',
-            icon: jsx(SvgFooterInfoIcon, {}),
+            heading: 'Signing a wallet',
         },
         'qr-code': {
-            heading: 'Learn about connecting your wallet',
-            icon: jsx(SvgFooterInfoIcon, {}),
+            heading: 'Connecting a wallet',
         },
         'wallet-connect-mobile-wallets-list': {
             heading: 'Get your first wallet',
-            icon: jsx(SvgWalletOutline, {}),
         },
         'wallet-list': {
             heading: 'Get your first wallet',
-            icon: jsx(SvgWalletOutline, {}),
         },
     };
     const headerMap = {
@@ -65,11 +45,11 @@ const getDynamicLayoutData = ({ view }) => {
         'wallet-list': { heading: 'Select your wallet' },
         'wallet-sign': { heading: 'Sign to confirm transfer' },
     };
-    const footerData = footerMap[view];
+    const helpHeaderData = helpHeaderMap[view];
     const headerData = headerMap[view];
     return {
-        footerData,
         headerData,
+        helpHeaderData,
     };
 };
 

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

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getMissingChains = (arr1, arr2) => {
+    if (!arr1 || !arr2) {
+        return;
+    }
+    // create a Set of all 'chain' values from the second array
+    const chainSet = new Set(arr2.map((obj) => obj.walletChain));
+    // filter out objects from the first array that have 'chain' present in the set
+    const uniqueChains = arr1.filter((obj) => !chainSet.has(obj.chain));
+    return uniqueChains;
+};
+
+exports.getMissingChains = getMissingChains;

package/src/lib/utils/functions/getMissingChains/getMissingChains.d.ts

@@ -0,0 +1,3 @@
+import { ChainsToConnect } from '../../../context/DynamicContext/types';
+import { ConnectedWalletConnectorType } from '../../hooks/useConnectWallet/useConnectWallet';
+export declare const getMissingChains: (arr1: ChainsToConnect[] | undefined, arr2: ConnectedWalletConnectorType[] | undefined) => ChainsToConnect[] | undefined;

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

@@ -0,0 +1,12 @@
+const getMissingChains = (arr1, arr2) => {
+    if (!arr1 || !arr2) {
+        return;
+    }
+    // create a Set of all 'chain' values from the second array
+    const chainSet = new Set(arr2.map((obj) => obj.walletChain));
+    // filter out objects from the first array that have 'chain' present in the set
+    const uniqueChains = arr1.filter((obj) => !chainSet.has(obj.chain));
+    return uniqueChains;
+};
+
+export { getMissingChains };

package/src/lib/utils/functions/getMissingChains/index.d.ts

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

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

@@ -0,0 +1,12 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getWalletConnectorNetworks = (walletConnector) => {
+    if (!walletConnector)
+        return [];
+    const _walletConnector = walletConnector;
+    return (_walletConnector.evmNetworks || _walletConnector.starknetNetworks || []);
+};
+
+exports.getWalletConnectorNetworks = getWalletConnectorNetworks;

package/src/lib/utils/functions/getWalletConnectorNetworks/getWalletConnectorNetworks.d.ts

@@ -0,0 +1,3 @@
+import { NetworkConfiguration } from '@dynamic-labs/sdk-api';
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+export declare const getWalletConnectorNetworks: (walletConnector?: WalletConnector | null) => NetworkConfiguration[];

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

@@ -0,0 +1,8 @@
+const getWalletConnectorNetworks = (walletConnector) => {
+    if (!walletConnector)
+        return [];
+    const _walletConnector = walletConnector;
+    return (_walletConnector.evmNetworks || _walletConnector.starknetNetworks || []);
+};
+
+export { getWalletConnectorNetworks };

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

@@ -2,6 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const getWalletVerifiedCredential = (walletAddress, verifiedCredentials) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find((credential) => credential.address === walletAddress);
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+
+const getWalletVerifiedCredential = (walletAddress, verifiedCredentials, walletChain) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find(({ address }) => walletConnectorCore.isSameAddress(address || '', walletAddress || '', walletChain));
 
 exports.getWalletVerifiedCredential = getWalletVerifiedCredential;

package/src/lib/utils/functions/getWalletVerifiedCredential/getWalletVerifiedCredential.d.ts

@@ -1,2 +1,2 @@
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
-export declare const getWalletVerifiedCredential: (walletAddress: string | undefined, verifiedCredentials: JwtVerifiedCredential[] | undefined) => JwtVerifiedCredential | undefined;
+export declare const getWalletVerifiedCredential: (walletAddress: string | undefined, verifiedCredentials: JwtVerifiedCredential[] | undefined, walletChain: string) => JwtVerifiedCredential | undefined;

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

@@ -1,3 +1,5 @@
-const getWalletVerifiedCredential = (walletAddress, verifiedCredentials) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find((credential) => credential.address === walletAddress);
+import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
+
+const getWalletVerifiedCredential = (walletAddress, verifiedCredentials, walletChain) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find(({ address }) => isSameAddress(address || '', walletAddress || '', walletChain));
 
 export { getWalletVerifiedCredential };

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

@@ -17,3 +17,6 @@ export * from './isNetworkUnsupported';
 export * from './getReferencedAccount';
 export * from './getAppOrigin';
 export * from './groupBy';
+export * from './isProviderEnabled';
+export * from './isOnrampProvider';
+export * from './getWalletConnectorNetworks/getWalletConnectorNetworks';

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

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApi = require('@dynamic-labs/sdk-api');
+var isProviderEnabled = require('../isProviderEnabled/isProviderEnabled.cjs');
 
-const isEmailProviderEnabled = (providers) => providers.some(({ provider, enabledAt }) => [sdkApi.ProviderEnum.EmailOnly, sdkApi.ProviderEnum.MagicLink].includes(provider) &&
-    Boolean(enabledAt));
+const isEmailProviderEnabled = (providers) => isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.EmailOnly) ||
+    isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.Blocto) ||
+    isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.MagicLink);
 
 exports.isEmailProviderEnabled = isEmailProviderEnabled;

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

@@ -1,6 +1,8 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
+import { isProviderEnabled } from '../isProviderEnabled/isProviderEnabled.js';
 
-const isEmailProviderEnabled = (providers) => providers.some(({ provider, enabledAt }) => [ProviderEnum.EmailOnly, ProviderEnum.MagicLink].includes(provider) &&
-    Boolean(enabledAt));
+const isEmailProviderEnabled = (providers) => isProviderEnabled(providers, ProviderEnum.EmailOnly) ||
+    isProviderEnabled(providers, ProviderEnum.Blocto) ||
+    isProviderEnabled(providers, ProviderEnum.MagicLink);
 
 export { isEmailProviderEnabled };

package/src/lib/utils/functions/isOnrampProvider/index.d.ts

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

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

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var onrampProviders = require('../../constants/onrampProviders.cjs');
+
+const isOnrampProvider = (provider) => onrampProviders.ONRAMP_PROVIDERS.includes(provider.provider);
+
+exports.isOnrampProvider = isOnrampProvider;

package/src/lib/utils/functions/isOnrampProvider/isOnrampProvider.d.ts

@@ -0,0 +1,2 @@
+import { Provider } from '@dynamic-labs/sdk-api';
+export declare const isOnrampProvider: (provider: Provider) => boolean;

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

@@ -0,0 +1,5 @@
+import { ONRAMP_PROVIDERS } from '../../constants/onrampProviders.js';
+
+const isOnrampProvider = (provider) => ONRAMP_PROVIDERS.includes(provider.provider);
+
+export { isOnrampProvider };

package/src/lib/utils/functions/isProviderEnabled/index.d.ts

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

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

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isProviderEnabled = (providers, provider) => providers.some((providerItem) => providerItem.provider === provider && Boolean(providerItem.enabledAt));
+
+exports.isProviderEnabled = isProviderEnabled;

package/src/lib/utils/functions/isProviderEnabled/isProviderEnabled.d.ts

@@ -0,0 +1,2 @@
+import { Provider, ProviderEnum } from '@dynamic-labs/sdk-api';
+export declare const isProviderEnabled: (providers: Provider[], provider: ProviderEnum) => boolean;

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

@@ -0,0 +1,3 @@
+const isProviderEnabled = (providers, provider) => providers.some((providerItem) => providerItem.provider === provider && Boolean(providerItem.enabledAt));
+
+export { isProviderEnabled };

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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
-const isSelectedWalletAlreadyConnected = (connectedWallets, selectedWallet, user) => {
+const isSelectedWalletAlreadyConnected = (linkedWallets, selectedWallet, user) => {
     if (!user)
         return false;
-    return connectedWallets
+    return linkedWallets
         .map(({ connector }) => walletConnectorCore.normalizeWalletName(connector.name))
         .includes(walletConnectorCore.normalizeWalletName(selectedWallet.name));
 };

package/src/lib/utils/functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.d.ts

@@ -1,3 +1,3 @@
 import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { UserProfile, Wallet } from '../../../shared/types';
-export declare const isSelectedWalletAlreadyConnected: (connectedWallets: Wallet[], selectedWallet: WalletConnector, user?: UserProfile | undefined) => boolean;
+export declare const isSelectedWalletAlreadyConnected: (linkedWallets: Wallet[], selectedWallet: WalletConnector, user?: UserProfile | undefined) => boolean;

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

@@ -1,9 +1,9 @@
 import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 
-const isSelectedWalletAlreadyConnected = (connectedWallets, selectedWallet, user) => {
+const isSelectedWalletAlreadyConnected = (linkedWallets, selectedWallet, user) => {
     if (!user)
         return false;
-    return connectedWallets
+    return linkedWallets
         .map(({ connector }) => normalizeWalletName(connector.name))
         .includes(normalizeWalletName(selectedWallet.name));
 };

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

@@ -2,15 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var getWalletConnectorNetworks = require('../getWalletConnectorNetworks/getWalletConnectorNetworks.cjs');
+
 const isSupportedNetwork = ({ walletConnector, network }) => {
-    const evmNetworks = walletConnector.evmNetworks || [];
-    /**
-     * Currently only supports EVM networks. But this could support other types of networks in the future.
-     * When this happens, network could be a string (solana) or a number (ethereum). Be sure to remove the Number() cast.
-     * when this happens.
-     */
-    const currentEvmNetwork = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.find((element) => element.chainId === Number(network));
-    return !(evmNetworks && evmNetworks.length && !currentEvmNetwork);
+    const supportedNetworks = getWalletConnectorNetworks.getWalletConnectorNetworks(walletConnector);
+    if (!supportedNetworks.length) {
+        return true;
+    }
+    const isCurrentNetworkSupported = supportedNetworks.some(({ chainId }) => String(chainId) === String(network));
+    return isCurrentNetworkSupported;
 };
 
 exports.isSupportedNetwork = isSupportedNetwork;

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

@@ -1,12 +1,12 @@
+import { getWalletConnectorNetworks } from '../getWalletConnectorNetworks/getWalletConnectorNetworks.js';
+
 const isSupportedNetwork = ({ walletConnector, network }) => {
-    const evmNetworks = walletConnector.evmNetworks || [];
-    /**
-     * Currently only supports EVM networks. But this could support other types of networks in the future.
-     * When this happens, network could be a string (solana) or a number (ethereum). Be sure to remove the Number() cast.
-     * when this happens.
-     */
-    const currentEvmNetwork = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.find((element) => element.chainId === Number(network));
-    return !(evmNetworks && evmNetworks.length && !currentEvmNetwork);
+    const supportedNetworks = getWalletConnectorNetworks(walletConnector);
+    if (!supportedNetworks.length) {
+        return true;
+    }
+    const isCurrentNetworkSupported = supportedNetworks.some(({ chainId }) => String(chainId) === String(network));
+    return isCurrentNetworkSupported;
 };
 
 export { isSupportedNetwork };

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

@@ -18,9 +18,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 
 const storeAuthToken = (jwt) => {
-    // TODO: update it to not use localStorage
-    //        when we decide how to handle JWT https://linear.app/dynamic-labs/issue/DYN-178
-    localStorage.LocalStorage.setToLS(localStorage$1.AUTH_TOKEN, jwt);
+    localStorage.LocalStorage.setToLS(localStorage$1.AUTH_TOKEN, jwt, true);
 };
 
 exports.storeAuthToken = storeAuthToken;

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

@@ -14,9 +14,7 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 
 const storeAuthToken = (jwt) => {
-    // TODO: update it to not use localStorage
-    //        when we decide how to handle JWT https://linear.app/dynamic-labs/issue/DYN-178
-    LocalStorage.setToLS(AUTH_TOKEN, jwt);
+    LocalStorage.setToLS(AUTH_TOKEN, jwt, true);
 };
 
 export { storeAuthToken };

package/src/lib/utils/functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.d.ts

@@ -1,10 +1,8 @@
-import { WalletOption } from '../../../../../shared';
+import { WalletGroupOption, WalletOption } from '../../../../../shared';
 /**
  *  Check if given WalletOption is defined as a group
  *
  * @param {WalletOption} walletOption - Wallet Option
  * @returns {Boolean} - boolean value
  */
-export declare const isWalletGroup: (walletOption: WalletOption) => walletOption is WalletOption & {
-    groupedWallets: WalletOption[];
-};
+export declare const isWalletGroup: (walletOption: WalletOption) => walletOption is WalletGroupOption;

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

@@ -9,8 +9,8 @@ var groupWalletOptions = require('./utils/groupWalletOptions/groupWalletOptions.
 const PRIORITY_WALLET_LIST = [
     'metamask',
     'coinbase',
-    'phantom',
     'walletconnect',
+    'phantom',
     'argentx',
     'myalgo',
     'blocto',

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

@@ -5,8 +5,8 @@ import { groupWalletOptions } from './utils/groupWalletOptions/groupWalletOption
 const PRIORITY_WALLET_LIST = [
     'metamask',
     'coinbase',
-    'phantom',
     'walletconnect',
+    'phantom',
     'argentx',
     'myalgo',
     'blocto',

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var getWalletProvider = require('../../../functions/getWalletProvider/getWalletProvider.cjs');
 
-const specialCareWallets = ['slope', 'myalgo'];
+const specialCareWallets = ['slope', 'myalgo', 'bloctoevm'];
 const showPendingConnectView = (walletConnector, setView) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.js

@@ -1,7 +1,7 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { getWalletProvider } from '../../../functions/getWalletProvider/getWalletProvider.js';
 
-const specialCareWallets = ['slope', 'myalgo'];
+const specialCareWallets = ['slope', 'myalgo', 'bloctoevm'];
 const showPendingConnectView = (walletConnector, setView) => __awaiter(void 0, void 0, void 0, function* () {
     const walletProvider = getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect

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

@@ -10,7 +10,7 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/sdk-api');
-require('../../../../shared/logger.cjs');
+var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('react');
@@ -24,12 +24,15 @@ require('../../../../shared/consts/index.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
+require('@dynamic-labs/multi-wallet');
+var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
+var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
 
 const useConnectAndSign = () => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -40,28 +43,48 @@ const useConnectAndSign = () => {
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
-        yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
+        // Raise verification ongoing flag
+        setIsVerificationInProgress(true);
         try {
+            yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
             if (walletConnectorCore.isEmailWalletConnector(walletConnector)) {
                 if (walletConnectorCore.isEmailOTPWalletConnector(walletConnector)) {
                     setView('email-wallet-otp-verification-view');
                 }
-                else {
+                else if (!walletConnectorCore.isBloctoConnector(walletConnector)) {
                     setView('wait-for-email-confirmation-view');
                 }
             }
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            setCallback('connectSuccess');
+            if (!publicWalletAddress) {
+                return;
+            }
+            const walletNetwork = yield walletConnector.getNetwork();
+            const usesSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
+                network: walletNetwork,
+                walletConnector,
+            });
+            if (!usesSupportedNetwork) {
+                if (isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
+                    return setView('network-not-supported');
+                }
+                return setView('network-not-supported-manual');
+            }
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
                 handleWalletsToConnect();
+                if (!isFullyConnected) {
+                    setCallback('connectSuccess');
+                }
                 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;
             }
-            if (!walletConnectorCore.isEmailWalletConnector(walletConnector)) {
+            if (!walletConnectorCore.isEmailWalletConnector(walletConnector) ||
+                walletConnectorCore.isBloctoConnector(walletConnector)) {
                 setView('pending-signature');
             }
             else {
@@ -74,8 +97,11 @@ const useConnectAndSign = () => {
             });
         }
         catch (err) {
+            logger.logger.debug(err);
             setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
             goToInitialView();
+            // Since auth failed, lower flag
+            setIsVerificationInProgress(false);
             return;
         }
     });