Merge branch 'main' into fix/28254

README.md

@@ -3,7 +3,7 @@
         <img src="https://raw.githubusercontent.com/Expensify/App/main/web/favicon.png" width="64" height="64" alt="New Expensify Icon">
     </a>
     <h1>
-        <a href="https://new.expensify.com">
+        <a href="https://new.expensify.com/">
             New Expensify
         </a>
     </h1>

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001038000
-        versionName "1.3.80-0"
+        versionCode 1001038106
+        versionName "1.3.81-6"
     }
 
     flavorDimensions "default"

contributingGuides/CONTRIBUTING.md

@@ -203,7 +203,6 @@ During communication with Expensify, you will come across a variety of acronyms
 - **RBR:** Red Brick Road (UX Design Principle that utilizes red indicators on action items to encourage the user down the optimal path for handling and discovering errors) 
 - **VBA:** Verified Bank Account (Bank account that has been verified as real and belonging to the correct business/individual)
 - **NAB:** Not a Blocker (An issue that doesn't block progress, but would be nice to not have)
-- **LHN:** Left Hand Navigation
 - **IOU:** I owe you (used to describe payment requests between users)
 - **OTP:** One-time password, or magic sign-in
 - **RHP:** Right Hand Panel (on larger screens, pages are often displayed docked to the right side of the screen)

docs/_config.yml

@@ -4,6 +4,7 @@ description: Got a question about receipts, expenses, corporate cards, or anythi
 url: https://help.expensify.com
 author: Expensify
 logo: /assets/images/expensify-help.svg
+repository: Expensify/App
 open_url: true
 
 defaults:

docs/_sass/_search-bar.scss

@@ -88,11 +88,14 @@ $color-gray-label: $color-gray-label;
 /* All gsc id & class are Google Search relate gcse_0 is the search bar parent & gcse_1 is the search result list parent */
 #___gcse_0 {
     margin-left: 20px;
+    margin-top: -8px;
 }
 
 /* This input is in #___gcse_0 search bar */
 input#gsc-i-id1.gsc-input {
     background-color: $color-appBG;
+    padding: 15px 0px 0px !important;
+    pointer-events: auto;
     color: #E7ECE9;
     font-family: "ExpensifyNeue", "Segoe UI Emoji", "Noto Color Emoji" !important;
 }
@@ -102,23 +105,29 @@ input#gsc-i-id1.gsc-input {
     background-color: $color-appBG;
     border-bottom: $color-borders 2px solid;
     border-bottom-left-radius: 0px;
-
+    pointer-events: none;
+
     &:focus-within {
         border-bottom: $color-accent 2px solid;
     }
 }
 
 .gsc-input-box .gsib_a {
-    padding: 5px 9px 4px 0px;
+    padding: 0px 0px 4px 0px;
 }
 
 .search-icon {
     margin-left: auto;
 }
 
+.gsst_b, .gsst_a {
+    padding: 0px !important;
+}
 /* This is the close icon on search bar */
 .gsib_b .gsst_a .gscb_a {
     color: $color-icons;
+    padding: 8px 6px 0px 6px !important;
+    pointer-events: auto;
 
     &:hover {
         color: $color-text;
@@ -148,6 +157,7 @@ label.search-label {
     font-family: "ExpensifyNeue", "Segoe UI Emoji", "Noto Color Emoji";
     transform: translateY(-50%);
     left: 20px;
+    pointer-events: none;
     color: $color-gray-label;
     transform-origin: left top;
     user-select: none;
@@ -181,7 +191,6 @@ label.search-label {
 /* Change the Google Search Button icon into Expensify icon button */
 .gsc-search-button.gsc-search-button-v2 {
     padding: 10px;
-    margin-top: -7px;
     margin-left: 15px;
     margin-right: 20px;
     border-radius: 25px;

docs/articles/expensify-classic/account-settings/Account-Details.md

@@ -1,5 +1,61 @@
 ---
 title: Account Details
-description: Account Details
+description: The Account Details section of your account is where you can update your profile photo, enable 2FA, and change the email address associated with your Expensify account.
 ---
-## Resource Coming Soon!
+
+# Overview
+The Account Details section of your account is where you can update your profile photo, enable 2FA, and change the email address associated with your account. 
+
+You can have multiple email addresses tied to your account to make it easier to submit expenses or manage your account. Let’s go over how to configure the various account settings located under the Account Details section of your Expensify account. 
+
+# How to add a profile photo
+To update your name or add a profile photo, navigate to **Settings** > **Account** > **Account Details.** Under “your profile” you’ll notice a profile picture thumbnail, click “edit photo” underneath to update the profile image. 
+
+# How to enable Two-Factor Authentication
+Setting up Two-factor Authentication is one of the best ways to secure your account. This can be enabled individually in your account settings by following **Settings** > **Accounts** > **Account Details** > **Two Factor Authentication** and toggle the switch to **Enabled.**
+
+Save or download your **Recovery Codes.** It’s important to keep these safe! You WILL lose access to your account if you cannot use your authenticator app and do not have your recovery codes.
+
+Use your favorite authenticator app to connect to Expensify using the QR code or click the link to enter the secret key manually.
+
+Once connected, quickly enter the code generated by your app into Expensify before the timeframe runs out!
+
+# How to manage your devices
+You can access your Expensify account on multiple devices, which allows for easy access to your account data. By heading to **Settings** > **Account** > **Account Details** > **Device Management**, you can review the devices that have access to your account. 
+
+From that same place in your account, you can remove any devices that should no longer have access. To do this, select the **Revoke** button next to each device you wish to remove access to your account. 
+
+# How to add a Secondary Login
+A Secondary Login is helpful if you have multiple email addresses and don’t necessarily need multiple Expensify accounts. By adding additional emails to your Expensify account, you can use them to forward receipts to [email protected] and they will be uploaded to your main Expensify account. To get this added to your account, follow these steps:
+
+1. Log in to your Expensify account through a web browser at www.expensify.com. Please note that this process cannot be completed using the mobile app; it must be done from the website at expensify.com.
+2. Navigate to **Settings** > **Account** > **Account Details**. Scroll down to find the 'Secondary Logins' section, then click the 'Add Secondary Login' button.
+3. Input the email address or mobile phone number you wish to add, ensuring you include the international code if applicable.
+4. You will receive a prompt to enter the Magic Code, which will be sent to the email address you're adding as a secondary login.
+
+# How to update your email address
+Once a Secondary Login is added to your account, you can make it your primary email address. The primary address on an Expensify account is the address that will receive email notifications and updates regarding the account. Any new email addresses must be added as a secondary login before they can be made a primary address. 
+
+1. Log in to your Expensify account through a web browser at www.expensify.com. Please note that this process cannot be completed using the mobile app; it must be done from the website at expensify.com.
+2. Navigate to **Settings** > **Account** > **Account Details**. Scroll down to find the 'Secondary Logins' section, then select the **"Make Primary"** button next to the email address.
+3. You can keep the old address as a secondary login or delete email addresses by selecting the **"Remove"** button. 
+
+
+# Deep Dive
+## Managing emails connected to other Expensify accounts
+A secondary login can only be added if it is not linked to an existing account. If you have two email addresses with Expensify accounts linked to them, you'll need to merge them instead. 
+
+Alternatively, you can remove a personal email address from a previous work/organization account to use it elsewhere.
+
+Is your Secondary Login (personal email) validated in your company account? If so, do the following:
+1. Navigate to expensify.com
+2. Log in using your validated Secondary Login
+3. Navigate to **Account** > **Settings** > **Account Details** > **Secondary Logins**
+4. Remove your personal email address from the account by clicking the **"Remove"** button next to your email
+
+Is your Secondary Login (personal email) invalidated in your company account? If so, do the following:
+1. Navigate to expensify.com
+2. Enter your invalidated secondary login email address
+3. You will be presented with a confirmation message saying Expensify sent you an email with a validation link
+4. Head to your personal email account and follow the prompts
+5. You'll receive a link in the email to click that will unlink the two accounts

docs/articles/expensify-classic/billing-and-subscriptions/Billing-Owner.md

@@ -1,5 +1,49 @@
 ---
 title: Billing-Owner
-description: Billing-Owner
+description:  The Billing Owner is the person responsible for payment for all usage on a given Workspace
 ---
-## Resource Coming Soon!
+# Overview
+In Expensify, each Workspace has a Billing Owner. The Billing Owner is the person responsible for payment for all usage on a given Workspace. The Billing Owner is also a Workspace Admin, but it’s important to note that not all Workspace Admins are Billing Owners.
+# How to set a billing owner
+If you've just created a new Group Workspace, you first need to add a payment card to your account. You can do this by going to the web app's Home page and completing the payment card task. Alternatively, you can add a payment card directly from the Payments page (**Settings > Account > Payment**).
+- If you already own a Group Workspace subscription, you can edit your payment card details or manage subscription options within the web app under **Settings > Workspaces > Group > Subscription**.
+- If you're an individual Workspace owner, you can activate a new monthly subscription in the web app by going to **Settings > Workspaces > Individual > Subscription** section.
+# How to change the Billing Owner
+A Group Workspace's Billing Owner is typically the user who initially created the Workspace. However, any Workspace Admin can take over the role of Billing Owner by choosing to "Take Over Billing."
+Any Workspace Admin can take over the billing responsibility of a Group Workspace as long as they are already a member of that Workspace. If you wish to become the Billing Owner of a Workspace you're not currently a member of, you need to contact an existing Workspace Admin and ask them to add you to the Group Workspace.
+To take over billing:
+1. Go to **Settings > Workspaces > Group**.
+1. Click on the relevant Workspace name.
+1. Click on "Take Over Billing." If you haven't added a payment card to your settings yet, you'll be prompted to do so to complete the transfer.
+
+That's it! As the new Billing Owner, you will receive a monthly email receipt for the Group Workspaces you now own.
+# How to update payment details in Expensify
+If you're a policy billing owner, you can change your payment information like your payment card and billing currency. If you are a billing owner using the Expensify Card, your monthly company policy charges will be billed to your Expensify Card.
+
+To change your payment details:
+1. Log in to your account using a web browser or Android app (not available on iOS).
+1. Go to **Settings > Account > Payments**.
+1. To change your payment card, click "Change Payment Card" in the Payment Details section.
+1. To change your billing currency, click "Change Billing Currency" and choose a new currency. You'll need to enter the CVC code of your payment card. You can pay in USD, GBP, NZD, or AUD.
+# Deep Dive
+## Taking over an existing subscription
+If the previous Billing Owner had a 12-month subscription, it will be transferred to your Expensify account. If you already have an annual subscription, the sizes of both subscriptions will be combined. For example, if you have a subscription for 10 users and take over from someone with 50 users, your subscription will now cover 60 users. To take over the Annual Subscription, you need to transfer billing ownership of all Workspaces under the previous Billing Owner's name.
+
+## Taking over Consolidated Domain Billing
+If a Domain Admin has enabled Consolidated Domain Billing (**Settings > Domains > Domain Name > Domain Admins**), all Group Workspaces owned by users with email addresses matching the domain will be billed to the Consolidated Domain Billing owner. You can take over billing for the entire domain by following these steps:
+
+To take over billing for the entire domain, you must:
+1. Ensure you have a linked card on your **Settings > Account > Billing** page.
+1. Be designated as the Primary Domain Admin.
+1. Go to **Settings > Domains > _Domain Name_ > Domain Admins** and enable Consolidated Domain Billing.
+
+Currently, Consolidated Domain Billing simply consolidates the amounts due for each Group Workspace Billing Owner (listed on the **Settings > Workspaces > Group** page). If you want to use the Annual Subscription across all Workspaces on the domain, you must also be the Billing Owner of all Group Workspaces.
+# FAQ
+## Why can't I see the option to take over billing?
+There could be two reasons:
+1. You may not have the role of Workspace Admin. If you can't click on the Workspace name (if it's not a blue hyperlink), you're not a Workspace Admin. Another Workspace Admin for that Workspace must change your role before you can proceed.
+1. Your domain might have Consolidated Domain Billing enabled. Refer to the Deep Dive section to understand how to take over Consolidated Domain Billing.
+## What if the current Billing Owner is no longer an employee?
+There are two ways to resolve this:
+1. Have your IT dept. gain access to the account so that you can make yourself an admin. Your IT department may need to recreate the ex-employee's email address. Once your IT department has access to the employee's Home page, you can request a magic link to be sent to that email address to gain access to the account.
+1. Have another admin make you a Workspace admin.

docs/articles/expensify-classic/expense-and-report-features/Expense-Types.md

@@ -1,5 +1,42 @@
 ---
 title: Expense Types
-description: Expense Types
+description: Details of the different Expense filters and Expense Types
 ---
-## Resource Coming Soon!
+
+# Overview
+Expense types help categorize different expenses for better financial management. While reimbursable and non-reimbursable expenses are common, Expensify offers various other options to suit your needs. Let's explore the available expense types.
+
+# How To
+## Filtering a Report by Expense Type
+Organizing a report by expense type can make it easier to review expenses on a report. 
+- Open the report you're interested in.
+- Click the **Details** icon in the upper right corner of the report,
+- Change the “View” to **Detailed** and “Split by” **Reimbursable** or **Billable**.
+- You’ll also see the option to **Group by Category** or **Tags**. 
+
+
+# Deep Dive
+Each report will show the total amount for all expenses in the upper right. Under that total, there will be a breakdown of amounts that are reimbursable, billable, and non-reimbursable (depending on which of those expense types exist on the report). 
+
+## Expense Types
+- **Reimbursable Expenses:** Employees pay for these expenses out of their pockets on behalf of the business and are usually reimbursed. They often come from cash, debit cards, or personal credit card purchases.
+- **Non-reimbursable Expenses:** The business directly covers these expenses, so there's no need to reimburse the employee. Typically, these expenses are company card expenses.
+- **Billable Expenses:** Business or employee expenses must be billed to a specific client or vendor. Choose this option if you need to track expenses for invoicing to customers, clients, or other departments.
+- **Per Diem Expenses:** These expenses involve a daily or partial daily rate you can configure in your expense Workspace.
+- **Time Expenses:** Employees or jobs are billed based on an hourly rate that you can set within Expensify.
+- **Distance Expenses:** These expenses are related to travel for work.
+
+# FAQ
+
+## What’s the difference between a receipt, an expense, and a report attachment?
+
+- **Expense:** Created when you SmartScan or manually upload a receipt from a purchase.
+- **Receipt:** Automatically attached to the expense during the SmartScan process.
+- **Report Attachments:** Additional documents that need to be submitted to your approver (e.g., supplemental documents to the purchase) can be added to a report anytime by clicking the paperclip icon in the Reports Comments. 
+
+## How are credits or refunds displayed in Expensify?
+In Expensify, a credit is displayed as an expense with a minus (ex. -$1.00) in front of it. That’s because Expensify defaults all expenses as something that needs to be paid by the company. So a credit that is returned to the company is displayed as a negative expense. 
+
+If a report includes a credit or a refund expense, it will offset the total amount on the report. 
+For example, the report has two reimbursable expenses, $400 and $500. The total Reimbursable is $900. 
+Conversely, a -$400 and $500 will be a total Reimbursable amount of $500