From 4ef57cd43f428c66b1e3be7582155f92c5dc8f5d Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Mon, 3 Nov 2025 01:00:48 +0530 Subject: [PATCH 01/23] fix: update hold modal content --- .../ProcessMoneyRequestHoldMenu.tsx | 19 ++----------------- src/languages/en.ts | 8 ++++---- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/components/ProcessMoneyRequestHoldMenu.tsx b/src/components/ProcessMoneyRequestHoldMenu.tsx index 32e7087eb296..788cb92c63c3 100644 --- a/src/components/ProcessMoneyRequestHoldMenu.tsx +++ b/src/components/ProcessMoneyRequestHoldMenu.tsx @@ -1,16 +1,12 @@ -import React, {useMemo} from 'react'; -import {View} from 'react-native'; +import React from 'react'; import useBeforeRemove from '@hooks/useBeforeRemove'; import useLocalize from '@hooks/useLocalize'; -import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; import variables from '@styles/variables'; import CONST from '@src/CONST'; import FeatureTrainingModal from './FeatureTrainingModal'; import HoldMenuSectionList from './HoldMenuSectionList'; import * as Illustrations from './Icon/Illustrations'; -import Text from './Text'; -import TextPill from './TextPill'; type ProcessMoneyRequestHoldMenuProps = { /** Method to trigger when pressing outside of the popover menu to close it */ @@ -23,23 +19,12 @@ type ProcessMoneyRequestHoldMenuProps = { function ProcessMoneyRequestHoldMenu({onClose, onConfirm}: ProcessMoneyRequestHoldMenuProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); - const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout(); useBeforeRemove(onClose); - const title = useMemo( - () => ( - - {translate('iou.holdEducationalTitle')} - {translate('iou.holdEducationalText')} - - ), - [onboardingIsMediumOrLargerScreenWidth, styles.flexRow, styles.alignItemsCenter, styles.mb1, styles.mb2, styles.textHeadline, styles.mr2, styles.holdRequestInline, translate], - ); - return ( Date: Mon, 3 Nov 2025 01:14:16 +0530 Subject: [PATCH 02/23] fix: remove unused key --- src/languages/de.ts | 1 - src/languages/en.ts | 1 - src/languages/es.ts | 1 - src/languages/fr.ts | 1 - src/languages/it.ts | 1 - src/languages/ja.ts | 1 - src/languages/nl.ts | 1 - src/languages/pl.ts | 1 - src/languages/pt-BR.ts | 1 - src/languages/zh-hans.ts | 1 - 10 files changed, 10 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index 943762000a90..330c49fd39ac 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -1416,7 +1416,6 @@ const translations = { payOnly: 'Nur bezahlen', approveOnly: 'Nur genehmigen', holdEducationalTitle: 'Diese Anfrage ist an', - holdEducationalText: 'halten', whatIsHoldExplain: 'Halten ist wie das Drücken der „Pause“-Taste bei einer Ausgabe, um vor der Genehmigung oder Zahlung nach weiteren Details zu fragen.', holdIsLeftBehind: 'Zurückgehaltene Ausgaben werden nach Genehmigung oder Zahlung in einen anderen Bericht verschoben.', unholdWhenReady: 'Genehmiger können Ausgaben freigeben, wenn sie zur Genehmigung oder Zahlung bereit sind.', diff --git a/src/languages/en.ts b/src/languages/en.ts index 91445cb030a2..14271c2250b8 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1386,7 +1386,6 @@ const translations = { payOnly: 'Pay only', approveOnly: 'Approve only', holdEducationalTitle: 'Should you hold this expense?', - holdEducationalText: 'hold', whatIsHoldExplain: 'Hold is like hitting “pause” on an expense until you\'re ready to submit it.', holdIsLeftBehind: 'Held expenses are left behind even if you submit an entire report.', unholdWhenReady: 'Unhold expenses when you\'re ready to submit them.', diff --git a/src/languages/es.ts b/src/languages/es.ts index 49079d36b4cf..fd3257e548db 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1380,7 +1380,6 @@ const translations = { hold: 'Retener', unhold: 'Desbloquear', holdEducationalTitle: 'Esta solicitud está', - holdEducationalText: 'retenida', whatIsHoldExplain: 'Retener es como "pausar" un gasto para solicitar más detalles antes de aprobarlo o pagarlo.', holdIsLeftBehind: 'Los gastos retenidos se trasladan a otro informe tras su aprobación o pago.', unholdWhenReady: 'Los aprobadores pueden desbloquear los gastos cuando estén listos para su aprobación o pago.', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 715dc45ae6f4..17fa9500d59d 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -1414,7 +1414,6 @@ const translations = { payOnly: 'Payer seulement', approveOnly: 'Approuver seulement', holdEducationalTitle: 'Cette demande est activée', - holdEducationalText: 'tenir', whatIsHoldExplain: 'La mise en attente, c\'est comme appuyer sur "pause" pour une dépense afin de demander plus de détails avant l\'approbation ou le paiement.', holdIsLeftBehind: 'Les dépenses en attente sont déplacées vers un autre rapport après approbation ou paiement.', unholdWhenReady: "Les approbateurs peuvent débloquer les dépenses lorsqu'elles sont prêtes pour approbation ou paiement.", diff --git a/src/languages/it.ts b/src/languages/it.ts index 7b75125a636e..2ad4e6fb0c25 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -1407,7 +1407,6 @@ const translations = { payOnly: 'Paga solo', approveOnly: 'Approva solo', holdEducationalTitle: 'Questa richiesta è attiva', - holdEducationalText: 'tieni', whatIsHoldExplain: 'Mettere in sospeso è come premere "pausa" su una spesa per chiedere ulteriori dettagli prima dell\'approvazione o del pagamento.', holdIsLeftBehind: "Le spese trattenute vengono spostate in un altro report al momento dell'approvazione o del pagamento.", unholdWhenReady: "Gli approvatori possono sbloccare le spese quando sono pronte per l'approvazione o il pagamento.", diff --git a/src/languages/ja.ts b/src/languages/ja.ts index cc792be36cc3..f1eacb41af05 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -1409,7 +1409,6 @@ const translations = { payOnly: '支払いのみ', approveOnly: '承認のみ', holdEducationalTitle: 'このリクエストはオン', - holdEducationalText: '保留', whatIsHoldExplain: '保留は、承認や支払いの前に詳細を確認するために、経費を「一時停止」するようなものです。', holdIsLeftBehind: '保留された経費は承認または支払い時に別のレポートに移動します。', unholdWhenReady: '承認者は、承認または支払いの準備が整ったときに経費を解除できます。', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 53b3e9921439..dc740b661f00 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -1409,7 +1409,6 @@ const translations = { payOnly: 'Alleen betalen', approveOnly: 'Alleen goedkeuren', holdEducationalTitle: 'Dit verzoek is ingediend op', - holdEducationalText: 'vasthouden', whatIsHoldExplain: 'Vasthouden is als het indrukken van "pauze" op een uitgave om meer details te vragen voordat deze wordt goedgekeurd of betaald.', holdIsLeftBehind: 'Ingehouden uitgaven worden naar een ander rapport verplaatst na goedkeuring of betaling.', unholdWhenReady: 'Goedkeurders kunnen uitgaven vrijgeven wanneer ze klaar zijn voor goedkeuring of betaling.', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 40dda5d0bd6d..91ddfdfb4d69 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -1407,7 +1407,6 @@ const translations = { payOnly: 'Płać tylko', approveOnly: 'Zatwierdź tylko', holdEducationalTitle: 'To żądanie jest w toku', - holdEducationalText: 'trzymaj', whatIsHoldExplain: 'Wstrzymanie jest jak naciśnięcie „pauzy” na wydatku, aby poprosić o więcej szczegółów przed zatwierdzeniem lub płatnością.', holdIsLeftBehind: 'Wstrzymane wydatki są przenoszone do innego raportu po zatwierdzeniu lub opłaceniu.', unholdWhenReady: 'Osoby zatwierdzające mogą zdjąć blokadę z wydatków, gdy będą gotowe do zatwierdzenia lub płatności.', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 67cc651980fb..f1cd100a4dd4 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -1404,7 +1404,6 @@ const translations = { payOnly: 'Pagar apenas', approveOnly: 'Aprovar apenas', holdEducationalTitle: 'Esta solicitação está em andamento', - holdEducationalText: 'aguarde', whatIsHoldExplain: 'Colocar em espera é como apertar "pausa" em uma despesa para solicitar mais detalhes antes da aprovação ou pagamento.', holdIsLeftBehind: 'Despesas retidas são movidas para outro relatório após aprovação ou pagamento.', unholdWhenReady: 'Os aprovadores podem liberar despesas quando estiverem prontas para aprovação ou pagamento.', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 73f88ff1671a..23c880c1d41d 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -1389,7 +1389,6 @@ const translations = { payOnly: '仅支付', approveOnly: '仅批准', holdEducationalTitle: '此请求正在处理中', - holdEducationalText: '保持', whatIsHoldExplain: '将“暂停”用于费用上,以便在批准或付款前请求更多详细信息。', holdIsLeftBehind: '待处理费用在批准或支付后移至另一份报告。', unholdWhenReady: '审批者可以在准备好审批或付款时解除费用保留。', From c1a0b87a52734e47aa3cff674a9e96106d3eb204 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Mon, 3 Nov 2025 17:18:25 +0530 Subject: [PATCH 03/23] fix: temp changes --- src/components/MoneyRequestHeader.tsx | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 5f62518741ee..40572441bfad 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -184,13 +184,13 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const statusBarProps = getStatusBarProps(); - useEffect(() => { - // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - if (isLoadingHoldUseExplained || dismissedHoldUseExplanation || !isOnHold) { - return; - } - Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute())); - }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]); + // useEffect(() => { + // // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing + // if (isLoadingHoldUseExplained || dismissedHoldUseExplanation || !isOnHold) { + // return; + // } + // Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute())); + // }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]); const primaryAction = useMemo(() => { if (!report || !parentReport || !transaction) { @@ -292,7 +292,11 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre return; } - changeMoneyRequestHoldStatus(parentReportAction); + if (dismissedHoldUseExplanation) { + changeMoneyRequestHoldStatus(parentReportAction); + } else { + Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute())) + } }, }, [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REMOVE_HOLD]: { From a6ac32c11591607ba31123875b1dd96dccace1e1 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Tue, 4 Nov 2025 05:47:34 +0530 Subject: [PATCH 04/23] fix: update es copy --- src/languages/es.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index b3c0c88d573d..abbe46ba9110 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1382,10 +1382,10 @@ const translations = { approveOnly: 'Solo aprobar', hold: 'Retener', unhold: 'Desbloquear', - holdEducationalTitle: 'Esta solicitud está', - whatIsHoldExplain: 'Retener es como "pausar" un gasto para solicitar más detalles antes de aprobarlo o pagarlo.', - holdIsLeftBehind: 'Los gastos retenidos se trasladan a otro informe tras su aprobación o pago.', - unholdWhenReady: 'Los aprobadores pueden desbloquear los gastos cuando estén listos para su aprobación o pago.', + holdEducationalTitle: '¿Deberías retener este gasto?', + whatIsHoldExplain: 'Retener es como presionar "pausa" en un gasto hasta que estés listo para enviarlo.', + holdIsLeftBehind: 'Los gastos retenidos se quedan fuera incluso si envías un informe completo.', + unholdWhenReady: 'Desbloquea los gastos cuando estés listo para enviarlos.', changePolicyEducational: { title: '¡Has movido este informe!', description: 'Revisa cuidadosamente estos elementos, que tienden a cambiar al trasladar informes a un nuevo espacio de trabajo.', From 5ec58eb0bfde3edd89f8a283cbde06457f3b8bd8 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Wed, 5 Nov 2025 23:45:20 +0530 Subject: [PATCH 05/23] feat: use hold modal logic --- src/components/MoneyRequestHeader.tsx | 35 +++++++++++++++++---------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 40572441bfad..af90c37e45f9 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -1,6 +1,6 @@ import {useRoute} from '@react-navigation/native'; import type {ReactNode} from 'react'; -import React, {useCallback, useContext, useEffect, useMemo, useState} from 'react'; +import React, {useCallback, useContext, useMemo, useState} from 'react'; import {View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; @@ -47,7 +47,7 @@ import ROUTES from '@src/ROUTES'; import SCREENS from '@src/SCREENS'; import type {Policy, Report, ReportAction} from '@src/types/onyx'; import type IconAsset from '@src/types/utils/IconAsset'; -import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; +import { setNameValuePair } from '@libs/actions/User'; import BrokenConnectionDescription from './BrokenConnectionDescription'; import Button from './Button'; import ButtonWithDropdownMenu from './ButtonWithDropdownMenu'; @@ -65,6 +65,7 @@ import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar'; import MoneyRequestReportTransactionsNavigation from './MoneyRequestReportView/MoneyRequestReportTransactionsNavigation'; import {useSearchContext} from './Search/SearchContext'; import {WideRHPContext} from './WideRHPContextProvider'; +import ProcessMoneyRequestHoldMenu from './ProcessMoneyRequestHoldMenu'; type MoneyRequestHeaderProps = { /** The report currently being looked at */ @@ -101,10 +102,10 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false); const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false); const [isRejectEducationalModalVisible, setIsRejectEducationalModalVisible] = useState(false); + const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false); const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION, {canBeMissing: true}); - const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {canBeMissing: true}); + const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {canBeMissing: true}); const shouldShowLoadingBar = useLoadingBarVisibility(); - const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult); const styles = useThemeStyles(); const theme = useTheme(); const {translate} = useLocalize(); @@ -133,6 +134,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const shouldOpenParentReportInCurrentTab = !isSelfDM(parentReport); const {wideRHPRouteKeys} = useContext(WideRHPContext); + const [network] = useOnyx(ONYXKEYS.NETWORK, {canBeMissing: true}); const markAsCash = useCallback(() => { markAsCashAction(transaction?.transactionID, reportID); @@ -184,14 +186,6 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const statusBarProps = getStatusBarProps(); - // useEffect(() => { - // // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - // if (isLoadingHoldUseExplained || dismissedHoldUseExplanation || !isOnHold) { - // return; - // } - // Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute())); - // }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]); - const primaryAction = useMemo(() => { if (!report || !parentReport || !transaction) { return ''; @@ -277,6 +271,14 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre } }; + const dismissModalAndUpdateUseHold = () => { + setIsHoldEducationalModalVisible(false); + setNameValuePair(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, true, false, !network?.shouldFailAllRequests); + if (parentReportAction) { + changeMoneyRequestHoldStatus(parentReportAction); + } + }; + const secondaryActionsImplementation: Record, DropdownOption>> = { [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD]: { text: translate('iou.hold'), @@ -295,8 +297,9 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre if (dismissedHoldUseExplanation) { changeMoneyRequestHoldStatus(parentReportAction); } else { - Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute())) + setIsHoldEducationalModalVisible(true); } + }, }, [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REMOVE_HOLD]: { @@ -481,6 +484,12 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre onConfirm={dismissModalAndUpdateUseReject} /> )} + {!!isHoldEducationalModalVisible && ( + + )} ); } From 3b8b53e3cc55445791c638bb029594f09c3da99e Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Thu, 6 Nov 2025 23:31:10 +0530 Subject: [PATCH 06/23] fix: role based modal open --- src/components/MoneyRequestHeader.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index af90c37e45f9..faf980c642d2 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -25,7 +25,7 @@ import type {ReportsSplitNavigatorParamList, SearchReportParamList} from '@libs/ import {getOriginalMessage, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils'; import {getTransactionThreadPrimaryAction, isMarkAsResolvedAction} from '@libs/ReportPrimaryActionUtils'; import {getSecondaryTransactionThreadActions} from '@libs/ReportSecondaryActionUtils'; -import {changeMoneyRequestHoldStatus, isSelfDM, navigateToDetailsPage, rejectMoneyRequestReason} from '@libs/ReportUtils'; +import {changeMoneyRequestHoldStatus, isCurrentUserSubmitter, isSelfDM, navigateToDetailsPage, rejectMoneyRequestReason} from '@libs/ReportUtils'; import {getReviewNavigationRoute} from '@libs/TransactionPreviewUtils'; import { getOriginalTransactionWithSplitInfo, @@ -129,6 +129,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(transactionViolations); const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations); + const isReportSubmitter = isCurrentUserSubmitter(report); // If the parent report is a selfDM, it should always be opened in the Inbox tab const shouldOpenParentReportInCurrentTab = !isSelfDM(parentReport); @@ -294,12 +295,14 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre return; } - if (dismissedHoldUseExplanation) { + const isDismissed = isReportSubmitter ? dismissedHoldUseExplanation : dismissedRejectUseExplanation; + const setModalVisible = isReportSubmitter ? setIsHoldEducationalModalVisible : setIsRejectEducationalModalVisible; + + if (isDismissed) { changeMoneyRequestHoldStatus(parentReportAction); } else { - setIsHoldEducationalModalVisible(true); + setModalVisible(true); } - }, }, [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REMOVE_HOLD]: { From 9dc83c0603c14c36a4fe74d9f76c56dba14dc538 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Thu, 6 Nov 2025 23:42:24 +0530 Subject: [PATCH 07/23] feat: use action instead of state flag --- src/components/MoneyRequestHeader.tsx | 46 +++++++++++++++++---------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index faf980c642d2..cd4dd667f873 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -101,8 +101,8 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const {duplicateTransactions, duplicateTransactionViolations} = useDuplicateTransactionsAndViolations(transaction?.transactionID ? [transaction.transactionID] : []); const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false); const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false); - const [isRejectEducationalModalVisible, setIsRejectEducationalModalVisible] = useState(false); const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false); + const [rejectModalAction, setRejectModalAction] = useState<'hold' | 'reject' | null>(null); const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION, {canBeMissing: true}); const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {canBeMissing: true}); const shouldShowLoadingBar = useLoadingBarVisibility(); @@ -264,14 +264,6 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre return getSecondaryTransactionThreadActions(currentUserLogin ?? '', parentReport, transaction, parentReportAction, policy, report); }, [parentReport, transaction, parentReportAction, currentUserLogin, policy, report]); - const dismissModalAndUpdateUseReject = () => { - setIsRejectEducationalModalVisible(false); - dismissRejectUseExplanation(); - if (parentReportAction) { - rejectMoneyRequestReason(parentReportAction); - } - }; - const dismissModalAndUpdateUseHold = () => { setIsHoldEducationalModalVisible(false); setNameValuePair(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, true, false, !network?.shouldFailAllRequests); @@ -280,6 +272,21 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre } }; + const dismissRejectModalBasedOnAction = () => { + if (rejectModalAction === 'hold') { + dismissRejectUseExplanation(); + if (parentReportAction) { + changeMoneyRequestHoldStatus(parentReportAction); + } + } else { + dismissRejectUseExplanation(); + if (parentReportAction) { + rejectMoneyRequestReason(parentReportAction); + } + } + setRejectModalAction(null); + }; + const secondaryActionsImplementation: Record, DropdownOption>> = { [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD]: { text: translate('iou.hold'), @@ -296,12 +303,19 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre } const isDismissed = isReportSubmitter ? dismissedHoldUseExplanation : dismissedRejectUseExplanation; - const setModalVisible = isReportSubmitter ? setIsHoldEducationalModalVisible : setIsRejectEducationalModalVisible; if (isDismissed) { - changeMoneyRequestHoldStatus(parentReportAction); + if (isReportSubmitter) { + changeMoneyRequestHoldStatus(parentReportAction); + } else { + rejectMoneyRequestReason(parentReportAction); + } } else { - setModalVisible(true); + if (isReportSubmitter) { + setIsHoldEducationalModalVisible(true); + } else { + setRejectModalAction('hold'); + } } }, }, @@ -364,7 +378,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre rejectMoneyRequestReason(parentReportAction); } } else { - setIsRejectEducationalModalVisible(true); + setRejectModalAction('reject'); } }, }, @@ -481,10 +495,10 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre danger shouldEnableNewFocusManagement /> - {!!isRejectEducationalModalVisible && ( + {!!rejectModalAction && ( )} {!!isHoldEducationalModalVisible && ( From b7496d399ed4d512c417dba96f07e7c7dad3347d Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Thu, 6 Nov 2025 23:43:45 +0530 Subject: [PATCH 08/23] fix: reject action --- src/components/MoneyRequestHeader.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index cd4dd667f873..0c1d32a75ad4 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -303,19 +303,16 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre } const isDismissed = isReportSubmitter ? dismissedHoldUseExplanation : dismissedRejectUseExplanation; - if (isDismissed) { if (isReportSubmitter) { changeMoneyRequestHoldStatus(parentReportAction); } else { rejectMoneyRequestReason(parentReportAction); } + } else if (isReportSubmitter) { + setIsHoldEducationalModalVisible(true); } else { - if (isReportSubmitter) { - setIsHoldEducationalModalVisible(true); - } else { - setRejectModalAction('hold'); - } + setRejectModalAction('hold'); } }, }, From 91093f92b1a47ec432c1a2b36f7bc87fd468dade Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Thu, 6 Nov 2025 23:48:28 +0530 Subject: [PATCH 09/23] refactor: use const --- src/components/MoneyRequestHeader.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 0c1d32a75ad4..10d79855b17c 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -102,7 +102,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false); const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false); const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false); - const [rejectModalAction, setRejectModalAction] = useState<'hold' | 'reject' | null>(null); + const [rejectModalAction, setRejectModalAction] = useState(null); const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION, {canBeMissing: true}); const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {canBeMissing: true}); const shouldShowLoadingBar = useLoadingBarVisibility(); @@ -273,7 +273,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre }; const dismissRejectModalBasedOnAction = () => { - if (rejectModalAction === 'hold') { + if (rejectModalAction === CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD) { dismissRejectUseExplanation(); if (parentReportAction) { changeMoneyRequestHoldStatus(parentReportAction); @@ -312,7 +312,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre } else if (isReportSubmitter) { setIsHoldEducationalModalVisible(true); } else { - setRejectModalAction('hold'); + setRejectModalAction(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD); } }, }, @@ -375,7 +375,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre rejectMoneyRequestReason(parentReportAction); } } else { - setRejectModalAction('reject'); + setRejectModalAction(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT); } }, }, From 3b2b4459144083fef303d24ba878513d00048243 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Thu, 6 Nov 2025 23:52:45 +0530 Subject: [PATCH 10/23] refactor: use const --- src/components/MoneyRequestHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 10d79855b17c..33e0aea47af5 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -102,7 +102,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false); const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false); const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false); - const [rejectModalAction, setRejectModalAction] = useState(null); + const [rejectModalAction, setRejectModalAction] = useState(null); const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION, {canBeMissing: true}); const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {canBeMissing: true}); const shouldShowLoadingBar = useLoadingBarVisibility(); From ebae0496cd272edc5755c897ad10eb3a37976fde Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 00:19:57 +0530 Subject: [PATCH 11/23] fix: chat report for submitter --- src/components/MoneyRequestHeader.tsx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 33e0aea47af5..157ff2215019 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -102,7 +102,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false); const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false); const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false); - const [rejectModalAction, setRejectModalAction] = useState(null); + const [rejectModalAction, setRejectModalAction] = useState<'hold' | 'reject' | null>(null); const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION, {canBeMissing: true}); const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {canBeMissing: true}); const shouldShowLoadingBar = useLoadingBarVisibility(); @@ -129,7 +129,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(transactionViolations); const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations); - const isReportSubmitter = isCurrentUserSubmitter(report); + const isReportSubmitter = isCurrentUserSubmitter(chatIOUReport); // If the parent report is a selfDM, it should always be opened in the Inbox tab const shouldOpenParentReportInCurrentTab = !isSelfDM(parentReport); @@ -303,12 +303,9 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre } const isDismissed = isReportSubmitter ? dismissedHoldUseExplanation : dismissedRejectUseExplanation; + if (isDismissed) { - if (isReportSubmitter) { - changeMoneyRequestHoldStatus(parentReportAction); - } else { - rejectMoneyRequestReason(parentReportAction); - } + changeMoneyRequestHoldStatus(parentReportAction); } else if (isReportSubmitter) { setIsHoldEducationalModalVisible(true); } else { From 74e626203d29b25e4a984ec31ea9c750daddd9a9 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 00:42:21 +0530 Subject: [PATCH 12/23] fix: remove path from feature navigator --- .../FeatureTrainingModalNavigator.tsx | 5 --- src/pages/ProcessMoneyRequestHoldPage.tsx | 40 ------------------- 2 files changed, 45 deletions(-) delete mode 100644 src/pages/ProcessMoneyRequestHoldPage.tsx diff --git a/src/libs/Navigation/AppNavigator/Navigators/FeatureTrainingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/FeatureTrainingModalNavigator.tsx index acfd68c962fc..d40a3735abc2 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/FeatureTrainingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/FeatureTrainingModalNavigator.tsx @@ -6,7 +6,6 @@ import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigati import Animations from '@libs/Navigation/PlatformStackNavigation/navigationOptions/animation'; import type {FeatureTrainingNavigatorParamList} from '@libs/Navigation/types'; import ChangePolicyEducationalModal from '@pages/ChangePolicyEducationalModal'; -import ProcessMoneyRequestHoldPage from '@pages/ProcessMoneyRequestHoldPage'; import TrackTrainingPage from '@pages/TrackTrainingPage'; import SCREENS from '@src/SCREENS'; @@ -21,10 +20,6 @@ function FeatureTrainingModalNavigator() { name={SCREENS.FEATURE_TRAINING_ROOT} component={TrackTrainingPage} /> - (null); - useFocusEffect( - useCallback(() => { - focusTimeoutRef.current = setTimeout(() => { - // eslint-disable-next-line @typescript-eslint/no-deprecated - InteractionManager.runAfterInteractions(() => { - blurActiveElement(); - }); - }, CONST.ANIMATED_TRANSITION); - return () => focusTimeoutRef.current && clearTimeout(focusTimeoutRef.current); - }, []), - ); - const [network] = useOnyx(ONYXKEYS.NETWORK, {canBeMissing: true}); - - const onConfirm = useCallback(() => { - setNameValuePair(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, true, false, !network?.shouldFailAllRequests); - }, [network?.shouldFailAllRequests]); - - return ( - - ); -} - -ProcessMoneyRequestHoldPage.displayName = 'ProcessMoneyRequestHoldPage'; - -export default ProcessMoneyRequestHoldPage; From ee6dc837e7f1f7d06a70022fc77a7adebcef6900 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 00:42:38 +0530 Subject: [PATCH 13/23] fix: avoid duplicate nav --- src/components/ProcessMoneyRequestHoldMenu.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/ProcessMoneyRequestHoldMenu.tsx b/src/components/ProcessMoneyRequestHoldMenu.tsx index 788cb92c63c3..9a668d9e6ada 100644 --- a/src/components/ProcessMoneyRequestHoldMenu.tsx +++ b/src/components/ProcessMoneyRequestHoldMenu.tsx @@ -36,6 +36,7 @@ function ProcessMoneyRequestHoldMenu({onClose, onConfirm}: ProcessMoneyRequestHo illustrationOuterContainerStyle={styles.p0} onClose={onClose} onConfirm={onConfirm} + shouldCloseOnConfirm={false} > From 72ed1ac60f8289afb3f629b49775cec94af49c37 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 00:50:48 +0530 Subject: [PATCH 14/23] style: lint fixes --- src/components/MoneyRequestHeader.tsx | 4 ++-- src/languages/en.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 157ff2215019..dc2bf1e35bb7 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -18,6 +18,7 @@ import useThemeStyles from '@hooks/useThemeStyles'; import useTransactionViolations from '@hooks/useTransactionViolations'; import {deleteTrackExpense, initSplitExpense, markRejectViolationAsResolved} from '@libs/actions/IOU'; import {setupMergeTransactionData} from '@libs/actions/MergeTransaction'; +import {setNameValuePair} from '@libs/actions/User'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types'; @@ -47,7 +48,6 @@ import ROUTES from '@src/ROUTES'; import SCREENS from '@src/SCREENS'; import type {Policy, Report, ReportAction} from '@src/types/onyx'; import type IconAsset from '@src/types/utils/IconAsset'; -import { setNameValuePair } from '@libs/actions/User'; import BrokenConnectionDescription from './BrokenConnectionDescription'; import Button from './Button'; import ButtonWithDropdownMenu from './ButtonWithDropdownMenu'; @@ -63,9 +63,9 @@ import LoadingBar from './LoadingBar'; import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusBar'; import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar'; import MoneyRequestReportTransactionsNavigation from './MoneyRequestReportView/MoneyRequestReportTransactionsNavigation'; +import ProcessMoneyRequestHoldMenu from './ProcessMoneyRequestHoldMenu'; import {useSearchContext} from './Search/SearchContext'; import {WideRHPContext} from './WideRHPContextProvider'; -import ProcessMoneyRequestHoldMenu from './ProcessMoneyRequestHoldMenu'; type MoneyRequestHeaderProps = { /** The report currently being looked at */ diff --git a/src/languages/en.ts b/src/languages/en.ts index 4771c2bfa368..3d486dc6f155 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1389,9 +1389,9 @@ const translations = { payOnly: 'Pay only', approveOnly: 'Approve only', holdEducationalTitle: 'Should you hold this expense?', - whatIsHoldExplain: 'Hold is like hitting “pause” on an expense until you\'re ready to submit it.', + whatIsHoldExplain: "Hold is like hitting “pause” on an expense until you're ready to submit it.", holdIsLeftBehind: 'Held expenses are left behind even if you submit an entire report.', - unholdWhenReady: 'Unhold expenses when you\'re ready to submit them.', + unholdWhenReady: "Unhold expenses when you're ready to submit them.", changePolicyEducational: { title: 'You moved this report!', description: 'Double-check these items, which tend to change when moving reports to a new workspace.', From 27c300644aba170c6393378e1a558f5e44bc5323 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 01:06:44 +0530 Subject: [PATCH 15/23] feat: replicate changes for money report --- src/components/MoneyReportHeader.tsx | 67 +++++++++++++++++++--------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 27d37a52bab3..62189a9dec8f 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -34,6 +34,7 @@ import {setupMergeTransactionData} from '@libs/actions/MergeTransaction'; import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode'; import {createTransactionThreadReport, deleteAppReport, downloadReportPDF, exportReportToCSV, exportReportToPDF, exportToIntegration, markAsManuallyExported} from '@libs/actions/Report'; import {getExportTemplates, queueExportSearchWithTemplate, search} from '@libs/actions/Search'; +import {setNameValuePair} from '@libs/actions/User'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import getPlatform from '@libs/getPlatform'; import Log from '@libs/Log'; @@ -61,6 +62,7 @@ import { hasUpdatedTotal, hasViolations as hasViolationsReportUtils, isAllowedToApproveExpenseReport, + isCurrentUserSubmitter, isExported as isExportedUtils, isInvoiceReport as isInvoiceReportUtil, isProcessingReport, @@ -77,7 +79,6 @@ import { hasDuplicateTransactions, isDuplicate, isExpensifyCardTransaction, - isOnHold as isOnHoldTransactionUtils, isPayAtEndExpense as isPayAtEndExpenseTransactionUtils, isPending, isScanning, @@ -111,7 +112,6 @@ import SCREENS from '@src/SCREENS'; import type * as OnyxTypes from '@src/types/onyx'; import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage'; import type IconAsset from '@src/types/utils/IconAsset'; -import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import ActivityIndicator from './ActivityIndicator'; import AnimatedSubmitButton from './AnimatedSubmitButton'; import BrokenConnectionDescription from './BrokenConnectionDescription'; @@ -139,6 +139,7 @@ import MoneyRequestReportNavigation from './MoneyRequestReportView/MoneyRequestR import type {PopoverMenuItem} from './PopoverMenu'; import type {ActionHandledType} from './ProcessMoneyReportHoldMenu'; import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu'; +import ProcessMoneyRequestHoldMenu from './ProcessMoneyRequestHoldMenu'; import {useSearchContext} from './Search/SearchContext'; import AnimatedSettlementButton from './SettlementButton/AnimatedSettlementButton'; import Text from './Text'; @@ -236,9 +237,8 @@ function MoneyReportHeader({ }); const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION, {canBeMissing: true}); - const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {canBeMissing: true}); + const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {canBeMissing: true}); - const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult); const [invoiceReceiverPolicy] = useOnyx( `${ONYXKEYS.COLLECTION.POLICY}${chatReport?.invoiceReceiver && 'policyID' in chatReport.invoiceReceiver ? chatReport.invoiceReceiver.policyID : undefined}`, {canBeMissing: true}, @@ -278,7 +278,6 @@ function MoneyReportHeader({ const styles = useThemeStyles(); const theme = useTheme(); const {isOffline} = useNetwork(); - const isOnHold = isOnHoldTransactionUtils(transaction); const {isExpenseSplit} = getOriginalTransactionWithSplitInfo(transaction); const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true}); @@ -324,12 +323,14 @@ function MoneyReportHeader({ const isInvoiceReport = isInvoiceReportUtil(moneyRequestReport); const [isDownloadErrorModalVisible, setIsDownloadErrorModalVisible] = useState(false); - const [isRejectEducationalModalVisible, setIsRejectEducationalModalVisible] = useState(false); + const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false); + const [rejectModalAction, setRejectModalAction] = useState<'hold' | 'reject' | null>(null); const {selectedTransactionIDs, removeTransaction, clearSelectedTransactions, currentSearchQueryJSON, currentSearchKey, currentSearchHash} = useSearchContext(); const shouldCalculateTotals = useSearchShouldCalculateTotals(currentSearchKey, currentSearchQueryJSON?.similarSearchHash, true); const {wideRHPRouteKeys} = useContext(WideRHPContext); + const [network] = useOnyx(ONYXKEYS.NETWORK, {canBeMissing: true}); const shouldDisplayNarrowMoreButton = !shouldDisplayNarrowVersion || (wideRHPRouteKeys.length > 0 && !isSmallScreenWidth); const beginExportWithTemplate = useCallback( @@ -417,6 +418,7 @@ function MoneyReportHeader({ const isReportInRHP = route.name === SCREENS.SEARCH.REPORT_RHP; const shouldDisplaySearchRouter = !isReportInRHP || isSmallScreenWidth; const isReportInSearch = route.name === SCREENS.SEARCH.MONEY_REQUEST_REPORT; + const isReportSubmitter = isCurrentUserSubmitter(chatIOUReport); const existingB2BInvoiceReport = useParticipantsInvoiceReport(activePolicyID, CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS, chatReport?.policyID); const confirmPayment = useCallback( @@ -571,21 +573,30 @@ function MoneyReportHeader({ }; const statusBarProps = getStatusBarProps(); - const dismissModalAndUpdateUseReject = () => { - setIsRejectEducationalModalVisible(false); - dismissRejectUseExplanation(); + + const dismissModalAndUpdateUseHold = () => { + setIsHoldEducationalModalVisible(false); + setNameValuePair(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, true, false, !network?.shouldFailAllRequests); if (requestParentReportAction) { - rejectMoneyRequestReason(requestParentReportAction); + changeMoneyRequestHoldStatus(requestParentReportAction); } }; - useEffect(() => { - // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - if (isLoadingHoldUseExplained || dismissedHoldUseExplanation || !isOnHold) { - return; + + const dismissRejectModalBasedOnAction = () => { + if (rejectModalAction === CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD) { + dismissRejectUseExplanation(); + if (requestParentReportAction) { + changeMoneyRequestHoldStatus(requestParentReportAction); + } + } else { + dismissRejectUseExplanation(); + if (requestParentReportAction) { + rejectMoneyRequestReason(requestParentReportAction); + } } - Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute())); - }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]); + setRejectModalAction(null); + }; const primaryAction = useMemo(() => { return getReportPrimaryAction({ @@ -979,7 +990,15 @@ function MoneyReportHeader({ return; } - changeMoneyRequestHoldStatus(requestParentReportAction); + const isDismissed = isReportSubmitter ? dismissedHoldUseExplanation : dismissedRejectUseExplanation; + + if (isDismissed) { + changeMoneyRequestHoldStatus(requestParentReportAction); + } else if (isReportSubmitter) { + setIsHoldEducationalModalVisible(true); + } else { + setRejectModalAction(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD); + } }, }, [CONST.REPORT.SECONDARY_ACTIONS.REMOVE_HOLD]: { @@ -1086,7 +1105,7 @@ function MoneyReportHeader({ rejectMoneyRequestReason(requestParentReportAction); } } else { - setIsRejectEducationalModalVisible(true); + setRejectModalAction(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT); } }, shouldShow: transactions.length === 1, @@ -1455,10 +1474,16 @@ function MoneyReportHeader({ isVisible={isDownloadErrorModalVisible} onClose={() => setIsDownloadErrorModalVisible(false)} /> - {!!isRejectEducationalModalVisible && ( + {!!rejectModalAction && ( + )} + {!!isHoldEducationalModalVisible && ( + )} Date: Fri, 7 Nov 2025 01:12:25 +0530 Subject: [PATCH 16/23] fix: revise comment --- src/ONYXKEYS.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index c3c1c5ef94f3..f1d28184b2d4 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -262,7 +262,7 @@ const ONYXKEYS = { /** If the user should see the team 2025 subscription pricing */ NVP_PRIVATE_MANUAL_TEAM_2025_PRICING: 'nvp_private_manualTeam2025Pricing', - /** If the user dismissed the reject explanation */ + /** If the approver dismissed the reject or hold explanation */ NVP_DISMISSED_REJECT_USE_EXPLANATION: 'nvp_dismissedRejectUseExplanation', /** Details on whether an account is locked or not */ From cf8860dbf18e5a01c3d50cf1199fc0d154c6e80e Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 01:17:07 +0530 Subject: [PATCH 17/23] style: lint fixes --- src/components/MoneyReportHeader.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 62189a9dec8f..12191c45b986 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -582,7 +582,6 @@ function MoneyReportHeader({ } }; - const dismissRejectModalBasedOnAction = () => { if (rejectModalAction === CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD) { dismissRejectUseExplanation(); From ffc30c0f2edc14558d1e33cc5c3e7269cce57f5f Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 01:26:02 +0530 Subject: [PATCH 18/23] fix: remove hold modal route --- src/ROUTES.ts | 7 ------- src/SCREENS.ts | 2 -- src/libs/Navigation/linkingConfig/config.ts | 1 - src/libs/Navigation/types.ts | 1 - 4 files changed, 11 deletions(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 44ff6908fd2f..3ba642f924b8 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -2403,13 +2403,6 @@ const ROUTES = { route: 'share/submit-details/:reportOrAccountID', getRoute: (reportOrAccountID: string) => `share/submit-details/${reportOrAccountID}` as const, }, - - PROCESS_MONEY_REQUEST_HOLD: { - route: 'hold-expense-educational', - - // eslint-disable-next-line no-restricted-syntax -- Legacy route generation - getRoute: (backTo?: string) => getUrlWithBackToParam('hold-expense-educational', backTo), - }, CHANGE_POLICY_EDUCATIONAL: { route: 'change-workspace-educational', diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 5811bf7e08f6..69de503cd91e 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -236,7 +236,6 @@ const SCREENS = { ROOM_MEMBER_DETAILS: 'RoomMembers_Details', ROOM_INVITE: 'RoomInvite', REFERRAL: 'Referral', - PROCESS_MONEY_REQUEST_HOLD: 'ProcessMoneyRequestHold', TRANSACTION_DUPLICATE: 'TransactionDuplicate', TRAVEL: 'Travel', SEARCH_REPORT: 'SearchReport', @@ -764,7 +763,6 @@ const SCREENS = { SIGN_IN_ROOT: 'SignIn_Root', DETAILS_ROOT: 'Details_Root', PROFILE_ROOT: 'Profile_Root', - PROCESS_MONEY_REQUEST_HOLD_ROOT: 'ProcessMoneyRequestHold_Root', AUTO_SUBMIT_ROOT: 'AutoSubmit_Modal_Root', CHANGE_POLICY_EDUCATIONAL_ROOT: 'ChangePolicyEducational_Root', REPORT_DESCRIPTION_ROOT: 'Report_Description_Root', diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index ca0303aba72f..079c5e648a13 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -58,7 +58,6 @@ const config: LinkingOptions['config'] = { path: ROUTES.TRACK_TRAINING_MODAL, exact: true, }, - [SCREENS.PROCESS_MONEY_REQUEST_HOLD_ROOT]: ROUTES.PROCESS_MONEY_REQUEST_HOLD.route, [SCREENS.AUTO_SUBMIT_ROOT]: ROUTES.AUTO_SUBMIT_MODAL_ROOT, [SCREENS.CHANGE_POLICY_EDUCATIONAL_ROOT]: ROUTES.CHANGE_POLICY_EDUCATIONAL.route, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 873d60e713db..d4823b3da12b 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1952,7 +1952,6 @@ type SignInNavigatorParamList = { type FeatureTrainingNavigatorParamList = { [SCREENS.FEATURE_TRAINING_ROOT]: undefined; - [SCREENS.PROCESS_MONEY_REQUEST_HOLD_ROOT]: undefined; [SCREENS.AUTO_SUBMIT_ROOT]: undefined; [SCREENS.CHANGE_POLICY_EDUCATIONAL_ROOT]: undefined; }; From 76f818d65675ae3711d26c7ed80ac982912392d1 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 01:27:50 +0530 Subject: [PATCH 19/23] refactor: rename modal --- ...uestHoldMenu.tsx => HoldSubmitterEducationalModal.tsx} | 8 ++++---- src/components/MoneyReportHeader.tsx | 4 ++-- src/components/MoneyRequestHeader.tsx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) rename src/components/{ProcessMoneyRequestHoldMenu.tsx => HoldSubmitterEducationalModal.tsx} (85%) diff --git a/src/components/ProcessMoneyRequestHoldMenu.tsx b/src/components/HoldSubmitterEducationalModal.tsx similarity index 85% rename from src/components/ProcessMoneyRequestHoldMenu.tsx rename to src/components/HoldSubmitterEducationalModal.tsx index 9a668d9e6ada..925af76a6580 100644 --- a/src/components/ProcessMoneyRequestHoldMenu.tsx +++ b/src/components/HoldSubmitterEducationalModal.tsx @@ -8,7 +8,7 @@ import FeatureTrainingModal from './FeatureTrainingModal'; import HoldMenuSectionList from './HoldMenuSectionList'; import * as Illustrations from './Icon/Illustrations'; -type ProcessMoneyRequestHoldMenuProps = { +type HoldSubmitterEducationalModalProps = { /** Method to trigger when pressing outside of the popover menu to close it */ onClose: () => void; @@ -16,7 +16,7 @@ type ProcessMoneyRequestHoldMenuProps = { onConfirm: () => void; }; -function ProcessMoneyRequestHoldMenu({onClose, onConfirm}: ProcessMoneyRequestHoldMenuProps) { +function HoldSubmitterEducationalModal({onClose, onConfirm}: HoldSubmitterEducationalModalProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); @@ -43,6 +43,6 @@ function ProcessMoneyRequestHoldMenu({onClose, onConfirm}: ProcessMoneyRequestHo ); } -ProcessMoneyRequestHoldMenu.displayName = 'ProcessMoneyRequestHoldMenu'; +HoldSubmitterEducationalModal.displayName = 'HoldSubmitterEducationalModal'; -export default ProcessMoneyRequestHoldMenu; +export default HoldSubmitterEducationalModal; diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 12191c45b986..be5d641a1bac 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -139,7 +139,7 @@ import MoneyRequestReportNavigation from './MoneyRequestReportView/MoneyRequestR import type {PopoverMenuItem} from './PopoverMenu'; import type {ActionHandledType} from './ProcessMoneyReportHoldMenu'; import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu'; -import ProcessMoneyRequestHoldMenu from './ProcessMoneyRequestHoldMenu'; +import HoldSubmitterEducationalModal from './HoldSubmitterEducationalModal'; import {useSearchContext} from './Search/SearchContext'; import AnimatedSettlementButton from './SettlementButton/AnimatedSettlementButton'; import Text from './Text'; @@ -1480,7 +1480,7 @@ function MoneyReportHeader({ /> )} {!!isHoldEducationalModalVisible && ( - diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index dc2bf1e35bb7..7f5a18216273 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -63,7 +63,7 @@ import LoadingBar from './LoadingBar'; import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusBar'; import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar'; import MoneyRequestReportTransactionsNavigation from './MoneyRequestReportView/MoneyRequestReportTransactionsNavigation'; -import ProcessMoneyRequestHoldMenu from './ProcessMoneyRequestHoldMenu'; +import HoldSubmitterEducationalModal from './HoldSubmitterEducationalModal'; import {useSearchContext} from './Search/SearchContext'; import {WideRHPContext} from './WideRHPContextProvider'; @@ -496,7 +496,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre /> )} {!!isHoldEducationalModalVisible && ( - From ade3877a97a21b3c289bb952e6b453700fa2c224 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 01:29:53 +0530 Subject: [PATCH 20/23] style: lint fixes --- src/components/MoneyReportHeader.tsx | 2 +- src/components/MoneyRequestHeader.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index be5d641a1bac..7bde32a947b0 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -124,6 +124,7 @@ import {DelegateNoAccessContext} from './DelegateNoAccessModalProvider'; import Header from './Header'; import HeaderWithBackButton from './HeaderWithBackButton'; import HoldOrRejectEducationalModal from './HoldOrRejectEducationalModal'; +import HoldSubmitterEducationalModal from './HoldSubmitterEducationalModal'; import Icon from './Icon'; import * as Expensicons from './Icon/Expensicons'; import {KYCWallContext} from './KYCWall/KYCWallContext'; @@ -139,7 +140,6 @@ import MoneyRequestReportNavigation from './MoneyRequestReportView/MoneyRequestR import type {PopoverMenuItem} from './PopoverMenu'; import type {ActionHandledType} from './ProcessMoneyReportHoldMenu'; import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu'; -import HoldSubmitterEducationalModal from './HoldSubmitterEducationalModal'; import {useSearchContext} from './Search/SearchContext'; import AnimatedSettlementButton from './SettlementButton/AnimatedSettlementButton'; import Text from './Text'; diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 7f5a18216273..bb4e42ea97f2 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -57,13 +57,13 @@ import DecisionModal from './DecisionModal'; import {DelegateNoAccessContext} from './DelegateNoAccessModalProvider'; import HeaderWithBackButton from './HeaderWithBackButton'; import HoldOrRejectEducationalModal from './HoldOrRejectEducationalModal'; +import HoldSubmitterEducationalModal from './HoldSubmitterEducationalModal'; import Icon from './Icon'; import * as Expensicons from './Icon/Expensicons'; import LoadingBar from './LoadingBar'; import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusBar'; import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar'; import MoneyRequestReportTransactionsNavigation from './MoneyRequestReportView/MoneyRequestReportTransactionsNavigation'; -import HoldSubmitterEducationalModal from './HoldSubmitterEducationalModal'; import {useSearchContext} from './Search/SearchContext'; import {WideRHPContext} from './WideRHPContextProvider'; From d98d36e5cb3231711ee65c0c5c5997e0cbe3ee64 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 02:03:28 +0530 Subject: [PATCH 21/23] feat: language file updates --- src/languages/de.ts | 8 ++++---- src/languages/fr.ts | 8 ++++---- src/languages/it.ts | 8 ++++---- src/languages/ja.ts | 8 ++++---- src/languages/nl.ts | 8 ++++---- src/languages/pl.ts | 8 ++++---- src/languages/pt-BR.ts | 8 ++++---- src/languages/zh-hans.ts | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index edab209620ad..c2b6fc24a138 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -1418,10 +1418,10 @@ const translations = { }), payOnly: 'Nur bezahlen', approveOnly: 'Nur genehmigen', - holdEducationalTitle: 'Diese Anfrage ist an', - whatIsHoldExplain: 'Halten ist wie das Drücken der „Pause“-Taste bei einer Ausgabe, um vor der Genehmigung oder Zahlung nach weiteren Details zu fragen.', - holdIsLeftBehind: 'Zurückgehaltene Ausgaben werden nach Genehmigung oder Zahlung in einen anderen Bericht verschoben.', - unholdWhenReady: 'Genehmiger können Ausgaben freigeben, wenn sie zur Genehmigung oder Zahlung bereit sind.', + holdEducationalTitle: 'Sollten Sie diese Ausgabe zurückhalten?', + whatIsHoldExplain: 'Zurückhalten bedeutet, dass Sie eine Ausgabe sozusagen „pausieren”, bis Sie bereit sind, sie einzureichen.', + holdIsLeftBehind: 'Zurückgehaltene Ausgaben bleiben auch dann zurück, wenn Sie einen gesamten Bericht einreichen.', + unholdWhenReady: 'Heben Sie die Zurückhaltung von Ausgaben auf, wenn Sie bereit sind, sie einzureichen.', changePolicyEducational: { title: 'Du hast diesen Bericht verschoben!', description: 'Überprüfen Sie diese Punkte, die sich beim Verschieben von Berichten in einen neuen Arbeitsbereich ändern können.', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index f3912750899f..c12476a5c654 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -1416,10 +1416,10 @@ const translations = { }), payOnly: 'Payer seulement', approveOnly: 'Approuver seulement', - holdEducationalTitle: 'Cette demande est activée', - whatIsHoldExplain: 'La mise en attente, c\'est comme appuyer sur "pause" pour une dépense afin de demander plus de détails avant l\'approbation ou le paiement.', - holdIsLeftBehind: 'Les dépenses en attente sont déplacées vers un autre rapport après approbation ou paiement.', - unholdWhenReady: "Les approbateurs peuvent débloquer les dépenses lorsqu'elles sont prêtes pour approbation ou paiement.", + holdEducationalTitle: 'Dois-tu mettre cette dépense en attente ?', + whatIsHoldExplain: 'Mettre en attente, c\'est comme appuyer sur "pause" pour une dépense jusqu\'à ce que tu sois prêt à la soumettre.', + holdIsLeftBehind: 'Les dépenses mises en attente sont laissées de côté même si tu soumets un rapport complet.', + unholdWhenReady: "Retire les dépenses en attente lorsque tu es prêt à les soumettre.", changePolicyEducational: { title: 'Vous avez déplacé ce rapport !', description: 'Vérifiez ces éléments, qui ont tendance à changer lors du déplacement des rapports vers un nouvel espace de travail.', diff --git a/src/languages/it.ts b/src/languages/it.ts index 0ba1f47bf9cc..98ca9566f8a8 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -1409,10 +1409,10 @@ const translations = { }), payOnly: 'Paga solo', approveOnly: 'Approva solo', - holdEducationalTitle: 'Questa richiesta è attiva', - whatIsHoldExplain: 'Mettere in sospeso è come premere "pausa" su una spesa per chiedere ulteriori dettagli prima dell\'approvazione o del pagamento.', - holdIsLeftBehind: "Le spese trattenute vengono spostate in un altro report al momento dell'approvazione o del pagamento.", - unholdWhenReady: "Gli approvatori possono sbloccare le spese quando sono pronte per l'approvazione o il pagamento.", + holdEducationalTitle: 'Devi sospendere questa spesa?', + whatIsHoldExplain: 'Sospendere significa mettere in "pausa" una spesa fino a quando non sei pronto per inviarla.', + holdIsLeftBehind: "Le spese sospese rimangono in sospeso anche se invii l'intero rapporto.", + unholdWhenReady: "Rimuovi la sospensione dalle spese quando sei pronto per inviarle.", changePolicyEducational: { title: 'Hai spostato questo report!', description: 'Ricontrolla questi elementi, che tendono a cambiare quando si spostano i report in un nuovo spazio di lavoro.', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 29b5869a3f41..ed5b9ceea9b6 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -1411,10 +1411,10 @@ const translations = { }), payOnly: '支払いのみ', approveOnly: '承認のみ', - holdEducationalTitle: 'このリクエストはオン', - whatIsHoldExplain: '保留は、承認や支払いの前に詳細を確認するために、経費を「一時停止」するようなものです。', - holdIsLeftBehind: '保留された経費は承認または支払い時に別のレポートに移動します。', - unholdWhenReady: '承認者は、承認または支払いの準備が整ったときに経費を解除できます。', + holdEducationalTitle: 'この経費は保留にしますか?', + whatIsHoldExplain: '保留とは、経費の提出準備が整うまで「一時停止」する機能です。', + holdIsLeftBehind: '保留中の経費は、レポート全体を提出しても除外されます。', + unholdWhenReady: '提出準備が整ったら、経費の保留を解除してください。', changePolicyEducational: { title: 'このレポートを移動しました!', description: 'レポートを新しいワークスペースに移動する際に変更される傾向があるこれらの項目を再確認してください。', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index f4a2766f9d24..cfdd9e375311 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -1411,10 +1411,10 @@ const translations = { }), payOnly: 'Alleen betalen', approveOnly: 'Alleen goedkeuren', - holdEducationalTitle: 'Dit verzoek is ingediend op', - whatIsHoldExplain: 'Vasthouden is als het indrukken van "pauze" op een uitgave om meer details te vragen voordat deze wordt goedgekeurd of betaald.', - holdIsLeftBehind: 'Ingehouden uitgaven worden naar een ander rapport verplaatst na goedkeuring of betaling.', - unholdWhenReady: 'Goedkeurders kunnen uitgaven vrijgeven wanneer ze klaar zijn voor goedkeuring of betaling.', + holdEducationalTitle: 'Moet u deze uitgave vasthouden?', + whatIsHoldExplain: 'Vasthouden is als op ‘pauze’ drukken voor een uitgave totdat u klaar bent om deze in te dienen.', + holdIsLeftBehind: 'Vastgehouden uitgaven blijven achter, zelfs als u een volledig rapport indient.', + unholdWhenReady: 'Haal uitgaven uit de wachtstand wanneer u klaar bent om ze in te dienen.', changePolicyEducational: { title: 'Je hebt dit rapport verplaatst!', description: 'Controleer deze items dubbel, aangezien ze de neiging hebben te veranderen bij het verplaatsen van rapporten naar een nieuwe werkruimte.', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index f46571042766..c4432a824a39 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -1409,10 +1409,10 @@ const translations = { }), payOnly: 'Płać tylko', approveOnly: 'Zatwierdź tylko', - holdEducationalTitle: 'To żądanie jest w toku', - whatIsHoldExplain: 'Wstrzymanie jest jak naciśnięcie „pauzy” na wydatku, aby poprosić o więcej szczegółów przed zatwierdzeniem lub płatnością.', - holdIsLeftBehind: 'Wstrzymane wydatki są przenoszone do innego raportu po zatwierdzeniu lub opłaceniu.', - unholdWhenReady: 'Osoby zatwierdzające mogą zdjąć blokadę z wydatków, gdy będą gotowe do zatwierdzenia lub płatności.', + holdEducationalTitle: 'Czy należy wstrzymać tę wydatek?', + whatIsHoldExplain: 'Wstrzymanie wydatku jest jak naciśnięcie przycisku „pauza” do momentu, aż będziesz gotowy do jego przesłania.', + holdIsLeftBehind: 'Wstrzymane wydatki pozostają wstrzymane nawet po przesłaniu całego raportu.', + unholdWhenReady: 'Odblokuj wydatki, gdy będziesz gotowy do ich przesłania.', changePolicyEducational: { title: 'Przeniosłeś ten raport!', description: 'Sprawdź te elementy, które mają tendencję do zmiany podczas przenoszenia raportów do nowego obszaru roboczego.', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index cb4d8450baa2..4ad1f5fa9d54 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -1406,10 +1406,10 @@ const translations = { }), payOnly: 'Pagar apenas', approveOnly: 'Aprovar apenas', - holdEducationalTitle: 'Esta solicitação está em andamento', - whatIsHoldExplain: 'Colocar em espera é como apertar "pausa" em uma despesa para solicitar mais detalhes antes da aprovação ou pagamento.', - holdIsLeftBehind: 'Despesas retidas são movidas para outro relatório após aprovação ou pagamento.', - unholdWhenReady: 'Os aprovadores podem liberar despesas quando estiverem prontas para aprovação ou pagamento.', + holdEducationalTitle: 'Você deve reter essa despesa?', + whatIsHoldExplain: 'Reter é como clicar em “pausar” em uma despesa até que você esteja pronto para enviá-la.', + holdIsLeftBehind: 'As despesas retidas são deixadas para trás mesmo que você envie um relatório completo.', + unholdWhenReady: 'Liberte as despesas quando estiver pronto para enviá-las.', changePolicyEducational: { title: 'Você moveu este relatório!', description: 'Verifique novamente esses itens, que tendem a mudar ao mover relatórios para um novo espaço de trabalho.', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 34b32c92f668..e93d9cac1eb7 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -1391,10 +1391,10 @@ const translations = { }), payOnly: '仅支付', approveOnly: '仅批准', - holdEducationalTitle: '此请求正在处理中', - whatIsHoldExplain: '将“暂停”用于费用上,以便在批准或付款前请求更多详细信息。', - holdIsLeftBehind: '待处理费用在批准或支付后移至另一份报告。', - unholdWhenReady: '审批者可以在准备好审批或付款时解除费用保留。', + holdEducationalTitle: '是否应暂存此项费用?', + whatIsHoldExplain: '暂存功能如同对费用按下“暂停键”,待您准备提交时再处理。', + holdIsLeftBehind: '即使提交整份报销单,暂存的费用仍会保留。', + unholdWhenReady: '准备提交时,请取消暂存状态。', changePolicyEducational: { title: '您已移动此报告!', description: '请仔细检查这些项目,因为在将报告移动到新工作区时,它们往往会发生变化。', From 0e1c9bb54a22301f3870a45b411ce0531888283d Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 7 Nov 2025 02:06:39 +0530 Subject: [PATCH 22/23] style: lint fixes --- src/languages/fr.ts | 2 +- src/languages/it.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/fr.ts b/src/languages/fr.ts index c12476a5c654..1f3eb0869fe7 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -1419,7 +1419,7 @@ const translations = { holdEducationalTitle: 'Dois-tu mettre cette dépense en attente ?', whatIsHoldExplain: 'Mettre en attente, c\'est comme appuyer sur "pause" pour une dépense jusqu\'à ce que tu sois prêt à la soumettre.', holdIsLeftBehind: 'Les dépenses mises en attente sont laissées de côté même si tu soumets un rapport complet.', - unholdWhenReady: "Retire les dépenses en attente lorsque tu es prêt à les soumettre.", + unholdWhenReady: 'Retire les dépenses en attente lorsque tu es prêt à les soumettre.', changePolicyEducational: { title: 'Vous avez déplacé ce rapport !', description: 'Vérifiez ces éléments, qui ont tendance à changer lors du déplacement des rapports vers un nouvel espace de travail.', diff --git a/src/languages/it.ts b/src/languages/it.ts index 98ca9566f8a8..e560823ffb12 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -1412,7 +1412,7 @@ const translations = { holdEducationalTitle: 'Devi sospendere questa spesa?', whatIsHoldExplain: 'Sospendere significa mettere in "pausa" una spesa fino a quando non sei pronto per inviarla.', holdIsLeftBehind: "Le spese sospese rimangono in sospeso anche se invii l'intero rapporto.", - unholdWhenReady: "Rimuovi la sospensione dalle spese quando sei pronto per inviarle.", + unholdWhenReady: 'Rimuovi la sospensione dalle spese quando sei pronto per inviarle.', changePolicyEducational: { title: 'Hai spostato questo report!', description: 'Ricontrolla questi elementi, che tendono a cambiare quando si spostano i report in un nuovo spazio di lavoro.', From 58a1bb8a5485d0aa14e65c881c96bf29bc027198 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Wed, 12 Nov 2025 23:32:56 +0530 Subject: [PATCH 23/23] refactor: remove literals --- src/components/MoneyReportHeader.tsx | 4 +++- src/components/MoneyRequestHeader.tsx | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 9e3fbf555836..b01c1b214f04 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -318,7 +318,9 @@ function MoneyReportHeader({ const [isDownloadErrorModalVisible, setIsDownloadErrorModalVisible] = useState(false); const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false); - const [rejectModalAction, setRejectModalAction] = useState<'hold' | 'reject' | null>(null); + const [rejectModalAction, setRejectModalAction] = useState | null>(null); const {selectedTransactionIDs, removeTransaction, clearSelectedTransactions, currentSearchQueryJSON, currentSearchKey, currentSearchHash} = useSearchContext(); const shouldCalculateTotals = useSearchShouldCalculateTotals(currentSearchKey, currentSearchQueryJSON?.similarSearchHash, true); diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 1dd630657e8d..17d945002dfd 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -102,7 +102,9 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false); const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false); const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false); - const [rejectModalAction, setRejectModalAction] = useState<'hold' | 'reject' | null>(null); + const [rejectModalAction, setRejectModalAction] = useState | null>(null); const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION, {canBeMissing: true}); const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {canBeMissing: true}); const shouldShowLoadingBar = useLoadingBarVisibility();