From 764b1c1045c9127287e6ca68428e3d27b7683018 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Wed, 29 Nov 2023 19:20:50 +0000 Subject: [PATCH 1/2] Do not prefer the expenseMessage in case of next steps for expense reports --- src/components/MoneyReportHeader.js | 2 +- src/components/MoneyReportHeaderStatusBar.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js index bf8bc7719316..09a5130adc0b 100644 --- a/src/components/MoneyReportHeader.js +++ b/src/components/MoneyReportHeader.js @@ -89,7 +89,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, nextSt return isManager && !isDraft && !isApproved && !isSettled; }, [policyType, isManager, isDraft, isApproved, isSettled]); const shouldShowSubmitButton = isDraft && reimbursableTotal !== 0; - const shouldShowNextSteps = isDraft && nextStep && (!_.isEmpty(nextStep.message) || !_.isEmpty(nextStep.expenseMessage)); + const shouldShowNextSteps = isDraft && nextStep && !_.isEmpty(nextStep.message); const shouldShowAnyButton = shouldShowSettlementButton || shouldShowApproveButton || shouldShowSubmitButton || shouldShowNextSteps; const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport); const formattedAmount = CurrencyUtils.convertToDisplayString(reimbursableTotal, moneyRequestReport.currency); diff --git a/src/components/MoneyReportHeaderStatusBar.js b/src/components/MoneyReportHeaderStatusBar.js index 362a2dc22b9f..fb7f0420ce2d 100644 --- a/src/components/MoneyReportHeaderStatusBar.js +++ b/src/components/MoneyReportHeaderStatusBar.js @@ -21,9 +21,9 @@ function MoneyReportHeaderStatusBar({nextStep}) { const {translate} = useLocalize(); const messageContent = useMemo(() => { - const messageArray = _.isEmpty(nextStep.expenseMessage) ? nextStep.message : nextStep.expenseMessage; + const messageArray = nextStep.message; return NextStepUtils.parseMessage(messageArray); - }, [nextStep.expenseMessage, nextStep.message]); + }, [nextStep.message]); return ( From 803915785d8e6e7bc4367ed3d773c3932b37a039 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Wed, 29 Nov 2023 20:13:12 +0000 Subject: [PATCH 2/2] Fix lint --- src/components/MoneyReportHeaderStatusBar.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/MoneyReportHeaderStatusBar.js b/src/components/MoneyReportHeaderStatusBar.js index fb7f0420ce2d..3f2c06be78cf 100644 --- a/src/components/MoneyReportHeaderStatusBar.js +++ b/src/components/MoneyReportHeaderStatusBar.js @@ -1,6 +1,5 @@ import React, {useMemo} from 'react'; import {Text, View} from 'react-native'; -import _ from 'underscore'; import useLocalize from '@hooks/useLocalize'; import * as NextStepUtils from '@libs/NextStepUtils'; import nextStepPropTypes from '@pages/nextStepPropTypes';