feat: add mana to txs in tx activities and activity details

packages/shared/components/activity-info/GenericActivityInformation.svelte

@@ -2,8 +2,8 @@
     import { KeyValueBox } from '@ui'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { activeProfile, getBaseToken } from '@core/profile'
-    import { Activity, formatTokenAmountPrecise } from '@core/wallet'
-    import { ExplorerEndpoint } from '@core/network'
+    import { Activity, ActivityDirection, formatTokenAmountBestMatch, formatTokenAmountPrecise } from '@core/wallet'
+    import { DEFAULT_MANA, ExplorerEndpoint } from '@core/network'
     import { getOfficialExplorerUrl } from '@core/network/utils'
     import { openUrlInBrowser } from '@core/app'
     import { IKeyValueBoxList, truncateString } from '@core/utils'
@@ -28,6 +28,8 @@
     $: formattedGiftedStorageDeposit = formatTokenAmountPrecise(activity?.giftedStorageDeposit ?? 0, getBaseToken())
     $: formattedSurplus = formatTokenAmountPrecise(activity?.surplus ?? 0, getBaseToken())
     $: formattedGasFee = formatTokenAmountPrecise(Number(gasFee ?? 0), getBaseToken())
+    $: formattedManaPrefix = activity.direction === ActivityDirection.Incoming ? '' : '- '
+    $: formattedMana = formattedManaPrefix + formatTokenAmountBestMatch(Number(activity?.mana ?? 0), DEFAULT_MANA)
 
     let transactionDetailsList: IKeyValueBoxList
     $: transactionDetailsList = {
@@ -62,6 +64,9 @@
             timelockDate: { data: formattedTimelockDate, isTooltipVisible: true },
         }),
         ...(claimedTime && { claimedTime: { data: claimedTime } }),
+        ...(typeof activity?.mana === 'number' && {
+            mana: { data: formattedMana },
+        }),
     }
 
     function onTransactionIdClick(): void {

packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts

@@ -11,6 +11,7 @@ export interface IProcessedTransaction {
     utxoInputs: UTXOInput[]
     wrappedInputs: IWrappedOutput[]
     claimingData?: IClaimData
+    mana: number
 }
 
 export interface IClaimData {

packages/shared/lib/core/wallet/types/activities/base-activity.type.ts

@@ -23,6 +23,7 @@ export type BaseActivity = {
     asyncData: AsyncData
     destinationNetwork?: string
     parsedLayer2Metadata?: Partial<Layer2Metadata>
+    mana: number
 }
 
 export type AsyncData = {

packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAccountActivity.ts

@@ -18,7 +18,7 @@ export async function generateSingleAccountActivity(
     wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<AccountActivity> {
-    const { transactionId, claimingData, direction, time, inclusionState } = processedTransaction
+    const { transactionId, claimingData, direction, time, inclusionState, mana } = processedTransaction
 
     const output = wrappedOutput.output as AccountOutput
     const outputId = wrappedOutput.outputId
@@ -57,6 +57,7 @@ export async function generateSingleAccountActivity(
         inclusionState,
         containsValue,
         asyncData,
+        mana,
         ...sendingInfo,
     }
 }

packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts

@@ -17,7 +17,7 @@ export async function generateSingleAnchorActivity(
     wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<AnchorActivity> {
-    const { transactionId, claimingData, direction, time, inclusionState } = processedTransaction
+    const { transactionId, claimingData, direction, time, inclusionState, mana } = processedTransaction
 
     const output = wrappedOutput.output as AnchorOutput
     const outputId = wrappedOutput.outputId
@@ -56,6 +56,7 @@ export async function generateSingleAnchorActivity(
         inclusionState,
         containsValue,
         asyncData,
+        mana,
         ...sendingInfo,
     }
 }

packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts

@@ -23,7 +23,7 @@ export async function generateSingleBasicActivity(
     fallbackAssetId?: string,
     fallbackAmount?: number
 ): Promise<TransactionActivity> {
-    const { transactionId, direction, claimingData, time, inclusionState } = processedTransaction
+    const { transactionId, direction, claimingData, time, inclusionState, mana } = processedTransaction
 
     const isHidden = false
     const isAssetHidden = false
@@ -102,6 +102,7 @@ export async function generateSingleBasicActivity(
         asyncData,
         destinationNetwork,
         parsedLayer2Metadata,
+        mana,
         ...sendingInfo,
     }
 }

packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts

@@ -16,7 +16,7 @@ export async function generateSingleConsolidationActivity(
     wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<ConsolidationActivity> {
-    const { transactionId, direction, claimingData, time, inclusionState, wrappedInputs } = processedTransaction
+    const { transactionId, direction, claimingData, time, inclusionState, wrappedInputs, mana } = processedTransaction
 
     const isHidden = false
     const isAssetHidden = false
@@ -54,6 +54,7 @@ export async function generateSingleConsolidationActivity(
         tag,
         asyncData,
         amountConsolidatedInputs,
+        mana,
         ...sendingInfo,
     }
 }

packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts

@@ -23,7 +23,7 @@ export async function generateSingleFoundryActivity(
     wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<FoundryActivity> {
-    const { transactionId, claimingData, time, direction, inclusionState } = processedTransaction
+    const { transactionId, claimingData, time, direction, inclusionState, mana } = processedTransaction
 
     const output = wrappedOutput.output as FoundryOutput
     const outputId = wrappedOutput.outputId
@@ -78,6 +78,7 @@ export async function generateSingleFoundryActivity(
         metadata,
         tag,
         asyncData,
+        mana,
         ...sendingInfo,
     }
 }

packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts

@@ -17,7 +17,7 @@ export async function generateSingleGovernanceActivity(
     wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<GovernanceActivity> {
-    const { transactionId, direction, time, inclusionState, wrappedInputs } = processedTransaction
+    const { transactionId, direction, time, inclusionState, wrappedInputs, mana } = processedTransaction
 
     const isHidden = false
     const isAssetHidden = false
@@ -55,6 +55,7 @@ export async function generateSingleGovernanceActivity(
         metadata,
         tag,
         asyncData: null,
+        mana,
         ...governanceInfo,
         ...sendingInfo,
     }

packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts

@@ -19,7 +19,7 @@ export async function generateSingleNftActivity(
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters,
     nftIdFromInput?: string
 ): Promise<NftActivity> {
-    const { claimingData, time, inclusionState, transactionId, direction } = processedTransaction
+    const { claimingData, time, inclusionState, transactionId, direction, mana } = processedTransaction
     const outputId = wrappedOutput.outputId
     const output = wrappedOutput.output as NftOutput
     const id = outputId || transactionId
@@ -81,5 +81,6 @@ export async function generateSingleNftActivity(
         direction,
         destinationNetwork,
         parsedLayer2Metadata,
+        mana,
     }
 }

packages/shared/lib/core/wallet/utils/generateActivity/generateVestingActivity.ts

@@ -19,7 +19,7 @@ export async function generateVestingActivity(
     wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<VestingActivity> {
-    const { transactionId, direction, claimingData, time, inclusionState } = processedTransaction
+    const { transactionId, direction, claimingData, time, inclusionState, mana } = processedTransaction
 
     const isHidden = false
     const isAssetHidden = false
@@ -63,6 +63,7 @@ export async function generateVestingActivity(
         tag,
         asyncData,
         destinationNetwork,
+        mana,
         ...sendingInfo,
         ...parsedLayer2Metadata,
     }

packages/shared/lib/core/wallet/utils/outputs/preprocessIncomingTransaction.ts

@@ -1,5 +1,5 @@
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
-import { Output, OutputType, OutputWithMetadata, TransactionWithMetadata, UTXOInput } from '@iota/sdk/out/types'
+import { Output, OutputType, TransactionWithMetadata, UTXOInput } from '@iota/sdk/out/types'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
 import { ActivityDirection } from '../../enums'
 import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network'
@@ -24,13 +24,18 @@ export function preprocessIncomingTransaction(transaction: TransactionWithMetada
         remainder: true,
     }))
 
+    const manaCost = outputs
+        .filter((output) => !output.remainder)
+        .reduce((acc, output) => acc + Number(output.output.mana), 0)
+
     return {
         outputs,
         transactionId,
         direction: ActivityDirection.Incoming,
         time: new Date(slotUnixTimestamp * MILLISECONDS_PER_SECOND),
         inclusionState: transaction.inclusionState,
         wrappedInputs: <IWrappedOutput[]>inputs,
+        mana: manaCost,
         utxoInputs,
     }
 }
@@ -50,7 +55,6 @@ function convertTransactionOutputTypeToWrappedOutput(
     outputType: Output
 ): IWrappedOutput {
     const outputId = getOutputIdFromTransactionIdAndIndex(transactionId, index)
-    OutputWithMetadata
     return {
         outputId,
         output: outputType,

packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts

@@ -1,9 +1,17 @@
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
-import { Output, OutputType, OutputWithMetadata, TransactionWithMetadata, UTXOInput } from '@iota/sdk/out/types'
+import {
+    AccountOutput,
+    Output,
+    OutputType,
+    OutputWithMetadata,
+    TransactionWithMetadata,
+    UTXOInput,
+} from '@iota/sdk/out/types'
 import { computeOutputId } from './computeOutputId'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
 import { getDirectionFromOutgoingTransaction } from '../transactions'
 import { IWalletState } from '@core/wallet/interfaces'
+import { getPassiveManaForOutput } from '@core/network'
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
 import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network'
 import { get } from 'svelte/store'
@@ -31,12 +39,24 @@ export async function preprocessOutgoingTransaction(
 
     const inputs = await Promise.all(inputIds.map((inputId) => wallet.getOutput(inputId)))
 
+    let manaCost = 0
+    const prevAccountOutput = inputs.find((input) => (input.output as AccountOutput).accountId)
+    if (prevAccountOutput) {
+        const prevMana = getPassiveManaForOutput(prevAccountOutput) ?? 0
+        const postAccountOutput = outputs.find(
+            (output) =>
+                (prevAccountOutput.output as AccountOutput).accountId === (output.output as AccountOutput).accountId
+        )
+        manaCost = prevMana - Number(postAccountOutput?.output?.mana ?? 0)
+    }
+
     return {
         outputs: outputs,
         transactionId,
         direction,
         time: new Date(slotUnixTimestamp * MILLISECONDS_PER_SECOND),
         inclusionState: transaction.inclusionState,
+        mana: manaCost,
         wrappedInputs: <IWrappedOutput[]>inputs,
     }
 }

packages/shared/locales/en.json

@@ -1733,7 +1733,8 @@
         "manaCost": "Estimated Mana cost",
         "availableMana": "Available mana",
         "insufficientMana": "Insufficient {availableMana}.",
-        "secondsToRefreshManaCost": "{seconds} seconds to refresh the mana cost"
+        "secondsToRefreshManaCost": "{seconds} seconds to refresh the mana cost",
+        "mana": "Mana"
     },
     "filters":{
         "title": "Filters",