Merge branch 'main' into ts-migration/UserUtils

.well-known/apple-app-site-association

@@ -68,6 +68,10 @@
                         "/": "/workspace/*",
                         "comment": "Workspace Details"
                     },
+                    {
+                        "/": "/get-assistance/*",
+                        "comment": "Get Assistance Pages"
+                    },
                     {
                         "/": "/teachersunite/*",
                         "comment": "Teachers Unite!"

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001037402
-        versionName "1.3.74-2"
+        versionCode 1001037403
+        versionName "1.3.74-3"
     }
 
     flavorDimensions "default"

docs/404.html

@@ -1,8 +1,8 @@
 ---
 permalink: /404.html
 ---
-<div class="centered-content with-lhn">
-    <img class="icon" src="/assets/images/hourglass.svg" />
+<div class="centered-content">
+    <img class="icon" src="/assets/images/circle-hourglass.svg" />
     <strong>Hmm it's not here...</strong>
     <div>That page is nowhere to be found.</div>
 </div>

docs/_sass/_main.scss

@@ -641,30 +641,13 @@ button {
 }
 
 .centered-content {
-    height: 240px;
+    width: 100%;
+    height: calc(100vh - 56px);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
     text-align: center;
-    font-size: larger;
-    position: absolute;
-    top: calc((100vh - 240px) / 2);
-
-    width: 380px;
-    right: calc((100vw - 380px) / 2);
-    @include breakpoint($breakpoint-tablet) {
-        width: 500px;
-        right: calc((100vw - 500px) / 2);
-    }
-
-    &.with-lhn {
-        right: calc((100vw - 380px) / 2);
-
-        @include breakpoint($breakpoint-tablet) {
-            right: calc((100vw - 320px - 500px ) / 2);
-        }
-
-        @include breakpoint($breakpoint-desktop) {
-            right: calc((100vw - 420px - 500px) / 2);
-        }
-    }
 
     div {
         margin-top: 8px;

docs/articles/expensify-classic/get-paid-back/expenses/Create-Expenses.md

@@ -1,5 +1,124 @@
 ---
-title: Create Expenses
-description: Create Expenses
+title: Create-Expenses.md
+description: This is an article that shows you all the ways that you can create Expenses in Expensify!
 ---
-## Resource Coming Soon!
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+Whether you're using SmartScan for automatic expense creation, or manually creating, splitting, or duplicating expenses, you can rest assured your expenses will be correctly tracked in Expensify.
+
+# How-to Create Expenses
+## Using SmartScan
+Use the big green camera button within the Expensify mobile app to snap a photo of your physical receipt to have it SmartScanned.
+For digital or emailed receipts, simply forward them to [email protected] and it will be SmartScanned and added to your Expensify account.
+
+There’s no need to keep the app open and most SmartScans are finished within the hour. If more details are needed, Concierge will reach out to you with a friendly message.
+## Using the Mobile App
+Simply tap the **+** icon in the top-right corner
+Choose **Expense** and then select **Manually Create**. 
+If you don't have a receipt handy or want to add it later, fill in your expense details and click the **Save** button. 
+## Using the Expensify Website
+Log into the Expensify website
+Click on the **Expenses** page and find the **New Expense** dropdown. 
+Select your expense type, hit the **Save** button and you're all set.
+You can then add details like the Merchant and Category, attach a receipt image, and even add a description.
+# How to Split an Expense
+Splitting an expense in Expensify allows you to break down a single expense into multiple expenses. Each split expense is treated as an individual expense which can be categorized and tagged separately. The same receipt image will be attached to all of the split expenses, allowing you to divide a single expense into smaller, more manageable expenses.
+To split an expense on the mobile app:
+
+1. Open an expense.
+2. At the bottom of the screen, tap **More Options**.
+3. Then, use the **Split** button to divide the expense.
+
+To split an expense on the Expensify website:
+
+1. Click on the expense you want to split.
+2. Click on the **Split** button. 
+   - On the Expenses page, this button is at the top.
+   - Within an individual expense, you'll find it at the bottom.
+3. This will automatically be split in two, but you can decide how many expenses you want to split it into by clicking on the **Add Split** button. 
+   - Remember, the total of all pieces must add up to the original expense amount, and no piece can have a $0.00 amount (or you won't be able to save the changes).
+
+# How to Create Bulk Expenses
+
+If you have multiple saved receipt images or PDFs to upload, you can drag and drop them onto your Expenses page in batches of ten - this will start the SmartScan process for all of them.
+
+You can also create a number of future 'placeholder' expenses for your recurring expenses (such as recurring bills or subscriptions) which you don't have receipts for by clicking *New Expense > Create Multiple* to quickly add multiple expenses in batches of up to ten.
+
+# How to Edit Bulk Expenses
+Editing expenses in bulk will allow you to apply the same coding across multiple expenses and is a web-only feature. To bulk edit expenses:
+Go to the Expenses page.
+To narrow down your selection, use the filters (e.g. "Merchant" and "Open") to find the specific expenses you want to edit.
+Select all the expenses you want to edit.
+Click on the **Edit Multiple** button at the top of the page. 
+# How to Edit Expenses on a Report
+If you’d like to edit expenses within an Open report:
+
+1. Click on the Report containing all the expenses. 
+2. Click on **Details**.
+3. Click on the Pencil icon.
+3. Select the **Edit Multiple** button. 
+
+If you've already submitted your report, you'll need to Retract it or have it Unapproved first before you can edit the expenses.
+
+
+# FAQ
+## Does Expensify account for duplicates?
+
+Yes, Expensify will account for duplicates. Expensify works behind the scenes to identify duplicate expenses before they are submitted, warning employees when they exist. If a duplicate expense is submitted, the same warning will be shown to the approver responsible for reviewing the report. 
+
+If two expenses are SmartScanned on the same day for the same amount, they will be flagged as duplicates unless:
+The expenses were split from a single expense, 
+The expenses were imported from a credit card, or
+Matching email receipts sent to [email protected] were received with different timestamps. 
+## How do I resolve a duplicate expense?
+
+If Concierge has let you know it's flagged a receipt as a duplicate, scanning the receipt again will trigger the same duplicate flagging.Users have the ability to resolve duplicates by either deleting the duplicated transactions, merging them, or ignoring them (if they are legitimately separate expenses of the same date and amount). 
+
+## How do I recover a duplicate or undelete an expense?
+
+To recover a duplicate or undelete an expense: 
+Log into your Expensify account on the website and navigate to the Expenses page 
+Use the filters to search for deleted expenses by selecting the "Deleted" filter 
+Select the checkbox next to the expenses you want to restore 
+Click the **Undelete** button and you're all set. You’ll find the expense on your Expenses page again.
+
+# Deep Dive
+
+## What are the different Expense statuses?
+
+There are a number of different expense statuses in Expensify:
+1. **Unreported**: Unreported expenses are not yet part of a report (and therefore unsubmitted) and are not viewable by anyone but the expense creator/owner.
+2. **Open**: Open expenses are on a report that's still in progress, and are unsubmitted. Your Policy Admin will be able to view them, making it a collaborative step toward reimbursement.
+3. **Processing**: Processing expenses are submitted, but waiting for approval.
+4. **Approved**: If it's a non-reimbursable expense, the workflow is complete at this point. If it's a reimbursable expense, you're one step closer to getting paid.
+5. **Reimbursed**: Reimbursed expenses are fully settled. You can check the Report Comments to see when you'll get paid.
+6. **Closed**: Sometimes an expense accidentally ends up on your Individual Policy, falling into the Closed status. You’ll need to reopen the report and change the Policy by clicking on the **Details** tab in order to resubmit your report.
+## What are Violations?
+
+Violations represent errors or discrepancies that Expensify has picked up and need to be corrected before a report can be successfully submitted. The one exception is when an expense comment is added, it will override the violation - as the user is providing a valid reason for submission.
+
+To enable or configure violations according to your policy, go to **Settings > Policies > _Policy Name_ > Expenses > Expense Violations**. Keep in mind that Expensify includes certain system mandatory violations that can't be disabled, even if your policy has violations turned off.
+
+You can spot violations by the exclamation marks (!) attached to expenses. Hovering over the symbol will provide a brief description and you can find more detailed information below the list of expenses. The two types of violations are:
+**Red**: These indicate violations directly tied to your report's Policy settings. They are clear rule violations that must be addressed before submission.
+**Yellow**: Concierge will highlight items that require attention but may not necessarily need corrective action. For example, if a receipt was SmartScanned and then the amount was modified, we’ll bring it to your attention so that it can be manually reviewed.
+## How to Track Attendees
+
+Attendee tracking makes it easy to track shared expenses and maintain transparency in your group spending. 
+
+Internal attendees are considered users within your policies or domain. To add internal attendees on mobile or web:
+1. Click or tap the **Attendee** field within your expense.
+2. Select the internal attendees you'd like to add from the list of searchable users.
+3. You can continue adding more attendees or save the Expense.
+
+External attendees are considered users outside your group policy or domain. To add external attendees:
+1. Click or tap the **Attendee** field within your expense.
+2. Type in the individual's name or email address.
+3. Tap **Add** to include the attendee.
+You can continue adding more attendees or save the Expense.
+To remove an attendee from an expense:
+Open the expense.
+Click or tap the **Attendees** field to display the list of attendees.
+From the list, de-select the attendees you'd like to remove from the expense.
+

docs/articles/expensify-classic/get-paid-back/expenses/Merge-Expenses.md

@@ -1,5 +1,64 @@
 ---
 title: Merge Expenses
-description: Merge Expenses
+description: This article shows you all the ways that you can merge your expenses in Expensify!
 ---
-## Resource Coming Soon!
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+The merge expense function helps combine two separate expenses into one. This is useful when the same expense has been accidentally entered more than once, or if you have a connected credit card and an imported expense didn’t automatically merge with a manual entry. 
+
+# How-to merge expenses
+It’s important to note that merging expenses doesn't add the two values together. Instead, merging them combines both expenses to create a single, consolidated expense.
+
+Keep in mind: 
+1. Merging expenses cannot be undone.
+2. You can only merge two expenses at a time.
+3. You can merge a cash expense with a credit card expense, or two cash expenses - but not two credit card expenses.
+4. In order to merge, both expenses will need to be in an Open or Unreported state.
+
+# How to merge expenses on the web app
+To merge two expenses from the Expenses page:
+1. Sign into your Expensify account.
+2. Navigate to the Expenses page on the left-hand navigation.
+3. Click the checkboxes next to the two expenses you wish to merge.
+4. Click **Merge**.
+5. You'll be able to choose which aspect of each of the two expenses you would like to be used on the resulting expense, such as the receipt image, card, merchant, category, and more.  
+
+To merge two expenses from the Reports page:
+1. Sign into your Expensify account.
+2. Navigate to the Reports page on the left-hand navigation.
+3. Click the Report that contains the expenses that you wish to merge.
+4. Click on the **Details** tab, then the Pencil icon.
+5. Select the two expenses that you wish to merge.
+6. You'll be able to choose which aspect of each of the two expenses you would like to be used on the resulting expense, such as the receipt image, card, merchant, category, and more.   
+
+# How to merge expenses on the Expensify mobile app
+On the mobile app, merging is prompted when you see the message _"Potential duplicate expense detected"_. Simply tap **Resolve Now** to take a closer look, then hit **Merge Expense**, and you're done! 
+
+If the expenses exist on two different reports, you will be asked which report you'd like the newly created single expense to be reported onto.
+
+# FAQ
+
+## Can you merge expenses across different reports?
+
+You cannot merge expenses across different reports. Expenses will only merge if they are on the same report. If you have expenses across different reports that you wish to merge, you’ll need to move both expenses onto the same report (and ensure they are in the Open status) in order to merge them.
+
+## Can you merge expenses across different accounts?
+
+You cannot merge expenses across two separate accounts. You will need to choose one submitter and transfer the expense information to that user's account in order to merge the expense.
+## Can you merge expenses with different currencies?
+
+Yes, you can merge expenses with different currencies. The conversion amount will be based on the daily exchange rate for the date of the transaction, as long as the converted rates are within +/- 5%. If the currencies are the same, then the amounts must be an exact match to merge.
+
+## Can Expensify automatically merge a cash expense with a credit card expense?
+
+Yes, Expensify can merge a cash expense with a credit card expense. A receipt will need to be SmartScanned via the app or forwarded to [[email protected]](mailto:[email protected]) in order to merge with a card expense. Note that the SmartScan must be fully completed and not stopped or edited, otherwise the two won’t merge. 
+
+## It doesn’t look like my cash and card expenses merged properly. What are some troubleshooting tips?
+First, check the expense types - you can only merge a SmartScanned receipt (which will initially show with a cash icon) with a card transaction imported from a bank or via CSV.  
+
+If the card expense in your Expensify account is older than the receipt you're trying to merge it with, they won't merge, and if the receipt is dated more than 7 days prior to the card expense, then they also will not merge.
+
+If you have any expenses that are more than 90 days old from the date they were incurred (not the date they were imported to Expensify), Expensify will not automatically merge them. This safeguard helps prevent the merging of very old expenses that might not align with recent transactions or receipts.
+
+Lastly, transactions imported with the Expensify API (via the Expense Importer) will not automatically merge with SmartScanned transactions.

docs/articles/expensify-classic/get-paid-back/expenses/Upload-Receipts.md

@@ -1,5 +1,36 @@
 ---
-title: Upload Receipts
-description: Upload Receipts
+title: Upload-Receipts.md
+description: This article shows you all the ways that you can upload your receipts to Expensify!
 ---
-## Resource Coming Soon!
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+Need to get paid? Check out this guide to see all the ways that you can upload your receipts to Expensify - whether it’s by SmartScanning them by forwarding via email or manually by taking a picture of a receipt, we’ll cover it here!
+
+# How-to Upload Receipts
+## SmartScan
+The easiest way to upload your receipts to Expensify is to SmartScan them with Expensify’s mobile app or forward a receipt from your email inbox! 
+
+When you SmartScan a receipt, we’ll read the Merchant, Date and Amount of the transaction, create an expense, and add it to your Expensify account automatically. The best practice is to take a picture of the receipt at the time of purchase or forward it to your Expensify account from the point of sale system. If you have a credit card connected and you upload a receipt that matches a card expense, the SmartScanned receipt will automatically merge with the imported card expense instead. 
+
+## Email Receipts
+To SmartScan a receipt on your mobile app, tap the green camera button, point and shoot! You can also forward your digital receipts (or photos of receipts) to [email protected] from the email address associated with your Expensify account, and they’ll be SmartScanned. This may take a few minutes because Expensify aims to have the most accurate OCR.
+
+## Manually Upload
+To upload receipts on the web, simply navigate to the Expenses page and click on **New Expense**. Select **Scan Receipt** and choose the file you would like to upload, or drag-and-drop your image directly into the Expenses page, and that will start the SmartScanning process!
+
+# FAQ
+## How do you SmartScan multiple receipts? 
+You can utilize the Rapid Fire Mode to quickly SmartScan multiple receipts at once! 
+
+To activate it, tap on the green camera button in the mobile app and then tap on the camera icon on the bottom right. When you see the little fire icon on the camera, Rapid Fire Mode has been activated - tap the camera icon again to disable Rapid Fire Mode.
+
+## How do you create an expense from an email address that is different from your Expensify login?
+You can email a receipt from a different email address by adding it as a Secondary Login to your Expensify account - this ensures that any receipts sent from this email to [email protected] will be associated with your current Expensify account.
+
+Once that email address has been added as a Secondary Login, simply forward your receipt image or emails to [email protected].
+
+## How do you crop or rotate a receipt image?
+You can crop and rotate a receipt image on the web app, and you can only edit one expense at a time. 
+
+Navigate to your Expenses page and locate the expense whose receipt image you'd like to edit, then click the expense to open the Edit screen. If there is an image file associated with the receipt, you will see the Rotate and Crop buttons. Alternatively, you can also navigate to your Reports page, click on a report, and locate the individual expense.