Merge branch 'main' into chore/khizr-fixes-2-REOWN-4657

Author: 0xmkh

.changeset/expose-approved-networks.md

@@ -0,0 +1,30 @@
+---
+'@reown/appkit-utils': patch
+'@reown/appkit': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-cli': patch
+'@reown/appkit-codemod': patch
+'@reown/appkit-common': patch
+'@reown/appkit-core': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-pay': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-siwx': patch
+'@reown/appkit-testing': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-universal-connector': patch
+'@reown/appkit-wallet-button': patch
+'@reown/appkit-wallet': patch
+'@reown/appkit-controllers': patch
+'@reown/appkit-adapter-bitcoin': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-ton': patch
+'@reown/appkit-adapter-tron': patch
+'@reown/appkit-adapter-wagmi': patch
+---
+
+fix: persist the universal-link base as the WalletConnect deeplink choice when `experimental_preferUniversalLinks` is enabled, so session-request re-opens (handled by universal-provider) use the wallet's universal link instead of falling back to its native custom scheme

.changeset/fiery-carrots-grin.md

@@ -21,7 +21,7 @@ export default [
   {
     name: '@reown/appkit/react',
     path: 'packages/appkit/dist/esm/exports/react.js',
-    limit: '235 KB', // Current: ~222 KB (5% buffer)
+    limit: '236 KB', // Current: ~235 KB
     gzip: true
   },
   {

.changeset/prefer-universal-links-deeplink-choice.md

@@ -18,11 +18,15 @@ export function AppKitInfoMultiChain({
   )
   const solanaAdapter = config?.adapters?.find(adapter => adapter === 'solana')
   const bitcoinAdapter = config?.adapters?.find(adapter => adapter === 'bitcoin')
+  const tonAdapter = config?.adapters?.find(adapter => adapter === 'ton')
+  const tronAdapter = config?.adapters?.find(adapter => adapter === 'tron')
 
   const currentAccount = useAppKitAccount()
   const evmAccount = useAppKitAccount({ namespace: 'eip155' })
   const solanaAccount = useAppKitAccount({ namespace: 'solana' })
   const bitcoinAccount = useAppKitAccount({ namespace: 'bip122' })
+  const tonAccount = useAppKitAccount({ namespace: 'ton' })
+  const tronAccount = useAppKitAccount({ namespace: 'tron' })
 
   return (
     <>
@@ -35,6 +39,8 @@ export function AppKitInfoMultiChain({
         {evmAdapter && <AccountCard account={evmAccount} namespace="eip155" />}
         {solanaAdapter && <AccountCard account={solanaAccount} namespace="solana" />}
         {bitcoinAdapter && <AccountCard account={bitcoinAccount} namespace="bip122" />}
+        {tonAdapter && <AccountCard account={tonAccount} namespace="ton" />}
+        {tronAdapter && <AccountCard account={tronAccount} namespace="tron" />}
       </Grid>
       <Grid templateColumns={{ base: 'repeat(1, 1fr)', md: 'repeat(2, 1fr)' }} gap={4}>
         <AccountCard account={currentAccount} />

.changeset/tough-foxes-hunt.md

@@ -385,7 +385,7 @@ export const appKitConfigs = {
   // ----- Custom Variants ------------------------------
   'siwx-default': {
     ...commonAppKitConfig,
-    adapters: ['ethers', 'solana', 'bitcoin'],
+    adapters: ['ethers', 'solana', 'bitcoin', 'tron'],
     networks: ConstantsUtil.AllNetworks,
     siwx: new DefaultSIWX()
   },

.size-limit.js

@@ -924,30 +924,38 @@ export class ModalPage {
   }
 
   async clickOpenWebApp() {
-    let url = ''
-
     const openButton = this.page.getByTestId('w3m-connecting-widget-secondary-button')
     await expect(openButton).toBeVisible()
     await expect(openButton).toHaveText('Open')
 
-    while (!url) {
-      await openButton.click()
-      await this.page.waitForTimeout(500)
-
-      const pages = this.page.context().pages()
-
-      // Check if more than 1 tab is open
-      if (pages.length > 1) {
-        const lastTab = pages[pages.length - 1]
-
-        if (lastTab) {
-          url = lastTab.url()
-          break
-        }
+    /*
+     * Patch window.open to capture the URL synchronously at the moment AppKit
+     * calls it. Reading lastTab.url() after the click races against external
+     * redirects (e.g. some wallets' webapp_link points to chromewebstore.google.com
+     * which immediately redirects to a Google consent page, dropping the ?uri= param).
+     */
+    await this.page.evaluate(() => {
+      const original = window.open
+      ;(window as unknown as { __capturedOpenUrl: string }).__capturedOpenUrl = ''
+      window.open = function open(...args: Parameters<typeof window.open>) {
+        ;(window as unknown as { __capturedOpenUrl: string }).__capturedOpenUrl = String(
+          args[0] ?? ''
+        )
+
+        return original.apply(this, args)
       }
-    }
+    })
 
-    return url
+    await openButton.click()
+    await this.page.waitForFunction(
+      () => (window as unknown as { __capturedOpenUrl: string }).__capturedOpenUrl !== '',
+      undefined,
+      { timeout: 10_000 }
+    )
+
+    return this.page.evaluate(
+      () => (window as unknown as { __capturedOpenUrl: string }).__capturedOpenUrl
+    )
   }
 
   async search(value: string) {

apps/laboratory/src/components/AppKitInfoMultiChain.tsx

@@ -310,11 +310,22 @@ export class ModalValidator {
 
   async expectOpenButton({ disabled }: { disabled: boolean }) {
     const secondaryButton = this.page.getByTestId('w3m-connecting-widget-secondary-button')
-    if (disabled) {
-      await expect(secondaryButton).toHaveAttribute('disabled')
-    } else {
-      await expect(secondaryButton).not.toHaveAttribute('disabled')
-    }
+
+    await expect
+      .poll(
+        () =>
+          secondaryButton.evaluate((el: Element) => {
+            const btn = el.shadowRoot?.querySelector('button') as HTMLButtonElement | null
+            if (btn) {
+              return btn.disabled
+            }
+            const attr = el.getAttribute('disabled')
+
+            return attr !== null && attr !== 'false'
+          }),
+        { timeout: 60000 }
+      )
+      .toBe(disabled)
   }
 
   async expectTryAgainButton() {

apps/laboratory/src/constants/appKitConfigs.ts

@@ -0,0 +1,46 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>AppKit Headless (vanilla) Example</title>
+    <link rel="stylesheet" href="/src/main.css" />
+  </head>
+  <body>
+    <main class="page">
+      <h1 class="title">AppKit Headless — vanilla JS</h1>
+      <p class="subtitle">
+        A custom wallet modal driven entirely by the imperative AppKit client API (<code
+          >appKit.fetchWallets</code
+        >
+        / <code>getWalletList</code> / <code>subscribeWalletList</code> /
+        <code>connectWallet</code>) — no React, no AppKit modal.
+      </p>
+
+      <!-- Connected account -->
+      <section id="account" class="account" hidden>
+        <span id="account-address" class="account__address"></span>
+        <button id="disconnect" class="btn btn--outline">Disconnect</button>
+      </section>
+
+      <!-- Open the custom wallet modal -->
+      <button id="open" class="btn">Connect wallet</button>
+
+      <!-- Custom headless wallet modal -->
+      <div id="modal" class="modal" hidden>
+        <div class="modal__backdrop" data-close></div>
+        <div class="modal__card">
+          <div class="modal__header">
+            <h2>Select a wallet</h2>
+            <button class="modal__close" data-close>&times;</button>
+          </div>
+          <!-- Wallet list with infinite loading -->
+          <div id="wallet-list" class="wallet-list"></div>
+          <p id="list-status" class="wallet-list__status"></p>
+        </div>
+      </div>
+    </main>
+
+    <script type="module" src="/src/main.js"></script>
+  </body>
+</html>