@web3auth/modal 10.16.0 → 11.0.0-beta.1

package/dist/lib.esm/packages/modal/src/ui/components/SocialLoginList/SocialLoginList.js

@@ -13,12 +13,12 @@ function getProviderIcon(method, isDark, extension) {
       id: "active-login-img",
       src: `https://images.web3auth.io/${hoverId}${extension}`,
       alt: "active-login-img",
-      className: "w3a--hidden w3a--size-5 w3a--object-contain group-hover:w3a--block"
+      className: "wta:hidden wta:size-5 wta:object-contain wta:group-hover:block"
     }), /*#__PURE__*/jsx("img", {
       id: "login-img",
       src: `https://images.web3auth.io/${imageId}${extension}`,
       alt: "login-img",
-      className: "w3a--block w3a--size-5 w3a--object-contain group-hover:w3a--hidden"
+      className: "wta:block wta:size-5 wta:object-contain wta:group-hover:hidden"
     })]
   });
 }
@@ -35,20 +35,20 @@ function SocialLoginList(props) {
   } = props;
   const getGridRowFromVisibleLogin = () => {
     if (visibleRow.length === 1) {
-      return "w3a--grid-cols-1";
+      return "wta:grid-cols-1";
     } else if (visibleRow.length === 2) {
-      return "w3a--grid-cols-2";
+      return "wta:grid-cols-2";
     } else if (visibleRow.length === 3) {
-      return "w3a--grid-cols-3";
+      return "wta:grid-cols-3";
     } else {
-      return "w3a--grid-cols-4";
+      return "wta:grid-cols-4";
     }
   };
   if ((visibleRow.length !== 0 || mainOptionsRow.length !== 0) && (otherRow === null || otherRow === void 0 ? void 0 : otherRow.length) === 0) {
     return /*#__PURE__*/jsxs("div", {
-      className: "w3a--flex w3a--w-full w3a--flex-col w3a--items-center w3a--justify-center w3a--gap-y-2",
+      className: "wta:flex wta:w-full wta:flex-col wta:items-center wta:justify-center wta:gap-y-2",
       children: [/*#__PURE__*/jsx("div", {
-        className: "w3a--grid w3a--w-full w3a--gap-y-2",
+        className: "wta:grid wta:w-full wta:gap-y-2",
         children: mainOptionsRow.map(row => /*#__PURE__*/jsx(Button, {
           type: BUTTON_TYPE.SOCIAL,
           props: {
@@ -57,19 +57,18 @@ function SocialLoginList(props) {
             method: row.method,
             isDark,
             isPrimaryBtn: false,
-            btnStyle: "w3a--flex w3a--items-center !w3a--justify-center w3a--w-full w3a--h-11 w3a--group",
+            btnStyle: "wta:flex wta:items-center wta:justify-center! wta:w-full wta:h-11 wta:group",
             children: /*#__PURE__*/jsx(Fragment, {
               children: getProviderIcon(row.method, isDark, ".svg")
             }),
             onClick: () => handleSocialLoginClick({
-              connector: row.connector,
               loginParams: row.loginParams
             }),
             buttonRadius
           }
         }, row.method))
       }), /*#__PURE__*/jsxs("div", {
-        className: cn("w3a--grid w3a--w-full w3a--gap-x-2", getGridRowFromVisibleLogin()),
+        className: cn("wta:grid wta:w-full wta:gap-x-2", getGridRowFromVisibleLogin()),
         children: [visibleRow.filter((_, index) => visibleRow.length === 4 ? index <= 3 : index < 3).map(row => /*#__PURE__*/jsx(LoginHint, {
           content: "Last Login",
           isDark: isDark,
@@ -81,12 +80,11 @@ function SocialLoginList(props) {
               method: row.method,
               isDark,
               isPrimaryBtn: false,
-              btnStyle: "w3a--flex w3a--items-center !w3a--justify-center w3a--w-full w3a--h-11 w3a--group",
+              btnStyle: "wta:flex wta:items-center wta:justify-center! wta:w-full wta:h-11 wta:group",
               children: /*#__PURE__*/jsx(Fragment, {
                 children: getProviderIcon(row.method, isDark, ".svg")
               }),
               onClick: () => handleSocialLoginClick({
-                connector: row.connector,
                 loginParams: row.loginParams
               }),
               buttonRadius
@@ -95,13 +93,14 @@ function SocialLoginList(props) {
         }, row.method)), canShowMore && visibleRow.length > 4 && /*#__PURE__*/jsx(Button, {
           type: BUTTON_TYPE.SOCIAL,
           props: {
+            isDark,
             showIcon: false,
             onClick: handleExpandSocialLogins,
-            btnStyle: "w3a--flex w3a--items-center !w3a--justify-center w3a--w-full w3a--h-11",
+            btnStyle: "wta:flex wta:items-center wta:justify-center! wta:w-full wta:h-11",
             children: /*#__PURE__*/jsx("img", {
               src: getIcons(isDark ? "dots-dark-horizontal" : "dots-light-horizontal"),
               alt: "Logo",
-              className: "w3a--object-contain"
+              className: "wta:object-contain"
             }),
             buttonRadius
           }
@@ -110,20 +109,20 @@ function SocialLoginList(props) {
     });
   }
   return /*#__PURE__*/jsxs("div", {
-    className: "w3a--flex w3a--w-full w3a--flex-col w3a--items-start w3a--justify-start w3a--gap-y-4",
+    className: "wta:flex wta:w-full wta:flex-col wta:items-start wta:justify-start wta:gap-y-4",
     children: [/*#__PURE__*/jsx("button", {
       type: "button",
-      className: "w3a--appearance-none",
+      className: "wta:appearance-none",
       onClick: () => handleExpandSocialLogins(),
       children: /*#__PURE__*/jsx("img", {
         src: getIcons(isDark ? "arrow-left-dark" : "arrow-left-light"),
         alt: "Logo",
-        className: "w3a--object-contain"
+        className: "wta:object-contain"
       })
     }), /*#__PURE__*/jsx("div", {
-      className: "w3a--social-container w3a--grid w3a--h-[300px] w3a--w-full w3a--auto-rows-min w3a--grid-cols-1 w3a--gap-y-2 w3a--overflow-y-auto w3a--pl-2 w3a--pr-3",
+      className: "w3a--social-container wta:grid wta:h-[300px] wta:w-full wta:auto-rows-min wta:grid-cols-1 wta:gap-y-2 wta:overflow-y-auto wta:pl-2 wta:pr-3",
       children: otherRow.map(row => /*#__PURE__*/jsx("div", {
-        className: "w3a--h-11 w3a--w-full",
+        className: "wta:h-11 wta:w-full",
         children: /*#__PURE__*/jsx(Button, {
           type: BUTTON_TYPE.SOCIAL,
           props: {
@@ -131,18 +130,17 @@ function SocialLoginList(props) {
             isDark,
             isPrimaryBtn: false,
             onClick: () => handleSocialLoginClick({
-              connector: row.connector,
               loginParams: row.loginParams
             }),
-            btnStyle: "w3a--group w3a--relative w3a--overflow-hidden w3a--flex w3a--items-center !w3a--justify-start w3a--w-full w3a--h-11",
+            btnStyle: "wta:group wta:relative wta:overflow-hidden wta:flex wta:items-center wta:justify-start! wta:w-full wta:h-11",
             buttonRadius,
             children: /*#__PURE__*/jsxs(Fragment, {
               children: [getProviderIcon(row.method, isDark, ".svg"), /*#__PURE__*/jsx("p", {
-                className: "w3a--text-sm w3a--font-normal w3a--text-app-gray-900 dark:w3a--text-app-white",
+                className: "wta:text-sm wta:font-normal wta:text-app-gray-900 wta:dark:text-app-white",
                 children: row.name
               }), /*#__PURE__*/jsx("img", {
                 id: "login-arrow",
-                className: "w3a--absolute w3a--right-4 w3a--top-1/2 -w3a--translate-x-10 -w3a--translate-y-1/2 w3a--opacity-0 w3a--transition-all w3a--duration-300 group-hover:w3a--translate-x-0 group-hover:w3a--opacity-100",
+                className: "wta:absolute wta:right-4 wta:top-1/2 wta:-translate-x-10 wta:-translate-y-1/2 wta:opacity-0 wta:transition-all wta:duration-300 wta:group-hover:translate-x-0 wta:group-hover:opacity-100",
                 src: getIcons(isDark ? "chevron-right-dark" : "chevron-right-light"),
                 alt: "arrow"
               })]

package/dist/lib.esm/packages/modal/src/ui/components/SpinnerLoader/SpinnerLoader.css.js

@@ -0,0 +1,4 @@
+import styleInject from '../../../../../../node_modules/style-inject/dist/style-inject.es.js';
+
+var css_248z = ".w3a-parent-container .w3a--spinner-loader{display:inline-flex;height:60px;position:relative;width:60px}.w3a-parent-container .w3a--spinner-loader-ring{--spinner-color:var(--app-gray-400);background-image:conic-gradient(from 0deg at 50% 50%,var(--spinner-color) 0,#e5e7ebcc 90deg,#e5e7ebcc 270deg,var(--spinner-color) 1turn);background-position:0 0;background-size:100% 100%;border-radius:100vw;display:inline-block;height:100%;-webkit-mask:radial-gradient(farthest-side,#000 98%,#0000) center/85% 85% no-repeat,linear-gradient(#000 0 0);-webkit-mask-composite:destination-out;mask:radial-gradient(farthest-side,#000 98%,#0000) center/85% 85% no-repeat,linear-gradient(#000 0 0);mask-composite:exclude;position:absolute;width:100%}.w3a-parent-container .w3a--dark .w3a--spinner-loader-ring{background-image:conic-gradient(from 0deg at 50% 50%,var(--spinner-color) 0,#e5e7eb33 90deg,#e5e7eb33 270deg,var(--spinner-color) 1turn)}.w3a-parent-container .w3a--spinner-loader-image{left:50%;position:absolute;top:50%;transform:translate(-50%,-50%)}";
+styleInject(css_248z);

package/dist/lib.esm/packages/modal/src/ui/components/SpinnerLoader/SpinnerLoader.js

@@ -0,0 +1,28 @@
+import './SpinnerLoader.css.js';
+import { cn } from '../../utils.js';
+import { jsxs, jsx } from 'react/jsx-runtime';
+
+const SpinnerLoader = props => {
+  const {
+    children,
+    classes,
+    width = 60,
+    height = 60,
+    className
+  } = props;
+  return /*#__PURE__*/jsxs("div", {
+    className: cn("w3a--spinner-loader", className),
+    style: {
+      width,
+      height
+    },
+    children: [/*#__PURE__*/jsx("div", {
+      className: cn("w3a--spinner-loader-ring wta:animate-spin", classes === null || classes === void 0 ? void 0 : classes.spinner)
+    }), children && /*#__PURE__*/jsx("div", {
+      className: "w3a--spinner-loader-image",
+      children: children
+    })]
+  });
+};
+
+export { SpinnerLoader as default };

package/dist/lib.esm/packages/modal/src/ui/components/Toast/Toast.js

@@ -1,5 +1,5 @@
-import { useContext, useEffect } from 'react';
-import { RootContext } from '../../context/RootContext.js';
+import { useEffect } from 'react';
+import { useToast } from '../../context/RootContext.js';
 import { TOAST_TYPE } from '../../interfaces.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
@@ -7,7 +7,7 @@ const Toast = () => {
   const {
     toast,
     setToast
-  } = useContext(RootContext);
+  } = useToast();
   useEffect(() => {
     if (toast.message) {
       setTimeout(() => {
@@ -20,21 +20,21 @@ const Toast = () => {
   }, [toast.message, setToast]);
   if (!toast.message) return null;
   const toastClass = {
-    success: "w3a--border-app-green-200 w3a--bg-app-green-100 w3a--text-app-green-900",
-    error: "w3a--border-app-red-200 w3a--bg-app-red-100 w3a--text-app-red-900",
-    warning: "w3a--border-app-yellow-200 w3a--bg-app-yellow-100 w3a--text-app-yellow-900",
-    info: "w3a--border-app-blue-200 w3a--bg-app-blue-100 w3a--text-app-blue-900"
+    success: "wta:border-app-green-200 wta:bg-app-green-100 wta:text-app-green-900",
+    error: "wta:border-app-red-200 wta:bg-app-red-100 wta:text-app-red-900",
+    warning: "wta:border-app-yellow-200 wta:bg-app-yellow-100 wta:text-app-yellow-900",
+    info: "wta:border-app-blue-200 wta:bg-app-blue-100 wta:text-app-blue-900"
   };
   const toastIconClass = {
-    success: "w3a--text-app-green-900",
-    error: "w3a--text-app-red-900",
-    warning: "w3a--text-app-yellow-900",
-    info: "w3a--text-app-blue-900"
+    success: "wta:text-app-green-900",
+    error: "wta:text-app-red-900",
+    warning: "wta:text-app-yellow-900",
+    info: "wta:text-app-blue-900"
   };
   return /*#__PURE__*/jsxs("div", {
-    className: `w3a--absolute w3a--inset-x-4 w3a--bottom-4 w3a--z-[60] w3a--mx-auto w3a--w-[90%] w3a--rounded-md w3a--border w3a--p-4 w3a--text-sm ${toastClass[toast.type]}`,
+    className: `wta:absolute wta:inset-x-4 wta:bottom-4 wta:z-[60] wta:mx-auto wta:w-[90%] wta:rounded-md wta:border wta:p-4 wta:text-sm ${toastClass[toast.type]}`,
     children: [/*#__PURE__*/jsx("div", {
-      className: "w3a--absolute w3a--right-4 w3a--top-4 w3a--z-10 w3a--cursor-pointer",
+      className: "wta:absolute wta:right-4 wta:top-4 wta:z-10 wta:cursor-pointer",
       children: /*#__PURE__*/jsx("svg", {
         width: "13",
         height: "13",
@@ -54,7 +54,7 @@ const Toast = () => {
         })
       })
     }), /*#__PURE__*/jsx("div", {
-      className: "w3a--flex w3a--items-center w3a--gap-2",
+      className: "wta:flex wta:items-center wta:gap-2",
       children: /*#__PURE__*/jsx("p", {
         children: toast.message
       })

package/dist/lib.esm/packages/modal/src/ui/constants.js

@@ -1,8 +1,11 @@
 const PAGES = {
-  LOGIN: "login",
-  CONNECT_WALLET: "connect_wallet"};
+  /** Main login options: social logins and wallet button (e.g. MetaMask) */
+  LOGIN_OPTIONS: "login",
+  /** List of all available wallets to connect */
+  WALLET_LIST: "connect_wallet"};
 const CONNECT_WALLET_PAGES = {
   CONNECT_WALLET: "Connect Your Wallet",
+  /** Sub-page title when showing QR/instructions for selected wallet */
   SELECTED_WALLET: "Selected Wallet"
 };
 const DEFAULT_LOGO_LIGHT = "https://images.web3auth.io/web3auth-logo-w.svg"; // logo used on light mode

package/dist/lib.esm/packages/modal/src/ui/containers/AccountLinking/AccountLinking.js

@@ -0,0 +1,107 @@
+import { WALLET_CONNECTORS } from '@web3auth/no-modal';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { WALLET_CONNECT_LOGO } from '../../constants.js';
+import { useModalState } from '../../context/ModalStateContext.js';
+import { useWidget } from '../../context/WidgetContext.js';
+import { ACCOUNT_LINKING_INTENT, ACCOUNT_LINKING_STATUS } from '../../interfaces.js';
+import i18nInstance from '../../localeImport.js';
+import ConnectWalletQrCode from '../ConnectWallet/ConnectWalletQrCode/ConnectWalletQrCode.js';
+import { jsxs, jsx } from 'react/jsx-runtime';
+
+const DEFAULT_ACCOUNT_LINKING_BUTTON = {
+  name: WALLET_CONNECTORS.WALLET_CONNECT_V2,
+  displayName: "WalletConnect",
+  hasInjectedWallet: false,
+  hasWalletConnect: true,
+  hasInstallLinks: false,
+  imgExtension: "svg"
+};
+function AccountLinking(props) {
+  var _accountLinkingButton;
+  const {
+    allExternalWallets
+  } = props;
+  const {
+    modalState
+  } = useModalState();
+  const {
+    deviceDetails,
+    isDark
+  } = useWidget();
+  const [t] = useTranslation(undefined, {
+    i18n: i18nInstance
+  });
+  const accountLinkingButton = useMemo(() => {
+    const requestedConnectorName = modalState.accountLinking.connectorName;
+    if (!requestedConnectorName) return DEFAULT_ACCOUNT_LINKING_BUTTON;
+    return allExternalWallets.find(button => button.name === requestedConnectorName) || DEFAULT_ACCOUNT_LINKING_BUTTON;
+  }, [allExternalWallets, modalState.accountLinking.connectorName]);
+  const accountLinkingDisplayName = useMemo(() => {
+    return accountLinkingButton.displayName || "WalletConnect";
+  }, [accountLinkingButton.displayName]);
+  const accountLinkingQrLogoImage = useMemo(() => {
+    if (accountLinkingButton.name === WALLET_CONNECTORS.WALLET_CONNECT_V2 || !accountLinkingButton.imgExtension) {
+      return WALLET_CONNECT_LOGO;
+    }
+    return `https://images.web3auth.io/login-${accountLinkingButton.name}.${accountLinkingButton.imgExtension}`;
+  }, [accountLinkingButton.imgExtension, accountLinkingButton.name]);
+  const isSwitchAccountIntent = modalState.accountLinking.intent === ACCOUNT_LINKING_INTENT.SWITCH;
+  const isWalletConnectConnector = accountLinkingButton.name === WALLET_CONNECTORS.WALLET_CONNECT_V2;
+  const accountLinkingMessage = useMemo(() => {
+    switch (modalState.accountLinking.status) {
+      case ACCOUNT_LINKING_STATUS.INITIALIZING:
+        return t("modal.account-linking.initializing-wallet", {
+          wallet: accountLinkingDisplayName
+        });
+      case ACCOUNT_LINKING_STATUS.AWAITING_CONNECTION:
+        return modalState.accountLinking.walletConnectUri ? isWalletConnectConnector ? t("modal.account-linking.scan-walletconnect") : t("modal.account-linking.scan-wallet", {
+          wallet: accountLinkingDisplayName
+        }) : t("modal.account-linking.preparing-wallet-qr", {
+          wallet: accountLinkingDisplayName
+        });
+      case ACCOUNT_LINKING_STATUS.WALLET_CONNECTED:
+        return isSwitchAccountIntent ? t("modal.account-linking.wallet-connected-preparing-switch") : t("modal.account-linking.wallet-connected-preparing-linking");
+      case ACCOUNT_LINKING_STATUS.LINKING:
+        return isSwitchAccountIntent ? t("modal.account-linking.switching-wallet") : t("modal.account-linking.linking-wallet");
+      case ACCOUNT_LINKING_STATUS.COMPLETED:
+        return isSwitchAccountIntent ? t("modal.account-linking.wallet-switched") : t("modal.account-linking.wallet-linked");
+      case ACCOUNT_LINKING_STATUS.ERRORED:
+        return modalState.accountLinking.errorMessage || (isSwitchAccountIntent ? t("modal.account-linking.failed-switch-wallet", {
+          wallet: accountLinkingDisplayName
+        }) : t("modal.account-linking.failed-connect-wallet", {
+          wallet: accountLinkingDisplayName
+        }));
+      default:
+        return "";
+    }
+  }, [accountLinkingDisplayName, isSwitchAccountIntent, isWalletConnectConnector, modalState.accountLinking.errorMessage, modalState.accountLinking.status, modalState.accountLinking.walletConnectUri, t]);
+  return /*#__PURE__*/jsxs("div", {
+    className: "wta:flex wta:flex-1 wta:flex-col wta:gap-y-4",
+    children: [/*#__PURE__*/jsx("div", {
+      className: "wta:flex wta:items-center wta:justify-center",
+      children: /*#__PURE__*/jsx("p", {
+        className: "wta:text-base wta:font-medium wta:text-app-gray-900 wta:dark:text-app-white",
+        children: accountLinkingDisplayName
+      })
+    }), modalState.accountLinking.status === ACCOUNT_LINKING_STATUS.ERRORED ? /*#__PURE__*/jsx("div", {
+      className: "wta:rounded-2xl wta:border wta:border-app-gray-200 wta:bg-app-gray-50 wta:p-4 wta:dark:border-app-gray-700 wta:dark:bg-app-gray-800",
+      children: /*#__PURE__*/jsx("p", {
+        className: "wta:text-center wta:text-sm wta:text-app-gray-700 wta:dark:text-app-gray-200",
+        children: accountLinkingMessage
+      })
+    }) : /*#__PURE__*/jsx(ConnectWalletQrCode, {
+      qrCodeValue: modalState.accountLinking.walletConnectUri,
+      isDark: isDark,
+      selectedButton: accountLinkingButton,
+      logoImage: accountLinkingQrLogoImage,
+      primaryColor: (_accountLinkingButton = accountLinkingButton.walletRegistryItem) === null || _accountLinkingButton === void 0 ? void 0 : _accountLinkingButton.primaryColor,
+      platform: deviceDetails.platform
+    }), accountLinkingMessage && modalState.accountLinking.status !== ACCOUNT_LINKING_STATUS.ERRORED && /*#__PURE__*/jsx("p", {
+      className: "wta:text-center wta:text-sm wta:text-app-gray-500 wta:dark:text-app-gray-300",
+      children: accountLinkingMessage
+    })]
+  });
+}
+
+export { AccountLinking as default };

package/dist/lib.esm/packages/modal/src/ui/{components → containers}/ConnectWallet/ConnectWallet.js

@@ -1,9 +1,11 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { WALLET_CONNECTORS, ANALYTICS_EVENTS, log } from '@web3auth/no-modal';
-import { useContext, useState, useMemo, useEffect } from 'react';
-import { CONNECT_WALLET_PAGES } from '../../constants.js';
+import { useContext, useState, useCallback, useMemo, useEffect } from 'react';
+import { CONNECT_WALLET_PAGES, PAGES } from '../../constants.js';
 import { AnalyticsContext } from '../../context/AnalyticsContext.js';
-import { RootContext } from '../../context/RootContext.js';
+import { useModalState } from '../../context/ModalStateContext.js';
+import { useBodyState } from '../../context/RootContext.js';
+import { useWidget } from '../../context/WidgetContext.js';
 import ConnectWalletChainFilter from './ConnectWalletChainFilter/ConnectWalletChainFilter.js';
 import ConnectWalletHeader from './ConnectWalletHeader/ConnectWalletHeader.js';
 import ConnectWalletList from './ConnectWalletList/ConnectWalletList.js';
@@ -12,32 +14,39 @@ import ConnectWalletSearch from './ConnectWalletSearch/ConnectWalletSearch.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
 function ConnectWallet(props) {
-  var _selectedButton$walle;
+  var _bodyState$installLin2, _bodyState$multiChain2, _selectedButton$walle;
   const {
-    isDark,
-    config,
-    walletConnectUri,
-    metamaskConnectUri,
-    walletRegistry,
     allRegistryButtons,
     customConnectorButtons,
     connectorVisibilityMap,
-    deviceDetails,
-    buttonRadius = "pill",
-    chainNamespace,
-    isExternalWalletModeOnly,
-    onBackClick,
-    handleExternalWalletClick,
-    handleWalletDetailsHeight,
-    disableBackButton
+    isExternalWalletModeOnly
   } = props;
   const {
     bodyState,
     setBodyState
-  } = useContext(RootContext);
+  } = useBodyState();
   const {
     analytics
   } = useContext(AnalyticsContext);
+  const {
+    deviceDetails,
+    isDark,
+    uiConfig
+  } = useWidget();
+  const {
+    walletRegistry
+  } = uiConfig;
+  const {
+    modalState,
+    setModalState,
+    handleShowExternalWallets,
+    preHandleExternalWalletClick: handleExternalWalletClick
+  } = useModalState();
+  const {
+    externalWalletsConfig: config,
+    walletConnectUri,
+    metamaskConnectUri
+  } = modalState;
   const [currentPage, setCurrentPage] = useState(CONNECT_WALLET_PAGES.CONNECT_WALLET);
   const [selectedWallet, setSelectedWallet] = useState(false);
   const [isLoading] = useState(false);
@@ -45,17 +54,36 @@ function ConnectWallet(props) {
   const [walletSearch, setWalletSearch] = useState("");
   const [selectedChain, setSelectedChain] = useState("all");
   const [isShowAllWallets, setIsShowAllWallets] = useState(false);
+  // Track if user came directly from Login page with a pre-selected wallet
+  const [isPreSelectedFromLogin, setIsPreSelectedFromLogin] = useState(false);
+  const onBackClick = useCallback(flag => {
+    setModalState(_objectSpread(_objectSpread({}, modalState), {}, {
+      currentPage: PAGES.LOGIN_OPTIONS
+    }));
+    handleShowExternalWallets(flag);
+  }, [modalState, setModalState, handleShowExternalWallets]);
   const handleBack = () => {
     if (!selectedWallet && currentPage === CONNECT_WALLET_PAGES.CONNECT_WALLET && onBackClick) {
       onBackClick(false);
       return;
     }
     if (selectedWallet) {
+      // If user came from Login page with pre-selected wallet, go back to Login
+      if (isPreSelectedFromLogin && onBackClick) {
+        setSelectedWallet(false);
+        setIsPreSelectedFromLogin(false);
+        onBackClick(false);
+        return;
+      }
+      // Otherwise, go back to wallet list
       setCurrentPage(CONNECT_WALLET_PAGES.CONNECT_WALLET);
       setSelectedWallet(false);
-      handleWalletDetailsHeight();
     }
   };
+  const disableBackButton = useMemo(() => {
+    var _bodyState$installLin, _bodyState$multiChain;
+    return ((_bodyState$installLin = bodyState.installLinks) === null || _bodyState$installLin === void 0 ? void 0 : _bodyState$installLin.show) || ((_bodyState$multiChain = bodyState.multiChainSelector) === null || _bodyState$multiChain === void 0 ? void 0 : _bodyState$multiChain.show);
+  }, [(_bodyState$installLin2 = bodyState.installLinks) === null || _bodyState$installLin2 === void 0 ? void 0 : _bodyState$installLin2.show, (_bodyState$multiChain2 = bodyState.multiChainSelector) === null || _bodyState$multiChain2 === void 0 ? void 0 : _bodyState$multiChain2.show]);
   const walletDiscoverySupported = useMemo(() => {
     const supported = walletRegistry && (Object.keys(walletRegistry.default || {}).length > 0 || Object.keys(walletRegistry.others || {}).length > 0);
     return supported;
@@ -140,12 +168,28 @@ function ConnectWallet(props) {
   // also resets everytime we search causing no. of wallets to change or select different chain
   useEffect(() => {
     if (walletDiscoverySupported && totalExternalWalletsCount <= 15) {
+      // eslint-disable-next-line react-hooks/set-state-in-effect -- intentional
       setIsShowAllWallets(true);
     } else {
       setIsShowAllWallets(false);
     }
   }, [walletDiscoverySupported, selectedChain, totalExternalWalletsCount]);
 
+  // Handle pre-selected wallet from Login page (e.g., MetaMask QR code flow)
+  useEffect(() => {
+    if (bodyState.preSelectedWallet) {
+      // eslint-disable-next-line react-hooks/set-state-in-effect -- intentional
+      setSelectedButton(bodyState.preSelectedWallet);
+      setSelectedWallet(true);
+      setCurrentPage(CONNECT_WALLET_PAGES.SELECTED_WALLET);
+      setIsPreSelectedFromLogin(true);
+      // Clear pre-selected wallet after handling
+      setBodyState(prev => _objectSpread(_objectSpread({}, prev), {}, {
+        preSelectedWallet: null
+      }));
+    }
+  }, [bodyState.preSelectedWallet, setBodyState]);
+
   /**
    * Wallet click logic
    * - For installed wallets
@@ -181,12 +225,11 @@ function ConnectWallet(props) {
         setSelectedButton(button);
         setSelectedWallet(true);
         setCurrentPage(CONNECT_WALLET_PAGES.SELECTED_WALLET);
-        handleWalletDetailsHeight();
         return;
       }
 
       // show chain namespace selector if the button has multiple chain namespaces
-      if (((_button$chainNamespac2 = button.chainNamespaces) === null || _button$chainNamespac2 === void 0 ? void 0 : _button$chainNamespac2.length) > 1) {
+      if (((_button$chainNamespac2 = button.chainNamespaces) === null || _button$chainNamespac2 === void 0 ? void 0 : _button$chainNamespac2.length) > 1 && button.name !== WALLET_CONNECTORS.METAMASK) {
         setBodyState(_objectSpread(_objectSpread({}, bodyState), {}, {
           multiChainSelector: {
             show: true,
@@ -204,10 +247,19 @@ function ConnectWallet(props) {
     } else {
       // show QR code if wallet connect v2 is supported
       if (button.hasWalletConnect) {
+        // In account-linking picker mode, hand off to the WC v2 account-linking flow in
+        // modalManager (via the picker resolver in onExternalWalletLogin) instead of showing
+        // the regular inline QR — the regular QR uses a connector owned by the login flow,
+        // which is not what we want for linking.
+        if (modalState.accountLinking.pickerActive) {
+          handleExternalWalletClick({
+            connector: button.name
+          });
+          return;
+        }
         setSelectedButton(button);
         setSelectedWallet(true);
         setCurrentPage(CONNECT_WALLET_PAGES.SELECTED_WALLET);
-        handleWalletDetailsHeight();
       } else {
         // otherwise, show install links
         setBodyState(_objectSpread(_objectSpread({}, bodyState), {}, {
@@ -237,13 +289,14 @@ function ConnectWallet(props) {
     return false;
   }, [selectedWallet, isExternalWalletModeOnly]);
   return /*#__PURE__*/jsxs("div", {
-    className: "w3a--relative w3a--flex w3a--flex-1 w3a--flex-col w3a--gap-y-4",
+    className: "wta:relative wta:flex wta:flex-1 wta:flex-col wta:gap-y-4",
     children: [/*#__PURE__*/jsx(ConnectWalletHeader, {
       hideBackButton: hideBackButton,
       disableBackButton: disableBackButton,
       onBackClick: handleBack,
       currentPage: currentPage,
-      selectedButton: selectedButton
+      selectedButton: selectedButton,
+      isLinking: modalState.accountLinking.pickerActive
     }), selectedWallet ? /*#__PURE__*/jsx(ConnectWalletQrCode, {
       qrCodeValue: qrCodeValue,
       isDark: isDark,
@@ -252,19 +305,17 @@ function ConnectWallet(props) {
       logoImage: `https://images.web3auth.io/login-${selectedButton.name}.${selectedButton.imgExtension}`,
       platform: deviceDetails.platform
     }) : /*#__PURE__*/jsxs("div", {
-      className: "w3a--flex w3a--flex-col w3a--gap-y-2",
-      children: [chainNamespace.length > 1 && /*#__PURE__*/jsx(ConnectWalletChainFilter, {
+      className: "wta:flex wta:flex-col wta:gap-y-2",
+      children: [/*#__PURE__*/jsx(ConnectWalletChainFilter, {
         isDark: isDark,
         isLoading: isLoading,
         selectedChain: selectedChain,
-        setSelectedChain: handleChainFilterChange,
-        chainNamespace: chainNamespace
+        setSelectedChain: handleChainFilterChange
       }), /*#__PURE__*/jsx(ConnectWalletSearch, {
         totalExternalWalletCount: totalExternalWalletsCount,
         isLoading: isLoading,
         walletSearch: walletSearch,
-        handleWalletSearch: handleWalletSearch,
-        buttonRadius: buttonRadius
+        handleWalletSearch: handleWalletSearch
       }), /*#__PURE__*/jsx(ConnectWalletList, {
         externalButtons: externalButtons,
         isLoading: isLoading,
@@ -273,9 +324,7 @@ function ConnectWallet(props) {
         handleWalletClick: handleWalletClick,
         handleMoreWallets: handleMoreWallets,
         isDark: isDark,
-        deviceDetails: deviceDetails,
         walletConnectUri: walletConnectUri,
-        buttonRadius: buttonRadius,
         isShowAllWallets: isShowAllWallets
       })]
     })]