diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js index 8cddd3c017de..9a2d7c673c5b 100755 --- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js +++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js @@ -60,8 +60,12 @@ 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', + mixedUAStyles: {...styles.textLabelSupporting}, + }), }), - [styles.colorMuted, styles.formError, styles.mb0], + [styles.colorMuted, styles.formError, styles.mb0, styles.textLabelSupporting], ); // We need to memoize this prop to make it referentially stable. diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js index 880e46b2592a..8bf180018afb 100644 --- a/src/components/MoneyReportHeader.js +++ b/src/components/MoneyReportHeader.js @@ -149,11 +149,6 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, nextSt )} - {shouldShowNextSteps && ( - - - - )} {shouldShowSettlementButton && isSmallScreenWidth && ( )} + {shouldShowNextSteps && ( + + + + )} ); diff --git a/src/components/MoneyReportHeaderStatusBar.js b/src/components/MoneyReportHeaderStatusBar.js index 3f2c06be78cf..48f3bf227763 100644 --- a/src/components/MoneyReportHeaderStatusBar.js +++ b/src/components/MoneyReportHeaderStatusBar.js @@ -27,7 +27,7 @@ function MoneyReportHeaderStatusBar({nextStep}) { return ( - {translate('iou.nextSteps')} + {translate('iou.nextSteps')} diff --git a/src/components/MoneyRequestHeaderStatusBar.js b/src/components/MoneyRequestHeaderStatusBar.js index fc91678cf6fb..e50b69cca1fe 100644 --- a/src/components/MoneyRequestHeaderStatusBar.js +++ b/src/components/MoneyRequestHeaderStatusBar.js @@ -21,7 +21,7 @@ function MoneyRequestHeaderStatusBar({title, description, shouldShowBorderBottom return ( - {title} + {title} {description} diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts index 538e8dbe81f0..ac5c999d5388 100644 --- a/src/libs/NextStepUtils.ts +++ b/src/libs/NextStepUtils.ts @@ -14,10 +14,12 @@ function parseMessage(messages: Message[] | undefined) { nextStepHTML += `<${tagType}>${Str.safeEscape(part.text)}`; }); - return nextStepHTML + const formattedHtml = nextStepHTML .replace(/%expenses/g, 'this expense') .replace(/%Expenses/g, 'This expense') .replace(/%tobe/g, 'is'); + + return `${formattedHtml}`; } // eslint-disable-next-line import/prefer-default-export diff --git a/src/styles/styles.ts b/src/styles/styles.ts index a880a434b8f2..b51c22f7766c 100644 --- a/src/styles/styles.ts +++ b/src/styles/styles.ts @@ -3781,9 +3781,9 @@ const styles = (theme: ThemeColors) => }, moneyRequestHeaderStatusBarBadge: { - paddingHorizontal: 8, - borderRadius: variables.componentBorderRadiusSmall, + width: 68, height: variables.inputHeightSmall, + borderRadius: variables.componentBorderRadiusSmall, display: 'flex', justifyContent: 'center', alignItems: 'center',