Merge remote-tracking branch 'upstream/main' into patch-for-search-lh…

…n-no-results-found-padding

.eslintrc.js

@@ -122,6 +122,7 @@ module.exports = {
                         },
                     },
                 ],
+                'rulesdir/avoid-anonymous-functions': 'off',
             },
         },
         // This helps disable the `prefer-alias` rule to be enabled for specific directories
@@ -276,5 +277,11 @@ module.exports = {
                 'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
             },
         },
+        {
+            files: ['en.ts', 'es.ts'],
+            rules: {
+                'rulesdir/use-periods-for-error-messages': 'error',
+            },
+        },
     ],
 };

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001046700
-        versionName "1.4.67-0"
+        versionCode 1001046800
+        versionName "1.4.68-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/articles/expensify-classic/expensify-card/Unlimited-Virtual-Cards.md

@@ -0,0 +1,86 @@
+---
+title:  Unlimited Virtual Cards
+description: Learn more about virtual cards and how they can help your business gain efficiency and insight into company spending.
+---
+
+# Overview
+
+For admins to issue virtual cards, your company **must upgrade to Expensify’s new Expensify Visa® Commercial Card.** 
+
+Once upgraded to the new Expensify Card, admins can issue an unlimited number of virtual cards with a fixed or monthly limit for specific company purchases or recurring subscription payments _(e.g., Marketing purchases, Advertising, Travel, Amazon Web Services, etc.)._
+
+This feature supports businesses that require tighter controls on company spending, allowing customers to set fixed or monthly spending limits for each virtual card. 
+
+Use virtual cards if your company needs or wants:
+
+- To use one card per vendor or subscription,
+- To issue cards for one-time purchases with a fixed amount,
+- To issue cards for events or trips,
+- To issue cards with a low limit that renews monthly,
+
+Admins can also name each virtual card, making it easy to categorize and assign them to specific accounts upon creation. Naming the card ensures a clear and organized overview of expenses within the Expensify platform.
+
+# How to set up virtual cards
+
+After adopting the new Expensify Card, domain admins can issue virtual cards to any employee using an email matching your domain. Once created and assigned, the card will be visible under the name given to the card. 
+
+**To assign a virtual card:**
+
+1. Head to **Settings** > **Domains** > [**Company Cards**](https://www.expensify.com/domain_companycards).
+2. Click the **Issue Virtual Cards** button.
+3. Enter a card name (i.e., "Google Ads").
+4. Select a domain member to assign the card to.
+5. Enter a card limit.
+6. Select a **Limit Type** of _Fixed_ or _Monthly_.
+7. Click **Issue Card**.
+
+![The Issue Virtual Cards modal is open in the middle of the screen. There are four options to set; Card Name, Assignee, Card Limit, and Limit type. A cancel (left) and save (right) button are at the bottom right of the modal.]({{site.url}}/assets/images/AdminissuedVirtualCards.png){:width="100%"}
+
+# How to edit virtual cards
+
+Domain admin can update the details of a virtual card on the [Company Cards](https://www.expensify.com/domain_companycards) page.
+
+**To edit a virtual card:**
+
+1. Click the **Edit** button to the right of the card.
+2. Change the editable details.
+3. Click **Edit Card** to save the changes.
+
+# How to terminate a virtual card
+
+Domain admin can also terminate a virtual card on the [Company Cards](https://www.expensify.com/domain_companycards) page by setting the limit to $0.
+
+**To terminate a virtual card:**
+
+1. Click the **Edit** button to the right of the card.
+2. Set the limit to $0.
+3. Click **Save**.
+4. Refresh your web page, and the card will be removed from the list.
+
+{% include faq-begin.md %}
+
+**What is the difference between a fixed limit and a monthly limit?**
+
+There are two different limit types that are best suited for their intended purpose.
+
+- _Fixed limit_ spend cards are ideal for one-time expenses or providing employees access to a card for a designated purchase. 
+- _Monthly_ limit spend cards are perfect for managing recurring expenses such as subscriptions and memberships.
+
+**Where can employees see their virtual cards?**
+
+Employees can see their assigned virtual cards by navigating to **Settings** > **Account** > [**Credit Cards Import**](https://www.expensify.com/settings?param=%7B%22section%22:%22creditcards%22%7D) in their account.
+
+On this page, employees can see the remaining card limit, the type of card it is (i.e., fixed or monthly), and view the name given to the card. 
+
+When the employee needs to use the card, they’ll click the **Show Details** button to expose the card details for making purchases. 
+
+_Note: If the employee doesn’t have Two-Factor Authentication (2FA) enabled when they display the card details, they’ll be prompted to enable it. Enabling 2FA for their account provides the best protection from fraud and is **required** to dispute virtual card expenses._ 
+
+**What do I do when there is fraud on one of our virtual cards?**
+
+If you or an employee loses their virtual card, experiences fraud, or suspects the card details are no longer secure, please [request a new card](https://help.expensify.com/articles/expensify-classic/expensify-card/Dispute-A-Transaction) immediately. A domain admin can also set the limit for the card to $0 to terminate the specific card immediately if the employee cannot take action.
+
+When the employee requests a new card, the compromised card will be terminated immediately. This is best practice for any Expensify Card and if fraud is suspected, action should be taken as soon as possible to reduce financial impact on the company.
+
+{% include faq-end.md %}
+

docs/articles/expensify-classic/reports/Submit-or-retract-a-report.md

@@ -60,6 +60,8 @@ You can retract a submitted report to edit the reported expenses and re-submit t
 4. Tap **Retract** at the top of the report.
 {% include end-option.html %}
 
+**Note:** Workspaces with Instant Submit set as the Scheduled Submit frequency won’t have the option to Retract entire reports, only individual expenses.
+
 {% include end-selector.html %}
 
 </div>

docs/articles/expensify-classic/settings/Notification-Troubleshooting.md → docs/articles/expensify-classic/settings/account-settings/Set-Notifications.md

@@ -1,5 +1,5 @@
 ---
-title: Notification Troubleshooting
+title: Set notifications
 description: This article is about how to troubleshoot notifications from Expensify. 
 --- 
 

docs/articles/expensify-classic/spending-insights/Insights.md

@@ -4,67 +4,67 @@ description: How to get the most out of the Custom Reporing and Insights
 redirect_from: articles/other/Insights/
 ---
 <!-- The lines above are required by Jekyll to process the .md file -->
-{% raw %}
-# What is Custom Reporting and Insights?
-The Insights dashboard allows you to monitor all aspects of company spend across categories, employees, projects, departments, and more. You can see trends in real time, forecast company budgets, and build unlimited custom reports with help from our trained specialist team. 
+
+# Overview
+The Insights dashboard allows you to monitor all aspects of company spending across categories, employees, projects, departments, and more. You can see trends in real-time, forecast company budgets, and build unlimited custom reports with help from our trained specialist team. 
 
 ![Insights Pie Chart](https://help.expensify.com/assets/images/insights-chart.png){:width="100%"}
 ## Review your Insights data
 
-1. Navigate to your [Insights page](https://www.expensify.com/expenses?param={"fromInsightsTab":true,"viewMode":"charts"}), located in the left hand menu
+1. Navigate to your [Insights page](https://www.expensify.com/expenses?param={"fromInsightsTab":true,"viewMode":"charts"}), located in the left-hand menu
 2. Select a specific date range (the default view has the current month pre-selected) 
-3. Use the filter options to select the categories, tags, employees etc that you want insights on 
+3. Use the filter options to select the categories, tags, employees, or any other parameter
 4. Make sure that View in the top right corner is set to the pie chart icon
 5. You can view any dataset in more detail by clicking in the “View Raw Data” column 
 
 ## Export your Insights data  
 
 1. Switch the View in the top right corner of the [Insights page](https://www.expensify.com/expenses?param={"fromInsightsTab":true,"viewMode":"charts"}) to the lists icon
 2. Select the expenses you want to export, either by selecting individual expenses, or checking the select all box (next to Date at the top)
-3. Select **Export To** in the top right hand corner to download the report as a .csv file 
+3. Select **Export To** in the top right-hand corner to download the report as a .csv file 
 
 ## Create a Custom Export Report for your Expenses
 
 1. Navigate to **Settings > Account > Preferences > scroll down to CSV Export Formats** 
-2. Build up a report using these [formulas](https://community.expensify.com/discussion/5795/deep-dive-expense-level-formula/p1?new=1)
+2. Build up a report using these [formulas]((https://help.expensify.com/articles/expensify-classic/spending-insights/Custom-Templates))
 3. Click the **Custom Export** button on the Insights page and your Account Manager will help get you started on building up your report  
 
-## Create a Custom Export Report for your Policy
+## Create a Custom Export Report for your Workspace
 
-1. Navigate to **Settings > Policies > Group > [Policy Name] > Export Formats** 
-2. Build up a report using these [formulas](https://community.expensify.com/discussion/5795/deep-dive-expense-level-formula/p1?new=1)
+1. Navigate to **Settings > Workspaces > Group > [Workspace Name] > Export Formats** 
+2. Build up a report using these [formulas](https://help.expensify.com/articles/expensify-classic/spending-insights/Custom-Templates)
 3. If you need any help, click the **Support** button on the top left to contact your Account Manager
 
 {% include faq-begin.md %}
 
 #### Can I share my custom export report? 
 
-If you would like to create a custom export report that can be shared with other policy admins, you can create these by navigating to the **[Settings > Policies > Group > [Policy Name] > Export Formats](https://www.expensify.com/admin_policies?param={"section":"group"})** page. Custom export reports created under **Settings > Account > Preferences** page are only available to the member who created them.
+If you would like to create a custom export report that can be shared with other workspace admins, you can do so by navigating to the **[Settings > Workspaces > Group > [Workspace Name] > Export Formats** page. Custom export reports created under the **Settings > Account > Preferences** page are only available to the member who created them.
 
-#### Can I put expenses from different policies on the same report? 
+#### Can I put expenses from different workspaces on the same report? 
 
-Custom export reports created under Settings > Account > Preferences page are able to export expenses from multiple policies, and custom export formats created under Settings > Policies > Group > [Policy Name] > Export Formats are for expenses reported under that policy only. 
+Custom export reports created under the Settings > Account > Preferences page can export expenses from multiple workspaces, and custom export formats created under Settings > Workspaces> Group > [Workspace Name] > Export Formats are for expenses reported under that workspace only. 
 
 #### Are there any default export reports available?
 
-Yes! We have [seven default reports](https://community.expensify.com/discussion/5602/deep-dive-default-export-templates) available to export directly from the Reports page: 
+Yes! We have [seven default reports](https://help.expensify.com/articles/expensify-classic/spending-insights/Default-Export-Templates) available to export directly from the Reports page: 
 
 - **All Data** - Expense Level Export** - the name says it all! This is for the people who want ALL the details from their expense reports. We're talking Tax, Merchant Category Codes, Approvers - you name it, this report's got it!
-- **All Data** - Report Level Export - this is the report for those who don't need to see each individual expense but want to see a line by line breakdown at a report level - submitter, total amount, report ID - that kind of stuff
+- **All Data** - Report Level Export - this is the report for those who don't need to see each individual expense but want to see a line-by-line breakdown at a report level - submitter, total amount, report ID - that kind of stuff
 - **Basic Export** - this is the best way to get a simple breakdown of all your expenses - just the basics
 - **Canadian Multiple Tax Export** - tax, GST, PST...if you need to know tax then this is the export you want!
 - **Category Export** - want to see a breakdown of your expenses by Category? This is the export you
 - **Per Diem Export** - the name says it all
 - **Tag Export** - much like the Category Export, but for Tags
 
-*To note: these reports will be emailed directly to your email address rather than downloaded on your computer.* 
+*These reports will be emailed directly to your email address rather than automatically downloaded.* 
 
 #### How many expenses can I export in one report? 
-The custom export reports are best for small-to-medium chunks of data. If you want to export large amounts of data, we recommend you use a [default export report](https://community.expensify.com/discussion/5602/deep-dive-default-export-templates) that you can run from the Reports page.  
+The custom export reports are best for small-to-medium chunks of data. If you want to export large amounts of data, we recommend you use a [default export report](https://help.expensify.com/articles/expensify-classic/spending-insights/Default-Export-Templates) that you can run from the Reports page.  
 
 #### What other kinds of export reports can my Account Manager help me create? 
 
-We’ve built a huge variety of custom reports for customers, so make sure to reach out to your Account Manager for more details. Some examples of custom reports we’ve build for customers before are: 
+We’ve built a huge variety of custom reports for customers, so make sure to reach out to your Account Manager for more details. Some examples of custom reports we’ve built for customers before are: 
 
 - Accrual Report
 - Aged Approval Reports
@@ -97,7 +97,5 @@ We’ve built a huge variety of custom reports for customers, so make sure to re
 - Unposted Procurement Aging Report
 - Unposted Travel Aging Report
 - Vendor Spend
-- … or anything you can imagine! 
-{% endraw %}
 
 {% include faq-end.md %}