feat: rename reject to ignore outputs in the tx history

docs/specifications/activities/class-diagram.md

@@ -78,7 +78,7 @@ classDiagram
         - asyncStatus: ActivityAsyncStatus
         - timelockDate: Date
         - expirationDate: Date
-        - isRejected: boolean
+        - isIgnored: boolean
         - isClaiming: boolean
         - claimingTransactionId: string
         - claimedDate: Date

packages/desktop/components/popups/ActivityDetailsPopup.svelte

@@ -11,7 +11,7 @@
         ActivityDirection,
         ActivityType,
         claimActivity,
-        rejectActivity,
+        ignoreActivity,
         selectedWallet,
         selectedWalletActivities,
     } from '@core/wallet'
@@ -82,17 +82,17 @@
         }
     }
 
-    function onRejectClick(): void {
+    function onIgnoreClick(): void {
         openPopup({
             id: PopupId.Confirmation,
             props: {
-                title: localize('actions.confirmRejection.title'),
-                description: localize('actions.confirmRejection.description'),
-                hint: localize('actions.confirmRejection.node'),
-                confirmText: localize('actions.reject'),
+                title: localize('actions.confirmIgnore.title'),
+                description: localize('actions.confirmIgnore.description'),
+                hint: localize('actions.confirmIgnore.node'),
+                confirmText: localize('actions.ignore'),
                 variant: TextHintVariant.Warning,
                 onConfirm: () => {
-                    rejectActivity(activityId)
+                    ignoreActivity(activityId)
                     closePopup()
                 },
                 onCancel: () =>
@@ -161,10 +161,10 @@
                     <Button
                         outline
                         classes="w-full"
-                        disabled={activity.asyncData?.isClaiming || activity.asyncData?.isRejected}
-                        onClick={onRejectClick}
+                        disabled={activity.asyncData?.isClaiming || activity.asyncData?.isIgnored}
+                        onClick={onIgnoreClick}
                     >
-                        {localize('actions.reject')}
+                        {localize('actions.ignore')}
                     </Button>
                     <Button
                         classes="w-full"

packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte

@@ -3,7 +3,7 @@
         ActivityAsyncStatus,
         ActivityDirection,
         claimActivity,
-        rejectActivity,
+        ignoreActivity,
         getTimeDifference,
         Activity,
     } from '@core/wallet'
@@ -26,17 +26,17 @@
     $: timeDiff = getTimeDiff(activity)
     $: hasExpirationTime = !!activity.asyncData?.expirationDate
 
-    function onRejectClick(): void {
+    function onIgnoreClick(): void {
         openPopup({
             id: PopupId.Confirmation,
             props: {
-                title: localize('actions.confirmRejection.title'),
-                description: localize('actions.confirmRejection.description'),
-                hint: localize('actions.confirmRejection.node'),
+                title: localize('actions.confirmIgnore.title'),
+                description: localize('actions.confirmIgnore.description'),
+                hint: localize('actions.confirmIgnore.node'),
                 variant: TextHintVariant.Warning,
-                confirmText: localize('actions.reject'),
+                confirmText: localize('actions.ignore'),
                 onConfirm: () => {
-                    rejectActivity(activity.id)
+                    ignoreActivity(activity.id)
                     closePopup()
                 },
             },
@@ -84,13 +84,13 @@
     <svelte:fragment slot="right">
         {#if shouldShowActions}
             <Button
-                onClick={onRejectClick}
-                disabled={activity.asyncData?.isClaiming || activity.asyncData?.isRejected}
+                onClick={onIgnoreClick}
+                disabled={activity.asyncData?.isClaiming || activity.asyncData?.isIgnored}
                 inlineStyle="min-width: 4rem;"
                 size={ButtonSize.Small}
                 outline
             >
-                {localize('actions.reject')}
+                {localize('actions.ignore')}
             </Button>
             <Button
                 onClick={onClaimClick}

packages/shared/lib/core/wallet/actions/claimActivity.ts

@@ -13,7 +13,7 @@ export async function claimActivity(activity: Activity): Promise<void> {
     try {
         if (isActivityHiddenForWalletId(wallet.id, activity.id)) {
             removeActivityFromHiddenActivities(wallet.id, activity.id)
-            updateAsyncDataByActivityId(wallet.id, activity.id, { isRejected: false })
+            updateAsyncDataByActivityId(wallet.id, activity.id, { isIgnored: false })
         }
 
         updateAsyncDataByActivityId(wallet.id, activity.id, { isClaiming: true })

packages/shared/lib/core/wallet/actions/rejectActivity.ts → packages/shared/lib/core/wallet/actions/ignoreActivity.ts

@@ -5,7 +5,7 @@ import { localize } from '@core/i18n'
 import { showAppNotification } from '@auxiliary/notification'
 import { activeProfileId } from '@core/profile'
 
-export function rejectActivity(id: string): void {
+export function ignoreActivity(id: string): void {
     const walletId = get(selectedWalletId)
     hiddenActivities.update((state) => {
         const profileId = get(activeProfileId)
@@ -23,7 +23,7 @@ export function rejectActivity(id: string): void {
         return state
     })
 
-    updateAsyncDataByActivityId(walletId, id, { isRejected: true })
+    updateAsyncDataByActivityId(walletId, id, { isIgnored: true })
     showAppNotification({
         type: 'success',
         alert: true,

packages/shared/lib/core/wallet/actions/index.ts

@@ -4,7 +4,7 @@ export * from './burnNft'
 export * from './claimActivity'
 export * from './getWalletAssetsForSelectedWallet'
 export * from './generateAndStoreActivitiesForAllWallets'
-export * from './rejectActivity'
+export * from './ignoreActivity'
 export * from './refreshWalletAssetsForActiveProfile'
 export * from './requestPersistedAsset'
 export * from './sendOutput'

packages/shared/lib/core/wallet/constants/default-activity-filter.constant.ts

@@ -78,10 +78,10 @@ export const DEFAULT_ACTIVITY_FILTER: ActivityFilter = {
             value: undefined,
         },
     },
-    showRejected: {
+    showIgnored: {
         active: false,
         type: 'selection',
-        localeKey: 'filters.showRejected',
+        localeKey: 'filters.showIgnored',
         selected: BooleanFilterOption.Yes,
         choices: [BooleanFilterOption.Yes, BooleanFilterOption.No],
     },

packages/shared/lib/core/wallet/interfaces/activity-filter.interface.ts

@@ -13,7 +13,7 @@ export interface ActivityFilter {
     internalExternal: SelectionFilterUnit
     asset: AssetFilterUnit
     date: DateFilterUnit
-    showRejected: SelectionFilterUnit
+    showIgnored: SelectionFilterUnit
     showHidden: SelectionFilterUnit
     showValueless: SelectionFilterUnit
 }

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

@@ -31,7 +31,7 @@ export type AsyncData = {
     asyncStatus: ActivityAsyncStatus
     timelockDate: Date
     expirationDate: Date
-    isRejected: boolean
+    isIgnored: boolean
     isClaiming: boolean
     claimingTransactionId: string
     claimedDate: Date

packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts

@@ -18,7 +18,7 @@ export async function getAsyncDataFromOutput(
         const isClaiming = false
         const claimingTransactionId = claimingData?.claimingTransactionId
         const claimedDate = claimingData?.claimedDate
-        const isRejected = isActivityHiddenForWalletId(wallet.id, outputId)
+        const isIgnored = isActivityHiddenForWalletId(wallet.id, outputId)
 
         const expirationDate = getExpirationDateFromOutput(commonOutput)
         const timelockDate = getTimelockDateFromOutput(commonOutput)
@@ -36,7 +36,7 @@ export async function getAsyncDataFromOutput(
             asyncStatus,
             timelockDate,
             expirationDate,
-            isRejected,
+            isIgnored,
             isClaiming,
             claimingTransactionId,
             claimedDate,

packages/shared/lib/core/wallet/utils/isVisibleActivity.ts

@@ -27,7 +27,7 @@ export function isVisibleActivity(activity: Activity): boolean {
     if (!isVisibleWithActiveHiddenFilter(activity, filter)) {
         return false
     }
-    if (!isVisibleWithActiveRejectedFilter(activity, filter)) {
+    if (!isVisibleWithActiveIgnoredFilter(activity, filter)) {
         return false
     }
     if (!isVisibleWithActiveAssetFilter(activity, filter)) {
@@ -75,10 +75,10 @@ function isVisibleWithActiveValuelessFilter(activity: Activity, filter: Activity
     return true
 }
 
-function isVisibleWithActiveRejectedFilter(activity: Activity, filter: ActivityFilter): boolean {
+function isVisibleWithActiveIgnoredFilter(activity: Activity, filter: ActivityFilter): boolean {
     if (
-        (!filter.showRejected.active || filter.showRejected.selected === BooleanFilterOption.No) &&
-        activity.asyncData?.isRejected
+        (!filter.showIgnored.active || filter.showIgnored.selected === BooleanFilterOption.No) &&
+        activity.asyncData?.isIgnored
     ) {
         return false
     }

packages/shared/locales/en.json

@@ -1292,11 +1292,11 @@
         "claim": "Claim",
         "claiming": "Claiming",
         "claimingRewards": "Claiming rewards",
-        "reject": "Reject",
-        "confirmRejection": {
-            "title": "Reject transaction",
-            "description": "Are you sure you want to reject this transaction?",
-            "node": "Please note that rejecting a transaction only hides it from your Activity feed"
+        "ignore": "Ignore",
+        "confirmIgnore": {
+            "title": "Ignore transaction",
+            "description": "Are you sure you want to ignore this transaction?",
+            "node": "Please note that ignoring a transaction only hides it from your Activity feed"
         },
         "confirmTokenBurn": {
             "title": "Burn {assetName}",
@@ -1743,8 +1743,8 @@
             "yes": "Yes",
             "no": "No"
         },
-        "showRejected": {
-            "label": "Show rejected",
+        "showIgnored": {
+            "label": "Show ignored",
             "yes": "Yes",
             "no": "No"
         },