wip

jscriptcoder · jscriptcoder · commit 42d3f69dec2b · 2023-10-10T17:13:53.000+02:00
diff --git a/src/app.config.ts b/src/app.config.ts
@@ -1,5 +1,3 @@
-import { zeroAddress } from "viem"
-
 export const apiConfig = {
   tokensUrl: 'https://tokens.coingecko.com/uniswap/all.json',
   // tokensUrl: 'https://erc20.cmc.eth.link/',
@@ -17,8 +15,7 @@ export const notificarionConfig = {
   duration: 5000,
 }
 
-export const ethTokenConfig = {
-  address: zeroAddress,
+export const etherToken = {
   name: 'Ether',
   symbol: 'ETH',
   decimals: 18,
diff --git a/src/components/Swap/Swap.svelte b/src/components/Swap/Swap.svelte
@@ -79,16 +79,19 @@
 
       console.log('Quote data:', quotaData)
 
-      // Approve the 0x contract to spend the token
-      const txHash = await approveAllowance({
-        account: $account.address,
-        address: tokenFrom.address,
-        spender: quotaData.allowanceTarget, // contains the address of the 0x contract
-        amount: amountFrom,
-        chainId: $network.id,
-      })
-
-      console.log('Approve tx hash:', txHash)
+      // If token has address then it's an ERC20 token
+      if (tokenFrom.address) {
+        // Approve the 0x contract to spend the token
+        const txHash = await approveAllowance({
+          account: $account.address,
+          address: tokenFrom.address,
+          spender: quotaData.allowanceTarget, // contains the address of the 0x contract
+          amount: amountFrom,
+          chainId: $network.id,
+        })
+
+        console.log('Approve tx hash:', txHash)
+      }
     } catch (err) {
       console.error(err)
       errorToast('There was an error trading the tokens.')
diff --git a/src/components/Swap/TokenSelector.svelte b/src/components/Swap/TokenSelector.svelte
@@ -9,7 +9,7 @@
   import fetchAllTokens from '../../libs/token/fetchAllTokens'
   import type { Token } from '../../libs/token/types'
   import Loading from '../Loading'
-  import { ethTokenConfig, inputConfig, tokenSelectorConfig } from '../../app.config'
+  import { etherToken, inputConfig, tokenSelectorConfig } from '../../app.config'
   import { mainnet } from 'viem/chains'
 
   export let value: Token
@@ -81,12 +81,8 @@
 
       // We want to add ETH in our list of tokens as the first token
       tokens.unshift({
+        ...etherToken,
         chainId: mainnet.id, // TODO: other chains?
-        address: ethTokenConfig.address,
-        name: ethTokenConfig.name,
-        symbol: ethTokenConfig.symbol,
-        decimals: ethTokenConfig.decimals,
-        logoURI: ethTokenConfig.logoURI,
       })
 
       // Creates a map to quickly look up tokens based
@@ -95,7 +91,7 @@
       indexTokenMap = tokens.reduce((acc, token) => {
         const name = token.name.toLowerCase()
         const symbol = token.symbol.toLowerCase()
-        const address = token.address.toLowerCase()
+        const address = token?.address?.toLowerCase()
         const index = `${name}|${symbol}|${address}`
 
         acc[index] = token
diff --git a/src/libs/api/0x.ts b/src/libs/api/0x.ts
@@ -1,4 +1,3 @@
-import { zeroAddress } from 'viem'
 import type { GetPriceArgs, GetQuoteArgs, OxApiArgs, PriceResponseData, QuoteResponseData } from './types'
 
 async function OxApi({ apiCall, sellToken, buyToken, sellAmount, chainId }: OxApiArgs) {
@@ -7,9 +6,9 @@ async function OxApi({ apiCall, sellToken, buyToken, sellAmount, chainId }: OxAp
   const queryParams = new URLSearchParams({
     apiCall,
 
-    // For Ether, which uses the zero address, we use the symbol instead of the address
-    sellToken: sellToken === zeroAddress ? 'ETH' : sellToken,
-    
+    // If no sellAddress is passed, we asume it's ETH
+    sellToken: sellToken ?? 'ETH',
+
     buyToken,
     sellAmount,
     chainId,
diff --git a/src/libs/api/types.ts b/src/libs/api/types.ts
@@ -2,10 +2,10 @@ import type { Address } from 'viem'
 import type { Token } from '../token/types'
 
 export interface BaseArgs {
-  sellToken: Address
-  buyToken: string
   sellAmount: string
   chainId: string
+  sellToken?: Address
+  buyToken?: string
   slippagePercentage?: string
 }
 
diff --git a/src/libs/token/types.ts b/src/libs/token/types.ts
@@ -2,9 +2,9 @@ import type { Address } from 'viem'
 
 export type Token = {
   chainId: number
-  address: Address
   name: string
   symbol: string
   decimals: number
   logoURI: string
+  address?: Address
 }
