From 9110bbe9ce0aea79507e2c920ae4e30821fa9923 Mon Sep 17 00:00:00 2001
From: MarkNerdi <105642810+MarkNerdi@users.noreply.github.com>
Date: Thu, 24 Nov 2022 09:18:51 +0100
Subject: [PATCH] fix: fix shown rejected activities (#5280)

---
 .../wallet/utils/generateActivity/generateAliasActivity.ts   | 2 +-
 .../wallet/utils/generateActivity/generateFoundryActivity.ts | 2 +-
 .../wallet/utils/generateActivity/generateNftActivity.ts     | 5 ++---
 .../utils/generateActivity/generateTransactionActivity.ts    | 2 +-
 .../utils/generateActivity/helper/getAsyncDataFromOutput.ts  | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivity.ts
index 7aa487e730..91d44f245f 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateAliasActivity.ts
@@ -42,7 +42,7 @@ export function generateAliasActivity(
 
     const metadata = getMetadataFromOutput(output)
     const tag = getTagFromOutput(output)
-    const asyncData = getAsyncDataFromOutput(output, transactionId, claimingData, account)
+    const asyncData = getAsyncDataFromOutput(output, outputId, claimingData, account)
     const sendingInfo = getSendingInformation(processedTransaction, output, account)
 
     return {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivity.ts
index 7d7a4f939f..4a97e22c15 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateFoundryActivity.ts
@@ -55,7 +55,7 @@ export function generateFoundryActivity(
     const tag = getTagFromOutput(output)
 
     const sendingInfo = getSendingInformation(processedTransaction, output, account)
-    const asyncData = getAsyncDataFromOutput(output, transactionId, claimingData, account)
+    const asyncData = getAsyncDataFromOutput(output, outputId, claimingData, account)
 
     return {
         type: ActivityType.Foundry,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivity.ts
index d43c25b613..fe14740ec3 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateNftActivity.ts
@@ -3,9 +3,8 @@ import { outputContainsValue, getNftOutputFromTransaction } from '..'
 import { ActivityDirection, ActivityType } from '@core/wallet/enums'
 import { IAccountState } from '@core/account'
 import type { INftOutput } from '@iota/types'
-import { getAsyncDataFromOutput } from '../generateActivity/helper/getAsyncDataFromOutput'
 import { NftActivity } from '@core/wallet/types'
-import { getMetadataFromOutput, getSendingInformation, getTagFromOutput } from './helper'
+import { getMetadataFromOutput, getSendingInformation, getTagFromOutput, getAsyncDataFromOutput } from './helper'
 import { getNftId } from '../outputs/getNftId'
 import { EMPTY_HEX_ID } from '@core/wallet/constants'
 
@@ -33,7 +32,7 @@ export function generateNftActivity(processedTransaction: IProcessedTransaction,
     let { direction } = sendingInfo
 
     direction = output.nftId === EMPTY_HEX_ID ? ActivityDirection.Minting : direction
-    const asyncData = getAsyncDataFromOutput(output, transactionId, claimingData, account)
+    const asyncData = getAsyncDataFromOutput(output, outputId, claimingData, account)
 
     return {
         type: ActivityType.Nft,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateTransactionActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateTransactionActivity.ts
index cedb362f19..01d94bddb3 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateTransactionActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateTransactionActivity.ts
@@ -52,7 +52,7 @@ export function generateTransactionActivity(
     const publicNote = ''
 
     const sendingInfo = getSendingInformation(processedTransaction, output, account)
-    const asyncData = getAsyncDataFromOutput(output, transactionId, claimingData, account)
+    const asyncData = getAsyncDataFromOutput(output, outputId, claimingData, account)
 
     return {
         type: ActivityType.Transaction,
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 70359ac441..34cb17ef32 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
@@ -6,7 +6,7 @@ import { isOutputAsync } from '../../outputs/isOutputAsync'
 
 export function getAsyncDataFromOutput(
     output: Output,
-    transactionId: string,
+    outputId: string,
     claimingData: IClaimData,
     account: IAccountState
 ): AsyncData {
@@ -16,7 +16,7 @@ export function getAsyncDataFromOutput(
         const isClaiming = false
         const claimingTransactionId = claimingData?.claimingTransactionId
         const claimedDate = claimingData?.claimedDate
-        const isRejected = isActivityHiddenForAccountIndex(account.index, transactionId)
+        const isRejected = isActivityHiddenForAccountIndex(account.index, outputId)
 
         const expirationDate = getExpirationDateFromOutput(output)
         const timelockDate = getTimelockDateFromOutput(output)