fix: resolve conflicts

.github/workflows/e2ePerformanceTests.yml

@@ -184,6 +184,9 @@ jobs:
 
       - name: Copy e2e code into zip folder
         run: cp tests/e2e/dist/index.js zip/testRunner.ts
+
+      - name: Copy profiler binaries into zip folder
+        run: cp -r node_modules/@perf-profiler/android/cpp-profiler/bin zip/bin
 
       - name: Zip everything in the zip directory up
         run: zip -qr App.zip ./zip

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009000116
-        versionName "9.0.1-16"
+        versionCode 1009000301
+        versionName "9.0.3-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"
@@ -190,6 +190,23 @@ android {
     }
 }
 
+afterEvaluate {
+    // As the App is building from source, we need to make sure hermesc is built before the JS bundle is created.
+    // Otherwise the release version of the app will fail to build due to missing hermesc.
+    def hermesCTask = gradle.includedBuild("react-native").task(":packages:react-native:ReactAndroid:hermes-engine:buildHermesC")
+
+    android.applicationVariants.configureEach { variant ->
+        if (variant.buildType.name == "release") {
+            def variantName = variant.name.capitalize()
+            def bundleTask = tasks.named("createBundle${variantName}JsAndAssets").getOrNull()
+
+            if (bundleTask != null) {
+                bundleTask.dependsOn(hermesCTask)
+            }
+        }
+    }
+}
+
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")

docs/articles/new-expensify/connections/Set-up-QuickBooks-Online-connection.md

@@ -46,6 +46,12 @@ Log in to QuickBooks Online and ensure all of your employees are setup as either
    <li>Enter your Intuit login details to import your settings from QuickBooks Online to Expensify.</li>
 </ol>
 
+![The toggle location to enable accounting integrations like QuickBooks Online]({{site.url}}/assets/images/ExpensifyHelp-QBO-1.png){:width="100%"}
+
+![How to enable accounting integrations like QuickBooks Online]({{site.url}}/assets/images/ExpensifyHelp-QBO-2.png){:width="100%"}
+
+![The QuickBooks Online Connect button]({{site.url}}/assets/images/ExpensifyHelp-QBO-3.png){:width="100%"}
+
 # Step 3: Configure import settings
 
 The following steps help you determine how data will be imported from QuickBooks Online to Expensify. 

docs/articles/new-expensify/connections/Set-up-Xero-connection.md

@@ -23,6 +23,12 @@ To set up your Xero connection, complete the 4 steps below.
    <li>Enter your Xero login details to import your settings from Xero to Expensify.</li>
 </ol>
 
+![The toggle location to enable accounting integrations like QuickBooks Online]({{site.url}}/assets/images/ExpensifyHelp-Xero-1.png){:width="100%"}
+
+![How to enable accounting integrations like QuickBooks Online]({{site.url}}/assets/images/ExpensifyHelp-Xero-2.png){:width="100%"}
+
+![The QuickBooks Online Connect button]({{site.url}}/assets/images/ExpensifyHelp-Xero-3.png){:width="100%"}
+
 # Step 2: Configure import settings
 
 The following steps help you determine how data will be imported from Xero to Expensify. 

docs/articles/new-expensify/expenses/Approve-and-pay-expenses.md

@@ -29,7 +29,11 @@ To approve an expense,
 {% include info.html %}
 Admins can modify an expense, if needed.
 {% include end-info.html %}
-
+
+![The approve button in an expense]({{site.url}}/assets/images/ExpensifyHelp_ApproveExpense_1.png){:width="100%"}
+
+![The approve button when you click into the expense]({{site.url}}/assets/images/ExpensifyHelp_ApproveExpense_2.png){:width="100%"}
+
 You’re now ready to pay the expense. 
 
 # Hold an expense

docs/redirects.csv

@@ -201,4 +201,5 @@ https://help.expensify.com/articles/expensify-classic/workspaces/reports/Report-
 https://help.expensify.com/articles/expensify-classic/workspaces/reports/Scheduled-Submit,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports
 https://help.expensify.com/articles/new-expensify/chat/Expensify-Chat-For-Admins,https://help.expensify.com/new-expensify/hubs/chat/
 https://help.expensify.com/articles/new-expensify/bank-accounts-and-payments/Connect-a-Bank-Account.html,https://help.expensify.com/articles/new-expensify/expenses/Connect-a-Business-Bank-Account
+https://help.expensify.com/articles/expensify-classic/travel/Coming-Soon,https://help.expensify.com/expensify-classic/hubs/travel/
 https://help.expensify.com/articles/new-expensify/expenses/Manually-submit-reports-for-approval,https://help.expensify.com/new-expensify/hubs/expenses/

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.1</string>
+	<string>9.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.1.16</string>
+	<string>9.0.3.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.1</string>
+	<string>9.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.1.16</string>
+	<string>9.0.3.1</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.1</string>
+	<string>9.0.3</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.1.16</string>
+	<string>9.0.3.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>