Merge branch 'develop' into refactor/remove-unusued-components

bloomwalletio · Sep 7, 2023 · a74ff7a · a74ff7a
2 parents e658481 + 946ef8c
commit a74ff7a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte b/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte
@@ -1,14 +1,12 @@
 <script lang="ts">
     import { localize, parseCurrency } from '@core/i18n'
-    import { activeProfile } from '@core/profile/stores'
     import {
         ITokenWithBalance,
         TokenStandard,
         convertToRawAmount,
         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
@@ -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"