diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
index 9d767c90b372..0b5cbad29983 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
@@ -60,11 +60,11 @@ function BaseHTMLEngineProvider(props) {
}),
'mention-user': defaultHTMLElementModels.span.extend({tagName: 'mention-user'}),
'mention-here': defaultHTMLElementModels.span.extend({tagName: 'mention-here'}),
- 'next-steps': defaultHTMLElementModels.span.extend({
- tagName: 'next-steps',
+ 'next-step': defaultHTMLElementModels.span.extend({
+ tagName: 'next-step',
mixedUAStyles: {...styles.textLabelSupporting},
}),
- 'next-steps-email': defaultHTMLElementModels.span.extend({tagName: 'next-steps-email'}),
+ 'next-step-email': defaultHTMLElementModels.span.extend({tagName: 'next-step-email'}),
video: defaultHTMLElementModels.div.extend({
tagName: 'video',
mixedUAStyles: {whiteSpace: 'pre'},
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/NextStepsEmailRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/NextStepEmailRenderer.tsx
similarity index 60%
rename from src/components/HTMLEngineProvider/HTMLRenderers/NextStepsEmailRenderer.tsx
rename to src/components/HTMLEngineProvider/HTMLRenderers/NextStepEmailRenderer.tsx
index c5d3a15a30e2..b8292cad60a2 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/NextStepsEmailRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/NextStepEmailRenderer.tsx
@@ -2,18 +2,18 @@ import React from 'react';
import Text from '@components/Text';
import useThemeStyles from '@hooks/useThemeStyles';
-type NextStepsEmailRendererProps = {
+type NextStepEmailRendererProps = {
tnode: {
data: string;
};
};
-function NextStepsEmailRenderer({tnode}: NextStepsEmailRendererProps) {
+function NextStepEmailRenderer({tnode}: NextStepEmailRendererProps) {
const styles = useThemeStyles();
return {tnode.data};
}
-NextStepsEmailRenderer.displayName = 'NextStepsEmailRenderer';
+NextStepEmailRenderer.displayName = 'NextStepEmailRenderer';
-export default NextStepsEmailRenderer;
+export default NextStepEmailRenderer;
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/index.js b/src/components/HTMLEngineProvider/HTMLRenderers/index.js
index e3aee487a172..9d0dab731792 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/index.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/index.js
@@ -4,7 +4,7 @@ import EditedRenderer from './EditedRenderer';
import ImageRenderer from './ImageRenderer';
import MentionHereRenderer from './MentionHereRenderer';
import MentionUserRenderer from './MentionUserRenderer';
-import NextStepsEmailRenderer from './NextStepsEmailRenderer';
+import NextStepEmailRenderer from './NextStepEmailRenderer';
import PreRenderer from './PreRenderer';
/**
@@ -22,5 +22,5 @@ export default {
pre: PreRenderer,
'mention-user': MentionUserRenderer,
'mention-here': MentionHereRenderer,
- 'next-steps-email': NextStepsEmailRenderer,
+ 'next-step-email': NextStepEmailRenderer,
};
diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index e72f7d3576f5..889eeb1b9c6e 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -111,11 +111,11 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, nextSt
const shouldShowSettlementButton = shouldShowPayButton || shouldShowApproveButton;
const shouldShowSubmitButton = isDraft && reimbursableTotal !== 0;
const isFromPaidPolicy = policyType === CONST.POLICY.TYPE.TEAM || policyType === CONST.POLICY.TYPE.CORPORATE;
- const shouldShowNextSteps = isFromPaidPolicy && nextStep && !_.isEmpty(nextStep.message);
- const shouldShowAnyButton = shouldShowSettlementButton || shouldShowApproveButton || shouldShowSubmitButton || shouldShowNextSteps;
+ const shouldShowNextStep = isFromPaidPolicy && nextStep && !_.isEmpty(nextStep.message);
+ const shouldShowAnyButton = shouldShowSettlementButton || shouldShowApproveButton || shouldShowSubmitButton || shouldShowNextStep;
const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
const formattedAmount = CurrencyUtils.convertToDisplayString(reimbursableTotal, moneyRequestReport.currency);
- const isMoreContentShown = shouldShowNextSteps || (shouldShowAnyButton && isSmallScreenWidth);
+ const isMoreContentShown = shouldShowNextStep || (shouldShowAnyButton && isSmallScreenWidth);
const threeDotsMenuItems = [HeaderUtils.getPinMenuItem(moneyRequestReport)];
if (isPayer && isSettled) {
@@ -154,7 +154,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, nextSt
shouldShowBackButton={isSmallScreenWidth}
onBackButtonPress={() => Navigation.goBack(ROUTES.HOME, false, true)}
// Shows border if no buttons or next steps are showing below the header
- shouldShowBorderBottom={!(shouldShowAnyButton && isSmallScreenWidth) && !(shouldShowNextSteps && !isSmallScreenWidth)}
+ shouldShowBorderBottom={!(shouldShowAnyButton && isSmallScreenWidth) && !(shouldShowNextStep && !isSmallScreenWidth)}
shouldShowThreeDotsButton
threeDotsMenuItems={threeDotsMenuItems}
threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
@@ -216,7 +216,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, nextSt
/>
)}
- {shouldShowNextSteps && (
+ {shouldShowNextStep && (
diff --git a/src/components/MoneyReportHeaderStatusBar.tsx b/src/components/MoneyReportHeaderStatusBar.tsx
index 8eaf67e3c96a..9d96d93423c5 100644
--- a/src/components/MoneyReportHeaderStatusBar.tsx
+++ b/src/components/MoneyReportHeaderStatusBar.tsx
@@ -24,7 +24,7 @@ function MoneyReportHeaderStatusBar({nextStep}: MoneyReportHeaderStatusBarProps)
return (
- {translate(nextStep.title === CONST.NEXT_STEP.FINISHED ? 'iou.finished' : 'iou.nextSteps')}
+ {translate(nextStep.title === CONST.NEXT_STEP.FINISHED ? 'iou.finished' : 'iou.nextStep')}
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 2ed4cf1b257c..db569c41cf21 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -571,7 +571,7 @@ export default {
settledElsewhere: 'Paid elsewhere',
settleExpensify: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pay ${formattedAmount} with Expensify` : `Pay with Expensify`),
payElsewhere: 'Pay elsewhere',
- nextSteps: 'Next Steps',
+ nextStep: 'Next Steps',
finished: 'Finished',
requestAmount: ({amount}: RequestAmountParams) => `request ${amount}`,
requestedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `requested ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
@@ -1436,7 +1436,7 @@ export default {
description: 'A day or two after you add your account to Expensify we send three (3) transactions to your account. They have a merchant line like "Expensify, Inc. Validation".',
descriptionCTA: 'Please enter each transaction amount in the fields below. Example: 1.51.',
reviewingInfo: "Thanks! We're reviewing your information, and will be in touch shortly. Please check your chat with Concierge ",
- forNextSteps: ' for next steps to finish setting up your bank account.',
+ forNextStep: ' for next steps to finish setting up your bank account.',
letsChatCTA: "Yes, let's chat",
letsChatText: 'Thanks for doing that. We need your help verifying a few pieces of information, but we can work this out quickly over chat. Ready?',
letsChatTitle: "Let's chat!",
diff --git a/src/languages/es.ts b/src/languages/es.ts
index a0de1f8ce18e..a0b211752175 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -564,7 +564,7 @@ export default {
settledElsewhere: 'Pagado de otra forma',
settleExpensify: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pagar ${formattedAmount} con Expensify` : `Pagar con Expensify`),
payElsewhere: 'Pagar de otra forma',
- nextSteps: 'Pasos Siguientes',
+ nextStep: 'Pasos Siguientes',
finished: 'Finalizado',
requestAmount: ({amount}: RequestAmountParams) => `solicitar ${amount}`,
requestedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicité ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
@@ -1459,7 +1459,7 @@ export default {
'Uno o dos días después de añadir tu cuenta a Expensify, te enviaremos tres (3) transacciones a tu cuenta. Tienen un nombre de comerciante similar a "Expensify, Inc. Validation".',
descriptionCTA: 'Introduce el importe de cada transacción en los campos siguientes. Ejemplo: 1.51.',
reviewingInfo: '¡Gracias! Estamos revisando tu información y nos comunicaremos contigo en breve. Consulta el chat con Concierge ',
- forNextSteps: ' para conocer los próximos pasos para terminar de configurar tu cuenta bancaria.',
+ forNextStep: ' para conocer los próximos pasos para terminar de configurar tu cuenta bancaria.',
letsChatCTA: 'Sí, vamos a chatear',
letsChatText: 'Gracias. Necesitamos tu ayuda para verificar la información, pero podemos hacerlo rápidamente a través del chat. ¿Estás listo?',
letsChatTitle: '¡Vamos a chatear!',
diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index 51a49b3fd44a..a76a7d3c75c4 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -12,7 +12,7 @@ function parseMessage(messages: Message[] | undefined) {
let content = Str.safeEscape(part.text);
if (isEmail) {
- tagType = 'next-steps-email';
+ tagType = 'next-step-email';
content = EmailUtils.prefixMailSeparatorsWithBreakOpportunities(content);
}
@@ -24,7 +24,7 @@ function parseMessage(messages: Message[] | undefined) {
.replace(/%Expenses/g, 'These expenses')
.replace(/%tobe/g, 'are');
- return `${formattedHtml}`;
+ return `${formattedHtml}`;
}
// eslint-disable-next-line import/prefer-default-export
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index a9d04654f8bd..4a2820ec1a91 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -93,6 +93,15 @@ Onyx.connect({
},
});
+let allNextSteps = {};
+Onyx.connect({
+ key: ONYXKEYS.COLLECTION.NEXT_STEP,
+ waitForCollectionCallback: true,
+ callback: (val) => {
+ allNextSteps = val || {};
+ },
+});
+
let userAccountID = '';
let currentUserEmail = '';
Onyx.connect({
@@ -119,15 +128,6 @@ Onyx.connect({
},
});
-let nextSteps = {};
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.NEXT_STEP,
- waitForCollectionCallback: true,
- callback: (val) => {
- nextSteps = val || {};
- },
-});
-
/**
* Initialize money request info
* @param {String} reportID to attach the transaction to
@@ -2758,7 +2758,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
optimisticReportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, true);
}
- const currentNextStep = lodashGet(nextSteps, `${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`, null);
+ const currentNextStep = lodashGet(allNextSteps, `${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`, null);
const optimisticData = [
{
@@ -2909,7 +2909,7 @@ function sendMoneyWithWallet(report, amount, currency, comment, managerID, recip
}
function approveMoneyRequest(expenseReport) {
- const currentNextStep = lodashGet(nextSteps, `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`, null);
+ const currentNextStep = lodashGet(allNextSteps, `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`, null);
const optimisticApprovedReportAction = ReportUtils.buildOptimisticApprovedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID);
@@ -2980,7 +2980,7 @@ function approveMoneyRequest(expenseReport) {
* @param {Object} expenseReport
*/
function submitReport(expenseReport) {
- const currentNextStep = lodashGet(nextSteps, `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`, null);
+ const currentNextStep = lodashGet(allNextSteps, `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`, null);
const optimisticSubmittedReportAction = ReportUtils.buildOptimisticSubmittedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID);
const parentReport = ReportUtils.getReport(expenseReport.parentReportID);