Merge branch 'main' into fix-24445-undo-delete-message

.github/actions/composite/buildAndroidAPK/action.yml

@@ -13,7 +13,7 @@ runs:
 
     - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
       with:
-        ruby-version: '2.7'
+        ruby-version: "2.7"
         bundler-cache: true
 
     - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
@@ -26,4 +26,4 @@ runs:
       uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05
       with:
         name: ${{ inputs.ARTIFACT_NAME }}
-        path: android/app/build/outputs/apk/e2eRelease/app-e2eRelease.apk
+        path: android/app/build/outputs/apk/e2e/release/app-e2e-release.apk

.github/actions/javascript/getPullRequestDetails/action.yml

@@ -13,8 +13,14 @@ inputs:
 outputs:
   MERGE_COMMIT_SHA:
     description: 'The merge_commit_sha of the given pull request'
+  HEAD_COMMIT_SHA:
+    description: 'The head_commit_sha of the given pull request'
   MERGE_ACTOR:
     description: 'The actor who merged the pull request'
+  IS_MERGED:
+    description: 'True if the pull request is merged'
+  FORKED_REPO_URL:
+    description: 'Output forked repo URL if PR includes changes from a fork'
 runs:
   using: 'node16'
   main: './index.js'

.github/workflows/e2ePerformanceTests.yml

@@ -84,12 +84,7 @@ jobs:
       - name: Unmerged PR - Fetch head ref of unmerged PR
         if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
         run: |
-          if [[ ${{ steps.getPullRequestDetails.outputs.FORKED_REPO_URL }} != '' ]]; then
-            git remote add pr_remote ${{ steps.getPullRequestDetails.outputs.FORKED_REPO_URL }}
-            git fetch pr_remote ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} --no-tags --depth=1
-          else
-            git fetch origin ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} --no-tags --depth=1
-          fi
+          git fetch origin ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} --no-tags --depth=1
 
       - name: Unmerged PR - Set dummy git credentials before merging
         if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
@@ -101,7 +96,7 @@ jobs:
         if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
         id: getMergeCommitShaIfUnmergedPR
         run: |
-          git merge --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
+          git merge --allow-unrelated-histories --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
           git checkout ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -140,18 +135,19 @@ jobs:
           name: baseline-apk-${{ needs.buildBaseline.outputs.VERSION }}
           path: zip
 
-      # The downloaded artifact will be a file named "app-e2eRelease.apk" so we have to rename it
+      # The downloaded artifact will be a file named "app-e2e-release.apk" so we have to rename it
       - name: Rename baseline APK
-        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk"
+        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk"
 
       - name: Download delta APK
         uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
+        id: downloadDeltaAPK
         with:
           name: delta-apk-${{ needs.buildDelta.outputs.DELTA_REF }}
           path: zip
 
       - name: Rename delta APK
-        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-compare.apk"
+        run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2eRelease-compare.apk"
 
       - name: Copy e2e code into zip folder
         run: cp -r tests/e2e zip

.storybook/preview.js

@@ -6,7 +6,7 @@ import './fonts.css';
 import ComposeProviders from '../src/components/ComposeProviders';
 import HTMLEngineProvider from '../src/components/HTMLEngineProvider';
 import OnyxProvider from '../src/components/OnyxProvider';
-import {LocaleContextProvider} from '../src/components/withLocalize';
+import {LocaleContextProvider} from '../src/components/LocaleContextProvider';
 import {KeyboardStateProvider} from '../src/components/withKeyboardState';
 import {EnvironmentProvider} from '../src/components/withEnvironment';
 import {WindowDimensionsProvider} from '../src/components/withWindowDimensions';

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

@@ -75,6 +75,10 @@
                     {
                         "/": "/teachersunite/*",
                         "comment": "Teachers Unite!"
+                    },
+                    {
+                        "/": "/search/*",
+                        "comment": "Search"
                     }
                 ]
             }

android/app/build.gradle

@@ -58,7 +58,7 @@ project.ext.envConfigFiles = [
     adhocRelease: ".env.adhoc",
     developmentRelease: ".env",
     developmentDebug: ".env",
-    e2eRelease: ".env.production"
+    e2eRelease: "tests/e2e/.env.e2e"
 ]
 
 /**
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001037403
-        versionName "1.3.74-3"
+        versionCode 1001037502
+        versionName "1.3.75-2"
     }
 
     flavorDimensions "default"
@@ -136,10 +136,20 @@ android {
             signingConfig signingConfigs.debug
         }
         release {
-            signingConfig signingConfigs.release
             productFlavors.production.signingConfig signingConfigs.release
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+
+            signingConfig null
+            // buildTypes take precedence over productFlavors when it comes to the signing configuration,
+            // thus we need to manually set the signing config, so that the e2e uses the debug config again.
+            // In other words, the signingConfig setting above will be ignored when we build the flavor in release mode. 
+            productFlavors.all { flavor ->
+                // All release builds should be signed with the release config ...
+                flavor.signingConfig signingConfigs.release
+            }
+            // ... except for the e2e flavor, which we maybe want to build locally:
+            productFlavors.e2e.signingConfig signingConfigs.debug
         }
     }
 

android/app/src/main/AndroidManifest.xml

@@ -67,6 +67,7 @@
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/split"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/new"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/search"/>
 
                 <!-- Staging URLs -->
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
@@ -83,6 +84,7 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/split"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/new"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/search"/>
             </intent-filter>
         </activity>
 

docs/articles/expensify-classic/account-settings/Account-Details.md

@@ -0,0 +1,5 @@
+---
+title: Account Details
+description: Account Details
+---
+## Resource Coming Soon!

docs/articles/expensify-classic/get-paid-back/expenses/Create-Expenses.md

@@ -48,11 +48,11 @@ You can also create a number of future 'placeholder' expenses for your recurring
 # How to Edit Bulk Expenses
 Editing expenses in bulk will allow you to apply the same coding across multiple expenses and is a web-only feature. To bulk edit expenses:
 Go to the Expenses page.
-To narrow down your selection, use the filters (e.g. "Merchant" and "Open") to find the specific expenses you want to edit.
+To narrow down your selection, use the filters (e.g. "Merchant" and "Draft") to find the specific expenses you want to edit.
 Select all the expenses you want to edit.
 Click on the **Edit Multiple** button at the top of the page. 
 # How to Edit Expenses on a Report
-If you’d like to edit expenses within an Open report:
+If you’d like to edit expenses within a Draft report:
 
 1. Click on the Report containing all the expenses. 
 2. Click on **Details**.
@@ -61,8 +61,8 @@ If you’d like to edit expenses within an Open report:
 
 If you've already submitted your report, you'll need to Retract it or have it Unapproved first before you can edit the expenses.
 
-
 # FAQ
+
 ## Does Expensify account for duplicates?
 
 Yes, Expensify will account for duplicates. Expensify works behind the scenes to identify duplicate expenses before they are submitted, warning employees when they exist. If a duplicate expense is submitted, the same warning will be shown to the approver responsible for reviewing the report. 
@@ -71,6 +71,7 @@ If two expenses are SmartScanned on the same day for the same amount, they will
 The expenses were split from a single expense, 
 The expenses were imported from a credit card, or
 Matching email receipts sent to [email protected] were received with different timestamps. 
+
 ## How do I resolve a duplicate expense?
 
 If Concierge has let you know it's flagged a receipt as a duplicate, scanning the receipt again will trigger the same duplicate flagging.Users have the ability to resolve duplicates by either deleting the duplicated transactions, merging them, or ignoring them (if they are legitimately separate expenses of the same date and amount). 
@@ -88,21 +89,23 @@ Click the **Undelete** button and you're all set. You’ll find the expense on y
 ## What are the different Expense statuses?
 
 There are a number of different expense statuses in Expensify:
-1. **Unreported**: Unreported expenses are not yet part of a report (and therefore unsubmitted) and are not viewable by anyone but the expense creator/owner.
-2. **Open**: Open expenses are on a report that's still in progress, and are unsubmitted. Your Policy Admin will be able to view them, making it a collaborative step toward reimbursement.
+1. **Personal**: Personal expenses are not yet part of a report (and therefore unsubmitted) and are not viewable by anyone but the expense creator/owner.
+2. **Draft**: Draft expenses are seen as still in progress, and are unsubmitted. Your Policy Admin will be able to view them, making this a collaborative step toward reimbursement.
 3. **Processing**: Processing expenses are submitted, but waiting for approval.
 4. **Approved**: If it's a non-reimbursable expense, the workflow is complete at this point. If it's a reimbursable expense, you're one step closer to getting paid.
 5. **Reimbursed**: Reimbursed expenses are fully settled. You can check the Report Comments to see when you'll get paid.
 6. **Closed**: Sometimes an expense accidentally ends up on your Individual Policy, falling into the Closed status. You’ll need to reopen the report and change the Policy by clicking on the **Details** tab in order to resubmit your report.
+
 ## What are Violations?
 
 Violations represent errors or discrepancies that Expensify has picked up and need to be corrected before a report can be successfully submitted. The one exception is when an expense comment is added, it will override the violation - as the user is providing a valid reason for submission.
 
 To enable or configure violations according to your policy, go to **Settings > Policies > _Policy Name_ > Expenses > Expense Violations**. Keep in mind that Expensify includes certain system mandatory violations that can't be disabled, even if your policy has violations turned off.
 
 You can spot violations by the exclamation marks (!) attached to expenses. Hovering over the symbol will provide a brief description and you can find more detailed information below the list of expenses. The two types of violations are:
-**Red**: These indicate violations directly tied to your report's Policy settings. They are clear rule violations that must be addressed before submission.
-**Yellow**: Concierge will highlight items that require attention but may not necessarily need corrective action. For example, if a receipt was SmartScanned and then the amount was modified, we’ll bring it to your attention so that it can be manually reviewed.
+1. **Red**: These indicate violations directly tied to your report's Policy settings. They are clear rule violations that must be addressed before submission.
+2. **Yellow**: Concierge will highlight items that require attention but may not necessarily need corrective action. For example, if a receipt was SmartScanned and then the amount was modified, we’ll bring it to your attention so that it can be manually reviewed.
+
 ## How to Track Attendees
 
 Attendee tracking makes it easy to track shared expenses and maintain transparency in your group spending. 
@@ -116,9 +119,10 @@ External attendees are considered users outside your group policy or domain. To
 1. Click or tap the **Attendee** field within your expense.
 2. Type in the individual's name or email address.
 3. Tap **Add** to include the attendee.
-You can continue adding more attendees or save the Expense.
+4. You can continue adding more attendees or save the Expense.
+
 To remove an attendee from an expense:
-Open the expense.
-Click or tap the **Attendees** field to display the list of attendees.
-From the list, de-select the attendees you'd like to remove from the expense.
 
+1. Open the expense.
+2. Click or tap the **Attendees** field to display the list of attendees.
+3. From the list, de-select the attendees you'd like to remove from the expense.

docs/articles/expensify-classic/get-paid-back/expenses/Merge-Expenses.md

@@ -14,7 +14,7 @@ Keep in mind:
 1. Merging expenses cannot be undone.
 2. You can only merge two expenses at a time.
 3. You can merge a cash expense with a credit card expense, or two cash expenses - but not two credit card expenses.
-4. In order to merge, both expenses will need to be in an Open or Unreported state.
+4. In order to merge, both expenses will need to be in a Personal or Draft status.
 
 # How to merge expenses on the web app
 To merge two expenses from the Expenses page:
@@ -41,11 +41,12 @@ If the expenses exist on two different reports, you will be asked which report y
 
 ## Can you merge expenses across different reports?
 
-You cannot merge expenses across different reports. Expenses will only merge if they are on the same report. If you have expenses across different reports that you wish to merge, you’ll need to move both expenses onto the same report (and ensure they are in the Open status) in order to merge them.
+You cannot merge expenses across different reports. Expenses will only merge if they are on the same report. If you have expenses across different reports that you wish to merge, you’ll need to move both expenses onto the same report (and ensure they are in the Draft status) in order to merge them.
 
 ## Can you merge expenses across different accounts?
 
 You cannot merge expenses across two separate accounts. You will need to choose one submitter and transfer the expense information to that user's account in order to merge the expense.
+
 ## Can you merge expenses with different currencies?
 
 Yes, you can merge expenses with different currencies. The conversion amount will be based on the daily exchange rate for the date of the transaction, as long as the converted rates are within +/- 5%. If the currencies are the same, then the amounts must be an exact match to merge.

docs/articles/expensify-classic/manage-employees-and-report-approvals/User-Roles.md

@@ -9,34 +9,34 @@ This guide is for those who are part of a **Group Workspace**.
 
 Each member has a role that defines what they can see and do in the workspace. Most members will have the role of "Employee."
 
-# How to Manage User Roles
+# How to manage user roles
 
-To find and edit the roles of group workspace members, go to **Settings > Workspaces > Group > [Your Specific Workspace Name] > Members > Workspace Members**
+To find and edit the roles of group workspace members, go to **Settings > Workspaces > Group > _[Workspace Name]_ > Members > Workspace Members**
 
 Here you'll see the list of members in your group workspace. To change their roles, click **Settings** next to the member’s name and choose the role that the member needs.
 
 Next, let’s go over the various user roles that are available on a group workspace.
 
-## The Employee Role
+### The Employee Role
 
 - **What can they do:** Employees can only see their own expense reports or reports that have been submitted to or shared with them. They can't change settings or invite new users.
 - **Who is it for:** Regular employees who only need to manage their own expenses, or managers who are reviewing expense reports for a few users but don’t need global visibility. 
 - **Approvers:** Members who approve expenses can either be Employees, Admins, or Workspace Auditors, depending on how much control they need.
 - **Billable:** Employees are billable actors if they take actions on a report on your Group Workspace (including **SmartScanning** a receipt).
 
-## Workspace Admin Role
+### Workspace Admin Role
 
 - **What can they do:** Admins have full control. They can change settings, invite members, and view all reports. They can also process reimbursements if they have access to the company’s account.
 - **Billing Owners:** Billing owners are Admins by default. **Workspace Admins** are assigned by the owner or another admin.
 - **Billable:** Yes, if they perform actions like changing settings or inviting users. Just viewing reports is not billable.
 
-## Workspace Auditor Role
+### Workspace Auditor Role
 
 - **What can they do:** Workspace Auditors can see all reports, make comments, and export them. They can also mark reports as reimbursed if they're the final approver.
 - **Who is it for:** Accountants, bookkeepers, and internal or external audit agents who need to view but not edit workspace settings.
 - **Billable:** Yes, if they perform any actions like commenting or exporting a report. Viewing alone doesn't incur a charge.
 
-## Technical Contact
+### Technical Contact
 
 - **What can they do:** In case of connection issues, alerts go to the billing owner by default. You can set a technical contact if you want alerts to go to an IT administrator instead.
 - **How to set one:** Go to **Settings > Workspaces > Group > [Workspace Name] > Connections > Technical Contact**.