show basetoken amount on smartcontract popups

bloomwalletio · May 27, 2024 · b4696e6 · b4696e6
1 parent e040eaf
commit b4696e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte b/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte
@@ -55,6 +55,10 @@
         }
     }
     $: preparedTransaction.gasPrice = Converter.bigIntToHex(gasPrices?.[selectedGasSpeed] ?? gasPrices.required)
+    $: baseCoinTransfer = {
+        token: getTokenFromSelectedAccountTokens(BASE_TOKEN_ID, evmNetwork.id),
+        rawAmount: Converter.bigIntLikeToBigInt(preparedTransaction.value),
+    }
 
     setParsedContractData()
     function setParsedContractData(): void {
@@ -217,13 +221,10 @@
     />
 
     <div class="space-y-5">
-        {#if !preparedTransaction.data}
-            {@const baseCoinTransfer = {
-                token: getTokenFromSelectedAccountTokens(BASE_TOKEN_ID, evmNetwork.id),
-                rawAmount: Converter.bigIntLikeToBigInt(preparedTransaction.value),
-            }}
+        {#if preparedTransaction.value}
             <TransactionAssetSection {baseCoinTransfer} />
-        {:else if parsedData?.type === ParsedSmartContractType.CoinTransfer}
+        {/if}
+        {#if parsedData?.type === ParsedSmartContractType.CoinTransfer}
             {@const baseCoinTransfer = {
                 token: getTokenFromSelectedAccountTokens(BASE_TOKEN_ID, evmNetwork.id),
                 rawAmount: parsedData.rawAmount,

diff --git a/packages/shared/src/lib/core/wallet/types/token-transfer-data.type.ts b/packages/shared/src/lib/core/wallet/types/token-transfer-data.type.ts
@@ -2,6 +2,6 @@ import { IToken } from '@core/token/interfaces'
 
 export type TokenTransferData = {
     rawAmount: bigint
-    token: IToken
+    token?: IToken
     unit?: string
 }