Remove hasOnlyPendingDistanceRequests vars

Expensify · Feb 6, 2024 · a020a23 · a020a23
1 parent d22cfe5
commit a020a23
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/components/DistanceEReceipt.js b/src/components/DistanceEReceipt.js
@@ -35,7 +35,6 @@ function DistanceEReceipt({transaction}) {
     const {thumbnail} = TransactionUtils.hasReceipt(transaction) ? ReceiptUtils.getThumbnailAndImageURIs(transaction) : {};
     const {amount: transactionAmount, currency: transactionCurrency, merchant: transactionMerchant, created: transactionDate} = ReportUtils.getTransactionDetails(transaction);
     const formattedTransactionAmount = CurrencyUtils.convertToDisplayString(transactionAmount, transactionCurrency);
-    const isFetchingWaypointsFromServer = TransactionUtils.isFetchingWaypointsFromServer(transaction);
     const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail || '');
     const waypoints = lodashGet(transaction, 'comment.waypoints', {});
     const sortedWaypoints = useMemo(
@@ -63,7 +62,7 @@ function DistanceEReceipt({transaction}) {
                     />
 
                     <View style={[styles.moneyRequestViewImage, styles.mh0, styles.mt0, styles.mb5, styles.borderNone]}>
-                        {isFetchingWaypointsFromServer || !thumbnailSource ? (
+                        {TransactionUtils.isFetchingWaypointsFromServer(transaction) || !thumbnailSource ? (
                             <PendingMapView />
                         ) : (
                             <ThumbnailImage

diff --git a/src/components/ReportActionItem/MoneyRequestPreview.tsx b/src/components/ReportActionItem/MoneyRequestPreview.tsx
@@ -156,7 +156,6 @@ function MoneyRequestPreview({
     const hasFieldErrors = TransactionUtils.hasMissingSmartscanFields(transaction);
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
     const isFetchingWaypointsFromServer = TransactionUtils.isFetchingWaypointsFromServer(transaction);
-    const isPendingDistanceRequest = isDistanceRequest && isFetchingWaypointsFromServer && !requestAmount;
     const isCardTransaction = TransactionUtils.isCardTransaction(transaction);
     const isSettled = ReportUtils.isSettled(iouReport?.reportID);
     const isDeleted = action?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
@@ -168,7 +167,10 @@ function MoneyRequestPreview({
        the merchant says: "Route pending...", which is already shown in the amount field;
     */
     const shouldShowMerchant =
-        !!requestMerchant && requestMerchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT && requestMerchant !== CONST.TRANSACTION.DEFAULT_MERCHANT && !isPendingDistanceRequest;
+        !!requestMerchant &&
+        requestMerchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT &&
+        requestMerchant !== CONST.TRANSACTION.DEFAULT_MERCHANT &&
+        !(isFetchingWaypointsFromServer && !requestAmount);
     const shouldShowDescription = !!description && !shouldShowMerchant && !isScanning;
 
     let merchantOrDescription = requestMerchant;
@@ -226,7 +228,7 @@ function MoneyRequestPreview({
             return translate('iou.receiptScanning');
         }
 
-        if (isPendingDistanceRequest) {
+        if (isFetchingWaypointsFromServer && !requestAmount) {
             return translate('iou.routePending');
         }
 

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
@@ -140,7 +140,6 @@ function ReportPreview({
     const hasErrors = (hasReceipts && hasMissingSmartscanFields) || (canUseViolations && ReportUtils.hasViolations(iouReportID, transactionViolations));
     const lastThreeTransactionsWithReceipts = transactionsWithReceipts.slice(-3);
     const lastThreeReceipts = lastThreeTransactionsWithReceipts.map((transaction) => ReceiptUtils.getThumbnailAndImageURIs(transaction));
-    const hasOnlyPendingDistanceRequests = hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend;
 
     let formattedMerchant = numberOfRequests === 1 && hasReceipts ? TransactionUtils.getMerchant(transactionsWithReceipts[0]) : null;
     if (TransactionUtils.isPartialMerchant(formattedMerchant ?? '')) {
@@ -170,7 +169,7 @@ function ReportPreview({
         if (isScanning) {
             return translate('iou.receiptScanning');
         }
-        if (hasOnlyPendingDistanceRequests) {
+        if (hasOnlyTransactionsWithPendingRoutes) {
             return translate('iou.routePending');
         }
 
@@ -234,7 +233,7 @@ function ReportPreview({
      * There is an edge case when there is only one distance request with a pending route and amount = 0.
        In this case, we don't want to show the merchant because it says: "Pending route...", which is already displayed in the amount field.
      */
-    const shouldShowSingleRequestMerchant = numberOfRequests === 1 && !!formattedMerchant && !hasOnlyPendingDistanceRequests;
+    const shouldShowSingleRequestMerchant = numberOfRequests === 1 && !!formattedMerchant && !(hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend);
     const shouldShowSubtitle = !isScanning && (shouldShowSingleRequestMerchant || numberOfRequests > 1);
 
     return (