Merge branch 'main' into @szymczak/chat-filter-is

.github/actions/composite/buildAndroidE2EAPK/action.yml

@@ -56,9 +56,8 @@ runs:
         distribution: "oracle"
         java-version: "17"
 
-    - uses: ruby/setup-ruby@v1.187.0
+    - uses: ruby/setup-ruby@v1.190.0
       with:
-        ruby-version: "2.7"
         bundler-cache: true
 
     - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef

.github/workflows/platformDeploy.yml

@@ -60,9 +60,8 @@ jobs:
           java-version: '17'
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.187.0
+        uses: ruby/setup-ruby@v1.190.0
         with:
-          ruby-version: '2.7'
           bundler-cache: true
 
       - name: Decrypt keystore
@@ -186,9 +185,8 @@ jobs:
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.187.0
+        uses: ruby/setup-ruby@v1.190.0
         with:
-          ruby-version: '2.7'
           bundler-cache: true
 
       - name: Cache Pod dependencies

.github/workflows/testBuild.yml

@@ -87,9 +87,8 @@ jobs:
           java-version: '17'
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.187.0
+        uses: ruby/setup-ruby@v1.190.0
         with:
-          ruby-version: '2.7'
           bundler-cache: true
 
       - name: Decrypt keystore
@@ -161,9 +160,8 @@ jobs:
         run: sudo xcode-select -switch /Applications/Xcode_15.2.0.app
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.187.0
+        uses: ruby/setup-ruby@v1.190.0
         with:
-          ruby-version: '2.7'
           bundler-cache: true
 
       - name: Cache Pod dependencies

.ruby-version

@@ -0,0 +1 @@
+3.3.4

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby ">= 2.6.10"
+ruby ">= 3.3.4"
 
 gem "cocoapods", "= 1.15.2"
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'

Gemfile.lock

@@ -299,7 +299,7 @@ DEPENDENCIES
   xcpretty (~> 0)
 
 RUBY VERSION
-   ruby 2.6.10p210
+   ruby 3.3.4p94
 
 BUNDLED WITH
    2.4.19

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009002701
-        versionName "9.0.27-1"
+        versionCode 1009002900
+        versionName "9.0.29-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"

contributingGuides/CONTRIBUTING.md

@@ -31,6 +31,15 @@ This project and everyone participating in it is governed by the Expensify [Code
 ## Restrictions
 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**.
+
+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 contributors@expensify.com with the subject `Slack Channel Invites`. We'll send you an invite! 
+
+Note: Do not send direct messages to the Expensify team in Slack or Expensify Chat, they will not be able to respond. 
+
+Note: if you are hired for an Upwork job and have any job-specific questions, please ask in the GitHub issue or pull request. This will ensure that the person addressing your question has as much context as possible.
+
 ## Reporting Vulnerabilities
 If you've found a vulnerability, please email security@expensify.com with the subject `Vulnerability Report` instead of creating an issue.
 

desktop/package.json

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

docs/articles/expensify-classic/expensify-billing/Billing-Overview.md

@@ -21,7 +21,7 @@ The pay-per-use rate is the full rate per active member without any discounts. T
 ## How the Expensify Card can reduce your bill
 Bundling the Expensify Card with an annual subscription ensures you pay the lowest possible monthly price for Expensify. And the more you spend on Expensify Cards, the lower your bill will be.
 
-If at least 50% of your approved USD spend in a given month is on your company’s Expensify Cards, you will receive an additional 50% discount on the price per member. This additional 50% discount, when coupled with an annual subscription, brings the price per member to $5 on a Collect plan and $9 on a Control plan.
+If at least 50% of your total settled US spend in a given month is on your company’s Expensify Cards, you will receive an additional 50% discount on the price per member. This additional 50% discount, when coupled with an annual subscription, brings the price per member to $5 on a Collect plan and $9 on a Control plan.
 
 Additionally, every month, you receive 1% cash back on all Expensify Card purchases, and 2% if the spend across your Expensify Cards is $250k or more (_applies to US purchases only_). Any cash back from the Expensify Card is first applied to your Expensify bill, further reducing your price per member. Any leftover cash back is deposited directly into your connected bank account.
 ## Savings calculator
@@ -30,11 +30,11 @@ To see how much money you can save (and even earn!) by using the Expensify Card,
 {% include faq-begin.md %}
 
 ## What if we put less than 50% of our total spend on the Expensify Card?
-If less than 50% of your total USD spend is on the Expensify Card, the bill is discounted on a sliding scale.
+If less than 50% of your total settled US spend in a given month is on the Expensify Card, your bill is discounted on a sliding scale.
 
 **Example:**
 - Annual subscription discount: 50%
-- % of Expensify Card spend (US purchases only) across all workspaces: 20% 
+- % of total settled Expensify Card spend (US purchases only) across all workspaces: 20% 
 - Expensify Card discount: 20%
 
 In that case, you'd save 70% on the price per member for that month's bill.

docs/articles/expensify-classic/expensify-billing/Receipt-Breakdown.md

@@ -18,7 +18,7 @@ The top section will show the total amount you paid as the billing owner of Expe
 ## How-to reduce your bill and get paid to use Expensify
 Chances are you can actually get paid to use Expensify with the Expensify Card. In this section of the receipt, we outline how much money you're leaving on the table by not using the Expensify Card. You can click `Get started` to connect with your account manager (if you have one) or Concierge, both of whom can help get you started with the card.  
 
-_Note: Currently, we offer Expensify Cards to companies with USD bank accounts._ 
+_Note: Currently, we offer Expensify Cards to companies with US bank accounts._ 
 
 ## How-to understand your billing breakdown 
 Your receipt will have a detailed breakdown of activity and discounts across all workspaces. Here's a description of items that may appear on your bill:
@@ -34,12 +34,10 @@ Your receipt will have a detailed breakdown of activity and discounts across all
   - Any members included in your annual subscription on the Collect plan. 
 - [Number of] Pay-per-use Collect members @ $20.00
   - Any members above your annual subscription size on the Collect plan. These members are billed at the pay-per-use rate.
-- [Number of] Free members @ $0.00
-  - All members across any of your Free workspaces.
 - X% Expensify Card discount with $Y spend
-  - This shows the % discount you're getting based on total approved spend across your Expensify Cards. This is only available in the US.
+  - The % discount you're getting based on total settled US purchases across your Expensify Cards.
 - X% Expensify Card cash back credit for $Y spend
-  - The amount of cash back you've earned based on total approved spend across your Expensify Cards. This is only available in the US.
+  - The amount of cash back you've earned based on total settled US purchases across your Expensify Cards.
 - 50% ExpensifyApproved! partner discount
   - If you're part of an accounting firm, you get an additional discount for being our partner. [Learn more about our ExpensifyApproved! accountants program.](https://use.expensify.com/accountants-program) 
 - Total 

docs/articles/expensify-classic/expensify-card/Expensify-Card-Perks.md

@@ -7,7 +7,7 @@ description: An overview of all the various perks the Expensify Card offers
 ### Cashback
 Get 1% cash back with every swipe — no minimums necessary — and 2% back if you spend $250k+/month across cards.
 
-This applies to USD purchases only.
+This applies to US purchases only.
 
 ### Discounts on Monthly Expensify Bill
 Get the Expensify Visa® Commercial Card and use it for at least half of your organization's monthly expenses to save 50% on your monthly Expensify bill.