Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…

…/40555-ios-dismiss-onboarding

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001047100
-        versionName "1.4.71-0"
+        versionCode 1001047104
+        versionName "1.4.71-4"
         // 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/_data/_routes.yml

@@ -54,6 +54,11 @@ platforms:
         icon: /assets/images/hand-card.svg
         description: Explore the perks and benefits of the Expensify Card.
 
+      - href: travel
+        title: Travel
+        icon: /assets/images/plane.svg
+        description: Manage all your corporate travel needs with Expensify Travel.
+
       - href: copilots-and-delegates
         title: Copilots & Delegates
         icon: /assets/images/envelope-receipt.svg
@@ -114,16 +119,16 @@ platforms:
         icon: /assets/images/money-into-wallet.svg
         description: Learn more about expense tracking and submission.
 
-      - href: bank-accounts-and-payments
-        title: Bank Accounts & Payments
-        icon: /assets/images/bank-card.svg
-        description: Send direct reimbursements, pay invoices, and receive payment.
-
       - href: expensify-card
         title: Expensify Card
         icon: /assets/images/hand-card.svg
         description: Explore the perks and benefits of the Expensify Card.
 
+      - href: travel
+        title: Travel
+        icon: /assets/images/plane.svg
+        description: Manage all your corporate travel needs with Expensify Travel.
+
       - href: connections
         title: Connections
         icon: /assets/images/workflow.svg

docs/articles/expensify-classic/travel/Coming-Soon.md

@@ -0,0 +1,6 @@
+---
+title: Coming soon
+description: Coming soon
+---
+
+# Coming soon

docs/articles/new-expensify/settings/Enable-Two-Factor-Authentication.md

@@ -0,0 +1,51 @@
+---
+title: Enable Two-Factor Authentication (2FA)
+description: Add an extra layer of security for your Expensify login
+---
+<div id="new-expensify" markdown="1">
+
+Add an extra layer of security to help keep your financial data safe and secure by enabling two-factor authentication (2FA). This will require you to enter a code generated by your preferred authenticator app (like Google Authenticator or Microsoft Authenticator) when you log in.
+
+To enable 2FA,
+
+{% 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 **Security** in the left menu.
+3. Under Security Options, click **Two Factor Authentication**. 
+4. Save a copy of your backup codes. This step is critical! You will lose access to your account if you cannot use your authenticator app and do not have your recovery codes.
+   - Click **Download** to save a copy of your backup codes to your computer.
+   - Click **Copy** to paste the codes into a document or other secure location.
+5. Click **Next**.
+6. Download or open your authenticator app and connect it to Expensify by either:
+   - Scanning the QR code
+   - Entering the code into your authenticator app
+7. Enter the 6-digit code from your authenticator app into Expensify and click **Verify**.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon at the bottom of the screen. 
+2. Tap **Security**. 
+3. Under Security Options, tap **Two Factor Authentication**. 
+4. Save a copy of your backup codes. This step is critical! You will lose access to your account if you cannot use your authenticator app and do not have your recovery codes.
+   - Tap **Download** to save a copy of your backup codes to your device.
+   - Tap **Copy** to paste the codes into a document or other secure location.
+5. Tap **Next**.
+6. Download or open your authenticator app and connect it to Expensify by either:
+   - Scanning the QR code
+   - Entering the code into your authenticator app
+7. Enter the 6-digit code from your authenticator app into Expensify and tap **Verify**.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+When you log in to Expensify in the future, you’ll be emailed a magic code that you’ll use to log in with. Then you’ll be prompted to open your authenticator app to get the 6-digit code and enter it into Expensify. A new code regenerates every few seconds, so the code is always different. If the code time runs out, you can generate a new code as needed.
+
+{% include faq-begin.md %}
+**How do I use my recovery codes if I lose access to my authenticator app?**
+
+Your recovery codes work the same way as your authenticator codes. Just enter a recovery code as you would the authenticator code.
+{% include faq-end.md %}
+
+</div>

docs/articles/new-expensify/settings/Switch-account-language-to-Spanish.md

@@ -0,0 +1,23 @@
+---
+title: Switch account language to Spanish
+description: Change your account language
+---
+<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 **Preferences** in the left menu. 
+3. Click the Language option and select **Spanish**. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Preferences**. 
+3. Tap the Language option and select **Spanish**.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>

docs/articles/new-expensify/settings/Update-Notification-Preferences.md

@@ -0,0 +1,29 @@
+---
+title: Update notification preferences
+description: Determine how you want to receive Expensify notifications
+---
+<div id="new-expensify" markdown="1">
+
+To customize the email and in-app notifications you receive from Expensify,
+
+{% 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 **Preferences** in the left menu. 
+3. Enable or disable the toggles under Notifications:
+   - **Receive relevant feature updates and Expensify news**: If enabled, you will receive emails and in-app notifications from Expensify about new product and company updates. 
+   - **Mute all sounds from Expensify**: If enabled, all in-app notification sounds will be silenced.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Preferences**. 
+3. Enable or disable the toggles under Notifications:
+   - **Receive relevant feature updates and Expensify news**: If enabled, you will receive emails and in-app notifications from Expensify about new product and company updates. 
+   - **Mute all sounds from Expensify**: If enabled, all in-app notification sounds will be silenced.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>

docs/articles/new-expensify/travel/Coming-Soon.md

@@ -0,0 +1,6 @@
+---
+title: Coming soon
+description: Coming soon
+---
+
+# Coming soon