From 7f95ad2315de03d0cb2b59a446395b3b50c2f1e7 Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Mon, 18 Dec 2023 18:48:03 +0100 Subject: [PATCH] rename to next step --- .../BaseHTMLEngineProvider.js | 6 ++--- ...Renderer.tsx => NextStepEmailRenderer.tsx} | 8 +++---- .../HTMLEngineProvider/HTMLRenderers/index.js | 4 ++-- src/components/MoneyReportHeader.js | 10 ++++---- src/components/MoneyReportHeaderStatusBar.js | 2 +- src/languages/en.ts | 4 ++-- src/languages/es.ts | 4 ++-- src/libs/NextStepUtils.ts | 4 ++-- src/libs/actions/IOU.js | 24 +++++++++---------- 9 files changed, 33 insertions(+), 33 deletions(-) rename src/components/HTMLEngineProvider/HTMLRenderers/{NextStepsEmailRenderer.tsx => NextStepEmailRenderer.tsx} (60%) diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js index d663275a405c..40bb10a9eaf8 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'}), }), [styles.colorMuted, styles.formError, styles.mb0, styles.textLabelSupporting], ); 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 45a9ce893d9f..3bf696a32a49 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'; /** @@ -21,5 +21,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 3e6ce7e5be52..a559e876af18 100644 --- a/src/components/MoneyReportHeader.js +++ b/src/components/MoneyReportHeader.js @@ -102,11 +102,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 (!ReportUtils.isArchivedRoom(chatReport)) { @@ -138,7 +138,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)} @@ -200,7 +200,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, nextSt /> )} - {shouldShowNextSteps && ( + {shouldShowNextStep && ( diff --git a/src/components/MoneyReportHeaderStatusBar.js b/src/components/MoneyReportHeaderStatusBar.js index 687bc92ffbcd..fa21630ebbd8 100644 --- a/src/components/MoneyReportHeaderStatusBar.js +++ b/src/components/MoneyReportHeaderStatusBar.js @@ -28,7 +28,7 @@ function MoneyReportHeaderStatusBar({nextStep}) { 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 872e451452ba..4acf8fd2ec83 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -567,7 +567,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}` : ''}`, @@ -1429,7 +1429,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 44f75e351437..448a0d25d8a6 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -560,7 +560,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}` : ''}`, @@ -1452,7 +1452,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 ebad204a29a3..0ab43d8a9647 100644 --- a/src/libs/NextStepUtils.ts +++ b/src/libs/NextStepUtils.ts @@ -16,7 +16,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); } @@ -28,7 +28,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 802f0f00fffd..a49f72efba3d 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);