fix: calculate amount by deducting gasFee and not allocated gasBudget

iotaledger · Nov 15, 2023 · 94d50af · 94d50af
1 parent 8c64be2
commit 94d50af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/shared/lib/core/layer-2/types/layer2-metadata.interface.ts b/packages/shared/lib/core/layer-2/types/layer2-metadata.interface.ts
@@ -1,3 +1,3 @@
 import { ILayer2TransferAllowanceMetadata } from '../interfaces'
 
-export type Layer2Metadata = Omit<ILayer2TransferAllowanceMetadata, 'baseTokens' | 'nativeTokens' | 'nfts'>
+export type Layer2Metadata = Omit<ILayer2TransferAllowanceMetadata, 'nativeTokens' | 'nfts'>
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
@@ -33,6 +33,7 @@ export async function generateSingleBasicActivity(
     const id = outputId || transactionId
 
     const output = wrappedOutput.output as BasicOutput
+    const amount = getAmountFromOutput(output)
 
     const isShimmerClaiming = isShimmerClaimingTransaction(transactionId, get(activeProfileId))
 
@@ -44,13 +45,15 @@ export async function generateSingleBasicActivity(
     const asyncData = await getAsyncDataFromOutput(output, outputId, claimingData, account)
 
     const { parsedLayer2Metadata, destinationNetwork } = getLayer2ActivityInformation(metadata, sendingInfo)
+    const layer2Allowance = Number(parsedLayer2Metadata?.baseTokens ?? '0')
     const gasBudget = Number(parsedLayer2Metadata?.gasBudget ?? '0')
+    const gasFee = layer2Allowance > 0 ? amount - layer2Allowance : 0
 
     let { storageDeposit, giftedStorageDeposit } = await getStorageDepositFromOutput(account, output)
     giftedStorageDeposit = action === ActivityAction.Burn ? 0 : giftedStorageDeposit
     giftedStorageDeposit = gasBudget === 0 ? giftedStorageDeposit : 0
 
-    const baseTokenAmount = getAmountFromOutput(output) - storageDeposit - gasBudget
+    const baseTokenAmount = amount - storageDeposit - gasFee
 
     const nativeToken = await getNativeTokenFromOutput(output)
     const assetId = fallbackAssetId ?? nativeToken?.id ?? getCoinType()