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 */ diff --git a/src/ROUTES.ts b/src/ROUTES.ts index f4dd60d81df3..78e1bb0a0f85 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -2449,13 +2449,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 ea8070f3ad88..eca343fa38a6 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -240,7 +240,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', @@ -770,7 +769,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/components/ProcessMoneyRequestHoldMenu.tsx b/src/components/HoldSubmitterEducationalModal.tsx similarity index 54% rename from src/components/ProcessMoneyRequestHoldMenu.tsx rename to src/components/HoldSubmitterEducationalModal.tsx index 32e7087eb296..925af76a6580 100644 --- a/src/components/ProcessMoneyRequestHoldMenu.tsx +++ b/src/components/HoldSubmitterEducationalModal.tsx @@ -1,18 +1,14 @@ -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 = { +type HoldSubmitterEducationalModalProps = { /** Method to trigger when pressing outside of the popover menu to close it */ onClose: () => void; @@ -20,26 +16,15 @@ type ProcessMoneyRequestHoldMenuProps = { onConfirm: () => void; }; -function ProcessMoneyRequestHoldMenu({onClose, onConfirm}: ProcessMoneyRequestHoldMenuProps) { +function HoldSubmitterEducationalModal({onClose, onConfirm}: HoldSubmitterEducationalModalProps) { 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 ( ); } -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 6686850793b5..b01c1b214f04 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -35,6 +35,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'; @@ -62,6 +63,7 @@ import { hasUpdatedTotal, hasViolations as hasViolationsReportUtils, isAllowedToApproveExpenseReport, + isCurrentUserSubmitter, isExported as isExportedUtils, isInvoiceReport as isInvoiceReportUtil, isProcessingReport, @@ -78,7 +80,6 @@ import { hasDuplicateTransactions, isDuplicate, isExpensifyCardTransaction, - isOnHold as isOnHoldTransactionUtils, isPayAtEndExpense as isPayAtEndExpenseTransactionUtils, isPending, isScanning, @@ -112,7 +113,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'; @@ -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'; @@ -237,9 +238,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}, @@ -272,7 +272,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}); @@ -318,12 +317,16 @@ 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 | 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 showExportProgressModal = useCallback(() => { @@ -418,6 +421,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( @@ -576,21 +580,29 @@ 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({ @@ -1024,7 +1036,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]: { @@ -1187,7 +1207,7 @@ function MoneyReportHeader({ rejectMoneyRequestReason(requestParentReportAction); } } else { - setIsRejectEducationalModalVisible(true); + setRejectModalAction(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT); } }, shouldShow: transactions.length === 1, @@ -1478,10 +1498,16 @@ function MoneyReportHeader({ isVisible={isDownloadErrorModalVisible} onClose={() => setIsDownloadErrorModalVisible(false)} /> - {!!isRejectEducationalModalVisible && ( + {!!rejectModalAction && ( + )} + {!!isHoldEducationalModalVisible && ( + )} | null>(null); 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(); @@ -128,11 +131,13 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(transactionViolations); const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations); + const isReportSubmitter = isCurrentUserSubmitter(chatIOUReport); // If the parent report is a selfDM, it should always be opened in the Inbox tab const shouldOpenParentReportInCurrentTab = !isSelfDM(parentReport); const {wideRHPRouteKeys} = useContext(WideRHPContext); + const [network] = useOnyx(ONYXKEYS.NETWORK, {canBeMissing: true}); const markAsCash = useCallback(() => { markAsCashAction(transaction?.transactionID, reportID); @@ -184,14 +189,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 ''; @@ -269,14 +266,29 @@ 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(); + const dismissModalAndUpdateUseHold = () => { + setIsHoldEducationalModalVisible(false); + setNameValuePair(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, true, false, !network?.shouldFailAllRequests); if (parentReportAction) { - rejectMoneyRequestReason(parentReportAction); + changeMoneyRequestHoldStatus(parentReportAction); } }; + const dismissRejectModalBasedOnAction = () => { + if (rejectModalAction === CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.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'), @@ -292,7 +304,15 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre return; } - changeMoneyRequestHoldStatus(parentReportAction); + const isDismissed = isReportSubmitter ? dismissedHoldUseExplanation : dismissedRejectUseExplanation; + + if (isDismissed) { + changeMoneyRequestHoldStatus(parentReportAction); + } else if (isReportSubmitter) { + setIsHoldEducationalModalVisible(true); + } else { + setRejectModalAction(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD); + } }, }, [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REMOVE_HOLD]: { @@ -354,7 +374,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre rejectMoneyRequestReason(parentReportAction); } } else { - setIsRejectEducationalModalVisible(true); + setRejectModalAction(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT); } }, }, @@ -476,10 +496,16 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre danger shouldEnableNewFocusManagement /> - {!!isRejectEducationalModalVisible && ( + {!!rejectModalAction && ( + )} + {!!isHoldEducationalModalVisible && ( + )} diff --git a/src/languages/de.ts b/src/languages/de.ts index 7404a5192a6c..b0ddd33fb7ec 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -1414,11 +1414,10 @@ const translations: TranslationDeepObject = { }), 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.', + 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/en.ts b/src/languages/en.ts index e36d60e042d2..99b30fc7eca1 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1392,11 +1392,10 @@ const translations = { }), payOnly: 'Pay only', approveOnly: 'Approve only', - holdEducationalTitle: 'This request is on', - holdEducationalText: 'hold', - whatIsHoldExplain: 'Hold is like hitting “pause” on an expense to ask for more details before approval or payment.', - holdIsLeftBehind: 'Held expenses move to another report upon approval or payment.', - unholdWhenReady: 'Approvers can unhold expenses when they’re ready for approval or payment.', + holdEducationalTitle: 'Should you hold this expense?', + 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.", changePolicyEducational: { title: 'You moved this report!', description: 'Double-check these items, which tend to change when moving reports to a new workspace.', diff --git a/src/languages/es.ts b/src/languages/es.ts index 5cfea8155bb0..bb6b5641bbb6 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1071,11 +1071,10 @@ const translations: TranslationDeepObject = { approveOnly: 'Solo aprobar', 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.', + 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.', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index d210f95c4d07..cd2e2d5bf9f8 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -1416,11 +1416,10 @@ const translations: TranslationDeepObject = { }), 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.", + 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 30d094b3fbdd..d6be832b8fc7 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -1410,11 +1410,10 @@ const translations: TranslationDeepObject = { }), 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.", + 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 3760ef0ee3fb..4a9aaf0980ba 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -1410,11 +1410,10 @@ const translations: TranslationDeepObject = { }), payOnly: '支払いのみ', approveOnly: '承認のみ', - holdEducationalTitle: 'このリクエストはオン', - holdEducationalText: '保留', - whatIsHoldExplain: '保留は、承認や支払いの前に詳細を確認するために、経費を「一時停止」するようなものです。', - holdIsLeftBehind: '保留された経費は承認または支払い時に別のレポートに移動します。', - unholdWhenReady: '承認者は、承認または支払いの準備が整ったときに経費を解除できます。', + holdEducationalTitle: 'この経費は保留にしますか?', + whatIsHoldExplain: '保留とは、経費の提出準備が整うまで「一時停止」する機能です。', + holdIsLeftBehind: '保留中の経費は、レポート全体を提出しても除外されます。', + unholdWhenReady: '提出準備が整ったら、経費の保留を解除してください。', changePolicyEducational: { title: 'このレポートを移動しました!', description: 'レポートを新しいワークスペースに移動する際に変更される傾向があるこれらの項目を再確認してください。', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index be0a042fbcfc..9e863dc7cdda 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -1410,11 +1410,10 @@ const translations: TranslationDeepObject = { }), 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.', + 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 0ba0a7a2a9cf..0a9473e7e598 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -1408,11 +1408,10 @@ const translations: TranslationDeepObject = { }), 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.', + 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 0aefae6e26d8..749aff30411f 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -1407,11 +1407,10 @@ const translations: TranslationDeepObject = { }), 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.', + 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 c59c3511e9d8..46786824d0bc 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -1389,11 +1389,10 @@ const translations: TranslationDeepObject = { }), payOnly: '仅支付', approveOnly: '仅批准', - holdEducationalTitle: '此请求正在处理中', - holdEducationalText: '保持', - whatIsHoldExplain: '将“暂停”用于费用上,以便在批准或付款前请求更多详细信息。', - holdIsLeftBehind: '待处理费用在批准或支付后移至另一份报告。', - unholdWhenReady: '审批者可以在准备好审批或付款时解除费用保留。', + holdEducationalTitle: '是否应暂存此项费用?', + whatIsHoldExplain: '暂存功能如同对费用按下“暂停键”,待您准备提交时再处理。', + holdIsLeftBehind: '即使提交整份报销单,暂存的费用仍会保留。', + unholdWhenReady: '准备提交时,请取消暂存状态。', changePolicyEducational: { title: '您已移动此报告!', description: '请仔细检查这些项目,因为在将报告移动到新工作区时,它们往往会发生变化。', 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} /> - ['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 ff407434ee6e..b659b280bb90 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1965,7 +1965,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; }; diff --git a/src/pages/ProcessMoneyRequestHoldPage.tsx b/src/pages/ProcessMoneyRequestHoldPage.tsx deleted file mode 100644 index 116f8daf04e0..000000000000 --- a/src/pages/ProcessMoneyRequestHoldPage.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import {useFocusEffect} from '@react-navigation/native'; -import React, {useCallback, useRef} from 'react'; -import {InteractionManager} from 'react-native'; -import ProcessMoneyRequestHoldMenu from '@components/ProcessMoneyRequestHoldMenu'; -import useOnyx from '@hooks/useOnyx'; -import blurActiveElement from '@libs/Accessibility/blurActiveElement'; -import {setNameValuePair} from '@userActions/User'; -import CONST from '@src/CONST'; -import ONYXKEYS from '@src/ONYXKEYS'; - -function ProcessMoneyRequestHoldPage() { - const focusTimeoutRef = useRef(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;