Merge branch 'main' of github.com:Expensify/App into jsenyitko-custom-columns-release-2

Author: JS00001

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009027803
-        versionName "9.2.78-3"
+        versionCode 1009027806
+        versionName "9.2.78-6"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.78.3</string>
+	<string>9.2.78.6</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.2.78</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.78.3</string>
+	<string>9.2.78.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.2.78</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.78.3</string>
+	<string>9.2.78.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.2.78-3",
+  "version": "9.2.78-6",
   "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.",

package-lock.json

@@ -139,13 +139,12 @@ async function check({
         }
     }
 
-    printResults(results, {shouldPrintSuccesses, shouldPrintSuppressedErrors});
+    const isPassed = printResults(results, {shouldPrintSuccesses, shouldPrintSuppressedErrors});
 
     if (shouldGenerateReport) {
         generateReport(results, reportFileName);
     }
 
-    const isPassed = results.failures.size === 0 && (results.enforcedAddedComponentFailures?.size ?? 0) === 0;
     return isPassed;
 }
 
@@ -622,7 +621,7 @@ function findManualMemoizationMatches(source: string): ManualMemoizationMatch[]
 function printResults(
     {success, failures, suppressedFailures, enforcedAddedComponentFailures}: CompilerResults,
     {shouldPrintSuccesses, shouldPrintSuppressedErrors}: PrintResultsOptions,
-): void {
+): boolean {
     if (shouldPrintSuccesses && success.size > 0) {
         log();
         logSuccess(`Successfully compiled ${success.size} files with React Compiler:`);
@@ -665,23 +664,26 @@ function printResults(
 
     const hasEnforcedAddedComponentFailures = enforcedAddedComponentFailures && enforcedAddedComponentFailures.size > 0;
 
-    const isPassed = failures.size === 0 && !hasEnforcedAddedComponentFailures;
-    if (isPassed) {
-        logSuccess('All files pass React Compiler compliance check!');
-        return;
-    }
-
     const distinctFileNames = new Set<string>();
     for (const failure of failures.values()) {
         distinctFileNames.add(failure.file);
     }
 
-    if (distinctFileNames.size > 0) {
+    const shouldPrintWarnings = distinctFileNames.size > 0;
+
+    if (shouldPrintWarnings) {
         log();
-        logError(`Failed to compile ${distinctFileNames.size} files with React Compiler:`);
+        logWarn(`Failed to compile ${distinctFileNames.size} files with React Compiler:`);
         log();
 
         printFailures(failures);
+
+        log();
+        logWarn('React Compiler errors were printed as warnings for transparency, but these must NOT be fixed and can be ignored.');
+    }
+
+    if (shouldPrintWarnings && !hasEnforcedAddedComponentFailures) {
+        log();
     }
 
     if (hasEnforcedAddedComponentFailures) {
@@ -704,8 +706,16 @@ function printResults(
         }
     }
 
+    const isPassed = !hasEnforcedAddedComponentFailures;
+    if (isPassed) {
+        logSuccess(`React Compiler compliance check passed ${shouldPrintWarnings ? 'with warnings' : ''}!`);
+        return true;
+    }
+
     log();
     logError('The files above failed the React Compiler compliance check. Please fix the issues and run the check again...');
+
+    return false;
 }
 
 function printFailures(failuresToPrint: FailureMap, level = 0) {

package.json

@@ -538,9 +538,6 @@ const ONYXKEYS = {
     /** The user's Concierge reportID */
     CONCIERGE_REPORT_ID: 'conciergeReportID',
 
-    /** The user's Self DM reportID */
-    SELF_DM_REPORT_ID: 'selfDMReportID',
-
     /** The details of unknown user while sharing a file - we don't know if they exist */
     SHARE_UNKNOWN_USER_DETAILS: 'shareUnknownUserDetails',
 
@@ -1304,7 +1301,6 @@ type OnyxValuesMapping = {
     [ONYXKEYS.IS_USING_IMPORTED_STATE]: boolean;
     [ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES]: Record<string, string>;
     [ONYXKEYS.CONCIERGE_REPORT_ID]: string;
-    [ONYXKEYS.SELF_DM_REPORT_ID]: string;
     [ONYXKEYS.SHARE_UNKNOWN_USER_DETAILS]: Participant;
     [ONYXKEYS.SHARE_TEMP_FILE]: OnyxTypes.ShareTempFile;
     [ONYXKEYS.VALIDATED_FILE_OBJECT]: OnyxTypes.FileObject | undefined;

scripts/react-compiler-compliance-check.ts

@@ -184,10 +184,6 @@ const ROUTES = {
             return `bank-account/enter-signer-info?policyID=${policyID}&bankAccountID=${bankAccountID}&isCompleted=${isCompleted}` as const;
         },
     },
-    BANK_ACCOUNT_CONNECT_EXISTING_BUSINESS_BANK_ACCOUNT: {
-        route: 'bank-account/connect-existing-business-bank-account',
-        getRoute: (policyID: string) => `bank-account/connect-existing-business-bank-account?policyID=${policyID}` as const,
-    },
     PUBLIC_CONSOLE_DEBUG: {
         route: 'troubleshoot/console',
 
@@ -1694,6 +1690,10 @@ const ROUTES = {
             return `workspaces/${policyID}/workflows` as const;
         },
     },
+    WORKSPACE_WORKFLOWS_CONNECT_EXISTING_BANK_ACCOUNT: {
+        route: 'workspaces/:policyID/workflows/connect-account',
+        getRoute: (policyID: string) => `workspaces/${policyID}/workflows/connect-account` as const,
+    },
     WORKSPACE_WORKFLOWS_APPROVALS_NEW: {
         route: 'workspaces/:policyID/workflows/approvals/new',
         getRoute: (policyID: string) => `workspaces/${policyID}/workflows/approvals/new` as const,