chore: onramp tests

packages/common/src/utils/TypeUtil.ts

@@ -26,6 +26,7 @@ export interface TransactionMetadata {
   sentTo: string
   status: TransactionStatus | CoinbaseTransactionStatus
   nonce: number
+  chain?: string
 }
 
 export interface TransactionTransfer {

packages/core/package.json

@@ -13,7 +13,7 @@
     "build:core": "tsc --build",
     "watch": "tsc --watch",
     "typecheck": "tsc --noEmit",
-    "test": "vitest run --dir tests --coverage.enabled --reporter=junit --coverage.reporter=json-summary --coverage.reporter=html",
+    "test": "vitest run --dir tests --coverage.enabled --coverage.reporter=json-summary --coverage.reporter=html",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {

packages/core/src/controllers/OnRampController.ts

@@ -30,7 +30,7 @@ export interface OnRampControllerState {
 
 type StateKey = keyof OnRampControllerState
 
-const USDC_CURRENCY_DEFAULT = {
+export const USDC_CURRENCY_DEFAULT = {
   id: '2b92315d-eab7-5bef-84fa-089a131333f5',
   name: 'USD Coin',
   symbol: 'USDC',
@@ -50,7 +50,7 @@ const USDC_CURRENCY_DEFAULT = {
   ]
 }
 
-const USD_CURRENCY_DEFAULT = {
+export const USD_CURRENCY_DEFAULT = {
   id: 'USD',
   payment_method_limits: [
     {
@@ -66,8 +66,7 @@ const USD_CURRENCY_DEFAULT = {
   ]
 }
 
-// -- State --------------------------------------------- //
-const state = proxy<OnRampControllerState>({
+const defaultState = {
   providers: ONRAMP_PROVIDERS as OnRampProvider[],
   selectedProvider: null,
   error: null,
@@ -76,7 +75,10 @@ const state = proxy<OnRampControllerState>({
   purchaseCurrencies: [USDC_CURRENCY_DEFAULT],
   paymentCurrencies: [],
   quotesLoading: false
-})
+}
+
+// -- State --------------------------------------------- //
+const state = proxy<OnRampControllerState>(defaultState)
 
 // -- Controller ---------------------------------------- //
 export const OnRampController = {
@@ -124,15 +126,37 @@ export const OnRampController = {
 
   async getQuote() {
     state.quotesLoading = true
-    const quote = await BlockchainApiController.getOnrampQuote({
-      purchaseCurrency: state.purchaseCurrency,
-      paymentCurrency: state.paymentCurrency,
-      amount: state.paymentAmount?.toString() || '0',
-      network: state.purchaseCurrency?.name
-    })
-    state.quotesLoading = false
-    state.purchaseAmount = Number(quote.purchaseAmount.amount)
+    try {
+      const quote = await BlockchainApiController.getOnrampQuote({
+        purchaseCurrency: state.purchaseCurrency,
+        paymentCurrency: state.paymentCurrency,
+        amount: state.paymentAmount?.toString() || '0',
+        network: state.purchaseCurrency?.symbol
+      })
+      state.quotesLoading = false
+      state.purchaseAmount = Number(quote.purchaseAmount.amount)
+
+      return quote
+    } catch (error) {
+      state.error = (error as Error).message
+      state.quotesLoading = false
+
+      return null
+    } finally {
+      state.quotesLoading = false
+    }
+  },
 
-    return quote
+  resetState() {
+    state.providers = ONRAMP_PROVIDERS as OnRampProvider[]
+    state.selectedProvider = null
+    state.error = null
+    state.purchaseCurrency = USDC_CURRENCY_DEFAULT
+    state.paymentCurrency = USD_CURRENCY_DEFAULT
+    state.purchaseCurrencies = [USDC_CURRENCY_DEFAULT]
+    state.paymentCurrencies = []
+    state.paymentAmount = undefined
+    state.purchaseAmount = undefined
+    state.quotesLoading = false
   }
 }

packages/core/src/controllers/TransactionsController.ts

@@ -21,7 +21,7 @@ export interface TransactionsControllerState {
 // -- State --------------------------------------------- //
 const state = proxy<TransactionsControllerState>({
   transactions: [],
-  coinbaseTransactions: [],
+  coinbaseTransactions: {},
   transactionsByYear: {},
   loading: false,
   empty: false,
@@ -93,27 +93,20 @@ export const TransactionsController = {
     transactionsMap: TransactionByYearMap = {},
     transactions: Transaction[] = []
   ) {
-    const grouped: TransactionByYearMap = transactionsMap
-
+    const grouped = transactionsMap
     transactions.forEach(transaction => {
       const year = new Date(transaction.metadata.minedAt).getFullYear()
       const month = new Date(transaction.metadata.minedAt).getMonth()
+
       const yearTransactions = grouped[year] ?? {}
       const monthTransactions = yearTransactions[month] ?? []
 
-      if (
-        monthTransactions.find(
-          t =>
-            t.metadata.hash === transaction.metadata.hash &&
-            t.metadata.status === transaction.metadata.status
-        )
-      ) {
-        return
-      }
+      // If there's a transaction with the same id, remove the old one
+      const newMonthTransactions = monthTransactions.filter(tx => tx.id !== transaction.id)
 
       grouped[year] = {
         ...yearTransactions,
-        [month]: [...monthTransactions, transaction].sort(
+        [month]: [...newMonthTransactions, transaction].sort(
           (a, b) => new Date(b.metadata.minedAt).getTime() - new Date(a.metadata.minedAt).getTime()
         )
       }

packages/core/src/utils/ConstantsUtil.ts

@@ -48,7 +48,8 @@ export const ConstantsUtil = {
     'polygon',
     'avalanche-c-chain',
     'optimism',
-    'celo'
+    'celo',
+    'base'
   ],
 
   WC_COINBASE_PAY_SDK_FALLBACK_CHAIN: 'ethereum',
@@ -59,7 +60,8 @@ export const ConstantsUtil = {
     Polygon: 'polygon',
     Avalanche: 'avalanche-c-chain',
     'OP Mainnet': 'optimism',
-    Celo: 'celo'
+    Celo: 'celo',
+    Base: 'base'
   },
 
   WC_COINBASE_ONRAMP_APP_ID: 'bf18c88d-495a-463b-b249-0b9d3656cf5e'

packages/core/tests/constants/OnrampTransactions.ts

@@ -0,0 +1,151 @@
+export const ONRAMP_TRANSACTIONS_RESPONSES_JAN = {
+  SUCCESS: {
+    id: '1eeccf2f-ef04-6d48-a2dd-0e1dca1d3cfb',
+    metadata: {
+      operationType: 'buy',
+      hash: '0xbf5f116e0e77b304404ff873b527578d8c0a247732a50b0da174a533b669ab5b',
+      minedAt: '2024-01-15T16:59:37.345Z',
+      sentFrom: 'Coinbase',
+      sentTo: '0xf3ea39310011333095CFCcCc7c4Ad74034CABA64',
+      status: 'ONRAMP_TRANSACTION_STATUS_SUCCESS',
+      nonce: 1,
+      chain: 'eip155:137'
+    },
+    transfers: [
+      {
+        fungible_info: {
+          name: 'USDC',
+          symbol: 'USDC'
+        },
+        direction: 'in',
+        quantity: {
+          numeric: '3.003898'
+        }
+      }
+    ]
+  },
+  FAILED: {
+    id: '1eeccf2f-ef04-6d48-a2dd-0e1dca1d3cfb',
+    metadata: {
+      operationType: 'buy',
+      hash: '',
+      minedAt: '2024-01-15T16:59:37.345Z',
+      sentFrom: 'Coinbase',
+      sentTo: '0xf3ea39310011333095CFCcCc7c4Ad74034CABA64',
+      status: 'ONRAMP_TRANSACTION_STATUS_FAILED',
+      nonce: 1
+    },
+    transfers: [
+      {
+        fungible_info: {
+          name: 'USDC',
+          symbol: 'USDC'
+        },
+        direction: 'in',
+        quantity: {
+          numeric: '4.995375'
+        }
+      }
+    ]
+  },
+  IN_PROGRESS: {
+    id: '1eeccf2f-ef04-6d48-a2dd-0e1dca1d3cfb',
+    metadata: {
+      operationType: 'buy',
+      hash: '',
+      minedAt: '2024-01-15T16:59:37.345Z',
+      sentFrom: 'Coinbase',
+      sentTo: '0xf3ea39310011333095CFCcCc7c4Ad74034CABA64',
+      status: 'ONRAMP_TRANSACTION_STATUS_IN_PROGRESS',
+      nonce: 1
+    },
+    transfers: [
+      {
+        fungible_info: {
+          name: 'USDC',
+          symbol: 'USDC'
+        },
+        direction: 'in',
+        quantity: {
+          numeric: '4.995375'
+        }
+      }
+    ]
+  }
+}
+
+export const ONRAMP_TRANSACTIONS_RESPONSES_FEB = {
+  SUCCESS: {
+    id: '1eecc239-9ed5-696e-afeb-129d128962f1',
+    metadata: {
+      operationType: 'buy',
+      hash: '0xbf5f116e0e77b304404ff873b527578d8c0a247732a50b0da174a533b669ab5b',
+      minedAt: '2024-02-15T16:59:37.345Z',
+      sentFrom: 'Coinbase',
+      sentTo: '0xf3ea39310011333095CFCcCc7c4Ad74034CABA64',
+      status: 'ONRAMP_TRANSACTION_STATUS_SUCCESS',
+      nonce: 1,
+      chain: 'eip155:137'
+    },
+    transfers: [
+      {
+        fungible_info: {
+          name: 'USDC',
+          symbol: 'USDC'
+        },
+        direction: 'in',
+        quantity: {
+          numeric: '3.003898'
+        }
+      }
+    ]
+  },
+  FAILED: {
+    id: '1eecc239-9ed5-696e-afeb-129d128962f1',
+    metadata: {
+      operationType: 'buy',
+      hash: '',
+      minedAt: '2024-02-15T16:59:37.345Z',
+      sentFrom: 'Coinbase',
+      sentTo: '0xf3ea39310011333095CFCcCc7c4Ad74034CABA64',
+      status: 'ONRAMP_TRANSACTION_STATUS_FAILED',
+      nonce: 1
+    },
+    transfers: [
+      {
+        fungible_info: {
+          name: 'USDC',
+          symbol: 'USDC'
+        },
+        direction: 'in',
+        quantity: {
+          numeric: '4.995375'
+        }
+      }
+    ]
+  },
+  IN_PROGRESS: {
+    id: '1eecc239-9ed5-696e-afeb-129d128962f1',
+    metadata: {
+      operationType: 'buy',
+      hash: '',
+      minedAt: '2024-02-15T16:59:37.345Z',
+      sentFrom: 'Coinbase',
+      sentTo: '0xf3ea39310011333095CFCcCc7c4Ad74034CABA64',
+      status: 'ONRAMP_TRANSACTION_STATUS_IN_PROGRESS',
+      nonce: 1
+    },
+    transfers: [
+      {
+        fungible_info: {
+          name: 'USDC',
+          symbol: 'USDC'
+        },
+        direction: 'in',
+        quantity: {
+          numeric: '4.995375'
+        }
+      }
+    ]
+  }
+}

packages/core/tests/controllers/AssetController.test.ts

@@ -8,7 +8,8 @@ describe('AssetController', () => {
       walletImages: {},
       networkImages: {},
       connectorImages: {},
-      tokenImages: {}
+      tokenImages: {},
+      currencyImages: {}
     })
   })
 })