fix: fund from exchange not working at first try

.changeset/tall-peaches-clap.md

@@ -0,0 +1,29 @@
+---
+'@reown/appkit-controllers': patch
+'pay-test-exchange': patch
+'@reown/appkit-adapter-bitcoin': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit': patch
+'@reown/appkit-utils': 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': patch
+'@reown/appkit-wallet-button': patch
+---
+
+Fixed an issue where funding from the exchange did not work on the first attempt

packages/controllers/src/controllers/ExchangeController.ts

@@ -24,9 +24,9 @@ import { SnackController } from './SnackController.js'
 
 // -- Constants ----------------------------------------- //
 const DEFAULT_PAGE = 0
-const DEFAULT_STATE: ExchangeControllerState = {
+export const DEFAULT_STATE: ExchangeControllerState = {
   paymentAsset: null,
-  amount: 10,
+  amount: 0,
   tokenAmount: 0,
   priceLoading: false,
   error: null,

packages/controllers/tests/controllers/ExchangeController.test.ts

@@ -4,6 +4,7 @@ import { ChainController } from '../../exports'
 import { AccountController } from '../../src/controllers/AccountController'
 import { EventsController } from '../../src/controllers/EventsController'
 import { ExchangeController } from '../../src/controllers/ExchangeController'
+import { DEFAULT_STATE } from '../../src/controllers/ExchangeController'
 import { OptionsController } from '../../src/controllers/OptionsController'
 import { SnackController } from '../../src/controllers/SnackController'
 import { CoreHelperUtil } from '../../src/utils/CoreHelperUtil'
@@ -19,6 +20,10 @@ describe('ExchangeController', () => {
     vi.resetAllMocks()
   })
 
+  it('should have default state', () => {
+    expect(ExchangeController.state).toEqual(DEFAULT_STATE)
+  })
+
   it('getTokenAmount returns computed amount', () => {
     ExchangeController.state.amount = 10
     ExchangeController.state.paymentAsset = {

packages/scaffold-ui/src/views/w3m-deposit-from-exchange-view/index.ts

@@ -22,7 +22,7 @@ import '@reown/appkit-ui/wui-text'
 
 import styles from './styles.js'
 
-const PRESET_AMOUNTS = [10, 50, 100]
+const PRESET_AMOUNTS = [10, 50, 100] as const
 
 @customElement('w3m-deposit-from-exchange-view')
 export class W3mDepositFromExchangeView extends LitElement {
@@ -85,6 +85,7 @@ export class W3mDepositFromExchangeView extends LitElement {
     if (!this.paymentAsset) {
       await this.setDefaultPaymentAsset()
     }
+    this.onPresetAmountClick(PRESET_AMOUNTS[0])
     await ExchangeController.fetchExchanges()
   }
 
@@ -238,6 +239,7 @@ export class W3mDepositFromExchangeView extends LitElement {
   private async setDefaultPaymentAsset() {
     if (this.network) {
       const paymentAssets = await ExchangeController.getAssetsForNetwork(this.network.caipNetworkId)
+
       if (paymentAssets[0]) {
         ExchangeController.setPaymentAsset(paymentAssets[0])
       }

packages/scaffold-ui/test/views/w3m-deposit-from-exchange-view.test.ts

@@ -4,12 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { html } from 'lit'
 
 import type { CaipNetwork } from '@reown/appkit-common'
-import {
-  ChainController,
-  ExchangeController,
-  RouterController,
-  SnackController
-} from '@reown/appkit-controllers'
+import { ChainController, ExchangeController, RouterController } from '@reown/appkit-controllers'
 
 import { W3mDepositFromExchangeView } from '../../src/views/w3m-deposit-from-exchange-view'
 import { HelpersUtil } from '../utils/HelpersUtil'
@@ -156,10 +151,7 @@ describe('W3mDepositFromExchangeView', () => {
     expect(handleSpy).toHaveBeenCalledWith('ex1')
   })
 
-  it('shows error when clicking exchange without amount', async () => {
-    // Mock the SnackController
-    const showErrorSpy = vi.spyOn(SnackController, 'showError')
-
+  it('shows set amount during first update', async () => {
     // Mock active network
     vi.spyOn(ChainController, 'state', 'get').mockReturnValue({
       ...ChainController.state,
@@ -170,7 +162,6 @@ describe('W3mDepositFromExchangeView', () => {
     ExchangeController.state.exchanges = [
       { id: 'ex1', imageUrl: 'https://img1', name: 'Exchange One' }
     ] as any
-    ExchangeController.state.amount = 0
 
     // Avoid side effects on firstUpdated
     vi.spyOn(ExchangeController, 'getAssetsForNetwork').mockResolvedValue([])
@@ -181,9 +172,6 @@ describe('W3mDepositFromExchangeView', () => {
     )
     await elementUpdated(element)
 
-    const items = HelpersUtil.querySelectAll(element, 'wui-list-item')
-    items?.[0]?.click()
-
-    expect(showErrorSpy).toHaveBeenCalledWith('Please enter an amount')
+    expect(ExchangeController.state.amount).toBe(10)
   })
 })