From 2047184f38fd6e67ce40264e5ebbaa5973587172 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Wed, 17 Apr 2024 10:00:12 -0600 Subject: [PATCH 1/5] Specify the resolution when completing actionable whisper --- src/libs/actions/IOU.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 3ce1edb36630b..0f55c383111c8 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -2486,6 +2486,7 @@ const getConvertTrackedExpenseInformation = ( linkedTrackedExpenseReportAction: OnyxTypes.ReportAction, linkedTrackedExpenseReportID: string, transactionThreadReportID: string, + resolution: ValueOf, ) => { const optimisticData: OnyxUpdate[] = []; const successData: OnyxUpdate[] = []; @@ -2537,7 +2538,7 @@ const getConvertTrackedExpenseInformation = ( value: { [actionableWhisperReportActionID]: { originalMessage: { - resolution: CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING, + resolution, }, }, }, @@ -2593,6 +2594,7 @@ function convertTrackedExpenseToRequest( linkedTrackedExpenseReportAction, linkedTrackedExpenseReportID, transactionThreadReportID, + CONST.IOU.ACTION.MOVE, ); optimisticData?.push(...moveTransactionOptimisticData); @@ -2659,6 +2661,7 @@ function categorizeTrackedExpense( linkedTrackedExpenseReportAction, linkedTrackedExpenseReportID, transactionThreadReportID, + CONST.IOU.ACTION.CATEGORIZE, ); optimisticData?.push(...moveTransactionOptimisticData); @@ -2728,6 +2731,7 @@ function shareTrackedExpense( linkedTrackedExpenseReportAction, linkedTrackedExpenseReportID, transactionThreadReportID, + CONST.IOU.ACTION.SHARE, ); optimisticData?.push(...moveTransactionOptimisticData); From 85e5e923dd5d590e585118ccc82aa8db233a425d Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Wed, 17 Apr 2024 10:06:38 -0600 Subject: [PATCH 2/5] Rename "move" to "request" --- src/CONST.ts | 2 +- src/libs/IOUUtils.ts | 4 ++-- src/libs/actions/IOU.ts | 4 ++-- src/pages/home/report/ReportActionItem.tsx | 2 +- .../MoneyTemporaryForRefactorRequestParticipantsSelector.js | 4 ++-- src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 2 +- src/pages/iou/request/step/IOURequestStepParticipants.tsx | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index eba68999cc39f..d2173fd31ee90 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -1411,7 +1411,7 @@ const CONST = { ACTION: { EDIT: 'edit', CREATE: 'create', - MOVE: 'move', + REQUEST: 'request', CATEGORIZE: 'categorize', SHARE: 'share', }, diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts index 27af031d19a83..c21152ea310dc 100644 --- a/src/libs/IOUUtils.ts +++ b/src/libs/IOUUtils.ts @@ -15,7 +15,7 @@ function navigateToStartMoneyRequestStep( reportID: string, iouAction?: ValueOf, ): void { - if (iouAction === CONST.IOU.ACTION.CATEGORIZE || iouAction === CONST.IOU.ACTION.MOVE) { + if (iouAction === CONST.IOU.ACTION.CATEGORIZE || iouAction === CONST.IOU.ACTION.REQUEST) { Navigation.goBack(); return; } @@ -135,7 +135,7 @@ function insertTagIntoTransactionTagsString(transactionTags: string, tag: string } function isMovingTransactionFromTrackExpense(action?: ValueOf) { - if (action === CONST.IOU.ACTION.MOVE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE) { + if (action === CONST.IOU.ACTION.REQUEST || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE) { return true; } diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 0f55c383111c8..3a6ab2a0ae8b6 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -2594,7 +2594,7 @@ function convertTrackedExpenseToRequest( linkedTrackedExpenseReportAction, linkedTrackedExpenseReportID, transactionThreadReportID, - CONST.IOU.ACTION.MOVE, + CONST.IOU.ACTION.REQUEST, ); optimisticData?.push(...moveTransactionOptimisticData); @@ -2835,7 +2835,7 @@ function requestMoney( const activeReportID = isMoneyRequestReport ? report?.reportID : chatReport.reportID; switch (action) { - case CONST.IOU.ACTION.MOVE: { + case CONST.IOU.ACTION.REQUEST: { if (!linkedTrackedExpenseReportAction || !actionableWhisperReportActionID || !linkedTrackedExpenseReportID) { return; } diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx index a23f3bab8dc8d..3313bf0413be1 100644 --- a/src/pages/home/report/ReportActionItem.tsx +++ b/src/pages/home/report/ReportActionItem.tsx @@ -393,7 +393,7 @@ function ReportActionItem({ text: 'actionableMentionTrackExpense.request', key: `${action.reportActionID}-actionableMentionTrackExpense-request`, onPress: () => { - ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.MOVE, action.reportActionID); + ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.REQUEST, action.reportActionID); }, isMediumSized: true, }, diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js index 87883972f84fb..5ab487a6e77f3 100644 --- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js +++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js @@ -109,7 +109,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({participants, onF // If we are using this component in the "Request money" flow then we pass the includeOwnedWorkspaceChats argument so that the current user // sees the option to request money from their admin on their own Workspace Chat. - iouType === CONST.IOU.TYPE.REQUEST && action !== CONST.IOU.ACTION.MOVE, + iouType === CONST.IOU.TYPE.REQUEST && action !== CONST.IOU.ACTION.REQUEST, (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && ![CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(action), false, @@ -267,7 +267,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({participants, onF (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && iouType !== CONST.IOU.TYPE.SEND && iouType !== CONST.IOU.TYPE.TRACK_EXPENSE && - ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(action); + ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.REQUEST, CONST.IOU.ACTION.CATEGORIZE].includes(action); const handleConfirmSelection = useCallback( (keyEvent, option) => { diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 46e663956e4a7..1c3a7d7c3f0c1 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -77,7 +77,7 @@ function IOURequestStepConfirmation({ const transactionTaxAmount = transaction?.taxAmount; const isSharingTrackExpense = action === CONST.IOU.ACTION.SHARE; const isCategorizingTrackExpense = action === CONST.IOU.ACTION.CATEGORIZE; - const isRequestingFromTrackExpense = action === CONST.IOU.ACTION.MOVE; + const isRequestingFromTrackExpense = action === CONST.IOU.ACTION.REQUEST; const requestType = TransactionUtils.getRequestType(transaction); diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx index 5d81a7711cadb..158050e8bbf6e 100644 --- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx +++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx @@ -50,7 +50,7 @@ function IOURequestStepParticipants({ if (action === CONST.IOU.ACTION.CATEGORIZE) { return translate('iou.categorize'); } - if (action === CONST.IOU.ACTION.MOVE) { + if (action === CONST.IOU.ACTION.REQUEST) { return translate('iou.request'); } if (action === CONST.IOU.ACTION.SHARE) { From b7deeb7d63b990628aa7c1cd70fa0610fe83fffe Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Wed, 17 Apr 2024 10:06:45 -0600 Subject: [PATCH 3/5] Remove unused reference --- src/CONST.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CONST.ts b/src/CONST.ts index d2173fd31ee90..b5a5a7797b52a 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -1436,7 +1436,6 @@ const CONST = { DELETE: 'delete', APPROVE: 'approve', TRACK: 'track', - MOVE: 'move', }, AMOUNT_MAX_LENGTH: 10, RECEIPT_STATE: { From 2fab2ffc65d31184542543f8d7c6749758fe94b2 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Wed, 17 Apr 2024 10:30:21 -0600 Subject: [PATCH 4/5] Make the type a little more strict --- 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 3a6ab2a0ae8b6..4fbfcc3bac5ab 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -2486,7 +2486,7 @@ const getConvertTrackedExpenseInformation = ( linkedTrackedExpenseReportAction: OnyxTypes.ReportAction, linkedTrackedExpenseReportID: string, transactionThreadReportID: string, - resolution: ValueOf, + resolution: Omit, 'edit' | 'create'>, ) => { const optimisticData: OnyxUpdate[] = []; const successData: OnyxUpdate[] = []; From 2a01d46114f9abf2a32d03b02db4e9b180401936 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Thu, 18 Apr 2024 10:01:33 -0600 Subject: [PATCH 5/5] Use simplified type --- 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 85e9e736341f4..da33b64982b42 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -2489,7 +2489,7 @@ const getConvertTrackedExpenseInformation = ( linkedTrackedExpenseReportAction: OnyxTypes.ReportAction, linkedTrackedExpenseReportID: string, transactionThreadReportID: string, - resolution: Omit, 'edit' | 'create'>, + resolution: IOUAction, ) => { const optimisticData: OnyxUpdate[] = []; const successData: OnyxUpdate[] = [];