From ecc749607219e5ebba033e9e5c6140ef62fca44d Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 16 Apr 2024 11:09:14 +0700 Subject: [PATCH 1/4] fix: Track expense shortcut doesn't update to the correct one in offline mode --- src/libs/actions/IOU.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 85f4b74f3436..c9e3e409b347 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -823,6 +823,22 @@ function buildOnyxDataForTrackExpense( const isScanRequest = TransactionUtils.isScanRequest(transaction); const clearedPendingFields = Object.fromEntries(Object.keys(transaction.pendingFields ?? {}).map((key) => [key, null])); const optimisticData: OnyxUpdate[] = []; + const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction); + let newQuickAction: ValueOf = CONST.QUICK_ACTIONS.TRACK_MANUAL; + if (isScanRequest) { + newQuickAction = CONST.QUICK_ACTIONS.TRACK_SCAN + } else if (isDistanceRequest) { + newQuickAction = CONST.QUICK_ACTIONS.TRACK_DISTANCE + } + optimisticData.push({ + onyxMethod: Onyx.METHOD.SET, + key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE, + value: { + action: newQuickAction, + chatReportID: chatReport?.reportID, + isFirstQuickAction: isEmptyObject(quickAction), + }, + }); if (chatReport) { optimisticData.push({ From 7a61a34b3706236394b3a4b8bded8daa5f83ded9 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 16 Apr 2024 11:56:45 +0700 Subject: [PATCH 2/4] fix: lint --- src/libs/actions/IOU.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index c9e3e409b347..b47ebf18694e 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -826,9 +826,9 @@ function buildOnyxDataForTrackExpense( const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction); let newQuickAction: ValueOf = CONST.QUICK_ACTIONS.TRACK_MANUAL; if (isScanRequest) { - newQuickAction = CONST.QUICK_ACTIONS.TRACK_SCAN + newQuickAction = CONST.QUICK_ACTIONS.TRACK_SCAN; } else if (isDistanceRequest) { - newQuickAction = CONST.QUICK_ACTIONS.TRACK_DISTANCE + newQuickAction = CONST.QUICK_ACTIONS.TRACK_DISTANCE; } optimisticData.push({ onyxMethod: Onyx.METHOD.SET, From cc5ddf582d05bd48c0e47f0a02b586c2d921ee88 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 17 Apr 2024 00:18:19 +0700 Subject: [PATCH 3/4] fix lint --- src/libs/actions/IOU.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index b47ebf18694e..25311f2e29b5 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -821,9 +821,9 @@ function buildOnyxDataForTrackExpense( policyCategories?: OnyxEntry, ): [OnyxUpdate[], OnyxUpdate[], OnyxUpdate[]] { const isScanRequest = TransactionUtils.isScanRequest(transaction); + const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction); const clearedPendingFields = Object.fromEntries(Object.keys(transaction.pendingFields ?? {}).map((key) => [key, null])); const optimisticData: OnyxUpdate[] = []; - const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction); let newQuickAction: ValueOf = CONST.QUICK_ACTIONS.TRACK_MANUAL; if (isScanRequest) { newQuickAction = CONST.QUICK_ACTIONS.TRACK_SCAN; From e07ee7d81b7e15137713dd6633e81f5db93624a8 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 19 Apr 2024 17:51:46 +0700 Subject: [PATCH 4/4] fix: add failure data to track expense --- src/libs/actions/IOU.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index b7141545409f..585594af2178 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -1056,6 +1056,12 @@ function buildOnyxDataForTrackExpense( const failureData: OnyxUpdate[] = []; + failureData.push({ + onyxMethod: Onyx.METHOD.SET, + key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE, + value: quickAction, + }); + if (iouReport) { failureData.push( {