From af3a4b3894aec7b9b224942a834706f6c4e64515 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 7 Dec 2023 11:47:44 -0700 Subject: [PATCH 1/4] add optimistic violations data to deleteMoneyRequest --- src/libs/actions/IOU.js | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index ed43569c360a..5aee6c48c29d 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -22,9 +22,18 @@ import * as UserUtils from '@libs/UserUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import * as Permissions from '@libs/Permissions'; import * as Policy from './Policy'; import * as Report from './Report'; +let betas; +Onyx.connect({ + key: ONYXKEYS.BETAS, + callback: (val) => { + betas = val || []; + }, +}); + let allPersonalDetails; Onyx.connect({ key: ONYXKEYS.PERSONAL_DETAILS_LIST, @@ -54,6 +63,20 @@ Onyx.connect({ }, }); +let allTransactionViolations; +Onyx.connect({ + key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, + waitForCollectionCallback: true, + callback: (val) => { + if (!val) { + allTransactionViolations = {}; + return; + } + + allTransactionViolations = val; + }, +}); + let allDraftSplitTransactions; Onyx.connect({ key: ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT, @@ -1988,6 +2011,7 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView const chatReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`]; const reportPreviewAction = ReportActionsUtils.getReportPreviewAction(iouReport.chatReportID, iouReport.reportID); const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]; + const transactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`]; const transactionThreadID = reportAction.childReportID; let transactionThread = null; if (transactionThreadID) { @@ -2068,6 +2092,13 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, value: null, }, + ...(Permissions.canUseViolations(betas) ? [ + { + onyxMethod: Onyx.METHOD.SET, + key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, + value: null, + }, + ] : []), ...(shouldDeleteTransactionThread ? [ { @@ -2132,6 +2163,13 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, value: transaction, }, + ...(Permissions.canUseViolations(betas) ? [ + { + onyxMethod: Onyx.METHOD.SET, + key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, + value: transactionViolations, + }, + ] : []), ...(shouldDeleteTransactionThread ? [ { From f63a576b6297d6ca48f14f74e03ff9e7154bb9f3 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 7 Dec 2023 12:34:57 -0700 Subject: [PATCH 2/4] fix style --- src/libs/actions/IOU.js | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index 5aee6c48c29d..f28b671311df 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -15,6 +15,7 @@ import * as Localize from '@libs/Localize'; import Navigation from '@libs/Navigation/Navigation'; import * as NumberUtils from '@libs/NumberUtils'; import * as OptionsListUtils from '@libs/OptionsListUtils'; +import * as Permissions from '@libs/Permissions'; import * as ReportActionsUtils from '@libs/ReportActionsUtils'; import * as ReportUtils from '@libs/ReportUtils'; import * as TransactionUtils from '@libs/TransactionUtils'; @@ -22,7 +23,6 @@ import * as UserUtils from '@libs/UserUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; -import * as Permissions from '@libs/Permissions'; import * as Policy from './Policy'; import * as Report from './Report'; @@ -2092,13 +2092,15 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, value: null, }, - ...(Permissions.canUseViolations(betas) ? [ - { - onyxMethod: Onyx.METHOD.SET, - key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, - value: null, - }, - ] : []), + ...(Permissions.canUseViolations(betas) + ? [ + { + onyxMethod: Onyx.METHOD.SET, + key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, + value: null, + }, + ] + : []), ...(shouldDeleteTransactionThread ? [ { @@ -2163,13 +2165,15 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, value: transaction, }, - ...(Permissions.canUseViolations(betas) ? [ - { - onyxMethod: Onyx.METHOD.SET, - key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, - value: transactionViolations, - }, - ] : []), + ...(Permissions.canUseViolations(betas) + ? [ + { + onyxMethod: Onyx.METHOD.SET, + key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, + value: transactionViolations, + }, + ] + : []), ...(shouldDeleteTransactionThread ? [ { From 616dac398739400c0a7e4a44aa835aca69746bbc Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 7 Dec 2023 12:56:43 -0700 Subject: [PATCH 3/4] fix import --- src/libs/actions/IOU.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index f28b671311df..6589ea627019 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -15,7 +15,7 @@ import * as Localize from '@libs/Localize'; import Navigation from '@libs/Navigation/Navigation'; import * as NumberUtils from '@libs/NumberUtils'; import * as OptionsListUtils from '@libs/OptionsListUtils'; -import * as Permissions from '@libs/Permissions'; +import Permissions from '@libs/Permissions'; import * as ReportActionsUtils from '@libs/ReportActionsUtils'; import * as ReportUtils from '@libs/ReportUtils'; import * as TransactionUtils from '@libs/TransactionUtils'; From c90377e0e64c3a61b32841248e5f0db6bd314e61 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Fri, 8 Dec 2023 11:58:26 -0700 Subject: [PATCH 4/4] code style --- src/libs/actions/IOU.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index 6589ea627019..074fc65aa47c 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -29,9 +29,7 @@ import * as Report from './Report'; let betas; Onyx.connect({ key: ONYXKEYS.BETAS, - callback: (val) => { - betas = val || []; - }, + callback: (val) => (betas = val || []), }); let allPersonalDetails;