Merge branch 'Expensify:main' into newPhoneNumberRHPForProfile

.github/workflows/cla.yml

@@ -4,7 +4,7 @@ on:
   issue_comment:
     types: [created]
   pull_request_target:
-    types: [opened, closed, synchronize]
+    types: [opened, synchronize]
 
 jobs:
   CLA:

.github/workflows/e2ePerformanceTests.yml

@@ -24,33 +24,21 @@ jobs:
     runs-on: ubuntu-latest
     name: Find the baseline and delta refs, and check for an existing build artifact for that commit
     outputs:
-      BASELINE_ARTIFACT_FOUND: ${{ steps.checkForExistingArtifact.outputs.ARTIFACT_FOUND }}
-      BASELINE_ARTIFACT_WORKFLOW_ID: ${{ steps.checkForExistingArtifact.outputs.ARTIFACT_WORKFLOW_ID }}
-      BASELINE_VERSION: ${{ steps.getMostRecentRelease.outputs.VERSION }}
+      BASELINE_REF: ${{ steps.getBaselineRef.outputs.BASELINE_REF }}
       DELTA_REF: ${{ steps.getDeltaRef.outputs.DELTA_REF }}
       IS_PR_MERGED: ${{ steps.getPullRequestDetails.outputs.IS_MERGED }}
     steps:
       - uses: actions/checkout@v4
         with:
-          # The OS_BOTIFY_COMMIT_TOKEN is a personal access token tied to osbotify (we need a PAT to access the artifact API)
-          token: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
-
-      - name: Get most recent release version
-        id: getMostRecentRelease
-        run: echo "VERSION=$(gh release list --limit 1 | awk '{ print $1 }')" >> "$GITHUB_OUTPUT"
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Check if there's an existing artifact for this baseline
-        id: checkForExistingArtifact
-        uses: ./.github/actions/javascript/getArtifactInfo
-        with:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
-          ARTIFACT_NAME: baseline-${{ steps.getMostRecentRelease.outputs.VERSION }}android-artifact-apk
+          fetch-depth: 0  # Fetches the entire history
 
-      - name: Skip build if there's already an existing artifact for the baseline
-        if: ${{ fromJSON(steps.checkForExistingArtifact.outputs.ARTIFACT_FOUND) }}
-        run: echo 'APK for baseline ${{ steps.getMostRecentRelease.outputs.VERSION }} already exists, reusing existing build'
+      - name: Determine "baseline ref" (prev merge commit)
+        id: getBaselineRef
+        run: |
+          previous_merge=$(git rev-list --merges HEAD~1 | head -n 1)
+          git checkout "$previous_merge"
+          echo "$previous_merge"
+          echo "BASELINE_REF=$previous_merge" >> "$GITHUB_OUTPUT"
 
       - name: Get pull request details
         id: getPullRequestDetails
@@ -84,15 +72,14 @@ jobs:
           fi
 
   buildBaseline:
-    name: Build apk from latest release as a baseline
+    name: Build apk from baseline
     uses: ./.github/workflows/buildAndroid.yml
     needs: prep
-    if: ${{ !fromJSON(needs.prep.outputs.BASELINE_ARTIFACT_FOUND) }}
     secrets: inherit
     with:
       type: e2e
-      ref: ${{ needs.prep.outputs.BASELINE_VERSION }}
-      artifact-prefix: baseline-${{ needs.prep.outputs.BASELINE_VERSION }}
+      ref: ${{ needs.prep.outputs.BASELINE_REF }}
+      artifact-prefix: baseline-${{ needs.prep.outputs.BASELINE_REF }}
 
   buildDelta:
     name: Build apk from delta ref
@@ -127,9 +114,6 @@ jobs:
         with:
           name: ${{ needs.buildBaseline.outputs.APK_ARTIFACT_NAME }}
           path: zip
-          # Set github-token only if the baseline was built in this workflow run:
-          github-token: ${{ needs.prep.outputs.BASELINE_ARTIFACT_WORKFLOW_ID && github.token }}
-          run-id: ${{ needs.prep.outputs.BASELINE_ARTIFACT_WORKFLOW_ID }}
 
       # The downloaded artifact will be a file named "app-e2e-release.apk" so we have to rename it
       - name: Rename baseline APK

.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 1009005200
-        versionName "9.0.52-0"
+        versionCode 1009005400
+        versionName "9.0.54-0"
         // 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.

docs/articles/expensify-classic/workspaces/Personal-and-Corporate-Karma.md

@@ -0,0 +1,42 @@
+---
+title: Personal and Corporate Karma
+description: Details about Personal and Corporate Karma
+---
+
+# Overview
+
+Expensify.org empowers individuals and communities to eliminate injustice around the world by making giving and volunteering more convenient, meaningful, and collaborative.
+
+## What is the Expensify.org giving model
+
+[Expensify.org](https://www.expensify.org/about) is built on creating a transparent and convenient way to create an emotional connection between donors, volunteers, and recipients.
+
+## Where do Expensify.org funds come from?
+
+Corporate Karma, Personal Karma, and monetary donations.
+
+## What is Personal Karma?
+
+Personal Karma allows individual users to automatically donate a small percentage of their monthly added expenses to Expensify.org. 
+
+For every $500 of expenses added, you’ll donate $1 to a related Expensify.org fund. All reported and unreported expenses, including invoice expenses, on the Expenses page are calculated to get the donation amount. Each month, Expensify will charge the billing card on file for the donation amount, and you’ll receive a donation receipt via email.
+
+The fund from your Personal Karma is determined by the expense's MCC (Merchant Category Code). Each MCC supports one of Expensify.org's funds: Climate Justice, Food Security, Housing Equity, Reentry Services, and Youth Advocacy.
+
+##  What is Corporate Karma?
+
+Corporate Karma is for companies that want to engage in social responsibility. Each month, the donation is calculated based on the total amount of all approved expense reports, including invoices, across all Workspace. 
+
+For every $500 your team spends monthly, your company will donate $1 to a related Expensify.org fund. Expensify will charge the payment card on file for the donation amount each month, and you’ll receive a donation receipt via email.
+
+The fund to which your Corporate Karma goes is determined by the expense's MCC (Merchant Category Code). Each MCC supports one of Expensify.org's funds: Climate Justice, Food Security, Housing Equity, Reentry Services, and Youth Advocacy.
+
+{% include faq-begin.md %}
+
+**How do I opt-in to Personal or Corporate Karma donations?**
+
+You can donate Personal and Corporate Karma to Expensify.org in your company or personal workspace settings. 
+
+Go to **Settings** > **Workspaces** > click on your Individual or Group workspace settings and Opt-in to Karma donations. 
+
+{% include faq-end.md %}

docs/articles/new-expensify/connections/xero/Connect-to-Xero.md

@@ -5,10 +5,10 @@ order: 1
 ---
 
 {% include info.html %}
-To use the Xero connection, you must have a Xero account and an Expensify Collect plan.
+You must have a Xero account and an Expensify Collect plan to use the Xero connection.
 {% include end-info.html %}
 
-To set up your Xero connection, complete the 4 steps below.
+To set up your Xero connection, complete the steps below.
 
 # Step 1: Connect Expensify to Xero
 
@@ -29,68 +29,6 @@ To set up your Xero connection, complete the 4 steps below.
 
 ![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. 
-
-<ol type="a">
-   <li>Under the Accounting settings for your workspace, click <b>Import</b> under the Xero connection.</li>
-   <li>Select an option for each of the following settings to determine what information will be imported from Xero into Expensify:</li>
-       <ul>
-           <li><b>Xero organization</b>: Select which Xero organization your Expensify workspace is connected to. Each organization can only be connected to one workspace at a time.</li>
-           <li><b>Chart of Accounts</b>: Your Xero chart of accounts and any accounts marked as “Show In Expense Claims” will be automatically imported into Expensify as Categories. This cannot be amended.</li>
-           <li><b>Tracking Categories</b>: Choose whether to import your Xero categories for cost centers and regions as tags in Expensify.</li>
-           <li><b>Re-bill Customers</b>: When enabled, Xero customer contacts are imported into Expensify as tags for expense tracking. After exporting to Xero, tagged billable expenses can be included on a sales invoice to your customer.</li>
-           <li><b>Taxes</b>: Choose whether to import tax rates and tax defaults from Xero.</li>
-       </ul>  
-</ol>
-
-# Step 3: Configure export settings
-The following steps help you determine how data will be exported from Expensify to Xero.
-
-<ol type="a">
-   <li>Under the Accounting settings for your workspace, click <b>Export</b> under the Xero connection.</li>
-   <li>Review each of the following export settings:</li>
-       <ul>
-           <li><b>Preferred Exporter</b>: Choose whether to assign a Workspace Admin as the Preferred Exporter. Once selected, the Preferred Exporter automatically receives reports for export in their account to help automate the exporting process.</li>
-       </ul>  
-</ol> 
-{% include info.html %}
-- Other Workspace Admins will still be able to export to Xero. 
-- If you set different export accounts for individual company cards under your domain settings, then your Preferred Exporter must be a Domain Admin.
-{% include end-info.html %}
-
-<ol type="a">
-      <ul>
-           <li><b>Export Out-of-Pocket Expenses as</b>: All out-of-pocket expenses will be exported as purchase bills. This cannot be amended.</li>
-           <li><b>Purchase Bill Date</b>: Choose whether to use the date of last expense, export date, or submitted date.</li>
-           <li><b>Export invoices as</b>: All invoices exported to Xero will be as a sales invoice. This cannot be amended.</li>
-           <li><b>Export company card expenses as</b>: All company card expenses export to Xero as bank transactions. This cannot be amended.</li>
-           <li><b>Xero Bank Account</b>: Select which bank account will be used to post bank transactions when non-reimbursable expenses are exported.</li>
-      </ul>
-</ol>
-
-# Step 4: Configure advanced settings
-
-The following steps help you determine the advanced settings for your connection, like auto-sync.
-
-<ol type="a">
-   <li>Under the Accounting settings for your workspace, click <b>Advanced</b> under the Xero connection.</li>
-   <li>Select an option for each of the following settings:</li>
-      <ul>
-           <li><b>Auto-sync</b>: Choose whether to enable Xero to automatically communicate 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. Once you’ve added a business bank account for ACH reimbursement, any reimbursable expenses will be sent to Xero automatically when the report is reimbursed. For non-reimbursable reports, Expensify automatically queues the report to export to Xero after it has completed the approval workflow in Expensify.</li>
-           <li><b>Set Purchase Bill Status</b>: Choose the status of your purchase bills:</li>
-              <ul>
-                 <li>Draft</li>
-                 <li>Awaiting Approval</li>
-                 <li>Awaiting Payment</li>                
-              </ul>
-           <li><b>Sync Reimbursed Reports</b>: Choose whether to enable report syncing for reimbursed expenses. If enabled, all reports that are marked as Paid in Xero will also show in Expensify as Paid. If enabled, you must also select the Xero account that reimbursements are coming out of, and Expensify will automatically create the payment in Xero.</li>
-           <li><b>Xero Bill Payment Account</b>: If you enable Sync Reimbursed Reports, you must select the Xero Bill Payment account your reimbursements will come from.</li>
-           <li><b>Xero Invoice Collections Account</b>: If you are exporting invoices from Expensify, select the invoice collection account that you want invoices to appear under once they are marked as paid.</li>
-      </ul>
-</ol>
-
 {% include faq-begin.md %}
 
 **How do I disconnect Xero from Expensify?**
@@ -99,7 +37,7 @@ The following steps help you determine the advanced settings for your connection
 2. Scroll down and click **Workspaces** in the left menu. 
 3. Select the workspace you want to disconnect from Xero. 
 4. Click **Accounting** in the left menu.
-5. Click the three dot menu icon to the right of Xero and select **Disconnect**.
+5. Click the three-dot menu icon to the right of Xero and select **Disconnect**.
 6. Click **Disconnect** to confirm. 
 
 You will no longer see the imported options from Xero.

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.54</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.52.0</string>
+	<string>9.0.54.0</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>