fix: fix shown rejected activities (#5280)

iotaledger · Nov 24, 2022 · 9110bbe · 9110bbe
1 parent 9f7e1eb
commit 9110bbe
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)