Merge pull request #29276 from BeeMargarida/fix/28766-do-not-show-sub…

…mit-if-value-0 [NoQA] fix: do not show submit button if total is 0
Expensify · Oct 11, 2023 · a3247b2 · a3247b2
2 parents 0bc4876 + e1368c0
commit a3247b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
@@ -80,7 +80,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
  }
  return isManager && !isDraft && !isApproved && !isSettled;
  }, [policyType, isManager, isDraft, isApproved, isSettled]);
- const shouldShowSubmitButton = isDraft;
+ const shouldShowSubmitButton = isDraft && reportTotal !== 0;
  const shouldShowAnyButton = shouldShowSettlementButton || shouldShowApproveButton || shouldShowSubmitButton;
  const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
  const formattedAmount = CurrencyUtils.convertToDisplayString(reportTotal, moneyRequestReport.currency);

diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
@@ -136,6 +136,8 @@ function ReportPreview(props) {
  scanningReceipts: numberOfScanningReceipts,
  });
 
+ const shouldShowSubmitButton = isReportDraft && reportTotal !== 0;
+
  const getDisplayAmount = () => {
  if (reportTotal) {
  return CurrencyUtils.convertToDisplayString(reportTotal, props.iouReport.currency);
@@ -242,7 +244,7 @@ function ReportPreview(props) {
  }}
  />
  )}
- {isReportDraft && (
+ {shouldShowSubmitButton && (
  <Button
  medium
  success={props.chatReport.isOwnPolicyExpenseChat}