From 5b2d24688bbfb62921f8021cc4d9ba37175f5c74 Mon Sep 17 00:00:00 2001 From: dafuga Date: Wed, 26 Jul 2023 23:50:19 +0100 Subject: [PATCH] enhancement: added ability to pass string instead of balance --- src/components/elements/input/token/selector/row.svelte | 4 +++- src/pages/evm/swap.svelte | 2 -- src/pages/evm/swap/form.svelte | 2 +- src/stores/tokens.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/elements/input/token/selector/row.svelte b/src/components/elements/input/token/selector/row.svelte index baab7ffd..3d53ab4d 100644 --- a/src/components/elements/input/token/selector/row.svelte +++ b/src/components/elements/input/token/selector/row.svelte @@ -21,7 +21,9 @@ $balances && $balances.find((balance) => balance.tokenKey === token.key)?.quantity } - if (balance) { + if (typeof balance === 'string') { + formattedTokenBalance = balance + } else if (balance) { const tokenPrecision = balance.symbol.precision const unitValue = balance.units.value const fullTokenBalanceString = ( diff --git a/src/pages/evm/swap.svelte b/src/pages/evm/swap.svelte index 0f625c31..5bd3aa27 100644 --- a/src/pages/evm/swap.svelte +++ b/src/pages/evm/swap.svelte @@ -78,8 +78,6 @@ try { ethWalletAccount = await connectEthWallet() } catch (e) { - console.log({code: e.code}) - if (e.code === -32002) { return } diff --git a/src/pages/evm/swap/form.svelte b/src/pages/evm/swap/form.svelte index 767301c2..11a6e560 100644 --- a/src/pages/evm/swap/form.svelte +++ b/src/pages/evm/swap/form.svelte @@ -69,7 +69,7 @@ ...$systemToken, name: 'EOS (EVM)', contract: 'eosio.evm', - balance: evmBalance, + balance: evmBalance || 'Connect', } fromOptions = [$systemToken, evmToken] if (from?.name === 'EOS (EVM)') { diff --git a/src/stores/tokens.ts b/src/stores/tokens.ts index 63c59f6f..85a58358 100644 --- a/src/stores/tokens.ts +++ b/src/stores/tokens.ts @@ -17,7 +17,7 @@ export interface Token { name: NameType price?: number logo?: string - balance?: Asset + balance?: Asset | string } export interface TokenKeyParams {