Merge branch 'main' into gedu/delete_comment_conflict_resolver

.github/workflows/buildAndroid.yml

@@ -20,11 +20,14 @@ on:
         description: The pull request number associated with this build, if relevant.
         type: string
         required: false
+
     outputs:
       AAB_FILE_NAME:
         value: ${{ jobs.build.outputs.AAB_FILE_NAME }}
       APK_FILE_NAME:
         value: ${{ jobs.build.outputs.APK_FILE_NAME }}
+      APK_ARTIFACT_NAME:
+        value: ${{ jobs.build.outputs.APK_ARTIFACT_NAME }}
 
   workflow_dispatch:
     inputs:
@@ -56,6 +59,7 @@ jobs:
     outputs:
       AAB_FILE_NAME: ${{ steps.build.outputs.AAB_FILE_NAME }}
       APK_FILE_NAME: ${{ steps.build.outputs.APK_FILE_NAME }}
+      APK_ARTIFACT_NAME: ${{ steps.build.outputs.APK_ARTIFACT_NAME }}
 
     steps:
       - name: Checkout
@@ -159,6 +163,7 @@ jobs:
               echo "APK_PATH=$apkPath"
               echo "APK_FILE_NAME=$(basename "$apkPath")"
               echo "SHOULD_UPLOAD_SOURCEMAPS=$SHOULD_UPLOAD_SOURCEMAPS"
+              echo "APK_ARTIFACT_NAME=${{ inputs.artifact-prefix }}android-artifact-apk" >> "$GITHUB_OUTPUT"
             } >> "$GITHUB_OUTPUT"    
 
       - name: Upload Android AAB artifact
@@ -174,7 +179,7 @@ jobs:
         continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.artifact-prefix }}android-artifact-apk
+          name: ${{ steps.build.outputs.APK_ARTIFACT_NAME }}
           path: ${{ steps.build.outputs.APK_PATH }}
 
       - name: Upload Android sourcemaps artifact

.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) }}
@@ -125,7 +125,7 @@ jobs:
         uses: actions/download-artifact@v4
         id: downloadBaselineAPK
         with:
-          name: baseline-${{ needs.prep.outputs.BASELINE_VERSION }}-android-artifact-apk
+          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 }}
@@ -139,7 +139,7 @@ jobs:
         uses: actions/download-artifact@v4
         id: downloadDeltaAPK
         with:
-          name: delta-${{ needs.prep.outputs.DELTA_REF }}-android-artifact-apk
+          name: ${{ needs.buildDelta.outputs.APK_ARTIFACT_NAME }}
           path: zip
 
       - name: Rename delta APK

android/app/build.gradle

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

desktop/package.json

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

docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md

@@ -8,7 +8,7 @@ You can choose to connect either a business deposit-only account that only recei
 
 | Business deposit-only account                     | Verified business account                            | 
 |---------------------------------------------------|------------------------------------------------------|
-| ✔ Receive reimbursements for invoices      | ✔ Reimburse expenses via direct bank transfer |
+| ✔ Receive payments for invoices      | ✔ Reimburse expenses via direct bank transfer |
 |                                                   | ✔ Pay bills                                   | 
 |                                                   | ✔ Issue Expensify Cards                       |
 

docs/articles/expensify-classic/bank-accounts-and-payments/payments/Pay-an-Invoice.md

@@ -0,0 +1,65 @@
+---
+title: Pay an Invoice
+description: A guide to different methods of paying an invoice
+---
+
+<div id="expensify-classic" markdown="1">
+
+There are multiple ways to pay Invoices in Expensify. Let’s go over each method below.
+
+# How to Pay Invoices 
+
+1. Sign in to your [Expensify web account](www.expensify.com).
+2. Click on the Invoice you’d like to pay to see the details.
+3. Click on the **Pay** button.
+4. Follow the prompts to pay through one of the following methods.
+
+### 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).
+
+**To pay with an ACH bank-to-bank transfer:** 
+1. Sign in to your [Expensify web account](www.expensify.com).
+2. Go to the **Home** or **Reports** page and locate the Invoice that needs to be paid.
+3. Click the **Pay** button to be redirected to the Invoice.
+4. Choose the ACH option from the drop-down list.
+
+**Fees:** None
+
+### Credit or Debit Card
+This option is available to all US and International customers receiving an invoice from a US vendor with a US business bank account. 
+
+**To pay with a credit or debit card:**
+1. Sign in to your [Expensify web account](www.expensify.com).
+2. Click on the Invoice you’d like to pay to see the details.
+3. Click the **Pay** button.
+4. Enter your credit card or debit card details. 
+
+**Fees:** 2.9% credit card payment fee.
+
+### Venmo
+If both you and the vendor must have Venmo connected to Expensify, you can pay the Invoice 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 and Paypal.me charges may apply. 
+
+
+### Pay outside of Expensify 
+If you are unable to pay using one of the above methods, you can still mark the Invoice as paid. This will update its status to indicate that the payment was made outside Expensify. 
+
+**To mark an Invoice as paid outside of Expensify:**
+1. Sign in to your [Expensify web account](www.expensify.com).
+2. Click on the Invoice you’d like to pay to see the details.
+3. Click the Pay button.
+4. Choose **I’ll do it manually**.
+
+**Fees:** None.
+
+{% include faq-begin.md %}
+
+## What’s the difference between an Invoice and an Expense Report in Expensify?
+An invoice is an expense submitted to a client or contractor for payment. An expense report is an expense/group of expenses submitted to an employer for reimbursement. 
+
+## What’s the difference between a Bill and an Invoice in Expensify?
+A Bill is an amount owed to a payee (usually a vendor or supplier) and is usually created from a vendor invoice. An Invoice is a receivable and indicates an amount owed to you by someone else. 
+
+{% include faq-end.md %}