include title in Next Steps (?)

Expensify · Aug 21, 2024 · 9489e15 · 9489e15
1 parent 5e6fe53
commit 9489e15
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
@@ -109,6 +109,10 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const hasOnlyPendingTransactions = ReportUtils.getTransactionsWithReceipts(moneyRequestReport?.reportID).every(
         (t) => TransactionUtils.isExpensifyCardTransaction(t) && TransactionUtils.isPending(t),
     );
+    const hasOnlyPostedTransactions = allTransactions.every(
+        (transaction) => !TransactionUtils.getReimbursable(transaction) && !TransactionUtils.isPending(transaction) && !TransactionUtils.isReceiptBeingScanned(transaction),
+    );
+
     const transactionIDs = allTransactions.map((t) => t.transactionID);
     const allHavePendingRTERViolation = TransactionUtils.allHavePendingRTERViolation(transactionIDs);
     const hasOnlyHeldExpenses = ReportUtils.hasOnlyHeldExpenses(moneyRequestReport.reportID);

diff --git a/src/components/MoneyReportHeaderStatusBar.tsx b/src/components/MoneyReportHeaderStatusBar.tsx
@@ -30,7 +30,8 @@ function MoneyReportHeaderStatusBar({nextStep}: MoneyReportHeaderStatusBarProps)
     const theme = useTheme();
     const messageContent = useMemo(() => {
         const messageArray = nextStep.message;
-        return NextStepUtils.parseMessage(messageArray);
+        const title = nextStep.title ?? '';
+        return NextStepUtils.parseMessage(messageArray, title);
     }, [nextStep.message]);
 
     return (

diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
@@ -35,7 +35,7 @@ Onyx.connect({
     callback: (value) => (allPolicies = value),
 });
 
-function parseMessage(messages: Message[] | undefined) {
+function parseMessage(messages: Message[] | undefined, title: string | undefined) {
     let nextStepHTML = '';
 
     messages?.forEach((part) => {
@@ -48,8 +48,7 @@ function parseMessage(messages: Message[] | undefined) {
             tagType = 'next-step-email';
             content = EmailUtils.prefixMailSeparatorsWithBreakOpportunities(content);
         }
-
-        nextStepHTML += `<${tagType}>${content}</${tagType}>`;
+        nextStepHTML += `<${tagType}>${[title, content].join(' ')}</${tagType}>`;
     });
 
     const formattedHtml = nextStepHTML

diff --git a/src/types/onyx/ReportNextStep.ts b/src/types/onyx/ReportNextStep.ts
@@ -55,6 +55,9 @@ type ReportNextStep = {
     /** The message parts of the next step */
     message?: Message[];
 
+    /** The tile the next step */
+    title?: string;
+
     /** The icon for the next step */
     icon: ValueOf<typeof CONST.NEXT_STEP.ICONS>;