From 8228842859dcc915a745a093104be7acbaadb698 Mon Sep 17 00:00:00 2001
From: MarkNerdi <105642810+MarkNerdi@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:47:37 +0100
Subject: [PATCH] refactor: activity generation (#5464)

* refactor: add wrapped inputs to processedTransaction

* refactor: initial separation of activity generation functions

Co-authored-by: MarkNerdi <MarkNerdi@users.noreply.github.com>

* refactor: exclude remainder

* refactor: extract tile title calculation

* refactor: update all inclusionsstates if transaction is confirmed

* chore: improve empty inputs check

* fix: fix type narrowing

* chore: move functions to own files

* fix: fix generation with inputs

* enhancement: create multiple

* refactor: create multiple activities from the same type in one transaction

Co-authored-by: Jason Kraft <jason.kraft@iota.org>

* chore: remove unused functions

* chore: rename generator functions

* chore: extract functions into own files

* Update packages/shared/lib/core/wallet/utils/getActivityTileTitle.ts

Co-authored-by: Jason Kraft <jason.kraft@iota.org>

* Update packages/shared/locales/en.json

Co-authored-by: Jason Kraft <jason.kraft@iota.org>

* fix: fix empty activity list

Co-authored-by: Nicole O'Brien <nicole.obrien@iota.org>
Co-authored-by: MarkNerdi <MarkNerdi@users.noreply.github.com>
Co-authored-by: Jason Kraft <jason.kraft@iota.org>
Co-authored-by: Jason Kraft <developer.kraft@gmail.com>
---
 .../AliasActivityTileContent.svelte           |  8 +-
 .../FoundryActivityTileContent.svelte         |  5 +-
 .../NftActivityTileContent.svelte             | 22 +----
 .../TransactionActivityTileContent.svelte     | 22 +----
 .../popups/AliasConfirmationPopup.svelte      |  8 +-
 .../governance/actions/setVotingPower.ts      | 10 +--
 .../events-handlers/handleNewOutputEvent.ts   | 16 ++--
 ...rateActivitiesFromProcessedTransactions.ts |  6 +-
 .../lib/core/wallet/actions/burnAsset.ts      |  8 +-
 .../shared/lib/core/wallet/actions/burnNft.ts |  8 +-
 .../core/wallet/actions/consolidateOutputs.ts |  8 +-
 .../core/wallet/actions/mintNativeToken.ts    | 22 +++--
 .../shared/lib/core/wallet/actions/mintNft.ts | 32 ++++---
 .../lib/core/wallet/actions/sendOutput.ts     | 12 ++-
 .../core/wallet/enums/activity-action.enum.ts |  1 +
 ...ctivity-generation-parameters.interface.ts |  9 ++
 .../lib/core/wallet/interfaces/index.ts       |  1 +
 .../stores/all-account-activities.store.ts    | 19 +++-
 .../selected-account-activities.store.ts      |  7 +-
 .../generateActivity/generateActivities.ts    | 90 +++++++++++++++++++
 .../generateActivity/generateActivity.ts      | 22 -----
 .../generateAliasActivitiesFromTransaction.ts | 26 ++++++
 .../generateBasicActivitiesFromTransaction.ts | 27 ++++++
 ...enerateFoundryActivitiesFromTransaction.ts | 24 +++++
 .../generateNftActivitiesFromTransaction.ts   | 26 ++++++
 ...vity.ts => generateSingleAliasActivity.ts} | 24 +++--
 ...vity.ts => generateSingleBasicActivity.ts} | 19 ++--
 ...ty.ts => generateSingleFoundryActivity.ts} | 31 +++----
 ...tivity.ts => generateSingleNftActivity.ts} | 21 +++--
 .../helper/getActivityTypeFromOutput.ts       | 16 ++++
 .../helper/getAsyncDataFromOutput.ts          |  2 +-
 .../helper/getSendingInformation.ts           |  2 +-
 .../utils/generateActivity/helper/index.ts    |  1 +
 .../wallet/utils/generateActivity/index.ts    |  2 +-
 .../core/wallet/utils/getActivityTileTitle.ts | 28 ++++++
 .../lib/core/wallet/utils/getActivityType.ts  | 17 ----
 .../shared/lib/core/wallet/utils/index.ts     |  2 +-
 .../utils/outputs/preprocessGroupedOutputs.ts |  1 +
 .../utils/outputs/preprocessTransaction.ts    |  6 +-
 .../activityOutputContainsValue.ts            | 22 +++++
 .../getFoundryOutputFromTransaction.ts        |  7 --
 .../getNftOutputFromTransaction.ts            |  7 --
 ...onRemainderBasicOutputsFromTransaction.ts} |  6 +-
 .../core/wallet/utils/transactions/index.ts   |  6 +-
 .../utils/transactions/outputContainsValue.ts | 28 ------
 45 files changed, 423 insertions(+), 264 deletions(-)
 create mode 100644 packages/shared/lib/core/wallet/interfaces/activity-generation-parameters.interface.ts
 create mode 100644 packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
 delete mode 100644 packages/shared/lib/core/wallet/utils/generateActivity/generateActivity.ts
 create mode 100644 packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivitiesFromTransaction.ts
 create mode 100644 packages/shared/lib/core/wallet/utils/generateActivity/generateBasicActivitiesFromTransaction.ts
 create mode 100644 packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivitiesFromTransaction.ts
 create mode 100644 packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivitiesFromTransaction.ts
 rename packages/shared/lib/core/wallet/utils/generateActivity/{generateAliasActivity.ts => generateSingleAliasActivity.ts} (71%)
 rename packages/shared/lib/core/wallet/utils/generateActivity/{generateTransactionActivity.ts => generateSingleBasicActivity.ts} (80%)
 rename packages/shared/lib/core/wallet/utils/generateActivity/{generateFoundryActivity.ts => generateSingleFoundryActivity.ts} (78%)
 rename packages/shared/lib/core/wallet/utils/generateActivity/{generateNftActivity.ts => generateSingleNftActivity.ts} (60%)
 create mode 100644 packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
 create mode 100644 packages/shared/lib/core/wallet/utils/getActivityTileTitle.ts
 delete mode 100644 packages/shared/lib/core/wallet/utils/getActivityType.ts
 create mode 100644 packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
 delete mode 100644 packages/shared/lib/core/wallet/utils/transactions/getFoundryOutputFromTransaction.ts
 delete mode 100644 packages/shared/lib/core/wallet/utils/transactions/getNftOutputFromTransaction.ts
 rename packages/shared/lib/core/wallet/utils/transactions/{getMainOutputFromTransaction.ts => getNonRemainderBasicOutputsFromTransaction.ts} (81%)
 delete mode 100644 packages/shared/lib/core/wallet/utils/transactions/outputContainsValue.ts

diff --git a/packages/shared/components/atoms/tiles/tileContents/AliasActivityTileContent.svelte b/packages/shared/components/atoms/tiles/tileContents/AliasActivityTileContent.svelte
index 06799b2d6ae..6f0707f07de 100644
--- a/packages/shared/components/atoms/tiles/tileContents/AliasActivityTileContent.svelte
+++ b/packages/shared/components/atoms/tiles/tileContents/AliasActivityTileContent.svelte
@@ -1,11 +1,13 @@
 <script lang="typescript">
     import { localize } from '@core/i18n'
-    import { InclusionState, AliasActivity } from '@core/wallet'
+    import { AliasActivity, getActivityTileTitle } from '@core/wallet'
     import { truncateString } from '@core/utils'
     import { Text, Icon, FontWeight } from 'shared/components'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
 
     export let activity: AliasActivity
+
+    $: title = getActivityTileTitle(activity)
 </script>
 
 <div class="relative flex w-8 h-8">
@@ -25,9 +27,7 @@
             lineHeight="140"
             classes="overflow-hidden overflow-ellipsis multiwrap-line2"
         >
-            {localize(
-                activity.inclusionState === InclusionState.Confirmed ? 'general.aliasCreated' : 'general.creatingAlias'
-            )}
+            {localize(title)}
         </Text>
     </div>
     <div class="flex flex-row">
diff --git a/packages/shared/components/atoms/tiles/tileContents/FoundryActivityTileContent.svelte b/packages/shared/components/atoms/tiles/tileContents/FoundryActivityTileContent.svelte
index 88512fbb2db..bc31a48b0f7 100644
--- a/packages/shared/components/atoms/tiles/tileContents/FoundryActivityTileContent.svelte
+++ b/packages/shared/components/atoms/tiles/tileContents/FoundryActivityTileContent.svelte
@@ -2,9 +2,9 @@
     import { localize } from '@core/i18n'
     import {
         FoundryActivity,
+        getActivityTileTitle,
         getAssetFromPersistedAssets,
         getFormattedAmountFromActivity,
-        InclusionState,
         IPersistedAsset,
         selectedAccountAssets,
     } from '@core/wallet'
@@ -15,6 +15,7 @@
 
     let asset: IPersistedAsset
     $: $selectedAccountAssets, (asset = getAssetFromPersistedAssets(activity.assetId))
+    $: title = getActivityTileTitle(activity)
     $: amount = getFormattedAmountFromActivity(activity)
 </script>
 
@@ -26,7 +27,7 @@
             lineHeight="140"
             classes="overflow-hidden overflow-ellipsis multiwrap-line2"
         >
-            {localize(activity.inclusionState === InclusionState.Confirmed ? 'general.minted' : 'general.minting')}
+            {localize(title)}
         </Text>
         <Text fontWeight={FontWeight.semibold} lineHeight="140" color="blue-700" classes="whitespace-nowrap">
             {amount}
diff --git a/packages/shared/components/atoms/tiles/tileContents/NftActivityTileContent.svelte b/packages/shared/components/atoms/tiles/tileContents/NftActivityTileContent.svelte
index a3fd4f08180..1efa0b20194 100644
--- a/packages/shared/components/atoms/tiles/tileContents/NftActivityTileContent.svelte
+++ b/packages/shared/components/atoms/tiles/tileContents/NftActivityTileContent.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { localize } from '@core/i18n'
-    import { ActivityAction, ActivityDirection, InclusionState, NftActivity, Subject } from '@core/wallet'
+    import { ActivityDirection, getActivityTileTitle, NftActivity, Subject } from '@core/wallet'
     import { truncateString } from '@core/utils'
     import { Text, FontWeight, NftImageOrIconBox } from 'shared/components'
     import { networkHrp } from '@core/network'
@@ -11,29 +11,11 @@
 
     $: isIncoming =
         activity.direction === ActivityDirection.Incoming || activity.direction === ActivityDirection.SelfTransaction
-    $: title = getTitle(activity)
+    $: title = getActivityTileTitle(activity)
     $: subjectLocale = getSubjectLocale(activity.subject)
 
     $: nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
 
-    function getTitle(_activity: NftActivity): string {
-        const { isInternal, direction, inclusionState, action } = _activity
-        const isConfirmed = inclusionState === InclusionState.Confirmed
-
-        if (action === ActivityAction.Mint) {
-            return isConfirmed ? 'general.minted' : 'general.minting'
-        }
-        if (isInternal) {
-            return isConfirmed ? 'general.transfer' : 'general.transferring'
-        }
-        if (direction === ActivityDirection.Incoming || direction === ActivityDirection.SelfTransaction) {
-            return isConfirmed ? 'general.received' : 'general.receiving'
-        }
-        if (direction === ActivityDirection.Outgoing) {
-            return isConfirmed ? 'general.sent' : 'general.sending'
-        }
-    }
-
     function getSubjectLocale(subject: Subject): string {
         let description
         if (subject?.type === 'account') {
diff --git a/packages/shared/components/atoms/tiles/tileContents/TransactionActivityTileContent.svelte b/packages/shared/components/atoms/tiles/tileContents/TransactionActivityTileContent.svelte
index 1e6e3c81296..846afc8e624 100644
--- a/packages/shared/components/atoms/tiles/tileContents/TransactionActivityTileContent.svelte
+++ b/packages/shared/components/atoms/tiles/tileContents/TransactionActivityTileContent.svelte
@@ -3,12 +3,12 @@
     import { networkHrp } from '@core/network'
     import {
         ActivityDirection,
-        InclusionState,
         IPersistedAsset,
         getFormattedAmountFromActivity,
         TransactionActivity,
         selectedAccountAssets,
         getAssetFromPersistedAssets,
+        getActivityTileTitle,
     } from '@core/wallet'
     import { truncateString } from '@core/utils'
     import { Text, AssetIcon, FontWeight } from 'shared/components'
@@ -17,30 +17,12 @@
 
     let asset: IPersistedAsset
     $: $selectedAccountAssets, (asset = getAssetFromPersistedAssets(activity.assetId))
-    $: title = getTitle(activity)
+    $: title = getActivityTileTitle(activity)
     $: subjectLocale = getSubjectLocale(activity)
     $: amount = getFormattedAmountFromActivity(activity)
     $: isIncoming =
         activity.direction === ActivityDirection.Incoming || activity.direction === ActivityDirection.SelfTransaction
 
-    function getTitle(_activity: TransactionActivity): string {
-        const { isShimmerClaiming, isInternal, direction, inclusionState } = _activity
-        const isConfirmed = inclusionState === InclusionState.Confirmed
-
-        if (isShimmerClaiming) {
-            return isConfirmed ? 'general.shimmerClaimed' : 'general.shimmerClaiming'
-        }
-        if (isInternal) {
-            return isConfirmed ? 'general.transfer' : 'general.transferring'
-        }
-        if (direction === ActivityDirection.Incoming || direction === ActivityDirection.SelfTransaction) {
-            return isConfirmed ? 'general.received' : 'general.receiving'
-        }
-        if (direction === ActivityDirection.Outgoing) {
-            return isConfirmed ? 'general.sent' : 'general.sending'
-        }
-    }
-
     function getSubjectLocale(_activity: TransactionActivity): string {
         const { isShimmerClaiming, subject } = _activity
         if (isShimmerClaiming) {
diff --git a/packages/shared/components/popups/AliasConfirmationPopup.svelte b/packages/shared/components/popups/AliasConfirmationPopup.svelte
index a1a0e01a289..7a04ba98548 100644
--- a/packages/shared/components/popups/AliasConfirmationPopup.svelte
+++ b/packages/shared/components/popups/AliasConfirmationPopup.svelte
@@ -4,10 +4,10 @@
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth, activeProfile } from '@core/profile'
     import {
-        addActivityToAccountActivitiesInAllAccountActivities,
+        addActivitiesToAccountActivitiesInAllAccountActivities,
         convertBech32ToHexAddress,
         formatTokenAmountPrecise,
-        generateActivity,
+        generateActivities,
         EMPTY_HEX_ID,
         preprocessTransaction,
         UNLOCK_CONDITION_GOVERNOR_ADDRESS,
@@ -59,8 +59,8 @@
             updateSelectedAccount({ isTransferring: true })
             const transaction = await $selectedAccount.createAliasOutput()
             const processedTransaction = await preprocessTransaction(transaction, $selectedAccount)
-            const activity = generateActivity(processedTransaction, $selectedAccount)
-            addActivityToAccountActivitiesInAllAccountActivities($selectedAccount.index, activity)
+            const activities = generateActivities(processedTransaction, $selectedAccount)
+            addActivitiesToAccountActivitiesInAllAccountActivities($selectedAccount.index, activities)
             closePopup()
         } catch (err) {
             handleError(err)
diff --git a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
index aec94ed5c4a..66cb9c2df60 100644
--- a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
+++ b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
@@ -1,11 +1,11 @@
-import { get } from 'svelte/store'
 import { selectedAccount, updateSelectedAccount } from '@core/account'
 import {
-    addActivityToAccountActivitiesInAllAccountActivities,
-    generateActivity,
+    addActivitiesToAccountActivitiesInAllAccountActivities,
+    generateActivities,
     preprocessTransaction,
 } from '@core/wallet'
 import { Transaction } from '@iota/wallet'
+import { get } from 'svelte/store'
 
 export async function setVotingPower(rawAmount: string): Promise<void> {
     try {
@@ -31,6 +31,6 @@ export async function setVotingPower(rawAmount: string): Promise<void> {
 async function processAndAddToActivities(transaction: Transaction): Promise<void> {
     const account = get(selectedAccount)
     const preprocessedTransaction = await preprocessTransaction(transaction, account)
-    const activity = generateActivity(preprocessedTransaction, account)
-    addActivityToAccountActivitiesInAllAccountActivities(account.index, activity)
+    const activities = generateActivities(preprocessedTransaction, account)
+    addActivitiesToAccountActivitiesInAllAccountActivities(account.index, activities)
 }
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
index 8adb675910a..7bf7afbce63 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
@@ -1,10 +1,10 @@
 import { syncBalance } from '@core/account/actions/syncBalance'
 import { addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput, getIsSpendableFromUnspentNftOutput } from '@core/nfts'
 import { activeAccounts } from '@core/profile/stores'
-import { ActivityType, addPersistedAsset, generateActivity, getOrRequestAssetFromPersistedAssets } from '@core/wallet'
+import { ActivityType, addPersistedAsset, generateActivities, getOrRequestAssetFromPersistedAssets } from '@core/wallet'
 import { OUTPUT_TYPE_ALIAS, OUTPUT_TYPE_NFT } from '@core/wallet/constants'
 import {
-    addActivityToAccountActivitiesInAllAccountActivities,
+    addActivitiesToAccountActivitiesInAllAccountActivities,
     allAccountActivities,
 } from '@core/wallet/stores/all-account-activities.store'
 import { getBech32AddressFromAddressTypes } from '@core/wallet/utils/getBech32AddressFromAddressTypes'
@@ -40,12 +40,14 @@ export async function handleNewOutputEventInternal(
 
         const processedOutput = preprocessGroupedOutputs([output], payload?.transactionInputs ?? [], account)
 
-        const activity = generateActivity(processedOutput, account)
-        if (activity.type === ActivityType.Basic || activity.type === ActivityType.Foundry) {
-            const asset = await getOrRequestAssetFromPersistedAssets(activity.assetId)
-            addPersistedAsset(asset)
+        const activities = generateActivities(processedOutput, account)
+        for (const activity of activities) {
+            if (activity.type === ActivityType.Basic || activity.type === ActivityType.Foundry) {
+                const asset = await getOrRequestAssetFromPersistedAssets(activity.assetId)
+                addPersistedAsset(asset)
+            }
         }
-        addActivityToAccountActivitiesInAllAccountActivities(account.index, activity)
+        addActivitiesToAccountActivitiesInAllAccountActivities(account.index, activities)
     }
 
     if (isNftOutput) {
diff --git a/packages/shared/lib/core/wallet/actions/activities/generateActivitiesFromProcessedTransactions.ts b/packages/shared/lib/core/wallet/actions/activities/generateActivitiesFromProcessedTransactions.ts
index 095d9e590b3..49a11fd3ba9 100644
--- a/packages/shared/lib/core/wallet/actions/activities/generateActivitiesFromProcessedTransactions.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/generateActivitiesFromProcessedTransactions.ts
@@ -1,7 +1,7 @@
 import { IAccountState } from '@core/account'
 import { IProcessedTransaction } from '@core/wallet/interfaces/processed-transaction.interface'
 import { Activity } from '@core/wallet/types'
-import { generateActivity } from '@core/wallet/utils'
+import { generateActivities } from '@core/wallet/utils'
 
 export function generateActivitiesFromProcessedTransactions(
     processedTransactions: IProcessedTransaction[],
@@ -10,8 +10,8 @@ export function generateActivitiesFromProcessedTransactions(
     const activities: Activity[] = []
     for (const _preparedActivity of processedTransactions) {
         try {
-            const activity = generateActivity(_preparedActivity, account)
-            activities.push(activity)
+            const activitiesToAdd = generateActivities(_preparedActivity, account)
+            activities.push(...activitiesToAdd)
         } catch (err) {
             console.error(err)
         }
diff --git a/packages/shared/lib/core/wallet/actions/burnAsset.ts b/packages/shared/lib/core/wallet/actions/burnAsset.ts
index d8064ca5e47..2ee0ef2a551 100644
--- a/packages/shared/lib/core/wallet/actions/burnAsset.ts
+++ b/packages/shared/lib/core/wallet/actions/burnAsset.ts
@@ -6,8 +6,8 @@ import { handleLedgerError } from '@core/ledger'
 import { activeProfile, ProfileType } from '@core/profile'
 import { Converter } from '@core/utils'
 import { get } from 'svelte/store'
-import { addActivityToAccountActivitiesInAllAccountActivities } from '../stores'
-import { generateActivity, preprocessTransaction } from '../utils'
+import { addActivitiesToAccountActivitiesInAllAccountActivities } from '../stores'
+import { generateActivities, preprocessTransaction } from '../utils'
 
 export async function burnAsset(assetId: string, rawAmount: string): Promise<void> {
     const account = get(selectedAccount)
@@ -20,8 +20,8 @@ export async function burnAsset(assetId: string, rawAmount: string): Promise<voi
 
         // Generate Activity
         const processedTransaction = await preprocessTransaction(burnTokenTransaction, account)
-        const activity = generateActivity(processedTransaction, account)
-        addActivityToAccountActivitiesInAllAccountActivities(account.index, activity)
+        const activities = generateActivities(processedTransaction, account)
+        addActivitiesToAccountActivitiesInAllAccountActivities(account.index, activities)
 
         showAppNotification({
             type: 'success',
diff --git a/packages/shared/lib/core/wallet/actions/burnNft.ts b/packages/shared/lib/core/wallet/actions/burnNft.ts
index 8f536dc1bf3..38bfd562cb6 100644
--- a/packages/shared/lib/core/wallet/actions/burnNft.ts
+++ b/packages/shared/lib/core/wallet/actions/burnNft.ts
@@ -6,8 +6,8 @@ import { handleLedgerError } from '@core/ledger'
 import { updateNftInAllAccountNfts } from '@core/nfts'
 import { activeProfile, ProfileType } from '@core/profile'
 import { get } from 'svelte/store'
-import { addActivityToAccountActivitiesInAllAccountActivities } from '../stores'
-import { generateActivity, preprocessTransaction } from '../utils'
+import { addActivitiesToAccountActivitiesInAllAccountActivities } from '../stores'
+import { generateActivities, preprocessTransaction } from '../utils'
 
 export async function burnNft(nftId: string): Promise<void> {
     const account = get(selectedAccount)
@@ -17,8 +17,8 @@ export async function burnNft(nftId: string): Promise<void> {
 
         // Generate Activity
         const processedTransaction = await preprocessTransaction(burnNftTransaction, account)
-        const activity = generateActivity(processedTransaction, account)
-        addActivityToAccountActivitiesInAllAccountActivities(account.index, activity)
+        const activities = generateActivities(processedTransaction, account)
+        addActivitiesToAccountActivitiesInAllAccountActivities(account.index, activities)
 
         // Update NFT
         updateNftInAllAccountNfts(account.index, nftId, { isSpendable: false })
diff --git a/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts b/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts
index 6826160c67f..ed820e457e3 100644
--- a/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts
+++ b/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts
@@ -3,8 +3,8 @@ import { handleError } from '@core/error/handlers/handleError'
 import { handleLedgerError } from '@core/ledger'
 import { activeProfile, ProfileType } from '@core/profile'
 import { get } from 'svelte/store'
-import { addActivityToAccountActivitiesInAllAccountActivities } from '../stores'
-import { generateActivity, preprocessTransaction } from '../utils'
+import { addActivitiesToAccountActivitiesInAllAccountActivities } from '../stores'
+import { generateActivities, preprocessTransaction } from '../utils'
 
 export async function consolidateOutputs(): Promise<void> {
     const account = get(selectedAccount)
@@ -12,8 +12,8 @@ export async function consolidateOutputs(): Promise<void> {
     try {
         const transaction = await account.consolidateOutputs(false, 2)
         const processedTransaction = await preprocessTransaction(transaction, account)
-        const activity = generateActivity(processedTransaction, account)
-        addActivityToAccountActivitiesInAllAccountActivities(account.index, activity)
+        const activities = generateActivities(processedTransaction, account)
+        addActivitiesToAccountActivitiesInAllAccountActivities(account.index, activities)
     } catch (err) {
         if (_activeProfile.type === ProfileType.Ledger) {
             handleLedgerError(err)
diff --git a/packages/shared/lib/core/wallet/actions/mintNativeToken.ts b/packages/shared/lib/core/wallet/actions/mintNativeToken.ts
index 7a3d2c0fe47..114be78c8dc 100644
--- a/packages/shared/lib/core/wallet/actions/mintNativeToken.ts
+++ b/packages/shared/lib/core/wallet/actions/mintNativeToken.ts
@@ -1,17 +1,17 @@
-import { get } from 'svelte/store'
+import { showAppNotification } from '@auxiliary/notification'
 import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { localize } from '@core/i18n'
-import { NativeTokenOptions, TransactionOptions } from '@iota/wallet'
-import { Converter } from '@core/utils'
-import { showAppNotification } from '@auxiliary/notification'
-import { activeProfile, ProfileType } from '@core/profile'
 import { handleLedgerError } from '@core/ledger'
+import { activeProfile, ProfileType } from '@core/profile'
+import { Converter } from '@core/utils'
+import { NativeTokenOptions, TransactionOptions } from '@iota/wallet'
+import { get } from 'svelte/store'
+import { VerifiedStatus } from '../enums'
 import { buildPersistedAssetFromIrc30Metadata } from '../helpers'
 import { IIrc30Metadata, IPersistedAsset } from '../interfaces'
-import { addActivityToAccountActivitiesInAllAccountActivities, resetMintTokenDetails } from '../stores'
+import { addActivitiesToAccountActivitiesInAllAccountActivities, resetMintTokenDetails } from '../stores'
 import { addPersistedAsset } from '../stores/persisted-assets.store'
-import { generateActivity, preprocessTransaction } from '../utils'
-import { VerifiedStatus } from '../enums'
+import { generateActivities, preprocessTransaction } from '../utils'
 
 export async function mintNativeToken(
     maximumSupply: number,
@@ -38,10 +38,8 @@ export async function mintNativeToken(
         )
         const processedTransaction = await preprocessTransaction(mintTokenTransaction.transaction, account)
         addPersistedAsset(persistedAsset)
-        addActivityToAccountActivitiesInAllAccountActivities(
-            account.index,
-            generateActivity(processedTransaction, account)
-        )
+        const activities = generateActivities(processedTransaction, account)
+        addActivitiesToAccountActivitiesInAllAccountActivities(account.index, activities)
         showAppNotification({
             type: 'success',
             message: localize('notifications.mintNativeToken.success'),
diff --git a/packages/shared/lib/core/wallet/actions/mintNft.ts b/packages/shared/lib/core/wallet/actions/mintNft.ts
index b0f2da24aae..86aa6f4c5b1 100644
--- a/packages/shared/lib/core/wallet/actions/mintNft.ts
+++ b/packages/shared/lib/core/wallet/actions/mintNft.ts
@@ -5,14 +5,14 @@ import { handleLedgerError } from '@core/ledger'
 import { addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput, IIrc27Metadata } from '@core/nfts'
 import { activeProfile, ProfileType } from '@core/profile'
 import { Converter } from '@core/utils'
-import { INftOutput } from '@iota/types'
 import { NftOptions } from '@iota/wallet'
 import { get } from 'svelte/store'
-import { DEFAULT_TRANSACTION_OPTIONS } from '../constants'
+import { DEFAULT_TRANSACTION_OPTIONS, OUTPUT_TYPE_NFT } from '../constants'
+import { ActivityAction } from '../enums'
 import { addActivityToAccountActivitiesInAllAccountActivities, resetMintNftDetails } from '../stores'
 import { NftActivity } from '../types'
-import { getNftOutputFromTransaction, preprocessTransaction } from '../utils'
-import { generateActivity } from '../utils/generateActivity'
+import { preprocessTransaction } from '../utils'
+import { generateSingleNftActivity } from '../utils/generateActivity/generateSingleNftActivity'
 
 export async function mintNft(metadata: IIrc27Metadata, amount: number): Promise<void> {
     try {
@@ -35,15 +35,25 @@ export async function mintNft(metadata: IIrc27Metadata, amount: number): Promise
             alert: true,
         })
 
-        // Generate Activity
         const processedTransaction = await preprocessTransaction(mintNftTransaction, account)
-        const activity: NftActivity = generateActivity(processedTransaction, account) as NftActivity
-        addActivityToAccountActivitiesInAllAccountActivities(account.index, activity)
+        const outputs = processedTransaction.outputs
 
-        // Store NFT
-        const output = getNftOutputFromTransaction(processedTransaction.outputs)
-        const nft = buildNftFromNftOutput(output.output as INftOutput, activity.outputId, false)
-        addOrUpdateNftInAllAccountNfts(account.index, nft)
+        // Generate Activities
+        for (const output of outputs) {
+            if (output.output.type === OUTPUT_TYPE_NFT) {
+                // For each minted NFT, generate a new activity
+                const activity: NftActivity = generateSingleNftActivity(account, {
+                    action: ActivityAction.Mint,
+                    processedTransaction,
+                    wrappedOutput: output,
+                }) as NftActivity
+                addActivityToAccountActivitiesInAllAccountActivities(account.index, activity)
+
+                // Store NFT metadata for each minted NFT
+                const nft = buildNftFromNftOutput(output.output, activity.outputId, false)
+                addOrUpdateNftInAllAccountNfts(account.index, nft)
+            }
+        }
 
         return Promise.resolve()
     } catch (err) {
diff --git a/packages/shared/lib/core/wallet/actions/sendOutput.ts b/packages/shared/lib/core/wallet/actions/sendOutput.ts
index 4bcc65bcd0e..8f0bc1048c5 100644
--- a/packages/shared/lib/core/wallet/actions/sendOutput.ts
+++ b/packages/shared/lib/core/wallet/actions/sendOutput.ts
@@ -1,11 +1,11 @@
 import { selectedAccount, updateSelectedAccount } from '@core/account'
+import { handleLedgerError } from '@core/ledger'
 import { activeProfile, ProfileType } from '@core/profile'
 import { get } from 'svelte/store'
 import { DEFAULT_TRANSACTION_OPTIONS } from '../constants'
-import { addActivityToAccountActivitiesInAllAccountActivities, resetNewTokenTransactionDetails } from '../stores'
-import { handleLedgerError } from '@core/ledger'
-import { generateActivity, preprocessTransaction } from '../utils'
+import { addActivitiesToAccountActivitiesInAllAccountActivities, resetNewTokenTransactionDetails } from '../stores'
 import { Output } from '../types'
+import { generateActivities, preprocessTransaction } from '../utils'
 
 export async function sendOutput(output: Output): Promise<void> {
     try {
@@ -15,18 +15,16 @@ export async function sendOutput(output: Output): Promise<void> {
         // Reset transaction details state, since the transaction has been sent
         resetNewTokenTransactionDetails()
         const processedTransaction = await preprocessTransaction(transaction, account)
-        const activity = generateActivity(processedTransaction, account)
-        addActivityToAccountActivitiesInAllAccountActivities(account.index, activity)
+        const activities = generateActivities(processedTransaction, account)
+        addActivitiesToAccountActivitiesInAllAccountActivities(account.index, activities)
         updateSelectedAccount({ isTransferring: false })
         return
     } catch (err) {
         updateSelectedAccount({ isTransferring: false })
         const _activeProfile = get(activeProfile)
-
         if (_activeProfile.type === ProfileType.Ledger) {
             handleLedgerError(err.error)
         }
-
         throw err
     }
 }
diff --git a/packages/shared/lib/core/wallet/enums/activity-action.enum.ts b/packages/shared/lib/core/wallet/enums/activity-action.enum.ts
index d1e0235a2b2..0cbd6741b6b 100644
--- a/packages/shared/lib/core/wallet/enums/activity-action.enum.ts
+++ b/packages/shared/lib/core/wallet/enums/activity-action.enum.ts
@@ -1,4 +1,5 @@
 export enum ActivityAction {
     Send = 'send',
     Mint = 'mint',
+    Unknown = 'unknown',
 }
diff --git a/packages/shared/lib/core/wallet/interfaces/activity-generation-parameters.interface.ts b/packages/shared/lib/core/wallet/interfaces/activity-generation-parameters.interface.ts
new file mode 100644
index 00000000000..69382e6f98e
--- /dev/null
+++ b/packages/shared/lib/core/wallet/interfaces/activity-generation-parameters.interface.ts
@@ -0,0 +1,9 @@
+import { ActivityAction } from '../enums'
+import { IProcessedTransaction } from './processed-transaction.interface'
+import { IWrappedOutput } from './wrapped-output.interface'
+
+export interface IActivityGenerationParameters {
+    action: ActivityAction
+    processedTransaction: IProcessedTransaction
+    wrappedOutput: IWrappedOutput
+}
diff --git a/packages/shared/lib/core/wallet/interfaces/index.ts b/packages/shared/lib/core/wallet/interfaces/index.ts
index 4ed99b78610..9ce8b606d35 100644
--- a/packages/shared/lib/core/wallet/interfaces/index.ts
+++ b/packages/shared/lib/core/wallet/interfaces/index.ts
@@ -1,5 +1,6 @@
 export * from './account-assets.interface'
 export * from './account-subject.interface'
+export * from './activity-generation-parameters.interface'
 export * from './address-subject.interface'
 export * from './asset-balance.interface'
 export * from './asset.interface'
diff --git a/packages/shared/lib/core/wallet/stores/all-account-activities.store.ts b/packages/shared/lib/core/wallet/stores/all-account-activities.store.ts
index 867330ace92..35759e00b2a 100644
--- a/packages/shared/lib/core/wallet/stores/all-account-activities.store.ts
+++ b/packages/shared/lib/core/wallet/stores/all-account-activities.store.ts
@@ -17,6 +17,19 @@ export function addActivityToAccountActivitiesInAllAccountActivities(accountInde
     })
 }
 
+export function addActivitiesToAccountActivitiesInAllAccountActivities(
+    accountIndex: number,
+    activities: Activity[]
+): void {
+    allAccountActivities.update((state) => {
+        if (!state[accountIndex]) {
+            state[accountIndex] = []
+        }
+        state[accountIndex].push(...activities)
+        return state
+    })
+}
+
 export function setAccountActivitiesInAllAccountActivities(accountIndex: number, accountActivities: Activity[]): void {
     allAccountActivities.update((state) => {
         state[accountIndex] = accountActivities
@@ -34,11 +47,9 @@ export function updateActivityByTransactionId(
     partialBaseActivity: Partial<BaseActivity>
 ): void {
     allAccountActivities.update((state) => {
-        const activity = state[accountIndex]?.find((_activity) => _activity.transactionId === transactionId)
+        const activities = state[accountIndex]?.filter((_activity) => _activity.transactionId === transactionId)
 
-        if (activity) {
-            Object.assign(activity, partialBaseActivity)
-        }
+        activities.forEach((activity) => Object.assign(activity, partialBaseActivity))
         return state
     })
 }
diff --git a/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts b/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
index 349bb9a52d6..6bb2171c16d 100644
--- a/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
+++ b/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
@@ -4,7 +4,6 @@ import { isValidIrc30 } from '@core/token'
 import { selectedAccount } from '../../account/stores/selected-account.store'
 import { Activity } from '../types/activity.type'
 import {
-    ActivityAction,
     ActivityDirection,
     ActivityType,
     BooleanFilterOption,
@@ -120,11 +119,7 @@ export const queriedActivities: Readable<Activity[]> = derived(
     [selectedAccountActivities, activitySearchTerm, activityFilter],
     ([$selectedAccountActivities, $activitySearchTerm]) => {
         let activityList = $selectedAccountActivities.filter((_activity) => {
-            if (
-                !_activity.isHidden &&
-                (_activity.type === ActivityType.Nft ||
-                    (_activity.type === ActivityType.Alias && _activity.action === ActivityAction.Mint))
-            ) {
+            if (!_activity.isHidden && (_activity.type === ActivityType.Nft || _activity.type === ActivityType.Alias)) {
                 return true
             }
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
new file mode 100644
index 00000000000..263c226aa19
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
@@ -0,0 +1,90 @@
+import { IAccountState } from '@core/account'
+import {
+    ActivityAction,
+    ActivityType,
+    IProcessedTransaction,
+    OUTPUT_TYPE_ALIAS,
+    OUTPUT_TYPE_FOUNDRY,
+    OUTPUT_TYPE_NFT,
+} from '@core/wallet'
+import { Activity } from '@core/wallet/types'
+import { generateSingleAliasActivity } from './generateSingleAliasActivity'
+import { generateSingleFoundryActivity } from './generateSingleFoundryActivity'
+import { generateSingleNftActivity } from './generateSingleNftActivity'
+import { generateSingleBasicActivity } from './generateSingleBasicActivity'
+import { getActivityTypeFromOutput } from './helper'
+import { generateNftActivitiesFromTransaction } from './generateNftActivitiesFromTransaction'
+import { generateAliasActivitiesFromTransaction } from './generateAliasActivitiesFromTransaction'
+import { generateBasicActivitiesFromTransaction } from './generateBasicActivitiesFromTransaction'
+import { generateFoundryActivitiesFromTransaction } from './generateFoundryActivitiesFromTransaction'
+
+export function generateActivities(processedTransaction: IProcessedTransaction, account: IAccountState): Activity[] {
+    if (processedTransaction.wrappedInputs?.length > 0) {
+        return generateActivitiesFromProcessedTransactionsWithInputs(processedTransaction, account)
+    } else {
+        return generateActivitiesFromProcessedTransactionsWithoutInputs(processedTransaction, account)
+    }
+}
+
+function generateActivitiesFromProcessedTransactionsWithInputs(
+    processedTransaction: IProcessedTransaction,
+    account: IAccountState
+): Activity[] {
+    const outputs = processedTransaction.outputs
+    const activities: Activity[] = []
+
+    const containsFoundryActivity = outputs.some((output) => output.output.type === OUTPUT_TYPE_FOUNDRY)
+    if (containsFoundryActivity) {
+        const foundryActivities = generateFoundryActivitiesFromTransaction(processedTransaction, account)
+        activities.push(...foundryActivities)
+    }
+
+    const containsNftActivity = outputs.some((output) => output.output.type === OUTPUT_TYPE_NFT)
+    if (containsNftActivity) {
+        const nftActivities = generateNftActivitiesFromTransaction(processedTransaction, account)
+        activities.push(...nftActivities)
+    }
+
+    const containsAliasActivity =
+        outputs.some((output) => output.output.type === OUTPUT_TYPE_ALIAS) && !containsFoundryActivity
+    if (containsAliasActivity) {
+        const aliasActivities = generateAliasActivitiesFromTransaction(processedTransaction, account)
+        activities.push(...aliasActivities)
+    }
+
+    if (!containsFoundryActivity && !containsNftActivity && !containsAliasActivity) {
+        const basicActivities = generateBasicActivitiesFromTransaction(processedTransaction, account)
+        activities.push(...basicActivities)
+    }
+
+    return activities
+}
+
+/*
+ * If we cannot get the detailed inputs for a transaction, we would need to blind guess what the user did with the transaction.
+ * Therefore we set the action to `Unknown`
+ */
+function generateActivitiesFromProcessedTransactionsWithoutInputs(
+    processedTransaction: IProcessedTransaction,
+    account: IAccountState
+): Activity[] {
+    const nonRemainderOutputs = processedTransaction.outputs.filter((wrappedOutput) => !wrappedOutput.remainder)
+    return nonRemainderOutputs.map((wrappedOutput) => {
+        const params = {
+            type: getActivityTypeFromOutput(wrappedOutput),
+            action: ActivityAction.Unknown,
+            processedTransaction,
+            wrappedOutput,
+        }
+        switch (params.type) {
+            case ActivityType.Basic:
+                return generateSingleBasicActivity(account, params)
+            case ActivityType.Foundry:
+                return generateSingleFoundryActivity(account, params)
+            case ActivityType.Alias:
+                return generateSingleAliasActivity(account, params)
+            case ActivityType.Nft:
+                return generateSingleNftActivity(account, params)
+        }
+    })
+}
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivity.ts
deleted file mode 100644
index 1d5ecdefcb4..00000000000
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivity.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { IAccountState } from '@core/account'
-import { ActivityType, getActivityType, IProcessedTransaction } from '@core/wallet'
-import { Activity } from '@core/wallet/types'
-import { generateTransactionActivity } from './generateTransactionActivity'
-import { generateFoundryActivity } from './generateFoundryActivity'
-import { generateAliasActivity } from './generateAliasActivity'
-import { generateNftActivity } from './generateNftActivity'
-
-export function generateActivity(processedTransaction: IProcessedTransaction, account: IAccountState): Activity {
-    const type = getActivityType(processedTransaction.outputs)
-
-    switch (type) {
-        case ActivityType.Basic:
-            return generateTransactionActivity(processedTransaction, account)
-        case ActivityType.Foundry:
-            return generateFoundryActivity(processedTransaction, account)
-        case ActivityType.Alias:
-            return generateAliasActivity(processedTransaction, account)
-        case ActivityType.Nft:
-            return generateNftActivity(processedTransaction, account)
-    }
-}
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivitiesFromTransaction.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivitiesFromTransaction.ts
new file mode 100644
index 00000000000..351d73b05d2
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivitiesFromTransaction.ts
@@ -0,0 +1,26 @@
+import { IAccountState } from '@core/account'
+import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction, OUTPUT_TYPE_ALIAS } from '@core/wallet'
+import { Activity } from '@core/wallet/types'
+import type { IAliasOutput } from '@iota/types'
+import { generateSingleAliasActivity } from './generateSingleAliasActivity'
+
+export function generateAliasActivitiesFromTransaction(
+    processedTransaction: IProcessedTransaction,
+    account: IAccountState
+): Activity[] {
+    const outputs = processedTransaction.outputs
+    const activities = []
+
+    const aliasOutputs = outputs.filter((output) => output.output.type === OUTPUT_TYPE_ALIAS)
+    for (const aliasOutput of aliasOutputs) {
+        const output = aliasOutput.output as IAliasOutput
+        activities.push(
+            generateSingleAliasActivity(account, {
+                action: output.aliasId === EMPTY_HEX_ID ? ActivityAction.Mint : ActivityAction.Send,
+                processedTransaction,
+                wrappedOutput: aliasOutput,
+            })
+        )
+    }
+    return activities
+}
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateBasicActivitiesFromTransaction.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateBasicActivitiesFromTransaction.ts
new file mode 100644
index 00000000000..1e1304ceb81
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateBasicActivitiesFromTransaction.ts
@@ -0,0 +1,27 @@
+import { IAccountState } from '@core/account'
+import { ActivityAction, getNonRemainderBasicOutputsFromTransaction, IProcessedTransaction } from '@core/wallet'
+import { Activity } from '@core/wallet/types'
+import { generateSingleBasicActivity } from './generateSingleBasicActivity'
+
+export function generateBasicActivitiesFromTransaction(
+    processedTransaction: IProcessedTransaction,
+    account: IAccountState
+): Activity[] {
+    const activities = []
+
+    const basicOutputs = getNonRemainderBasicOutputsFromTransaction(
+        processedTransaction.outputs,
+        account.depositAddress,
+        processedTransaction.direction
+    )
+    for (const basicOutput of basicOutputs) {
+        activities.push(
+            generateSingleBasicActivity(account, {
+                action: ActivityAction.Send,
+                processedTransaction,
+                wrappedOutput: basicOutput,
+            })
+        )
+    }
+    return activities
+}
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivitiesFromTransaction.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivitiesFromTransaction.ts
new file mode 100644
index 00000000000..34ea28480f8
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivitiesFromTransaction.ts
@@ -0,0 +1,24 @@
+import { IAccountState } from '@core/account'
+import { ActivityAction, IProcessedTransaction, OUTPUT_TYPE_FOUNDRY } from '@core/wallet'
+import { Activity } from '@core/wallet/types'
+import { generateSingleFoundryActivity } from './generateSingleFoundryActivity'
+
+export function generateFoundryActivitiesFromTransaction(
+    processedTransaction: IProcessedTransaction,
+    account: IAccountState
+): Activity[] {
+    const outputs = processedTransaction.outputs
+    const activities = []
+
+    const foundryOutputs = outputs.filter((output) => output.output.type === OUTPUT_TYPE_FOUNDRY)
+    for (const foundryOutput of foundryOutputs) {
+        activities.push(
+            generateSingleFoundryActivity(account, {
+                action: ActivityAction.Mint,
+                processedTransaction,
+                wrappedOutput: foundryOutput,
+            })
+        )
+    }
+    return activities
+}
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivitiesFromTransaction.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivitiesFromTransaction.ts
new file mode 100644
index 00000000000..3aeb30da9e8
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivitiesFromTransaction.ts
@@ -0,0 +1,26 @@
+import { IAccountState } from '@core/account'
+import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction, OUTPUT_TYPE_NFT } from '@core/wallet'
+import { Activity } from '@core/wallet/types'
+import type { INftOutput } from '@iota/types'
+import { generateSingleNftActivity } from './generateSingleNftActivity'
+
+export function generateNftActivitiesFromTransaction(
+    processedTransaction: IProcessedTransaction,
+    account: IAccountState
+): Activity[] {
+    const outputs = processedTransaction.outputs
+    const activities = []
+
+    const nftOutputs = outputs.filter((output) => output.output.type === OUTPUT_TYPE_NFT)
+    for (const nftOutput of nftOutputs) {
+        const output = nftOutput.output as INftOutput
+        activities.push(
+            generateSingleNftActivity(account, {
+                action: output.nftId === EMPTY_HEX_ID ? ActivityAction.Mint : ActivityAction.Send,
+                processedTransaction,
+                wrappedOutput: nftOutput,
+            })
+        )
+    }
+    return activities
+}
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
similarity index 71%
rename from packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivity.ts
rename to packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
index 44e738b8032..b4e4577a93d 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
@@ -1,9 +1,10 @@
-import { IProcessedTransaction } from '../../interfaces'
-import { convertHexAddressToBech32, outputContainsValue, hashOutputId } from '..'
-import { ActivityAction, ActivityType } from '@core/wallet/enums'
-import { ADDRESS_TYPE_ALIAS, EMPTY_HEX_ID, OUTPUT_TYPE_ALIAS } from '@core/wallet/constants'
-import { IAliasOutput } from '@iota/types'
+import { IAccountState } from '@core/account'
+import { ADDRESS_TYPE_ALIAS, EMPTY_HEX_ID } from '@core/wallet/constants'
+import { ActivityType } from '@core/wallet/enums'
+import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { AliasActivity } from '@core/wallet/types'
+import { IAliasOutput } from '@iota/types'
+import { convertHexAddressToBech32, hashOutputId } from '..'
 import {
     getAmountFromOutput,
     getAsyncDataFromOutput,
@@ -14,14 +15,12 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { IAccountState } from '@core/account'
 
-export function generateAliasActivity(
-    processedTransaction: IProcessedTransaction,
-    account: IAccountState
+export function generateSingleAliasActivity(
+    account: IAccountState,
+    { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): AliasActivity {
-    const { outputs, utxoInputs, transactionId, claimingData, direction, time, inclusionState } = processedTransaction
-    const wrappedOutput = outputs.find((output) => output.output.type === OUTPUT_TYPE_ALIAS)
+    const { utxoInputs, transactionId, claimingData, direction, time, inclusionState } = processedTransaction
 
     const output = wrappedOutput.output as IAliasOutput
     const outputId = wrappedOutput.outputId
@@ -32,11 +31,10 @@ export function generateAliasActivity(
     const governorAddress = getGovernorAddressFromAliasOutput(output)
     const stateControllerAddress = getStateControllerAddressFromAliasOutput(output)
     const aliasId = getAliasId(output, outputId)
-    const action = output.aliasId === EMPTY_HEX_ID ? ActivityAction.Mint : ActivityAction.Send
 
     const isHidden = false
     const isAssetHidden = false
-    const containsValue = outputContainsValue(processedTransaction, account)
+    const containsValue = true
 
     const inputs = utxoInputs
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateTransactionActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
similarity index 80%
rename from packages/shared/lib/core/wallet/utils/generateActivity/generateTransactionActivity.ts
rename to packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
index 9fe25c95a90..abef7f2cd9f 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateTransactionActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
@@ -8,12 +8,12 @@ import {
 } from '@core/layer-2'
 import { COIN_TYPE } from '@core/network'
 import { activeProfile, activeProfileId } from '@core/profile'
+import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { TransactionActivity } from '@core/wallet/types'
 import { IBasicOutput } from '@iota/types'
 import { get } from 'svelte/store'
-import { ActivityAction, ActivityType } from '../../enums'
-import { IProcessedTransaction } from '../../interfaces'
-import { getNativeTokenFromOutput, getMainOutputFromTransaction, outputContainsValue } from '../../utils'
+import { ActivityType } from '../../enums'
+import { activityOutputContainsValue, getNativeTokenFromOutput } from '..'
 import {
     getAmountFromOutput,
     getAsyncDataFromOutput,
@@ -23,19 +23,18 @@ import {
     getTagFromOutput,
 } from './helper'
 
-export function generateTransactionActivity(
-    processedTransaction: IProcessedTransaction,
-    account: IAccountState
+export function generateSingleBasicActivity(
+    account: IAccountState,
+    { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): TransactionActivity {
-    const { outputs, transactionId, direction, claimingData, time, inclusionState, utxoInputs } = processedTransaction
+    const { transactionId, direction, claimingData, time, inclusionState, utxoInputs } = processedTransaction
 
     const isHidden = false
     const isAssetHidden = false
-    const containsValue = outputContainsValue(processedTransaction, account)
+    const containsValue = activityOutputContainsValue(wrappedOutput)
 
     const inputs = utxoInputs
 
-    const wrappedOutput = getMainOutputFromTransaction(outputs, account.depositAddress, direction)
     const outputId = wrappedOutput.outputId
     const id = outputId || transactionId
 
@@ -50,8 +49,6 @@ export function generateTransactionActivity(
     const metadata = getMetadataFromOutput(output)
     const publicNote = ''
 
-    const action = ActivityAction.Send
-
     const sendingInfo = getSendingInformation(processedTransaction, output, account)
     const asyncData = getAsyncDataFromOutput(output, outputId, claimingData, account)
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
similarity index 78%
rename from packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivity.ts
rename to packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
index 9af9322e0cc..0849f11cdf9 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
@@ -1,15 +1,13 @@
+import { IAccountState } from '@core/account'
 import { COIN_TYPE } from '@core/network'
 import { activeProfile } from '@core/profile'
-import { get } from 'svelte/store'
-import { IProcessedTransaction } from '../../interfaces'
-import {
-    getNativeTokenFromOutput,
-    getFoundryOutputFromTransaction,
-    outputContainsValue,
-    convertHexAddressToBech32,
-} from '..'
-import { ActivityAction, ActivityType } from '@core/wallet/enums'
+import { ADDRESS_TYPE_ALIAS, UNLOCK_CONDITION_IMMUTABLE_ALIAS } from '@core/wallet/constants'
+import { ActivityType } from '@core/wallet/enums'
+import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { FoundryActivity } from '@core/wallet/types'
+import type { IAliasAddress, IFoundryOutput, IImmutableAliasUnlockCondition } from '@iota/types'
+import { get } from 'svelte/store'
+import { convertHexAddressToBech32, getNativeTokenFromOutput } from '..'
 import {
     getAmountFromOutput,
     getAsyncDataFromOutput,
@@ -18,16 +16,12 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { IAccountState } from '@core/account'
-import type { IAliasAddress, IFoundryOutput, IImmutableAliasUnlockCondition } from '@iota/types'
-import { ADDRESS_TYPE_ALIAS, UNLOCK_CONDITION_IMMUTABLE_ALIAS } from '@core/wallet/constants'
 
-export function generateFoundryActivity(
-    processedTransaction: IProcessedTransaction,
-    account: IAccountState
+export function generateSingleFoundryActivity(
+    account: IAccountState,
+    { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): FoundryActivity {
-    const { outputs, transactionId, claimingData, utxoInputs, time, direction, inclusionState } = processedTransaction
-    const wrappedOutput = getFoundryOutputFromTransaction(outputs)
+    const { transactionId, claimingData, utxoInputs, time, direction, inclusionState } = processedTransaction
 
     const output = wrappedOutput.output as IFoundryOutput
     const outputId = wrappedOutput.outputId
@@ -41,7 +35,7 @@ export function generateFoundryActivity(
 
     const isHidden = false
     const isAssetHidden = false
-    const containsValue = outputContainsValue(processedTransaction, account)
+    const containsValue = true
 
     const inputs = utxoInputs
 
@@ -54,7 +48,6 @@ export function generateFoundryActivity(
     const metadata = getMetadataFromOutput(output)
     const tag = getTagFromOutput(output)
 
-    const action = ActivityAction.Mint
     const sendingInfo = getSendingInformation(processedTransaction, output, account)
     const asyncData = getAsyncDataFromOutput(output, outputId, claimingData, account)
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
similarity index 60%
rename from packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivity.ts
rename to packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
index 75120a155f1..6118a2215cd 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
@@ -1,23 +1,23 @@
-import { IProcessedTransaction } from '../../interfaces'
-import { outputContainsValue, getNftOutputFromTransaction } from '..'
-import { ActivityAction, ActivityType } from '@core/wallet/enums'
 import { IAccountState } from '@core/account'
-import type { INftOutput } from '@iota/types'
+import { ActivityType } from '@core/wallet/enums'
+import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { NftActivity } from '@core/wallet/types'
-import { getMetadataFromOutput, getSendingInformation, getTagFromOutput, getAsyncDataFromOutput } from './helper'
+import type { INftOutput } from '@iota/types'
 import { getNftId } from '../outputs/getNftId'
-import { EMPTY_HEX_ID } from '@core/wallet/constants'
+import { getAsyncDataFromOutput, getMetadataFromOutput, getSendingInformation, getTagFromOutput } from './helper'
 
-export function generateNftActivity(processedTransaction: IProcessedTransaction, account: IAccountState): NftActivity {
-    const { outputs, claimingData, utxoInputs, time, inclusionState, transactionId, direction } = processedTransaction
-    const wrappedOutput = getNftOutputFromTransaction(outputs)
+export function generateSingleNftActivity(
+    account: IAccountState,
+    { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
+): NftActivity {
+    const { claimingData, utxoInputs, time, inclusionState, transactionId, direction } = processedTransaction
     const outputId = wrappedOutput.outputId
     const output = wrappedOutput.output as INftOutput
     const id = outputId || transactionId
 
     const isHidden = false
     const isAssetHidden = false
-    const containsValue = outputContainsValue(processedTransaction, account)
+    const containsValue = true
 
     const inputs = utxoInputs
 
@@ -30,7 +30,6 @@ export function generateNftActivity(processedTransaction: IProcessedTransaction,
     const sendingInfo = getSendingInformation(processedTransaction, output, account)
     const { subject, isInternal } = sendingInfo
 
-    const action = output.nftId === EMPTY_HEX_ID ? ActivityAction.Mint : ActivityAction.Send
     const asyncData = getAsyncDataFromOutput(output, outputId, claimingData, account)
 
     return {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
new file mode 100644
index 00000000000..7e06394f3cf
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
@@ -0,0 +1,16 @@
+import { OUTPUT_TYPE_ALIAS, OUTPUT_TYPE_BASIC, OUTPUT_TYPE_FOUNDRY, OUTPUT_TYPE_NFT } from '@core/wallet/constants'
+import { ActivityType } from '@core/wallet/enums'
+import { IWrappedOutput } from '@core/wallet/interfaces'
+
+export function getActivityTypeFromOutput(output: IWrappedOutput): ActivityType {
+    switch (output.output.type) {
+        case OUTPUT_TYPE_NFT:
+            return ActivityType.Nft
+        case OUTPUT_TYPE_ALIAS:
+            return ActivityType.Alias
+        case OUTPUT_TYPE_FOUNDRY:
+            return ActivityType.Foundry
+        case OUTPUT_TYPE_BASIC:
+            return ActivityType.Basic
+    }
+}
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
index 4e0e878ae3b..5b748181804 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
@@ -27,7 +27,7 @@ export function getAsyncDataFromOutput(
             if (timelockDate.getTime() > Date.now()) {
                 asyncStatus = ActivityAsyncStatus.Timelocked
             }
-        } else if (expirationDate.getTime() < Date.now()) {
+        } else if (expirationDate && expirationDate.getTime() < Date.now()) {
             asyncStatus = ActivityAsyncStatus.Expired
         } else {
             asyncStatus = ActivityAsyncStatus.Unclaimed
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
index b00a7177ded..a7a64c6d31f 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
@@ -18,7 +18,7 @@ export function getSendingInformation(
     const { direction, wrappedInputs } = processedTransaction
 
     const recipient = getRecipientFromOutput(output)
-    const sender = wrappedInputs
+    const sender = wrappedInputs?.length
         ? getSubjectFromAddress(getSenderAddressFromInputs(wrappedInputs))
         : getSenderFromTransaction(direction === ActivityDirection.Incoming, account.depositAddress, output)
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/index.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/index.ts
index 0435d2a3a11..f60c3fc0476 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/index.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/index.ts
@@ -1,3 +1,4 @@
+export * from './getActivityTypeFromOutput'
 export * from './getAsyncDataFromOutput'
 export * from './getAmountFromOutput'
 export * from './getSendingInformation'
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/index.ts b/packages/shared/lib/core/wallet/utils/generateActivity/index.ts
index c93fa4f6c2a..a6f5c854e89 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/index.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/index.ts
@@ -1 +1 @@
-export * from './generateActivity'
+export * from './generateActivities'
diff --git a/packages/shared/lib/core/wallet/utils/getActivityTileTitle.ts b/packages/shared/lib/core/wallet/utils/getActivityTileTitle.ts
new file mode 100644
index 00000000000..e918b1e4cf6
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/getActivityTileTitle.ts
@@ -0,0 +1,28 @@
+import { ActivityAction, ActivityDirection, ActivityType, InclusionState } from '../enums'
+import { Activity } from '../types'
+
+export function getActivityTileTitle(activity: Activity): string {
+    const { type, isInternal, direction, inclusionState, action } = activity
+    const isConfirmed = inclusionState === InclusionState.Confirmed
+
+    if (activity.type === ActivityType.Basic && activity.isShimmerClaiming) {
+        return isConfirmed ? 'general.shimmerClaimed' : 'general.shimmerClaiming'
+    } else if (action === ActivityAction.Mint) {
+        if (type === ActivityType.Alias) {
+            return isConfirmed ? 'general.aliasCreated' : 'general.creatingAlias'
+        }
+        return isConfirmed ? 'general.minted' : 'general.minting'
+    } else if (action === ActivityAction.Send) {
+        if (isInternal) {
+            return isConfirmed ? 'general.transfer' : 'general.transferring'
+        }
+        if (direction === ActivityDirection.Incoming || direction === ActivityDirection.SelfTransaction) {
+            return isConfirmed ? 'general.received' : 'general.receiving'
+        }
+        if (direction === ActivityDirection.Outgoing) {
+            return isConfirmed ? 'general.sent' : 'general.sending'
+        }
+    } else if (action === ActivityAction.Unknown) {
+        return 'general.unknown'
+    }
+}
diff --git a/packages/shared/lib/core/wallet/utils/getActivityType.ts b/packages/shared/lib/core/wallet/utils/getActivityType.ts
deleted file mode 100644
index ab5bd1fb512..00000000000
--- a/packages/shared/lib/core/wallet/utils/getActivityType.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ActivityType } from '../enums'
-import { OUTPUT_TYPE_ALIAS, OUTPUT_TYPE_FOUNDRY, OUTPUT_TYPE_NFT } from '../constants'
-import { IWrappedOutput } from '../interfaces'
-
-export function getActivityType(outputs: IWrappedOutput[]): ActivityType {
-    if (outputs.some((output) => output.output.type === OUTPUT_TYPE_FOUNDRY)) {
-        return ActivityType.Foundry
-    }
-    if (outputs.some((output) => output.output.type === OUTPUT_TYPE_NFT)) {
-        return ActivityType.Nft
-    }
-    if (outputs.some((output) => output.output.type === OUTPUT_TYPE_ALIAS)) {
-        return ActivityType.Alias
-    } else {
-        return ActivityType.Basic
-    }
-}
diff --git a/packages/shared/lib/core/wallet/utils/index.ts b/packages/shared/lib/core/wallet/utils/index.ts
index 5aa09c54588..ce1a13af403 100644
--- a/packages/shared/lib/core/wallet/utils/index.ts
+++ b/packages/shared/lib/core/wallet/utils/index.ts
@@ -8,7 +8,7 @@ export * from './convertToRawAmount'
 export * from './formatTokenAmountBestMatch'
 export * from './formatTokenAmountDefault'
 export * from './formatTokenAmountPrecise'
-export * from './getActivityType'
+export * from './getActivityTileTitle'
 export * from './getAssetInitials'
 export * from './getAssetFromPersistedAssets'
 export * from './getHexAddressFromAddressTypes'
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
index b58ef3af577..17c306ff6e7 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
@@ -23,6 +23,7 @@ export function preprocessGroupedOutputs(
     const direction = getDirectionForOutputs(outputDatas, wrappedInputs, account.depositAddress)
     const wrappedOutputs = outputDatas.map((outputData) => ({
         outputId: outputData.outputId,
+        remainder: outputData.remainder,
         output: outputData.output.type !== OUTPUT_TYPE_TREASURY ? outputData.output : undefined,
     }))
 
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
index 27d9bf9bd76..32b334c414d 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
@@ -46,5 +46,9 @@ function convertTransactionOutputTypeToWrappedOutput(
     outputType: OutputTypes
 ): IWrappedOutput {
     const outputId = getOutputIdFromTransactionIdAndIndex(transactionId, index)
-    return { outputId, output: outputType.type !== OUTPUT_TYPE_TREASURY ? outputType : undefined }
+    return {
+        outputId,
+        output: outputType.type !== OUTPUT_TYPE_TREASURY ? outputType : undefined,
+        remainder: false,
+    }
 }
diff --git a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
new file mode 100644
index 00000000000..fc829e02ffe
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
@@ -0,0 +1,22 @@
+import { ActivityType } from '@core/wallet/enums'
+import { IBasicOutput } from '@iota/types'
+import { getNativeTokenFromOutput, isOutputAsync } from '..'
+import { IWrappedOutput } from '../../interfaces'
+import { getActivityTypeFromOutput, getAmountFromOutput, getStorageDepositFromOutput } from '../generateActivity/helper'
+
+export function activityOutputContainsValue(wrappedOutput: IWrappedOutput): boolean {
+    const type = getActivityTypeFromOutput(wrappedOutput)
+    const typesToCheck = [ActivityType.Basic]
+    if (typesToCheck.includes(type)) {
+        const output = wrappedOutput.output as IBasicOutput
+
+        const isAsync = isOutputAsync(output)
+        const nativeToken = getNativeTokenFromOutput(output)
+
+        const { storageDeposit } = getStorageDepositFromOutput(output)
+        const rawAmount = getAmountFromOutput(output) - storageDeposit
+        return !isAsync || rawAmount > 0 || (!!nativeToken && Number(nativeToken.amount) > 0)
+    } else {
+        return true
+    }
+}
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getFoundryOutputFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getFoundryOutputFromTransaction.ts
deleted file mode 100644
index 36c2a79ed8c..00000000000
--- a/packages/shared/lib/core/wallet/utils/transactions/getFoundryOutputFromTransaction.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { OUTPUT_TYPE_FOUNDRY } from '@core/wallet/constants'
-import { IWrappedOutput } from '@core/wallet/interfaces'
-
-export function getFoundryOutputFromTransaction(outputs: IWrappedOutput[]): IWrappedOutput {
-    const output = outputs.find((output) => output.output.type === OUTPUT_TYPE_FOUNDRY)
-    return output
-}
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getNftOutputFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getNftOutputFromTransaction.ts
deleted file mode 100644
index 9295d05228c..00000000000
--- a/packages/shared/lib/core/wallet/utils/transactions/getNftOutputFromTransaction.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { OUTPUT_TYPE_NFT } from '@core/wallet/constants'
-import { IWrappedOutput } from '@core/wallet/interfaces'
-
-export function getNftOutputFromTransaction(outputs: IWrappedOutput[]): IWrappedOutput {
-    const output = outputs.find((output) => output.output.type === OUTPUT_TYPE_NFT)
-    return output
-}
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getMainOutputFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
similarity index 81%
rename from packages/shared/lib/core/wallet/utils/transactions/getMainOutputFromTransaction.ts
rename to packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
index e8b4e12b024..3dca6673e37 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getMainOutputFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
@@ -2,12 +2,12 @@ import { getRecipientAddressFromOutput } from '..'
 import { IWrappedOutput } from '@core/wallet/interfaces'
 import { ActivityDirection } from '@core/wallet/enums'
 
-export function getMainOutputFromTransaction(
+export function getNonRemainderBasicOutputsFromTransaction(
     wrappedOutputs: IWrappedOutput[],
     accountAddress: string,
     direction: ActivityDirection
-): IWrappedOutput {
-    return wrappedOutputs.find((outputData) => {
+): IWrappedOutput[] {
+    return wrappedOutputs.filter((outputData) => {
         const recipientAddress = getRecipientAddressFromOutput(outputData.output)
 
         if (direction === ActivityDirection.Incoming || direction === ActivityDirection.SelfTransaction) {
diff --git a/packages/shared/lib/core/wallet/utils/transactions/index.ts b/packages/shared/lib/core/wallet/utils/transactions/index.ts
index 0c8f0b464f3..a54d4132859 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/index.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/index.ts
@@ -1,7 +1,5 @@
 export * from './getDirectionFromTransaction'
-export * from './getFoundryOutputFromTransaction'
-export * from './getMainOutputFromTransaction'
-export * from './getNftOutputFromTransaction'
+export * from './getNonRemainderBasicOutputsFromTransaction'
 export * from './getSenderFromTransaction'
 export * from './getSenderAddressFromInputs'
-export * from './outputContainsValue'
+export * from './activityOutputContainsValue'
diff --git a/packages/shared/lib/core/wallet/utils/transactions/outputContainsValue.ts b/packages/shared/lib/core/wallet/utils/transactions/outputContainsValue.ts
deleted file mode 100644
index fd5a5cf8ee2..00000000000
--- a/packages/shared/lib/core/wallet/utils/transactions/outputContainsValue.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { IAccountState } from '@core/account'
-import { ActivityType } from '@core/wallet/enums'
-import { IProcessedTransaction } from '../../interfaces'
-import { getNativeTokenFromOutput, getMainOutputFromTransaction, isOutputAsync, getActivityType } from '..'
-import { getAmountFromOutput, getStorageDepositFromOutput } from '../generateActivity/helper'
-import { IBasicOutput } from '@iota/types'
-
-export function outputContainsValue(processedTransaction: IProcessedTransaction, account: IAccountState): boolean {
-    const wrappedOutput = getMainOutputFromTransaction(
-        processedTransaction.outputs,
-        account.depositAddress,
-        processedTransaction.direction
-    )
-    const output = wrappedOutput.output as IBasicOutput
-    const type = getActivityType(processedTransaction.outputs)
-
-    const whiteListedActivityTypes = [ActivityType.Alias, ActivityType.Foundry, ActivityType.Nft]
-    if (whiteListedActivityTypes.includes(type)) {
-        return true
-    }
-
-    const isAsync = isOutputAsync(output)
-    const nativeToken = getNativeTokenFromOutput(output)
-
-    const { storageDeposit } = getStorageDepositFromOutput(output)
-    const rawAmount = getAmountFromOutput(output) - storageDeposit
-    return !isAsync || rawAmount > 0 || (!!nativeToken && Number(nativeToken.amount) > 0)
-}