Merge pull request #34359 from rojiphil/33874-hide-none-for-merchant

hide partial merchant name
Expensify · Jan 18, 2024 · ce0b4d2 · ce0b4d2
2 parents 4ce71ed + 9f37be5
commit ce0b4d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
@@ -166,6 +166,9 @@ function ReportPreview(props) {
     const lastThreeTransactionsWithReceipts = transactionsWithReceipts.slice(-3);
     const lastThreeReceipts = _.map(lastThreeTransactionsWithReceipts, (transaction) => ReceiptUtils.getThumbnailAndImageURIs(transaction));
     let formattedMerchant = numberOfRequests === 1 && hasReceipts ? TransactionUtils.getMerchant(transactionsWithReceipts[0]) : null;
+    if (TransactionUtils.isPartialMerchant(formattedMerchant)) {
+        formattedMerchant = null;
+    }
     const hasPendingWaypoints = formattedMerchant && hasOnlyDistanceRequests && _.every(transactionsWithReceipts, (transaction) => lodashGet(transaction, 'pendingFields.waypoints', null));
     if (hasPendingWaypoints) {
         formattedMerchant = formattedMerchant.replace(CONST.REGEX.FIRST_SPACE, props.translate('common.tbd'));
@@ -294,7 +297,7 @@ function ReportPreview(props) {
                                     )}
                                 </View>
                             </View>
-                            {!isScanning && (numberOfRequests > 1 || hasReceipts) && (
+                            {!isScanning && (numberOfRequests > 1 || (hasReceipts && numberOfRequests === 1 && formattedMerchant)) && (
                                 <View style={styles.flexRow}>
                                     <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
                                         <Text style={[styles.textLabelSupporting, styles.textNormal, styles.mb1, styles.lh20]}>{previewSubtitle || moneyRequestComment}</Text>

diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
@@ -147,6 +147,13 @@ function isMerchantMissing(transaction: Transaction) {
     return isMerchantEmpty && isModifiedMerchantEmpty;
 }
 
+/**
+ * Check if the merchant is partial i.e. `(none)`
+ */
+function isPartialMerchant(merchant: string): boolean {
+    return merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
+}
+
 function isAmountMissing(transaction: Transaction) {
     return transaction.amount === 0 && (!transaction.modifiedAmount || transaction.modifiedAmount === 0);
 }
@@ -573,6 +580,7 @@ export {
     getWaypoints,
     isAmountMissing,
     isMerchantMissing,
+    isPartialMerchant,
     isCreatedMissing,
     areRequiredFieldsEmpty,
     hasMissingSmartscanFields,