fix merge main

.eslintrc.js

@@ -235,8 +235,21 @@ module.exports = {
         ],
     },
 
-    // Remove once no JS files are left
     overrides: [
+        // Enforces every Onyx type and its properties to have a comment explaining its purpose.
+        {
+            files: ['src/types/onyx/**/*.ts'],
+            rules: {
+                'jsdoc/require-jsdoc': [
+                    'error',
+                    {
+                        contexts: ['TSInterfaceDeclaration', 'TSTypeAliasDeclaration', 'TSPropertySignature'],
+                    },
+                ],
+            },
+        },
+
+        // Remove once no JS files are left
         {
             files: ['*.js', '*.jsx'],
             rules: {

.github/workflows/testGithubActionsWorkflows.yml

@@ -25,6 +25,13 @@ jobs:
       - name: Setup Homebrew
         uses: Homebrew/actions/setup-homebrew@master
 
+      - name: Login to GitHub Container Regstry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: OSBotify
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Install Act
         run: brew install act
 

.gitignore

@@ -37,6 +37,11 @@ local.properties
 android/app/src/main/java/com/expensify/chat/generated/
 .cxx/
 
+# VIM
+*.swp
+*.swo
+*~
+
 # Vscode
 .vscode
 

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001048009
-        versionName "1.4.80-9"
+        versionCode 1001048200
+        versionName "1.4.82-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"

docs/README.md

@@ -186,9 +186,18 @@ Just update the content for each variable accordingly or remove it if the inform
 Assume that we want to rename the article `The Free Plan` to `Freemium Features` for the hub `billing and plan types` in New Expensify platform.
 1. Go to `docs/articles/new-expensify/billing-and-plan-types`
 2. Rename `The-Free-Plan.md` to `Freemium-Features.md`. Use dashes for spaces in the file name.
+3. Add an entry in redirects.csv for the old article pointing to the new article.
 
 Note: It is important that the file has `.md` extension.
 
+# How to hide an article temporarily
+Video demo available [here 🧵](https://expensify.slack.com/archives/C02NK2DQWUX/p1717772272605829?thread_ts=1717523271.137469&cid=C02NK2DQWUX).
+1. Open github's in built code editor by pressing `.` on your keyboard. ([instructions here](https://docs.github.com/en/codespaces/the-githubdev-web-based-editor#opening-the-githubdev-editor))
+2. Go to the article that you want to hide `docs/articles/...`.
+3. Drag and drop the article inside the hidden folder `docs/Hidden/`.
+4. Add a redirect for it in `docs/redirects.csv` to ensure that we don't have broken links. You can choose to point it to the home page or the article's hub.
+5. Commit the changes and raise a PR.
+
 # How the site is deployed
 This site is hosted on Cloudflare pages. Whenever code is merged to main, the github action `deployExpensifyHelp` will run.
 

docs/_data/_routes.yml

@@ -71,7 +71,7 @@ platforms:
 
       - href: integrations
         title: Integrations
-        icon: /assets/images/workflow.svg
+        icon: /assets/images/simple-illustration__monitor-remotesync.svg
         description: Integrate with accounting or HR software to streamline expense approvals.
 
       - href: spending-insights
@@ -131,7 +131,7 @@ platforms:
 
       - href: connections
         title: Connections
-        icon: /assets/images/workflow.svg
+        icon: /assets/images/simple-illustration__monitor-remotesync.svg
         description: Connect to accounting software to streamline expense approvals.
 
       - href: settings

docs/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting.md

@@ -64,8 +64,9 @@ Make sure you're importing your card in the correct spot in Expensify and select
 Please note there are some things that cannot be bypassed within Expensify, including two-factor authentication being enabled within your bank account. This will prevent the connection from remaining stable and will need to be turned off on the bank side. 
 
 ## What are the most reliable bank connections in Expensify?*
-The most reliable corporate card to use with Expensify is the Expensify Visa® Commercial Card. We offer daily settlement, unapproved expense limits, and real-time compliance for secure and efficient spending, as well as 2% cash back (_Applies to USD purchases only._) Click here to learn more or apply.
-Additionally, we've teamed up with major banks worldwide to ensure a smooth import of credit card transactions into your accounts. Corporate cards from the following banks also offer the most dependable connections in Expensify:
+All bank connections listed below are extremely reliable, but we recommend transacting with the Expensify Visa® Commercial Card. It also offers daily and monthly settlement, unapproved expense limits, realtime compliance for secure and efficient spending, and cash back on all US purchases. [Click here to learn more about the Expensify Card](https://use.expensify.com/company-credit-card).
+
+We've also teamed up with major banks worldwide to ensure a smooth import of credit card transactions into your accounts:
 - American Express
 - Bank of America
 - Brex
@@ -75,7 +76,7 @@ Additionally, we've teamed up with major banks worldwide to ensure a smooth impo
 - Stripe
 - Wells Fargo
 
-Commercial feeds for company cards are the dependable connections in Expensify. If you have a corporate or commercial card account, you might have access to a daily transaction feed where expenses from Visa, MasterCard, and American Express are automatically sent to Expensify. Reach out to your banking relationship manager to check if your card program qualifies for this feature.
+Commercial feeds for company cards are the dependable connections in Expensify. If you have a corporate or commercial card account, you might have access to a daily transaction feed where expenses from Visa, Mastercard, and American Express are automatically sent to Expensify. Reach out to your banking relationship manager to check if your card program qualifies for this feature.
 
 # Troubleshooting American Express Business
 

docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-Small-To-Medium-Sized-Businesses.md

@@ -194,14 +194,11 @@ As mentioned above, we’ll be able to pull in transactions as they post (daily)
 ### If you don't have a corporate card, use the Expensify Card (US only)
 Expensify provides a corporate card with the following features:
 
-- Up to 2% cash back (_Applies to USD purchases only._)
-- [SmartLimits](https://help.expensify.com/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features) to control what each individual cardholder can spend
-- A stable, unbreakable real-time connection (third-party bank feeds can run into connectivity issues)
-- Receipt compliance - informing notifications (e.g. add a receipt!) for users *as soon as the card is swiped*
-- Unlimited Virtual Cards - single-purpose cards with a fixed or monthly limit for specific company purchases
-- A 50% discount on the price of all Expensify plans
-- Multiple discounts and savings on a host of partner tech suppliers 
-- Good Karma - 10% of all card interchange we earn goes directly to the Expensify.org Social Justice Community funds
+- Finish your expenses in a swipe, we'll take care of everything else
+- Get cash back on every US purchase and up to 50% off your monthly Expensify bill
+- Stay in control with realtime alerts, spend limits, and auto-reconciliation
+- Don't worry about credit checks, annual fees, or personal guarantees
+- Create unlimited virtual cards with fixed or monthly limits for specific purchases
 
 The Expensify Card is recommended as the most efficient way to manage your company's spending. 
 

docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-US-Based-VC-Backed-Startups.md

@@ -155,11 +155,12 @@ The Expensify Card has many benefits for your company. Two in particular are wor
 ### If you don't have a corporate card, use the Expensify Card
 Expensify provides a corporate card with the following features:
 
-- Up to 2% cash back (Applies to USD purchases only)
-- [SmartLimits](https://community.expensify.com/discussion/4851/deep-dive-what-are-unapproved-expense-limits#latest)
-- Unlimited Virtual Cards - single-purpose cards with a fixed or monthly limit for specific company purchases
-- A stable, unbreakable connection (third-party bank feeds can run into connectivity issues)
-
+- Finish your expenses in a swipe, we'll take care of everything else
+- Get cash back on every US purchase and up to 50% off your monthly Expensify bill
+- Stay in control with realtime alerts, spend limits, and auto-reconciliation
+- Don't worry about credit checks, annual fees, or personal guarantees
+- Create unlimited virtual cards with fixed or monthly limits for specific purchases
+
 The Expensify Card is recommended as the most efficient way to manage your company's spending.
 
 Here’s how to enable it:

docs/articles/new-expensify/settings/Add-profile-photo.md

@@ -0,0 +1,21 @@
+---
+title: Add profile photo
+description: Add an image to your profile
+---
+<div id="new-expensify" markdown="1">
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu. 
+2. Click the Edit pencil icon next to your profile image or icon and select **Upload Image** to choose a new image from your saved files.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon at the bottom of the screen. 
+2. Tap the Edit pencil icon next to your profile image or icon and select **Upload Image** to choose a new image from your saved files.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>

docs/articles/new-expensify/travel/Book-with-Expensify-Travel.md

@@ -0,0 +1,89 @@
+---
+title: Book with Expensify Travel
+description: Book flights, hotels, cars, trains, and more with Expensify Travel
+---
+<div id="expensify-classic" markdown="1">
+
+Expensify Travel allows members to search and book flights, hotels, cars, and trains globally at the most competitive rates available. 
+
+With Expensify Travel, you can:
+- Search and book travel arrangements all in one place
+- Book travel for yourself or for someone else
+- Get real-time support by chat or phone
+- Manage all your T&E expenses in Expensify
+- Create specific rules for booking travel
+- Enable approvals for out-of-policy trips
+- Book with any credit card on the market
+- Book with the Expensify Card to get cash back and automatically reconcile transactions
+
+There is a flat fee of $15 per trip booked. A single trip can include multiple bookings, such as a flight, a hotel, and a car rental.
+
+# Book travel
+
+To book travel from the Expensify web app,
+
+1. Click the **Travel** tab.
+2. Click **Book or manage travel**.
+3. Use the icons at the top to select the type of travel arrangement you want to book: flights, hotels, cars, or trains.
+4. Enter the travel information relevant to the travel arrangement selected (for example, the destination, dates of travel, etc.). 
+5. Select all the details for the arrangement you want to book.
+6. Review the booking details and click **Book Flight / Book Hotel / Book Car / Book Rail** to complete the booking.
+
+The traveler is emailed an itinerary of the booking. Additionally,  
+- Their travel details are added to a Trip chat room under their primary workspace. 
+- An expense report for the trip is created.
+- If booked with an Expensify Card, the trip is automatically reconciled.
+
+{% include info.html %}
+The travel itinerary is also emailed to the traveler’s [copilots](https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Assign-or-remove-a-Copilot), if applicable.
+{% include end-info.html %}
+
+</div>
+
+<div id="new-expensify" markdown="1">
+Expensify Travel allows members to search and book flights, hotels, cars, and trains globally at the most competitive rates available. 
+
+With Expensify Travel, you can:
+- Search and book travel arrangements all in one place
+- Book travel for yourself or for someone else
+- Get real-time support by chat or phone
+- Manage all your T&E expenses in Expensify
+- Create specific rules for booking travel
+- Enable approvals for out-of-policy trips
+- Book with any credit card on the market
+- Book with the Expensify Card to get cash back and automatically reconcile transactions
+
+There is a flat fee of $15 per trip booked. A single trip can include multiple bookings, such as a flight, a hotel, and a car rental.
+
+# Book travel
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click the + icon in the bottom left menu and select **Book travel**. 
+2. Click **Book or manage travel**.
+3. Agree to the terms and conditions and click **Continue**.
+4. Use the icons at the top to select the type of travel arrangement you want to book: flights, hotels, cars, or trains.
+5. Enter the travel information relevant to the travel arrangement selected (for example, the destination, dates of travel, etc.). 
+6. Select all the details for the arrangement you want to book.
+7. Review the booking details and click **Book Flight / Book Hotel / Book Car / Book Rail** to complete the booking. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap the + icon in the bottom menu and select **Book travel**. 
+2. Tap **Book or manage travel**.
+3. Agree to the terms and conditions and tap **Continue**.
+4. Use the icons at the top to select the type of travel arrangement you want to book: flights, hotels, cars, or trains.
+5. Enter the travel information relevant to the travel arrangement selected (for example, the destination, dates of travel, etc.). 
+6. Select all the details for the arrangement you want to book.
+7. Review the booking details and click **Book Flight / Book Hotel / Book Car / Book Rail** to complete the booking. 
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+The traveler is emailed an itinerary of the booking. Additionally,  
+- Their travel details are added to a Trip chat room under their primary workspace. 
+- An expense report for the trip is created.
+- If booked with an Expensify Card, the trip is automatically reconciled.
+
+</div>