diff --git a/packages/shared/components/activity-info/GenericActivityInformation.svelte b/packages/shared/components/activity-info/GenericActivityInformation.svelte index 2cf1862b7b3..438d409782e 100644 --- a/packages/shared/components/activity-info/GenericActivityInformation.svelte +++ b/packages/shared/components/activity-info/GenericActivityInformation.svelte @@ -17,14 +17,17 @@ $: claimedTime = getFormattedTimeStamp(activity?.asyncData?.claimedDate) $: hasStorageDeposit = activity?.storageDeposit || (activity?.storageDeposit === 0 && activity?.giftedStorageDeposit === 0) - $: gasBudget = activity?.parsedLayer2Metadata?.gasBudget + // Note: Because this component is used in both confirmation and tx history, + // we asume the gas budget is the same as the gas fee, + // its true for transactions made with firefly, but it might not be true for other wallets. + $: gasFee = activity?.parsedLayer2Metadata?.gasBudget $: formattedTransactionTime = getFormattedTimeStamp(activity?.time) $: formattedTimelockDate = getFormattedTimeStamp(activity?.asyncData?.timelockDate) $: formattedStorageDeposit = formatTokenAmountPrecise(activity?.storageDeposit ?? 0, getBaseToken()) $: formattedGiftedStorageDeposit = formatTokenAmountPrecise(activity?.giftedStorageDeposit ?? 0, getBaseToken()) $: formattedSurplus = formatTokenAmountPrecise(activity?.surplus ?? 0, getBaseToken()) - $: formattedGasBudget = formatTokenAmountPrecise(Number(gasBudget ?? 0), getBaseToken()) + $: formattedGasFee = formatTokenAmountPrecise(Number(gasFee ?? 0), getBaseToken()) let transactionDetailsList: IKeyValueBoxList $: transactionDetailsList = { @@ -49,8 +52,8 @@ ...(activity?.giftedStorageDeposit && { giftedStorageDeposit: { data: formattedGiftedStorageDeposit, isTooltipVisible: true }, }), - ...(gasBudget && { - gasBudget: { data: formattedGasBudget, isTooltipVisible: true }, + ...(gasFee && { + gasFee: { data: formattedGasFee, isTooltipVisible: true }, }), ...(expirationTime && { expirationTime: { data: expirationTime, isTooltipVisible: true }, diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json index 49be0201060..af5d6cc6860 100644 --- a/packages/shared/locales/en.json +++ b/packages/shared/locales/en.json @@ -1648,7 +1648,7 @@ "smartContract": "Smart Contract", "targetContract": "Target contract", "contractFunction": "Contract function", - "gasBudget": "Gas budget", + "gasFee": "Gas fee", "standard": "Standard", "uri": "URI", "issuer": "Issuer", @@ -2162,7 +2162,7 @@ "timelockDate": "The sender set a timelock on these funds. You will be able to spend them once the timelock expires.", "metadata": "An optional data field for storing data persistently on the Tangle.", "tag": "A short optional data field. Tagging groups of transactions can make them easier to search for.", - "gasBudget": "Gas budget is required to conduct a transaction or execute a smart contract function on Shimmer EVM." + "gasFee": "Gas fee is required to conduct a transaction or execute a smart contract function on Shimmer EVM." }, "outgoing": { "storageDeposit": "A storage deposit is a refundable deposit needed to store your transaction on the Tangle.", @@ -2171,7 +2171,7 @@ "timelockDate": "You added a timelock to this transaction. The recipient will not be able to spend these funds until the timelock expires.", "metadata": "An optional data field for storing data persistently on the Tangle.", "tag": "A short optional data field. Tagging groups of transactions can make them easier to search for.", - "gasBudget": "Gas budget is required to conduct a transaction or execute a smart contract function on Shimmer EVM." + "gasFee": "Gas fee is required to conduct a transaction or execute a smart contract function on Shimmer EVM." }, "nftMetadata": { "standard": "The NFT standard e.g. IRC27.",