Merge remote-tracking branch 'upstream/main' into adeel-saved-search-…

…name

.well-known/apple-app-site-association

@@ -2,7 +2,7 @@
     "applinks": {
         "details": [
             {
-                "appIDs": ["368M544MTT.com.chat.expensify.chat"],
+                "appIDs": ["368M544MTT.com.chat.expensify.chat", "452835FXHF.com.expensify.expensifylite"],
                 "components": [
                     {
                        "/": "/r/*",
@@ -105,6 +105,6 @@
         ]
     },
     "webcredentials": {
-        "apps": ["368M544MTT.com.chat.expensify.chat"]
+        "apps": ["368M544MTT.com.chat.expensify.chat", "452835FXHF.com.expensify.expensifylite"]
     }
 }

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009005205
-        versionName "9.0.52-5"
+        versionCode 1009005301
+        versionName "9.0.53-1"
         // 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/src/main/java/com/expensify/chat/MainApplication.kt

@@ -11,9 +11,11 @@ import com.expensify.chat.bootsplash.BootSplashPackage
 import com.expensify.chat.shortcutManagerModule.ShortcutManagerPackage
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.react.modules.i18nmanager.I18nUtil
 import com.facebook.soloader.SoLoader
@@ -44,6 +46,9 @@ class MainApplication : MultiDexApplication(), ReactApplication {
             get() = BuildConfig.IS_HERMES_ENABLED
     })
 
+    override val reactHost: ReactHost
+        get() = getDefaultReactHost(applicationContext, reactNativeHost)
+
     override fun onCreate() {
         super.onCreate()
         ReactFontManager.getInstance().addCustomFont(this, "Expensify New Kansas", R.font.expensify_new_kansas)
@@ -59,7 +64,7 @@ class MainApplication : MultiDexApplication(), ReactApplication {
         SoLoader.init(this,  /* native exopackage */false)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             // If you opted-in for the New Architecture, we load the native entry point for this app.
-            load(bridgelessEnabled = false)
+            load()
         }
         if (BuildConfig.DEBUG) {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false)

docs/articles/expensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop.md

@@ -7,6 +7,8 @@ Our new QuickBooks Desktop integration allows you to automate the import and exp
 # Step 1: Configure export settings
 The following steps will determine how data will be exported from Expensify to QuickBooks Desktop.
 
+![Expensify export settings page for the QuickBooks Desktop integration](https://help.expensify.com/assets/images/quickbooks-desktop-export-settings.png){:width="100%"}
+
 1. In Expensify, hover over **Settings** and click **Workspaces**.
 2. Select the Workspace you want to connect to QuickBooks Desktop.
 3. Click the **Connections** tab. 
@@ -28,6 +30,8 @@ The following steps will determine how data will be exported from Expensify to Q
 
 The following steps help you determine how data will be imported from QuickBooks Online to Expensify:
 
+![Expensify coding settings page for the QuickBooks Desktop integration](https://help.expensify.com/assets/images/quickbooks-desktop-coding-settings.png){:width="100%"}
+
 1. Click Import under the QuickBooks Online connection.
 2. Review each of the following import settings:
 - **Chart of Accounts**: The Chart of Accounts is automatically imported from QuickBooks Desktop as categories. This cannot be amended.
@@ -39,6 +43,8 @@ The following steps help you determine how data will be imported from QuickBooks
 
 The following steps help you determine the advanced settings for your connection, like auto-sync and employee invitation settings.
 
+![Expensify advanced settings page for the QuickBooks Desktop integration](https://help.expensify.com/assets/images/quickbooks-desktop-advanced-settings.png){:width="100%"}
+
 1. Click **Advanced** under the QuickBooks Desktop connection.
 2. **Enable or disable Auto-Sync**: If enabled, QuickBooks Desktop automatically communicates changes with Expensify to ensure that the data shared between the two systems is up to date. New report approvals/reimbursements will be synced during the next auto-sync period.
 

docs/articles/expensify-classic/connections/quickbooks-desktop/Quickbooks-Desktop-Troubleshooting.md

@@ -40,7 +40,13 @@ Generally, these errors indicate that there is a credentials issue.
 4. Check that you have the correct permissions. 
 5. Log in to QuickBooks Desktop as an Admin (in single-user mode). 
 6. Go to **Edit** > **Preferences** > **Integrated Applications** > **Company Preferences**.
-7. Select the Web Connector and click **Properties**. 
+
+![Company Preferences page of QuickBooks Desktop](https://help.expensify.com/assets/images/quickbooks-desktop-company-preferences.png){:width="100%"}
+
+7. Select the Web Connector and click **Properties**.
+
+![Web Connector Properties page in QuickBooks Desktop](https://help.expensify.com/assets/images/quickbooks-desktop-access-rights.png){:width="100%"}
+
 8. Make sure that the "Allow this application to login automatically" checkbox is selected and click **OK**.
 9. Close all windows in QuickBooks.
 
@@ -98,6 +104,11 @@ Generally, this is the result of not having both the QuickBooks Web Connector an
 
 1. Make sure that the Web Connector and QuickBooks Desktop Company File are both open.
 2. In the Web Connector, check that the Last Status is “Ok”.
+
+![QuickBooks Web Connector showing status "OK"](https://help.expensify.com/assets/images/quickbooks-desktop-web-connector.png){:width="100%"}
+
 3. Check the Report Comments in Expensify to confirm that the report has been successfully exported to QuickBooks Desktop.
 
+![Expensify report showing the report was exported](https://help.expensify.com/assets/images/quickbooks-desktop-exported-report-comments.png){:width="100%"}
+
 If these general troubleshooting steps don’t work, reach out to Concierge with your Expensify Report ID and a screenshot of your QuickBooks Web Connector.

ios/NewExpensify.xcodeproj/project.pbxproj

@@ -681,7 +681,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/FullStory/tools/FullStoryCommandLine\" \"${CONFIGURATION_BUILD_DIR}/${WRAPPER_NAME}\"\n";
+			shellScript = "if [ \"$CONFIGURATION\" != \"DebugDevelopment\" ]; then\n  \"${PODS_ROOT}/FullStory/tools/FullStoryCommandLine\" \"${CONFIGURATION_BUILD_DIR}/${WRAPPER_NAME}\"\nelse\n  echo \"Skipping FullStory Asset Uploader phase for DebugDevelopment scheme.\"\nfi\n";
 		};
 		5CF45ABA52C0BB0D7B9D139A /* [Expo] Configure project */ = {
 			isa = PBXShellScriptBuildPhase;

ios/NewExpensify/AppDelegate.mm

@@ -88,11 +88,6 @@ - (NSURL *)bundleURL
 #endif
 }
 
-- (BOOL)bridgelessEnabled
-{
-  return NO;
-}
-
 // This methods is needed to support the hardware keyboard shortcuts
 - (NSArray *)keyCommands {
   return [HardwareShortcuts sharedInstance].keyCommands;

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.52</string>
+	<string>9.0.53</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.52.5</string>
+	<string>9.0.53.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/RCTBootSplash.h

@@ -1,12 +1,4 @@
-//
-//  RCTBootSplash.h
-//  NewExpensify
-//
-//  Created by Mathieu Acthernoene on 07/01/2022.
-//
-
 #import <React/RCTBridgeModule.h>
-#import <React/RCTRootView.h>
 
 @interface RCTBootSplash : NSObject <RCTBridgeModule>