Merge pull request #31604 from dukenv0307/fix/30680

Show merchant for split bill
Expensify · Nov 28, 2023 · be800e1 · be800e1
2 parents 92a7093 + 290e061
commit be800e1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -170,8 +170,7 @@ function MoneyRequestPreview(props) {
  const isDeleted = lodashGet(props.action, 'pendingAction', null) === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
  // Show the merchant for IOUs and expenses only if they are custom or not related to scanning smartscan
- const shouldShowMerchant =
- !_.isEmpty(requestMerchant) && !props.isBillSplit && requestMerchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT && requestMerchant !== CONST.TRANSACTION.DEFAULT_MERCHANT;
+ const shouldShowMerchant = !_.isEmpty(requestMerchant) && requestMerchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT && requestMerchant !== CONST.TRANSACTION.DEFAULT_MERCHANT;
  const shouldShowDescription = !_.isEmpty(description) && !shouldShowMerchant && !isScanning;
 
  const receiptImages = hasReceipt ? [ReceiptUtils.getThumbnailAndImageURIs(props.transaction)] : [];
@@ -322,7 +321,7 @@ function MoneyRequestPreview(props) {
  </View>
  )}
  </View>
- {shouldShowMerchant && (
+ {shouldShowMerchant && !props.isBillSplit && (
  <View style={[styles.flexRow]}>
  <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20, styles.breakWord]}>
  {hasPendingWaypoints ? requestMerchant.replace(CONST.REGEX.FIRST_SPACE, props.translate('common.tbd')) : requestMerchant}
@@ -334,7 +333,9 @@ function MoneyRequestPreview(props) {
  {!isCurrentUserManager && props.shouldShowPendingConversionMessage && (
  <Text style={[styles.textLabel, styles.colorMuted]}>{props.translate('iou.pendingConversionMessage')}</Text>
  )}
- {shouldShowDescription && <Text style={[styles.colorMuted]}>{description}</Text>}
+ {(shouldShowDescription || (shouldShowMerchant && props.isBillSplit)) && (
+ <Text style={[styles.colorMuted]}>{shouldShowDescription ? description : requestMerchant}</Text>
+ )}
  </View>
  {props.isBillSplit && !_.isEmpty(participantAccountIDs) && requestAmount > 0 && (
  <Text style={[styles.textLabel, styles.colorMuted, styles.ml1, styles.amountSplitPadding]}>