refactor: moving balances to balances store

greymass · Oct 24, 2023 · f76b2cd · f76b2cd
1 parent 6f921fa
commit f76b2cd
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 21 deletions.
diff --git a/src/components/elements/input/token/selector.svelte b/src/components/elements/input/token/selector.svelte
@@ -45,7 +45,6 @@
     $: {
         if (tokenOptions) {
             filteredTokens = tokenOptions.map(tokenOption => {
-                const usdt = $tokens?.find(token => token.contract === 'tethertether')
                 const token = $tokens?.find(token => tokenOption.tokenName === token.name)
 
                 if (!token) {

diff --git a/src/components/elements/input/token/selector/row.svelte b/src/components/elements/input/token/selector/row.svelte
@@ -14,12 +14,7 @@
     let balance
 
     $: {
-        if (token.balance) {
-            balance = token.balance
-        } else {
-            balance =
-                $balances && $balances.find((balance) => balance.tokenKey === token.key)?.quantity
-        }
+        balance = $balances && $balances.find((balance) => balance.tokenKey === token.key)?.quantity
 
         if (typeof balance === 'string') {
             formattedTokenBalance = balance

diff --git a/src/pages/transfer/form.svelte b/src/pages/transfer/form.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import {Asset as CoreAsset} from '@greymass/eosio'
     import {activeEvmSession, activeSession, activeBlockchain, currentAccountBalance} from '~/store'
-    import {Token, TokenOption, systemToken} from '~/stores/tokens'
+    import type {Token, TokenOption} from '~/stores/tokens'
 
     import Label from '~/components/elements/input/label.svelte'
     import Form from '~/components/elements/form.svelte'
@@ -73,8 +73,6 @@
             Object.values(transferManagers).map(async (transferManagerData) => {
                 const TransferManagerClass = transferManagerData.transferClass
 
-                if (!$systemToken) return
-
                 // Only displaying accounts that support the current chain
                 if (!TransferManagerClass.supportedChains.includes($activeBlockchain?.id)) return
 
@@ -90,7 +88,7 @@
 
                 fromOptions.push({
                     tokenName: String(transferManagerData.token),
-                    label: TransferManagerClass.fromDisplayString,
+                    label: transferManagerData.fromLabel,
                 })
             })
         )
@@ -125,6 +123,8 @@
         }
     }
 
+    $: console.log({ fromOptions })
+
     $: {
         transferManager?.balance().then((balance) => {
             availableToReceive = CoreAsset.from(

diff --git a/src/pages/transfer/managers/eosEvmBridge.ts b/src/pages/transfer/managers/eosEvmBridge.ts
@@ -9,10 +9,6 @@ import {updateActiveAccount} from '~/stores/account-provider'
 import {updateEvmBalance} from '~/stores/balances-provider'
 
 export class EosEvmBridge extends TransferManager {
-    static from = 'eos'
-    static fromDisplayString = 'EOS'
-    static to = 'evm'
-    static toDisplayString = 'EOS (EVM)'
     static supportedChains = ['eos']
     static evmRequired = true
 

diff --git a/src/pages/transfer/managers/index.ts b/src/pages/transfer/managers/index.ts
@@ -9,31 +9,59 @@ import type {TransferManager} from './transferManager'
 interface TransferType {
     transferClass: typeof TransferManager
     token: AssetType
+    from: string
+    fromLabel: string
+    to: string
+    toLabel: string
 }
 
 export const transferManagers: {[key: string]: TransferType} = {
     'EOS - EOS (EVM)': {
         transferClass: EosEvmBridge,
-        token: 'EOS'
+        token: 'EOS',
+        from: 'eos',
+        fromLabel: 'EOS',
+        to: 'evm',
+        toLabel: 'EOS (EVM)',
     },
     'EOS (EVM) - EOS': {
         transferClass: EvmEosBridge,
-        token: 'EOS'
+        token: 'EOS',
+        from: 'evm',
+        fromLabel: 'EOS (EVM)',
+        to: 'eos',
+        toLabel: 'EOS',
     },
     'USDT - USDT (EVM)': {
         transferClass: EosEvmBridge,
-        token: 'USDT'
+        token: 'USDT',
+        from: 'usdt',
+        fromLabel: 'USDT',
+        to: 'evm',
+        toLabel: 'USDT (EVM)',
     },
     'USDT (EVM) - USDT': {
         transferClass: EvmEosBridge,
-        token: 'USDT'
+        token: 'USDT',
+        from: 'evm',
+        fromLabel: 'USDT (EVM)',
+        to: 'usdt',
+        toLabel: 'USDT',
     },
     'TLOS - TLOS (EVM)': {
         transferClass: TelosEvmBridge,
-        token: 'TLOS'
+        token: 'TLOS',
+        from: 'tlos',
+        fromLabel: 'TLOS',
+        to: 'evm',
+        toLabel: 'TLOS (EVM)',
     },
     'TLOS (EVM) - TLOS': {
         transferClass: EvmTelosBridge,
-        token: 'TLOS'
+        token: 'TLOS',
+        from: 'evm',
+        fromLabel: 'TLOS (EVM)',
+        to: 'tlos',
+        toLabel: 'TLOS',
     },
 }