Merge pull request #177 from greymass/dev

Transfer + Send/Receive fixes
greymass · Oct 17, 2023 · 6d9ba7f · 6d9ba7f
2 parents af1b621 + 3973bb5
commit 6d9ba7f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/components/elements/input/token/selector.svelte b/src/components/elements/input/token/selector.svelte
@@ -4,6 +4,7 @@
     import {activeBlockchain} from '~/store'
     import type {Token} from '~/stores/tokens'
     import {tokens} from '~/stores/tokens'
+    import {balances} from '~/stores/balances'
 
     import Form from '~/components/elements/form.svelte'
     import Input from '~/components/elements/input.svelte'
@@ -16,6 +17,13 @@
     export let selectedToken: Token | undefined = undefined
     export let tokenOptions: Token[] | undefined = undefined
     export let onTokenSelect: (token: Token) => void
+    export let showTokensWithoutBalance: boolean = false
+
+    $: {
+        if (defaultToken) {
+            selectedToken = defaultToken
+        }
+    }
 
     let displayModal = writable<boolean>(false)
     let query: string = ''
@@ -42,11 +50,22 @@
                 ($tokens &&
                     $tokens.filter((token) => {
                         const blockchainMatches = token.chainId.equals($activeBlockchain.chainId)
+                        let balanceExists
+                        if (!showTokensWithoutBalance) {
+                            balanceExists = !!(
+                                token.balance ||
+                                $balances.find((balance) => balance.tokenKey === token.key)
+                            )
+                        }
                         const queryExists = query.length === 0
                         const queryMatches = String(token.name)
                             .toLowerCase()
                             .includes(query.toLowerCase())
-                        return blockchainMatches && (queryExists || queryMatches)
+                        return (
+                            blockchainMatches &&
+                            (queryExists || queryMatches) &&
+                            (showTokensWithoutBalance || balanceExists)
+                        )
                     })) ||
                 []
         }

diff --git a/src/pages/transfer/form.svelte b/src/pages/transfer/form.svelte
@@ -234,6 +234,7 @@
                         onTokenSelect={handleFromChange}
                         selectedToken={from}
                         tokenOptions={fromOptions}
+                        showTokensWithoutBalance
                     />
                 </div>
                 <Label align="left">Amount</Label>
@@ -257,6 +258,7 @@
                         onTokenSelect={handleToChange}
                         selectedToken={to}
                         tokenOptions={toOptions}
+                        showTokensWithoutBalance
                     />
                 </div>
                 {#if receivedAmount && receivedAmount.value > 0 && feeAmount && feeAmount.value > 0}