From 7bbc38772f484f6f2d7cc082d81732a47d3519a8 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 25 Dec 2023 16:02:43 +0700 Subject: [PATCH 1/5] redirect to upload screen if file is lost --- src/libs/IOUUtils.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts index edfb9e3691d0..a349aaacc0d2 100644 --- a/src/libs/IOUUtils.ts +++ b/src/libs/IOUUtils.ts @@ -38,7 +38,13 @@ function navigateToStartStepIfScanFileCannotBeRead( return; } - const onFailure = () => navigateToStartMoneyRequestStep(requestType, iouType, transactionID, reportID); + const onFailure = () => { + if (requestType === CONST.IOU.REQUEST_TYPE.MANUAL) { + Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams())); + return + } + navigateToStartMoneyRequestStep(requestType, iouType, transactionID, reportID) + } FileUtils.readFileAsync(receiptPath, receiptFilename, onSuccess, onFailure); } From d9243e73ce5d254631e3a7ed1ad2872624958be6 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 25 Dec 2023 16:29:27 +0700 Subject: [PATCH 2/5] fix lint --- src/libs/IOUUtils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts index a349aaacc0d2..63f73e210588 100644 --- a/src/libs/IOUUtils.ts +++ b/src/libs/IOUUtils.ts @@ -41,10 +41,10 @@ function navigateToStartStepIfScanFileCannotBeRead( const onFailure = () => { if (requestType === CONST.IOU.REQUEST_TYPE.MANUAL) { Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams())); - return + return; } - navigateToStartMoneyRequestStep(requestType, iouType, transactionID, reportID) - } + navigateToStartMoneyRequestStep(requestType, iouType, transactionID, reportID); + }; FileUtils.readFileAsync(receiptPath, receiptFilename, onSuccess, onFailure); } From 5a9fc7dd3866e518e90836160b01caaf41cd2227 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 4 Jan 2024 21:38:49 +0700 Subject: [PATCH 3/5] reset source and file name after reload --- src/libs/IOUUtils.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts index 32fda4c5f39a..758cff7cffc9 100644 --- a/src/libs/IOUUtils.ts +++ b/src/libs/IOUUtils.ts @@ -7,6 +7,7 @@ import * as CurrencyUtils from './CurrencyUtils'; import * as FileUtils from './fileDownload/FileUtils'; import Navigation from './Navigation/Navigation'; import * as TransactionUtils from './TransactionUtils'; +import * as IOU from '@userActions/IOU'; function navigateToStartMoneyRequestStep(requestType: ValueOf, iouType: ValueOf, transactionID: string, reportID: string) { // If the participants were automatically added to the transaction, then the user needs taken back to the starting step @@ -39,6 +40,7 @@ function navigateToStartStepIfScanFileCannotBeRead( } const onFailure = () => { + IOU.setMoneyRequestReceipt_temporaryForRefactor(transactionID, '', '') if (requestType === CONST.IOU.REQUEST_TYPE.MANUAL) { Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams())); return; From aa45fe6c52eb0b4280ea082625c06d09b5deb09e Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 4 Jan 2024 21:43:58 +0700 Subject: [PATCH 4/5] fix lint --- src/libs/IOUUtils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts index 758cff7cffc9..5971156ad058 100644 --- a/src/libs/IOUUtils.ts +++ b/src/libs/IOUUtils.ts @@ -1,5 +1,6 @@ import type {OnyxEntry} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; +import * as IOU from '@userActions/IOU'; import CONST from '@src/CONST'; import ROUTES from '@src/ROUTES'; import type {Report, Transaction} from '@src/types/onyx'; @@ -7,7 +8,6 @@ import * as CurrencyUtils from './CurrencyUtils'; import * as FileUtils from './fileDownload/FileUtils'; import Navigation from './Navigation/Navigation'; import * as TransactionUtils from './TransactionUtils'; -import * as IOU from '@userActions/IOU'; function navigateToStartMoneyRequestStep(requestType: ValueOf, iouType: ValueOf, transactionID: string, reportID: string) { // If the participants were automatically added to the transaction, then the user needs taken back to the starting step @@ -40,7 +40,7 @@ function navigateToStartStepIfScanFileCannotBeRead( } const onFailure = () => { - IOU.setMoneyRequestReceipt_temporaryForRefactor(transactionID, '', '') + IOU.setMoneyRequestReceipt_temporaryForRefactor(transactionID, '', ''); if (requestType === CONST.IOU.REQUEST_TYPE.MANUAL) { Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams())); return; From 68035f51045f0d09f79f8777e0d53c6be2baa5ec Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 4 Jan 2024 21:50:25 +0700 Subject: [PATCH 5/5] fix lint --- src/libs/IOUUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts index 5971156ad058..cd95e3c398bf 100644 --- a/src/libs/IOUUtils.ts +++ b/src/libs/IOUUtils.ts @@ -1,9 +1,9 @@ import type {OnyxEntry} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; -import * as IOU from '@userActions/IOU'; import CONST from '@src/CONST'; import ROUTES from '@src/ROUTES'; import type {Report, Transaction} from '@src/types/onyx'; +import * as IOU from './actions/IOU'; import * as CurrencyUtils from './CurrencyUtils'; import * as FileUtils from './fileDownload/FileUtils'; import Navigation from './Navigation/Navigation';