From 76d8f5bde6c71062e1cf97cc18234ff40ef7abc8 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 1 May 2025 01:21:08 +0200 Subject: [PATCH 1/6] remove moved action --- src/libs/actions/Transaction.ts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index df3c2561e1c83..0ca200af35b10 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -641,19 +641,7 @@ function changeTransactionsReport(transactionIDs: string[], reportID: string) { onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldReportID}`, value: { - [oldIOUAction.reportActionID]: { - actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, - originalMessage: { - deleted: DateUtils.getDBTime(), - }, - message: [ - { - deleted: DateUtils.getDBTime(), - type: CONST.REPORT.MESSAGE.TYPE.TEXT, - text: '', - }, - ], - }, + [oldIOUAction.reportActionID]: null, }, }, ); From c7d5d9169a087db17c7d4be2d094d5f1529276a3 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 1 May 2025 16:38:23 +0200 Subject: [PATCH 2/6] update action --- src/libs/actions/Transaction.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index 0ca200af35b10..7206e1c35b8d9 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -641,7 +641,22 @@ function changeTransactionsReport(transactionIDs: string[], reportID: string) { onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldReportID}`, value: { - [oldIOUAction.reportActionID]: null, + [oldIOUAction.reportActionID]: { + previousMessage: oldIOUAction.message, + message: [ + { + type: 'COMMENT', + html: '', + text: '', + isEdited: true, + isDeletedParentAction: false, + }, + ], + originalMessage: { + IOUTransactionID: null, + }, + errors: undefined, + }, }, }, ); From 54fe7d0f3445ab63267afd7c2bfa2804b79dbd1b Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 1 May 2025 16:39:02 +0200 Subject: [PATCH 3/6] use const --- src/libs/actions/Transaction.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index 7206e1c35b8d9..880203dd0553c 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -645,7 +645,7 @@ function changeTransactionsReport(transactionIDs: string[], reportID: string) { previousMessage: oldIOUAction.message, message: [ { - type: 'COMMENT', + type: CONST.REPORT.MESSAGE.TYPE.COMMENT, html: '', text: '', isEdited: true, From 82960842e82028fc72061e86a266558e1c91de6e Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 1 May 2025 16:59:38 +0200 Subject: [PATCH 4/6] fix eslint --- src/libs/actions/Transaction.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index 880203dd0553c..596e2793bea55 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -8,7 +8,6 @@ import * as API from '@libs/API'; import type {ChangeTransactionsReportParams, DismissViolationParams, GetRouteParams, MarkAsCashParams, TransactionThreadInfo} from '@libs/API/parameters'; import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import * as CollectionUtils from '@libs/CollectionUtils'; -import DateUtils from '@libs/DateUtils'; import * as NumberUtils from '@libs/NumberUtils'; import {rand64} from '@libs/NumberUtils'; import {getAllReportActions, getIOUActionForReportID, getOriginalMessage, isModifiedExpenseAction} from '@libs/ReportActionsUtils'; From 16f6f553182615882b0aa81140fea1cd2212dea6 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 13 May 2025 10:36:28 -0600 Subject: [PATCH 5/6] fix lint --- Mobile-Expensify | 2 +- src/libs/actions/Transaction.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Mobile-Expensify b/Mobile-Expensify index 70e268ee821ec..bdd10d37ce75e 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit 70e268ee821ec28724e1b4d776ac9de95c5bed1b +Subproject commit bdd10d37ce75e2b8ed5758338f544818af4c2c6f diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index 0fde7ac6ccefe..23893c97fe129 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -8,6 +8,7 @@ import * as API from '@libs/API'; import type {ChangeTransactionsReportParams, DismissViolationParams, GetRouteParams, MarkAsCashParams, TransactionThreadInfo} from '@libs/API/parameters'; import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import * as CollectionUtils from '@libs/CollectionUtils'; +import DateUtils from '@libs/DateUtils'; import * as NumberUtils from '@libs/NumberUtils'; import {rand64} from '@libs/NumberUtils'; import {getAllReportActions, getIOUActionForReportID, getOriginalMessage, isModifiedExpenseAction} from '@libs/ReportActionsUtils'; From ef4c6119ee8541abaf0d2325dca0cff0b4895882 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 13 May 2025 10:40:30 -0600 Subject: [PATCH 6/6] fix submodule update --- Mobile-Expensify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mobile-Expensify b/Mobile-Expensify index bdd10d37ce75e..70e268ee821ec 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit bdd10d37ce75e2b8ed5758338f544818af4c2c6f +Subproject commit 70e268ee821ec28724e1b4d776ac9de95c5bed1b