@multiplatform.one/web3 7.19.0 → 7.20.0

package/src/connectkit/hooks/useConnectors.ts

@@ -35,16 +35,6 @@ export function useInjectedConnector(uuid?: string) {
   */
   return useConnector("injected", uuid);
 }
-export function useWalletConnectConnector() {
-  /*
-  options: {
-    qrcode: false,
-    // or
-    showQrModal: false,
-  }
-  */
-  return useConnector("walletConnect");
-}
 export function useCoinbaseWalletConnector() {
   /*
   options: {

package/src/connectkit/index.ts

@@ -4,6 +4,10 @@ export { Types } from "@multiplatform.one/connectkit";
 export { default as getDefaultConfig } from "./defaultConfig";
 export { default as getDefaultConnectors } from "./defaultConnectors";
 export { wallets } from "./wallets";
+export {
+  metaMaskConnect,
+  type MetaMaskConnectParameters,
+} from "./connectors/metaMaskConnectConnector";
 
 // web3's wrapper (generic connectkit useModal + wallet/SIWE openers) keeps the
 // consumer-facing `useModal` API. The agnostic base lives in ./hooks/useModal.

package/src/connectkit/screens.tsx

@@ -12,7 +12,6 @@ import { ProfileSiweHeaderAction } from "./profileHeaderAction";
 import Onboarding from "./components/Pages/Onboarding";
 import About from "./components/Pages/About";
 import Connectors from "./components/Pages/Connectors";
-import MobileConnectors from "./components/Pages/MobileConnectors";
 import ConnectUsing from "./components/ConnectModal/ConnectUsing";
 import DownloadApp from "./components/Pages/DownloadApp";
 import Profile from "./components/Pages/Profile";
@@ -41,10 +40,6 @@ export type Web3ModalState = ModalState & {
   locales?: Record<string, string>;
   /** Display name of the connector currently being connected. */
   walletName?: string;
-  /** Whether the connect screen is showing a QR code (vs the injector flow). */
-  useQrcode?: boolean;
-  /** Whether the active connector is WalletConnect. */
-  isWalletConnect?: boolean;
 };
 
 const l = (s: ModalState, key: string): string => (s as Web3ModalState).locales?.[key] ?? "";
@@ -75,25 +70,10 @@ export const web3Screens: readonly ScreenDef[] = [
     availableWhen: (s) => !s.connected,
     onBack: (api) => api.setRoute(routes.CONNECTORS),
   },
-  {
-    id: routes.MOBILECONNECTORS,
-    component: MobileConnectors,
-    heading: (s) => l(s, "mobileConnectorsScreen_heading"),
-    availableWhen: (s) => !s.connected,
-    onBack: (api) => api.setRoute(routes.CONNECTORS),
-  },
   {
     id: routes.CONNECT,
     component: ConnectUsing,
-    heading: (s) => {
-      const st = s as Web3ModalState;
-      if (st.useQrcode) {
-        return st.isWalletConnect
-          ? l(s, "scanScreen_heading")
-          : l(s, "scanScreen_heading_withConnector");
-      }
-      return st.walletName ?? "";
-    },
+    heading: (s) => (s as Web3ModalState).walletName ?? "",
     // Reached internally (after picking a connector), never via openScreen.
     availableWhen: () => false,
     onBack: (api) => api.setRoute(routes.CONNECTORS),

package/src/connectkit/siwe/SIWEProvider.spec.tsx

@@ -7,7 +7,7 @@ import { getBase58Decoder } from "@solana/kit";
 
 const { mockUseAccount, mockSignMessageAsync } = vi.hoisted(() => ({
   mockUseAccount: vi.fn(),
-  mockSignMessageAsync: vi.fn(),
+  mockSignMessageAsync: vi.fn(async () => "0xsigned"),
 }));
 
 vi.mock("wagmi", () => ({
@@ -21,12 +21,38 @@ vi.mock("@multiplatform.one/connectkit", () => ({
   isWalletConnector: (c?: { type?: string }) => c?.type === "wallet",
 }));
 
-import { SIWEContext } from "./SIWEContext";
+import { SIWEContext, type SIWEContextValue } from "./SIWEContext";
 import { SIWEProvider } from "./SIWEProvider";
 
+const evmAddress = "0x0000000000000000000000000000000000000001";
 const solanaAddress = getBase58Decoder().decode(new Uint8Array(32).fill(7));
 const b64 = (s: string) => window.btoa(unescape(encodeURIComponent(s)));
 
+function renderSignIn() {
+  const createMessage = vi.fn(({ chainId }: { chainId: number }) => `sign in on ${chainId}`);
+  const onSign = vi.fn(() => true);
+  let ctx: SIWEContextValue | null = null;
+  const Probe = () => {
+    ctx = useContext(SIWEContext);
+    return null;
+  };
+  render(
+    <QueryClientProvider client={new QueryClient()}>
+      <SIWEProvider
+        getNonce={async () => "nonce123"}
+        createMessage={createMessage}
+        verifyMessage={async () => true}
+        getSession={async () => null}
+        signOut={async () => true}
+        onSign={onSign}
+      >
+        <Probe />
+      </SIWEProvider>
+    </QueryClientProvider>,
+  );
+  return { createMessage, onSign, ctx: () => ctx! };
+}
+
 function signInWith(connector: object, address: string, chainId: number) {
   mockUseAccount.mockReturnValue({ address, chain: { id: chainId }, connector });
   const onSign = vi.fn(async () => undefined);
@@ -63,6 +89,48 @@ function signInWith(connector: object, address: string, chainId: number) {
   };
 }
 
+describe("SIWEProvider signIn", () => {
+  beforeEach(() => vi.clearAllMocks());
+
+  it("signs with the connected chain id when the wallet sits on a chain the config does not list", async () => {
+    // MetaMask on Base while the config lists mainnet/polygon: wagmi reports the
+    // connection's chainId but no `chain` object.
+    mockUseAccount.mockReturnValue({ address: evmAddress, chain: undefined, chainId: 8453 });
+    const { createMessage, onSign, ctx } = renderSignIn();
+    await waitFor(() => expect(ctx().nonce.data).toBe("nonce123"));
+
+    let result: unknown;
+    await act(async () => {
+      result = await ctx().signIn();
+    });
+
+    expect(createMessage).toHaveBeenCalledWith({
+      address: evmAddress,
+      chainId: 8453,
+      nonce: "nonce123",
+    });
+    expect(mockSignMessageAsync).toHaveBeenCalledWith({ message: "sign in on 8453" });
+    expect(onSign).toHaveBeenCalledOnce();
+    expect(result).not.toBe(false);
+  });
+
+  it("uses the configured chain when wagmi knows it", async () => {
+    mockUseAccount.mockReturnValue({ address: evmAddress, chain: { id: 137 }, chainId: 137 });
+    const { createMessage, ctx } = renderSignIn();
+    await waitFor(() => expect(ctx().nonce.data).toBe("nonce123"));
+
+    await act(async () => {
+      await ctx().signIn();
+    });
+
+    expect(createMessage).toHaveBeenCalledWith({
+      address: evmAddress,
+      chainId: 137,
+      nonce: "nonce123",
+    });
+  });
+});
+
 describe("SIWEProvider signing", () => {
   beforeEach(() => vi.clearAllMocks());
 

package/src/connectkit/siwe/SIWEProvider.tsx

@@ -90,13 +90,13 @@ export const SIWEProvider = ({
     },
   });
 
-  const { address, chain, connector } = useAccount();
+  const { address, chain, chainId: connectedChainId, connector } = useAccount();
   const { signMessageAsync } = useSignMessage();
 
   const onError = (error: any) => {
     console.error("signIn error", error, error.message);
     switch (error.code) {
-      case -32000: // WalletConnect: user rejected
+      case -32000: // user rejected, as some wallets report it
       case 4001: // MetaMask: user rejected
       case "ACTION_REJECTED": // MetaMask: user rejected
         setStatus(StatusState.REJECTED);
@@ -112,7 +112,9 @@ export const SIWEProvider = ({
         throw new Error("SIWE not configured");
       }
 
-      const chainId = chain?.id;
+      // `chain` is undefined when the wallet sits on a network the config does not
+      // list (MetaMask on Base or BSC); the message still names the chain it signs on.
+      const chainId = chain?.id ?? connectedChainId;
       if (!address) throw new Error("No address found");
       if (!chainId) throw new Error("No chainId found");
 

package/src/connectkit/wallets/index.ts

@@ -1,16 +1,19 @@
 import { CreateConnectorFn } from "wagmi";
-import { injected } from "@wagmi/connectors";
+import { injected } from "@wagmi/connectors/injected";
 
 import { walletConfigs } from "./walletConfigs";
 
 type WalletIds = Extract<keyof typeof walletConfigs, string>;
 
+// Injected connectors for the browser-extension wallets the modal knows by name.
+// MetaMask is left out: it connects through metaMaskConnect.
 export const wallets: {
   [key: WalletIds]: CreateConnectorFn;
 } = Object.keys(walletConfigs).reduce((acc, key) => {
   const config = walletConfigs[key];
-  if (!config?.getWalletConnectDeeplink) return acc;
+  if (!config?.name || !config.downloadUrls) return acc;
   const target = key.split(",")[0].trim();
+  if (target === "injected" || target.toLowerCase().startsWith("metamask")) return acc;
   const flag =
     config.name?.replace("Wallet", "").replace(" ", "") ??
     target[0].toUpperCase() + target.slice(1);

package/src/connectkit/wallets/useWallets.tsx

@@ -2,7 +2,6 @@ import { Connector } from "wagmi";
 
 import { useConnectors } from "../hooks/useConnectors";
 import { walletConfigs, WalletConfigProps } from "./walletConfigs";
-import { useContext } from "@multiplatform.one/connectkit";
 import {
   isCoinbaseWalletConnector,
   isInjectedConnector,
@@ -27,7 +26,6 @@ export const useWallet = (id: string): WalletProps | null => {
 };
 export const useWallets = (): WalletProps[] => {
   const connectors = useConnectors();
-  const context = useContext();
 
   const wallets = connectors.map((connector): WalletProps => {
     // use overrides
@@ -51,7 +49,7 @@ export const useWallets = (): WalletProps[] => {
         connector.type === "mock" ||
         connector.type === "wallet" || // non-EVM wallets are only listed when detected present
         (connector.type === "injected" && connector.id !== "metaMask") ||
-        isMetaMaskConnector(connector.id) || // always run the MetaMask SDK (extension, mobile deeplink, or SDK modal)
+        isMetaMaskConnector(connector.id) || // always run MetaMask Connect (extension, mobile deeplink, or its install modal)
         isCoinbaseWalletConnector(connector.id), // always run coinbase wallet SDK
     };
 
@@ -73,17 +71,6 @@ export const useWallets = (): WalletProps[] => {
     wallets
       // remove duplicate ids
       .filter((wallet, index, self) => self.findIndex((w) => w.id === wallet.id) === index)
-      // Replace walletConnect's name with the one from options
-      .map((wallet) => {
-        if (wallet.id === "walletConnect") {
-          return {
-            ...wallet,
-            name: context.options?.walletConnectName || wallet.name,
-            shortName: context.options?.walletConnectName || wallet.shortName,
-          };
-        }
-        return wallet;
-      })
       // remove wallet with id coinbaseWalletSDK if wallet with id 'com.coinbase.wallet' exists
       .filter(
         (wallet, _index, self) =>
@@ -106,11 +93,5 @@ export const useWallets = (): WalletProps[] => {
         if (!AisInstalled && BisInstalled) return 1;
         return 0;
       })
-      // move walletConnect to the end
-      .sort((a, b) => {
-        if (a.id === "walletConnect") return 1;
-        if (b.id === "walletConnect") return -1;
-        return 0;
-      })
   );
 };

package/src/connectkit/wallets/walletConfigs.tsx

@@ -1,4 +1,4 @@
-import { Logos, isAndroid } from "@multiplatform.one/connectkit";
+import { Logos } from "@multiplatform.one/connectkit";
 
 /**
  * EIP-6963: Multi Injected Provider Discovery
@@ -37,9 +37,6 @@ export type WalletConfigProps = {
     edge?: string;
     safari?: string;
   };
-  // Create URI for QR code, where uri is encoded data from WalletConnect
-  getWalletConnectDeeplink?: (uri: string) => string;
-  shouldDeeplinkDesktop?: boolean;
 };
 
 // Simple branded fallback icon (colored square + glyph) for wallets without a
@@ -70,8 +67,7 @@ export const walletConfigs: {
     icon: <Logos.Mock />,
   },
   // wallet non-EVM wallets (Solana / Sui / Bitcoin). Keyed by the shim-connector ids
-  // from adapters/discover.ts. No getWalletConnectDeeplink → routed to the injector
-  // page (these are injected/extension wallets, not WalletConnect). `name` is
+  // from adapters/discover.ts; they are injected/extension wallets. `name` is
   // intentionally omitted so the connector's detected name is preserved.
   "wallet:solana:phantom, wallet:bitcoin:phantom": {
     icon: <Logos.Phantom />,
@@ -108,9 +104,6 @@ export const walletConfigs: {
       android: "https://play.google.com/store/apps/details?id=im.argent.contractwalletclient",
       ios: "https://apps.apple.com/app/argent/id1358741926",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return isAndroid() ? uri : `https://argent.link/app/wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   "coinbaseWallet, coinbaseWalletSDK": {
     name: "Coinbase Wallet",
@@ -125,9 +118,6 @@ export const walletConfigs: {
       chrome:
         "https://chrome.google.com/webstore/detail/coinbase-wallet-extension/hnfanknocfeofbddgcijnmhnfnkdnaad",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return `https://go.cb-w.com/wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   "com.coinbase.wallet": {
     name: "Coinbase Wallet",
@@ -142,9 +132,6 @@ export const walletConfigs: {
       chrome:
         "https://chrome.google.com/webstore/detail/coinbase-wallet-extension/hnfanknocfeofbddgcijnmhnfnkdnaad",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return `https://go.cb-w.com/wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   "com.crypto.wallet": {
     name: "Crypto.com",
@@ -172,7 +159,6 @@ export const walletConfigs: {
       brave:
         "https://chrome.google.com/webstore/detail/frame-companion/ldcoohedfbjoobcadoglnnmmfbdlmmhf",
     },
-    getWalletConnectDeeplink: (uri: string) => uri,
   },
   frontier: {
     name: "Frontier Wallet",
@@ -186,9 +172,6 @@ export const walletConfigs: {
       chrome:
         "https://chrome.google.com/webstore/detail/frontier-wallet/kppfdiipphfccemcignhifpjkapfbihd",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return isAndroid() ? uri : `frontier://wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   injected: {
     name: "Browser Wallet",
@@ -210,10 +193,6 @@ export const walletConfigs: {
       brave: "https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn",
       edge: "https://microsoftedge.microsoft.com/addons/detail/metamask/ejbalbakoplchlghecdalmeeeajnimhm",
     },
-    // NO getWalletConnectDeeplink: MetaMask must NEVER ride WalletConnect.
-    // The metaMaskSDK connector deep-links via its own transport in connect();
-    // every MetaMask-over-WC path keyed off this one config function
-    // (ConnectorItem's anchor, ConnectUsing's QR predicate, MobileConnectors).
   },
   "app.phantom": {
     name: "Phantom",
@@ -234,11 +213,6 @@ export const walletConfigs: {
       edge: "https://rainbow.me/extension?utm_source=connectkit",
       brave: "https://rainbow.me/extension?utm_source=connectkit",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return isAndroid()
-        ? uri
-        : `https://rnbwapp.com/wc?uri=${encodeURIComponent(uri)}&connector=connectkit`;
-    },
   },
   "io.rabby": {
     name: "Rabby Wallet",
@@ -258,9 +232,6 @@ export const walletConfigs: {
       ios: "https://apps.apple.com/app/id1515759131",
       android: "https://play.google.com/store/apps/details?id=io.gnosis.safe",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return isAndroid() ? uri : `https://gnosis-safe.io/wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   "xyz.talisman": {
     name: "Talisman",
@@ -284,9 +255,6 @@ export const walletConfigs: {
       android: "https://play.google.com/store/apps/details?id=com.wallet.crypto.trustapp",
       ios: "https://apps.apple.com/app/trust-crypto-bitcoin-wallet/id1288339409",
     },
-    getWalletConnectDeeplink(uri) {
-      return isAndroid() ? uri : `https://link.trustwallet.com/wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   infinityWallet: {
     name: "Infinity Wallet",
@@ -309,9 +277,6 @@ export const walletConfigs: {
       android: "https://play.google.com/store/apps/details?id=im.token.app",
       ios: "https://itunes.apple.com/us/app/imtoken2/id1384798940",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return `imtokenv2://wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   unstoppable: {
     name: "Unstoppable",
@@ -321,9 +286,6 @@ export const walletConfigs: {
       ios: "https://apps.apple.com/app/bank-bitcoin-wallet/id1447619907",
       android: "https://play.google.com/store/apps/details?id=io.horizontalsystems.bankwallet",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return isAndroid() ? uri : `https://unstoppable.money/wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   onto: {
     name: "ONTO",
@@ -334,9 +296,6 @@ export const walletConfigs: {
       android: "https://play.google.com/store/apps/details?id=com.github.ontio.onto",
       website: "https://onto.app/en/download/",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return isAndroid() ? uri : `https://onto.app/wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   steak: {
     name: "Steak",
@@ -347,9 +306,6 @@ export const walletConfigs: {
       ios: "https://apps.apple.com/app/steakwallet/id1569375204",
       website: "https://steakwallet.fi/download",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return isAndroid() ? uri : `https://links.steakwallet.fi/wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   ledger: {
     name: "Ledger Live",
@@ -361,10 +317,6 @@ export const walletConfigs: {
       android: "https://play.google.com/store/apps/details?id=com.ledger.live",
       ios: "https://apps.apple.com/app/ledger-live-web3-wallet/id1361671700",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return isAndroid() ? uri : `ledgerlive://wc?uri=${encodeURIComponent(uri)}`;
-    },
-    shouldDeeplinkDesktop: true,
   },
   zerion: {
     name: "Zerion",
@@ -375,9 +327,6 @@ export const walletConfigs: {
       android: "https://play.google.com/store/apps/details?id=io.zerion.android",
       website: "https://zerion.io/",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return isAndroid() ? uri : `https://app.zerion.io/wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   slope: {
     name: "Slope",
@@ -390,9 +339,6 @@ export const walletConfigs: {
         "https://chrome.google.com/webstore/detail/slope-wallet/pocmplpaccanhmnllbbkpgfliimjljgo",
       website: "https://slope.finance/",
     },
-    getWalletConnectDeeplink: (uri: string) => {
-      return isAndroid() ? uri : `https://slope.finance/app/wc?uri=${encodeURIComponent(uri)}`;
-    },
   },
   tokenPocket: {
     name: "TokenPocket Wallet",
@@ -417,12 +363,4 @@ export const walletConfigs: {
       firefox: "https://addons.mozilla.org/en-US/firefox/addon/talisman-wallet-extension/",
     },
   },
-  walletConnect: {
-    name: "Other Wallets",
-    shortName: "Other",
-    icon: <Logos.WalletConnect background />,
-    iconConnector: <Logos.OtherWallets />,
-    iconShape: "square",
-    getWalletConnectDeeplink: (uri: string) => uri,
-  },
 } as const;

package/src/connectkit/web3Bridge.tsx

@@ -1,13 +1,7 @@
 import React, { useContext as useReactContext, useEffect, useMemo } from "react";
 import { useAccount, useAccountEffect, useConfig } from "wagmi";
 
-import {
-  ModalState,
-  ModalStateProvider,
-  routes,
-  useContext,
-  isWalletConnectConnector,
-} from "@multiplatform.one/connectkit";
+import { ModalState, ModalStateProvider, routes, useContext } from "@multiplatform.one/connectkit";
 import { Web3ContextProvider } from "./components/contexts/web3";
 import { Web3ScreenRegistrar } from "./screens";
 import { ensureWalletConnectors } from "./connectors/ensureWalletConnectors";
@@ -53,9 +47,8 @@ export const Web3ModalBridge: React.FC<Web3ModalBridgeProps> = ({
   const signInWithGpg = useReactContext(GpgContext)?.enabled ?? false;
   const { isSignedIn } = useSIWESignedIn();
 
-  // Wallet-derived bits the modal headings need (which connector, QR vs injector).
+  // The connector name the connect screen's heading shows.
   const wallet = useWallet(context.connector?.id ?? "");
-  const useQrcode = wallet ? !(!wallet.getWalletConnectDeeplink || wallet.isInstalled) : false;
 
   // wallet: wallet extensions (notably UniSat) inject their window globals AFTER the
   // wagmi config is built, so getDefaultConfig's one-shot discovery misses them and
@@ -122,22 +115,12 @@ export const Web3ModalBridge: React.FC<Web3ModalBridgeProps> = ({
       signInWithEthereum,
       signInWithGpg,
       walletName: wallet?.name,
-      useQrcode,
-      isWalletConnect: isWalletConnectConnector(wallet?.connector?.id),
     }),
-    [
-      isConnected,
-      chainIsSupported,
-      isSignedIn,
-      signInWithEthereum,
-      signInWithGpg,
-      wallet,
-      useQrcode,
-    ],
+    [isConnected, chainIsSupported, isSignedIn, signInWithEthereum, signInWithGpg, wallet],
   );
 
   return (
-    <Web3ContextProvider enabled={context.open}>
+    <Web3ContextProvider>
       <Web3ScreenRegistrar />
       <ModalStateProvider value={modalState}>
         <ConnectorLauncherProvider>{children}</ConnectorLauncherProvider>

package/src/esbuild.ts

@@ -0,0 +1,42 @@
+import { readFile } from "node:fs/promises";
+
+import { createMetaMaskConnectTimeoutTracker } from "./bundler/metaMaskConnectTimeouts";
+
+type OnLoadArgs = { path: string };
+type OnLoadResult = { contents: string; loader: "js" } | undefined;
+type EsbuildMessage = { text: string };
+
+/** The part of esbuild's PluginBuild this plugin uses. */
+export type MetaMaskConnectTimeoutsEsbuildBuild = {
+  onLoad(options: { filter: RegExp }, callback: (args: OnLoadArgs) => Promise<OnLoadResult>): void;
+  onEnd(callback: () => { errors: EsbuildMessage[] } | undefined): void;
+};
+
+/**
+ * esbuild counterpart of `@multiplatform.one/web3/vite`'s metaMaskConnectTimeouts:
+ * raises MetaMask Connect's relay timers to ten minutes in a bundle that carries
+ * the wallet modal, and fails the build if it bundles MetaMask Connect with a
+ * timer left short.
+ */
+export function metaMaskConnectTimeoutsEsbuild() {
+  return {
+    name: "mpo-web3:metamask-connect-timeouts",
+    setup(build: MetaMaskConnectTimeoutsEsbuildBuild) {
+      const tracker = createMetaMaskConnectTimeoutTracker();
+      build.onLoad(
+        {
+          filter:
+            /[\\/]@metamask[\\/](connect-evm|connect-multichain|mobile-wallet-protocol-dapp-client)[\\/].*\.[cm]?js$/,
+        },
+        async (args) => {
+          const result = tracker.patch(args.path, await readFile(args.path, "utf8"));
+          return result ? { contents: result.code, loader: "js" } : undefined;
+        },
+      );
+      build.onEnd(() => {
+        const problem = tracker.problem();
+        return problem ? { errors: [{ text: problem }] } : undefined;
+      });
+    },
+  };
+}

package/src/hooks/useWallet.spec.ts

@@ -76,30 +76,21 @@ describe("useWallet", () => {
 
   it("connect() prefers injected connector", () => {
     const injected = { id: "injected" };
-    const wc = { id: "walletConnect" };
+    const metaMask = { id: "metaMaskSDK" };
     const other = { id: "other" };
-    mockUseConnect.mockReturnValue({ connect: mockConnect, connectors: [other, wc, injected] });
-
-    const { result } = renderHook(() => useWallet());
-    act(() => {
-      result.current.connect();
+    mockUseConnect.mockReturnValue({
+      connect: mockConnect,
+      connectors: [other, metaMask, injected],
     });
-    expect(mockConnect).toHaveBeenCalledWith({ connector: injected });
-  });
-
-  it("connect() prefers walletConnect when no injected connector", () => {
-    const wc = { id: "walletConnect" };
-    const other = { id: "other" };
-    mockUseConnect.mockReturnValue({ connect: mockConnect, connectors: [other, wc] });
 
     const { result } = renderHook(() => useWallet());
     act(() => {
       result.current.connect();
     });
-    expect(mockConnect).toHaveBeenCalledWith({ connector: wc });
+    expect(mockConnect).toHaveBeenCalledWith({ connector: injected });
   });
 
-  it("connect() falls back to first connector when no injected or walletConnect", () => {
+  it("connect() falls back to first connector when no injected connector", () => {
     const other = { id: "other" };
     mockUseConnect.mockReturnValue({ connect: mockConnect, connectors: [other] });
 

package/src/hooks/useWallet.ts

@@ -53,8 +53,7 @@ export function useWallet(): UseWalletResult {
 
   const handleConnect = useCallback(() => {
     const injectedConnector = connectors.find((c) => c.id === "injected");
-    const wcConnector = connectors.find((c) => c.id === "walletConnect");
-    const connector = injectedConnector || wcConnector || connectors[0];
+    const connector = injectedConnector || connectors[0];
 
     if (connector) {
       connect({ connector });

package/src/providers/WalletProvider.native.tsx

@@ -98,7 +98,7 @@ export function WalletProvider({
   }, [bridge]);
 
   // Inbound app-link returns from a wallet app: forward the params into the
-  // WebView (the mock-wallet path consumes address/signature; real WalletConnect
+  // WebView (the mock-wallet path consumes address/signature; a real wallet
   // just needs the resync that AppState already triggers).
   useEffect(() => {
     const handle = (url: string | null) => {

package/src/providers/WalletProvider.tsx

@@ -15,11 +15,10 @@ export interface WalletProviderProps extends PropsWithChildren {
 
 const defaultQueryClient = new QueryClient();
 
-// wagmi/WalletConnect Core must be initialized exactly once per process. useMemo
-// only dedupes within a single component instance, so a provider remount (e.g.
-// React StrictMode double-invoke, or a route transition) rebuilds the config and
-// re-inits WalletConnect ("WalletConnect Core is already initialized" Nx). Cache
-// the created config at module scope keyed by its inputs so it survives remounts.
+// Build the wagmi config once per process. useMemo only dedupes within a single
+// component instance, so a provider remount (e.g. React StrictMode double-invoke,
+// or a route transition) would rebuild the config and set its connectors up again.
+// Cache the created config at module scope keyed by its inputs so it survives remounts.
 type WagmiConfigResult = ReturnType<typeof createConfig>;
 const wagmiConfigCache = new Map<string, WagmiConfigResult>();
 
@@ -55,7 +54,6 @@ export function WalletProvider({
       appDescription,
       appUrl,
       appIcon,
-      walletConnectProjectId,
       chainIds,
       localnetRpcUrl,
       mockWallet,
@@ -84,7 +82,7 @@ export function WalletProvider({
     const created = createConfig(defaultConfig);
     wagmiConfigCache.set(cacheKey, created);
     return created;
-  }, [appName, appDescription, appUrl, appIcon, walletConnectProjectId, activeChains, mockWallet]);
+  }, [appName, appDescription, appUrl, appIcon, activeChains, mockWallet]);
 
   return (
     <Web3ConfigContext.Provider value={web3Config}>

package/src/providers/mockConnector.ts

@@ -7,8 +7,8 @@ import { createConnector } from "wagmi";
  * web WalletProvider when `config.mockWallet === true` (production never sets
  * that flag). Backed by an ephemeral runtime key (no secret shipped) and
  * produces REAL, verifiable signatures, so a headless browser can exercise the
- * whole connect → sign → SIWE → Keycloak round-trip with no MetaMask /
- * WalletConnect / extension.
+ * whole connect → sign → SIWE → Keycloak round-trip with no MetaMask or
+ * extension.
  *
  * This is the web `src/` analogue of webview/wiring/mockWallet.ts (which serves
  * the isolated WebView build); kept here so the native import graph stays clean.