fix: consolidated bug fixes batch

.size-limit.js

@@ -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
   },
   {

apps/laboratory/tests/shared/validators/ModalValidator.ts

@@ -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() {

packages/adapters/bitcoin/src/connectors/BitcoinWalletConnectConnector.ts

@@ -77,10 +77,11 @@ export class BitcoinWalletConnectConnector
 
   public async getAccountAddresses(): Promise<BitcoinConnector.AccountAddress[]> {
     this.checkIfMethodIsSupported('getAccountAddresses')
+    const account = this.getAccount(true)
 
     const addresses = await this.internalRequest({
       method: 'getAccountAddresses',
-      params: undefined
+      params: { account }
     })
 
     return addresses.map(address => ({ address, purpose: AddressPurpose.Payment }))
@@ -119,7 +120,7 @@ export class BitcoinWalletConnectConnector
   }
 
   public setDefaultChain(chainId: string) {
-    this.provider.setDefaultChain(chainId)
+    this.provider?.setDefaultChain(chainId)
   }
 
   // -- Private ------------------------------------------ //
@@ -210,6 +211,11 @@ export namespace WalletConnectProvider {
     memo?: string
   }
 
+  export type WCGetAccountAddressesParams = {
+    account: string
+    intentions?: string[]
+  }
+
   export type WCGetAccountAddressesResponse = {
     address: string
     publicKey: Uint8Array
@@ -240,7 +246,7 @@ export namespace WalletConnectProvider {
   export type RequestMethods = {
     signMessage: Request<WCSignMessageParams, WCSignMessageResponse>
     sendTransfer: Request<WCSendTransferParams, WCSendTransferResponse>
-    getAccountAddresses: Request<undefined, string[]>
+    getAccountAddresses: Request<WCGetAccountAddressesParams, string[]>
     signPsbt: Request<WCSignPSBTParams, WCSignPSBTResponse>
   }
 

packages/adapters/bitcoin/tests/utils/WalletConnectProvider.test.ts

@@ -197,6 +197,10 @@ describe('LeatherConnector', () => {
   describe('getAccountAddresses', () => {
     beforeEach(() => {
       universalProvider.session = mockUniversalProvider.mockSession()
+      vi.spyOn(ChainController, 'getAccountData').mockReturnValue({
+        caipAddress: `${bitcoin.caipNetworkId}:address`,
+        address: 'address'
+      } as unknown as AccountState)
     })
 
     it('should get the account addresses and parse response', async () => {
@@ -208,7 +212,7 @@ describe('LeatherConnector', () => {
       expect(requestSpy).toHaveBeenCalledWith(
         {
           method: 'getAccountAddresses',
-          params: undefined
+          params: { account: 'address' }
         },
         bitcoin.caipNetworkId
       )

packages/adapters/solana/src/providers/SolanaWalletConnectProvider.ts

@@ -232,7 +232,7 @@ export class SolanaWalletConnectProvider
   }
 
   public setDefaultChain(chainId: string) {
-    this.provider.setDefaultChain(chainId)
+    this.provider?.setDefaultChain(chainId)
   }
 
   // -- Private ------------------------------------------ //

packages/adapters/ton/src/connectors/TonWalletConnectConnector.ts

@@ -113,7 +113,7 @@ export class TonWalletConnectConnector
   }
 
   public setDefaultChain(chainId: string) {
-    this.provider.setDefaultChain(chainId)
+    this.provider?.setDefaultChain(chainId)
   }
 
   // -- Internals ----------------------------------------------------- //

packages/adapters/tron/src/connectors/TronWalletConnectConnector.ts

@@ -168,7 +168,7 @@ export class TronWalletConnectConnector
   }
 
   public setDefaultChain(chainId: string) {
-    this.provider.setDefaultChain(chainId)
+    this.provider?.setDefaultChain(chainId)
   }
 
   // -- Internals ----------------------------------------------------- //

packages/adapters/wagmi/src/client.ts

@@ -1086,6 +1086,14 @@ export class WagmiAdapter extends AdapterBlueprint {
   }
 
   private toChecksummedAddress(address: string) {
-    return checksumAddress(address.toLowerCase() as `0x${string}`)
+    if (!address) {
+      return address as `0x${string}`
+    }
+
+    try {
+      return checksumAddress(address.toLowerCase() as `0x${string}`)
+    } catch {
+      return address as `0x${string}`
+    }
   }
 }

packages/appkit/src/client/appkit-base-client.ts

@@ -1277,10 +1277,10 @@ export abstract class AppKitBaseClient {
           address,
           chainId: syncAccountChainId,
           chainNamespace
-        })
+        }).catch(() => null)
       } else if (!isActiveChain && syncAccountChainId) {
         this.syncAccountInfo(address, syncAccountChainId, chainNamespace)
-        this.syncBalance({ address, chainId: syncAccountChainId, chainNamespace })
+        this.syncBalance({ address, chainId: syncAccountChainId, chainNamespace }).catch(() => null)
       } else {
         this.syncAccountInfo(address, chainId, chainNamespace)
       }
@@ -1667,7 +1667,7 @@ export abstract class AppKitBaseClient {
         address,
         chainId,
         chainNamespace
-      })
+      }).catch(() => null)
     }
   }
 
@@ -2132,6 +2132,15 @@ export abstract class AppKitBaseClient {
     chain: ChainNamespace,
     shouldRefresh = false
   ) => {
+    if (caipAddress !== null) {
+      const parts = caipAddress.split(':')
+      if (parts.length !== 3 || parts.some(p => !p)) {
+        console.warn(`[AppKit] setCaipAddress: invalid CAIP-10 address rejected: "${caipAddress}"`)
+
+        return
+      }
+    }
+
     ChainController.setAccountProp('caipAddress', caipAddress, chain, shouldRefresh)
     ChainController.setAccountProp(
       'address',

packages/appkit/src/universal-adapter/client.ts

@@ -264,7 +264,7 @@ export class UniversalAdapter extends AdapterBlueprint {
         }
       }
     }
-    connector.provider.setDefaultChain(caipNetwork.caipNetworkId)
+    connector.provider?.setDefaultChain(caipNetwork.caipNetworkId)
   }
 
   public getWalletConnectProvider() {

packages/controllers/src/controllers/ApiController.ts

@@ -280,8 +280,8 @@ export const ApiController = {
         ...params,
         page: String(params.page),
         entries: String(params.entries),
-        include: params.include?.join(','),
-        exclude: exclude.join(',')
+        include: params.include?.join(',') || undefined,
+        exclude: exclude.join(',') || undefined
       }
     })
 
@@ -468,7 +468,7 @@ export const ApiController = {
     const params = {
       page: pageOverride ?? 1,
       entries: entriesOverride ?? 100,
-      search: search?.trim(),
+      search: search?.trim() || undefined,
       badge_type: badge,
       include: includeOverride ?? includeWalletIds,
       exclude: excludeOverride ?? excludeWalletIds,

packages/controllers/src/controllers/SendController.ts

@@ -33,7 +33,7 @@ import { SnackController } from './SnackController.js'
 
 export interface TxParams {
   receiverAddress: string
-  sendTokenAmount: number
+  sendTokenAmount: string
   decimals: string
 }
 export interface SendInputArguments {
@@ -47,14 +47,14 @@ export interface SendInputArguments {
 export interface ContractWriteParams {
   receiverAddress: string
   tokenAddress: string
-  sendTokenAmount: number
+  sendTokenAmount: string
   decimals: string
 }
 export interface SendControllerState {
   tokenBalances: Balance[]
   token?: Balance
   hash?: string
-  sendTokenAmount?: number
+  sendTokenAmount?: string
   receiverAddress?: string
   receiverProfileName?: string
   receiverProfileImageUrl?: string
@@ -122,7 +122,7 @@ const controller = {
         getPreferredAccountType(ChainController.state.activeChain) ===
         W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
       token: state.token?.symbol || '',
-      amount: state.sendTokenAmount ?? 0,
+      amount: Number(state.sendTokenAmount ?? '0'),
       network: ChainController.state.activeCaipNetwork?.caipNetworkId || ''
     }
   },
@@ -177,7 +177,7 @@ const controller = {
         properties: {
           isSmartAccount: activeAccountType === W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
           token: SendController.state.token.address,
-          amount: SendController.state.sendTokenAmount,
+          amount: Number(SendController.state.sendTokenAmount),
           network: ChainController.state.activeCaipNetwork?.caipNetworkId || ''
         }
       })
@@ -198,7 +198,7 @@ const controller = {
         properties: {
           isSmartAccount: activeAccountType === W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
           token: SendController.state.token.symbol || '',
-          amount: SendController.state.sendTokenAmount,
+          amount: Number(SendController.state.sendTokenAmount),
           network: ChainController.state.activeCaipNetwork?.caipNetworkId || ''
         }
       })
@@ -302,7 +302,7 @@ const controller = {
         isSmartAccount:
           getPreferredAccountType('eip155') === W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
         token: SendController.state.token?.symbol || '',
-        amount: params.sendTokenAmount,
+        amount: Number(params.sendTokenAmount),
         network: ChainController.state.activeCaipNetwork?.caipNetworkId || '',
         hash: hash || ''
       }
@@ -350,7 +350,7 @@ const controller = {
           isSmartAccount:
             getPreferredAccountType('eip155') === W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
           token: SendController.state.token?.symbol || '',
-          amount: params.sendTokenAmount,
+          amount: Number(params.sendTokenAmount),
           network: ChainController.state.activeCaipNetwork?.caipNetworkId || '',
           hash: hash || ''
         }
@@ -392,7 +392,7 @@ const controller = {
       chainNamespace: 'solana',
       tokenMint,
       to: SendController.state.receiverAddress,
-      value: SendController.state.sendTokenAmount
+      value: Number(SendController.state.sendTokenAmount)
     })
 
     if (hash) {
@@ -407,7 +407,7 @@ const controller = {
       properties: {
         isSmartAccount: false,
         token: SendController.state.token?.symbol || '',
-        amount: SendController.state.sendTokenAmount,
+        amount: Number(SendController.state.sendTokenAmount),
         network: ChainController.state.activeCaipNetwork?.caipNetworkId || '',
         hash: hash || ''
       }

packages/controllers/src/controllers/SwapController.ts

@@ -727,24 +727,64 @@ const controller = {
       return undefined
     }
 
-    const amount = ConnectionController.parseUnits(
+    let amount = ConnectionController.parseUnits(
       sourceTokenAmount,
       sourceToken.decimals
     )?.toString()
 
     try {
-      const response = await BlockchainApiController.generateSwapCalldata({
+      const isSourceTokenIsNetworkToken = sourceToken.address === networkAddress
+
+      let response = await BlockchainApiController.generateSwapCalldata({
         userAddress: fromCaipAddress,
         from: sourceToken.address,
         to: toToken.address,
         amount: amount as string,
         disableEstimate: true
       })
 
-      const isSourceTokenIsNetworkToken = sourceToken.address === networkAddress
+      let gas = BigInt(response.tx.eip155.gas)
+      let gasPrice = BigInt(response.tx.eip155.gasPrice)
+
+      /*
+       * For native-token source swaps (e.g. ETH → USDC), the transaction
+       * value IS the swap input amount, so the total ETH deducted from the
+       * wallet is value + gas×gasPrice.  If that exceeds the balance the
+       * wallet's eth_estimateGas call will revert.
+       *
+       * The UI's Max button uses a rough constant to pre-subtract gas, but
+       * the API may return a different gas estimate.  We correct here using
+       * the actual numbers from the first calldata response.
+       */
+      if (isSourceTokenIsNetworkToken && amount) {
+        const nativeToken = state.myTokensWithBalance?.find(t => t.address === networkAddress)
+        if (nativeToken) {
+          const decimals = parseInt(nativeToken.quantity.decimals, 10)
+          const rawBalance =
+            ConnectionController.parseUnits(nativeToken.quantity.numeric, decimals) ?? 0n
+          const gasCost = gas * gasPrice
+          const value = BigInt(amount)
+
+          if (value + gasCost > rawBalance) {
+            // Re-request calldata with an amount that leaves room for gas
+            const adjustedAmount = rawBalance > gasCost ? rawBalance - gasCost : 0n
+            // eslint-disable-next-line max-depth
+            if (adjustedAmount > 0n) {
+              response = await BlockchainApiController.generateSwapCalldata({
+                userAddress: fromCaipAddress,
+                from: sourceToken.address,
+                to: toToken.address,
+                amount: adjustedAmount.toString(),
+                disableEstimate: true
+              })
+              amount = adjustedAmount.toString()
+              gas = BigInt(response.tx.eip155.gas)
+              gasPrice = BigInt(response.tx.eip155.gasPrice)
+            }
+          }
+        }
+      }
 
-      const gas = BigInt(response.tx.eip155.gas)
-      const gasPrice = BigInt(response.tx.eip155.gasPrice)
       const address = CoreHelperUtil.getPlainAddress(response.tx.to)
 
       if (!address) {

packages/controllers/src/utils/FetchUtil.ts

@@ -93,7 +93,7 @@ export class FetchUtil {
     const url = new URL(path, this.baseUrl)
     if (params) {
       Object.entries(params).forEach(([key, value]) => {
-        if (value) {
+        if (value !== undefined && value !== null) {
           url.searchParams.append(key, value)
         }
       })