Fix showQrModal option not respected on desktop web

Author: joaquim-verges

.changeset/social-dogs-bet.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Fix showQrModal option not respected on desktop web

apps/playground-web/src/app/wallets/sign-in/headless/page.tsx

@@ -77,7 +77,7 @@ import { shortenAddress } from "thirdweb/utils";
 function App() {
   const account = useActiveAccount();
   const wallet = useActiveWallet();
-  const { connect, isConnecting, error } = useConnect();
+  const { connect, isConnecting, error, cancelConnection } = useConnect();
   const { disconnect } = useDisconnect();
 
   if (account) {
@@ -99,7 +99,14 @@ function App() {
         connect(async () => {
           // 500+ wallets supported with id autocomplete
           const wallet = createWallet("io.metamask");
-          await wallet.connect({ client });
+          const isInstalled = !!injectedProvider("io.metamask");
+          await wallet.connect({ client, ...(isInstalled ? {} : {
+            walletConnect: {
+              // if not installed, show qr modal
+              showQrModal: true,
+              onCancel: () => {
+                cancelConnection();
+          }) });
           return wallet;
         })
       }

apps/playground-web/src/components/sign-in/hooks.tsx

@@ -6,7 +6,7 @@ import {
   useDisconnect,
 } from "thirdweb/react";
 import { shortenAddress } from "thirdweb/utils";
-import { createWallet } from "thirdweb/wallets";
+import { createWallet, injectedProvider } from "thirdweb/wallets";
 import { THIRDWEB_CLIENT } from "../../lib/client";
 import { Button } from "../ui/button";
 
@@ -21,6 +21,17 @@ export function HooksPreview() {
       const adminWallet = createWallet("io.metamask");
       await adminWallet.connect({
         client: THIRDWEB_CLIENT,
+        ...(injectedProvider("io.metamask")
+          ? {}
+          : {
+              walletConnect: {
+                showQrModal: true,
+                onCancel: () => {
+                  console.log("onCancel");
+                  connectMutation.cancelConnection();
+                },
+              },
+            }),
       });
       return adminWallet;
     });

apps/playground-web/src/components/sign-in/modal.tsx

@@ -54,7 +54,6 @@ export function ModalPreview({ enableAuth }: { enableAuth?: boolean }) {
       auth: enableAuth ? playgroundAuth : undefined,
       client: THIRDWEB_CLIENT,
     });
-    console.log("connected", wallet);
     return wallet;
   };
 

packages/thirdweb/package.json

@@ -36,6 +36,7 @@
     "ora": "8.2.0",
     "ox": "0.7.0",
     "prompts": "2.4.2",
+    "qrcode": "1.5.3",
     "toml": "3.0.0",
     "uqr": "0.1.2",
     "viem": "2.28.1",

packages/thirdweb/src/react/core/hooks/wallets/useConnect.ts

@@ -79,5 +79,15 @@ export function useConnect(options?: ConnectManagerOptions) {
     [connect, options, setConnectionStatus],
   );
 
-  return { connect: handleConnection, error, isConnecting } as const;
+  const cancelConnection = useCallback(() => {
+    setIsConnecting(false);
+    setConnectionStatus("disconnected");
+  }, [setConnectionStatus]);
+
+  return {
+    connect: handleConnection,
+    error,
+    isConnecting,
+    cancelConnection,
+  } as const;
 }

packages/thirdweb/src/wallets/create-wallet.ts

@@ -17,6 +17,7 @@ import { inAppWallet } from "./in-app/web/in-app.js";
 import { getInjectedProvider } from "./injected/index.js";
 import type { Account, Wallet } from "./interfaces/wallet.js";
 import { smartWallet } from "./smart/smart-wallet.js";
+import type { QROverlay } from "./wallet-connect/qr-overlay.js";
 import type { WCConnectOptions } from "./wallet-connect/types.js";
 import { createWalletEmitter } from "./wallet-emitter.js";
 import type {
@@ -299,30 +300,90 @@ export function createWallet<const ID extends WalletId>(
               "./wallet-connect/controller.js"
             );
 
-            const [
-              connectedAccount,
-              connectedChain,
-              doDisconnect,
-              doSwitchChain,
-            ] = await connectWC(
-              wcOptions,
-              emitter,
-              wallet.id as WCSupportedWalletIds | "walletConnect",
-              webLocalStorage,
-              sessionHandler,
-            );
-            // set the states
-            account = connectedAccount;
-            chain = connectedChain;
-            handleDisconnect = doDisconnect;
-            handleSwitchChain = doSwitchChain;
-            trackConnect({
-              chainId: chain.id,
-              client: wcOptions.client,
-              walletAddress: account.address,
-              walletType: id,
-            });
-            return account;
+            let qrOverlay: QROverlay | undefined;
+
+            try {
+              const [
+                connectedAccount,
+                connectedChain,
+                doDisconnect,
+                doSwitchChain,
+              ] = await connectWC(
+                {
+                  ...wcOptions,
+                  walletConnect: {
+                    ...wcOptions.walletConnect,
+                    onDisplayUri: wcOptions.walletConnect?.showQrModal
+                      ? async (uri) => {
+                          // Check if we're in a browser environment
+                          if (
+                            typeof window !== "undefined" &&
+                            typeof document !== "undefined"
+                          ) {
+                            try {
+                              const { createQROverlay } = await import(
+                                "./wallet-connect/qr-overlay.js"
+                              );
+
+                              // Clean up any existing overlay
+                              if (qrOverlay) {
+                                qrOverlay.destroy();
+                              }
+
+                              // Create new QR overlay
+                              qrOverlay = createQROverlay(uri, {
+                                theme:
+                                  wcOptions.walletConnect?.qrModalOptions
+                                    ?.themeMode ?? "dark",
+                                qrSize: 280,
+                                showCloseButton: true,
+                                onCancel: () => {
+                                  wcOptions.walletConnect?.onCancel?.();
+                                },
+                              });
+                            } catch (error) {
+                              console.error(
+                                "Failed to create QR overlay:",
+                                error,
+                              );
+                            }
+                          }
+                        }
+                      : undefined,
+                  },
+                },
+                emitter,
+                wallet.id as WCSupportedWalletIds | "walletConnect",
+                webLocalStorage,
+                sessionHandler,
+              );
+
+              // Clean up QR overlay on successful connection
+              if (qrOverlay) {
+                qrOverlay.destroy();
+                qrOverlay = undefined;
+              }
+
+              // set the states
+              account = connectedAccount;
+              chain = connectedChain;
+              handleDisconnect = doDisconnect;
+              handleSwitchChain = doSwitchChain;
+              trackConnect({
+                chainId: chain.id,
+                client: wcOptions.client,
+                walletAddress: account.address,
+                walletType: id,
+              });
+              return account;
+            } catch (error) {
+              // Clean up QR overlay on connection error
+              if (qrOverlay) {
+                qrOverlay.destroy();
+                qrOverlay = undefined;
+              }
+              throw error;
+            }
           }
 
           if (id === "walletConnect") {