Merge main to resolve merge conflicts

.github/ISSUE_TEMPLATE/Standard.md

@@ -10,6 +10,7 @@ ___
 **Version Number:**
 **Reproducible in staging?:**
 **Reproducible in production?:**
+**If this was caught on HybridApp, is this reproducible on New Expensify Standalone?:**
 **If this was caught during regression testing, add the test name, ID and link from TestRail:**
 **Email or phone of affected tester (no customers):**
 **Logs:** https://stackoverflow.com/c/expensify/questions/4856
@@ -34,9 +35,11 @@ Can the user still use Expensify without this being fixed? Have you informed the
 Check off any platforms that are affected by this issue
 --->
 Which of our officially supported platforms is this issue occurring on?
-- [ ] Android: Native
+- [ ] Android: Standalone
+- [ ] Android: HybridApp
 - [ ] Android: mWeb Chrome
-- [ ] iOS: Native
+- [ ] iOS: Standalone
+- [ ] iOS: HybridApp
 - [ ] iOS: mWeb Safari
 - [ ] MacOS: Chrome / Safari
 - [ ] MacOS: Desktop

.github/workflows/cla.yml

@@ -4,39 +4,9 @@ on:
   issue_comment:
     types: [created]
   pull_request_target:
-    types: [opened, synchronize]
+    types: [opened, closed, synchronize]
 
 jobs:
   CLA:
-    runs-on: ubuntu-latest
-    # This job only runs for pull request comments or pull request target events (not issue comments)
-    # It does not run for pull requests created by OSBotify
-    if: ${{ github.event.issue.pull_request || (github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'OSBotify' && github.event.pull_request.user.login != 'imgbot[bot]') }}
-    steps:
-        - name: CLA comment check
-          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
-          id: sign
-          with:
-            text: ${{ github.event.comment.body }}
-            regex: '\s*I have read the CLA Document and I hereby sign the CLA\s*'
-        - name: CLA comment re-check
-          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
-          id: recheck
-          with:
-            text: ${{ github.event.comment.body }}
-            regex: '\s*recheck\s*'
-        - name: CLA Assistant
-          if: ${{ steps.recheck.outputs.match != '' || steps.sign.outputs.match != '' || github.event_name == 'pull_request_target' }}
-          # Version: 2.1.2-beta
-          uses: cla-assistant/github-action@948230deb0d44dd38957592f08c6bd934d96d0cf
-          env:
-              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_BOTIFY_TOKEN }}
-          with:
-              path-to-signatures: '${{ github.repository }}/cla.json'
-              path-to-document: 'https://github.com/${{ github.repository }}/blob/main/contributingGuides/CLA.md'
-              branch: 'main'
-              remote-organization-name: 'Expensify'
-              remote-repository-name: 'CLA'
-              lock-pullrequest-aftermerge: false
-              allowlist: OSBotify,snyk-bot
+    uses: Expensify/GitHub-Actions/.github/workflows/cla.yml@main
+    secrets: inherit

.github/workflows/e2ePerformanceTests.yml

@@ -46,7 +46,7 @@ jobs:
         uses: ./.github/actions/javascript/getArtifactInfo
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
-          ARTIFACT_NAME: baseline-${{ steps.getMostRecentRelease.outputs.VERSION }}-android-artifact-apk
+          ARTIFACT_NAME: baseline-${{ steps.getMostRecentRelease.outputs.VERSION }}android-artifact-apk
 
       - name: Skip build if there's already an existing artifact for the baseline
         if: ${{ fromJSON(steps.checkForExistingArtifact.outputs.ARTIFACT_FOUND) }}

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004900
-        versionName "9.0.49-0"
+        versionCode 1009005101
+        versionName "9.0.51-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"

contributingGuides/CONTRIBUTING.md

@@ -32,9 +32,9 @@ This project and everyone participating in it is governed by the Expensify [Code
 At this time, we are not hiring contractors in Crimea, North Korea, Russia, Iran, Cuba, or Syria.
 
 ## Slack channels
-All contributors should be a member of a shared Slack channel called [#expensify-open-source](https://expensify.slack.com/archives/C01GTK53T8Q) -- this channel is used to ask **general questions**, facilitate **discussions**, and make **feature requests**.
+We have a shared Slack channel called #expensify-open-source — this channel is used to ask general questions, facilitate discussions, and make feature requests.
 
-Before requesting an invite to Slack, please ensure your Upwork account is active, since we only pay via Upwork (see [below](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#payment-for-contributions)). To request an invite to Slack, email [email protected] with the subject `Slack Channel Invites`. We'll send you an invite! 
+That said, we have a small issue with adding users at the moment and we’re working with Slack to try and get this resolved. If you would like to join, [fill out this form](https://forms.gle/Q7hnhUJPnQCK7Fe56) with your email and Upwork profile link. Once resolved, we’ll add you.
 
 Note: Do not send direct messages to the Expensify team in Slack or Expensify Chat, they will not be able to respond. 
 

contributingGuides/OFFLINE_UX.md

@@ -85,7 +85,7 @@ When the user is offline:
        - In the event that `successData` and `failureData` are the same, you can use a single object `finallyData` in place of both. 
 
 **Handling errors:**
-- The [OfflineWithFeedback component](https://github.com/Expensify/App/blob/main/src/components/OfflineWithFeedback.js) already handles showing errors too, as long as you pass the error field in the [errors prop](https://github.com/Expensify/App/blob/128ea378f2e1418140325c02f0b894ee60a8e53f/src/components/OfflineWithFeedback.js#L29-L31)
+- The [OfflineWithFeedback component](https://github.com/Expensify/App/blob/main/src/components/OfflineWithFeedback.tsx) already handles showing errors too, as long as you pass the error field in the [errors prop](https://github.com/Expensify/App/blob/128ea378f2e1418140325c02f0b894ee60a8e53f/src/components/OfflineWithFeedback.js#L29-L31)
 - The behavior for when something fails is:
     - If you were adding new data, the failed to add data is displayed greyed out and with the button to dismiss the error
     - If you were deleting data, the failed data is displayed regularly with the button to dismiss the error

desktop/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
-    "electron-updater": "^6.3.7",
+    "electron-updater": "^6.3.8",
     "mime-types": "^2.1.35",
     "node-machine-id": "^1.1.12"
   },

docs/articles/expensify-classic/bank-accounts-and-payments/payments/Pay-Bills.md → docs/articles/expensify-classic/bank-accounts-and-payments/payments/Create-and-Pay-Bills.md

@@ -1,26 +1,26 @@
 ---
-title: Pay Bills
+title: Create and Pay Bills
 description: Expensify bill management and payment methods.
 ---
 Streamline your operations by receiving and paying vendor or supplier bills directly in Expensify. Vendors can send bills even if they don't have an Expensify account, and you can manage payments seamlessly.
 
-## Receive Bills in Expensify
+# Receive Bills in Expensify
 You can receive bills in three ways:
 - Directly from Vendors: Provide your Expensify billing email to vendors.
 - Forwarding Emails: Forward bills received in your email to Expensify.
 - Manual Upload: For physical bills, create a Bill in Expensify from the Reports page.
 
-## Bill Pay Workflow
+# Bill Pay Workflow
 1. When a vendor or supplier sends a bill to Expensify, the document is automatically SmartScanned, and a Bill is created. This Bill is managed by the primary domain contact, who can view it on the Reports page within their default group policy.
 
 2. Once the Bill is ready for processing, it follows the established approval workflow. As each person approves it, the Bill appears in the next approver’s Inbox. The final approver will pay the Bill using one of the available payment methods.
 
 3. During this process, the Bill is coded with the appropriate GL codes from your connected accounting software. After completing the approval workflow, the Bill can be exported back to your accounting system.
 
-## Payment Methods
+# Payment Methods
 There are multiple ways to pay Bills in Expensify. Let’s go over each method below. 
 
-### ACH bank-to-bank transfer
+## ACH bank-to-bank transfer
 
 To use this payment method, you must have a [business bank account connected to your Expensify account](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account).
 
@@ -32,7 +32,7 @@ To use this payment method, you must have a [business bank account connected to
 
 **Fees:** None
 
-### Credit or Debit Card
+## Credit or Debit Card
 This option is available to all US and International customers receiving a bill from a US vendor with a US business bank account. 
 
 **To pay with a credit or debit card:**
@@ -43,13 +43,13 @@ This option is available to all US and International customers receiving a bill
 
 **Fees:** 2.9% of the total amount paid.
 
-### Venmo
+## Venmo
 If both you and the vendor must have Venmo connected to Expensify, you can pay the bill by following the steps outlined [here](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Third-Party-Payments#setting-up-third-party-payments).
 
 **Fees:** Venmo charges a 3% sender’s fee.
 
 
-### Pay outside of Expensify 
+## Pay outside of Expensify 
 If you are unable to pay using one of the above methods, you can still mark the Bill as paid. This will update its status to indicate that the payment was made outside Expensify. 
 
 **To mark a Bill as paid outside of Expensify:**