From 946ef8c06c568b213613b55efe9c66fba735e314 Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Thu, 7 Sep 2023 07:43:37 +0100
Subject: [PATCH] fix: token label using old token icon (#628)

---
 .../components/inputs/TokenAmountWithSliderInput.svelte  | 9 +++------
 packages/shared/src/components/labels/TokenLabel.svelte  | 5 +++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte b/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte
index 50162e85b0..aeb29ca839 100644
--- a/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte
+++ b/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     import { localize, parseCurrency } from '@core/i18n'
-    import { activeProfile } from '@core/profile/stores'
     import {
         ITokenWithBalance,
         TokenStandard,
@@ -8,7 +7,6 @@
         formatTokenAmountDefault,
         getUnitFromTokenMetadata,
     } from '@core/token'
-    import { visibleSelectedAccountTokens } from '@core/token/stores'
     import { getMaxDecimalsFromTokenMetadata } from '@core/token/utils'
     import { AmountInput, InputContainer, SliderInput, Text, TokenLabel, UnitInput } from '@ui'
     import Big from 'big.js'
@@ -17,8 +15,7 @@
     export let disabled = false
     export let isFocused = false
     export let votingPower: number = 0
-    export let token: ITokenWithBalance | undefined =
-        $visibleSelectedAccountTokens?.[$activeProfile?.network?.id]?.baseCoin
+    export let token: ITokenWithBalance
     export let rawAmount: string | undefined = undefined
     export let unit: string | undefined = undefined
     export let amount: string | undefined =
@@ -30,8 +27,8 @@
     let error: string
 
     $: isFocused && (error = '')
-    $: allowedDecimals = getMaxDecimalsFromTokenMetadata(token?.metadata, unit)
-    $: availableBalance = token?.balance?.available + votingPower
+    $: allowedDecimals = getMaxDecimalsFromTokenMetadata(token.metadata, unit)
+    $: availableBalance = (token.balance.available ?? 0) + votingPower
     $: bigAmount = convertToRawAmount(amount, token?.metadata, unit)
     $: max = parseCurrency(formatTokenAmountDefault(availableBalance, token?.metadata, unit, false))
     $: rawAmount = bigAmount?.toString()
diff --git a/packages/shared/src/components/labels/TokenLabel.svelte b/packages/shared/src/components/labels/TokenLabel.svelte
index be24c2e71c..99741cf148 100644
--- a/packages/shared/src/components/labels/TokenLabel.svelte
+++ b/packages/shared/src/components/labels/TokenLabel.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
     import { IToken } from '@core/token'
-    import { FontWeight, Text, TokenIcon } from '@ui'
+    import { FontWeight, Text } from '@ui'
+    import TokenAvatar from '@ui/avatars/TokenAvatar.svelte'
 
     export let token: IToken
 </script>
 
 {#if token}
     <div class="flex flex-row items-center p-2 space-x-2 text-left bg-gray-100 dark:bg-gray-700 rounded-md">
-        <TokenIcon small persistedToken={token} networkId={token.networkId} />
+        <TokenAvatar size="xs" {token} />
         <div class="w-full relative" style="max-width: 75px;">
             <Text
                 color="gray-600"