Skip to content

Feat: Add ability to unreport transactions #61743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Feat: Add ability to unreport transactions #61743

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a4f5c4a
add translations
waterim May 8, 2025
c2382ea
update stepReport
waterim May 8, 2025
71105e3
update transaction
waterim May 8, 2025
a8de995
update to use policy name
waterim May 13, 2025
29f2f30
Merge remote-tracking branch 'upstream/main' into feat/waterim/unrepo…
waterim May 15, 2025
d6db4f8
fix conflict
waterim May 15, 2025
ce70973
fix linter
waterim May 15, 2025
df6de1e
fix ts
waterim May 15, 2025
2a29e68
add new params
waterim May 19, 2025
1366a15
add report and action optimistically
waterim May 19, 2025
024ace0
Merge remote-tracking branch 'upstream/main' into feat/waterim/unrepo…
waterim May 19, 2025
0566c81
Merge remote-tracking branch 'upstream/main' into feat/waterim/unrepo…
waterim May 21, 2025
9f39a1f
update navigation
waterim May 21, 2025
729fe3a
update transaction
waterim May 21, 2025
e276b25
fix ts
waterim May 21, 2025
2e8b7ba
update transaction
waterim May 21, 2025
813ac81
add conditional optimistic create
waterim May 21, 2025
d42112d
Merge remote-tracking branch 'upstream/main' into feat/waterim/unrepo…
waterim May 22, 2025
4f285a9
fix transaction
waterim May 22, 2025
5b66493
add failure
waterim May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 53 additions & 53 deletions src/libs/actions/Transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,59 @@ function changeTransactionsReport(transactionIDs: string[], reportID: string) {
const currentTime = DateUtils.getDBTime();
selfDMReport = buildOptimisticSelfDMReport(currentTime);
selfDMCreatedReportAction = buildOptimisticCreatedReportAction(currentUserEmail ?? '', currentTime);

// Add optimistic updates for self DM report
optimisticData.push(
{
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT}${selfDMReport.reportID}`,
value: {
...selfDMReport,
pendingFields: {
createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
},
},
},
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${selfDMReport.reportID}`,
value: {isOptimisticReport: true},
},
{
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`,
value: {
[selfDMCreatedReportAction.reportActionID]: selfDMCreatedReportAction,
},
},
);

// Add success data for self DM report
successData.push(
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${selfDMReport.reportID}`,
value: {
pendingFields: {
createChat: null,
},
},
},
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${selfDMReport.reportID}`,
value: {isOptimisticReport: false},
},
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`,
value: {
[selfDMCreatedReportAction.reportActionID]: {
pendingAction: null,
},
},
},
);
}

let transactionsMoved = false;
Expand Down Expand Up @@ -854,59 +907,6 @@ function changeTransactionsReport(transactionIDs: string[], reportID: string) {
selfDMReportID: selfDMReport.reportID,
selfDMCreatedReportActionID: selfDMCreatedReportAction.reportActionID,
};

// Add optimistic updates for self DM report
optimisticData.push(
{
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT}${selfDMReport.reportID}`,
value: {
...selfDMReport,
pendingFields: {
createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
},
},
},
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${selfDMReport.reportID}`,
value: {isOptimisticReport: true},
},
{
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`,
value: {
[selfDMCreatedReportAction.reportActionID]: selfDMCreatedReportAction,
},
},
);

// Add success data for self DM report
successData.push(
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${selfDMReport.reportID}`,
value: {
pendingFields: {
createChat: null,
},
},
},
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${selfDMReport.reportID}`,
value: {isOptimisticReport: false},
},
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`,
value: {
[selfDMCreatedReportAction.reportActionID]: {
pendingAction: null,
},
},
},
);
} else {
transactionIDToReportActionAndThreadData[transaction.transactionID] = baseTransactionData;
}
Expand Down
Loading