Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…

…s-migration/MoneyRequestConfirmationList/component

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001044400
-        versionName "1.4.44-0"
+        versionCode 1001044401
+        versionName "1.4.44-1"
     }
 
     flavorDimensions "default"

docs/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features.md

@@ -81,7 +81,7 @@ Follow the below steps to run reconciliation on the Expensify Card settlements:
     - Entry ID: a unique number grouping card payments and transactions settled by those payments
     - Amount: the amount debited from the Business Bank Account for payments
     - Merchant: the business where a purchase was made
-    - Card: refers to the Expensify credit card number and cardholder's email address
+    - Card: refers to the Expensify Card number and cardholder's email address
     - Business Account: the business bank account connected to Expensify that the settlement is paid from
     - Transaction ID: a special ID that helps Expensify support locate transactions if there's an issue
 

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.44.0</string>
+	<string>1.4.44.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.44.0</string>
+	<string>1.4.44.1</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.44</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.44.0</string>
+	<string>1.4.44.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.44-0",
+  "version": "1.4.44-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/components/FlatList/MVCPFlatList.js

@@ -38,6 +38,7 @@ const MVCPFlatList = React.forwardRef(({maintainVisibleContentPosition, horizont
     const firstVisibleViewRef = React.useRef(null);
     const mutationObserverRef = React.useRef(null);
     const lastScrollOffsetRef = React.useRef(0);
+    const isListRenderedRef = React.useRef(false);
 
     const getScrollOffset = React.useCallback(() => {
         if (scrollRef.current == null) {
@@ -137,6 +138,9 @@ const MVCPFlatList = React.forwardRef(({maintainVisibleContentPosition, horizont
     }, [adjustForMaintainVisibleContentPosition, getContentView, getScrollOffset, scrollToOffset]);
 
     React.useEffect(() => {
+        if (!isListRenderedRef.current) {
+            return;
+        }
         requestAnimationFrame(() => {
             prepareForMaintainVisibleContentPosition();
             setupMutationObserver();
@@ -186,6 +190,10 @@ const MVCPFlatList = React.forwardRef(({maintainVisibleContentPosition, horizont
             onScroll={onScrollInternal}
             scrollEventThrottle={1}
             ref={onRef}
+            onLayout={(e) => {
+                isListRenderedRef.current = true;
+                props.onLayout?.(e);
+            }}
         />
     );
 });

src/components/ReportActionItem/MoneyRequestView.tsx

@@ -189,10 +189,9 @@ function MoneyRequestView({
 
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
     let receiptURIs;
-    let hasErrors = false;
+    const hasErrors = canEdit && TransactionUtils.hasMissingSmartscanFields(transaction);
     if (hasReceipt) {
         receiptURIs = ReceiptUtils.getThumbnailAndImageURIs(transaction);
-        hasErrors = canEdit && TransactionUtils.hasMissingSmartscanFields(transaction);
     }
 
     const pendingAction = transaction?.pendingAction;

src/components/ReportActionItem/ReportPreview.tsx

@@ -138,7 +138,7 @@ function ReportPreview({
 
     const hasReceipts = transactionsWithReceipts.length > 0;
     const isScanning = hasReceipts && areAllRequestsBeingSmartScanned;
-    const hasErrors = (hasReceipts && hasMissingSmartscanFields) || (canUseViolations && ReportUtils.hasViolations(iouReportID, transactionViolations));
+    const hasErrors = hasMissingSmartscanFields || (canUseViolations && ReportUtils.hasViolations(iouReportID, transactionViolations));
     const lastThreeTransactionsWithReceipts = transactionsWithReceipts.slice(-3);
     const lastThreeReceipts = lastThreeTransactionsWithReceipts.map((transaction) => ReceiptUtils.getThumbnailAndImageURIs(transaction));
 

src/libs/ReportUtils.ts

@@ -2235,8 +2235,7 @@ function areAllRequestsBeingSmartScanned(iouReportID: string, reportPreviewActio
  *
  */
 function hasMissingSmartscanFields(iouReportID: string): boolean {
-    const transactionsWithReceipts = getTransactionsWithReceipts(iouReportID);
-    return transactionsWithReceipts.some((transaction) => TransactionUtils.hasMissingSmartscanFields(transaction));
+    return TransactionUtils.getAllReportTransactions(iouReportID).some((transaction) => TransactionUtils.hasMissingSmartscanFields(transaction));
 }
 
 /**

src/libs/TransactionUtils.ts

@@ -480,7 +480,7 @@ function isReceiptBeingScanned(transaction: OnyxEntry<Transaction>): boolean {
  * Check if the transaction has a non-smartscanning receipt and is missing required fields
  */
 function hasMissingSmartscanFields(transaction: OnyxEntry<Transaction>): boolean {
-    return Boolean(transaction && hasReceipt(transaction) && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction));
+    return Boolean(transaction && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction));
 }
 
 /**

src/pages/home/report/ReportActionItemFragment.tsx

@@ -105,6 +105,7 @@ function ReportActionItemFragment({
                         source={source}
                         html={fragment.html ?? ''}
                         addExtraMargin={!displayAsGroup}
+                        styleAsDeleted={!!(isOffline && isPendingDelete)}
                     />
                 );
             }

src/pages/home/report/comment/AttachmentCommentFragment.tsx

@@ -1,22 +1,27 @@
 import React from 'react';
 import {View} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
 import type {OriginalMessageSource} from '@src/types/onyx/OriginalMessage';
 import RenderCommentHTML from './RenderCommentHTML';
 
 type AttachmentCommentFragmentProps = {
     source: OriginalMessageSource;
     html: string;
     addExtraMargin: boolean;
+    styleAsDeleted: boolean;
 };
 
-function AttachmentCommentFragment({addExtraMargin, html, source}: AttachmentCommentFragmentProps) {
+function AttachmentCommentFragment({addExtraMargin, html, source, styleAsDeleted}: AttachmentCommentFragmentProps) {
     const styles = useThemeStyles();
+    const isUploading = html === CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML;
+    const htmlContent = styleAsDeleted && isUploading ? `<del>${html}</del>` : html;
+
     return (
         <View style={addExtraMargin ? styles.mt2 : {}}>
             <RenderCommentHTML
                 source={source}
-                html={html}
+                html={htmlContent}
             />
         </View>
     );