Merge pull request #29659 from Expensify/georgia-fixSmartScanBanner

[CP Staging] - Only show Pending Banner for ECard Transactions (cherry picked from commit 5a5b890)
Expensify · Oct 16, 2023 · ad68cc1 · ad68cc1
1 parent e3ac764
commit ad68cc1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -472,6 +472,7 @@ const CONST = {
         HAND_ICON_HEIGHT: 152,
         HAND_ICON_WIDTH: 200,
         SHUTTER_SIZE: 90,
+        MAX_REPORT_PREVIEW_RECEIPTS: 3,
     },
     REPORT: {
         MAXIMUM_PARTICIPANTS: 8,

diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js
@@ -82,7 +82,7 @@ function MoneyRequestHeader({session, parentReport, report, parentReportAction,
     }, [parentReportAction, setIsDeleteModalVisible]);
 
     const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
-    const isPending = TransactionUtils.isPending(transaction);
+    const isPending = TransactionUtils.isExpensifyCardTransaction(transaction) && TransactionUtils.isPending(transaction);
 
     const canModifyRequest = isActionOwner && !isSettled && !isApproved && !ReportActionsUtils.isDeletedAction(parentReportAction);
 

diff --git a/src/components/ReportActionItem/ReportActionItemImages.js b/src/components/ReportActionItem/ReportActionItemImages.js
@@ -47,8 +47,10 @@ const defaultProps = {
  */
 
 function ReportActionItemImages({images, size, total, isHovered}) {
-    const numberOfShownImages = size || images.length;
-    const shownImages = images.slice(0, size);
+    // Calculate the number of images to be shown, limited by the value of 'size' (if defined)
+    // or the total number of images.
+    const numberOfShownImages = Math.min(size || images.length, images.length);
+    const shownImages = images.slice(0, numberOfShownImages);
     const remaining = (total || images.length) - size;
     const MAX_REMAINING = 9;
 

diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
@@ -195,9 +195,9 @@ function ReportPreview(props) {
                     {hasReceipts && (
                         <ReportActionItemImages
                             images={lastThreeReceipts}
-                            size={3}
                             total={transactionsWithReceipts.length}
                             isHovered={props.isHovered || isScanning}
+                            size={CONST.RECEIPT.MAX_REPORT_PREVIEW_RECEIPTS}
                         />
                     )}
                     <View style={styles.reportPreviewBoxBody}>

diff --git a/src/pages/iou/SplitBillDetailsPage.js b/src/pages/iou/SplitBillDetailsPage.js
@@ -9,7 +9,6 @@ import ONYXKEYS from '../../ONYXKEYS';
 import CONST from '../../CONST';
 import * as OptionsListUtils from '../../libs/OptionsListUtils';
 import personalDetailsPropType from '../personalDetailsPropType';
-import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import compose from '../../libs/compose';
 import reportActionPropTypes from '../home/report/reportActionPropTypes';
 import reportPropTypes from '../reportPropTypes';
@@ -61,8 +60,6 @@ const propTypes = {
         /** Currently logged in user email */
         email: PropTypes.string,
     }).isRequired,
-
-    ...withLocalizePropTypes,
 };
 
 const defaultProps = {
@@ -112,7 +109,7 @@ function SplitBillDetailsPage(props) {
     return (
         <ScreenWrapper testID={SplitBillDetailsPage.displayName}>
             <FullPageNotFoundView shouldShow={_.isEmpty(reportID) || _.isEmpty(reportAction) || _.isEmpty(props.transaction)}>
-                <HeaderWithBackButton title={props.translate('common.details')} />
+                <HeaderWithBackButton title={translate('common.details')} />
                 <View
                     pointerEvents="box-none"
                     style={[styles.containerWithSpaceBetween]}
@@ -155,7 +152,6 @@ SplitBillDetailsPage.defaultProps = defaultProps;
 SplitBillDetailsPage.displayName = 'SplitBillDetailsPage';
 
 export default compose(
-    withLocalize,
     withReportAndReportActionOrNotFound,
     withOnyx({
         report: {