{% for article in section.articles %}
{% assign article_href = section.href | append: '/' | append: article.href %}
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 4232c565e715..cc45e83efa59 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -14,7 +14,7 @@
-
+
diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
index 29b02d8aeb00..f3bf1035ed56 100644
--- a/docs/_sass/_main.scss
+++ b/docs/_sass/_main.scss
@@ -749,6 +749,7 @@ button {
width: 20px;
height: 20px;
cursor: pointer;
+ display: inline-block;
}
.homepage {
diff --git a/docs/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features.md b/docs/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features.md
index 043cc4be1e26..b9938b058ef6 100644
--- a/docs/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features.md
+++ b/docs/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features.md
@@ -1,174 +1,134 @@
---
title: Admin Card Settings and Features
-description: An in-depth look into the Expensify Card program's admin controls and settings.
+description: A deep dive into the available controls and settings for the Expensify Card.
---
+# Expensify Visa® Commercial Card Overview
+The Expensify Visa® Commercial Card offers various settings to help admins manage expenses and card usage efficiently. Here’s how to use these features:
-# Overview
+## Smart Limits
+Smart Limits allow you to set custom spending limits for each Expensify cardholder or default limits for groups. Setting a Smart Limit activates an Expensify card for your user and issues a virtual card for immediate use.
-The Expensify Visa® Commercial Card offers a range of settings and functionality to customize how admins manage expenses and card usage in Expensify. To start, we'll lay out the best way to make these options work for you.
+#### Set Limits for Individual Cardholders
+As a Domain Admin, you can set or edit Custom Smart Limits for a card:
+1. Go to _**Settings > Domains > Domain Name > Company Cards**_.
+2. Click **Edit Limit** to set the limit.
-Set Smart Limits to control card spend. Smart Limits are spend limits that can be set for individual cards or specific groups. Once a given Smart Limit is reached, the card is temporarily disabled until expenses are approved.
+This limit restricts the amount of unapproved (unsubmitted and processing) expenses a cardholder can incur. Once the limit is reached, the cardholder cannot use their card until they submit outstanding expenses and have their card spend approved. If you set the Smart Limit to $0, the user’s card cannot be used.
-Monitor spend using your Domain Limit and the Reconciliation Dashboard.
-Your Domain Limit is the total Expensify Card limit across your entire organization. No member can spend more than what's available here, no matter what their individual Smart Limit is. A Domain Limit is dynamic and depends on a number of factors, which we'll explain below.
+#### Set Default Group Limits
+Domain Admins can set or edit custom Smart Limits for a domain group:
-Decide the settlement model that works best for your business
-Monthly settlement is when your Expensify Card balance is paid in full on a certain day each month. Though the Expensify Card is set to settle daily by default, any Domain Admin can change this setting to monthly.
+1. Go to _**Settings > Domains > Domain Name > Groups**_.
+2. Click on the limit in-line for your chosen group and amend the value.
-Now, let's get into the mechanics of each piece mentioned above.
+This limit applies to all members of the Domain Group who do not have an individual limit set via _**Settings > Domains > Domain Name > Company Cards**_.
-# How to set Smart Limits
-Smart Limits allow you to set a custom spend limit for each Expensify cardholder, or default limits for groups. Setting a Smart Limit is the step that activates an Expensify card for your user (and issues a virtual card for immediate use).
+#### Refreshing Smart Limits
+To let cardholders continue spending, you can approve their pending expenses via the Reconciliation tab. This frees up their limit, allowing them to use their card again.
-## Set limits for individual cardholders
-As a Domain Admin, you can set or edit Custom Smart Limits for a card by going to Settings > Domains > Domain Name > Company Cards. Simply click Edit Limit to set the limit. This limit will restrict the amount of unapproved (unsubmitted and Processing) expenses that a cardholder can incur. After the limit is reached, the cardholder won't be able to use their card until they submit outstanding expenses and have their card spend approved. If you set the Smart Limit to $0, the user's card can't be used.
-## Set default group limits
-Domain Admins can set or edit custom Smart Limits for a domain group by going to Settings > Domains > Domain Name > Groups. Just click on the limit in-line for your chosen group and amend the value.
+To check an unapproved card balance and approve expenses:
+1. Click on **Reconciliation** and enter a date range.
+2. Click on the Unapproved total to see what needs approval.
+3. You can add to a new report or approve an existing report from here.
-This limit will apply to all members of the Domain Group who do not have an individual limit set via Settings > Domains > Domain Name > Company Cards.
+You can also increase a Smart Limit at any time by clicking **Edit Limit**.
-## Refreshing Smart Limits
-To let cardholders keep spending, you can approve their pending expenses via the Reconciliation tab. This will free up their limit, allowing them to use their card again.
+### Understanding Your Domain Limit
+To ensure you have the most accurate Domain Limit for your company, follow these steps:
-To check an unapproved card balance and approve expenses, click on Reconciliation and enter a date range, then click though the Unapproved total to see what needs approving. You can add to a new report or approve an existing report from here.
+1. **Connect Your Bank Account:** Go to _**Settings > Account > Payments > Add Verified Bank Account**_ and connect via Plaid.
-You can also increase a Smart Limit at any time by clicking Edit Limit.
+2. **Request a Custom Limit:** If your bank isn’t supported or you’re experiencing connection issues, you can request a custom limit at _**Settings > Domains > Domain Name > Company Cards > Request Limit Increase**_. Note that you’ll need to provide three months of unredacted bank statements for review by our risk management team.
-# Understanding your Domain Limit
+### Factors Affecting Your Domain Limit
+Your Domain Limit may fluctuate due to several factors:
-To get the most accurate Domain Limit for your company, connect your bank account via Plaid under Settings > Account > Payments > Add Verified Bank Account.
+- **Available Funds in Your Verified Business Bank Account:** We regularly monitor balances via Plaid. A sudden decrease in balance within the last 24 hours may impact your limit. For accounts with 'sweep' functionality, maintain a sufficient balance even when sweeping daily.
-If your bank isn't supported or you're having connection issues, you can request a custom limit under Settings > Domains > Domain Name > Company Cards > Request Limit Increase. As a note, you'll need to provide three months of unredacted bank statements for review by our risk management team.
+- **Pending Expenses:** Check the Reconciliation Dashboard for large pending expenses that could affect your available balance. Your Domain Limit automatically adjusts to include pending expenses.
-Your Domain Limit may fluctuate from time to time based on various factors, including:
+- **Processing Settlements:** Settlements typically take about three business days to process and clear. Multiple large settlements over consecutive days may affect your Domain Limit, which updates dynamically once settlements are cleared.
-- Available funds in your Verified Business Bank Account: We regularly check bank balances via Plaid. A sudden drop in balance within the last 24 hours may affect your limit. For 'sweep' accounts, be sure to maintain a substantial balance even if you're sweeping daily.
-- Pending expenses: Review the Reconciliation Dashboard to check for large pending expenses that may impact your available balance. Your Domain Limit will adjust automatically to include pending expenses.
-- Processing settlements: Settlements need about three business days to process and clear. Several large settlements over consecutive days may impact your Domain Limit, which will dynamically update when settlements have cleared.
+Please note: If your Domain Limit is reduced to $0, cardholders cannot make purchases, even if they have higher Smart Limits set on their individual cards.
-As a note, if your Domain Limit is reduced to $0, your cardholders can't make purchases even if they have a larger Smart Limit set on their individual cards.
+## Reconciling Expenses and Settlements
+Reconciling expenses ensures your financial records are accurate and up-to-date. Follow these steps to review and reconcile expenses associated with your Expensify Cards:
-# How to reconcile Expensify Cards
-## How to reconcile expenses
-Reconciling expenses is essential to ensuring your financial records are accurate and up-to-date.
+#### How to Reconcile Expenses:
+1. Go to _**Settings > Domains > Domain Name > Company Cards > Reconciliation > Expenses**_.
+2. Enter your start and end dates, then click *Run*.
+3. The Imported Total will display all Expensify Card transactions for the period.
+4. You'll see a list of all Expensify Cards, the total spend on each card, and a snapshot of expenses that have been approved and have not been approved (Approved Total and Unapproved Total, respectively).
+5. Click on the amounts to view the associated expenses.
-Follow the steps below to quickly review and reconcile expenses associated with your Expensify Cards:
+#### How to Reconcile Settlements:
+A settlement is the payment to Expensify for purchases made using the Expensify Cards. The program can settle on either a daily or monthly basis. Note that not all transactions in a settlement will be approved when running reconciliation.
-1. Go to Settings > Domains > Domain Name > Company Cards > Reconciliation > Expenses
-2. Enter your start and end dates, then click Run
-3. The Imported Total will show all Expensify Card transactions for the period
-4. You'll also see a list of all Expensify Cards, the total spend on each card, and a snapshot of expenses that have and have not been approved (Approved Total and Unapproved Total, respectively)
-By clicking on the amounts, you can view the associated expenses
+1. Log into the Expensify web app.
+2. Click _**Settings > Domains > Domain Name > Company Cards > Reconciliation > `Settlements**_.
+3. Use the Search function to generate a statement for the specific period you need.
+The search results will include the following info for each entry:
+- **Date:** When a purchase was made or funds were debited for payments.
+- **Posted Date:** When the purchase transaction is posted.
+- **Entry ID:** A unique number grouping card payments and transactions settled by those payments.
+- **Amount:** The amount debited from the Business Bank Account for payments.
+- **Merchant:** The business where a purchase was made.
+- **Card:** Refers to the Expensify Card number and cardholder’s email address.
+- **Business Account:** The business bank account connected to Expensify that the settlement is paid from.
+- **Transaction ID:** A special ID that helps Expensify support locate transactions if there’s an issue.
-## How to reconcile settlements
-A settlement is the payment to Expensify for the purchases made using the Expensify Cards.
+Review the individual transactions (debits) and the payments (credits) that settled them. Each cardholder will have a virtual and a physical card listed, handled the same way for settlements, reconciliation, and exporting.
-The Expensify Card program can settle on either a daily or monthly basis. One thing to note is that not all transactions in a settlement will be approved when running reconciliation.
+4. Click **Download CSV** for reconciliation. This will list everything you see on the screen.
+5. To reconcile pre-authorizations, use the Transaction ID column in the CSV file to locate the original purchase.
+6. Review account payments: You’ll see payments made from the accounts listed under _**Settings > Account > Payments > Bank Accounts**_. Payment data won’t show for deleted accounts.
-You can view the Expensify Card settlements under Settings > Domains > Domain Name > Company Cards > Reconciliation > Settlements.
+Use the Reconciliation Dashboard to confirm the status of expenses missing from your accounting system. It allows you to view both approved and unapproved expenses within your selected date range that haven’t been exported yet.
-By clicking each settlement amount, you can see the transactions contained in that specific payment amount.
+### Set a Preferred Workspace
+Many customers find it helpful to separate their company card expenses from other types of expenses for easier coding. To do this, create a separate workspace specifically for card expenses.
-Follow the below steps to run reconciliation on the Expensify Card settlements:
+**Using a Preferred Workspace:**
+Combine this feature with Scheduled Submit to automatically add new card expenses to reports connected to your card-specific workspace.
-1. Log into the Expensify web app
-2. Click Settings > Domains > Domain Name > Company Cards > Reconciliation tab > Settlements
-3. Use the Search function to generate a statement for the specific period you need
-4. The search results will include the following info for each entry:
- - Date: when a purchase was made or funds were debited for payments
- - Posted Date: when the purchase transaction posted
- - Entry ID: a unique number grouping card payments and transactions settled by those payments
- - Amount: the amount debited from the Business Bank Account for payments
- - Merchant: the business where a purchase was made
- - Card: refers to the Expensify Card number and cardholder's email address
- - Business Account: the business bank account connected to Expensify that the settlement is paid from
- - Transaction ID: a special ID that helps Expensify support locate transactions if there's an issue
+### Change the Settlement Account
+You can change your settlement account to any verified business bank account in Expensify. If your current bank account is closing, make sure to set up a replacement as soon as possible.
-5. Review the individual transactions (debits) and the payments (credits) that settled them
-6. Every cardholder will have a virtual and a physical card listed. They're handled the same way for settlements, reconciliation, and exporting.
-7. Click Download CSV for reconciliation
-8. This will list everything that you see on screen
-9. To reconcile pre-authorizations, you can use the Transaction ID column in the CSV file to locate the original purchase
-10. Review account payments
-11. You'll see payments made from the accounts listed under Settings > Account > Payments > Bank Accounts. Payment data won't show for deleted accounts.
+#### Steps to Select a Different Settlement Account:
+1. Go to _**Settings > Domains > Domain Name > Company Cards > Settings**_ tab.
+2. Use the Expensify Card settlement account dropdown to select a new account.
+3. Click **Save**.
-You can use the Reconciliation Dashboard to confirm the status of expenses that are missing from your accounting system. It allows you to view both approved and unapproved expenses within your selected date range that haven't been exported yet.
+### Change the Settlement Frequency
+By default, Expensify Cards settle daily. However, you can switch to monthly settlements.
+#### Monthly Settlement Requirements:
+ - The settlement account must not have had a negative balance in the last 90 days.
+ - There will be an initial settlement for any outstanding spending before the switch.
+ - The settlement date going forward will be the date you switch (e.g., if you switch on September 15th, future settlements will be on the 15th of each month).
-# Deep dive
-## Set a preferred workspace
-Some customers choose to split their company card expenses from other expense types for coding purposes. Most commonly this is done by creating a separate workspace for card expenses.
+#### Steps to Change the Settlement Frequency:
+1. Go to _**Settings > Domains > Domain Name > Company Cards > Settings**_ tab.
+2. Click the **Settlement Frequency** dropdown and select **Monthly**.
+3. Click **Save** to confirm the change.
-You can use the preferred workspace feature in conjunction with Scheduled Submit to make sure all newly imported card expenses are automatically added to reports connected to your card-specific workspace.
+### Declined Expensify Card Transactions
+If you have 'Receive real-time alerts' enabled, you'll get a notification explaining why a transaction was declined. To enable alerts:
+1. Open the mobile app.
+2. Click the three-bar icon in the upper-left corner.
+3. Go to Settings.
+4. Toggle 'Receive real-time alerts' on.
-## How to change your settlement account
-You can change your settlement account to any other verified business bank account in Expensify. If your bank account is closing, make sure you set up the replacement bank account in Expensify as early as possible.
+If you or your employees notice any unfamiliar purchases or need a new card, go to _**Settings > Account > Credit Card Import**_ and click on **Request a New Card**.
-To select a different settlement account:
+#### Common Reasons for Declines:
+- **Insufficient Card Limit:** If a transaction exceeds your card's limit, it will be declined. Always check your balance under _**Settings > Account > Credit Card Import**_ on the web or mobile app. Approve pending expenses to free up your limit.
-1. Go to Settings > Domains > Domain Name > Company Cards > Settings tab
-2. Use the Expensify Card settlement account dropdown to select a new account
-3. Click Save
+- **Card Not Activated or Canceled:** Transactions won't process if the card hasn't been activated or has been canceled.
+- **Incorrect Card Information:** Entering incorrect card details, such as the CVC, ZIP, or expiration date, will lead to declines.
-## Change the settlement frequency
+- **Suspicious Activity:** Expensify may block transactions if unusual activity is detected. This could be due to irregular spending patterns, risky vendors, or multiple rapid transactions. Check your Expensify Home page to approve unusual merchants. If further review is needed, Expensify will perform a manual due diligence check and lock your cards temporarily.
-By default, the Expensify Cards settle on a daily cadence. However, you can choose to have the cards settle on a monthly basis.
-
-1. Monthly settlement is only available if the settlement account hasn't had a negative balance in the last 90 days
-2. There will be an initial settlement to settle any outstanding spend that happened before switching the settlement frequency
-3. The date that the settlement is changed to monthly is the settlement date going forward (e.g. If you switch to monthly settlement on September 15th, Expensify Cards will settle on the 15th of each month going forward)
-
-To change the settlement frequency:
-1. Go to Settings > Domains > Domain Name > Company Cards > Settings tab
-2. Click the Settlement Frequency dropdown and select Monthly
-3. Click Save to confirm the change
-
-
-
-## Declined Expensify Card transactions
-As long as you have 'Receive realtime alerts' enabled, you'll get a notification explaining the decline reason. You can enable alerts in the mobile app by clicking on three-bar icon in the upper-left corner > Settings > toggle Receive realtime alerts on.
-
-If you ever notice any unfamiliar purchases or need a new card, go to Settings > Account > Credit Card Import and click on Request a New Card right away.
-
-Here are some reasons an Expensify Card transaction might be declined:
-
-1. You have an insufficient card limit
- - If a transaction amount exceeds the available limit on your Expensify Card, the transaction will be declined. It's essential to be aware of the available balance before making a purchase to avoid this - you can see the balance under Settings > Account > Credit Card Import on the web app or mobile app. Submitting expenses and having them approved will free up your limit for more spend.
-
-2. Your card hasn't been activated yet, or has been canceled
- - If the card has been canceled or not yet activated, it won't process any transactions.
-
-3. Your card information was entered incorrectly. Entering incorrect card information, such as the CVC, ZIP or expiration date will also lead to declines.
-
-4. There was suspicious activity
- - If Expensify detects unusual or suspicious activity, we may block transactions as a security measure. This could happen due to irregular spending patterns, attempted purchases from risky vendors, or multiple rapid transactions. Check your Expensify Home page to approve unsual merchants and try again.
- If the spending looks suspicious, we may do a manual due diligence check, and our team will do this as quickly as possible - your cards will all be locked while this happens.
-5. The merchant is located in a restricted country
- - Some countries may be off-limits for transactions. If a merchant or their headquarters (billing address) are physically located in one of these countries, Expensify Card purchases will be declined. This list may change at any time, so be sure to check back frequently: Belarus, Burundi, Cambodia, Central African Republic, Democratic Republic of the Congo, Cuba, Iran, Iraq, North Korea, Lebanon, Libya, Russia, Somalia, South Sudan, Syrian Arab Republic, Tanzania, Ukraine, Venezuela, Yemen, and Zimbabwe.
-
-{% include faq-begin.md %}
-## What happens when I reject an Expensify Card expense?
-Rejecting an Expensify Card expense from an Expensify report will simply allow it to be reported on a different report.
-
-If an Expensify Card expense needs to be rejected, you can reject the report or the specific expense so it can be added to a different report. The rejected expense will become Unreported and return to the submitter's Expenses page.
-
-If you want to dispute a card charge, please message Concierge to start the dispute process.
-
-If your employee has accidentally made an unauthorised purchase, you will need to work that out with the employee to determine how they will pay back your company.
-
-
-## What happens when an Expensify Card transaction is refunded?
-
-
-The way a refund is displayed in Expensify depends on the status of the expense (pending or posted) and whether or not the employee also submitted an accompanying SmartScanned receipt. Remember, a SmartScanned receipt will auto-merge with the Expensify Card expense.
-
-- Full refunds:
-If a transaction is pending and doesn't have a receipt attached (except for eReceipts), getting a full refund will make the transaction disappear.
-If a transaction is pending and has a receipt attached (excluding eReceipts), a full refund will zero-out the transaction (amount becomes zero).
-- Partial refunds:
-If a transaction is pending, a partial refund will reduce the amount of the transaction.
-- If a transaction is posted, a partial refund will create a negative transaction for the refund amount.
-
-{% include faq-end.md %}
+- **Merchant in a Restricted Country:** Transactions will be declined if the merchant is in a restricted country.
diff --git a/docs/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features.md b/docs/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features.md
index f24ed57dc655..38686462a1c2 100644
--- a/docs/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features.md
+++ b/docs/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features.md
@@ -3,78 +3,55 @@ title: Cardholder Settings and Features
description: Expensify Card Settings for Employees
---
-# How to use your Expensify Visa® Commercial Card
-Once you receive your card, you can start using it right away.
+# Using Your Expensify Visa® Commercial Card
-First, you'll want to take note of the Smart Limit tied to your card – this is listed in your card settings via **Settings > Account > Credit Card Import**. This limit represents the total amount of unapproved expenses you can have on the card.
+### Activate Your Card
+You can start using your card immediately upon receipt by logging into your Expensify account, heading to your Home tab, and following the prompts on the _**Activate your Expensify Card**_ task.
-It's crucial to continuously submit your expenses promptly, as that'll ensure they can be approved and restore your full limit. You can always chat with your admin if you need your limit adjusted.
+### Review your Card's Smart Limit
+Check your card’s Smart Limit via _**Settings > Account > Credit Card Import**_:
+- This limit is the total amount of unapproved expenses you can have on the card.
+- If a purchase is more than your card's Smart Limit, it will be declined.
-You can swipe your Expensify Card like you would with any other card. As you make purchases, you'll get instant alerts on your phone letting you know if you need to SmartScan receipts. Any SmartScanned receipts should merge with the card expense automatically.
+## Managing Expenses
+- **Submit Expenses Promptly**: Submit your expenses regularly to restore your full limit. Contact your admin if you need a limit adjustment.
+- **Using Your Card**: Swipe your Expensify Card like any other card. You’ll receive instant alerts on your phone for SmartScan receipts. SmartScanned receipts will merge automatically with card expenses.
+- **eReceipts**: If your organization doesn’t require itemized receipts, Expensify will generate IRS-compliant eReceipts for all non-lodging transactions.
+- **Reporting Expenses**: Report and submit Expensify Card expenses as usual. Approved expenses refresh your Smart Limit.
-If your organization doesn't require itemized receipts, you can rely on eReceipts instead. As long as the expense isn't lodging-related, Expensify will automatically generate an IRS-compliant eReceipt for every transaction.
+## Enabling Notifications
+Download the Expensify mobile app and enable push notifications to stay updated on spending activity and potential fraud.
-You can report and submit Expensify Card expenses just like any other expenses. As they're approved, your Smart Limit will be refreshed accordingly, allowing you to keep making purchases.
+#### For iPhone:
+1. Open the Expensify app and tap the three-bar icon in the upper-left corner.
+2. Tap _**Settings > enable Receive real-time alerts**_.
+3. Accept the confirmation to access your iPhone’s notification settings for Expensify.
+4. Turn on **Allow Notifications** and select your notification types.
-## Enable Notifications
-Download the Expensify mobile app and enable push notifications to stay current on your spending activity. Your card is connected to your Expensify account, so each transaction on your card will trigger a push notification. We'll also send you a push notification if we detect potentially fraudulent activity and allow you to confirm your purchase.
-
-Follow the steps below to enable real-time alerts on your mobile device.
-
-**If you have an iPhone**:
-1. Open the Expensify app and tap the three-bar icon in the upper-left corner
-2. Tap **Settings** and enable **Receive realtime alerts**
-3. Accept the confirmation dialogue to go to your iPhone's notification settings for Expensify. Turn on Allow Notifications, and choose the notification types you’d like!
-
-**If you have an Android**:
-1. Go to Settings and open 'Apps and Notifications'.
+#### For Android:
+1. Go to _**Settings > Apps and Notifications**_.
2. Find and open Expensify and enable notifications.
-3. Customize your alerts. Depending on your phone model, you may have extra options to customize the types of notifications you receive.
-
-## Your virtual card
-Once you're assigned a limit, you'll be able to use your virtual card immediately. You can view your virtual card details via **Settings > Account > Credit Card Import > Show Details**. Keep in mind that your virtual card and physical card share a limit.
-
-The virtual Expensify Card includes a card number, expiration date, and security code (CVC). You can use the virtual card for online purchases, in-app transactions, and in-person payments once it's linked to a mobile wallet (Apple Pay or Google Pay).
-
-## How to access your virtual card details
-Here's how to access your virtual card details via the Expensify mobile app:
-1. Tap the three-bar icon in the upper-left corner
-2. Tap **Settings > Connected Cards**
-3. Under **Virtual Card**, tap **Show Details**
-
-From there, you can view your virtual card's number, CVV, expiration date, and billing address.
-
-Here's how to access your virtual card details via the Expensify web app:
-1. Head to **Settings > Account > Credit Card Import**
-2. Under **Virtual Card**, click **Show Details**
-
-From there, you can view your virtual card's card number, CVV, expiration date, and billing address.
-
-## How to add your virtual card to a digital wallet (Apple Pay or Google Pay)
-
-To use the Expensify Card for contactless payment, add it to your digital wallet from the mobile app:
-1. Tap the three-bar icon in the upper-left corner
-2. Tap **Settings > Connected Cards**
-3. Depending on your device, tap **Add to Apple Wallet** or **Add to Gpay**
-4. Complete the remaining steps
-
-## Expensify Card declines
-As long as you've enabled 'Receive real-time alerts', you'll get a notification explaining the reason for each decline. You can enable alerts in the mobile app by clicking on the three-bar icon in the upper-left corner > **Settings** > toggle **Receive real-time alerts**.
-
-Here are some reasons an Expensify Card transaction might be declined:
-
-- You have an insufficient card limit
- - If a transaction exceeds your Expensify Card's available limit, the transaction will be declined. You can see the remaining limit in the mobile app under **Settings > Connected Cards** or in the web app under **Settings > Account > Credit Card Import**.
- - Submitting expenses and getting them approved will free up your limit for more spending.
-
-- Your card isn't active yet or it was disabled by your Domain Admin
-- Your card information was entered incorrectly with the merchant. Entering incorrect card information, such as the CVC, ZIP, or expiration date, will also lead to declines.
-There was suspicious activity
-- If Expensify detects unusual or suspicious activity, we may block transactions as a security measure
- - This could happen due to irregular spending patterns, attempted purchases from risky vendors, or multiple rapid transactions.
- - Check your Expensify Home page to approve unusual merchants and try again.
- - If the spending looks suspicious, we may complete a manual due diligence check, and our team will do this as quickly as possible - your cards will all be locked while this happens.
-- The merchant is located in a restricted country
+3. Customize your alerts based on your phone model.
+
+## Using Your Virtual Card
+- **Access Details**: You can view your virtual card details (card number, expiration date, CVC) via _**Settings > Account > Credit Card Import > Show Details**_. The virtual and physical cards share the same limit.
+- **Purchases**: Use the virtual card for online, in-app, and in-person payments when linked to a mobile wallet (Apple Pay or Google Pay).
+
+#### Adding to a Digital Wallet
+To add your Expensify Card to a digital wallet, follow the steps below:
+ 1. Tap the three-bar icon in the upper-left corner.
+ 2. Tap _**Settings > Connected Cards**_.
+ 3. Tap **Add to Apple Wallet** or **Add to Gpay**, depending on your device.
+ 4. Complete the steps as prompted.
+
+## Handling Declines
+- **Real-Time Alerts**: Enable real-time alerts in the mobile app (_**Settings > toggle Receive real-time alerts**_) to get notifications for declines.
+- **Common Decline Reasons**:
+ - **Insufficient Limit**: Transactions exceeding the available limit will be declined. You can check your limit in _**Settings > Connected Cards**_ or _**Settings > Account > Credit Card Import**_.
+ - **Inactive or Disabled Card**: Ensure your card is active and not disabled by your Domain Admin.
+ - **Incorrect Information**: Entering incorrect card details (CVC, ZIP, expiration date) will result in declines.
+ - **Suspicious Activity**: Transactions may be blocked for unusual or suspicious activity. Check the Expensify Home page to approve unusual merchants. Suspicious spending may prompt a manual due diligence check, during which your cards will be locked.
+ - **Restricted Country**: Transactions from restricted countries will be declined.
{% include faq-begin.md %}
## Can I use Smart Limits with a free Expensify account?
diff --git a/docs/articles/expensify-classic/expensify-card/Dispute-A-Transaction.md b/docs/articles/expensify-classic/expensify-card/Dispute-A-Transaction.md
index 19972b79d5e0..cb86c340dc81 100644
--- a/docs/articles/expensify-classic/expensify-card/Dispute-A-Transaction.md
+++ b/docs/articles/expensify-classic/expensify-card/Dispute-A-Transaction.md
@@ -1,50 +1,50 @@
---
title: Expensify Card - Transaction Disputes & Fraud
-description: Learn how to dispute an Expensify Card transaction.
+description: Understand how to dispute an Expensify Card transaction.
---
-# Overview
-When using your Expensify Visa® Commercial Card, you may come across transaction errors, which can include things like:
-- Unrecognized, unauthorized, or fraudulent charges.
-- Transactions of an incorrect amount.
+# Disputing Expensify Card Transactions
+While using your Expensify Visa® Commercial Card, you might encounter transaction errors, such as:
+- Unauthorized transaction activity
+- Incorrect transaction amounts.
- Duplicate charges for a single transaction.
-- Missing a promised merchant refund.
+- Missing merchant refunds.
-You’ll find all the relevant information on handling these below.
+When that happens, you may need to file a dispute for one or more transactions.
-# How to Navigate the Dispute Process
## Disputing a Transaction
-
-If you spot an Expensify Card transaction error, please contact us immediately at [concierge@expensify.com](mailto:concierge@expensify.com). After that, we'll ask a few questions to better understand the situation. If the transaction has already settled in your account (no longer pending), we can file a dispute with our card processor on your behalf.
-
-If you suspect fraud on your Expensify Card, don't hesitate to cancel it by heading to Settings > Account > Credit Card Import > Request A New Card. Better safe than sorry!
-
-Lastly, if you haven’t enabled Two-Factor Authentication (2FA) yet, please do so ASAP to add an additional layer of security to your account.
+If you notice a transaction error on your Expensify Card, contact us immediately at concierge@expensify.com. We will ask a few questions to understand the situation better, and file a dispute with our card processor on your behalf.
## Types of Disputes
+The most common types of disputes are:
+- Unauthorized or fraudulent disputes
+- Service disputes
-There are two main dispute types:
+### Unauthorized or fraudulent disputes
+- Charges made after your card was lost or stolen.
+- Unauthorized charges while your card is in your possession (indicating compromised information).
+- Continued charges for a canceled recurring subscription.
-1. Unauthorized charges/fraud disputes, which include:
- - Charges made with your card after it was lost or stolen.
- - Unauthorized charges while your card is still in your possession (indicating compromised card information).
- - Continued charges for a canceled recurring subscription.
+**If there are transactions made with your Expensify Card you don't recognize, you'll want to do the following right away:**
+1. Cancel your card by going to _**Settings > Account > Credit Card Import > Request A New Card**_.
+2. Enable Two-Factor Authentication (2FA) for added security under _**Settings > Account > Account Details > Two Factor Authentication**_.
-2. Service disputes, which include:
- - Received damaged or defective merchandise.
- - Charged for merchandise but never received it.
- - Double-charged for a purchase made with another method (e.g., cash).
- - Made a return but didn't receive a timely refund.
- - Multiple charges for a single transaction.
- - Charges settled for an incorrect amount.
+### Service Disputes
+- Received damaged or defective merchandise.
+- Charged for merchandise that was never received.
+- Double-charged for a purchase made with another method (e.g., cash).
+- Made a return but didn't receive a refund.
+- Multiple charges for a single transaction.
+- Charges settled for an incorrect amount.
-You don't need to categorize your dispute; we'll handle that. However, this may help you assess if a situation warrants a dispute. In most cases, the initial step for resolving a dispute should be contacting the merchant, as they can often address the issue promptly.
+For service disputes, contacting the merchant is often the quickest way to resolve the dispute.
## Simplifying the Dispute Process
-
-To ensure the dispute process goes smoothly, please:
-- Provide detailed information about the disputed charge, including why you're disputing it, what occurred, and any steps you've taken to address the issue.
-- If you recognize the merchant but not the charge, and you've transacted with them before, contact the merchant directly, as it may be a non-fraudulent error.
-- Include supporting documentation like receipts or cancellation confirmations when submitting your dispute to enhance the likelihood of a favorable resolution (not required but highly recommended).
+To ensure a smooth dispute process, please:
+- Provide detailed information about the disputed charge, including why you're disputing it and any steps you've taken to address the issue.
+- If you recognize the merchant but not the charge, contact the merchant directly.
+- Include supporting documentation (e.g., receipts, cancellation confirmations) when submitting your dispute to increase the chances of a favorable resolution (recommended but not required).
+- Make sure the transaction isn't pending (pending transactions cannot be disputed).
+
{% include faq-begin.md %}
diff --git a/docs/articles/expensify-classic/expensify-card/Request-the-Card.md b/docs/articles/expensify-classic/expensify-card/Request-the-Card.md
index 724745f458ef..b65c66c986ad 100644
--- a/docs/articles/expensify-classic/expensify-card/Request-the-Card.md
+++ b/docs/articles/expensify-classic/expensify-card/Request-the-Card.md
@@ -2,45 +2,35 @@
title: Request the Card
description: Details on requesting the Expensify Card as an employee
---
-# Overview
-
-Once your organization is approved for the Expensify Visa® Commercial Card, you can request a card!
-
-This article covers how to request, activate, and replace your physical and virtual Expensify Cards.
-
-# How to get your first Expensify Card
-
-An admin in your organization must first enable the Expensify Cards before you can receive a card. After that, an admin may assign you a card by setting a limit. You can think of setting a card limit as “unlocking” access to the card.
-
-If you haven’t been assigned a limit yet, look for the task on your account's homepage that says, “Ask your admin for the card!” This task allows you to message your admin team to make that request.
-
-Once you’re assigned a card limit, we’ll notify you via email to let you know you can request a card. A link within the notification email will take you to your account’s homepage, where you can provide your shipping address for the physical card. Enter your address, and we’ll ship the card to arrive within 3-5 business days.
-
-Once your physical card arrives in the mail, activate it in Expensify by entering the last four digits of the card in the activation task on your account’s homepage.
-
-# Virtual Card
-
-Once assigned a limit, a virtual card is available immediately. You can view the virtual card details via **Settings > Account > Credit Card Import > Show Details**. Feel free to begin transacting with the virtual card while your physical card is in transit – your virtual card and physical card share a limit.
-
-Please note that you must enable two-factor authentication on your account if you want to have the option to dispute transactions made on your virtual card.
-
-# Notifications
-
-To stay up-to-date on your card’s limit and spending activity, download the Expensify mobile app and enable push notifications. Your card is connected to your Expensify account, so each transaction on your card will trigger a push notification. We’ll also send you a push notification if we detect potentially fraudulent activity and allow you to confirm your purchase.
-
-# How to request a replacement Expensify Card
-
-You can request a new card anytime if your Expensify Card is lost, stolen, or damaged. From your Expensify account on the web, head to **Settings > Account > Credit Card Import** and click **Request a New Card**. Confirm the shipping information, complete the prompts, and your new card will arrive in 2 - 3 business days.
-
-Selecting the “lost” or “stolen” options will deactivate your current card to prevent potentially fraudulent activity. However, choosing the “damaged” option will leave your current card active so you can use it while the new one is shipped to you.
-
-If you need to cancel your Expensify Card and cannot access the website or mobile app, call our interactive voice recognition phone service (available 24/7). Call 1-877-751-5848 (US) or +44 808 196 0632 (Internationally).
-
-It's not possible to order a replacement card over the phone, so, if applicable, you would need to handle this step from your Expensify account.
-
-# Card Expiration Date
-
-If you notice that your card expiration date is soon, it's time for a new Expensify card. Expensify will automatically input a notification in your account's Home (Inbox) tab. This notice will ask you to input your address, but this is more if you have changed your address since your card was issued to you. You can ignore it and do nothing; the new Expensify card will ship to your address on file. The new Expensify card will have a new, unique card number and will not be associated with the old one.
+To start using the Expensify Card, do the following:
+1. **Enable Expensify Cards:** An admin must first enable the cards. Then, an admin can assign you a card by setting a limit, which allows access to the card.
+2. **Request the Card:**
+ - If you haven’t been assigned a limit, look for the task on your account’s homepage that says, “Ask your admin for the card!” Use this task to message your admin team.
+ - Once you’re assigned a card limit, you’ll receive an email notification. Click the link in the email to provide your shipping address on your account’s homepage.
+ - Enter your address, and the physical card will be shipped within 3-5 business days.
+3. **Activate the Card:** When your physical card arrives, activate it in Expensify by entering the last four digits of the card in the activation task on your homepage.
+
+### Virtual Cards
+Once you've been assigned a limit, a virtual card is available immediately. You can view its details via _**Settings > Account > Credit Card Import > Show Details**_.
+
+To protect your account and card spend, enable two-factor authentication under _**Settings > Account > Account Details**_.
+
+### Notifications
+- Download the Expensify mobile app and enable push notifications to stay updated on your card’s limit and spending.
+- Each transaction triggers a push notification.
+- You’ll also get notifications for potentially fraudulent activity, allowing you to confirm or dispute charges.
+
+## Request a Replacement Expensify Card
+### If the card is lost, stolen, or damaged Card:
+ - Go to _**Settings > Account > Credit Card Import** and click **Request a New Card**_.
+ - Confirm your shipping information and complete the prompts. The new card will arrive in 2-3 business days.
+ - Selecting “lost” or “stolen” deactivates your current card to prevent fraud. Choosing “damaged” keeps the current card active until the new one arrives.
+ - If you can’t access the website or app, call 1-877-751-5848 (US) or +44 808 196 0632 (Internationally) to cancel your card.
+
+### If the card is expiring
+- If your card is about to expire, Expensify will notify you via your account’s Home (Inbox) tab.
+- Enter your address if it has changed; otherwise, do nothing, and the new card will ship to your address on file.
+- The new card will have a unique number and will not be linked to the old one.
{% include faq-begin.md %}
diff --git a/docs/articles/expensify-classic/expensify-card/Statements.md b/docs/articles/expensify-classic/expensify-card/Statements.md
index 894dfa3d8b9a..eb797f0cee4b 100644
--- a/docs/articles/expensify-classic/expensify-card/Statements.md
+++ b/docs/articles/expensify-classic/expensify-card/Statements.md
@@ -1,73 +1,62 @@
---
title: — Expensify Card Statements and Settlements
-description: Learn how the Expensify Card statement and settlements work!
+description: Understand how to access your Expensify Card Statement
---
-# Overview
-Expensify offers several settlement types and a statement that provides a detailed view of transactions and settlements. We discuss specifics on both below.
+## Expensify Card Statements
+Expensify offers several settlement types and a detailed statement of transactions and settlements.
-# How to use Expensify Visa® Commercial Card Statement and Settlements
-## Using the statement
-If your domain uses the Expensify Card and you have a validated Business Bank Account, access the Expensify Card statement at Settings > Domains > Company Cards > Reconciliation Tab > Settlements.
+### Accessing the Statement
+- If your domain uses the Expensify Card and you have a validated Business Bank Account, access the statement at _**Settings > Domains > Company Cards > Reconciliation Tab > Settlements**_.
+- The statement shows individual transactions (debits) and their corresponding settlements (credits).
-The Expensify Card statement displays individual transactions (debits) and their corresponding settlements (credits). Each Expensify Cardholder has a Digital Card and a Physical Card, which are treated the same in settlement, reconciliation, and exporting to your accounting system.
-
-Here's a breakdown of crucial information in the statement:
-- **Date:** For card payments, it shows the debit date; for card transactions, it displays the purchase date.
-- **Entry ID:** This unique ID groups card payments and transactions together.
-- **Withdrawn Amount:** This applies to card payments, matching the debited amount from the Business Bank Account.
-- **Transaction Amount:** This applies to card transactions, matching the expense purchase amount.
-- **User email:** Applies to card transactions, indicating the cardholder's Expensify email address.
-- **Transaction ID:** A unique ID for locating transactions and assisting Expensify Support in case of issues. Transaction IDs are handy for reconciling pre-authorizations. To find the original purchase, locate the Transaction ID in the Settlements tab of the reconciliation dashboard, download the settlements as a CSV, and search for the Transaction ID within it.
+### Key Information in the Statement
+- **Date:** Debit date for card payments; purchase date for transactions.
+- **Entry ID:** Unique ID grouping card payments and transactions.
+- **Withdrawn Amount:** Amount debited from the Business Bank Account for card payments.
+- **Transaction Amount:** Expense purchase amount for card transactions.
+- **User Email:** Cardholder’s Expensify email address.
+- **Transaction ID:** Unique ID for locating transactions and assisting support.
{:width="100%"}
-The Expensify Card statement only shows payments from existing Business Bank Accounts under Settings > Account > Payments > Business Accounts. If a Business Account is deleted, the statement won't contain data for payments from that account.
-
-## Exporting your statement
-When using the Expensify Card, you can export your statement to a CSV with these steps:
+**Note:** The statement only includes payments from existing Business Bank Accounts under **Settings > Account > Payments > Business Accounts**. Deleted accounts' payments won't appear.
- 1. Login to your account on the web app and click on Settings > Domains > Company Cards.
- 2. Click the Reconciliation tab at the top right, then select Settlements.
- 3. Enter your desired statement dates using the Start and End fields.
- 4. Click Search to access the statement for that period.
- 5. You can view the table or select Download to export it as a CSV.
+## Exporting Statements
+1. Log in to the web app and go to **Settings > Domains > Company Cards**.
+2. Click the **Reconciliation** tab and select **Settlements**.
+3. Enter the start and end dates for your statement.
+4. Click **Search** to view the statement.
+5. Click **Download** to export it as a CSV.
{:width="100%"}
## Expensify Card Settlement Frequency
-Paying your Expensify Card balance is simple with automatic settlement. There are two settlement frequency options:
- - **Daily Settlement:** Your Expensify Card balance is paid in full every business day, meaning you’ll see an itemized debit each business day.
- - **Monthly Settlement:** Expensify Cards are settled monthly, with your settlement date determined during the card activation process. With monthly, you’ll see only one itemized debit per month. (Available for Plaid-connected bank accounts with no recent negative balance.)
+- **Daily Settlement:** Balance paid in full every business day with an itemized debit each day.
+- **Monthly Settlement:** Balance settled monthly on a predetermined date with one itemized debit per month (available for Plaid-connected accounts with no recent negative balance).
-## How settlement works
-Each business day (Monday through Friday, excluding US bank holidays) or on your monthly settlement date, we calculate the total of posted Expensify Card transactions since the last settlement. The settlement amount represents what you must pay to bring your Expensify Card balance back to $0.
+## How Settlement Works
+- Each business day or on your monthly settlement date, the total of posted transactions is calculated.
+- The settlement amount is withdrawn from the Verified Business Bank Account linked to the primary domain admin, resetting your card balance to $0.
+- To change your settlement frequency or bank account, go to _**Settings > Domains > [Domain Name] > Company Cards**_, click the **Settings** tab, and select the new options from the dropdown menu. Click **Save** to confirm.
-We'll automatically withdraw this settlement amount from the Verified Business Bank Account linked to the primary domain admin. You can set up this bank account in the web app under Settings > Account > Payments > Bank Accounts.
+{:width="100%"}
-Once the payment is made, your Expensify Card balance will be $0, and the transactions are considered "settled."
-To change your settlement frequency or bank account, go to Settings > Domains > [Domain Name] > Company Cards. On the Company Cards page, click the Settings tab, choose a new settlement frequency or account from the dropdown menu, and click Save to confirm the change.
+# FAQ
-{:width="100%"}
+## Can you pay your balance early if you’ve reached your Domain Limit?
+- For Monthly Settlement, use the “Settle Now” button to manually initiate settlement.
+- For Daily Settlement, balances settle automatically with no additional action required.
-# Expensify Card Statement and Settlements FAQs
-## Can you pay your balance early if you've reached your Domain Limit?
-If you've chosen Monthly Settlement, you can manually initiate settlement using the "Settle Now" button. We'll settle the outstanding balance and then perform settlement again on your selected predetermined monthly settlement date.
-
-If you opt for Daily Settlement, the Expensify Card statement will automatically settle daily through an automatic withdrawal from your business bank account. No additional action is needed on your part.
-
## Will our domain limit change if our Verified Bank Account has a higher balance?
-Your domain limit may fluctuate based on your cash balance, spending patterns, and history with Expensify. Suppose you've recently transferred funds to the business bank account linked to Expensify card settlements. In that case, you should expect a change in your domain limit within 24 hours of the transfer (assuming your business bank account is connected through Plaid).
-
+Domain limits may change based on cash balance, spending patterns, and history with Expensify. If your bank account is connected through Plaid, expect changes within 24 hours of transferring funds.
+
## How is the “Amount Owed” figure on the card list calculated?
-The amount owed consists of all Expensify Card transactions, both pending and posted, since the last settlement date. The settlement amount withdrawn from your designated Verified Business Bank Account only includes posted transactions.
-
-Your amount owed decreases when the settlement clears. Any pending transactions that don't post timely will automatically expire, reducing your amount owed.
-
-## **How do I view all unsettled expenses?**
-To view unsettled expenses since the last settlement, use the Reconciliation Dashboard's Expenses tab. Follow these steps:
- 1. Note the dates of expenses in your last settlement.
- 2. Switch to the Expenses tab on the Reconciliation Dashboard.
- 3. Set the start date just after the last settled expenses and the end date to today.
- 4. The Imported Total will show the outstanding amount, and you can click through to view individual expenses.
+It includes all pending and posted transactions since the last settlement date. The settlement amount withdrawn only includes posted transactions.
+
+## How do I view all unsettled expenses?
+1. Note the dates of expenses in your last settlement.
+2. Go to the **Expenses** tab on the Reconciliation Dashboard.
+3. Set the start date after the last settled expenses and the end date to today.
+4. The **Imported Total** shows the outstanding amount, and you can click to view individual expenses.
diff --git a/docs/assets/images/ExpensifyHelp-Invoice-1.png b/docs/assets/images/ExpensifyHelp-Invoice-1.png
index e4a042afef82..a6dda9fdca92 100644
Binary files a/docs/assets/images/ExpensifyHelp-Invoice-1.png and b/docs/assets/images/ExpensifyHelp-Invoice-1.png differ
diff --git a/docs/assets/images/ExpensifyHelp-QBO-1.png b/docs/assets/images/ExpensifyHelp-QBO-1.png
index 2aa80e954f1b..e20a5e4222d0 100644
Binary files a/docs/assets/images/ExpensifyHelp-QBO-1.png and b/docs/assets/images/ExpensifyHelp-QBO-1.png differ
diff --git a/docs/assets/images/ExpensifyHelp-QBO-2.png b/docs/assets/images/ExpensifyHelp-QBO-2.png
index 23419b86b6aa..66b71b8d8ec8 100644
Binary files a/docs/assets/images/ExpensifyHelp-QBO-2.png and b/docs/assets/images/ExpensifyHelp-QBO-2.png differ
diff --git a/docs/assets/images/ExpensifyHelp-QBO-3.png b/docs/assets/images/ExpensifyHelp-QBO-3.png
index c612cb760d58..f96550868bbd 100644
Binary files a/docs/assets/images/ExpensifyHelp-QBO-3.png and b/docs/assets/images/ExpensifyHelp-QBO-3.png differ
diff --git a/docs/assets/images/ExpensifyHelp-QBO-4.png b/docs/assets/images/ExpensifyHelp-QBO-4.png
index 7fbc99503f2e..c7b85a93b04b 100644
Binary files a/docs/assets/images/ExpensifyHelp-QBO-4.png and b/docs/assets/images/ExpensifyHelp-QBO-4.png differ
diff --git a/docs/assets/images/ExpensifyHelp-QBO-5.png b/docs/assets/images/ExpensifyHelp-QBO-5.png
index 600a5903c05f..99b83b8be2d1 100644
Binary files a/docs/assets/images/ExpensifyHelp-QBO-5.png and b/docs/assets/images/ExpensifyHelp-QBO-5.png differ
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index a6b9d8632061..680e0ed493a1 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageTypeAPPLCFBundleShortVersionString
- 9.0.4
+ 9.0.6CFBundleSignature????CFBundleURLTypes
@@ -40,7 +40,7 @@
CFBundleVersion
- 9.0.4.7
+ 9.0.6.1FullStoryOrgId
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index ce34b27d72e3..14d830fc2300 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
CFBundlePackageTypeBNDLCFBundleShortVersionString
- 9.0.4
+ 9.0.6CFBundleSignature????CFBundleVersion
- 9.0.4.7
+ 9.0.6.1
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 9b89c5e2790f..33bae95b8ae4 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
CFBundleName$(PRODUCT_NAME)CFBundleShortVersionString
- 9.0.4
+ 9.0.6CFBundleVersion
- 9.0.4.7
+ 9.0.6.1NSExtensionNSExtensionPointIdentifier
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index a5ffdcb4b63c..29ab90c4b7db 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -282,7 +282,7 @@ PODS:
- nanopb/encode (= 2.30908.0)
- nanopb/decode (2.30908.0)
- nanopb/encode (2.30908.0)
- - Onfido (29.7.1)
+ - Onfido (29.7.2)
- onfido-react-native-sdk (10.6.0):
- glog
- hermes-engine
@@ -1871,7 +1871,7 @@ PODS:
- RNGoogleSignin (10.0.1):
- GoogleSignIn (~> 7.0)
- React-Core
- - RNLiveMarkdown (0.1.88):
+ - RNLiveMarkdown (0.1.91):
- glog
- hermes-engine
- RCT-Folly (= 2022.05.16.00)
@@ -1889,9 +1889,9 @@ PODS:
- React-utils
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- - RNLiveMarkdown/common (= 0.1.88)
+ - RNLiveMarkdown/common (= 0.1.91)
- Yoga
- - RNLiveMarkdown/common (0.1.88):
+ - RNLiveMarkdown/common (0.1.91):
- glog
- hermes-engine
- RCT-Folly (= 2022.05.16.00)
@@ -2531,7 +2531,7 @@ SPEC CHECKSUMS:
MapboxMaps: 87ef0003e6db46e45e7a16939f29ae87e38e7ce2
MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
- Onfido: 342cbecd7a4383e98dfe7f9c35e98aaece599062
+ Onfido: f3af62ea1c9a419589c133e3e511e5d2c4f3f8af
onfido-react-native-sdk: 3e3b0dd70afa97410fb318d54c6a415137968ef2
Plaid: 7829e84db6d766a751c91a402702946d2977ddcb
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
@@ -2614,7 +2614,7 @@ SPEC CHECKSUMS:
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: 74b7b3d06d667ba0bbf41da7718f2607ae0dfe8f
RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
- RNLiveMarkdown: e33d2c97863d5480f8f4b45f8b25f801cc43c7f5
+ RNLiveMarkdown: 24fbb7370eefee2f325fb64cfe904b111ffcd81b
RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
rnmapbox-maps: df8fe93dbd251f25022f4023d31bc04160d4d65c
RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216
@@ -2631,7 +2631,7 @@ SPEC CHECKSUMS:
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
VisionCamera: 1394a316c7add37e619c48d7aa40b38b954bf055
- Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70
+ Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312
PODFILE CHECKSUM: d5e281e5370cb0211a104efd90eb5fa7af936e14
diff --git a/package-lock.json b/package-lock.json
index abc223a50b38..04b1d5cc63fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,19 @@
{
"name": "new.expensify",
- "version": "9.0.4-7",
+ "version": "9.0.6-1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "9.0.4-7",
+ "version": "9.0.6-1",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@dotlottie/react-player": "^1.6.3",
- "@expensify/react-native-live-markdown": "0.1.88",
+ "@expensify/react-native-live-markdown": "0.1.91",
"@expo/metro-runtime": "~3.1.1",
"@formatjs/intl-datetimeformat": "^6.10.0",
"@formatjs/intl-listformat": "^7.2.2",
@@ -55,7 +55,7 @@
"date-fns-tz": "^2.0.0",
"dom-serializer": "^0.2.2",
"domhandler": "^4.3.0",
- "expensify-common": "2.0.19",
+ "expensify-common": "2.0.26",
"expo": "^50.0.3",
"expo-av": "~13.10.4",
"expo-image": "1.11.0",
@@ -79,7 +79,7 @@
"react-content-loader": "^7.0.0",
"react-dom": "18.1.0",
"react-error-boundary": "^4.0.11",
- "react-fast-pdf": "1.0.13",
+ "react-fast-pdf": "1.0.14",
"react-map-gl": "^7.1.3",
"react-native": "0.73.4",
"react-native-android-location-enabler": "^2.0.1",
@@ -102,7 +102,7 @@
"react-native-linear-gradient": "^2.8.1",
"react-native-localize": "^2.2.6",
"react-native-modal": "^13.0.0",
- "react-native-onyx": "2.0.55",
+ "react-native-onyx": "2.0.56",
"react-native-pager-view": "6.2.3",
"react-native-pdf": "6.7.3",
"react-native-performance": "^5.1.0",
@@ -200,7 +200,7 @@
"babel-jest": "29.4.1",
"babel-loader": "^9.1.3",
"babel-plugin-module-resolver": "^5.0.0",
- "babel-plugin-react-compiler": "^0.0.0-experimental-c23de8d-20240515",
+ "babel-plugin-react-compiler": "0.0.0-experimental-696af53-20240625",
"babel-plugin-react-native-web": "^0.18.7",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-remove-console": "^6.9.4",
@@ -219,7 +219,7 @@
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jest": "^28.6.0",
"eslint-plugin-jsdoc": "^46.2.6",
- "eslint-plugin-react-compiler": "^0.0.0-experimental-53bb89e-20240515",
+ "eslint-plugin-react-compiler": "0.0.0-experimental-0998c1e-20240625",
"eslint-plugin-react-native-a11y": "^3.3.0",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-testing-library": "^6.2.2",
@@ -236,6 +236,7 @@
"portfinder": "^1.0.28",
"prettier": "^2.8.8",
"pusher-js-mock": "^0.3.3",
+ "react-compiler-healthcheck": "^0.0.0-experimental-b130d5f-20240625",
"react-is": "^18.3.1",
"react-native-clean-project": "^4.0.0-alpha4.0",
"react-test-renderer": "18.2.0",
@@ -3783,9 +3784,9 @@
}
},
"node_modules/@expensify/react-native-live-markdown": {
- "version": "0.1.88",
- "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.88.tgz",
- "integrity": "sha512-78X5ACV+OL+aL6pfJAXyHkNuMGUc4Rheo4qLkIwLpmUIAiAxmY0B2lch5XHSNGf1a5ofvVbdQ6kl84+4E6DwlQ==",
+ "version": "0.1.91",
+ "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.91.tgz",
+ "integrity": "sha512-6uQTgwhpvLqQKdtNqSgh45sRuQRXzv/WwyhdvQNge6EYtulyGFqT82GIP+LIGW8Xnl73nzFZTuMKwWxFFR/Cow==",
"workspaces": [
"parser",
"example",
@@ -20331,9 +20332,9 @@
}
},
"node_modules/babel-plugin-react-compiler": {
- "version": "0.0.0-experimental-c23de8d-20240515",
- "resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-0.0.0-experimental-c23de8d-20240515.tgz",
- "integrity": "sha512-0XN2gmpT55QtAz5n7d5g91y1AuO9tRhWBaLgCRyc4ExHrlr7+LfxW+YTb3mOwxngkkiggwM8HyYsaEK9MqhnlQ==",
+ "version": "0.0.0-experimental-696af53-20240625",
+ "resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-0.0.0-experimental-696af53-20240625.tgz",
+ "integrity": "sha512-OUDKms8qmcm5bX0D+sJWC1YcKcd7AZ2aJ7eY6gkR+Xr7PDfkXLbqAld4Qs9B0ntjVbUMEtW/PjlQrxDtY4raHg==",
"dev": true,
"dependencies": {
"@babel/generator": "7.2.0",
@@ -25297,9 +25298,9 @@
}
},
"node_modules/eslint-plugin-react-compiler": {
- "version": "0.0.0-experimental-53bb89e-20240515",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react-compiler/-/eslint-plugin-react-compiler-0.0.0-experimental-53bb89e-20240515.tgz",
- "integrity": "sha512-L3HV9qja1dnClRlR9aaWEJeJoGPH9cgjKq0sYqIOOH9uyWdVMH9CudsFr6yLva7dj05FpLZkiIaRSZJ3P/v6yQ==",
+ "version": "0.0.0-experimental-0998c1e-20240625",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react-compiler/-/eslint-plugin-react-compiler-0.0.0-experimental-0998c1e-20240625.tgz",
+ "integrity": "sha512-npq2RomExoQI3jETs4OrifaygyJYgOcX/q74Q9OC7GmffLh5zSJaQpzjs2fi61NMNkJyIvTBD0C6sKTGGcetOw==",
"dev": true,
"dependencies": {
"@babel/core": "^7.24.4",
@@ -25973,9 +25974,9 @@
}
},
"node_modules/expensify-common": {
- "version": "2.0.19",
- "resolved": "https://registry.npmjs.org/expensify-common/-/expensify-common-2.0.19.tgz",
- "integrity": "sha512-GdWlYiHOAapy/jxjcvL9NKGOofhoEuKIwvJNGNVHbDXcA+0NxVCNYrHt1yrLnVcE4KtK6PGT6fQ2Lp8NTCoA+g==",
+ "version": "2.0.26",
+ "resolved": "https://registry.npmjs.org/expensify-common/-/expensify-common-2.0.26.tgz",
+ "integrity": "sha512-3GORs2xfx78SoKLDh4lXpk4Bx61sAVNnlo23VB803zs7qZz8/Oq3neKedtEJuRAmUps0C1Y5y9xZE8nrPO31nQ==",
"dependencies": {
"awesome-phonenumber": "^5.4.0",
"classnames": "2.5.0",
@@ -25987,7 +25988,7 @@
"prop-types": "15.8.1",
"react": "16.12.0",
"react-dom": "16.12.0",
- "semver": "^7.6.0",
+ "semver": "^7.6.2",
"simply-deferred": "git+https://github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
"ua-parser-js": "^1.0.37"
}
@@ -36758,6 +36759,98 @@
"react-dom": ">=16.8.0"
}
},
+ "node_modules/react-compiler-healthcheck": {
+ "version": "0.0.0-experimental-b130d5f-20240625",
+ "resolved": "https://registry.npmjs.org/react-compiler-healthcheck/-/react-compiler-healthcheck-0.0.0-experimental-b130d5f-20240625.tgz",
+ "integrity": "sha512-vf3Ipg+f19yOYQeRP938e5jWNEpwR6EX5pwBZdJUF9rt11vJ3ckgUVcF5qGWUU/7DB0N9MH1koBqwqMYabrBiQ==",
+ "dev": true,
+ "dependencies": {
+ "@babel/core": "^7.24.4",
+ "@babel/parser": "^7.24.4",
+ "chalk": "4",
+ "fast-glob": "^3.3.2",
+ "ora": "5.4.1",
+ "yargs": "^17.7.2",
+ "zod": "^3.22.4",
+ "zod-validation-error": "^3.0.3"
+ },
+ "bin": {
+ "react-compiler-healthcheck": "dist/index.js"
+ },
+ "engines": {
+ "node": "^14.17.0 || ^16.0.0 || >= 18.0.0"
+ }
+ },
+ "node_modules/react-compiler-healthcheck/node_modules/ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "dependencies": {
+ "color-convert": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/react-compiler-healthcheck/node_modules/chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/chalk?sponsor=1"
+ }
+ },
+ "node_modules/react-compiler-healthcheck/node_modules/color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "dependencies": {
+ "color-name": "~1.1.4"
+ },
+ "engines": {
+ "node": ">=7.0.0"
+ }
+ },
+ "node_modules/react-compiler-healthcheck/node_modules/color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "node_modules/react-compiler-healthcheck/node_modules/has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/react-compiler-healthcheck/node_modules/supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "dependencies": {
+ "has-flag": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/react-compiler-runtime": {
"resolved": "lib/react-compiler-runtime",
"link": true
@@ -36894,9 +36987,9 @@
}
},
"node_modules/react-fast-pdf": {
- "version": "1.0.13",
- "resolved": "https://registry.npmjs.org/react-fast-pdf/-/react-fast-pdf-1.0.13.tgz",
- "integrity": "sha512-rF7NQZ26rJAI8ysRJaG71dl2c7AIq48ibbn7xCyF3lEZ/yOjA8BeR0utRwDjaHGtswQscgETboilhaaH5UtIYg==",
+ "version": "1.0.14",
+ "resolved": "https://registry.npmjs.org/react-fast-pdf/-/react-fast-pdf-1.0.14.tgz",
+ "integrity": "sha512-iWomykxvnZtokIKpRK5xpaRfXz9ufrY7AVANtIBYsAZtX5/7VDlpIQwieljfMZwFc96TyceCnneufsgXpykTQw==",
"dependencies": {
"react-pdf": "^7.7.0",
"react-window": "^1.8.10"
@@ -37277,9 +37370,9 @@
}
},
"node_modules/react-native-onyx": {
- "version": "2.0.55",
- "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.55.tgz",
- "integrity": "sha512-W0+hFY98uC3uije2JBFS1ON19iAe8u6Ls50T2Qrx9NMtzUFqEchMuR75L4F/kMvi/uwtQII+Cl02Pd52h/tdPg==",
+ "version": "2.0.56",
+ "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.56.tgz",
+ "integrity": "sha512-3rn1+J4tli9zPS9w5x6tOAUz01wVHkiTFgtHoIwjD7HdLUO/9nk6H8JX6Oqb9Vzq2XQOSavUFRepIHnGvzNtgg==",
"dependencies": {
"ascii-table": "0.0.9",
"fast-equals": "^4.0.3",
@@ -39380,11 +39473,9 @@
}
},
"node_modules/semver": {
- "version": "7.6.0",
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "version": "7.6.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+ "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
"bin": {
"semver": "bin/semver.js"
},
diff --git a/package.json b/package.json
index bc7306ee3782..cb82f42e92ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "9.0.4-7",
+ "version": "9.0.6-1",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -60,13 +60,14 @@
"workflow-test": "./workflow_tests/scripts/runWorkflowTests.sh",
"workflow-test:generate": "ts-node workflow_tests/utils/preGenerateTest.ts",
"setup-https": "mkcert -install && mkcert -cert-file config/webpack/certificate.pem -key-file config/webpack/key.pem dev.new.expensify.com localhost 127.0.0.1",
- "e2e-test-runner-build": "ncc build tests/e2e/testRunner.ts -o tests/e2e/dist/"
+ "e2e-test-runner-build": "ncc build tests/e2e/testRunner.ts -o tests/e2e/dist/",
+ "react-compiler-healthcheck": "react-compiler-healthcheck --verbose"
},
"dependencies": {
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@dotlottie/react-player": "^1.6.3",
- "@expensify/react-native-live-markdown": "0.1.88",
+ "@expensify/react-native-live-markdown": "0.1.91",
"@expo/metro-runtime": "~3.1.1",
"@formatjs/intl-datetimeformat": "^6.10.0",
"@formatjs/intl-listformat": "^7.2.2",
@@ -108,7 +109,7 @@
"date-fns-tz": "^2.0.0",
"dom-serializer": "^0.2.2",
"domhandler": "^4.3.0",
- "expensify-common": "2.0.19",
+ "expensify-common": "2.0.26",
"expo": "^50.0.3",
"expo-av": "~13.10.4",
"expo-image": "1.11.0",
@@ -132,7 +133,7 @@
"react-content-loader": "^7.0.0",
"react-dom": "18.1.0",
"react-error-boundary": "^4.0.11",
- "react-fast-pdf": "1.0.13",
+ "react-fast-pdf": "1.0.14",
"react-map-gl": "^7.1.3",
"react-native": "0.73.4",
"react-native-android-location-enabler": "^2.0.1",
@@ -155,7 +156,7 @@
"react-native-linear-gradient": "^2.8.1",
"react-native-localize": "^2.2.6",
"react-native-modal": "^13.0.0",
- "react-native-onyx": "2.0.55",
+ "react-native-onyx": "2.0.56",
"react-native-pager-view": "6.2.3",
"react-native-pdf": "6.7.3",
"react-native-performance": "^5.1.0",
@@ -253,7 +254,7 @@
"babel-jest": "29.4.1",
"babel-loader": "^9.1.3",
"babel-plugin-module-resolver": "^5.0.0",
- "babel-plugin-react-compiler": "^0.0.0-experimental-c23de8d-20240515",
+ "babel-plugin-react-compiler": "0.0.0-experimental-696af53-20240625",
"babel-plugin-react-native-web": "^0.18.7",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-remove-console": "^6.9.4",
@@ -272,7 +273,7 @@
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jest": "^28.6.0",
"eslint-plugin-jsdoc": "^46.2.6",
- "eslint-plugin-react-compiler": "^0.0.0-experimental-53bb89e-20240515",
+ "eslint-plugin-react-compiler": "0.0.0-experimental-0998c1e-20240625",
"eslint-plugin-react-native-a11y": "^3.3.0",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-testing-library": "^6.2.2",
@@ -289,6 +290,7 @@
"portfinder": "^1.0.28",
"prettier": "^2.8.8",
"pusher-js-mock": "^0.3.3",
+ "react-compiler-healthcheck": "^0.0.0-experimental-b130d5f-20240625",
"react-is": "^18.3.1",
"react-native-clean-project": "^4.0.0-alpha4.0",
"react-test-renderer": "18.2.0",
diff --git a/patches/@expensify+react-native-live-markdown+0.1.85.patch b/patches/@expensify+react-native-live-markdown+0.1.85.patch
deleted file mode 100644
index f745786a088e..000000000000
--- a/patches/@expensify+react-native-live-markdown+0.1.85.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/@expensify/react-native-live-markdown/lib/module/web/cursorUtils.js b/node_modules/@expensify/react-native-live-markdown/lib/module/web/cursorUtils.js
-index e975fb2..6a4b510 100644
---- a/node_modules/@expensify/react-native-live-markdown/lib/module/web/cursorUtils.js
-+++ b/node_modules/@expensify/react-native-live-markdown/lib/module/web/cursorUtils.js
-@@ -53,7 +53,7 @@ function setCursorPosition(target, start, end = null) {
- // 3. Caret at the end of whole input, when pressing enter
- // 4. All other placements
- if (prevChar === '\n' && prevTextLength !== undefined && prevTextLength < textCharacters.length) {
-- if (nextChar !== '\n') {
-+ if (nextChar !== '\n' && i !== n - 1 && nextChar) {
- range.setStart(textNodes[i + 1], 0);
- } else if (i !== textNodes.length - 1) {
- range.setStart(textNodes[i], 1);
diff --git a/patches/@expensify+react-native-live-markdown+0.1.91.patch b/patches/@expensify+react-native-live-markdown+0.1.91.patch
new file mode 100644
index 000000000000..c77e46accae3
--- /dev/null
+++ b/patches/@expensify+react-native-live-markdown+0.1.91.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/@expensify/react-native-live-markdown/src/web/cursorUtils.ts b/node_modules/@expensify/react-native-live-markdown/src/web/cursorUtils.ts
+index 1cda659..ba5c3c3 100644
+--- a/node_modules/@expensify/react-native-live-markdown/src/web/cursorUtils.ts
++++ b/node_modules/@expensify/react-native-live-markdown/src/web/cursorUtils.ts
+@@ -66,7 +66,7 @@ function setCursorPosition(target: HTMLElement, start: number, end: number | nul
+ // 3. Caret at the end of whole input, when pressing enter
+ // 4. All other placements
+ if (prevChar === '\n' && prevTextLength !== undefined && prevTextLength < textCharacters.length) {
+- if (nextChar !== '\n') {
++ if (nextChar && nextChar !== '\n' && i !== n - 1) {
+ range.setStart(textNodes[i + 1] as Node, 0);
+ } else if (i !== textNodes.length - 1) {
+ range.setStart(textNodes[i] as Node, 1);
diff --git a/patches/eslint-plugin-react-compiler+0.0.0-experimental-53bb89e-20240515.patch b/patches/eslint-plugin-react-compiler+0.0.0-experimental-53bb89e-20240515.patch
deleted file mode 100644
index f81f70944dd2..000000000000
--- a/patches/eslint-plugin-react-compiler+0.0.0-experimental-53bb89e-20240515.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/eslint-plugin-react-compiler/dist/index.js b/node_modules/eslint-plugin-react-compiler/dist/index.js
-index a0f47a7..f649250 100644
---- a/node_modules/eslint-plugin-react-compiler/dist/index.js
-+++ b/node_modules/eslint-plugin-react-compiler/dist/index.js
-@@ -69108,7 +69108,7 @@ const rule = {
- return false;
- }
- let babelAST;
-- if (context.filename.endsWith(".tsx") || context.filename.endsWith(".ts")) {
-+ if (filename.endsWith(".tsx") || filename.endsWith(".ts")) {
- try {
- const { parse: babelParse } = require("@babel/parser");
- babelAST = babelParse(sourceCode, {
diff --git a/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625.patch b/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625.patch
new file mode 100644
index 000000000000..d7c02701a636
--- /dev/null
+++ b/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625.patch
@@ -0,0 +1,90 @@
+diff --git a/node_modules/react-compiler-healthcheck/dist/index.js b/node_modules/react-compiler-healthcheck/dist/index.js
+index b427385..4bf23db 100755
+--- a/node_modules/react-compiler-healthcheck/dist/index.js
++++ b/node_modules/react-compiler-healthcheck/dist/index.js
+@@ -69154,7 +69154,7 @@ var reactCompilerCheck = {
+ compile(source, path);
+ }
+ },
+- report() {
++ report(verbose) {
+ const totalComponents =
+ SucessfulCompilation.length +
+ countUniqueLocInEvents(OtherFailures) +
+@@ -69164,6 +69164,50 @@ var reactCompilerCheck = {
+ `Successfully compiled ${SucessfulCompilation.length} out of ${totalComponents} components.`
+ )
+ );
++
++ if (verbose) {
++ for (const compilation of [...SucessfulCompilation, ...ActionableFailures, ...OtherFailures]) {
++ const filename = compilation.fnLoc?.filename;
++
++ if (compilation.kind === "CompileSuccess") {
++ const name = compilation.fnName;
++ const isHook = name?.startsWith('use');
++
++ if (name) {
++ console.log(
++ chalk.green(
++ `Successfully compiled ${isHook ? "hook" : "component" } [${name}](${filename})`
++ )
++ );
++ } else {
++ console.log(chalk.green(`Successfully compiled ${compilation.fnLoc?.filename}`));
++ }
++ }
++
++ if (compilation.kind === "CompileError") {
++ const { reason, severity, loc } = compilation.detail;
++
++ const lnNo = loc.start?.line;
++ const colNo = loc.start?.column;
++
++ const isTodo = severity === ErrorSeverity.Todo;
++
++ console.log(
++ chalk[isTodo ? 'yellow' : 'red'](
++ `Failed to compile ${
++ filename
++ }${
++ lnNo !== undefined ? `:${lnNo}${
++ colNo !== undefined ? `:${colNo}` : ""
++ }.` : ""
++ }`
++ ),
++ chalk[isTodo ? 'yellow' : 'red'](reason? `Reason: ${reason}` : "")
++ );
++ console.log("\n");
++ }
++ }
++ }
+ },
+ };
+ const JsFileExtensionRE = /(js|ts|jsx|tsx)$/;
+@@ -69200,9 +69244,16 @@ function main() {
+ type: "string",
+ default: "**/+(*.{js,mjs,jsx,ts,tsx}|package.json)",
+ })
++ .option('verbose', {
++ description: 'run with verbose logging',
++ type: 'boolean',
++ default: false,
++ alias: 'v',
++ })
+ .parseSync();
+ const spinner = ora("Checking").start();
+ let src = argv.src;
++ let verbose = argv.verbose;
+ const globOptions = {
+ onlyFiles: true,
+ ignore: [
+@@ -69222,7 +69273,7 @@ function main() {
+ libraryCompatCheck.run(source, path);
+ }
+ spinner.stop();
+- reactCompilerCheck.report();
++ reactCompilerCheck.report(verbose);
+ strictModeCheck.report();
+ libraryCompatCheck.report();
+ });
diff --git a/patches/react-native-keyboard-controller+1.12.2.patch.patch b/patches/react-native-keyboard-controller+1.12.2.patch
similarity index 100%
rename from patches/react-native-keyboard-controller+1.12.2.patch.patch
rename to patches/react-native-keyboard-controller+1.12.2.patch
diff --git a/patches/react-native-reanimated+3.7.2+001+fix-boost-dependency.patch b/patches/react-native-reanimated+3.8.1+001+fix-boost-dependency.patch
similarity index 100%
rename from patches/react-native-reanimated+3.7.2+001+fix-boost-dependency.patch
rename to patches/react-native-reanimated+3.8.1+001+fix-boost-dependency.patch
diff --git a/patches/react-native-reanimated+3.7.2+002+copy-state.patch b/patches/react-native-reanimated+3.8.1+002+copy-state.patch
similarity index 100%
rename from patches/react-native-reanimated+3.7.2+002+copy-state.patch
rename to patches/react-native-reanimated+3.8.1+002+copy-state.patch
diff --git a/patches/react-native-reanimated+3.7.2.patch b/patches/react-native-reanimated+3.8.1.patch
similarity index 100%
rename from patches/react-native-reanimated+3.7.2.patch
rename to patches/react-native-reanimated+3.8.1.patch
diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh
new file mode 100755
index 000000000000..9145629015ee
--- /dev/null
+++ b/scripts/applyPatches.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# This script is a simple wrapper around patch-package that fails if any errors or warnings are detected.
+# This is useful because patch-package does not fail on errors or warnings by default,
+# which means that broken patches are easy to miss, and leads to developer frustration and wasted time.
+
+SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
+source "$SCRIPTS_DIR/shellUtils.sh"
+
+# Wrapper to run patch-package.
+function patchPackage {
+ OS="$(uname)"
+ if [[ "$OS" == "Darwin" || "$OS" == "Linux" ]]; then
+ npx patch-package --error-on-fail
+ else
+ error "Unsupported OS: $OS"
+ exit 1
+ fi
+}
+
+# Run patch-package and capture its output and exit code, while still displaying the original output to the terminal
+TEMP_OUTPUT="$(mktemp)"
+patchPackage 2>&1 | tee "$TEMP_OUTPUT"
+EXIT_CODE=${PIPESTATUS[0]}
+OUTPUT="$(cat "$TEMP_OUTPUT")"
+rm -f "$TEMP_OUTPUT"
+
+# Check if the output contains a warning message
+echo "$OUTPUT" | grep -q "Warning:"
+WARNING_FOUND=$?
+
+printf "\n"
+
+# Determine the final exit code
+if [ "$EXIT_CODE" -eq 0 ]; then
+ if [ $WARNING_FOUND -eq 0 ]; then
+ # patch-package succeeded but warning was found
+ error "It looks like you upgraded a dependency without upgrading the patch. Please review the patch, determine if it's still needed, and port it to the new version of the dependency."
+ exit 1
+ else
+ # patch-package succeeded and no warning was found
+ success "patch-package succeeded without errors or warnings"
+ exit 0
+ fi
+else
+ # patch-package failed
+ error "patch-package failed to apply a patch"
+ exit "$EXIT_CODE"
+fi
diff --git a/scripts/postInstall.sh b/scripts/postInstall.sh
index 339fdf25cb10..782c8ef5822c 100755
--- a/scripts/postInstall.sh
+++ b/scripts/postInstall.sh
@@ -1,11 +1,14 @@
#!/bin/bash
+# Exit immediately if any command exits with a non-zero status
+set -e
+
# Go to project root
ROOT_DIR=$(dirname "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)")
cd "$ROOT_DIR" || exit 1
-# Run patch-package
-npx patch-package
+# Apply packages using patch-package
+scripts/applyPatches.sh
# Install node_modules in subpackages, unless we're in a CI/CD environment,
# where the node_modules for subpackages are cached separately.
diff --git a/src/App.tsx b/src/App.tsx
index 21025d34a661..98b5d4afeb1d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -20,6 +20,7 @@ import OnyxProvider from './components/OnyxProvider';
import PopoverContextProvider from './components/PopoverProvider';
import SafeArea from './components/SafeArea';
import ScrollOffsetContextProvider from './components/ScrollOffsetContextProvider';
+import {SearchContextProvider} from './components/Search/SearchContext';
import ThemeIllustrationsProvider from './components/ThemeIllustrationsProvider';
import ThemeProvider from './components/ThemeProvider';
import ThemeStylesProvider from './components/ThemeStylesProvider';
@@ -91,6 +92,7 @@ function App({url}: AppProps) {
VolumeContextProvider,
VideoPopoverMenuContextProvider,
KeyboardProvider,
+ SearchContextProvider,
]}
>
diff --git a/src/CONST.ts b/src/CONST.ts
index 4e7557e0b4ba..50df9118a74e 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -74,6 +74,7 @@ const onboardingChoices = {
type OnboardingPurposeType = ValueOf;
const CONST = {
+ RECENT_WAYPOINTS_NUMBER: 20,
DEFAULT_DB_NAME: 'OnyxDB',
DEFAULT_TABLE_NAME: 'keyvaluepairs',
DEFAULT_ONYX_DUMP_FILE_NAME: 'onyx-state.txt',
@@ -608,6 +609,7 @@ const CONST = {
TRAVEL_TERMS_URL: `${USE_EXPENSIFY_URL}/travelterms`,
EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT: 'https://www.expensify.com/tools/integrations/downloadPackage',
EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT_FILE_NAME: 'ExpensifyPackageForSageIntacct',
+ SAGE_INTACCT_INSTRUCTIONS: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct',
HOW_TO_CONNECT_TO_SAGE_INTACCT: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct#how-to-connect-to-sage-intacct',
PRICING: `https://www.expensify.com/pricing`,
@@ -719,7 +721,7 @@ const CONST = {
TASK_EDITED: 'TASKEDITED',
TASK_REOPENED: 'TASKREOPENED',
TRIPPREVIEW: 'TRIPPREVIEW',
- UNAPPROVED: 'UNAPPROVED', // OldDot Action
+ UNAPPROVED: 'UNAPPROVED',
UNHOLD: 'UNHOLD',
UNSHARE: 'UNSHARE', // OldDot Action
UPDATE_GROUP_CHAT_MEMBER_ROLE: 'UPDATEGROUPCHATMEMBERROLE',
@@ -790,6 +792,7 @@ const CONST = {
UPDATE_TIME_ENABLED: 'POLICYCHANGELOG_UPDATE_TIME_ENABLED',
UPDATE_TIME_RATE: 'POLICYCHANGELOG_UPDATE_TIME_RATE',
LEAVE_POLICY: 'POLICYCHANGELOG_LEAVE_POLICY',
+ CORPORATE_UPGRADE: 'POLICYCHANGELOG_CORPORATE_UPGRADE',
},
ROOM_CHANGE_LOG: {
INVITE_TO_ROOM: 'INVITETOROOM',
@@ -837,6 +840,8 @@ const CONST = {
IOU: 'iou',
TASK: 'task',
INVOICE: 'invoice',
+ PAYCHECK: 'paycheck',
+ BILL: 'bill',
},
CHAT_TYPE: chatTypes,
WORKSPACE_CHAT_ROOMS: {
@@ -1120,8 +1125,6 @@ const CONST = {
// around each header.
EMOJI_NUM_PER_ROW: 8,
- EMOJI_FREQUENT_ROW_COUNT: 3,
-
EMOJI_DEFAULT_SKIN_TONE: -1,
// Amount of emojis to render ahead at the end of the update cycle
@@ -1343,18 +1346,75 @@ const CONST = {
},
},
+ SAGE_INTACCT_MAPPING_VALUE: {
+ NONE: 'NONE',
+ DEFAULT: 'DEFAULT',
+ TAG: 'TAG',
+ REPORT_FIELD: 'REPORT_FIELD',
+ },
+
+ SAGE_INTACCT_CONFIG: {
+ MAPPINGS: {
+ DEPARTMENTS: 'departments',
+ CLASSES: 'classes',
+ LOCATIONS: 'locations',
+ CUSTOMERS: 'customers',
+ PROJECTS: 'projects',
+ },
+ SYNC_ITEMS: 'syncItems',
+ TAX: 'tax',
+ EXPORT: 'export',
+ EXPORT_DATE: 'exportDate',
+ NON_REIMBURSABLE_CREDIT_CARD_VENDOR: 'nonReimbursableCreditCardChargeDefaultVendor',
+ NON_REIMBURSABLE_VENDOR: 'nonReimbursableVendor',
+ REIMBURSABLE_VENDOR: 'reimbursableExpenseReportDefaultVendor',
+ NON_REIMBURSABLE_ACCOUNT: 'nonReimbursableAccount',
+ NON_REIMBURSABLE: 'nonReimbursable',
+ EXPORTER: 'exporter',
+ REIMBURSABLE: 'reimbursable',
+ AUTO_SYNC: 'autoSync',
+ AUTO_SYNC_ENABLED: 'enabled',
+ IMPORT_EMPLOYEES: 'importEmployees',
+ APPROVAL_MODE: 'approvalMode',
+ SYNC: 'sync',
+ SYNC_REIMBURSED_REPORTS: 'syncReimbursedReports',
+ REIMBURSEMENT_ACCOUNT_ID: 'reimbursementAccountID',
+ },
+
+ SAGE_INTACCT: {
+ APPROVAL_MODE: {
+ APPROVAL_MANUAL: 'APPROVAL_MANUAL',
+ },
+ },
+
QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE: {
VENDOR_BILL: 'bill',
CHECK: 'check',
JOURNAL_ENTRY: 'journal_entry',
},
+ SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE: {
+ EXPENSE_REPORT: 'EXPENSE_REPORT',
+ VENDOR_BILL: 'VENDOR_BILL',
+ },
+
+ SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE: {
+ CREDIT_CARD_CHARGE: 'CREDIT_CARD_CHARGE',
+ VENDOR_BILL: 'VENDOR_BILL',
+ },
+
XERO_EXPORT_DATE: {
LAST_EXPENSE: 'LAST_EXPENSE',
REPORT_EXPORTED: 'REPORT_EXPORTED',
REPORT_SUBMITTED: 'REPORT_SUBMITTED',
},
+ SAGE_INTACCT_EXPORT_DATE: {
+ LAST_EXPENSE: 'LAST_EXPENSE',
+ EXPORTED: 'EXPORTED',
+ SUBMITTED: 'SUBMITTED',
+ },
+
NETSUITE_CONFIG: {
SUBSIDIARY: 'subsidiary',
EXPORTER: 'exporter',
@@ -1387,7 +1447,16 @@ const CONST = {
3: 'createAccessToken',
4: 'enterCredentials',
},
- IMPORT_CUSTOM_FIELDS: ['customSegments', 'customLists'],
+ IMPORT_CUSTOM_FIELDS: {
+ CUSTOM_SEGMENTS: 'customSegments',
+ CUSTOM_LISTS: 'customLists',
+ },
+ CUSTOM_SEGMENT_FIELDS: ['segmentName', 'internalID', 'scriptID', 'mapping'],
+ CUSTOM_LIST_FIELDS: ['listName', 'internalID', 'transactionFieldID', 'mapping'],
+ CUSTOM_FORM_ID_TYPE: {
+ REIMBURSABLE: 'reimbursable',
+ NON_REIMBURSABLE: 'nonReimbursable',
+ },
SYNC_OPTIONS: {
SYNC_REIMBURSED_REPORTS: 'syncReimbursedReports',
SYNC_PEOPLE: 'syncPeople',
@@ -1402,6 +1471,40 @@ const CONST = {
JOBS: 'jobs',
},
},
+ NETSUITE_CUSTOM_LIST_LIMIT: 8,
+ NETSUITE_ADD_CUSTOM_LIST_STEP_NAMES: ['1', '2,', '3', '4'],
+ NETSUITE_ADD_CUSTOM_SEGMENT_STEP_NAMES: ['1', '2,', '3', '4', '5', '6,'],
+ },
+
+ NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES: {
+ CUSTOM_LISTS: {
+ CUSTOM_LIST_PICKER: 0,
+ TRANSACTION_FIELD_ID: 1,
+ MAPPING: 2,
+ CONFIRM: 3,
+ },
+ CUSTOM_SEGMENTS: {
+ SEGMENT_TYPE: 0,
+ SEGMENT_NAME: 1,
+ INTERNAL_ID: 2,
+ SCRIPT_ID: 3,
+ MAPPING: 4,
+ CONFIRM: 5,
+ },
+ },
+
+ NETSUITE_CUSTOM_RECORD_TYPES: {
+ CUSTOM_SEGMENT: 'customSegment',
+ CUSTOM_RECORD: 'customRecord',
+ },
+
+ NETSUITE_FORM_STEPS_HEADER_HEIGHT: 40,
+
+ NETSUITE_IMPORT: {
+ HELP_LINKS: {
+ CUSTOM_SEGMENTS: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/NetSuite#custom-segments',
+ CUSTOM_LISTS: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/NetSuite#custom-lists',
+ },
},
NETSUITE_EXPORT_DATE: {
@@ -1456,6 +1559,17 @@ const CONST = {
JOURNALS_APPROVED: 'JOURNALS_APPROVED',
},
+ NETSUITE_ACCOUNT_TYPE: {
+ ACCOUNTS_PAYABLE: '_accountsPayable',
+ ACCOUNTS_RECEIVABLE: '_accountsReceivable',
+ OTHER_CURRENT_LIABILITY: '_otherCurrentLiability',
+ CREDIT_CARD: '_creditCard',
+ BANK: '_bank',
+ OTHER_CURRENT_ASSET: '_otherCurrentAsset',
+ LONG_TERM_LIABILITY: '_longTermLiability',
+ EXPENSE: '_expense',
+ },
+
NETSUITE_APPROVAL_ACCOUNT_DEFAULT: 'APPROVAL_ACCOUNT_DEFAULT',
/**
@@ -2032,6 +2146,9 @@ const CONST = {
PAID: 'paid',
ADMIN: 'admin',
},
+ DEFAULT_MAX_EXPENSE_AGE: 90,
+ DEFAULT_MAX_EXPENSE_AMOUNT: 200000,
+ DEFAULT_MAX_AMOUNT_NO_RECEIPT: 2500,
},
CUSTOM_UNITS: {
@@ -2110,6 +2227,10 @@ const CONST = {
CARD_NAME: 'CardName',
CONFIRMATION: 'Confirmation',
},
+ CARD_TYPE: {
+ PHYSICAL: 'physical',
+ VIRTUAL: 'virtual',
+ },
},
AVATAR_ROW_SIZE: {
DEFAULT: 4,
@@ -2331,6 +2452,8 @@ const CONST = {
PRIVATE_NOTES: 'privateNotes',
DELETE: 'delete',
MARK_AS_INCOMPLETE: 'markAsIncomplete',
+ CANCEL_PAYMENT: 'cancelPayment',
+ UNAPPROVE: 'unapprove',
},
EDIT_REQUEST_FIELD: {
AMOUNT: 'amount',
@@ -3775,6 +3898,7 @@ const CONST = {
},
EVENTS: {
SCROLLING: 'scrolling',
+ ON_RETURN_TO_OLD_DOT: 'onReturnToOldDot',
},
CHAT_HEADER_LOADER_HEIGHT: 36,
@@ -3926,6 +4050,7 @@ const CONST = {
TAX_REQUIRED: 'taxRequired',
HOLD: 'hold',
},
+ REVIEW_DUPLICATES_ORDER: ['merchant', 'category', 'tag', 'description', 'taxCode', 'billable', 'reimbursable'],
/** Context menu types */
CONTEXT_MENU_TYPES: {
@@ -5040,6 +5165,9 @@ const CONST = {
DONE: 'done',
PAID: 'paid',
VIEW: 'view',
+ REVIEW: 'review',
+ HOLD: 'hold',
+ UNHOLD: 'unhold',
},
TRANSACTION_TYPE: {
CASH: 'cash',
@@ -5123,11 +5251,32 @@ const CONST = {
EXCLUDE_FROM_LAST_VISITED_PATH: [SCREENS.NOT_FOUND, SCREENS.SAML_SIGN_IN, SCREENS.VALIDATE_LOGIN] as string[],
+ EMPTY_STATE_MEDIA: {
+ ANIMATION: 'animation',
+ ILLUSTRATION: 'illustration',
+ VIDEO: 'video',
+ },
+
+ UPGRADE_FEATURE_INTRO_MAPPING: [
+ {
+ id: 'reportFields',
+ alias: 'report-fields',
+ name: 'Report Fields',
+ title: 'workspace.upgrade.reportFields.title',
+ description: 'workspace.upgrade.reportFields.description',
+ icon: 'Pencil',
+ },
+ ],
+
REPORT_FIELD_TYPES: {
TEXT: 'text',
DATE: 'date',
LIST: 'dropdown',
},
+
+ NAVIGATION_ACTIONS: {
+ RESET: 'RESET',
+ },
} as const;
type Country = keyof typeof CONST.ALL_COUNTRIES;
diff --git a/src/Expensify.tsx b/src/Expensify.tsx
index bfe4db13d9c4..f96c51961acc 100644
--- a/src/Expensify.tsx
+++ b/src/Expensify.tsx
@@ -208,7 +208,7 @@ function Expensify({
}
appStateChangeListener.current.remove();
};
- // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want this effect to run again
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want this effect to run again
}, []);
// This is being done since we want to play sound even when iOS device is on silent mode, to align with other platforms.
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 906f8ef7095e..8abb7738289c 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -320,6 +320,9 @@ const ONYXKEYS = {
/** Onboarding Purpose selected by the user during Onboarding flow */
ONBOARDING_PURPOSE_SELECTED: 'onboardingPurposeSelected',
+ /** Onboarding error message to be displayed to the user */
+ ONBOARDING_ERROR_MESSAGE: 'onboardingErrorMessage',
+
/** Onboarding policyID selected by the user during Onboarding flow */
ONBOARDING_POLICY_ID: 'onboardingPolicyID',
@@ -442,6 +445,9 @@ const ONYXKEYS = {
* So for example: card_12345_Expensify Card
*/
WORKSPACE_CARDS_LIST: 'card_',
+
+ /** The bank account that Expensify Card payments will be reconciled against */
+ SHARED_NVP_EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION: 'sharedNVP_expensifyCard_continuousReconciliationConnection_',
},
/** List of Form ids */
@@ -460,8 +466,8 @@ const ONYXKEYS = {
WORKSPACE_RATE_AND_UNIT_FORM_DRAFT: 'workspaceRateAndUnitFormDraft',
WORKSPACE_TAX_CUSTOM_NAME: 'workspaceTaxCustomName',
WORKSPACE_TAX_CUSTOM_NAME_DRAFT: 'workspaceTaxCustomNameDraft',
- WORKSPACE_REPORT_FIELDS_FORM: 'workspaceReportFieldsForm',
- WORKSPACE_REPORT_FIELDS_FORM_DRAFT: 'workspaceReportFieldsFormDraft',
+ WORKSPACE_REPORT_FIELDS_FORM: 'workspaceReportFieldForm',
+ WORKSPACE_REPORT_FIELDS_FORM_DRAFT: 'workspaceReportFieldFormDraft',
POLICY_CREATE_DISTANCE_RATE_FORM: 'policyCreateDistanceRateForm',
POLICY_CREATE_DISTANCE_RATE_FORM_DRAFT: 'policyCreateDistanceRateFormDraft',
POLICY_DISTANCE_RATE_EDIT_FORM: 'policyDistanceRateEditForm',
@@ -532,8 +538,8 @@ const ONYXKEYS = {
REPORT_VIRTUAL_CARD_FRAUD_DRAFT: 'reportVirtualCardFraudFormDraft',
GET_PHYSICAL_CARD_FORM: 'getPhysicalCardForm',
GET_PHYSICAL_CARD_FORM_DRAFT: 'getPhysicalCardFormDraft',
- REPORT_FIELD_EDIT_FORM: 'reportFieldEditForm',
- REPORT_FIELD_EDIT_FORM_DRAFT: 'reportFieldEditFormDraft',
+ REPORT_FIELDS_EDIT_FORM: 'reportFieldsEditForm',
+ REPORT_FIELDS_EDIT_FORM_DRAFT: 'reportFieldsEditFormDraft',
REIMBURSEMENT_ACCOUNT_FORM: 'reimbursementAccount',
REIMBURSEMENT_ACCOUNT_FORM_DRAFT: 'reimbursementAccountDraft',
PERSONAL_BANK_ACCOUNT_FORM: 'personalBankAccount',
@@ -556,12 +562,22 @@ const ONYXKEYS = {
NEW_CHAT_NAME_FORM_DRAFT: 'newChatNameFormDraft',
SUBSCRIPTION_SIZE_FORM: 'subscriptionSizeForm',
SUBSCRIPTION_SIZE_FORM_DRAFT: 'subscriptionSizeFormDraft',
- ISSUE_NEW_EXPENSIFY_CARD_FORM: 'issueNewExpensifyCardForm',
- ISSUE_NEW_EXPENSIFY_CARD_FORM_DRAFT: 'issueNewExpensifyCardFormDraft',
+ ISSUE_NEW_EXPENSIFY_CARD_FORM: 'issueNewExpensifyCard',
+ ISSUE_NEW_EXPENSIFY_CARD_FORM_DRAFT: 'issueNewExpensifyCardDraft',
SAGE_INTACCT_CREDENTIALS_FORM: 'sageIntacctCredentialsForm',
SAGE_INTACCT_CREDENTIALS_FORM_DRAFT: 'sageIntacctCredentialsFormDraft',
+ NETSUITE_CUSTOM_FIELD_FORM: 'netSuiteCustomFieldForm',
+ NETSUITE_CUSTOM_FIELD_FORM_DRAFT: 'netSuiteCustomFieldFormDraft',
+ NETSUITE_CUSTOM_SEGMENT_ADD_FORM: 'netSuiteCustomSegmentAddForm',
+ NETSUITE_CUSTOM_SEGMENT_ADD_FORM_DRAFT: 'netSuiteCustomSegmentAddFormDraft',
+ NETSUITE_CUSTOM_LIST_ADD_FORM: 'netSuiteCustomListAddForm',
+ NETSUITE_CUSTOM_LIST_ADD_FORM_DRAFT: 'netSuiteCustomListAddFormDraft',
NETSUITE_TOKEN_INPUT_FORM: 'netsuiteTokenInputForm',
NETSUITE_TOKEN_INPUT_FORM_DRAFT: 'netsuiteTokenInputFormDraft',
+ NETSUITE_CUSTOM_FORM_ID_FORM: 'netsuiteCustomFormIDForm',
+ NETSUITE_CUSTOM_FORM_ID_FORM_DRAFT: 'netsuiteCustomFormIDFormDraft',
+ SAGE_INTACCT_DIMENSION_TYPE_FORM: 'sageIntacctDimensionTypeForm',
+ SAGE_INTACCT_DIMENSION_TYPE_FORM_DRAFT: 'sageIntacctDimensionTypeFormDraft',
},
} as const;
@@ -574,7 +590,7 @@ type OnyxFormValuesMapping = {
[ONYXKEYS.FORMS.WORKSPACE_TAG_FORM]: FormTypes.WorkspaceTagForm;
[ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM]: FormTypes.WorkspaceRateAndUnitForm;
[ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME]: FormTypes.WorkspaceTaxCustomName;
- [ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM]: FormTypes.WorkspaceReportFieldsForm;
+ [ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM]: FormTypes.WorkspaceReportFieldForm;
[ONYXKEYS.FORMS.CLOSE_ACCOUNT_FORM]: FormTypes.CloseAccountForm;
[ONYXKEYS.FORMS.PROFILE_SETTINGS_FORM]: FormTypes.ProfileSettingsForm;
[ONYXKEYS.FORMS.DISPLAY_NAME_FORM]: FormTypes.DisplayNameForm;
@@ -609,7 +625,7 @@ type OnyxFormValuesMapping = {
[ONYXKEYS.FORMS.REPORT_VIRTUAL_CARD_FRAUD]: FormTypes.ReportVirtualCardFraudForm;
[ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM]: FormTypes.ReportPhysicalCardForm;
[ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM]: FormTypes.GetPhysicalCardForm;
- [ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM]: FormTypes.ReportFieldEditForm;
+ [ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM]: FormTypes.ReportFieldsEditForm;
[ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM]: FormTypes.ReimbursementAccountForm;
[ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM]: FormTypes.PersonalBankAccountForm;
[ONYXKEYS.FORMS.WORKSPACE_DESCRIPTION_FORM]: FormTypes.WorkspaceDescriptionForm;
@@ -625,7 +641,12 @@ type OnyxFormValuesMapping = {
[ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM]: FormTypes.SubscriptionSizeForm;
[ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM]: FormTypes.IssueNewExpensifyCardForm;
[ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM]: FormTypes.SageIntactCredentialsForm;
+ [ONYXKEYS.FORMS.NETSUITE_CUSTOM_FIELD_FORM]: FormTypes.NetSuiteCustomFieldForm;
+ [ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM]: FormTypes.NetSuiteCustomFieldForm;
+ [ONYXKEYS.FORMS.NETSUITE_CUSTOM_SEGMENT_ADD_FORM]: FormTypes.NetSuiteCustomFieldForm;
[ONYXKEYS.FORMS.NETSUITE_TOKEN_INPUT_FORM]: FormTypes.NetSuiteTokenInputForm;
+ [ONYXKEYS.FORMS.NETSUITE_CUSTOM_FORM_ID_FORM]: FormTypes.NetSuiteCustomFormIDForm;
+ [ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM]: FormTypes.SageIntacctDimensionForm;
};
type OnyxFormDraftValuesMapping = {
@@ -674,6 +695,7 @@ type OnyxCollectionValuesMapping = {
[ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END]: OnyxTypes.BillingGraceEndPeriod;
[ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS]: OnyxTypes.ExpensifyCardSettings;
[ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST]: OnyxTypes.WorkspaceCardsList;
+ [ONYXKEYS.COLLECTION.SHARED_NVP_EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION]: OnyxTypes.BankAccount;
};
type OnyxValuesMapping = {
@@ -779,6 +801,7 @@ type OnyxValuesMapping = {
[ONYXKEYS.MAX_CANVAS_HEIGHT]: number;
[ONYXKEYS.MAX_CANVAS_WIDTH]: number;
[ONYXKEYS.ONBOARDING_PURPOSE_SELECTED]: string;
+ [ONYXKEYS.ONBOARDING_ERROR_MESSAGE]: string;
[ONYXKEYS.ONBOARDING_POLICY_ID]: string;
[ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID]: string;
[ONYXKEYS.IS_SEARCHING_FOR_REPORTS]: boolean;
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index ef6ed2e264ca..2189522e45ea 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -3,6 +3,7 @@ import type CONST from './CONST';
import type {IOUAction, IOUType} from './CONST';
import type {IOURequestType} from './libs/actions/IOU';
import type {AuthScreensParamList} from './libs/Navigation/types';
+import type {SageIntacctMappingName} from './types/onyx/Policy';
import type {SearchQuery} from './types/onyx/SearchResults';
import type AssertTypesNotEqual from './types/utils/AssertTypesNotEqual';
@@ -53,6 +54,11 @@ const ROUTES = {
getRoute: (query: string, reportID: string) => `search/${query}/view/${reportID}` as const,
},
+ TRANSACTION_HOLD_REASON_RHP: {
+ route: '/search/:query/hold/:transactionID',
+ getRoute: (query: string, transactionID: string) => `search/${query}/hold/${transactionID}` as const,
+ },
+
// This is a utility route used to go to the user's concierge chat, or the sign-in page if the user's not authenticated
CONCIERGE: 'concierge',
FLAG_COMMENT: {
@@ -670,6 +676,10 @@ const ROUTES = {
route: 'settings/workspaces/:policyID/accounting/quickbooks-online/invoice-account-selector',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/invoice-account-selector` as const,
},
+ WORKSPACE_ACCOUNTING_RECONCILIATION_ACCOUNT_SETTINGS: {
+ route: 'settings/workspaces/:policyID/accounting/:connection/card-reconciliation',
+ getRoute: (policyID: string, connection: ValueOf) => `settings/workspaces/${policyID}/accounting/${connection}/card-reconciliation` as const,
+ },
WORKSPACE_CATEGORIES: {
route: 'settings/workspaces/:policyID/categories',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories` as const,
@@ -678,6 +688,10 @@ const ROUTES = {
route: 'settings/workspaces/:policyID/categories/:categoryName',
getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURIComponent(categoryName)}` as const,
},
+ WORKSPACE_UPGRADE: {
+ route: 'settings/workspaces/:policyID/upgrade/:featureName',
+ getRoute: (policyID: string, featureName: string) => `settings/workspaces/${policyID}/upgrade/${encodeURIComponent(featureName)}` as const,
+ },
WORKSPACE_CATEGORIES_SETTINGS: {
route: 'settings/workspaces/:policyID/categories/settings',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories/settings` as const,
@@ -787,33 +801,39 @@ const ROUTES = {
route: 'settings/workspaces/:policyID/reportFields/new',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/reportFields/new` as const,
},
- WORKSPACE_REPORT_FIELD_LIST_VALUES: {
- route: 'settings/workspaces/:policyID/reportFields/new/listValues',
- getRoute: (policyID: string) => `settings/workspaces/${policyID}/reportFields/new/listValues` as const,
+ WORKSPACE_REPORT_FIELDS_SETTINGS: {
+ route: 'settings/workspaces/:policyID/reportFields/:reportFieldID/edit',
+ getRoute: (policyID: string, reportFieldID: string) => `settings/workspaces/${policyID}/reportFields/${encodeURIComponent(reportFieldID)}/edit` as const,
+ },
+ WORKSPACE_REPORT_FIELDS_LIST_VALUES: {
+ route: 'settings/workspaces/:policyID/reportFields/listValues/:reportFieldID?',
+ getRoute: (policyID: string, reportFieldID?: string) => `settings/workspaces/${policyID}/reportFields/listValues/${encodeURIComponent(reportFieldID ?? '')}` as const,
},
- WORKSPACE_REPORT_FIELD_ADD_VALUE: {
- route: 'settings/workspaces/:policyID/reportFields/new/addValue',
- getRoute: (policyID: string) => `settings/workspaces/${policyID}/reportFields/new/addValue` as const,
+ WORKSPACE_REPORT_FIELDS_ADD_VALUE: {
+ route: 'settings/workspaces/:policyID/reportFields/addValue/:reportFieldID?',
+ getRoute: (policyID: string, reportFieldID?: string) => `settings/workspaces/${policyID}/reportFields/addValue/${encodeURIComponent(reportFieldID ?? '')}` as const,
},
- WORKSPACE_REPORT_FIELD_VALUE_SETTINGS: {
- route: 'settings/workspaces/:policyID/reportFields/new/:valueIndex',
- getRoute: (policyID: string, valueIndex: number) => `settings/workspaces/${policyID}/reportFields/new/${valueIndex}` as const,
+ WORKSPACE_REPORT_FIELDS_VALUE_SETTINGS: {
+ route: 'settings/workspaces/:policyID/reportFields/:valueIndex/:reportFieldID?',
+ getRoute: (policyID: string, valueIndex: number, reportFieldID?: string) =>
+ `settings/workspaces/${policyID}/reportFields/${valueIndex}/${encodeURIComponent(reportFieldID ?? '')}` as const,
},
- WORKSPACE_REPORT_FIELD_EDIT_VALUE: {
+ WORKSPACE_REPORT_FIELDS_EDIT_VALUE: {
route: 'settings/workspaces/:policyID/reportFields/new/:valueIndex/edit',
getRoute: (policyID: string, valueIndex: number) => `settings/workspaces/${policyID}/reportFields/new/${valueIndex}/edit` as const,
},
+ WORKSPACE_EDIT_REPORT_FIELDS_INITIAL_VALUE: {
+ route: 'settings/workspaces/:policyID/reportFields/:reportFieldID/edit/initialValue',
+ getRoute: (policyID: string, reportFieldID: string) => `settings/workspaces/${policyID}/reportFields/${encodeURIComponent(reportFieldID)}/edit/initialValue` as const,
+ },
WORKSPACE_EXPENSIFY_CARD: {
route: 'settings/workspaces/:policyID/expensify-card',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card` as const,
},
- // TODO: uncomment after development is done
- // WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW: {
- // route: 'settings/workspaces/:policyID/expensify-card/issues-new',
- // getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card/issue-new` as const,
- // },
- // TODO: remove after development is done - this one is for testing purposes
- WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW: 'settings/workspaces/expensify-card/issue-new',
+ WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW: {
+ route: 'settings/workspaces/:policyID/expensify-card/issue-new',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card/issue-new` as const,
+ },
WORKSPACE_DISTANCE_RATES: {
route: 'settings/workspaces/:policyID/distance-rates',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/distance-rates` as const,
@@ -866,6 +886,34 @@ const ROUTES = {
route: 'r/:threadReportID/duplicates/review',
getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review` as const,
},
+ TRANSACTION_DUPLICATE_REVIEW_MERCHANT_PAGE: {
+ route: 'r/:threadReportID/duplicates/review/merchant',
+ getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/merchant` as const,
+ },
+ TRANSACTION_DUPLICATE_REVIEW_CATEGORY_PAGE: {
+ route: 'r/:threadReportID/duplicates/review/category',
+ getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/category` as const,
+ },
+ TRANSACTION_DUPLICATE_REVIEW_TAG_PAGE: {
+ route: 'r/:threadReportID/duplicates/review/tag',
+ getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/tag` as const,
+ },
+ TRANSACTION_DUPLICATE_REVIEW_TAX_CODE_PAGE: {
+ route: 'r/:threadReportID/duplicates/review/tax-code',
+ getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/tax-code` as const,
+ },
+ TRANSACTION_DUPLICATE_REVIEW_DESCRIPTION_PAGE: {
+ route: 'r/:threadReportID/duplicates/confirm',
+ getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/confirm` as const,
+ },
+ TRANSACTION_DUPLICATE_REVIEW_REIMBURSABLE_PAGE: {
+ route: 'r/:threadReportID/duplicates/review/reimbursable',
+ getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/reimbursable` as const,
+ },
+ TRANSACTION_DUPLICATE_REVIEW_BILLABLE_PAGE: {
+ route: 'r/:threadReportID/duplicates/review/billable',
+ getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/billable` as const,
+ },
POLICY_ACCOUNTING_XERO_IMPORT: {
route: 'settings/workspaces/:policyID/accounting/xero/import',
@@ -973,6 +1021,29 @@ const ROUTES = {
getRoute: (policyID: string, importField: TupleToUnion) =>
`settings/workspaces/${policyID}/accounting/netsuite/import/mapping/${importField}` as const,
},
+ POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING: {
+ route: 'settings/workspaces/:policyID/accounting/netsuite/import/custom/:importCustomField',
+ getRoute: (policyID: string, importCustomField: ValueOf) =>
+ `settings/workspaces/${policyID}/accounting/netsuite/import/custom/${importCustomField}` as const,
+ },
+ POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_VIEW: {
+ route: 'settings/workspaces/:policyID/accounting/netsuite/import/custom/:importCustomField/view/:valueIndex',
+ getRoute: (policyID: string, importCustomField: ValueOf, valueIndex: number) =>
+ `settings/workspaces/${policyID}/accounting/netsuite/import/custom/${importCustomField}/view/${valueIndex}` as const,
+ },
+ POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_EDIT: {
+ route: 'settings/workspaces/:policyID/accounting/netsuite/import/custom/:importCustomField/edit/:valueIndex/:fieldName',
+ getRoute: (policyID: string, importCustomField: ValueOf, valueIndex: number, fieldName: string) =>
+ `settings/workspaces/${policyID}/accounting/netsuite/import/custom/${importCustomField}/edit/${valueIndex}/${fieldName}` as const,
+ },
+ POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_LIST_ADD: {
+ route: 'settings/workspaces/:policyID/accounting/netsuite/import/custom-list/new',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/import/custom-list/new` as const,
+ },
+ POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD: {
+ route: 'settings/workspaces/:policyID/accounting/netsuite/import/custom-segment/new',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/import/custom-segment/new` as const,
+ },
POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS: {
route: 'settings/workspaces/:policyID/accounting/netsuite/import/customer-projects',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/import/customer-projects` as const,
@@ -1042,6 +1113,35 @@ const ROUTES = {
route: 'settings/workspaces/:policyID/connections/netsuite/advanced/',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/` as const,
},
+ POLICY_ACCOUNTING_NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT: {
+ route: 'settings/workspaces/:policyID/connections/netsuite/advanced/reimbursement-account/select',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/reimbursement-account/select` as const,
+ },
+ POLICY_ACCOUNTING_NETSUITE_COLLECTION_ACCOUNT_SELECT: {
+ route: 'settings/workspaces/:policyID/connections/netsuite/advanced/collection-account/select',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/collection-account/select` as const,
+ },
+ POLICY_ACCOUNTING_NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT: {
+ route: 'settings/workspaces/:policyID/connections/netsuite/advanced/expense-report-approval-level/select',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/expense-report-approval-level/select` as const,
+ },
+ POLICY_ACCOUNTING_NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT: {
+ route: 'settings/workspaces/:policyID/connections/netsuite/advanced/vendor-bill-approval-level/select',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/vendor-bill-approval-level/select` as const,
+ },
+ POLICY_ACCOUNTING_NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT: {
+ route: 'settings/workspaces/:policyID/connections/netsuite/advanced/journal-entry-approval-level/select',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/journal-entry-approval-level/select` as const,
+ },
+ POLICY_ACCOUNTING_NETSUITE_APPROVAL_ACCOUNT_SELECT: {
+ route: 'settings/workspaces/:policyID/connections/netsuite/advanced/approval-account/select',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/approval-account/select` as const,
+ },
+ POLICY_ACCOUNTING_NETSUITE_CUSTOM_FORM_ID: {
+ route: 'settings/workspaces/:policyID/connections/netsuite/advanced/custom-form-id/:expenseType',
+ getRoute: (policyID: string, expenseType: ValueOf) =>
+ `settings/workspaces/${policyID}/connections/netsuite/advanced/custom-form-id/${expenseType}` as const,
+ },
POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES: {
route: 'settings/workspaces/:policyID/accounting/sage-intacct/prerequisites',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/prerequisites` as const,
@@ -1054,6 +1154,66 @@ const ROUTES = {
route: 'settings/workspaces/:policyID/accounting/sage-intacct/existing-connections',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/existing-connections` as const,
},
+ POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/import',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_TOGGLE_MAPPINGS: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/import/toggle-mapping/:mapping',
+ getRoute: (policyID: string, mapping: SageIntacctMappingName) => `settings/workspaces/${policyID}/accounting/sage-intacct/import/toggle-mapping/${mapping}` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_MAPPINGS_TYPE: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/import/mapping-type/:mapping',
+ getRoute: (policyID: string, mapping: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import/mapping-type/${mapping}` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/import/user-dimensions',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import/user-dimensions` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_ADD_USER_DIMENSION: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/import/add-user-dimension',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import/add-user-dimension` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_EDIT_USER_DIMENSION: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/import/edit-user-dimension/:dimensionName',
+ getRoute: (policyID: string, dimensionName: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import/edit-user-dimension/${dimensionName}` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/export',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_PREFERRED_EXPORTER: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/preferred-exporter',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/preferred-exporter` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT_DATE: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/date',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/date` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_EXPENSES: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/reimbursable',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/reimbursable` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/nonreimbursable',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/nonreimbursable` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/:reimbursable/default-vendor',
+ getRoute: (policyID: string, reimbursable: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/${reimbursable}/default-vendor` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/nonreimbursable/credit-card-account',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/nonreimbursable/credit-card-account` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/advanced',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/advanced` as const,
+ },
+ POLICY_ACCOUNTING_SAGE_INTACCT_PAYMENT_ACCOUNT: {
+ route: 'settings/workspaces/:policyID/accounting/sage-intacct/advanced/payment-account',
+ getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/advanced/payment-account` as const,
+ },
} as const;
/**
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 9753b77a1db6..0768ca8bb291 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -30,6 +30,7 @@ const SCREENS = {
SEARCH: {
CENTRAL_PANE: 'Search_Central_Pane',
REPORT_RHP: 'Search_Report_RHP',
+ TRANSACTION_HOLD_REASON_RHP: 'Search_Transaction_Hold_Reason_RHP',
BOTTOM_TAB: 'Search_Bottom_Tab',
},
SETTINGS: {
@@ -186,6 +187,13 @@ const SCREENS = {
TRANSACTION_DUPLICATE: {
REVIEW: 'Transaction_Duplicate_Review',
+ MERCHANT: 'Transaction_Duplicate_Merchant',
+ CATEGORY: 'Transaction_Duplicate_Category',
+ TAG: 'Transaction_Duplicate_Tag',
+ DESCRIPTION: 'Transaction_Duplicate_Description',
+ TAX_CODE: 'Transaction_Duplicate_Tax_Code',
+ REIMBURSABLE: 'Transaction_Duplicate_Reimburable',
+ BILLABLE: 'Transaction_Duplicate_Billable',
},
IOU_SEND: {
@@ -273,6 +281,11 @@ const SCREENS = {
XERO_BILL_PAYMENT_ACCOUNT_SELECTOR: 'Policy_Accounting_Xero_Bill_Payment_Account_Selector',
XERO_EXPORT_BANK_ACCOUNT_SELECT: 'Policy_Accounting_Xero_Export_Bank_Account_Select',
NETSUITE_IMPORT_MAPPING: 'Policy_Accounting_NetSuite_Import_Mapping',
+ NETSUITE_IMPORT_CUSTOM_FIELD: 'Policy_Accounting_NetSuite_Import_Custom_Field',
+ NETSUITE_IMPORT_CUSTOM_FIELD_VIEW: 'Policy_Accounting_NetSuite_Import_Custom_Field_View',
+ NETSUITE_IMPORT_CUSTOM_FIELD_EDIT: 'Policy_Accounting_NetSuite_Import_Custom_Field_Edit',
+ NETSUITE_IMPORT_CUSTOM_LIST_ADD: 'Policy_Accounting_NetSuite_Import_Custom_List_Add',
+ NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD: 'Policy_Accounting_NetSuite_Import_Custom_Segment_Add',
NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS: 'Policy_Accounting_NetSuite_Import_CustomersOrProjects',
NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT: 'Policy_Accounting_NetSuite_Import_CustomersOrProjects_Select',
NETSUITE_TOKEN_INPUT: 'Policy_Accounting_NetSuite_Token_Input',
@@ -292,9 +305,32 @@ const SCREENS = {
NETSUITE_TAX_POSTING_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Tax_Posting_Account_Select',
NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Provincial_Tax_Posting_Account_Select',
NETSUITE_ADVANCED: 'Policy_Accounting_NetSuite_Advanced',
+ NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Reimbursement_Account_Select',
+ NETSUITE_COLLECTION_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Collection_Account_Select',
+ NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT: 'Policy_Accounting_NetSuite_Expense_Report_Approval_Level_Select',
+ NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT: 'Policy_Accounting_NetSuite_Vendor_Bill_Approval_Level_Select',
+ NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT: 'Policy_Accounting_NetSuite_Journal_Entry_Approval_Level_Select',
+ NETSUITE_APPROVAL_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Approval_Account_Select',
+ NETSUITE_CUSTOM_FORM_ID: 'Policy_Accounting_NetSuite_Custom_Form_ID',
SAGE_INTACCT_PREREQUISITES: 'Policy_Accounting_Sage_Intacct_Prerequisites',
ENTER_SAGE_INTACCT_CREDENTIALS: 'Policy_Enter_Sage_Intacct_Credentials',
EXISTING_SAGE_INTACCT_CONNECTIONS: 'Policy_Existing_Sage_Intacct_Connections',
+ SAGE_INTACCT_IMPORT: 'Policy_Accounting_Sage_Intacct_Import',
+ SAGE_INTACCT_TOGGLE_MAPPING: 'Policy_Accounting_Sage_Intacct_Toggle_Mapping',
+ SAGE_INTACCT_MAPPING_TYPE: 'Policy_Accounting_Sage_Intacct_Mapping_Type',
+ SAGE_INTACCT_USER_DIMENSIONS: 'Policy_Accounting_Sage_Intacct_User_Dimensions',
+ SAGE_INTACCT_ADD_USER_DIMENSION: 'Policy_Accounting_Sage_Intacct_Add_User_Dimension',
+ SAGE_INTACCT_EDIT_USER_DIMENSION: 'Policy_Accounting_Sage_Intacct_Edit_User_Dimension',
+ SAGE_INTACCT_EXPORT: 'Policy_Accounting_Sage_Intacct_Export',
+ SAGE_INTACCT_PREFERRED_EXPORTER: 'Policy_Accounting_Sage_Intacct_Preferred_Exporter',
+ SAGE_INTACCT_EXPORT_DATE: 'Policy_Accounting_Sage_Intacct_Export_Date',
+ SAGE_INTACCT_REIMBURSABLE_EXPENSES: 'Policy_Accounting_Sage_Intacct_Reimbursable_Expenses',
+ SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES: 'Policy_Accounting_Sage_Intacct_Non_Reimbursable_Expenses',
+ SAGE_INTACCT_DEFAULT_VENDOR: 'Policy_Accounting_Sage_Intacct_Default_Vendor',
+ SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: 'Policy_Accounting_Sage_Intacct_Non_Reimbursable_Credit_Card_Account',
+ SAGE_INTACCT_ADVANCED: 'Policy_Accounting_Sage_Intacct_Advanced',
+ SAGE_INTACCT_PAYMENT_ACCOUNT: 'Policy_Accounting_Sage_Intacct_Payment_Account',
+ RECONCILIATION_ACCOUNT_SETTINGS: 'Policy_Accounting_Reconciliation_Account_Settings',
},
INITIAL: 'Workspace_Initial',
PROFILE: 'Workspace_Profile',
@@ -318,11 +354,13 @@ const SCREENS = {
TAG_EDIT: 'Tag_Edit',
TAXES: 'Workspace_Taxes',
REPORT_FIELDS: 'Workspace_ReportFields',
+ REPORT_FIELDS_SETTINGS: 'Workspace_ReportFields_Settings',
REPORT_FIELDS_CREATE: 'Workspace_ReportFields_Create',
REPORT_FIELDS_LIST_VALUES: 'Workspace_ReportFields_ListValues',
REPORT_FIELDS_ADD_VALUE: 'Workspace_ReportFields_AddValue',
REPORT_FIELDS_VALUE_SETTINGS: 'Workspace_ReportFields_ValueSettings',
REPORT_FIELDS_EDIT_VALUE: 'Workspace_ReportFields_EditValue',
+ REPORT_FIELDS_EDIT_INITIAL_VALUE: 'Workspace_ReportFields_EditInitialValue',
TAX_EDIT: 'Workspace_Tax_Edit',
TAX_NAME: 'Workspace_Tax_Name',
TAX_VALUE: 'Workspace_Tax_Value',
@@ -360,6 +398,7 @@ const SCREENS = {
DISTANCE_RATE_EDIT: 'Distance_Rate_Edit',
DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT: 'Distance_Rate_Tax_Reclaimable_On_Edit',
DISTANCE_RATE_TAX_RATE_EDIT: 'Distance_Rate_Tax_Rate_Edit',
+ UPGRADE: 'Workspace_Upgrade',
},
EDIT_REQUEST: {
diff --git a/src/components/AccountingListSkeletonView.tsx b/src/components/AccountingListSkeletonView.tsx
index b977903d3adc..dbe8ada6c4b7 100644
--- a/src/components/AccountingListSkeletonView.tsx
+++ b/src/components/AccountingListSkeletonView.tsx
@@ -4,12 +4,14 @@ import ItemListSkeletonView from './Skeletons/ItemListSkeletonView';
type AccountingListSkeletonViewProps = {
shouldAnimate?: boolean;
+ gradientOpacityEnabled?: boolean;
};
-function AccountingListSkeletonView({shouldAnimate = true}: AccountingListSkeletonViewProps) {
+function AccountingListSkeletonView({shouldAnimate = true, gradientOpacityEnabled = false}: AccountingListSkeletonViewProps) {
return (
(
<>
{
diff --git a/src/components/AddressSearch/index.tsx b/src/components/AddressSearch/index.tsx
index 9bd6142b5604..2679a550f72f 100644
--- a/src/components/AddressSearch/index.tsx
+++ b/src/components/AddressSearch/index.tsx
@@ -24,7 +24,24 @@ import CONST from '@src/CONST';
import type {Address} from '@src/types/onyx/PrivatePersonalDetails';
import CurrentLocationButton from './CurrentLocationButton';
import isCurrentTargetInsideContainer from './isCurrentTargetInsideContainer';
-import type {AddressSearchProps} from './types';
+import type {AddressSearchProps, PredefinedPlace} from './types';
+
+/**
+ * Check if the place matches the search by the place name or description.
+ * @param search The search string for a place
+ * @param place The place to check for a match on the search
+ * @returns true if search is related to place, otherwise it returns false.
+ */
+function isPlaceMatchForSearch(search: string, place: PredefinedPlace): boolean {
+ if (!search) {
+ return true;
+ }
+ if (!place) {
+ return false;
+ }
+ const fullSearchSentence = `${place.name ?? ''} ${place.description}`;
+ return search.split(' ').every((searchTerm) => !searchTerm || fullSearchSentence.toLocaleLowerCase().includes(searchTerm.toLocaleLowerCase()));
+}
// The error that's being thrown below will be ignored until we fork the
// react-native-google-places-autocomplete repo and replace the
@@ -42,6 +59,7 @@ function AddressSearch(
isLimitedToUSA = false,
label,
maxInputLength,
+ onFocus,
onBlur,
onInputChange,
onPress,
@@ -72,7 +90,7 @@ function AddressSearch(
const [isTyping, setIsTyping] = useState(false);
const [isFocused, setIsFocused] = useState(false);
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
- const [searchValue, setSearchValue] = useState(value || defaultValue || '');
+ const [searchValue, setSearchValue] = useState('');
const [locationErrorCode, setLocationErrorCode] = useState(null);
const [isFetchingCurrentLocation, setIsFetchingCurrentLocation] = useState(false);
const shouldTriggerGeolocationCallbacks = useRef(true);
@@ -282,7 +300,7 @@ function AddressSearch(
// eslint-disable-next-line react/jsx-no-useless-fragment
<>
{(predefinedPlaces?.length ?? 0) > 0 && (
- <>
+
{/* This will show current location button in list if there are some recent destinations */}
{shouldShowCurrentLocationButton && (
)}
{!value && {translate('common.recentDestinations')}}
-
+
)}
);
@@ -304,10 +322,16 @@ function AddressSearch(
};
}, []);
+ const filteredPredefinedPlaces = useMemo(() => {
+ if (!searchValue) {
+ return predefinedPlaces ?? [];
+ }
+ return predefinedPlaces?.filter((predefinedPlace) => isPlaceMatchForSearch(searchValue, predefinedPlace)) ?? [];
+ }, [predefinedPlaces, searchValue]);
+
const listEmptyComponent = useCallback(
- () =>
- !!isOffline || !isTyping ? null : {translate('common.noResultsFound')},
- [isOffline, isTyping, styles, translate],
+ () => (!isTyping ? null : {translate('common.noResultsFound')}),
+ [isTyping, styles, translate],
);
const listLoader = useCallback(
@@ -348,7 +372,7 @@ function AddressSearch(
fetchDetails
suppressDefaultStyles
enablePoweredByContainer={false}
- predefinedPlaces={predefinedPlaces ?? undefined}
+ predefinedPlaces={filteredPredefinedPlaces}
listEmptyComponent={listEmptyComponent}
listLoaderComponent={listLoader}
renderHeaderComponent={renderHeaderComponent}
@@ -357,7 +381,7 @@ function AddressSearch(
const subtitle = data.isPredefinedPlace ? data.description : data.structured_formatting.secondary_text;
return (
- {!!title && {title}}
+ {!!title && {title}}
{subtitle}
);
@@ -391,6 +415,7 @@ function AddressSearch(
shouldSaveDraft,
onFocus: () => {
setIsFocused(true);
+ onFocus?.();
},
onBlur: (event) => {
if (!isCurrentTargetInsideContainer(event, containerRef)) {
@@ -420,10 +445,11 @@ function AddressSearch(
}}
styles={{
textInputContainer: [styles.flexColumn],
- listView: [StyleUtils.getGoogleListViewStyle(displayListViewBorder), styles.overflowAuto, styles.borderLeft, styles.borderRight, !isFocused && {height: 0}],
+ listView: [StyleUtils.getGoogleListViewStyle(displayListViewBorder), styles.borderLeft, styles.borderRight, !isFocused && styles.h0],
row: [styles.pv4, styles.ph3, styles.overflowAuto],
description: [styles.googleSearchText],
- separator: [styles.googleSearchSeparator],
+ separator: [styles.googleSearchSeparator, styles.overflowAuto],
+ container: [styles.mh100],
}}
numberOfLines={2}
isRowScrollable={false}
@@ -447,11 +473,13 @@ function AddressSearch(
)
}
placeholder=""
- />
- setLocationErrorCode(null)}
- locationErrorCode={locationErrorCode}
- />
+ listViewDisplayed
+ >
+ setLocationErrorCode(null)}
+ locationErrorCode={locationErrorCode}
+ />
+
{isFetchingCurrentLocation && }
diff --git a/src/components/AddressSearch/types.ts b/src/components/AddressSearch/types.ts
index 82e4c3c3fc37..b654fcad99da 100644
--- a/src/components/AddressSearch/types.ts
+++ b/src/components/AddressSearch/types.ts
@@ -23,6 +23,10 @@ type StreetValue = {
street: string;
};
+type PredefinedPlace = Place & {
+ name?: string;
+};
+
type AddressSearchProps = {
/** The ID used to uniquely identify the input in a Form */
inputID?: string;
@@ -30,6 +34,9 @@ type AddressSearchProps = {
/** Saves a draft of the input value when used in a form */
shouldSaveDraft?: boolean;
+ /** Callback that is called when the text input is focused */
+ onFocus?: () => void;
+
/** Callback that is called when the text input is blurred */
onBlur?: () => void;
@@ -64,7 +71,7 @@ type AddressSearchProps = {
canUseCurrentLocation?: boolean;
/** A list of predefined places that can be shown when the user isn't searching for something */
- predefinedPlaces?: Place[] | null;
+ predefinedPlaces?: PredefinedPlace[] | null;
/** A map of inputID key names */
renamedInputKeys?: Address;
@@ -84,4 +91,4 @@ type AddressSearchProps = {
type IsCurrentTargetInsideContainerType = (event: FocusEvent | NativeSyntheticEvent, containerRef: RefObject) => boolean;
-export type {CurrentLocationButtonProps, AddressSearchProps, IsCurrentTargetInsideContainerType, StreetValue};
+export type {CurrentLocationButtonProps, AddressSearchProps, IsCurrentTargetInsideContainerType, StreetValue, PredefinedPlace};
diff --git a/src/components/AmountForm.tsx b/src/components/AmountForm.tsx
index 3319a28c58b9..1eb272dce49a 100644
--- a/src/components/AmountForm.tsx
+++ b/src/components/AmountForm.tsx
@@ -135,7 +135,7 @@ function AmountForm(
setNewAmount(MoneyRequestUtils.stripDecimalsFromAmount(currentAmount));
// we want to update only when decimals change (setNewAmount also changes when decimals change).
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [decimals]);
/**
diff --git a/src/components/AnimatedStep/index.tsx b/src/components/AnimatedStep/index.tsx
index 2fb3e3167ff8..6de7d0c2b013 100644
--- a/src/components/AnimatedStep/index.tsx
+++ b/src/components/AnimatedStep/index.tsx
@@ -37,6 +37,7 @@ function AnimatedStep({onAnimationEnd, direction = CONST.ANIMATION_DIRECTION.IN,
}}
duration={CONST.ANIMATED_TRANSITION}
animation={animationStyle}
+ // eslint-disable-next-line react-compiler/react-compiler
useNativeDriver={useNativeDriver}
style={style}
>
diff --git a/src/components/AttachmentModal.tsx b/src/components/AttachmentModal.tsx
index 450a49403215..368347847890 100644
--- a/src/components/AttachmentModal.tsx
+++ b/src/components/AttachmentModal.tsx
@@ -265,7 +265,7 @@ function AttachmentModal({
}
setIsModalOpen(false);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [isModalOpen, isConfirmButtonDisabled, onConfirm, file, sourceState]);
/**
@@ -367,7 +367,7 @@ function AttachmentModal({
onModalClose();
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [onModalClose]);
/**
@@ -428,7 +428,7 @@ function AttachmentModal({
});
}
return menuItems;
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [isReceiptAttachment, transaction, file, sourceState, iouType]);
// There are a few things that shouldn't be set until we absolutely know if the file is a receipt or an attachment.
diff --git a/src/components/AttachmentPicker/index.native.tsx b/src/components/AttachmentPicker/index.native.tsx
index 154fcf838c86..7d4fbd97f4f7 100644
--- a/src/components/AttachmentPicker/index.native.tsx
+++ b/src/components/AttachmentPicker/index.native.tsx
@@ -222,6 +222,7 @@ function AttachmentPicker({type = CONST.ATTACHMENT_PICKER_TYPE.FILE, children, s
* @param onCanceledHandler A callback that will be called without a selected attachment
*/
const open = (onPickedHandler: (file: FileObject) => void, onCanceledHandler: () => void = () => {}) => {
+ // eslint-disable-next-line react-compiler/react-compiler
completeAttachmentSelection.current = onPickedHandler;
onCanceled.current = onCanceledHandler;
setIsVisible(true);
diff --git a/src/components/AttachmentPicker/index.tsx b/src/components/AttachmentPicker/index.tsx
index a6ff9cb8d27a..669b26724a02 100644
--- a/src/components/AttachmentPicker/index.tsx
+++ b/src/components/AttachmentPicker/index.tsx
@@ -46,6 +46,7 @@ function AttachmentPicker({children, type = CONST.ATTACHMENT_PICKER_TYPE.FILE}:
// Cleanup after selecting a file to start from a fresh state
if (fileInput.current) {
+ // eslint-disable-next-line react-compiler/react-compiler
fileInput.current.value = '';
}
}}
diff --git a/src/components/Attachments/AttachmentCarousel/Pager/index.tsx b/src/components/Attachments/AttachmentCarousel/Pager/index.tsx
index f16ba2c53ae8..c32919ecff6e 100644
--- a/src/components/Attachments/AttachmentCarousel/Pager/index.tsx
+++ b/src/components/Attachments/AttachmentCarousel/Pager/index.tsx
@@ -66,6 +66,7 @@ function AttachmentCarouselPager(
const pageScrollHandler = usePageScrollHandler((e) => {
'worklet';
+ // eslint-disable-next-line react-compiler/react-compiler
activePage.value = e.position;
isPagerScrolling.value = e.offset !== 0;
}, []);
diff --git a/src/components/Attachments/AttachmentCarousel/index.native.tsx b/src/components/Attachments/AttachmentCarousel/index.native.tsx
index 243fc52f1f5d..e0f7571af8c7 100644
--- a/src/components/Attachments/AttachmentCarousel/index.native.tsx
+++ b/src/components/Attachments/AttachmentCarousel/index.native.tsx
@@ -57,7 +57,7 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
onNavigate(targetAttachments[initialPage]);
}
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [reportActions, compareImage]);
/** Updates the page state when the user navigates between attachments */
diff --git a/src/components/Attachments/AttachmentCarousel/index.tsx b/src/components/Attachments/AttachmentCarousel/index.tsx
index 36abe1e2e5ed..f7ef2c6529ce 100644
--- a/src/components/Attachments/AttachmentCarousel/index.tsx
+++ b/src/components/Attachments/AttachmentCarousel/index.tsx
@@ -115,7 +115,7 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
scrollRef.current.scrollToIndex({index: page, animated: false});
// The hook is not supposed to run on page change, so we keep the page out of the dependencies
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [cellWidth]);
/** Updates the page state when the user navigates between attachments */
diff --git a/src/components/Attachments/AttachmentCarousel/useCarouselArrows.ts b/src/components/Attachments/AttachmentCarousel/useCarouselArrows.ts
index a7ce0f93114b..ed195fd943f1 100644
--- a/src/components/Attachments/AttachmentCarousel/useCarouselArrows.ts
+++ b/src/components/Attachments/AttachmentCarousel/useCarouselArrows.ts
@@ -45,7 +45,7 @@ function useCarouselArrows() {
useEffect(() => {
autoHideArrows();
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
return {shouldShowArrows, setShouldShowArrows, autoHideArrows, cancelAutoHideArrows};
diff --git a/src/components/Attachments/AttachmentCarousel/useCarouselContextEvents.ts b/src/components/Attachments/AttachmentCarousel/useCarouselContextEvents.ts
index d516879322ea..cc2c3c5c8229 100644
--- a/src/components/Attachments/AttachmentCarousel/useCarouselContextEvents.ts
+++ b/src/components/Attachments/AttachmentCarousel/useCarouselContextEvents.ts
@@ -39,6 +39,7 @@ function useCarouselContextEvents(setShouldShowArrows: (show?: SetStateAction translateY && translateX > SCROLL_THRESHOLD && scale.value === 1 && allowEnablingScroll) {
+ // eslint-disable-next-line react-compiler/react-compiler
isScrollEnabled.value = true;
} else if (translateY > SCROLL_THRESHOLD) {
isScrollEnabled.value = false;
diff --git a/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx b/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
index 70d70a8c1844..2d22a2560bb0 100644
--- a/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
+++ b/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
@@ -56,6 +56,7 @@ function BaseAutoCompleteSuggestions({
useEffect(() => {
if (measuredHeightOfSuggestionRows === prevRowHeightRef.current) {
+ // eslint-disable-next-line react-compiler/react-compiler
fadeInOpacity.value = withTiming(1, {
duration: 70,
easing: Easing.inOut(Easing.ease),
diff --git a/src/components/AvatarCropModal/AvatarCropModal.tsx b/src/components/AvatarCropModal/AvatarCropModal.tsx
index 66814a44cf95..1a606b35f6d2 100644
--- a/src/components/AvatarCropModal/AvatarCropModal.tsx
+++ b/src/components/AvatarCropModal/AvatarCropModal.tsx
@@ -123,6 +123,7 @@ function AvatarCropModal({imageUri = '', imageName = '', imageType = '', onClose
ImageSize.getSize(imageUri).then(({width, height, rotation: orginalRotation}) => {
// On Android devices ImageSize library returns also rotation parameter.
if (orginalRotation === 90 || orginalRotation === 270) {
+ // eslint-disable-next-line react-compiler/react-compiler
originalImageHeight.value = width;
originalImageWidth.value = height;
} else {
diff --git a/src/components/AvatarCropModal/Slider.tsx b/src/components/AvatarCropModal/Slider.tsx
index 9a9da65befa0..67aa89c9c550 100644
--- a/src/components/AvatarCropModal/Slider.tsx
+++ b/src/components/AvatarCropModal/Slider.tsx
@@ -7,6 +7,7 @@ import type {SharedValue} from 'react-native-reanimated';
import Tooltip from '@components/Tooltip';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
+import * as Browser from '@libs/Browser';
import ControlSelection from '@libs/ControlSelection';
type SliderProps = {
@@ -62,7 +63,7 @@ function Slider({sliderValue, gestureCallbacks}: SliderProps) {
shiftVertical={-2}
>
{/* pointerEventsNone is a workaround to make sure the pan gesture works correctly on mobile safari */}
-
+
)}
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index 88ae8d48a871..0fd3cc0728ca 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -118,6 +118,9 @@ type ButtonProps = Partial & {
/** Whether the button should use split style or not */
isSplitButton?: boolean;
+
+ /** Whether button's content should be centered */
+ isContentCentered?: boolean;
};
type KeyboardShortcutComponentProps = Pick;
@@ -147,7 +150,7 @@ function KeyboardShortcutComponent({isDisabled = false, isLoading = false, onPre
priority: enterKeyEventListenerPriority,
shouldPreventDefault: false,
}),
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[shouldDisableEnterShortcut, isFocused],
);
@@ -202,6 +205,7 @@ function Button(
id = '',
accessibilityLabel = '',
isSplitButton = false,
+ isContentCentered = false,
...rest
}: ButtonProps,
ref: ForwardedRef,
@@ -239,7 +243,7 @@ function Button(
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
if (icon || shouldShowRightIcon) {
return (
-
+
{icon && (
diff --git a/src/components/Composer/index.native.tsx b/src/components/Composer/index.native.tsx
index 9e66c0b20c99..c5f2e07eef80 100644
--- a/src/components/Composer/index.native.tsx
+++ b/src/components/Composer/index.native.tsx
@@ -50,6 +50,7 @@ function Composer(
* @param {Element} el
*/
const setTextInputRef = useCallback((el: AnimatedMarkdownTextInputRef) => {
+ // eslint-disable-next-line react-compiler/react-compiler
textInput.current = el;
if (typeof ref !== 'function' || textInput.current === null) {
return;
@@ -60,7 +61,7 @@ function Composer(
// this.textInput = el} /> this will not
// return a ref to the component, but rather the HTML element by default
ref(textInput.current);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
useEffect(() => {
@@ -93,6 +94,7 @@ function Composer(
readOnly={isDisabled}
onBlur={(e) => {
if (!isFocused) {
+ // eslint-disable-next-line react-compiler/react-compiler
shouldResetFocus.current = true; // detect the input is blurred when the page is hidden
}
props?.onBlur?.(e);
diff --git a/src/components/Composer/index.tsx b/src/components/Composer/index.tsx
index eb7091cd958c..a41f983434d8 100755
--- a/src/components/Composer/index.tsx
+++ b/src/components/Composer/index.tsx
@@ -277,8 +277,9 @@ function Composer(
if (!textInput.current || prevScroll === undefined) {
return;
}
+ // eslint-disable-next-line react-compiler/react-compiler
textInput.current.scrollTop = prevScroll;
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [isComposerFullSize]);
useHtmlPaste(textInput, handlePaste, true);
@@ -295,7 +296,7 @@ function Composer(
}
ReportActionComposeFocusManager.clear();
};
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
const handleKeyPress = useCallback(
diff --git a/src/components/ConfirmationPage.tsx b/src/components/ConfirmationPage.tsx
index d1a73b7933fe..883e7261f386 100644
--- a/src/components/ConfirmationPage.tsx
+++ b/src/components/ConfirmationPage.tsx
@@ -17,7 +17,7 @@ type ConfirmationPageProps = {
heading: string;
/** Description of the confirmation page */
- description: string;
+ description: React.ReactNode;
/** The text for the button label */
buttonText?: string;
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index bd9b623bcfb4..2b2c53eaaa18 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -13,6 +13,7 @@ import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
import {removePolicyConnection} from '@libs/actions/connections';
import getQuickBooksOnlineSetupLink from '@libs/actions/connections/QuickBooksOnline';
+import * as PolicyAction from '@userActions/Policy/Policy';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Session} from '@src/types/onyx';
@@ -49,6 +50,8 @@ function ConnectToQuickbooksOnlineButton({
setIsDisconnectModalOpen(true);
return;
}
+ // Since QBO doesn't support Taxes, we should disable them from the LHN when connecting to QBO
+ PolicyAction.enablePolicyTaxes(policyID, false);
setWebViewOpen(true);
}}
text={translate('workspace.accounting.setup')}
@@ -59,6 +62,8 @@ function ConnectToQuickbooksOnlineButton({
{shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect && isDisconnectModalOpen && (
{
+ // Since QBO doesn't support Taxes, we should disable them from the LHN when connecting to QBO
+ PolicyAction.enablePolicyTaxes(policyID, false);
removePolicyConnection(policyID, integrationToDisconnect);
setIsDisconnectModalOpen(false);
setWebViewOpen(true);
diff --git a/src/components/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx
index dc8638f018d4..3809b4f4f110 100644
--- a/src/components/ConnectionLayout.tsx
+++ b/src/components/ConnectionLayout.tsx
@@ -61,11 +61,14 @@ type ConnectionLayoutProps = {
/** Name of the current connection */
connectionName: ConnectionName;
- /** Block the screen when the connection is not empty */
- reverseConnectionEmptyCheck?: boolean;
+ /** Whether the screen should load for an empty connection */
+ shouldLoadForEmptyConnection?: boolean;
/** Handler for back button press */
onBackButtonPress?: () => void;
+
+ /** Whether or not to block user from accessing the page */
+ shouldBeBlocked?: boolean;
};
type ConnectionLayoutContentProps = Pick;
@@ -97,8 +100,9 @@ function ConnectionLayout({
shouldUseScrollView = true,
headerTitleAlreadyTranslated,
titleAlreadyTranslated,
- reverseConnectionEmptyCheck = false,
+ shouldLoadForEmptyConnection = false,
onBackButtonPress = () => Navigation.goBack(),
+ shouldBeBlocked = false,
}: ConnectionLayoutProps) {
const {translate} = useLocalize();
@@ -118,12 +122,14 @@ function ConnectionLayout({
[title, titleStyle, children, titleAlreadyTranslated],
);
+ const shouldBlockByConnection = shouldLoadForEmptyConnection ? !isConnectionEmpty : isConnectionEmpty;
+
return (
{
// This will cause the form to revalidate and remove any error related to currency
onInputChange(currency);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [currency]);
return (
diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index 430c00cf8804..b206d4bcf51d 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -64,7 +64,7 @@ function DisplayNamesTooltipItem({
if (!childRefs.current?.[index] || !el) {
return;
}
- // eslint-disable-next-line no-param-reassign
+ // eslint-disable-next-line react-compiler/react-compiler, no-param-reassign
childRefs.current[index] = el;
}}
style={[textStyles, styles.pre]}
diff --git a/src/components/EmojiPicker/EmojiPicker.tsx b/src/components/EmojiPicker/EmojiPicker.tsx
index 2be8ea4aea7a..edf78283caf9 100644
--- a/src/components/EmojiPicker/EmojiPicker.tsx
+++ b/src/components/EmojiPicker/EmojiPicker.tsx
@@ -115,6 +115,7 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef {
const emojiListRef = useAnimatedRef>();
const frequentlyUsedEmojis = useFrequentlyUsedEmojis();
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
const allEmojis = useMemo(() => EmojiUtils.mergeEmojisWithFrequentlyUsedEmojis(emojis), [frequentlyUsedEmojis]);
const headerEmojis = useMemo(() => EmojiUtils.getHeaderEmojis(allEmojis), [allEmojis]);
const headerRowIndices = useMemo(() => headerEmojis.map((headerEmoji) => headerEmoji.index), [headerEmojis]);
diff --git a/src/components/EmojiPicker/EmojiSkinToneList.tsx b/src/components/EmojiPicker/EmojiSkinToneList.tsx
index fb798f1c02c4..3a1832ac40a7 100644
--- a/src/components/EmojiPicker/EmojiSkinToneList.tsx
+++ b/src/components/EmojiPicker/EmojiSkinToneList.tsx
@@ -38,7 +38,7 @@ function EmojiSkinToneList() {
return;
}
toggleIsSkinToneListVisible();
- // eslint-disable-next-line react-hooks/exhaustive-deps -- only run when preferredSkinTone updates
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- only run when preferredSkinTone updates
}, [preferredSkinTone]);
const currentSkinTone = getSkinToneEmojiFromIndex(preferredSkinTone);
diff --git a/src/components/EmptyStateComponent/index.tsx b/src/components/EmptyStateComponent/index.tsx
new file mode 100644
index 000000000000..a8ad9d0f3154
--- /dev/null
+++ b/src/components/EmptyStateComponent/index.tsx
@@ -0,0 +1,100 @@
+import type {VideoReadyForDisplayEvent} from 'expo-av';
+import React, {useMemo, useState} from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import ImageSVG from '@components/ImageSVG';
+import Lottie from '@components/Lottie';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import VideoPlayer from '@components/VideoPlayer';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import CONST from '@src/CONST';
+import type {EmptyStateComponentProps, VideoLoadedEventType} from './types';
+
+const VIDEO_ASPECT_RATIO = 400 / 225;
+
+function EmptyStateComponent({SkeletonComponent, headerMediaType, headerMedia, buttonText, buttonAction, title, subtitle, headerStyles, headerContentStyles}: EmptyStateComponentProps) {
+ const styles = useThemeStyles();
+ const {isSmallScreenWidth} = useWindowDimensions();
+ const [videoAspectRatio, setVideoAspectRatio] = useState(VIDEO_ASPECT_RATIO);
+
+ const setAspectRatio = (event: VideoReadyForDisplayEvent | VideoLoadedEventType | undefined) => {
+ if (!event) {
+ return;
+ }
+
+ if ('naturalSize' in event) {
+ setVideoAspectRatio(event.naturalSize.width / event.naturalSize.height);
+ } else {
+ setVideoAspectRatio(event.srcElement.videoWidth / event.srcElement.videoHeight);
+ }
+ };
+
+ const HeaderComponent = useMemo(() => {
+ switch (headerMediaType) {
+ case CONST.EMPTY_STATE_MEDIA.VIDEO:
+ return (
+
+ );
+ case CONST.EMPTY_STATE_MEDIA.ANIMATION:
+ return (
+
+ );
+ case CONST.EMPTY_STATE_MEDIA.ILLUSTRATION:
+ return (
+
+ );
+ default:
+ return null;
+ }
+ }, [headerMedia, headerMediaType, headerContentStyles, videoAspectRatio, styles.emptyStateVideo]);
+
+ return (
+
+
+
+
+
+
+ {HeaderComponent}
+
+ {title}
+ {subtitle}
+ {!!buttonText && !!buttonAction && (
+
+ )}
+
+
+
+
+ );
+}
+
+EmptyStateComponent.displayName = 'EmptyStateComponent';
+export default EmptyStateComponent;
diff --git a/src/components/EmptyStateComponent/types.ts b/src/components/EmptyStateComponent/types.ts
new file mode 100644
index 000000000000..326b25542f42
--- /dev/null
+++ b/src/components/EmptyStateComponent/types.ts
@@ -0,0 +1,41 @@
+import type {ImageStyle} from 'expo-image';
+import type {StyleProp, ViewStyle} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import type DotLottieAnimation from '@components/LottieAnimations/types';
+import type SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
+import type TableRowSkeleton from '@components/Skeletons/TableRowSkeleton';
+import type CONST from '@src/CONST';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+type ValidSkeletons = typeof SearchRowSkeleton | typeof TableRowSkeleton;
+type MediaTypes = ValueOf;
+
+type SharedProps = {
+ SkeletonComponent: ValidSkeletons;
+ title: string;
+ subtitle: string;
+ buttonText?: string;
+ buttonAction?: () => void;
+ headerStyles?: StyleProp;
+ headerMediaType: T;
+ headerContentStyles?: StyleProp;
+};
+
+type MediaType = SharedProps & {
+ headerMedia: HeaderMedia;
+};
+
+type VideoProps = MediaType;
+type IllustrationProps = MediaType;
+type AnimationProps = MediaType;
+
+type EmptyStateComponentProps = VideoProps | IllustrationProps | AnimationProps;
+
+type VideoLoadedEventType = {
+ srcElement: {
+ videoWidth: number;
+ videoHeight: number;
+ };
+};
+
+export type {EmptyStateComponentProps, VideoLoadedEventType};
diff --git a/src/components/FlatList/index.android.tsx b/src/components/FlatList/index.android.tsx
index 1246367d29e8..c8ce7ee10d6b 100644
--- a/src/components/FlatList/index.android.tsx
+++ b/src/components/FlatList/index.android.tsx
@@ -22,7 +22,7 @@ function CustomFlatList(props: FlatListProps, ref: ForwardedRef)
}
}, [scrollPosition?.offset, ref]);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
const onMomentumScrollEnd = useCallback((event: NativeSyntheticEvent) => setScrollPosition({offset: event.nativeEvent.contentOffset.y}), []);
useFocusEffect(
diff --git a/src/components/FloatingActionButton.tsx b/src/components/FloatingActionButton.tsx
index 93ffa52bc80b..7c2f5579332a 100644
--- a/src/components/FloatingActionButton.tsx
+++ b/src/components/FloatingActionButton.tsx
@@ -63,6 +63,7 @@ function FloatingActionButton({onPress, isActive, accessibilityLabel, role}: Flo
const buttonRef = ref;
useEffect(() => {
+ // eslint-disable-next-line react-compiler/react-compiler
sharedValue.value = withTiming(isActive ? 1 : 0, {
duration: 340,
easing: Easing.inOut(Easing.ease),
diff --git a/src/components/FocusTrap/FocusTrapForModal/index.web.tsx b/src/components/FocusTrap/FocusTrapForModal/index.web.tsx
index be5da8c49a78..00dcedd32aa2 100644
--- a/src/components/FocusTrap/FocusTrapForModal/index.web.tsx
+++ b/src/components/FocusTrap/FocusTrapForModal/index.web.tsx
@@ -1,6 +1,7 @@
import FocusTrap from 'focus-trap-react';
import React from 'react';
import sharedTrapStack from '@components/FocusTrap/sharedTrapStack';
+import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
import type FocusTrapForModalProps from './FocusTrapForModalProps';
function FocusTrapForModal({children, active}: FocusTrapForModalProps) {
@@ -12,6 +13,12 @@ function FocusTrapForModal({children, active}: FocusTrapForModalProps) {
clickOutsideDeactivates: true,
initialFocus: false,
fallbackFocus: document.body,
+ setReturnFocus: (element) => {
+ if (ReportActionComposeFocusManager.isFocused()) {
+ return false;
+ }
+ return element;
+ },
}}
>
{children}
diff --git a/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx b/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx
index d81293729b94..628a85c6d705 100644
--- a/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx
+++ b/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx
@@ -39,6 +39,7 @@ function FocusTrapForScreen({children}: FocusTrapProps) {
useFocusEffect(
useCallback(() => {
+ // eslint-disable-next-line react-compiler/react-compiler
activeRouteName = route.name;
}, [route]),
);
diff --git a/src/components/FocusTrap/SCREENS_WITH_AUTOFOCUS.ts b/src/components/FocusTrap/SCREENS_WITH_AUTOFOCUS.ts
index 7af327d35ac4..27eab777097f 100644
--- a/src/components/FocusTrap/SCREENS_WITH_AUTOFOCUS.ts
+++ b/src/components/FocusTrap/SCREENS_WITH_AUTOFOCUS.ts
@@ -9,8 +9,13 @@ const SCREENS_WITH_AUTOFOCUS: string[] = [
SCREENS.PRIVATE_NOTES.EDIT,
SCREENS.SETTINGS.PROFILE.STATUS,
SCREENS.SETTINGS.PROFILE.PRONOUNS,
+ SCREENS.REPORT_SETTINGS.ROOT,
+ SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES,
+ SCREENS.REPORT_PARTICIPANTS.ROOT,
+ SCREENS.ROOM_MEMBERS_ROOT,
SCREENS.NEW_TASK.DETAILS,
SCREENS.MONEY_REQUEST.CREATE,
+ SCREENS.WORKSPACE.INVITE,
SCREENS.SIGN_IN_ROOT,
];
diff --git a/src/components/Form/FormProvider.tsx b/src/components/Form/FormProvider.tsx
index 9df94e4c6114..793154d95b02 100644
--- a/src/components/Form/FormProvider.tsx
+++ b/src/components/Form/FormProvider.tsx
@@ -73,6 +73,9 @@ type FormProviderProps = FormProvider
/** Whether to apply flex to the submit button */
submitFlexEnabled?: boolean;
+
+ /** Whether button is disabled */
+ isSubmitDisabled?: boolean;
};
function FormProvider(
@@ -176,7 +179,7 @@ function FormProvider(
onValidate(trimmedStringValues, !hasServerError);
// Only run when locales change
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [preferredLocale]);
/** @param inputID - The inputID of the input being touched */
@@ -239,6 +242,7 @@ function FormProvider(
inputRefs.current[inputID] = newRef;
}
if (inputProps.value !== undefined) {
+ // eslint-disable-next-line react-compiler/react-compiler
inputValues[inputID] = inputProps.value;
} else if (inputProps.shouldSaveDraft && draftValues?.[inputID] !== undefined && inputValues[inputID] === undefined) {
inputValues[inputID] = draftValues[inputID];
diff --git a/src/components/Form/FormWrapper.tsx b/src/components/Form/FormWrapper.tsx
index 5c74fd466a15..77ef44343792 100644
--- a/src/components/Form/FormWrapper.tsx
+++ b/src/components/Form/FormWrapper.tsx
@@ -38,6 +38,9 @@ type FormWrapperProps = ChildrenProps &
/** Assuming refs are React refs */
inputRefs: RefObject;
+ /** Whether the submit button is disabled */
+ isSubmitDisabled?: boolean;
+
/** Callback to submit the form */
onSubmit: () => void;
};
@@ -57,9 +60,11 @@ function FormWrapper({
enabledWhenOffline,
isSubmitActionDangerous = false,
formID,
+ shouldUseScrollView = true,
scrollContextEnabled = false,
shouldHideFixErrorsAlert = false,
disablePressOnEnter = true,
+ isSubmitDisabled = false,
}: FormWrapperProps) {
const styles = useThemeStyles();
const formRef = useRef(null);
@@ -108,6 +113,7 @@ function FormWrapper({
{isSubmitButtonVisible && (
{({safeAreaPaddingBottomStyle}) =>
diff --git a/src/components/Form/InputWrapper.tsx b/src/components/Form/InputWrapper.tsx
index b5535a2fe6c1..c966dd4456e9 100644
--- a/src/components/Form/InputWrapper.tsx
+++ b/src/components/Form/InputWrapper.tsx
@@ -54,7 +54,7 @@ function computeComponentSpecificRegistrationParams({
shouldSetTouchedOnBlurOnly: false,
// Forward the originally provided value
blurOnSubmit,
- shouldSubmitForm: false,
+ shouldSubmitForm: !!shouldSubmitForm,
};
}
diff --git a/src/components/Form/SafariFormWrapper.tsx b/src/components/Form/SafariFormWrapper.tsx
new file mode 100644
index 000000000000..8ad411e547be
--- /dev/null
+++ b/src/components/Form/SafariFormWrapper.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import {isSafari} from '@libs/Browser';
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+
+type SafariFormWrapperProps = ChildrenProps;
+
+/**
+ * If we used any without ;
+ }
+
+ return children;
+}
+
+export default SafariFormWrapper;
diff --git a/src/components/Form/types.ts b/src/components/Form/types.ts
index afbe2bb124b5..5f56bbeceea6 100644
--- a/src/components/Form/types.ts
+++ b/src/components/Form/types.ts
@@ -20,6 +20,10 @@ import type TextInput from '@components/TextInput';
import type TextPicker from '@components/TextPicker';
import type ValuePicker from '@components/ValuePicker';
import type BusinessTypePicker from '@pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker';
+import type DimensionTypeSelector from '@pages/workspace/accounting/intacct/import/DimensionTypeSelector';
+import type NetSuiteCustomFieldMappingPicker from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker';
+import type NetSuiteCustomListPicker from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListPicker';
+import type NetSuiteMenuWithTopDescriptionForm from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm';
import type {Country} from '@src/CONST';
import type {OnyxFormKey, OnyxValues} from '@src/ONYXKEYS';
import type {BaseForm} from '@src/types/form/Form';
@@ -39,6 +43,7 @@ type ValidInputs =
| typeof CurrencySelector
| typeof AmountForm
| typeof BusinessTypePicker
+ | typeof DimensionTypeSelector
| typeof StateSelector
| typeof RoomNameInput
| typeof ValuePicker
@@ -47,7 +52,10 @@ type ValidInputs =
| typeof AmountPicker
| typeof TextPicker
| typeof AddPlaidBankAccount
- | typeof EmojiPickerButtonDropdown;
+ | typeof EmojiPickerButtonDropdown
+ | typeof NetSuiteCustomListPicker
+ | typeof NetSuiteCustomFieldMappingPicker
+ | typeof NetSuiteMenuWithTopDescriptionForm;
type ValueTypeKey = 'string' | 'boolean' | 'date' | 'country' | 'reportFields' | 'disabledListValues';
type ValueTypeMap = {
@@ -126,6 +134,9 @@ type FormProps = {
/** Whether ScrollWithContext should be used instead of regular ScrollView. Set to true when there's a nested Picker component in Form. */
scrollContextEnabled?: boolean;
+ /** Whether to use ScrollView */
+ shouldUseScrollView?: boolean;
+
/** Container styles */
style?: StyleProp;
diff --git a/src/components/HybridAppMiddleware.tsx b/src/components/HybridAppMiddleware.tsx
deleted file mode 100644
index 5c6934f4fc3d..000000000000
--- a/src/components/HybridAppMiddleware.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import {useNavigation} from '@react-navigation/native';
-import type {StackNavigationProp} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {NativeModules} from 'react-native';
-import useSplashScreen from '@hooks/useSplashScreen';
-import BootSplash from '@libs/BootSplash';
-import Log from '@libs/Log';
-import Navigation from '@libs/Navigation/Navigation';
-import type {RootStackParamList} from '@libs/Navigation/types';
-import * as Welcome from '@userActions/Welcome';
-import CONST from '@src/CONST';
-import type {Route} from '@src/ROUTES';
-
-type HybridAppMiddlewareProps = {
- children: React.ReactNode;
-};
-
-type HybridAppMiddlewareContextType = {
- navigateToExitUrl: (exitUrl: Route) => void;
- showSplashScreenOnNextStart: () => void;
-};
-const HybridAppMiddlewareContext = React.createContext({
- navigateToExitUrl: () => {},
- showSplashScreenOnNextStart: () => {},
-});
-
-/*
- * HybridAppMiddleware is responsible for handling BootSplash visibility correctly.
- * It is crucial to make transitions between OldDot and NewDot look smooth.
- */
-function HybridAppMiddleware(props: HybridAppMiddlewareProps) {
- const {isSplashHidden, setIsSplashHidden} = useSplashScreen();
- const [startedTransition, setStartedTransition] = useState(false);
- const [finishedTransition, setFinishedTransition] = useState(false);
- const navigation = useNavigation>();
-
- /*
- * Handles navigation during transition from OldDot. For ordinary NewDot app it is just pure navigation.
- */
- const navigateToExitUrl = useCallback((exitUrl: Route) => {
- if (NativeModules.HybridAppModule) {
- setStartedTransition(true);
- Log.info(`[HybridApp] Started transition to ${exitUrl}`, true);
- }
-
- Navigation.navigate(exitUrl);
- }, []);
-
- /**
- * This function only affects iOS. If during a single app lifecycle we frequently transition from OldDot to NewDot,
- * we need to artificially show the bootsplash because the app is only booted once.
- */
- const showSplashScreenOnNextStart = useCallback(() => {
- setIsSplashHidden(false);
- setStartedTransition(false);
- setFinishedTransition(false);
- }, [setIsSplashHidden]);
-
- useEffect(() => {
- if (!finishedTransition || isSplashHidden) {
- return;
- }
-
- Log.info('[HybridApp] Finished transtion', true);
- BootSplash.hide().then(() => {
- setIsSplashHidden(true);
- Log.info('[HybridApp] Handling onboarding flow', true);
- Welcome.handleHybridAppOnboarding();
- });
- }, [finishedTransition, isSplashHidden, setIsSplashHidden]);
-
- useEffect(() => {
- if (!startedTransition) {
- return;
- }
-
- // On iOS, the transitionEnd event doesn't trigger some times. As such, we need to set a timeout.
- const timeout = setTimeout(() => {
- setFinishedTransition(true);
- }, CONST.SCREEN_TRANSITION_END_TIMEOUT);
-
- const unsubscribeTransitionEnd = navigation.addListener('transitionEnd', () => {
- clearTimeout(timeout);
- setFinishedTransition(true);
- });
-
- return () => {
- clearTimeout(timeout);
- unsubscribeTransitionEnd();
- };
- }, [navigation, startedTransition]);
-
- const contextValue = useMemo(
- () => ({
- navigateToExitUrl,
- showSplashScreenOnNextStart,
- }),
- [navigateToExitUrl, showSplashScreenOnNextStart],
- );
-
- return {props.children};
-}
-
-HybridAppMiddleware.displayName = 'HybridAppMiddleware';
-
-export default HybridAppMiddleware;
-export type {HybridAppMiddlewareContextType};
-export {HybridAppMiddlewareContext};
diff --git a/src/components/HybridAppMiddleware/index.ios.tsx b/src/components/HybridAppMiddleware/index.ios.tsx
new file mode 100644
index 000000000000..5b06e5626c6e
--- /dev/null
+++ b/src/components/HybridAppMiddleware/index.ios.tsx
@@ -0,0 +1,130 @@
+import type React from 'react';
+import {useContext, useEffect, useState} from 'react';
+import {NativeEventEmitter, NativeModules} from 'react-native';
+import type {NativeModule} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import {InitialURLContext} from '@components/InitialURLContextProvider';
+import useExitTo from '@hooks/useExitTo';
+import useSplashScreen from '@hooks/useSplashScreen';
+import BootSplash from '@libs/BootSplash';
+import Log from '@libs/Log';
+import Navigation from '@libs/Navigation/Navigation';
+import * as SessionUtils from '@libs/SessionUtils';
+import * as Welcome from '@userActions/Welcome';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {HybridAppRoute, Route} from '@src/ROUTES';
+
+type HybridAppMiddlewareProps = {
+ authenticated: boolean;
+ children: React.ReactNode;
+};
+
+/*
+ * HybridAppMiddleware is responsible for handling BootSplash visibility correctly.
+ * It is crucial to make transitions between OldDot and NewDot look smooth.
+ * The middleware assumes that the entry point for HybridApp is the /transition route.
+ */
+function HybridAppMiddleware({children, authenticated}: HybridAppMiddlewareProps) {
+ const {isSplashHidden, setIsSplashHidden} = useSplashScreen();
+ const [startedTransition, setStartedTransition] = useState(false);
+ const [finishedTransition, setFinishedTransition] = useState(false);
+
+ const initialURL = useContext(InitialURLContext);
+ const exitToParam = useExitTo();
+ const [exitTo, setExitTo] = useState();
+
+ const [isAccountLoading] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => account?.isLoading ?? false});
+ const [sessionEmail] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.email});
+
+ // In iOS, the HybridApp defines the `onReturnToOldDot` event.
+ // If we frequently transition from OldDot to NewDot during a single app lifecycle,
+ // we need to artificially display the bootsplash since the app is booted only once.
+ // Therefore, isSplashHidden needs to be updated at the appropriate time.
+ useEffect(() => {
+ if (!NativeModules.HybridAppModule) {
+ return;
+ }
+ const HybridAppEvents = new NativeEventEmitter(NativeModules.HybridAppModule as unknown as NativeModule);
+ const listener = HybridAppEvents.addListener(CONST.EVENTS.ON_RETURN_TO_OLD_DOT, () => {
+ Log.info('[HybridApp] `onReturnToOldDot` event received. Resetting state of HybridAppMiddleware', true);
+ setIsSplashHidden(false);
+ setStartedTransition(false);
+ setFinishedTransition(false);
+ setExitTo(undefined);
+ });
+
+ return () => {
+ listener.remove();
+ };
+ }, [setIsSplashHidden]);
+
+ // Save `exitTo` when we reach /transition route.
+ // `exitTo` should always exist during OldDot -> NewDot transitions.
+ useEffect(() => {
+ if (!NativeModules.HybridAppModule || !exitToParam || exitTo) {
+ return;
+ }
+
+ Log.info('[HybridApp] Saving `exitTo` for later', true, {exitTo: exitToParam});
+ setExitTo(exitToParam);
+
+ Log.info(`[HybridApp] Started transition`, true);
+ setStartedTransition(true);
+ }, [exitTo, exitToParam]);
+
+ useEffect(() => {
+ if (!startedTransition || finishedTransition) {
+ return;
+ }
+
+ const transitionURL = NativeModules.HybridAppModule ? `${CONST.DEEPLINK_BASE_URL}${initialURL ?? ''}` : initialURL;
+ const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(transitionURL ?? undefined, sessionEmail);
+
+ // We need to wait with navigating to exitTo until all login-related actions are complete.
+ if (!authenticated || isLoggingInAsNewUser || isAccountLoading) {
+ return;
+ }
+
+ if (exitTo) {
+ Navigation.isNavigationReady().then(() => {
+ // We need to remove /transition from route history.
+ // `useExitTo` returns undefined for routes other than /transition.
+ if (exitToParam) {
+ Log.info('[HybridApp] Removing /transition route from history', true);
+ Navigation.goBack();
+ }
+
+ Log.info('[HybridApp] Navigating to `exitTo` route', true, {exitTo});
+ Navigation.navigate(Navigation.parseHybridAppUrl(exitTo));
+ setExitTo(undefined);
+
+ setTimeout(() => {
+ Log.info('[HybridApp] Setting `finishedTransition` to true', true);
+ setFinishedTransition(true);
+ }, CONST.SCREEN_TRANSITION_END_TIMEOUT);
+ });
+ }
+ }, [authenticated, exitTo, exitToParam, finishedTransition, initialURL, isAccountLoading, sessionEmail, startedTransition]);
+
+ useEffect(() => {
+ if (!finishedTransition || isSplashHidden) {
+ return;
+ }
+
+ Log.info('[HybridApp] Finished transition, hiding BootSplash', true);
+ BootSplash.hide().then(() => {
+ setIsSplashHidden(true);
+ if (authenticated) {
+ Log.info('[HybridApp] Handling onboarding flow', true);
+ Welcome.handleHybridAppOnboarding();
+ }
+ });
+ }, [authenticated, finishedTransition, isSplashHidden, setIsSplashHidden]);
+
+ return children;
+}
+
+HybridAppMiddleware.displayName = 'HybridAppMiddleware';
+
+export default HybridAppMiddleware;
diff --git a/src/components/HybridAppMiddleware/index.tsx b/src/components/HybridAppMiddleware/index.tsx
new file mode 100644
index 000000000000..b8c72d9200ac
--- /dev/null
+++ b/src/components/HybridAppMiddleware/index.tsx
@@ -0,0 +1,107 @@
+import type React from 'react';
+import {useContext, useEffect, useState} from 'react';
+import {NativeModules} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import {InitialURLContext} from '@components/InitialURLContextProvider';
+import useExitTo from '@hooks/useExitTo';
+import useSplashScreen from '@hooks/useSplashScreen';
+import BootSplash from '@libs/BootSplash';
+import Log from '@libs/Log';
+import Navigation from '@libs/Navigation/Navigation';
+import * as SessionUtils from '@libs/SessionUtils';
+import * as Welcome from '@userActions/Welcome';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {HybridAppRoute, Route} from '@src/ROUTES';
+
+type HybridAppMiddlewareProps = {
+ authenticated: boolean;
+ children: React.ReactNode;
+};
+
+/*
+ * HybridAppMiddleware is responsible for handling BootSplash visibility correctly.
+ * It is crucial to make transitions between OldDot and NewDot look smooth.
+ * The middleware assumes that the entry point for HybridApp is the /transition route.
+ */
+function HybridAppMiddleware({children, authenticated}: HybridAppMiddlewareProps) {
+ const {isSplashHidden, setIsSplashHidden} = useSplashScreen();
+ const [startedTransition, setStartedTransition] = useState(false);
+ const [finishedTransition, setFinishedTransition] = useState(false);
+
+ const initialURL = useContext(InitialURLContext);
+ const exitToParam = useExitTo();
+ const [exitTo, setExitTo] = useState();
+
+ const [isAccountLoading] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => account?.isLoading ?? false});
+ const [sessionEmail] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.email});
+
+ // Save `exitTo` when we reach /transition route.
+ // `exitTo` should always exist during OldDot -> NewDot transitions.
+ useEffect(() => {
+ if (!NativeModules.HybridAppModule || !exitToParam || exitTo) {
+ return;
+ }
+
+ Log.info('[HybridApp] Saving `exitTo` for later', true, {exitTo: exitToParam});
+ setExitTo(exitToParam);
+
+ Log.info(`[HybridApp] Started transition`, true);
+ setStartedTransition(true);
+ }, [exitTo, exitToParam]);
+
+ useEffect(() => {
+ if (!startedTransition || finishedTransition) {
+ return;
+ }
+
+ const transitionURL = NativeModules.HybridAppModule ? `${CONST.DEEPLINK_BASE_URL}${initialURL ?? ''}` : initialURL;
+ const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(transitionURL ?? undefined, sessionEmail);
+
+ // We need to wait with navigating to exitTo until all login-related actions are complete.
+ if (!authenticated || isLoggingInAsNewUser || isAccountLoading) {
+ return;
+ }
+
+ if (exitTo) {
+ Navigation.isNavigationReady().then(() => {
+ // We need to remove /transition from route history.
+ // `useExitTo` returns undefined for routes other than /transition.
+ if (exitToParam) {
+ Log.info('[HybridApp] Removing /transition route from history', true);
+ Navigation.goBack();
+ }
+
+ Log.info('[HybridApp] Navigating to `exitTo` route', true, {exitTo});
+ Navigation.navigate(Navigation.parseHybridAppUrl(exitTo));
+ setExitTo(undefined);
+
+ setTimeout(() => {
+ Log.info('[HybridApp] Setting `finishedTransition` to true', true);
+ setFinishedTransition(true);
+ }, CONST.SCREEN_TRANSITION_END_TIMEOUT);
+ });
+ }
+ }, [authenticated, exitTo, exitToParam, finishedTransition, initialURL, isAccountLoading, sessionEmail, startedTransition]);
+
+ useEffect(() => {
+ if (!finishedTransition || isSplashHidden) {
+ return;
+ }
+
+ Log.info('[HybridApp] Finished transition, hiding BootSplash', true);
+ BootSplash.hide().then(() => {
+ setIsSplashHidden(true);
+ if (authenticated) {
+ Log.info('[HybridApp] Handling onboarding flow', true);
+ Welcome.handleHybridAppOnboarding();
+ }
+ });
+ }, [authenticated, finishedTransition, isSplashHidden, setIsSplashHidden]);
+
+ return children;
+}
+
+HybridAppMiddleware.displayName = 'HybridAppMiddleware';
+
+export default HybridAppMiddleware;
diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index a0d7a5cb8883..487df5594212 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -42,6 +42,7 @@ import ChatBubbles from '@assets/images/chatbubbles.svg';
import CheckCircle from '@assets/images/check-circle.svg';
import CheckmarkCircle from '@assets/images/checkmark-circle.svg';
import Checkmark from '@assets/images/checkmark.svg';
+import CircularArrowBackwards from '@assets/images/circular-arrow-backwards.svg';
import Close from '@assets/images/close.svg';
import ClosedSign from '@assets/images/closed-sign.svg';
import Coins from '@assets/images/coins.svg';
@@ -201,6 +202,7 @@ export {
Wrench,
BackArrow,
Bank,
+ CircularArrowBackwards,
Bill,
Bell,
BellSlash,
diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts
index bd0824372799..da72b3025340 100644
--- a/src/components/Icon/Illustrations.ts
+++ b/src/components/Icon/Illustrations.ts
@@ -8,6 +8,7 @@ import ConciergeExclamation from '@assets/images/product-illustrations/concierge
import CreditCardsBlue from '@assets/images/product-illustrations/credit-cards--blue.svg';
import EmptyStateExpenses from '@assets/images/product-illustrations/emptystate__expenses.svg';
import EmptyStateTravel from '@assets/images/product-illustrations/emptystate__travel.svg';
+import FolderWithPapers from '@assets/images/product-illustrations/folder-with-papers.svg';
import GpsTrackOrange from '@assets/images/product-illustrations/gps-track--orange.svg';
import Hands from '@assets/images/product-illustrations/home-illustration-hands.svg';
import InvoiceOrange from '@assets/images/product-illustrations/invoice--orange.svg';
@@ -52,6 +53,7 @@ import ConciergeNew from '@assets/images/simple-illustrations/simple-illustratio
import CreditCardsNew from '@assets/images/simple-illustrations/simple-illustration__credit-cards.svg';
import CreditCardEyes from '@assets/images/simple-illustrations/simple-illustration__creditcardeyes.svg';
import EmailAddress from '@assets/images/simple-illustrations/simple-illustration__email-address.svg';
+import EmptyState from '@assets/images/simple-illustrations/simple-illustration__empty-state.svg';
import FolderOpen from '@assets/images/simple-illustrations/simple-illustration__folder-open.svg';
import Gears from '@assets/images/simple-illustrations/simple-illustration__gears.svg';
import HandCard from '@assets/images/simple-illustrations/simple-illustration__handcard.svg';
@@ -92,6 +94,7 @@ import ThumbsUpStars from '@assets/images/simple-illustrations/simple-illustrati
import TrackShoe from '@assets/images/simple-illustrations/simple-illustration__track-shoe.svg';
import TrashCan from '@assets/images/simple-illustrations/simple-illustration__trashcan.svg';
import TreasureChest from '@assets/images/simple-illustrations/simple-illustration__treasurechest.svg';
+import VirtualCard from '@assets/images/simple-illustrations/simple-illustration__virtualcard.svg';
import WalletAlt from '@assets/images/simple-illustrations/simple-illustration__wallet-alt.svg';
import Workflows from '@assets/images/simple-illustrations/simple-illustration__workflows.svg';
import ExpensifyApprovedLogoLight from '@assets/images/subscription-details__approvedlogo--light.svg';
@@ -196,4 +199,7 @@ export {
CheckmarkCircle,
CreditCardEyes,
LockClosedOrange,
+ EmptyState,
+ FolderWithPapers,
+ VirtualCard,
};
diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx
index f3cbc332c995..5fe1ba306400 100644
--- a/src/components/Image/index.tsx
+++ b/src/components/Image/index.tsx
@@ -58,7 +58,7 @@ function Image({source: propsSource, isAuthTokenRequired = false, session, onLoa
}
return propsSource;
// The session prop is not required, as it causes the image to reload whenever the session changes. For more information, please refer to issue #26034.
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [propsSource, isAuthTokenRequired]);
/**
diff --git a/src/components/LHNOptionsList/OptionRowLHN.tsx b/src/components/LHNOptionsList/OptionRowLHN.tsx
index 7703b804611a..431a12d00106 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN.tsx
@@ -21,8 +21,8 @@ import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import DateUtils from '@libs/DateUtils';
import DomUtils from '@libs/DomUtils';
-import {parseHtmlToText} from '@libs/OnyxAwareParser';
import * as OptionsListUtils from '@libs/OptionsListUtils';
+import Parser from '@libs/Parser';
import Performance from '@libs/Performance';
import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
import * as ReportUtils from '@libs/ReportUtils';
@@ -251,7 +251,7 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
numberOfLines={1}
accessibilityLabel={translate('accessibilityHints.lastChatMessagePreview')}
>
- {parseHtmlToText(optionItem.alternateText)}
+ {Parser.htmlToText(optionItem.alternateText)}
) : null}
diff --git a/src/components/LHNOptionsList/OptionRowLHNData.tsx b/src/components/LHNOptionsList/OptionRowLHNData.tsx
index 8d61058ed5be..8f3d78546dd3 100644
--- a/src/components/LHNOptionsList/OptionRowLHNData.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHNData.tsx
@@ -57,7 +57,7 @@ function OptionRowLHNData({
return item;
// Listen parentReportAction to update title of thread report when parentReportAction changed
// Listen to transaction to update title of transaction report when transaction changed
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [
fullReport,
lastReportActionTransaction,
diff --git a/src/components/Lottie/index.tsx b/src/components/Lottie/index.tsx
index 6395a715f339..a9b223a87a54 100644
--- a/src/components/Lottie/index.tsx
+++ b/src/components/Lottie/index.tsx
@@ -1,7 +1,7 @@
-import type {LottieViewProps} from 'lottie-react-native';
+import type {AnimationObject, LottieViewProps} from 'lottie-react-native';
import LottieView from 'lottie-react-native';
import type {ForwardedRef} from 'react';
-import React, {forwardRef} from 'react';
+import React, {forwardRef, useEffect, useState} from 'react';
import {View} from 'react-native';
import type DotLottieAnimation from '@components/LottieAnimations/types';
import useAppState from '@hooks/useAppState';
@@ -19,6 +19,12 @@ function Lottie({source, webStyle, ...props}: Props, ref: ForwardedRef setIsError(false)});
+ const [animationFile, setAnimationFile] = useState();
+
+ useEffect(() => {
+ setAnimationFile(source.file);
+ }, [setAnimationFile, source.file]);
+
const aspectRatioStyle = styles.aspectRatioLottie(source);
// If the image fails to load or app is in background state, we'll just render an empty view
@@ -28,17 +34,17 @@ function Lottie({source, webStyle, ...props}: Props, ref: ForwardedRef;
}
- return (
+ return animationFile ? (
setIsError(true)}
/>
- );
+ ) : null;
}
Lottie.displayName = 'Lottie';
diff --git a/src/components/MagicCodeInput.tsx b/src/components/MagicCodeInput.tsx
index 956f3ffe5e02..2fae3cc89597 100644
--- a/src/components/MagicCodeInput.tsx
+++ b/src/components/MagicCodeInput.tsx
@@ -192,7 +192,7 @@ function MagicCodeInput(
// We have not added:
// + the editIndex as the dependency because we don't want to run this logic after focusing on an input to edit it after the user has completed the code.
// + the onFulfill as the dependency because onFulfill is changed when the preferred locale changed => avoid auto submit form when preferred locale changed.
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [value, shouldSubmitOnComplete]);
/**
@@ -353,7 +353,7 @@ function MagicCodeInput(
// We have not added:
// + the onChangeText and onKeyPress as the dependencies because we only want to run this when lastPressedDigit changes.
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [lastPressedDigit, isDisableKeyboard]);
return (
diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx
index 283f7c396edb..553be816cf3f 100644
--- a/src/components/MapView/MapView.tsx
+++ b/src/components/MapView/MapView.tsx
@@ -37,6 +37,7 @@ const MapView = forwardRef(
const currentPosition = userLocation ?? initialLocation;
const [userInteractedWithMap, setUserInteractedWithMap] = useState(false);
const shouldInitializeCurrentPosition = useRef(true);
+ const [isAccessTokenSet, setIsAccessTokenSet] = useState(false);
// Determines if map can be panned to user's detected
// location without bothering the user. It will return
@@ -138,7 +139,12 @@ const MapView = forwardRef(
}, [navigation]);
useEffect(() => {
- setAccessToken(accessToken);
+ setAccessToken(accessToken).then((token) => {
+ if (!token) {
+ return;
+ }
+ setIsAccessTokenSet(true);
+ });
}, [accessToken]);
const setMapIdle = (e: MapState) => {
@@ -198,7 +204,7 @@ const MapView = forwardRef(
const initCenterCoordinate = useMemo(() => (interactive ? centerCoordinate : undefined), [interactive, centerCoordinate]);
const initBounds = useMemo(() => (interactive ? undefined : waypointsBounds), [interactive, waypointsBounds]);
- return !isOffline && !!accessToken && !!defaultSettings ? (
+ return !isOffline && isAccessTokenSet && !!defaultSettings ? (
(
resetBoundaries();
setShouldResetBoundaries(false);
- // eslint-disable-next-line react-hooks/exhaustive-deps -- this effect only needs to run when the boundaries reset is forced
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- this effect only needs to run when the boundaries reset is forced
}, [shouldResetBoundaries]);
useEffect(() => {
diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index bf12c95825dc..473806aac3af 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -1,4 +1,3 @@
-import {ExpensiMark} from 'expensify-common';
import type {ImageContentFit} from 'expo-image';
import type {ReactElement, ReactNode} from 'react';
import React, {forwardRef, useContext, useMemo} from 'react';
@@ -14,6 +13,7 @@ import ControlSelection from '@libs/ControlSelection';
import convertToLTR from '@libs/convertToLTR';
import * as DeviceCapabilities from '@libs/DeviceCapabilities';
import getButtonState from '@libs/getButtonState';
+import Parser from '@libs/Parser';
import type {AvatarSource} from '@libs/UserUtils';
import variables from '@styles/variables';
import * as Session from '@userActions/Session';
@@ -433,16 +433,14 @@ function MenuItem(
if (!title || !shouldParseTitle) {
return '';
}
- const parser = new ExpensiMark();
- return parser.replace(title, {shouldEscapeText});
+ return Parser.replace(title, {shouldEscapeText});
}, [title, shouldParseTitle, shouldEscapeText]);
const helperHtml = useMemo(() => {
if (!helperText || !shouldParseHelperText) {
return '';
}
- const parser = new ExpensiMark();
- return parser.replace(helperText, {shouldEscapeText});
+ return Parser.replace(helperText, {shouldEscapeText});
}, [helperText, shouldParseHelperText, shouldEscapeText]);
const processedTitle = useMemo(() => {
diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
index 2eb073bb39be..d88dde545f3b 100644
--- a/src/components/Modal/BaseModal.tsx
+++ b/src/components/Modal/BaseModal.tsx
@@ -118,7 +118,7 @@ function BaseModal(
}
hideModal(true);
},
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[],
);
@@ -242,7 +242,9 @@ function BaseModal(
deviceWidth={windowWidth}
animationIn={animationIn ?? modalStyleAnimationIn}
animationOut={animationOut ?? modalStyleAnimationOut}
+ // eslint-disable-next-line react-compiler/react-compiler
useNativeDriver={useNativeDriverProp && useNativeDriver}
+ // eslint-disable-next-line react-compiler/react-compiler
useNativeDriverForBackdrop={useNativeDriverForBackdrop && useNativeDriver}
hideModalContentWhileAnimating={hideModalContentWhileAnimating}
animationInTiming={animationInTiming}
diff --git a/src/components/Modal/ModalContent.tsx b/src/components/Modal/ModalContent.tsx
index 49d3b049220f..f71affe760ac 100644
--- a/src/components/Modal/ModalContent.tsx
+++ b/src/components/Modal/ModalContent.tsx
@@ -14,7 +14,7 @@ type ModalContentProps = {
};
function ModalContent({children, onDismiss = () => {}}: ModalContentProps) {
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
React.useEffect(() => () => onDismiss?.(), []);
return children;
}
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 80ad2890afaa..6777bbf6c269 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -99,7 +99,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
const canAllowSettlement = ReportUtils.hasUpdatedTotal(moneyRequestReport, policy);
const policyType = policy?.type;
const isDraft = ReportUtils.isOpenExpenseReport(moneyRequestReport);
- const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false);
const navigateBackToAfterDelete = useRef();
const hasScanningReceipt = ReportUtils.getTransactionsWithReceipts(moneyRequestReport?.reportID).some((t) => TransactionUtils.isReceiptBeingScanned(t));
@@ -108,14 +107,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
// allTransactions in TransactionUtils might have stale data
const hasOnlyHeldExpenses = ReportUtils.hasOnlyHeldExpenses(moneyRequestReport.reportID, transactions);
- const cancelPayment = useCallback(() => {
- if (!chatReport) {
- return;
- }
- IOU.cancelPayment(moneyRequestReport, chatReport);
- setIsConfirmModalVisible(false);
- }, [moneyRequestReport, chatReport]);
-
const shouldShowPayButton = useMemo(() => IOU.canIOUBePaid(moneyRequestReport, chatReport, policy), [moneyRequestReport, chatReport, policy]);
const shouldShowApproveButton = useMemo(() => IOU.canApproveIOU(moneyRequestReport, chatReport, policy), [moneyRequestReport, chatReport, policy]);
@@ -371,17 +362,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
transactionCount={transactionIDs.length}
/>
)}
- setIsConfirmModalVisible(false)}
- prompt={translate('iou.cancelPaymentConfirmation')}
- confirmText={translate('iou.cancelPayment')}
- cancelText={translate('common.dismiss')}
- danger
- shouldEnableNewFocusManagement
- />
CurrencyUtils.convertToFrontendAmountAsString(amount);
+const defaultOnFormatAmount = (amount: number, currency?: string) => CurrencyUtils.convertToFrontendAmountAsString(amount, currency ?? CONST.CURRENCY.USD);
function MoneyRequestAmountInput(
{
@@ -218,7 +218,7 @@ function MoneyRequestAmountInput(
}
// we want to re-initialize the state only when the amount changes
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [amount, shouldKeepUserInput]);
// Modifies the amount to match the decimals for changed currency.
@@ -232,7 +232,7 @@ function MoneyRequestAmountInput(
setNewAmount(MoneyRequestUtils.stripDecimalsFromAmount(currentAmount));
// we want to update only when decimals change (setNewAmount also changes when decimals change).
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [setNewAmount]);
/**
@@ -295,6 +295,7 @@ function MoneyRequestAmountInput(
// eslint-disable-next-line no-param-reassign
forwardedRef.current = ref;
}
+ // eslint-disable-next-line react-compiler/react-compiler
textInput.current = ref;
}}
selectedCurrencyCode={currency}
diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index 7e6682492eb2..1fbd6a6b2630 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -284,7 +284,7 @@ function MoneyRequestConfirmationList({
}, [isEditingSplitBill, hasSmartScanFailed, transaction, didConfirmSplit]);
const isMerchantEmpty = useMemo(() => !iouMerchant || TransactionUtils.isMerchantMissing(transaction), [transaction, iouMerchant]);
- const isMerchantRequired = (isPolicyExpenseChat || isTypeInvoice) && (!isScanRequest || isEditingSplitBill) && shouldShowMerchant;
+ const isMerchantRequired = isPolicyExpenseChat && (!isScanRequest || isEditingSplitBill) && shouldShowMerchant;
const isCategoryRequired = !!policy?.requiresCategory;
@@ -300,7 +300,7 @@ function MoneyRequestConfirmationList({
// reset the form error whenever the screen gains or loses focus
setFormError('');
- // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want this effect to run if it's just setFormError that changes
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want this effect to run if it's just setFormError that changes
}, [isFocused, transaction, shouldDisplayFieldError, hasSmartScanFailed, didConfirmSplit]);
useEffect(() => {
@@ -329,10 +329,10 @@ function MoneyRequestConfirmationList({
taxCode = transaction?.taxCode ?? TransactionUtils.getDefaultTaxCode(policy, transaction) ?? '';
}
const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxCode) ?? '';
- const taxAmount = TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount);
+ const taxAmount = TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount, currency);
const taxAmountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(taxAmount.toString()));
IOU.setMoneyRequestTaxAmount(transaction?.transactionID ?? '', taxAmountInSmallestCurrencyUnits);
- }, [policy, shouldShowTax, previousTransactionAmount, previousTransactionCurrency, transaction, isDistanceRequest, customUnitRateID]);
+ }, [policy, shouldShowTax, previousTransactionAmount, previousTransactionCurrency, transaction, isDistanceRequest, customUnitRateID, currency]);
// If completing a split expense fails, set didConfirm to false to allow the user to edit the fields again
if (isEditingSplitBill && didConfirm) {
@@ -531,6 +531,18 @@ function MoneyRequestConfirmationList({
],
);
+ const shouldDisableParticipant = (participant: Participant): boolean => {
+ if (ReportUtils.isDraftReport(participant.reportID)) {
+ return true;
+ }
+
+ if (!participant.isInvoiceRoom && !participant.isPolicyExpenseChat && !participant.isSelfDM && ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? -1)) {
+ return true;
+ }
+
+ return false;
+ };
+
const sections = useMemo(() => {
const options: Array> = [];
if (isTypeSplit) {
@@ -553,7 +565,7 @@ function MoneyRequestConfirmationList({
const formattedSelectedParticipants = selectedParticipants.map((participant) => ({
...participant,
isSelected: false,
- isDisabled: !participant.isInvoiceRoom && !participant.isPolicyExpenseChat && !participant.isSelfDM && ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? -1),
+ isInteractive: !shouldDisableParticipant(participant),
}));
options.push({
title: translate('common.to'),
@@ -603,7 +615,7 @@ function MoneyRequestConfirmationList({
}
IOU.setMoneyRequestCategory(transactionID, enabledCategories[0].name);
// Keep 'transaction' out to ensure that we autoselect the option only once
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [shouldShowCategories, policyCategories, isCategoryRequired]);
// Auto select the tag if there is only one enabled tag and it is required
@@ -621,7 +633,7 @@ function MoneyRequestConfirmationList({
IOU.setMoneyRequestTag(transactionID, updatedTagsString);
}
// Keep 'transaction' out to ensure that we autoselect the option only once
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [policyTagLists, policyTags]);
/**
diff --git a/src/components/MoneyRequestConfirmationListFooter.tsx b/src/components/MoneyRequestConfirmationListFooter.tsx
index 8dfff6466ab9..48190fb3c759 100644
--- a/src/components/MoneyRequestConfirmationListFooter.tsx
+++ b/src/components/MoneyRequestConfirmationListFooter.tsx
@@ -256,7 +256,8 @@ function MoneyRequestConfirmationListFooter({
// Do not hide fields in case of paying someone
const shouldShowAllFields = !!isDistanceRequest || shouldExpandFields || !shouldShowSmartScanFields || isTypeSend || !!isEditingSplitBill;
// Calculate the formatted tax amount based on the transaction's tax amount and the IOU currency code
- const formattedTaxAmount = CurrencyUtils.convertToDisplayString(transaction?.taxAmount, iouCurrencyCode);
+ const taxAmount = TransactionUtils.getTaxAmount(transaction, false);
+ const formattedTaxAmount = CurrencyUtils.convertToDisplayString(taxAmount, iouCurrencyCode);
// Get the tax rate title based on the policy and transaction
const taxRateTitle = TransactionUtils.getTaxName(policy, transaction);
// Determine if the merchant error should be displayed
diff --git a/src/components/MultiGestureCanvas/index.tsx b/src/components/MultiGestureCanvas/index.tsx
index 6b93e2e125e0..ff9566839d59 100644
--- a/src/components/MultiGestureCanvas/index.tsx
+++ b/src/components/MultiGestureCanvas/index.tsx
@@ -121,6 +121,7 @@ function MultiGestureCanvas({
const reset = useWorkletCallback((animated: boolean, callback?: () => void) => {
stopAnimation();
+ // eslint-disable-next-line react-compiler/react-compiler
offsetX.value = 0;
offsetY.value = 0;
pinchScale.value = 1;
diff --git a/src/components/MultiGestureCanvas/usePanGesture.ts b/src/components/MultiGestureCanvas/usePanGesture.ts
index 636913fdf05d..fa27e48eea4c 100644
--- a/src/components/MultiGestureCanvas/usePanGesture.ts
+++ b/src/components/MultiGestureCanvas/usePanGesture.ts
@@ -116,6 +116,7 @@ const usePanGesture = ({
// If the (absolute) velocity is 0, we don't need to run an animation
if (Math.abs(panVelocityX.value) !== 0) {
// Phase out the pan animation
+ // eslint-disable-next-line react-compiler/react-compiler
offsetX.value = withDecay({
velocity: panVelocityX.value,
clamp: [horizontalBoundaries.min, horizontalBoundaries.max],
diff --git a/src/components/MultiGestureCanvas/usePinchGesture.ts b/src/components/MultiGestureCanvas/usePinchGesture.ts
index 87d3bdada6a2..46a5e28e5732 100644
--- a/src/components/MultiGestureCanvas/usePinchGesture.ts
+++ b/src/components/MultiGestureCanvas/usePinchGesture.ts
@@ -68,6 +68,7 @@ const usePinchGesture = ({
useAnimatedReaction(
() => [pinchTranslateX.value, pinchTranslateY.value, pinchBounceTranslateX.value, pinchBounceTranslateY.value],
([translateX, translateY, bounceX, bounceY]) => {
+ // eslint-disable-next-line react-compiler/react-compiler
totalPinchTranslateX.value = translateX + bounceX;
totalPinchTranslateY.value = translateY + bounceY;
},
diff --git a/src/components/MultiGestureCanvas/useTapGestures.ts b/src/components/MultiGestureCanvas/useTapGestures.ts
index f550e93d6be2..e4bb02bd5d34 100644
--- a/src/components/MultiGestureCanvas/useTapGestures.ts
+++ b/src/components/MultiGestureCanvas/useTapGestures.ts
@@ -111,6 +111,7 @@ const useTapGestures = ({
offsetAfterZooming.y = 0;
}
+ // eslint-disable-next-line react-compiler/react-compiler
offsetX.value = withSpring(offsetAfterZooming.x, SPRING_CONFIG);
offsetY.value = withSpring(offsetAfterZooming.y, SPRING_CONFIG);
zoomScale.value = withSpring(doubleTapScale, SPRING_CONFIG, callback);
diff --git a/src/components/Onfido/BaseOnfidoWeb.tsx b/src/components/Onfido/BaseOnfidoWeb.tsx
index ebb29198bda7..703bb5a5b14e 100644
--- a/src/components/Onfido/BaseOnfidoWeb.tsx
+++ b/src/components/Onfido/BaseOnfidoWeb.tsx
@@ -140,7 +140,7 @@ function Onfido({sdkToken, onSuccess, onError, onUserExit}: OnfidoProps, ref: Fo
window.addEventListener('userAnalyticsEvent', logOnFidoEvent);
return () => window.removeEventListener('userAnalyticsEvent', logOnFidoEvent);
// Onfido should be initialized only once on mount
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
return (
diff --git a/src/components/Onfido/index.native.tsx b/src/components/Onfido/index.native.tsx
index fd681e610f86..c6eb9c8868ee 100644
--- a/src/components/Onfido/index.native.tsx
+++ b/src/components/Onfido/index.native.tsx
@@ -88,7 +88,7 @@ function Onfido({sdkToken, onUserExit, onSuccess, onError}: OnfidoProps) {
}
});
// Onfido should be initialized only once on mount
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
return ;
diff --git a/src/components/OpacityView.tsx b/src/components/OpacityView.tsx
index 41ab148bd7f2..d4a5c05167a0 100644
--- a/src/components/OpacityView.tsx
+++ b/src/components/OpacityView.tsx
@@ -36,6 +36,7 @@ function OpacityView({shouldDim, children, style = [], dimmingValue = variables.
React.useEffect(() => {
if (shouldDim) {
+ // eslint-disable-next-line react-compiler/react-compiler
opacity.value = withTiming(dimmingValue, {duration: 50});
} else {
opacity.value = withTiming(1, {duration: 50});
diff --git a/src/components/OptionListContextProvider.tsx b/src/components/OptionListContextProvider.tsx
index 21f8bb3de097..f098188de270 100644
--- a/src/components/OptionListContextProvider.tsx
+++ b/src/components/OptionListContextProvider.tsx
@@ -73,7 +73,7 @@ function OptionsListContextProvider({reports, children}: OptionsListProviderProp
return newOptions;
});
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [reports]);
/**
@@ -124,7 +124,7 @@ function OptionsListContextProvider({reports, children}: OptionsListProviderProp
});
// This effect is used to update the options list when personal details change so we ignore all dependencies except personalDetails
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [personalDetails]);
const loadOptions = useCallback(() => {
diff --git a/src/components/OptionsListSkeletonView.tsx b/src/components/OptionsListSkeletonView.tsx
index a11077f95bb5..6dede512f405 100644
--- a/src/components/OptionsListSkeletonView.tsx
+++ b/src/components/OptionsListSkeletonView.tsx
@@ -18,16 +18,18 @@ function getLinedWidth(index: number): string {
type OptionsListSkeletonViewProps = {
shouldAnimate?: boolean;
+ gradientOpacityEnabled?: boolean;
shouldStyleAsTable?: boolean;
};
-function OptionsListSkeletonView({shouldAnimate = true, shouldStyleAsTable = false}: OptionsListSkeletonViewProps) {
+function OptionsListSkeletonView({shouldAnimate = true, shouldStyleAsTable = false, gradientOpacityEnabled = false}: OptionsListSkeletonViewProps) {
const styles = useThemeStyles();
return (
{
const lineWidth = getLinedWidth(itemIndex);
diff --git a/src/components/PDFView/index.tsx b/src/components/PDFView/index.tsx
index a64a676cb97a..2edf699affab 100644
--- a/src/components/PDFView/index.tsx
+++ b/src/components/PDFView/index.tsx
@@ -68,7 +68,7 @@ function PDFView({onToggleKeyboard, fileName, onPress, isFocused, sourceURL, max
useEffect(() => {
retrieveCanvasLimits();
// This rule needs to be applied so that this effect is executed only when the component is mounted
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
useEffect(() => {
diff --git a/src/components/Picker/BasePicker.tsx b/src/components/Picker/BasePicker.tsx
index 1c337e024116..ddd6cd544f3e 100644
--- a/src/components/Picker/BasePicker.tsx
+++ b/src/components/Picker/BasePicker.tsx
@@ -61,7 +61,7 @@ function BasePicker(
// so they don't have to spend extra time selecting the only possible value.
onInputChange(items[0].value, 0);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [items]);
const context = useScrollContext();
diff --git a/src/components/PlaidLink/index.native.tsx b/src/components/PlaidLink/index.native.tsx
index 24ab75eb62b7..37b598303c3a 100644
--- a/src/components/PlaidLink/index.native.tsx
+++ b/src/components/PlaidLink/index.native.tsx
@@ -31,7 +31,7 @@ function PlaidLink({token, onSuccess = () => {}, onExit = () => {}, onEvent}: Pl
};
// We generally do not need to include the token as a dependency here as it is only provided once via props and should not change
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
return null;
}
diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index 154f5c1e1cd3..0f97a3c4414f 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -109,16 +109,18 @@ function PopoverMenu({
const selectedItemIndex = useRef(null);
const [currentMenuItems, setCurrentMenuItems] = useState(menuItems);
+ const currentMenuItemsFocusedIndex = currentMenuItems?.findIndex((option) => option.isSelected);
const [enteredSubMenuIndexes, setEnteredSubMenuIndexes] = useState([]);
- const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({initialFocusedIndex: -1, maxIndex: currentMenuItems.length - 1, isActive: isVisible});
+ const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({initialFocusedIndex: currentMenuItemsFocusedIndex, maxIndex: currentMenuItems.length - 1, isActive: isVisible});
const selectItem = (index: number) => {
const selectedItem = currentMenuItems[index];
if (selectedItem?.subMenuItems) {
setCurrentMenuItems([...selectedItem.subMenuItems]);
setEnteredSubMenuIndexes([...enteredSubMenuIndexes, index]);
- setFocusedIndex(-1);
+ const selectedSubMenuItemIndex = selectedItem?.subMenuItems.findIndex((option) => option.isSelected);
+ setFocusedIndex(selectedSubMenuItemIndex);
} else {
selectedItemIndex.current = index;
onItemSelected(selectedItem, index);
diff --git a/src/components/PopoverWithoutOverlay/index.tsx b/src/components/PopoverWithoutOverlay/index.tsx
index 06478b468e1e..7d58ad6d22be 100644
--- a/src/components/PopoverWithoutOverlay/index.tsx
+++ b/src/components/PopoverWithoutOverlay/index.tsx
@@ -69,7 +69,7 @@ function PopoverWithoutOverlay(
removeOnClose();
};
// We want this effect to run strictly ONLY when isVisible prop changes
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [isVisible]);
const {
@@ -124,6 +124,7 @@ function PopoverWithoutOverlay(
ref={viewRef(withoutOverlayRef)}
// Prevent the parent element to capture a click. This is useful when the modal component is put inside a pressable.
onClick={(e) => e.stopPropagation()}
+ dataSet={{dragArea: false}}
>
{
+ if (!interactive) {
+ return styles.cursorDefault;
+ }
if (shouldUseDisabledCursor) {
return styles.cursorDisabled;
}
@@ -74,7 +78,7 @@ function GenericPressable(
return styles.cursorText;
}
return styles.cursorPointer;
- }, [styles, shouldUseDisabledCursor, rest.accessibilityRole, rest.role]);
+ }, [styles, shouldUseDisabledCursor, rest.accessibilityRole, rest.role, interactive]);
const onLongPressHandler = useCallback(
(event: GestureResponderEvent) => {
@@ -98,7 +102,7 @@ function GenericPressable(
const onPressHandler = useCallback(
(event?: GestureResponderEvent | KeyboardEvent) => {
- if (isDisabled) {
+ if (isDisabled || !interactive) {
return;
}
if (!onPress) {
@@ -113,7 +117,7 @@ function GenericPressable(
}
return onPress(event);
},
- [shouldUseHapticsOnPress, onPress, nextFocusRef, ref, isDisabled],
+ [shouldUseHapticsOnPress, onPress, nextFocusRef, ref, isDisabled, interactive],
);
const voidOnPressHandler = useCallback(
diff --git a/src/components/Pressable/GenericPressable/types.ts b/src/components/Pressable/GenericPressable/types.ts
index 26a2fea42d94..61cb6db8ee76 100644
--- a/src/components/Pressable/GenericPressable/types.ts
+++ b/src/components/Pressable/GenericPressable/types.ts
@@ -142,6 +142,12 @@ type PressableProps = RNPressableProps &
* Specifies if the pressable responder should be disabled
*/
fullDisabled?: boolean;
+
+ /**
+ * Whether the menu item should be interactive at all
+ * e.g., show disabled cursor when disabled
+ */
+ interactive?: boolean;
};
type PressableRef = ForwardedRef;
diff --git a/src/components/ReceiptImage.tsx b/src/components/ReceiptImage.tsx
index a520693cff57..8c980838b841 100644
--- a/src/components/ReceiptImage.tsx
+++ b/src/components/ReceiptImage.tsx
@@ -74,8 +74,11 @@ type ReceiptImageProps = (
/** The size of the fallback icon */
fallbackIconSize?: number;
- /** The colod of the fallback icon */
+ /** The color of the fallback icon */
fallbackIconColor?: string;
+
+ /** The background color of fallback icon */
+ fallbackIconBackground?: string;
};
function ReceiptImage({
@@ -93,6 +96,7 @@ function ReceiptImage({
fallbackIconSize,
shouldUseInitialObjectPosition = false,
fallbackIconColor,
+ fallbackIconBackground,
}: ReceiptImageProps) {
const styles = useThemeStyles();
@@ -129,6 +133,7 @@ function ReceiptImage({
fallbackIcon={fallbackIcon}
fallbackIconSize={fallbackIconSize}
fallbackIconColor={fallbackIconColor}
+ fallbackIconBackground={fallbackIconBackground}
objectPosition={shouldUseInitialObjectPosition ? CONST.IMAGE_OBJECT_POSITION.INITIAL : CONST.IMAGE_OBJECT_POSITION.TOP}
/>
);
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index 9e31dc110579..896432708aff 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -1,9 +1,11 @@
+import type {RouteProp} from '@react-navigation/native';
import {useRoute} from '@react-navigation/native';
import lodashSortBy from 'lodash/sortBy';
import truncate from 'lodash/truncate';
import React, {useMemo} from 'react';
import {View} from 'react-native';
import type {GestureResponderEvent} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
import type {OnyxEntry} from 'react-native-onyx';
import Button from '@components/Button';
import Icon from '@components/Icon';
@@ -27,6 +29,8 @@ import ControlSelection from '@libs/ControlSelection';
import * as CurrencyUtils from '@libs/CurrencyUtils';
import * as DeviceCapabilities from '@libs/DeviceCapabilities';
import * as IOUUtils from '@libs/IOUUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as ReceiptUtils from '@libs/ReceiptUtils';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
@@ -41,6 +45,7 @@ import * as Report from '@userActions/Report';
import * as Transaction from '@userActions/Transaction';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
import SCREENS from '@src/SCREENS';
import type {OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -72,7 +77,7 @@ function MoneyRequestPreviewContent({
const StyleUtils = useStyleUtils();
const {translate} = useLocalize();
const {windowWidth} = useWindowDimensions();
- const route = useRoute();
+ const route = useRoute>();
const {shouldUseNarrowLayout} = useResponsiveLayout();
const sessionAccountID = session?.accountID;
@@ -126,6 +131,9 @@ function MoneyRequestPreviewContent({
const showCashOrCard = isCardTransaction ? translate('iou.card') : translate('iou.cash');
const shouldShowHoldMessage = !(isSettled && !isSettlementOrApprovalPartial) && isOnHold;
+ const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params?.threadReportID}`);
+ const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
+ const reviewingTransactionID = ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction)?.IOUTransactionID ?? '-1' : '-1';
// Get transaction violations for given transaction id from onyx, find duplicated transactions violations and get duplicates
const duplicates = useMemo(
() =>
@@ -264,6 +272,29 @@ function MoneyRequestPreviewContent({
[shouldShowSplitShare, isPolicyExpenseChat, action.actorAccountID, participantAccountIDs.length, transaction?.comment?.splits, requestAmount, requestCurrency, sessionAccountID],
);
+ const navigateToReviewFields = () => {
+ const comparisonResult = TransactionUtils.compareDuplicateTransactionFields(reviewingTransactionID);
+ const allTransactionIDsDuplicates = [reviewingTransactionID, ...duplicates].filter((id) => id !== transaction?.transactionID);
+ Transaction.setReviewDuplicatesKey({...comparisonResult.keep, duplicates: allTransactionIDsDuplicates, transactionID: transaction?.transactionID ?? ''});
+ if ('merchant' in comparisonResult.change) {
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_MERCHANT_PAGE.getRoute(route.params?.threadReportID));
+ } else if ('category' in comparisonResult.change) {
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_CATEGORY_PAGE.getRoute(route.params?.threadReportID));
+ } else if ('tag' in comparisonResult.change) {
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_TAG_PAGE.getRoute(route.params?.threadReportID));
+ } else if ('description' in comparisonResult.change) {
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_DESCRIPTION_PAGE.getRoute(route.params?.threadReportID));
+ } else if ('taxCode' in comparisonResult.change) {
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_TAX_CODE_PAGE.getRoute(route.params?.threadReportID));
+ } else if ('billable' in comparisonResult.change) {
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_BILLABLE_PAGE.getRoute(route.params?.threadReportID));
+ } else if ('reimbursable' in comparisonResult.change) {
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_REIMBURSABLE_PAGE.getRoute(route.params?.threadReportID));
+ } else {
+ // Navigation to confirm screen will be done in seperate PR
+ }
+ };
+
const childContainer = (
{
- Transaction.setReviewDuplicatesKey(transaction?.transactionID ?? '', duplicates);
- }}
+ onPress={navigateToReviewFields}
/>
)}
diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index d986af8f5cf3..4a145d4e79e9 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -121,7 +121,7 @@ function ReportPreview({
hasNonReimbursableTransactions: ReportUtils.hasNonReimbursableTransactions(iouReportID),
}),
// When transactions get updated these status may have changed, so that is a case where we also want to run this.
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[transactions, iouReportID, action],
);
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index 43e896fe6578..941e7cd5c610 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -22,6 +22,7 @@ import getButtonState from '@libs/getButtonState';
import Navigation from '@libs/Navigation/Navigation';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as ReportUtils from '@libs/ReportUtils';
+import * as TaskUtils from '@libs/TaskUtils';
import * as Session from '@userActions/Session';
import * as Task from '@userActions/Task';
import CONST from '@src/CONST';
@@ -96,6 +97,10 @@ function TaskView({report, ...props}: TaskViewProps) {
{
+ // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
+ if (TaskUtils.isActiveTaskEditRoute(report.reportID)) {
+ return;
+ }
if (isCompleted) {
Task.reopenTask(report);
} else {
diff --git a/src/components/ScreenWrapper.tsx b/src/components/ScreenWrapper.tsx
index 1d5d65d9874d..f845cfda3638 100644
--- a/src/components/ScreenWrapper.tsx
+++ b/src/components/ScreenWrapper.tsx
@@ -211,7 +211,7 @@ function ScreenWrapper(
}
};
// Rule disabled because this effect is only for component did mount & will component unmount lifecycle event
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
const isAvoidingViewportScroll = useTackInputFocus(shouldEnableMaxHeight && shouldAvoidScrollOnVirtualViewport && Browser.isMobileWebKit());
diff --git a/src/components/Search/SearchContext.tsx b/src/components/Search/SearchContext.tsx
new file mode 100644
index 000000000000..3911780d3965
--- /dev/null
+++ b/src/components/Search/SearchContext.tsx
@@ -0,0 +1,58 @@
+import React, {useCallback, useContext, useMemo, useState} from 'react';
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+import type {SearchContext} from './types';
+
+const defaultSearchContext = {
+ currentSearchHash: -1,
+ selectedTransactionIDs: [],
+ setCurrentSearchHash: () => {},
+ setSelectedTransactionIds: () => {},
+};
+
+const Context = React.createContext(defaultSearchContext);
+
+function SearchContextProvider({children}: ChildrenProps) {
+ const [searchContextData, setSearchContextData] = useState>({
+ currentSearchHash: defaultSearchContext.currentSearchHash,
+ selectedTransactionIDs: defaultSearchContext.selectedTransactionIDs,
+ });
+
+ const setCurrentSearchHash = useCallback(
+ (searchHash: number) => {
+ setSearchContextData({
+ ...searchContextData,
+ currentSearchHash: searchHash,
+ });
+ },
+ [searchContextData],
+ );
+
+ const setSelectedTransactionIds = useCallback(
+ (selectedTransactionIDs: string[]) => {
+ setSearchContextData({
+ ...searchContextData,
+ selectedTransactionIDs,
+ });
+ },
+ [searchContextData],
+ );
+
+ const searchContext = useMemo(
+ () => ({
+ ...searchContextData,
+ setCurrentSearchHash,
+ setSelectedTransactionIds,
+ }),
+ [searchContextData, setCurrentSearchHash, setSelectedTransactionIds],
+ );
+
+ return {children};
+}
+
+function useSearchContext() {
+ return useContext(Context);
+}
+
+SearchContextProvider.displayName = 'SearchContextProvider';
+
+export {SearchContextProvider, useSearchContext};
diff --git a/src/components/Search/SearchListWithHeader.tsx b/src/components/Search/SearchListWithHeader.tsx
index 48d9a2b4ae3a..02da657609ba 100644
--- a/src/components/Search/SearchListWithHeader.tsx
+++ b/src/components/Search/SearchListWithHeader.tsx
@@ -1,7 +1,12 @@
import type {ForwardedRef} from 'react';
-import React, {forwardRef, useEffect, useMemo, useState} from 'react';
+import React, {forwardRef, useCallback, useEffect, useMemo, useState} from 'react';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import Modal from '@components/Modal';
import SelectionList from '@components/SelectionList';
import type {BaseSelectionListProps, ReportListItemType, SelectionListHandle, TransactionListItemType} from '@components/SelectionList/types';
+import useLocalize from '@hooks/useLocalize';
+import useWindowDimensions from '@hooks/useWindowDimensions';
import * as SearchUtils from '@libs/SearchUtils';
import CONST from '@src/CONST';
import type {SearchDataTypes, SearchQuery} from '@src/types/onyx/SearchResults';
@@ -13,6 +18,8 @@ type SearchListWithHeaderProps = Omit void;
};
function mapTransactionItemToSelectedEntry(item: TransactionListItemType): [string, SelectedTransactionInfo] {
@@ -33,7 +40,14 @@ function mapToItemWithSelectionInfo(item: TransactionListItemType | ReportListIt
};
}
-function SearchListWithHeader({ListItem, onSelectRow, query, hash, data, searchType, ...props}: SearchListWithHeaderProps, ref: ForwardedRef) {
+function SearchListWithHeader(
+ {ListItem, onSelectRow, query, hash, data, searchType, isMobileSelectionModeActive, setIsMobileSelectionModeActive, ...props}: SearchListWithHeaderProps,
+ ref: ForwardedRef,
+) {
+ const {isSmallScreenWidth} = useWindowDimensions();
+ const {translate} = useLocalize();
+ const [isModalVisible, setIsModalVisible] = useState(false);
+ const [longPressedItem, setLongPressedItem] = useState(null);
const [selectedItems, setSelectedItems] = useState({});
const clearSelectedItems = () => setSelectedItems({});
@@ -42,39 +56,72 @@ function SearchListWithHeader({ListItem, onSelectRow, query, hash, data, searchT
clearSelectedItems();
}, [hash]);
- const toggleTransaction = (item: TransactionListItemType | ReportListItemType) => {
- if (SearchUtils.isTransactionListItemType(item)) {
- if (!item.keyForList) {
+ const toggleTransaction = useCallback(
+ (item: TransactionListItemType | ReportListItemType) => {
+ if (SearchUtils.isTransactionListItemType(item)) {
+ if (!item.keyForList) {
+ return;
+ }
+
+ setSelectedItems((prev) => {
+ if (prev[item.keyForList]?.isSelected) {
+ const {[item.keyForList]: omittedTransaction, ...transactions} = prev;
+ return transactions;
+ }
+ return {...prev, [item.keyForList]: {isSelected: true, canDelete: item.canDelete, action: item.action}};
+ });
+
return;
}
- setSelectedItems((prev) => {
- if (prev[item.keyForList]?.isSelected) {
- const {[item.keyForList]: omittedTransaction, ...transactions} = prev;
- return transactions;
- }
- return {...prev, [item.keyForList]: {isSelected: true, canDelete: item.canDelete, action: item.action}};
+ if (item.transactions.every((transaction) => selectedItems[transaction.keyForList]?.isSelected)) {
+ const reducedSelectedItems: SelectedTransactions = {...selectedItems};
+
+ item.transactions.forEach((transaction) => {
+ delete reducedSelectedItems[transaction.keyForList];
+ });
+
+ setSelectedItems(reducedSelectedItems);
+ return;
+ }
+
+ setSelectedItems({
+ ...selectedItems,
+ ...Object.fromEntries(item.transactions.map(mapTransactionItemToSelectedEntry)),
});
+ },
+ [selectedItems],
+ );
+ const openBottomModal = (item: TransactionListItemType | ReportListItemType | null) => {
+ if (!isSmallScreenWidth) {
return;
}
- if (item.transactions.every((transaction) => selectedItems[transaction.keyForList]?.isSelected)) {
- const reducedSelectedItems: SelectedTransactions = {...selectedItems};
+ setLongPressedItem(item);
+ setIsModalVisible(true);
+ };
- item.transactions.forEach((transaction) => {
- delete reducedSelectedItems[transaction.keyForList];
- });
+ const turnOnSelectionMode = useCallback(() => {
+ setIsMobileSelectionModeActive?.(true);
+ setIsModalVisible(false);
+
+ if (longPressedItem) {
+ toggleTransaction(longPressedItem);
+ }
+ }, [longPressedItem, setIsMobileSelectionModeActive, toggleTransaction]);
- setSelectedItems(reducedSelectedItems);
+ const closeBottomModal = useCallback(() => {
+ setIsModalVisible(false);
+ }, []);
+
+ useEffect(() => {
+ if (isMobileSelectionModeActive) {
return;
}
- setSelectedItems({
- ...selectedItems,
- ...Object.fromEntries(item.transactions.map(mapTransactionItemToSelectedEntry)),
- });
- };
+ setSelectedItems({});
+ }, [setSelectedItems, isMobileSelectionModeActive]);
const toggleAllTransactions = () => {
const areItemsOfReportType = searchType === CONST.SEARCH.DATA_TYPES.REPORT;
@@ -104,6 +151,8 @@ function SearchListWithHeader({ListItem, onSelectRow, query, hash, data, searchT
clearSelectedItems={clearSelectedItems}
query={query}
hash={hash}
+ isMobileSelectionModeActive={isMobileSelectionModeActive}
+ setIsMobileSelectionModeActive={setIsMobileSelectionModeActive}
/>
// eslint-disable-next-line react/jsx-props-no-spreading
@@ -111,10 +160,24 @@ function SearchListWithHeader({ListItem, onSelectRow, query, hash, data, searchT
sections={[{data: sortedSelectedData, isDisabled: false}]}
ListItem={ListItem}
onSelectRow={onSelectRow}
+ onLongPressRow={openBottomModal}
ref={ref}
onCheckboxPress={toggleTransaction}
onSelectAll={toggleAllTransactions}
+ isMobileSelectionModeActive={isMobileSelectionModeActive}
/>
+
+
+
+
);
}
diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index 8d42f9e6da36..b0f2acfb57d1 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback} from 'react';
+import React, {useMemo} from 'react';
import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -10,6 +10,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import * as SearchActions from '@libs/actions/Search';
+import SearchSelectedNarrow from '@pages/Search/SearchSelectedNarrow';
import variables from '@styles/variables';
import CONST from '@src/CONST';
import type {SearchQuery} from '@src/types/onyx/SearchResults';
@@ -22,11 +23,13 @@ type SearchHeaderProps = {
selectedItems?: SelectedTransactions;
clearSelectedItems?: () => void;
hash: number;
+ isMobileSelectionModeActive?: boolean;
+ setIsMobileSelectionModeActive?: (isMobileSelectionModeActive: boolean) => void;
};
type SearchHeaderOptionValue = DeepValueOf | undefined;
-function SearchPageHeader({query, selectedItems = {}, hash, clearSelectedItems}: SearchHeaderProps) {
+function SearchPageHeader({query, selectedItems = {}, hash, clearSelectedItems, isMobileSelectionModeActive, setIsMobileSelectionModeActive}: SearchHeaderProps) {
const {translate} = useLocalize();
const theme = useTheme();
const styles = useThemeStyles();
@@ -39,12 +42,13 @@ function SearchPageHeader({query, selectedItems = {}, hash, clearSelectedItems}:
finished: {icon: Illustrations.CheckmarkCircle, title: translate('common.finished')},
};
- const getHeaderButtons = useCallback(() => {
+ const selectedItemsKeys = Object.keys(selectedItems ?? []);
+
+ const headerButtonsOptions = useMemo(() => {
const options: Array> = [];
- const selectedItemsKeys = Object.keys(selectedItems ?? []);
if (selectedItemsKeys.length === 0) {
- return null;
+ return options;
}
const itemsToDelete = selectedItemsKeys.filter((id) => selectedItems[id].canDelete);
@@ -56,6 +60,9 @@ function SearchPageHeader({query, selectedItems = {}, hash, clearSelectedItems}:
value: CONST.SEARCH.BULK_ACTION_TYPES.DELETE,
onSelected: () => {
clearSelectedItems?.();
+ if (isMobileSelectionModeActive) {
+ setIsMobileSelectionModeActive?.(false);
+ }
SearchActions.deleteMoneyRequestOnSearch(hash, itemsToDelete);
},
});
@@ -70,6 +77,9 @@ function SearchPageHeader({query, selectedItems = {}, hash, clearSelectedItems}:
value: CONST.SEARCH.BULK_ACTION_TYPES.HOLD,
onSelected: () => {
clearSelectedItems?.();
+ if (isMobileSelectionModeActive) {
+ setIsMobileSelectionModeActive?.(false);
+ }
SearchActions.holdMoneyRequestOnSearch(hash, itemsToHold, '');
},
});
@@ -84,6 +94,9 @@ function SearchPageHeader({query, selectedItems = {}, hash, clearSelectedItems}:
value: CONST.SEARCH.BULK_ACTION_TYPES.UNHOLD,
onSelected: () => {
clearSelectedItems?.();
+ if (isMobileSelectionModeActive) {
+ setIsMobileSelectionModeActive?.(false);
+ }
SearchActions.unholdMoneyRequestOnSearch(hash, itemsToUnhold);
},
});
@@ -107,21 +120,18 @@ function SearchPageHeader({query, selectedItems = {}, hash, clearSelectedItems}:
});
}
- return (
- null}
- shouldAlwaysShowDropdownMenu
- pressOnEnter
- buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
- customText={translate('workspace.common.selected', {selectedNumber: selectedItemsKeys.length})}
- options={options}
- isSplitButton={false}
- isDisabled={isOffline}
- />
- );
- }, [clearSelectedItems, hash, isOffline, selectedItems, styles.colorMuted, styles.fontWeightNormal, theme.icon, translate]);
+ return options;
+ }, [clearSelectedItems, hash, selectedItems, selectedItemsKeys, styles, theme, translate, isMobileSelectionModeActive, setIsMobileSelectionModeActive]);
if (isSmallScreenWidth) {
+ if (isMobileSelectionModeActive) {
+ return (
+
+ );
+ }
return null;
}
@@ -131,11 +141,23 @@ function SearchPageHeader({query, selectedItems = {}, hash, clearSelectedItems}:
icon={headerContent[query]?.icon}
shouldShowBackButton={false}
>
- {getHeaderButtons()}
+ {headerButtonsOptions.length > 0 && (
+ null}
+ shouldAlwaysShowDropdownMenu
+ pressOnEnter
+ buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
+ customText={translate('workspace.common.selected', {selectedNumber: selectedItemsKeys.length})}
+ options={headerButtonsOptions}
+ isSplitButton={false}
+ isDisabled={isOffline}
+ />
+ )}
);
}
SearchPageHeader.displayName = 'SearchPageHeader';
+export type {SearchHeaderOptionValue};
export default SearchPageHeader;
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 5454ffc61757..d65d9826c281 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -1,11 +1,12 @@
import {useNavigation} from '@react-navigation/native';
import type {StackNavigationProp} from '@react-navigation/stack';
+import lodashMemoize from 'lodash/memoize';
import React, {useCallback, useEffect, useRef} from 'react';
import type {OnyxEntry} from 'react-native-onyx';
import {useOnyx} from 'react-native-onyx';
import SearchTableHeader from '@components/SelectionList/SearchTableHeader';
import type {ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
-import TableListItemSkeleton from '@components/Skeletons/TableListItemSkeleton';
+import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
@@ -13,7 +14,6 @@ import * as SearchActions from '@libs/actions/Search';
import * as DeviceCapabilities from '@libs/DeviceCapabilities';
import Log from '@libs/Log';
import * as ReportUtils from '@libs/ReportUtils';
-import type {SearchColumnType, SortOrder} from '@libs/SearchUtils';
import * as SearchUtils from '@libs/SearchUtils';
import Navigation from '@navigation/Navigation';
import type {AuthScreensParamList} from '@navigation/types';
@@ -25,14 +25,18 @@ import ROUTES from '@src/ROUTES';
import type SearchResults from '@src/types/onyx/SearchResults';
import type {SearchDataTypes, SearchQuery} from '@src/types/onyx/SearchResults';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+import {useSearchContext} from './SearchContext';
import SearchListWithHeader from './SearchListWithHeader';
import SearchPageHeader from './SearchPageHeader';
+import type {SearchColumnType, SortOrder} from './types';
type SearchProps = {
query: SearchQuery;
policyIDs?: string;
sortBy?: SearchColumnType;
sortOrder?: SortOrder;
+ isMobileSelectionModeActive?: boolean;
+ setIsMobileSelectionModeActive?: (isMobileSelectionModeActive: boolean) => void;
};
const sortableSearchTabs: SearchQuery[] = [CONST.SEARCH.TAB.ALL];
@@ -40,13 +44,16 @@ const transactionItemMobileHeight = 100;
const reportItemTransactionHeight = 52;
const listItemPadding = 12; // this is equivalent to 'mb3' on every transaction/report list item
const searchHeaderHeight = 54;
-
-function Search({query, policyIDs, sortBy, sortOrder}: SearchProps) {
+function Search({query, policyIDs, sortBy, sortOrder, isMobileSelectionModeActive, setIsMobileSelectionModeActive}: SearchProps) {
const {isOffline} = useNetwork();
const styles = useThemeStyles();
- const {isLargeScreenWidth} = useWindowDimensions();
+ const {isLargeScreenWidth, isSmallScreenWidth} = useWindowDimensions();
const navigation = useNavigation>();
const lastSearchResultsRef = useRef>();
+ const {setCurrentSearchHash} = useSearchContext();
+
+ const hash = SearchUtils.getQueryHash(query, policyIDs, sortBy, sortOrder);
+ const [currentSearchResults, searchResultsMeta] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`);
const getItemHeight = useCallback(
(item: TransactionListItemType | ReportListItemType) => {
@@ -68,8 +75,15 @@ function Search({query, policyIDs, sortBy, sortOrder}: SearchProps) {
[isLargeScreenWidth],
);
- const hash = SearchUtils.getQueryHash(query, policyIDs, sortBy, sortOrder);
- const [currentSearchResults, searchResultsMeta] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`);
+ const getItemHeightMemoized = lodashMemoize(
+ (item: TransactionListItemType | ReportListItemType) => getItemHeight(item),
+ (item) => {
+ // List items are displayed differently on "L"arge and "N"arrow screens so the height will differ
+ // in addition the same items might be displayed as part of different Search screens ("Expenses", "All", "Finished")
+ const screenSizeHash = isLargeScreenWidth ? 'L' : 'N';
+ return `${hash}-${item.keyForList}-${screenSizeHash}`;
+ },
+ );
// save last non-empty search results to avoid ugly flash of loading screen when hash changes and onyx returns empty data
if (currentSearchResults?.data && currentSearchResults !== lastSearchResultsRef.current) {
@@ -83,8 +97,9 @@ function Search({query, policyIDs, sortBy, sortOrder}: SearchProps) {
return;
}
+ setCurrentSearchHash(hash);
SearchActions.search({hash, query, policyIDs, offset: 0, sortBy, sortOrder});
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [hash, isOffline]);
const isLoadingItems = (!isOffline && isLoadingOnyxValue(searchResultsMeta)) || searchResults?.data === undefined;
@@ -98,7 +113,7 @@ function Search({query, policyIDs, sortBy, sortOrder}: SearchProps) {
query={query}
hash={hash}
/>
-
+
);
}
@@ -162,6 +177,8 @@ function Search({query, policyIDs, sortBy, sortOrder}: SearchProps) {
const shouldShowYear = SearchUtils.shouldShowYear(searchResults?.data);
+ const canSelectMultiple = isSmallScreenWidth ? isMobileSelectionModeActive : true;
+
return (
+ !isLargeScreenWidth ? null : (
+
+ )
}
- canSelectMultiple={isLargeScreenWidth}
+ canSelectMultiple={canSelectMultiple}
customListHeaderHeight={searchHeaderHeight}
// To enhance the smoothness of scrolling and minimize the risk of encountering blank spaces during scrolling,
// we have configured a larger windowSize and a longer delay between batch renders.
@@ -194,17 +213,19 @@ function Search({query, policyIDs, sortBy, sortOrder}: SearchProps) {
updateCellsBatchingPeriod={200}
ListItem={ListItem}
onSelectRow={openReport}
- getItemHeight={getItemHeight}
+ getItemHeight={getItemHeightMemoized}
shouldDebounceRowSelect
shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
- listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+ listHeaderWrapperStyle={[styles.ph8, styles.pv3, styles.pb5]}
containerStyle={[styles.pv0]}
showScrollIndicator={false}
onEndReachedThreshold={0.75}
onEndReached={fetchMoreResults}
+ setIsMobileSelectionModeActive={setIsMobileSelectionModeActive}
+ isMobileSelectionModeActive={isMobileSelectionModeActive}
listFooterContent={
isLoadingMoreItems ? (
-
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index 3ebc2797947a..cff74fe08a0a 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -1,3 +1,6 @@
+import type {ValueOf} from 'react-native-gesture-handler/lib/typescript/typeUtils';
+import type CONST from '@src/CONST';
+
/** Model of the selected transaction */
type SelectedTransactionInfo = {
/** Whether the transaction is selected */
@@ -13,5 +16,14 @@ type SelectedTransactionInfo = {
/** Model of selected results */
type SelectedTransactions = Record;
-// eslint-disable-next-line import/prefer-default-export
-export type {SelectedTransactionInfo, SelectedTransactions};
+type SortOrder = ValueOf;
+type SearchColumnType = ValueOf;
+
+type SearchContext = {
+ currentSearchHash: number;
+ selectedTransactionIDs: string[];
+ setCurrentSearchHash: (hash: number) => void;
+ setSelectedTransactionIds: (selectedTransactionIds: string[]) => void;
+};
+
+export type {SelectedTransactionInfo, SelectedTransactions, SearchColumnType, SortOrder, SearchContext};
diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
index c9dc773c8818..5be228f0156e 100644
--- a/src/components/SelectionList/BaseListItem.tsx
+++ b/src/components/SelectionList/BaseListItem.tsx
@@ -32,6 +32,7 @@ function BaseListItem({
shouldSyncFocus = true,
onFocus = () => {},
hoverStyle,
+ onLongPressRow,
}: BaseListItemProps) {
const theme = useTheme();
const styles = useThemeStyles();
@@ -42,7 +43,7 @@ function BaseListItem({
// Sync focus on an item
useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
- const handleMouseUp = (e: React.MouseEvent) => {
+ const handleMouseLeave = (e: React.MouseEvent) => {
e.stopPropagation();
setMouseUp();
};
@@ -71,6 +72,9 @@ function BaseListItem({
// eslint-disable-next-line react/jsx-props-no-spreading
{...bind}
ref={pressableRef}
+ onLongPress={() => {
+ onLongPressRow?.(item);
+ }}
onPress={(e) => {
if (isMouseDownOnInput) {
e?.stopPropagation(); // Preventing the click action
@@ -82,6 +86,7 @@ function BaseListItem({
onSelectRow(item);
}}
disabled={isDisabled && !item.isSelected}
+ interactive={item.isInteractive}
accessibilityLabel={item.text ?? ''}
role={CONST.ROLE.BUTTON}
hoverDimmingValue={1}
@@ -91,8 +96,7 @@ function BaseListItem({
id={keyForList ?? ''}
style={pressableStyle}
onFocus={onFocus}
- onMouseUp={handleMouseUp}
- onMouseLeave={handleMouseUp}
+ onMouseLeave={handleMouseLeave}
tabIndex={item.tabIndex}
>
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index ae70e5525393..eb2e66ad9a78 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -93,6 +93,8 @@ function BaseSelectionList(
updateCellsBatchingPeriod = 50,
removeClippedSubviews = true,
shouldDelayFocus = true,
+ onLongPressRow,
+ isMobileSelectionModeActive,
}: BaseSelectionListProps,
ref: ForwardedRef,
) {
@@ -222,7 +224,7 @@ function BaseSelectionList(
return [processedSections, showMoreButton];
// we don't need to add styles here as they change
// we don't need to add flattendedSections here as they will change along with sections
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [sections, currentPage]);
// Disable `Enter` shortcut if the active element is a button or checkbox
@@ -248,7 +250,7 @@ function BaseSelectionList(
listRef.current.scrollToLocation({sectionIndex, itemIndex, animated, viewOffset: variables.contentHeaderHeight});
},
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[flattenedSections.allOptions],
);
@@ -259,7 +261,7 @@ function BaseSelectionList(
}
setDisabledArrowKeyIndexes(flattenedSections.disabledArrowKeyOptionsIndexes);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [flattenedSections.disabledArrowKeyOptionsIndexes]);
// If `initiallyFocusedOptionKey` is not passed, we fall back to `-1`, to avoid showing the highlight on the first member
@@ -278,7 +280,7 @@ function BaseSelectionList(
onChangeText?.('');
}, [onChangeText]);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
const debouncedOnSelectRow = useCallback(lodashDebounce(onSelectRow, 200), [onSelectRow]);
/**
@@ -337,7 +339,7 @@ function BaseSelectionList(
// This debounce happens on the trailing edge because on repeated enter presses, rapid component state update cancels the existing debounce and the redundant
// enter presses runs the debounced function again.
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
const debouncedSelectFocusedOption = useCallback(lodashDebounce(selectFocusedOption, 100), [selectFocusedOption]);
/**
@@ -447,6 +449,8 @@ function BaseSelectionList(
isDisabled={isDisabled}
showTooltip={showTooltip}
canSelectMultiple={canSelectMultiple}
+ onLongPressRow={onLongPressRow}
+ isMobileSelectionModeActive={isMobileSelectionModeActive}
onSelectRow={() => selectRow(item)}
onCheckboxPress={handleOnCheckboxPress()}
onDismissError={() => onDismissError?.(item)}
diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index 9e0599d839df..ad77070c1b99 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -1,43 +1,78 @@
-import React from 'react';
+import React, {useCallback} from 'react';
import {View} from 'react-native';
import Badge from '@components/Badge';
import Button from '@components/Button';
import * as Expensicons from '@components/Icon/Expensicons';
+import {useSearchContext} from '@components/Search/SearchContext';
import useLocalize from '@hooks/useLocalize';
import useStyleUtils from '@hooks/useStyleUtils';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@navigation/Navigation';
import variables from '@styles/variables';
+import * as SearchActions from '@userActions/Search';
import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ROUTES from '@src/ROUTES';
+import type {SearchTransactionAction} from '@src/types/onyx/SearchResults';
+
+const actionTranslationsMap: Record = {
+ view: 'common.view',
+ review: 'common.review',
+ done: 'common.done',
+ paid: 'iou.settledExpensify',
+ hold: 'iou.hold',
+ unhold: 'iou.unhold',
+};
type ActionCellProps = {
- onButtonPress: () => void;
- action?: string;
+ action?: SearchTransactionAction;
+ transactionID?: string;
isLargeScreenWidth?: boolean;
isSelected?: boolean;
+ goToItem: () => void;
};
-function ActionCell({onButtonPress, action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth = true, isSelected = false}: ActionCellProps) {
+function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, transactionID, isLargeScreenWidth = true, isSelected = false, goToItem}: ActionCellProps) {
const {translate} = useLocalize();
- const styles = useThemeStyles();
const theme = useTheme();
+ const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
+ const {currentSearchHash} = useSearchContext();
+
+ const onButtonPress = useCallback(() => {
+ if (!transactionID) {
+ return;
+ }
+
+ if (action === CONST.SEARCH.ACTION_TYPES.HOLD) {
+ Navigation.navigate(ROUTES.TRANSACTION_HOLD_REASON_RHP.getRoute(CONST.SEARCH.TAB.ALL, transactionID));
+ } else if (action === CONST.SEARCH.ACTION_TYPES.UNHOLD) {
+ SearchActions.unholdMoneyRequestOnSearch(currentSearchHash, [transactionID]);
+ }
+ }, [action, currentSearchHash, transactionID]);
+
+ if (!isLargeScreenWidth) {
+ return null;
+ }
+
+ const text = translate(actionTranslationsMap[action]);
+
if (action === CONST.SEARCH.ACTION_TYPES.PAID || action === CONST.SEARCH.ACTION_TYPES.DONE) {
- const buttonTextKey = action === CONST.SEARCH.ACTION_TYPES.PAID ? 'iou.settledExpensify' : 'common.done';
return (
+ );
+ }
+
return (
);
}
diff --git a/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx b/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
index 8f46a5388da8..13e181264b25 100644
--- a/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
+++ b/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
@@ -2,24 +2,47 @@ import React, {memo} from 'react';
import {View} from 'react-native';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
+import {PressableWithFeedback} from '@components/Pressable';
import useStyleUtils from '@hooks/useStyleUtils';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import variables from '@styles/variables';
-import type {SearchAccountDetails} from '@src/types/onyx/SearchResults';
+import CONST from '@src/CONST';
+import type {SearchAccountDetails, SearchTransactionAction} from '@src/types/onyx/SearchResults';
import ActionCell from './ActionCell';
import UserInfoCell from './UserInfoCell';
type ExpenseItemHeaderNarrowProps = {
+ text?: string;
participantFrom: SearchAccountDetails;
participantTo: SearchAccountDetails;
participantFromDisplayName: string;
participantToDisplayName: string;
+ action?: SearchTransactionAction;
+ transactionID?: string;
onButtonPress: () => void;
- action?: string;
+ canSelectMultiple?: boolean;
+ isSelected?: boolean;
+ isDisabled?: boolean | null;
+ isDisabledCheckbox?: boolean;
+ handleCheckboxPress?: () => void;
};
-function ExpenseItemHeaderNarrow({participantFrom, participantFromDisplayName, participantTo, participantToDisplayName, onButtonPress, action}: ExpenseItemHeaderNarrowProps) {
+function ExpenseItemHeaderNarrow({
+ participantFrom,
+ participantFromDisplayName,
+ participantTo,
+ participantToDisplayName,
+ onButtonPress,
+ action,
+ canSelectMultiple,
+ isDisabledCheckbox,
+ isSelected,
+ isDisabled,
+ handleCheckboxPress,
+ text,
+ transactionID,
+}: ExpenseItemHeaderNarrowProps) {
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
const theme = useTheme();
@@ -27,6 +50,26 @@ function ExpenseItemHeaderNarrow({participantFrom, participantFromDisplayName, p
return (
+ {canSelectMultiple && (
+ handleCheckboxPress?.()}
+ style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), isDisabledCheckbox && styles.cursorDisabled, styles.mr1]}
+ >
+
+ {isSelected && (
+
+ )}
+
+
+ )}
diff --git a/src/components/SelectionList/Search/ReportListItem.tsx b/src/components/SelectionList/Search/ReportListItem.tsx
index 7119cee06cd9..7653e12c071f 100644
--- a/src/components/SelectionList/Search/ReportListItem.tsx
+++ b/src/components/SelectionList/Search/ReportListItem.tsx
@@ -59,6 +59,7 @@ function ReportListItem({
onSelectRow,
onDismissError,
onFocus,
+ onLongPressRow,
shouldSyncFocus,
}: ReportListItemProps) {
const reportItem = item as unknown as ReportListItemType;
@@ -110,6 +111,7 @@ function ReportListItem({
onSelectRow={() => openReportInRHP(transactionItem)}
onDismissError={onDismissError}
onFocus={onFocus}
+ onLongPressRow={onLongPressRow}
shouldSyncFocus={shouldSyncFocus}
/>
);
@@ -126,6 +128,7 @@ function ReportListItem({
showTooltip={showTooltip}
canSelectMultiple={canSelectMultiple}
onSelectRow={onSelectRow}
+ onLongPressRow={onLongPressRow}
onDismissError={onDismissError}
errors={item.errors}
pendingAction={item.pendingAction}
@@ -145,7 +148,7 @@ function ReportListItem({
onButtonPress={handleOnButtonPress}
/>
)}
-
+
{canSelectMultiple && (
@@ -155,7 +158,7 @@ function ReportListItem({
containerStyle={[StyleUtils.getCheckboxContainerStyle(20), StyleUtils.getMultiselectListStyles(!!item.isSelected, !!item.isDisabled)]}
disabled={!!isDisabled || item.isDisabledCheckbox}
accessibilityLabel={item.text ?? ''}
- style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled]}
+ style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled, !isLargeScreenWidth && styles.mr3]}
/>
)}
@@ -177,9 +180,8 @@ function ReportListItem({
@@ -201,6 +203,7 @@ function ReportListItem({
isDisabled={!!isDisabled}
canSelectMultiple={!!canSelectMultiple}
isButtonSelected={item.isSelected}
+ shouldShowTransactionCheckbox
/>
))}
diff --git a/src/components/SelectionList/Search/TransactionListItem.tsx b/src/components/SelectionList/Search/TransactionListItem.tsx
index b00ae0703c2e..a10552ca9ad8 100644
--- a/src/components/SelectionList/Search/TransactionListItem.tsx
+++ b/src/components/SelectionList/Search/TransactionListItem.tsx
@@ -15,6 +15,7 @@ function TransactionListItem({
onCheckboxPress,
onDismissError,
onFocus,
+ onLongPressRow,
shouldSyncFocus,
}: TransactionListItemProps) {
const transactionItem = item as unknown as TransactionListItemType;
@@ -22,7 +23,7 @@ function TransactionListItem({
const {isLargeScreenWidth} = useWindowDimensions();
- const listItemPressableStyle = [styles.selectionListPressableItemWrapper, styles.pv3, item.isSelected && styles.activeComponentBG, isFocused && styles.sidebarLinkActive];
+ const listItemPressableStyle = [styles.selectionListPressableItemWrapper, styles.pv3, styles.ph3, item.isSelected && styles.activeComponentBG, isFocused && styles.sidebarLinkActive];
const listItemWrapperStyle = [
styles.flex1,
@@ -46,6 +47,7 @@ function TransactionListItem({
pendingAction={item.pendingAction}
keyForList={item.keyForList}
onFocus={onFocus}
+ onLongPressRow={onLongPressRow}
shouldSyncFocus={shouldSyncFocus}
hoverStyle={item.isSelected && styles.activeComponentBG}
>
@@ -59,6 +61,7 @@ function TransactionListItem({
isDisabled={!!isDisabled}
canSelectMultiple={!!canSelectMultiple}
isButtonSelected={item.isSelected}
+ shouldShowTransactionCheckbox={false}
/>
);
diff --git a/src/components/SelectionList/Search/TransactionListItemRow.tsx b/src/components/SelectionList/Search/TransactionListItemRow.tsx
index 9f0799143373..6a8e4dc52bb7 100644
--- a/src/components/SelectionList/Search/TransactionListItemRow.tsx
+++ b/src/components/SelectionList/Search/TransactionListItemRow.tsx
@@ -4,6 +4,7 @@ import {View} from 'react-native';
import Checkbox from '@components/Checkbox';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
+import {PressableWithFeedback} from '@components/Pressable';
import ReceiptImage from '@components/ReceiptImage';
import type {TransactionListItemType} from '@components/SelectionList/types';
import TextWithTooltip from '@components/TextWithTooltip';
@@ -14,6 +15,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
import * as CurrencyUtils from '@libs/CurrencyUtils';
import DateUtils from '@libs/DateUtils';
+import StringUtils from '@libs/StringUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
import variables from '@styles/variables';
@@ -51,6 +53,7 @@ type TransactionListItemRowProps = {
isDisabled: boolean;
canSelectMultiple: boolean;
isButtonSelected?: boolean;
+ shouldShowTransactionCheckbox?: boolean;
};
const getTypeIcon = (type?: SearchTransactionType) => {
@@ -71,13 +74,15 @@ function ReceiptCell({transactionItem}: TransactionCellProps) {
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
+ const backgroundStyles = transactionItem.isSelected ? StyleUtils.getBackgroundColorStyle(theme.buttonHoveredBG) : StyleUtils.getBackgroundColorStyle(theme.border);
+
return (
@@ -114,16 +120,20 @@ function MerchantCell({transactionItem, showTooltip, isLargeScreenWidth}: Transa
const styles = useThemeStyles();
const {translate} = useLocalize();
const description = TransactionUtils.getDescription(transactionItem);
- let merchant = transactionItem.shouldShowMerchant ? transactionItem.formattedMerchant : description;
+ let merchantOrDescriptionToDisplay = transactionItem.formattedMerchant;
+ if (!merchantOrDescriptionToDisplay && !isLargeScreenWidth) {
+ merchantOrDescriptionToDisplay = description;
+ }
+ let merchant = transactionItem.shouldShowMerchant ? merchantOrDescriptionToDisplay : description;
if (TransactionUtils.hasReceipt(transactionItem) && TransactionUtils.isReceiptBeingScanned(transactionItem) && transactionItem.shouldShowMerchant) {
merchant = translate('iou.receiptStatusTitle');
}
-
+ const merchantToDisplay = StringUtils.getFirstLine(merchant);
return (
);
@@ -164,18 +174,25 @@ function TypeCell({transactionItem, isLargeScreenWidth}: TransactionCellProps) {
function CategoryCell({isLargeScreenWidth, showTooltip, transactionItem}: TransactionCellProps) {
const styles = useThemeStyles();
- return isLargeScreenWidth ? (
+ return (
- ) : (
-
);
}
@@ -225,67 +242,93 @@ function TransactionListItemRow({
containerStyle,
isChildListItem = false,
isButtonSelected = false,
+ shouldShowTransactionCheckbox,
}: TransactionListItemRowProps) {
const styles = useThemeStyles();
const {isLargeScreenWidth} = useWindowDimensions();
const StyleUtils = useStyleUtils();
+ const theme = useTheme();
if (!isLargeScreenWidth) {
return (
{showItemHeaderOnNarrowLayout && (
)}
-
+
+ {canSelectMultiple && shouldShowTransactionCheckbox && (
+
+
+ {item.isSelected && (
+
+ )}
+
+
+ )}
-
+
-
-
-
-
+ {item.category && (
+
+
+
+ )}
@@ -305,11 +348,11 @@ function TransactionListItemRow({
style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled]}
/>
)}
-
+
@@ -317,14 +360,14 @@ function TransactionListItemRow({
@@ -342,7 +385,7 @@ function TransactionListItemRow({
{item.shouldShowCategory && (
@@ -351,7 +394,7 @@ function TransactionListItemRow({
{item.shouldShowTag && (
@@ -361,7 +404,7 @@ function TransactionListItemRow({
@@ -371,22 +414,23 @@ function TransactionListItemRow({
diff --git a/src/components/SelectionList/SearchTableHeader.tsx b/src/components/SelectionList/SearchTableHeader.tsx
index 95e4b680692b..235cff294f8f 100644
--- a/src/components/SelectionList/SearchTableHeader.tsx
+++ b/src/components/SelectionList/SearchTableHeader.tsx
@@ -1,11 +1,11 @@
import React from 'react';
import {View} from 'react-native';
+import type {SearchColumnType, SortOrder} from '@components/Search/types';
import useLocalize from '@hooks/useLocalize';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
import * as SearchUtils from '@libs/SearchUtils';
-import type {SearchColumnType, SortOrder} from '@libs/SearchUtils';
import CONST from '@src/CONST';
import type {TranslationPaths} from '@src/languages/types';
import type * as OnyxTypes from '@src/types/onyx';
@@ -108,7 +108,7 @@ function SearchTableHeader({data, metadata, sortBy, sortOrder, isSortingAllowed,
return (
-
+
{SearchColumns.map(({columnName, translationKey, shouldShow, isColumnSortable}) => {
if (!shouldShow(data, metadata)) {
return null;
diff --git a/src/components/SelectionList/SortableHeaderText.tsx b/src/components/SelectionList/SortableHeaderText.tsx
index 8b0accf45711..47a894d79f53 100644
--- a/src/components/SelectionList/SortableHeaderText.tsx
+++ b/src/components/SelectionList/SortableHeaderText.tsx
@@ -4,10 +4,10 @@ import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import type {SortOrder} from '@components/Search/types';
import Text from '@components/Text';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
-import type {SortOrder} from '@libs/SearchUtils';
import CONST from '@src/CONST';
type SearchTableHeaderColumnProps = {
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index a20f0ae18c58..bfab13e895cc 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -60,6 +60,12 @@ type CommonListItemProps = {
/** Handles what to do when the item is focused */
onFocus?: () => void;
+
+ /** Callback to fire when the item is long pressed */
+ onLongPressRow?: (item: TItem) => void;
+
+ /** Whether Selection Mode is active - used only on small screens */
+ isMobileSelectionModeActive?: boolean;
} & TRightHandSideComponent;
type ListItem = {
@@ -81,6 +87,9 @@ type ListItem = {
/** Whether this option is disabled for selection */
isDisabled?: boolean | null;
+ /** Whether this item should be interactive at all */
+ isInteractive?: boolean;
+
/** List title is bold by default. Use this props to customize it */
isBold?: boolean;
@@ -462,6 +471,12 @@ type BaseSelectionListProps = Partial & {
* https://reactnative.dev/docs/optimizing-flatlist-configuration#windowsize
*/
windowSize?: number;
+
+ /** Callback to fire when the item is long pressed */
+ onLongPressRow?: (item: TItem) => void;
+
+ /** Whether Selection Mode is active - used only on small screens */
+ isMobileSelectionModeActive?: boolean;
} & TRightHandSideComponent;
type SelectionListHandle = {
diff --git a/src/components/SelectionScreen.tsx b/src/components/SelectionScreen.tsx
index af1cdfd171ea..8e1b0a88c875 100644
--- a/src/components/SelectionScreen.tsx
+++ b/src/components/SelectionScreen.tsx
@@ -1,12 +1,18 @@
import {isEmpty} from 'lodash';
import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
import * as PolicyUtils from '@libs/PolicyUtils';
import type {AccessVariant} from '@pages/workspace/AccessOrNotFoundWrapper';
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
import type {TranslationPaths} from '@src/languages/types';
+import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
import type {ConnectionName, PolicyFeatureName} from '@src/types/onyx/Policy';
+import type {ReceiptErrors} from '@src/types/onyx/Transaction';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
import HeaderWithBackButton from './HeaderWithBackButton';
+import OfflineWithFeedback from './OfflineWithFeedback';
import ScreenWrapper from './ScreenWrapper';
import SelectionList from './SelectionList';
import type RadioListItem from './SelectionList/RadioListItem';
@@ -63,6 +69,18 @@ type SelectionScreenProps = {
/** Name of the current connection */
connectionName: ConnectionName;
+
+ /** The type of action that's pending */
+ pendingAction?: OnyxCommon.PendingAction | null;
+
+ /** The errors to display */
+ errors?: OnyxCommon.Errors | ReceiptErrors | null;
+
+ /** Additional style object for the error row */
+ errorRowStyles?: StyleProp;
+
+ /** A function to run when the X button next to the error is clicked */
+ onClose?: () => void;
};
function SelectionScreen({
@@ -81,8 +99,13 @@ function SelectionScreen({
featureName,
shouldBeBlocked,
connectionName,
+ pendingAction,
+ errors,
+ errorRowStyles,
+ onClose,
}: SelectionScreenProps) {
const {translate} = useLocalize();
+ const styles = useThemeStyles();
const policy = PolicyUtils.getPolicy(policyID);
const isConnectionEmpty = isEmpty(policy?.connections?.[connectionName]);
@@ -95,24 +118,33 @@ function SelectionScreen({
shouldBeBlocked={isConnectionEmpty || shouldBeBlocked}
>
-
+ {headerContent}
+
+
+
);
diff --git a/src/components/SettlementButton.tsx b/src/components/SettlementButton.tsx
index 7a7e4e584363..7c3c021a08eb 100644
--- a/src/components/SettlementButton.tsx
+++ b/src/components/SettlementButton.tsx
@@ -225,7 +225,7 @@ function SettlementButton({
}
return buttonOptions;
// We don't want to reorder the options when the preferred payment method changes while the button is still visible
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [currency, formattedAmount, iouReport, policyID, translate, shouldHidePaymentOptions, shouldShowApproveButton, shouldDisableApproveButton]);
const selectPaymentType = (event: KYCFlowEvent, iouPaymentType: PaymentMethodType, triggerKYCFlow: TriggerKYCFlow) => {
diff --git a/src/components/Skeletons/ItemListSkeletonView.tsx b/src/components/Skeletons/ItemListSkeletonView.tsx
index 1ee2da8a8019..046cdfffbee5 100644
--- a/src/components/Skeletons/ItemListSkeletonView.tsx
+++ b/src/components/Skeletons/ItemListSkeletonView.tsx
@@ -1,6 +1,6 @@
-import React, {useMemo, useState} from 'react';
-import {View} from 'react-native';
-import type {StyleProp, ViewStyle} from 'react-native';
+import React, {useCallback, useMemo, useState} from 'react';
+import type {LayoutChangeEvent, StyleProp, ViewStyle} from 'react-native';
+import {StyleSheet, View} from 'react-native';
import SkeletonViewContentLoader from '@components/SkeletonViewContentLoader';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
@@ -10,22 +10,62 @@ type ListItemSkeletonProps = {
shouldAnimate?: boolean;
renderSkeletonItem: (args: {itemIndex: number}) => React.ReactNode;
fixedNumItems?: number;
+ gradientOpacityEnabled?: boolean;
itemViewStyle?: StyleProp;
itemViewHeight?: number;
};
-function ItemListSkeletonView({shouldAnimate = true, renderSkeletonItem, fixedNumItems, itemViewStyle = {}, itemViewHeight = CONST.LHN_SKELETON_VIEW_ITEM_HEIGHT}: ListItemSkeletonProps) {
+const getVerticalMargin = (style: StyleProp): number => {
+ if (!style) {
+ return 0;
+ }
+
+ const flattenStyle = StyleSheet.flatten(style);
+ const marginVertical = Number(flattenStyle?.marginVertical ?? 0);
+ const marginTop = Number(flattenStyle?.marginTop ?? 0);
+ const marginBottom = Number(flattenStyle?.marginBottom ?? 0);
+
+ return marginVertical + marginTop + marginBottom;
+};
+
+function ItemListSkeletonView({
+ shouldAnimate = true,
+ renderSkeletonItem,
+ fixedNumItems,
+ gradientOpacityEnabled = false,
+ itemViewStyle = {},
+ itemViewHeight = CONST.LHN_SKELETON_VIEW_ITEM_HEIGHT,
+}: ListItemSkeletonProps) {
const theme = useTheme();
const themeStyles = useThemeStyles();
const [numItems, setNumItems] = useState(fixedNumItems ?? 0);
+
+ const totalItemHeight = itemViewHeight + getVerticalMargin(itemViewStyle);
+
+ const handleLayout = useCallback(
+ (event: LayoutChangeEvent) => {
+ if (fixedNumItems) {
+ return;
+ }
+
+ const totalHeight = event.nativeEvent.layout.height;
+ const newNumItems = Math.ceil(totalHeight / totalItemHeight);
+ if (newNumItems !== numItems) {
+ setNumItems(newNumItems);
+ }
+ },
+ [fixedNumItems, numItems, totalItemHeight],
+ );
+
const skeletonViewItems = useMemo(() => {
const items = [];
for (let i = 0; i < numItems; i++) {
+ const opacity = gradientOpacityEnabled ? 1 - i / (numItems - 1) : 1;
items.push(
{
- if (fixedNumItems) {
- return;
- }
-
- const newNumItems = Math.ceil(event.nativeEvent.layout.height / itemViewHeight);
- if (newNumItems === numItems) {
- return;
- }
- setNumItems(newNumItems);
- }}
+ onLayout={handleLayout}
>
- {skeletonViewItems}
+ {skeletonViewItems}
);
}
diff --git a/src/components/Skeletons/TableListItemSkeleton.tsx b/src/components/Skeletons/SearchRowSkeleton.tsx
similarity index 54%
rename from src/components/Skeletons/TableListItemSkeleton.tsx
rename to src/components/Skeletons/SearchRowSkeleton.tsx
index 6ff3a3aedbb9..2359e47b7520 100644
--- a/src/components/Skeletons/TableListItemSkeleton.tsx
+++ b/src/components/Skeletons/SearchRowSkeleton.tsx
@@ -2,26 +2,41 @@ import React from 'react';
import {Circle, Rect} from 'react-native-svg';
import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
+import variables from '@styles/variables';
import CONST from '@src/CONST';
import ItemListSkeletonView from './ItemListSkeletonView';
-type TableListItemSkeletonProps = {
+type SearchRowSkeletonProps = {
shouldAnimate?: boolean;
fixedNumItems?: number;
+ gradientOpacityEnabled?: boolean;
};
-const barHeight = '10';
-const shortBarWidth = '40';
-const longBarWidth = '120';
+const barHeight = 8;
+const longBarWidth = 120;
+const leftPaneWidth = variables.sideBarWidth;
-function TableListItemSkeleton({shouldAnimate = true, fixedNumItems}: TableListItemSkeletonProps) {
+// 12 is the gap between the element and the right button
+const gapWidth = 12;
+
+// 80 is the width of the element itself
+const rightSideElementWidth = 80;
+
+// 24 is the padding of the central pane summing two sides
+const centralPanePadding = 40;
+
+// 80 is the width of the button on the right side
+const rightButtonWidth = 80;
+
+function SearchRowSkeleton({shouldAnimate = true, fixedNumItems, gradientOpacityEnabled = false}: SearchRowSkeletonProps) {
const styles = useThemeStyles();
- const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
+ const {windowWidth, isSmallScreenWidth, isLargeScreenWidth} = useWindowDimensions();
if (isSmallScreenWidth) {
return (
(
@@ -51,7 +66,7 @@ function TableListItemSkeleton({shouldAnimate = true, fixedNumItems}: TableListI
height={4}
/>
);
}
+
return (
(
<>
-
+ {isLargeScreenWidth && (
+ <>
+
+
+
+
+ )}
+
+
)}
@@ -146,6 +181,6 @@ function TableListItemSkeleton({shouldAnimate = true, fixedNumItems}: TableListI
);
}
-TableListItemSkeleton.displayName = 'TableListItemSkeleton';
+SearchRowSkeleton.displayName = 'SearchRowSkeleton';
-export default TableListItemSkeleton;
+export default SearchRowSkeleton;
diff --git a/src/components/Skeletons/TableRowSkeleton.tsx b/src/components/Skeletons/TableRowSkeleton.tsx
new file mode 100644
index 000000000000..865bffc5842f
--- /dev/null
+++ b/src/components/Skeletons/TableRowSkeleton.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import {Circle, Rect} from 'react-native-svg';
+import useThemeStyles from '@hooks/useThemeStyles';
+import ItemListSkeletonView from './ItemListSkeletonView';
+
+type TableListItemSkeletonProps = {
+ shouldAnimate?: boolean;
+ fixedNumItems?: number;
+ gradientOpacityEnabled?: boolean;
+};
+
+const barHeight = '8';
+const shortBarWidth = '60';
+const longBarWidth = '124';
+
+function TableListItemSkeleton({shouldAnimate = true, fixedNumItems, gradientOpacityEnabled = false}: TableListItemSkeletonProps) {
+ const styles = useThemeStyles();
+
+ return (
+ (
+ <>
+
+
+
+
+ )}
+ />
+ );
+}
+
+TableListItemSkeleton.displayName = 'TableListItemSkeleton';
+
+export default TableListItemSkeleton;
diff --git a/src/components/SpacerView.tsx b/src/components/SpacerView.tsx
index 23c109f7d589..bb762da1226b 100644
--- a/src/components/SpacerView.tsx
+++ b/src/components/SpacerView.tsx
@@ -35,10 +35,11 @@ function SpacerView({shouldShow, style}: SpacerViewProps) {
marginVertical: shouldShow ? CONST.HORIZONTAL_SPACER.DEFAULT_MARGIN_VERTICAL : CONST.HORIZONTAL_SPACER.HIDDEN_MARGIN_VERTICAL,
borderBottomWidth: shouldShow ? CONST.HORIZONTAL_SPACER.DEFAULT_BORDER_BOTTOM_WIDTH : CONST.HORIZONTAL_SPACER.HIDDEN_BORDER_BOTTOM_WIDTH,
};
+ // eslint-disable-next-line react-compiler/react-compiler
marginVertical.value = values.marginVertical;
borderBottomWidth.value = values.borderBottomWidth;
- // eslint-disable-next-line react-hooks/exhaustive-deps -- we only need to trigger when shouldShow prop is changed
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we only need to trigger when shouldShow prop is changed
}, [shouldShow, prevShouldShow]);
return ;
diff --git a/src/components/SplashScreenHider/index.native.tsx b/src/components/SplashScreenHider/index.native.tsx
index e31f391f7376..7c579519c926 100644
--- a/src/components/SplashScreenHider/index.native.tsx
+++ b/src/components/SplashScreenHider/index.native.tsx
@@ -34,6 +34,7 @@ function SplashScreenHider({onHide = () => {}}: SplashScreenHiderProps): SplashS
hideHasBeenCalled.current = true;
BootSplash.hide().then(() => {
+ // eslint-disable-next-line react-compiler/react-compiler
scale.value = withTiming(0, {
duration: 200,
easing: Easing.back(2),
diff --git a/src/components/StateSelector.tsx b/src/components/StateSelector.tsx
index 4da8c33c2dc8..e2be9281d0bb 100644
--- a/src/components/StateSelector.tsx
+++ b/src/components/StateSelector.tsx
@@ -71,7 +71,7 @@ function StateSelector(
// This helps prevent issues where the component might not update correctly if the state is controlled by both the parent and the URL.
Navigation.setParams({state: undefined});
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [stateFromUrl, onBlur, isFocused]);
const title = stateCode && Object.keys(COMMON_CONST.STATES).includes(stateCode) ? translate(`allStates.${stateCode}.stateName`) : '';
diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
index 0c7e603a4aa2..5e563ea99763 100644
--- a/src/components/TaskHeaderActionButton.tsx
+++ b/src/components/TaskHeaderActionButton.tsx
@@ -5,6 +5,7 @@ import {withOnyx} from 'react-native-onyx';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import * as ReportUtils from '@libs/ReportUtils';
+import * as TaskUtils from '@libs/TaskUtils';
import * as Session from '@userActions/Session';
import * as Task from '@userActions/Task';
import ONYXKEYS from '@src/ONYXKEYS';
@@ -36,7 +37,17 @@ function TaskHeaderActionButton({report, session}: TaskHeaderActionButtonProps)
isDisabled={!Task.canModifyTask(report, session?.accountID ?? -1)}
medium
text={translate(ReportUtils.isCompletedTaskReport(report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
- onPress={Session.checkIfActionIsAllowed(() => (ReportUtils.isCompletedTaskReport(report) ? Task.reopenTask(report) : Task.completeTask(report)))}
+ onPress={Session.checkIfActionIsAllowed(() => {
+ // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
+ if (TaskUtils.isActiveTaskEditRoute(report.reportID)) {
+ return;
+ }
+ if (ReportUtils.isCompletedTaskReport(report)) {
+ Task.reopenTask(report);
+ } else {
+ Task.completeTask(report);
+ }
+ })}
style={styles.flex1}
/>
diff --git a/src/components/TextInput/BaseTextInput/index.native.tsx b/src/components/TextInput/BaseTextInput/index.native.tsx
index 8f685fb668e7..6fe5c473797e 100644
--- a/src/components/TextInput/BaseTextInput/index.native.tsx
+++ b/src/components/TextInput/BaseTextInput/index.native.tsx
@@ -108,7 +108,7 @@ function BaseTextInput(
}
input.current.focus();
// We only want this to run on mount
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
const animateLabel = useCallback(
diff --git a/src/components/TextInput/BaseTextInput/index.tsx b/src/components/TextInput/BaseTextInput/index.tsx
index 3a1032ff7a43..6da87872ee96 100644
--- a/src/components/TextInput/BaseTextInput/index.tsx
+++ b/src/components/TextInput/BaseTextInput/index.tsx
@@ -108,7 +108,7 @@ function BaseTextInput(
}
input.current.focus();
// We only want this to run on mount
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
const animateLabel = useCallback(
diff --git a/src/components/TextInput/TextInputLabel/index.tsx b/src/components/TextInput/TextInputLabel/index.tsx
index e1083b88414b..3136a43e8669 100644
--- a/src/components/TextInput/TextInputLabel/index.tsx
+++ b/src/components/TextInput/TextInputLabel/index.tsx
@@ -16,7 +16,7 @@ function TextInputLabel({for: inputId = '', label, labelTranslateY, labelScale}:
return;
}
labelRef.current.setAttribute('for', inputId);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
return (
diff --git a/src/components/TextInput/index.tsx b/src/components/TextInput/index.tsx
index a9dda9e956cf..4070714c798e 100644
--- a/src/components/TextInput/index.tsx
+++ b/src/components/TextInput/index.tsx
@@ -40,7 +40,7 @@ function TextInput(props: BaseTextInputProps, ref: ForwardedRef(null);
+ const inputValueRef = useRef(value);
const focusTimeoutRef = useRef(null);
const hide = useCallback(() => {
@@ -32,11 +34,16 @@ function TextSelectorModal({value, description = '', subtitle, onValueSelected,
}
}, [onClose, shouldClearOnClose]);
+ useEffect(() => {
+ inputValueRef.current = currentValue;
+ }, [currentValue]);
+
useFocusEffect(
useCallback(() => {
focusTimeoutRef.current = setTimeout(() => {
if (inputRef.current && isVisible) {
inputRef.current.focus();
+ (inputRef.current as TextInputType).setSelection?.(inputValueRef.current?.length ?? 0, inputValueRef.current?.length ?? 0);
}
return () => {
if (!focusTimeoutRef.current || !isVisible) {
diff --git a/src/components/ThumbnailImage.tsx b/src/components/ThumbnailImage.tsx
index 3b89b7c3a7ad..04d0200ea228 100644
--- a/src/components/ThumbnailImage.tsx
+++ b/src/components/ThumbnailImage.tsx
@@ -41,9 +41,12 @@ type ThumbnailImageProps = {
/** The size of the fallback icon */
fallbackIconSize?: number;
- /** The colod of the fallback icon */
+ /** The color of the fallback icon */
fallbackIconColor?: string;
+ /** The background color of fallback icon */
+ fallbackIconBackground?: string;
+
/** Should the image be resized on load or just fit container */
shouldDynamicallyResize?: boolean;
@@ -66,6 +69,7 @@ function ThumbnailImage({
fallbackIcon = Expensicons.Gallery,
fallbackIconSize = variables.iconSizeSuperLarge,
fallbackIconColor,
+ fallbackIconBackground,
objectPosition = CONST.IMAGE_OBJECT_POSITION.INITIAL,
}: ThumbnailImageProps) {
const styles = useThemeStyles();
@@ -107,8 +111,10 @@ function ThumbnailImage({
const sizeStyles = shouldDynamicallyResize ? [thumbnailDimensionsStyles] : [styles.w100, styles.h100];
if (failedToLoad || previewSourceURL === '') {
+ const fallbackColor = StyleUtils.getBackgroundColorStyle(fallbackIconBackground ?? theme.border);
+
return (
-
+ {}}: Tim
handleMinutesChange(insertAtPosition(minutes, trimmedKey, selectionMinute.start, selectionMinute.end));
}
},
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[minutes, hours, selectionMinute, selectionHour],
);
@@ -381,7 +381,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
focusHourInputOnLastCharacter();
}
},
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[selectionHour, selectionMinute],
);
const arrowRightCallback = useCallback(
@@ -394,7 +394,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
focusMinuteInputOnFirstCharacter();
}
},
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[selectionHour, selectionMinute],
);
@@ -409,7 +409,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
e.preventDefault();
focusHourInputOnLastCharacter();
},
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[selectionMinute.start, selectionMinute.end, focusHourInputOnLastCharacter],
);
@@ -430,7 +430,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
useEffect(() => {
onInputChange(`${hours}:${minutes} ${amPmValue}`);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [hours, minutes, amPmValue]);
const handleSubmit = () => {
@@ -463,6 +463,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
// eslint-disable-next-line no-param-reassign
ref.current = {hourRef: textInputRef as TextInput | null, minuteRef: minuteInputRef.current};
}
+ // eslint-disable-next-line react-compiler/react-compiler
hourInputRef.current = textInputRef as TextInput | null;
}}
onSelectionChange={(e) => {
diff --git a/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx b/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
index 1398d74bbd67..50a1c9024293 100644
--- a/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
+++ b/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
@@ -41,6 +41,7 @@ function BaseEducationalTooltip({children, ...props}: TooltipProps) {
{...props}
>
{({showTooltip, hideTooltip, updateTargetBounds}) => {
+ // eslint-disable-next-line react-compiler/react-compiler
hideTooltipRef.current = hideTooltip;
return React.cloneElement(children as React.ReactElement, {
onLayout: (e: LayoutEvent) => {
diff --git a/src/components/VideoPlayer/BaseVideoPlayer.tsx b/src/components/VideoPlayer/BaseVideoPlayer.tsx
index 8230f9132d00..c6a244be3fcb 100644
--- a/src/components/VideoPlayer/BaseVideoPlayer.tsx
+++ b/src/components/VideoPlayer/BaseVideoPlayer.tsx
@@ -124,6 +124,7 @@ function BaseVideoPlayer({
if (videoResumeTryNumber.current === 1) {
playVideo();
}
+ // eslint-disable-next-line react-compiler/react-compiler
videoResumeTryNumber.current -= 1;
},
[playVideo, videoResumeTryNumber],
@@ -160,7 +161,7 @@ function BaseVideoPlayer({
videoStateRef.current = status;
onPlaybackStatusUpdate?.(status);
},
- // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want to trigger this when isPlaying changes because isPlaying is only used inside shouldReplayVideo
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want to trigger this when isPlaying changes because isPlaying is only used inside shouldReplayVideo
[onPlaybackStatusUpdate, preventPausingWhenExitingFullscreen, videoDuration],
);
diff --git a/src/components/VideoPlayer/VideoPlayerControls/ProgressBar/index.tsx b/src/components/VideoPlayer/VideoPlayerControls/ProgressBar/index.tsx
index c9cf2c25d7ad..5d1ea0d85d0b 100644
--- a/src/components/VideoPlayer/VideoPlayerControls/ProgressBar/index.tsx
+++ b/src/components/VideoPlayer/VideoPlayerControls/ProgressBar/index.tsx
@@ -30,6 +30,7 @@ function ProgressBar({duration, position, seekPosition}: ProgressBarProps) {
const wasVideoPlayingOnCheck = useSharedValue(false);
const onCheckVideoPlaying = (isPlaying: boolean) => {
+ // eslint-disable-next-line react-compiler/react-compiler
wasVideoPlayingOnCheck.value = isPlaying;
};
diff --git a/src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.tsx b/src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.tsx
index 011391ed4c71..abe1748c18b9 100644
--- a/src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.tsx
+++ b/src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.tsx
@@ -45,6 +45,7 @@ function VolumeButton({style, small = false}: VolumeButtonProps) {
const changeVolumeOnPan = useCallback(
(event: GestureStateChangeEvent | GestureUpdateEvent) => {
const val = NumberUtils.roundToTwoDecimalPlaces(1 - event.y / sliderHeight);
+ // eslint-disable-next-line react-compiler/react-compiler
volume.value = NumberUtils.clamp(val, 0, 1);
},
[sliderHeight, volume],
diff --git a/src/components/VideoPlayer/VideoPlayerControls/index.tsx b/src/components/VideoPlayer/VideoPlayerControls/index.tsx
index f5461159aa8e..04cb69a96f8b 100644
--- a/src/components/VideoPlayer/VideoPlayerControls/index.tsx
+++ b/src/components/VideoPlayer/VideoPlayerControls/index.tsx
@@ -72,6 +72,7 @@ function VideoPlayerControls({
};
const enterFullScreenMode = useCallback(() => {
+ // eslint-disable-next-line react-compiler/react-compiler
isFullScreenRef.current = true;
updateCurrentlyPlayingURL(url);
videoPlayerRef.current?.presentFullscreenPlayer();
diff --git a/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx b/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
index 0958ec148c3d..bfb7e3739d17 100644
--- a/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
+++ b/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
@@ -62,6 +62,7 @@ function VideoPopoverMenuContextProvider({children}: ChildrenProps) {
updatePlaybackSpeed(speed);
},
shouldPutLeftPaddingWhenNoIcon: true,
+ isSelected: currentPlaybackSpeed === speed,
})),
});
return items;
diff --git a/src/components/VideoPlayerContexts/VolumeContext.tsx b/src/components/VideoPlayerContexts/VolumeContext.tsx
index d67b989e5887..f22b524848de 100644
--- a/src/components/VideoPlayerContexts/VolumeContext.tsx
+++ b/src/components/VideoPlayerContexts/VolumeContext.tsx
@@ -16,6 +16,7 @@ function VolumeContextProvider({children}: ChildrenProps) {
return;
}
currentVideoPlayerRef.current.setStatusAsync({volume: newVolume, isMuted: newVolume === 0});
+ // eslint-disable-next-line react-compiler/react-compiler
volume.value = newVolume;
},
[currentVideoPlayerRef, volume],
diff --git a/src/components/WorkspaceEmptyStateSection.tsx b/src/components/WorkspaceEmptyStateSection.tsx
index 6a00aa4bf5eb..252197fda96b 100644
--- a/src/components/WorkspaceEmptyStateSection.tsx
+++ b/src/components/WorkspaceEmptyStateSection.tsx
@@ -14,6 +14,9 @@ type WorkspaceEmptyStateSectionProps = {
/** The text to display in the subtitle of the section */
subtitle?: string;
+ /** The component to show in the subtitle of the section */
+ subtitleComponent?: React.ReactNode;
+
/** The icon to display along with the title */
icon: IconAsset;
@@ -24,7 +27,7 @@ type WorkspaceEmptyStateSectionProps = {
shouldStyleAsCard?: boolean;
};
-function WorkspaceEmptyStateSection({icon, subtitle, title, containerStyle, shouldStyleAsCard = true}: WorkspaceEmptyStateSectionProps) {
+function WorkspaceEmptyStateSection({icon, subtitle, title, containerStyle, shouldStyleAsCard = true, subtitleComponent}: WorkspaceEmptyStateSectionProps) {
const styles = useThemeStyles();
const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -50,9 +53,9 @@ function WorkspaceEmptyStateSection({icon, subtitle, title, containerStyle, shou
{title}
- {!!subtitle && (
+ {(!!subtitle || !!subtitleComponent) && (
- {subtitle}
+ {subtitleComponent ?? {subtitle}}
)}
diff --git a/src/components/withNavigationTransitionEnd.tsx b/src/components/withNavigationTransitionEnd.tsx
index 417d8828c1e4..83f14a1d58ef 100644
--- a/src/components/withNavigationTransitionEnd.tsx
+++ b/src/components/withNavigationTransitionEnd.tsx
@@ -18,7 +18,7 @@ export default function (WrappedComponent: ComponentType {
diff --git a/src/hooks/useCopySelectionHelper.ts b/src/hooks/useCopySelectionHelper.ts
index ed379bfcf2e6..9bcb9b8b0139 100644
--- a/src/hooks/useCopySelectionHelper.ts
+++ b/src/hooks/useCopySelectionHelper.ts
@@ -1,7 +1,7 @@
import {useEffect} from 'react';
import Clipboard from '@libs/Clipboard';
import KeyboardShortcut from '@libs/KeyboardShortcut';
-import {parseHtmlToMarkdown, parseHtmlToText} from '@libs/OnyxAwareParser';
+import Parser from '@libs/Parser';
import SelectionScraper from '@libs/SelectionScraper';
import CONST from '@src/CONST';
@@ -11,10 +11,10 @@ function copySelectionToClipboard() {
return;
}
if (!Clipboard.canSetHtml()) {
- Clipboard.setString(parseHtmlToMarkdown(selection));
+ Clipboard.setString(Parser.htmlToMarkdown(selection));
return;
}
- Clipboard.setHtml(selection, parseHtmlToText(selection));
+ Clipboard.setHtml(selection, Parser.htmlToText(selection));
}
export default function useCopySelectionHelper() {
diff --git a/src/hooks/useExitTo.ts b/src/hooks/useExitTo.ts
new file mode 100644
index 000000000000..74226453d3f6
--- /dev/null
+++ b/src/hooks/useExitTo.ts
@@ -0,0 +1,17 @@
+import {findFocusedRoute, useNavigationState} from '@react-navigation/native';
+import type {PublicScreensParamList, RootStackParamList} from '@libs/Navigation/types';
+import SCREENS from '@src/SCREENS';
+
+export default function useExitTo() {
+ const activeRouteParams = useNavigationState((state) => {
+ const focusedRoute = findFocusedRoute(state);
+
+ if (focusedRoute?.name !== SCREENS.TRANSITION_BETWEEN_APPS) {
+ return undefined;
+ }
+
+ return focusedRoute?.params as PublicScreensParamList[typeof SCREENS.TRANSITION_BETWEEN_APPS];
+ });
+
+ return activeRouteParams?.exitTo;
+}
diff --git a/src/hooks/useHtmlPaste/index.ts b/src/hooks/useHtmlPaste/index.ts
index 4705a170c3bd..5888f96d1c15 100644
--- a/src/hooks/useHtmlPaste/index.ts
+++ b/src/hooks/useHtmlPaste/index.ts
@@ -1,6 +1,6 @@
import {useNavigation} from '@react-navigation/native';
import {useCallback, useEffect} from 'react';
-import {parseHtmlToMarkdown} from '@libs/OnyxAwareParser';
+import Parser from '@libs/Parser';
import type UseHtmlPaste from './types';
const insertByCommand = (text: string) => {
@@ -61,7 +61,7 @@ const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, removeLi
// eslint-disable-next-line no-empty
} catch (e) {}
// We only need to set the callback once.
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
/**
@@ -71,7 +71,7 @@ const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, removeLi
*/
const handlePastedHTML = useCallback(
(html: string) => {
- paste(parseHtmlToMarkdown(html));
+ paste(Parser.htmlToMarkdown(html));
},
[paste],
);
@@ -131,7 +131,7 @@ const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, removeLi
}
handlePastePlainText(event);
},
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[handlePastedHTML, handlePastePlainText, preHtmlPasteCallback],
);
@@ -155,7 +155,7 @@ const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, removeLi
}
document.removeEventListener('paste', handlePaste);
};
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
};
diff --git a/src/hooks/useHybridAppMiddleware.ts b/src/hooks/useHybridAppMiddleware.ts
deleted file mode 100644
index 18ebd9730630..000000000000
--- a/src/hooks/useHybridAppMiddleware.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import {useContext} from 'react';
-import {HybridAppMiddlewareContext} from '@components/HybridAppMiddleware';
-
-type SplashScreenHiddenContextType = {isSplashHidden: boolean};
-
-export default function useHybridAppMiddleware() {
- const {navigateToExitUrl, showSplashScreenOnNextStart} = useContext(HybridAppMiddlewareContext);
- return {navigateToExitUrl, showSplashScreenOnNextStart};
-}
-
-export type {SplashScreenHiddenContextType};
diff --git a/src/hooks/useKeyboardShortcut.ts b/src/hooks/useKeyboardShortcut.ts
index 1c5bbc426ef2..90f43b4520d1 100644
--- a/src/hooks/useKeyboardShortcut.ts
+++ b/src/hooks/useKeyboardShortcut.ts
@@ -63,6 +63,6 @@ export default function useKeyboardShortcut(shortcut: Shortcut, callback: (e?: G
return () => {
unsubscribe();
};
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [isActive, callback, captureOnInputs, excludedNodes, priority, shortcut.descriptionKey, shortcut.modifiers.join(), shortcut.shortcutKey, shouldBubble, shouldPreventDefault]);
}
diff --git a/src/hooks/useLastAccessedReportID.ts b/src/hooks/useLastAccessedReportID.ts
deleted file mode 100644
index 16a4a6bc2a31..000000000000
--- a/src/hooks/useLastAccessedReportID.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import {useCallback, useSyncExternalStore} from 'react';
-import type {OnyxCollection} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
-import {getPolicyEmployeeListByIdWithoutCurrentUser} from '@libs/PolicyUtils';
-import * as ReportUtils from '@libs/ReportUtils';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, Report, ReportMetadata} from '@src/types/onyx';
-import useActiveWorkspace from './useActiveWorkspace';
-import usePermissions from './usePermissions';
-
-/*
- * This hook is used to get the lastAccessedReportID.
- * This is a piece of data that's derived from a lot of frequently-changing Onyx values: (reports, reportMetadata, policies, etc...)
- * We don't want any component that needs access to the lastAccessedReportID to have to re-render any time any of those values change, just when the lastAccessedReportID changes.
- * So we have a custom implementation in this file that leverages useSyncExternalStore to connect to a "store" of multiple Onyx values, and re-render only when the one derived value changes.
- */
-
-const subscribers: Array<() => void> = [];
-
-let reports: OnyxCollection = {};
-let reportMetadata: OnyxCollection = {};
-let policies: OnyxCollection = {};
-let accountID: number | undefined;
-let isFirstTimeNewExpensifyUser = false;
-
-let reportsConnection: number;
-let reportMetadataConnection: number;
-let policiesConnection: number;
-let accountIDConnection: number;
-let isFirstTimeNewExpensifyUserConnection: number;
-
-function notifySubscribers() {
- subscribers.forEach((subscriber) => subscriber());
-}
-
-function subscribeToOnyxData() {
- // eslint-disable-next-line rulesdir/prefer-onyx-connect-in-libs
- reportsConnection = Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => {
- reports = value;
- notifySubscribers();
- },
- });
- // eslint-disable-next-line rulesdir/prefer-onyx-connect-in-libs
- reportMetadataConnection = Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT_METADATA,
- waitForCollectionCallback: true,
- callback: (value) => {
- reportMetadata = value;
- notifySubscribers();
- },
- });
- // eslint-disable-next-line rulesdir/prefer-onyx-connect-in-libs
- policiesConnection = Onyx.connect({
- key: ONYXKEYS.COLLECTION.POLICY,
- waitForCollectionCallback: true,
- callback: (value) => {
- policies = value;
- notifySubscribers();
- },
- });
- // eslint-disable-next-line rulesdir/prefer-onyx-connect-in-libs
- accountIDConnection = Onyx.connect({
- key: ONYXKEYS.SESSION,
- callback: (value) => {
- accountID = value?.accountID;
- notifySubscribers();
- },
- });
- // eslint-disable-next-line rulesdir/prefer-onyx-connect-in-libs
- isFirstTimeNewExpensifyUserConnection = Onyx.connect({
- key: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER,
- callback: (value) => {
- isFirstTimeNewExpensifyUser = !!value;
- notifySubscribers();
- },
- });
-}
-
-function unsubscribeFromOnyxData() {
- if (reportsConnection) {
- Onyx.disconnect(reportsConnection);
- reportsConnection = 0;
- }
- if (reportMetadataConnection) {
- Onyx.disconnect(reportMetadataConnection);
- reportMetadataConnection = 0;
- }
- if (policiesConnection) {
- Onyx.disconnect(policiesConnection);
- policiesConnection = 0;
- }
- if (accountIDConnection) {
- Onyx.disconnect(accountIDConnection);
- accountIDConnection = 0;
- }
- if (isFirstTimeNewExpensifyUserConnection) {
- Onyx.disconnect(isFirstTimeNewExpensifyUserConnection);
- isFirstTimeNewExpensifyUserConnection = 0;
- }
-}
-
-function removeSubscriber(subscriber: () => void) {
- const subscriberIndex = subscribers.indexOf(subscriber);
- if (subscriberIndex < 0) {
- return;
- }
- subscribers.splice(subscriberIndex, 1);
- if (subscribers.length === 0) {
- unsubscribeFromOnyxData();
- }
-}
-
-function addSubscriber(subscriber: () => void) {
- subscribers.push(subscriber);
- if (!reportsConnection) {
- subscribeToOnyxData();
- }
- return () => removeSubscriber(subscriber);
-}
-
-/**
- * Get the last accessed reportID.
- */
-export default function useLastAccessedReportID(shouldOpenOnAdminRoom: boolean) {
- const {canUseDefaultRooms} = usePermissions();
- const {activeWorkspaceID} = useActiveWorkspace();
-
- const getSnapshot = useCallback(() => {
- const policyMemberAccountIDs = getPolicyEmployeeListByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID);
- return ReportUtils.findLastAccessedReport(
- reports,
- !canUseDefaultRooms,
- policies,
- isFirstTimeNewExpensifyUser,
- shouldOpenOnAdminRoom,
- reportMetadata,
- activeWorkspaceID,
- policyMemberAccountIDs,
- )?.reportID;
- }, [activeWorkspaceID, canUseDefaultRooms, shouldOpenOnAdminRoom]);
-
- // We need access to all the data from these Onyx.connect calls, but we don't want to re-render the consuming component
- // unless the derived value (lastAccessedReportID) changes. To address these, we'll wrap everything with useSyncExternalStore
- return useSyncExternalStore(addSubscriber, getSnapshot);
-}
diff --git a/src/hooks/useMarkdownStyle.ts b/src/hooks/useMarkdownStyle.ts
index e21e2a77268c..51076b0818d4 100644
--- a/src/hooks/useMarkdownStyle.ts
+++ b/src/hooks/useMarkdownStyle.ts
@@ -9,7 +9,8 @@ const defaultEmptyArray: Array = [];
function useMarkdownStyle(message: string | null = null, excludeStyles: Array = defaultEmptyArray): MarkdownStyle {
const theme = useTheme();
- const emojiFontSize = containsOnlyEmojis(message ?? '') ? variables.fontSizeOnlyEmojis : variables.fontSizeNormal;
+ const hasMessageOnlyEmojis = message != null && message.length > 0 && containsOnlyEmojis(message);
+ const emojiFontSize = hasMessageOnlyEmojis ? variables.fontSizeOnlyEmojis : variables.fontSizeNormal;
// this map is used to reset the styles that are not needed - passing undefined value can break the native side
const nonStylingDefaultValues: Record = useMemo(
diff --git a/src/hooks/useReportIDs.tsx b/src/hooks/useReportIDs.tsx
index a90793857293..38622e17d2be 100644
--- a/src/hooks/useReportIDs.tsx
+++ b/src/hooks/useReportIDs.tsx
@@ -3,7 +3,6 @@ import type {OnyxEntry} from 'react-native-onyx';
import {useOnyx} from 'react-native-onyx';
import {getPolicyEmployeeListByIdWithoutCurrentUser} from '@libs/PolicyUtils';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
-import * as ReportUtils from '@libs/ReportUtils';
import SidebarUtils from '@libs/SidebarUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
@@ -13,7 +12,6 @@ import useActiveWorkspace from './useActiveWorkspace';
import useCurrentReportID from './useCurrentReportID';
import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
-type ChatReportSelector = OnyxTypes.Report & {isUnreadWithMention: boolean};
type PolicySelector = Pick;
type ReportActionsSelector = Array>;
@@ -25,56 +23,19 @@ type ReportIDsContextProviderProps = {
type ReportIDsContextValue = {
orderedReportIDs: string[];
currentReportID: string;
+ policyMemberAccountIDs: number[];
};
const ReportIDsContext = createContext({
orderedReportIDs: [],
currentReportID: '',
+ policyMemberAccountIDs: [],
});
/**
* This function (and the few below it), narrow down the data from Onyx to just the properties that we want to trigger a re-render of the component. This helps minimize re-rendering
* and makes the entire component more performant because it's not re-rendering when a bunch of properties change which aren't ever used in the UI.
*/
-const chatReportSelector = (report: OnyxEntry): ChatReportSelector =>
- (report && {
- reportID: report.reportID,
- participants: report.participants,
- isPinned: report.isPinned,
- isHidden: report.isHidden,
- notificationPreference: report.notificationPreference,
- errorFields: {
- addWorkspaceRoom: report.errorFields?.addWorkspaceRoom,
- },
- lastMessageText: report.lastMessageText,
- lastVisibleActionCreated: report.lastVisibleActionCreated,
- iouReportID: report.iouReportID,
- total: report.total,
- nonReimbursableTotal: report.nonReimbursableTotal,
- hasOutstandingChildRequest: report.hasOutstandingChildRequest,
- isWaitingOnBankAccount: report.isWaitingOnBankAccount,
- statusNum: report.statusNum,
- stateNum: report.stateNum,
- chatType: report.chatType,
- type: report.type,
- policyID: report.policyID,
- visibility: report.visibility,
- lastReadTime: report.lastReadTime,
- // Needed for name sorting:
- reportName: report.reportName,
- policyName: report.policyName,
- oldPolicyName: report.oldPolicyName,
- // Other less obvious properites considered for sorting:
- ownerAccountID: report.ownerAccountID,
- currency: report.currency,
- managerID: report.managerID,
- // Other important less obivous properties for filtering:
- parentReportActionID: report.parentReportActionID,
- parentReportID: report.parentReportID,
- isDeletedParentAction: report.isDeletedParentAction,
- isUnreadWithMention: ReportUtils.isUnreadWithMention(report),
- }) as ChatReportSelector;
-
const reportActionsSelector = (reportActions: OnyxEntry): ReportActionsSelector =>
(reportActions &&
Object.values(reportActions)
@@ -118,7 +79,7 @@ function ReportIDsContextProvider({
currentReportIDForTests,
}: ReportIDsContextProviderProps) {
const [priorityMode] = useOnyx(ONYXKEYS.NVP_PRIORITY_MODE, {initialValue: CONST.PRIORITY_MODE.DEFAULT});
- const [chatReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: chatReportSelector});
+ const [chatReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policySelector});
const [allReportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {selector: reportActionsSelector});
const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
@@ -130,7 +91,7 @@ function ReportIDsContextProvider({
const derivedCurrentReportID = currentReportIDForTests ?? currentReportIDValue?.currentReportID;
const {activeWorkspaceID} = useActiveWorkspace();
- const policyMemberAccountIDs = getPolicyEmployeeListByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID);
+ const policyMemberAccountIDs = useMemo(() => getPolicyEmployeeListByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID), [policies, activeWorkspaceID, accountID]);
const getOrderedReportIDs = useCallback(
(currentReportID?: string) =>
@@ -146,7 +107,7 @@ function ReportIDsContextProvider({
policyMemberAccountIDs,
),
// we need reports draft in deps array for reloading of list when reportsDrafts will change
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[chatReports, betas, policies, priorityMode, allReportActions, transactionViolations, activeWorkspaceID, policyMemberAccountIDs, reportsDrafts],
);
@@ -157,15 +118,16 @@ function ReportIDsContextProvider({
// we first generate the list as if there was no current report, then we check if
// the current report is missing from the list, which should very rarely happen. In this
// case we re-generate the list a 2nd time with the current report included.
- if (derivedCurrentReportID && !orderedReportIDs.includes(derivedCurrentReportID)) {
- return {orderedReportIDs: getOrderedReportIDs(derivedCurrentReportID), currentReportID: derivedCurrentReportID ?? '-1'};
+ if (derivedCurrentReportID && derivedCurrentReportID !== '-1' && orderedReportIDs.indexOf(derivedCurrentReportID) === -1) {
+ return {orderedReportIDs: getOrderedReportIDs(derivedCurrentReportID), currentReportID: derivedCurrentReportID ?? '-1', policyMemberAccountIDs};
}
return {
orderedReportIDs,
currentReportID: derivedCurrentReportID ?? '-1',
+ policyMemberAccountIDs,
};
- }, [getOrderedReportIDs, orderedReportIDs, derivedCurrentReportID]);
+ }, [getOrderedReportIDs, orderedReportIDs, derivedCurrentReportID, policyMemberAccountIDs]);
return {children};
}
@@ -175,4 +137,4 @@ function useReportIDs() {
}
export {ReportIDsContext, ReportIDsContextProvider, policySelector, useReportIDs};
-export type {ChatReportSelector, PolicySelector, ReportActionsSelector};
+export type {PolicySelector, ReportActionsSelector};
diff --git a/src/hooks/useReviewDuplicatesNavigation.tsx b/src/hooks/useReviewDuplicatesNavigation.tsx
new file mode 100644
index 000000000000..f92abe63c852
--- /dev/null
+++ b/src/hooks/useReviewDuplicatesNavigation.tsx
@@ -0,0 +1,52 @@
+import {useEffect, useMemo, useState} from 'react';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type StepName = 'description' | 'merchant' | 'category' | 'billable' | 'tag' | 'taxCode' | 'reimbursable';
+
+function useReviewDuplicatesNavigation(stepNames: string[], currentScreenName: StepName, threadReportID: string) {
+ const [nextScreen, setNextScreen] = useState(currentScreenName);
+ const [currentScreenIndex, setCurrentScreenIndex] = useState(0);
+ const intersection = useMemo(() => CONST.REVIEW_DUPLICATES_ORDER.filter((element) => stepNames.includes(element)), [stepNames]);
+
+ useEffect(() => {
+ const currentIndex = intersection.indexOf(currentScreenName);
+ const nextScreenIndex = currentIndex + 1;
+ setCurrentScreenIndex(currentIndex);
+ setNextScreen(intersection[nextScreenIndex] ?? '');
+ }, [currentScreenName, intersection]);
+
+ const navigateToNextScreen = () => {
+ switch (nextScreen) {
+ case 'merchant':
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_MERCHANT_PAGE.getRoute(threadReportID));
+ break;
+ case 'category':
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_CATEGORY_PAGE.getRoute(threadReportID));
+ break;
+ case 'tag':
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_TAG_PAGE.getRoute(threadReportID));
+ break;
+ case 'description':
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_DESCRIPTION_PAGE.getRoute(threadReportID));
+ break;
+ case 'taxCode':
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_TAX_CODE_PAGE.getRoute(threadReportID));
+ break;
+ case 'reimbursable':
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_REIMBURSABLE_PAGE.getRoute(threadReportID));
+ break;
+ case 'billable':
+ Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_BILLABLE_PAGE.getRoute(threadReportID));
+ break;
+ default:
+ // Navigation to confirm screen will be done in seperate PR
+ break;
+ }
+ };
+
+ return {navigateToNextScreen, currentScreenIndex};
+}
+
+export default useReviewDuplicatesNavigation;
diff --git a/src/hooks/useSyncFocus/index.ts b/src/hooks/useSyncFocus/index.ts
index f8b3349bc223..6211b9988a82 100644
--- a/src/hooks/useSyncFocus/index.ts
+++ b/src/hooks/useSyncFocus/index.ts
@@ -21,7 +21,7 @@ const useSyncFocus = (ref: RefObject, isFocused: boolean, shouldSyncFocus
}
ref.current?.focus();
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [didScreenTransitionEnd, isFocused, ref]);
};
diff --git a/src/hooks/useTabNavigatorFocus/index.ts b/src/hooks/useTabNavigatorFocus/index.ts
index f160f4670b26..f85b630a0834 100644
--- a/src/hooks/useTabNavigatorFocus/index.ts
+++ b/src/hooks/useTabNavigatorFocus/index.ts
@@ -40,7 +40,7 @@ function useTabNavigatorFocus({tabIndex}: UseTabNavigatorFocusParams): boolean {
// Retrieve the animation value from the tab navigator, which ranges from 0 to the total number of pages displayed.
// Even a minimal scroll towards the camera page (e.g., a value of 0.001 at start) should activate the camera for immediate responsiveness.
// STOP!!!!!!! This is not a pattern to be followed! We are conditionally rendering this hook becase when used in the edit flow we'll never be inside a tab navigator.
- // eslint-disable-next-line react-hooks/rules-of-hooks
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/rules-of-hooks
tabPositionAnimation = useTabAnimation();
} catch (error) {
tabPositionAnimation = null;
diff --git a/src/hooks/useTackInputFocus/index.ts b/src/hooks/useTackInputFocus/index.ts
index 124f8460127c..e6caa15f9dde 100644
--- a/src/hooks/useTackInputFocus/index.ts
+++ b/src/hooks/useTackInputFocus/index.ts
@@ -1,5 +1,6 @@
import {useCallback, useEffect} from 'react';
import useDebouncedState from '@hooks/useDebouncedState';
+import * as Browser from '@libs/Browser';
/**
* Detects input or text area focus on browsers, to avoid scrolling on virtual viewports
@@ -28,7 +29,13 @@ export default function useTackInputFocus(enable = false): boolean {
);
const resetScrollPositionOnVisualViewport = useCallback(() => {
- window.scrollTo({top: 0});
+ if (Browser.isChromeIOS() && window.visualViewport?.offsetTop) {
+ // On Chrome iOS, the visual viewport triggers a scroll event when the keyboard is opened, but some time the scroll position is not correct.
+ // So this change is specific to Chrome iOS, helping to reset the viewport position correctly.
+ window.scrollTo({top: -window.visualViewport.offsetTop});
+ } else {
+ window.scrollTo({top: 0});
+ }
}, []);
useEffect(() => {
diff --git a/src/hooks/useWindowDimensions/index.ts b/src/hooks/useWindowDimensions/index.ts
index 25757fda17e5..b391e45a61aa 100644
--- a/src/hooks/useWindowDimensions/index.ts
+++ b/src/hooks/useWindowDimensions/index.ts
@@ -23,7 +23,7 @@ export default function (useCachedViewportHeight = false): WindowDimensions {
unlockWindowDimensions: () => {},
};
- const isCachedViewportHeight = useCachedViewportHeight && Browser.isMobileSafari();
+ const isCachedViewportHeight = useCachedViewportHeight && Browser.isMobileWebKit();
const cachedViewportHeightWithKeyboardRef = useRef(initalViewportHeight);
const {width: windowWidth, height: windowHeight} = useWindowDimensions();
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 4232ba3dfdf5..348b0d36b5fe 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2,7 +2,7 @@ import {CONST as COMMON_CONST, Str} from 'expensify-common';
import {startCase} from 'lodash';
import CONST from '@src/CONST';
import type {Country} from '@src/CONST';
-import type {ConnectionName, PolicyConnectionSyncStage} from '@src/types/onyx/Policy';
+import type {ConnectionName, PolicyConnectionSyncStage, SageIntacctMappingName} from '@src/types/onyx/Policy';
import type {
AddressLineParams,
AdminCanceledRequestParams,
@@ -171,6 +171,7 @@ export default {
wallet: 'Wallet',
preferences: 'Preferences',
view: 'View',
+ review: 'Review',
not: 'Not',
signIn: 'Sign in',
signInWithGoogle: 'Sign in with Google',
@@ -354,6 +355,7 @@ export default {
shared: 'Shared',
drafts: 'Drafts',
finished: 'Finished',
+ upgrade: 'Upgrade',
companyID: 'Company ID',
userID: 'User ID',
disable: 'Disable',
@@ -519,6 +521,7 @@ export default {
replyInThread: 'Reply in thread',
joinThread: 'Join thread',
leaveThread: 'Leave thread',
+ copyOnyxData: 'Copy Onyx data',
flagAsOffensive: 'Flag as offensive',
menu: 'Menu',
},
@@ -813,6 +816,11 @@ export default {
removed: 'removed',
transactionPending: 'Transaction pending.',
chooseARate: ({unit}: ReimbursementRateParams) => `Select a workspace reimbursement rate per ${unit}`,
+ unapprove: 'Unapprove',
+ unapproveReport: 'Unapprove report',
+ headsUp: 'Heads up!',
+ unapproveWithIntegrationWarning: (accountingIntegration: string) =>
+ `This report has already been exported to ${accountingIntegration}. Changes to this report in Expensify may lead to data discrepancies and Expensify Card reconciliation issues. Are you sure you want to unapprove this report?`,
},
notificationPreferencesPage: {
header: 'Notification preferences',
@@ -931,7 +939,7 @@ export default {
timezonePage: {
timezone: 'Timezone',
isShownOnProfile: 'Your timezone is shown on your profile.',
- getLocationAutomatically: 'Automatically determine your location.',
+ getLocationAutomatically: 'Automatically determine your location',
},
updateRequiredView: {
updateRequired: 'Update required',
@@ -1007,7 +1015,7 @@ export default {
},
returnToClassic: 'Switch to Expensify Classic',
help: 'Help',
- accountSettings: 'Account Settings',
+ accountSettings: 'Account settings',
account: 'Account',
general: 'General',
},
@@ -1146,9 +1154,9 @@ export default {
deleteAccount: 'Delete account',
deleteConfirmation: 'Are you sure you want to delete this account?',
error: {
- notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method.',
+ notOwnerOfBankAccount: 'An error occurred while setting this bank account as your default payment method.',
invalidBankAccount: 'This bank account is temporarily suspended.',
- notOwnerOfFund: 'There was an error setting this card as your default payment method.',
+ notOwnerOfFund: 'An error occurred while setting this card as your default payment method.',
setDefaultFailure: 'Something went wrong. Please chat with Concierge for further assistance.',
},
addBankAccountFailure: 'An unexpected error occurred while trying to add your bank account. Please try again.',
@@ -1456,6 +1464,7 @@ export default {
title: 'What do you want to do today?',
errorSelection: 'Please make a selection to continue.',
errorContinue: 'Please press continue to get set up.',
+ errorBackButton: 'Please finish the setup questions to start using the app.',
[CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Get paid back by my employer',
[CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: "Manage my team's expenses",
[CONST.ONBOARDING_CHOICES.PERSONAL_SPEND]: 'Track and budget expenses',
@@ -1611,7 +1620,7 @@ export default {
phrase4: 'verify your account here',
},
hasPhoneLoginError: 'To add a verified bank account please ensure your primary login is a valid email and try again. You can add your phone number as a secondary login.',
- hasBeenThrottledError: 'There was an error adding your bank account. Please wait a few minutes and try again.',
+ hasBeenThrottledError: 'An error occurred while adding your bank account. Please wait a few minutes and try again.',
hasCurrencyError: 'Oops! It appears that your workspace currency is set to a different currency than USD. To proceed, please set it to USD and try again.',
error: {
youNeedToSelectAnOption: 'You need to select an option to proceed.',
@@ -1677,7 +1686,7 @@ export default {
verifyIdentity: 'Verify identity',
letsVerifyIdentity: "Let's verify your identity.",
butFirst: `But first, the boring stuff. Read up on the legalese in the next step and click "Accept" when you're ready.`,
- genericError: 'There was an error while processing this step. Please try again.',
+ genericError: 'An error occurred while processing this step. Please try again.',
cameraPermissionsNotGranted: 'Enable camera access',
cameraRequestMessage: 'We need access to your camera to complete bank account verification. Please enable via Settings > New Expensify.',
microphonePermissionsNotGranted: 'Enable microphone access',
@@ -1999,6 +2008,7 @@ export default {
categories: 'Categories',
tags: 'Tags',
reportFields: 'Report fields',
+ reportField: 'Report field',
taxes: 'Taxes',
bills: 'Bills',
invoices: 'Invoices',
@@ -2031,6 +2041,10 @@ export default {
welcomeNote: ({workspaceName}: WelcomeNoteParams) =>
`You have been invited to ${workspaceName || 'a workspace'}! Download the Expensify mobile app at use.expensify.com/download to start tracking your expenses.`,
subscription: 'Subscription',
+ letsDoubleCheck: "Let's double check that everything looks right.",
+ lineItemLevel: 'Line-item level',
+ reportLevel: 'Report level',
+ appliedOnExport: 'Not imported into Expensify, applied on export',
},
qbo: {
importDescription: 'Choose which coding configurations to import from QuickBooks Online to Expensify.',
@@ -2207,6 +2221,63 @@ export default {
noAccountsFound: 'No accounts found',
noAccountsFoundDescription: 'Add the account in Xero and sync the connection again.',
},
+ sageIntacct: {
+ preferredExporter: 'Preferred exporter',
+ notConfigured: 'Not configured',
+ exportDate: {
+ label: 'Export date',
+ description: 'Use this date when exporting reports to Sage Intacct.',
+ values: {
+ [CONST.SAGE_INTACCT_EXPORT_DATE.LAST_EXPENSE]: {
+ label: 'Date of last expense',
+ description: 'Date of the most recent expense on the report.',
+ },
+ [CONST.SAGE_INTACCT_EXPORT_DATE.EXPORTED]: {
+ label: 'Export date',
+ description: 'Date the report was exported to Sage Intacct.',
+ },
+ [CONST.SAGE_INTACCT_EXPORT_DATE.SUBMITTED]: {
+ label: 'Submitted date',
+ description: 'Date the report was submitted for approval.',
+ },
+ },
+ },
+ reimbursableExpenses: {
+ label: 'Export reimbursable expenses as',
+ description: 'Reimbursable expenses will export as expense reports to Sage Intacct. Bills will export as vendor bills.',
+ values: {
+ [CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.EXPENSE_REPORT]: 'Expense reports',
+ [CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL]: 'Vendor bills',
+ },
+ },
+ nonReimbursableExpenses: {
+ label: 'Export non-reimbursable expenses as',
+ description:
+ 'Non-reimbursable expenses will export to Sage Intacct as either credit card transactions or vendor bills and credit the account selected below. Learn more about assigning cards to individual accounts.',
+ values: {
+ [CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.CREDIT_CARD_CHARGE]: 'Credit card transactions',
+ [CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL]: 'Vendor bills',
+ },
+ },
+ creditCardAccount: 'Credit card account',
+ defaultVendor: 'Default vendor',
+ defaultVendorDescription: (isReimbursable: boolean): string =>
+ `Set a default vendor that will apply to ${isReimbursable ? '' : 'non-'}reimbursable expenses that don't have a matching vendor in Sage Intacct.`,
+ exportDescription: 'Configure how data in Expensify gets exported to Sage Intacct.',
+ exportPreferredExporterNote:
+ 'The preferred exporter can be any workspace admin, but must also be a Domain Admin if you set different export accounts for individual company cards in Domain Settings.',
+ exportPreferredExporterSubNote: 'Once set, the preferred exporter will see reports for export in their account.',
+ noAccountsFound: 'No accounts found',
+ noAccountsFoundDescription: `Add the account in Sage Intacct and sync the connection again.`,
+ autoSync: 'Auto-sync',
+ autoSyncDescription: 'Sync Sage Intacct and Expensify automatically, every day.',
+ inviteEmployees: 'Invite employees',
+ inviteEmployeesDescription:
+ 'Import Sage Intacct employee records and invite employees to this workspace. Your approval workflow will default to manager approval and can be furthered configured on the Members page.',
+ syncReimbursedReports: 'Sync reimbursed reports',
+ syncReimbursedReportsDescription: 'When a report is reimbursed using Expensify ACH, the corresponding puchase bill will be created in the Sage Intacct account below.',
+ paymentAccount: 'Sage Intacct payment account',
+ },
netsuite: {
subsidiary: 'Subsidiary',
subsidiarySelectDescription: "Choose the subsidiary in NetSuite that you'd like to import data from.",
@@ -2293,8 +2364,12 @@ export default {
autoSyncDescription: 'Expensify will automatically sync with NetSuite every day.',
reimbursedReportsDescription: 'Any time a report is paid using Expensify ACH, the corresponding bill payment will be created in the NetSuite account below.',
reimbursementsAccount: 'Reimbursements account',
+ reimbursementsAccountDescription: "Choose the bank account you'll use for reimbursements, and we'll create the associated payment in NetSuite.",
collectionsAccount: 'Collections account',
+ collectionsAccountDescription: 'Once an invoice is marked as paid in Expensify and exported to NetSuite, it’ll appear against the account below.',
approvalAccount: 'A/P approval account',
+ approvalAccountDescription:
+ 'Choose the account that transactions will be approved against in NetSuite. If you’re syncing reimbursed reports, this is also the account that bill payments will be created against.',
defaultApprovalAccount: 'NetSuite default',
inviteEmployees: 'Invite employees and set approvals',
inviteEmployeesDescription:
@@ -2308,6 +2383,7 @@ export default {
customFormIDNonReimbursable: 'Non-reimbursable expense',
exportReportsTo: {
label: 'Expense report approval level',
+ description: 'Once an expense report is approved in Expensify and exported to NetSuite, you can set an additional level of approval in NetSuite prior to posting.',
values: {
[CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_APPROVED_NONE]: 'NetSuite default preference',
[CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_SUPERVISOR_APPROVED]: 'Only supervisor approved',
@@ -2317,6 +2393,7 @@ export default {
},
exportVendorBillsTo: {
label: 'Vendor bill approval level',
+ description: 'Once a vendor bill is approved in Expensify and exported to NetSuite, you can set an additional level of approval in NetSuite prior to posting.',
values: {
[CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVED_NONE]: 'NetSuite default preference',
[CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVAL_PENDING]: 'Pending approval',
@@ -2325,12 +2402,16 @@ export default {
},
exportJournalsTo: {
label: 'Journal entry approval level',
+ description: 'Once a journal entry is approved in Expensify and exported to NetSuite, you can set an additional level of approval in NetSuite prior to posting.',
values: {
[CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVED_NONE]: 'NetSuite default preference',
[CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVAL_PENDING]: 'Pending approval',
[CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVED]: 'Approved for posting',
},
},
+ error: {
+ customFormID: 'Please enter a valid numeric custom form ID.',
+ },
},
noAccountsFound: 'No accounts found',
noAccountsFoundDescription: 'Add the account in NetSuite and sync the connection again.',
@@ -2398,10 +2479,79 @@ export default {
jobs: 'projects',
label: (importFields: string[], importType: string) => `${importFields.join(' and ')}, ${importType}`,
},
- importTaxDescription: 'Import tax groups from NetSuite',
+ importTaxDescription: 'Import tax groups from NetSuite.',
importCustomFields: {
- customSegments: 'Custom segments/records',
- customLists: 'Custom lists',
+ chooseOptionBelow: 'Choose an option below:',
+ requiredFieldError: (fieldName: string) => `Please enter the ${fieldName}`,
+ customSegments: {
+ title: 'Custom segments/records',
+ addText: 'Add custom segment/record',
+ recordTitle: 'Custom segment',
+ helpLink: CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS,
+ helpLinkText: 'View detailed instructions',
+ helpText: ' on configuring custom segments/records.',
+ emptyTitle: 'Add a custom segment or custom record',
+ fields: {
+ segmentName: 'Name',
+ internalID: 'Internal ID',
+ scriptID: 'Script ID',
+ customRecordScriptID: 'Transaction column ID',
+ mapping: 'Displayed as',
+ },
+ removeTitle: 'Remove custom segment/record',
+ removePrompt: 'Are you sure you want to remove this custom segment/record?',
+ addForm: {
+ customSegmentName: 'custom segment name',
+ customRecordName: 'custom record name',
+ segmentTitle: 'Custom segment',
+ customSegmentAddTitle: 'Add custom segment',
+ customRecordAddTitle: 'Add custom record',
+ recordTitle: 'Custom record',
+ segmentRecordType: 'Do you want to add a custom segment or a custom record?',
+ customSegmentNameTitle: "What's the custom segment name?",
+ customRecordNameTitle: "What's the custom record name?",
+ customSegmentNameFooter: `You can find custom segment names in NetSuite under *Customizations > Links, Records & Fields > Custom Segments* page.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+ customRecordNameFooter: `You can find custom record names in NetSuite by entering the "Transaction Column Field" in global search.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+ customSegmentInternalIDTitle: "What's the internal ID?",
+ customSegmentInternalIDFooter: `First, make sure you've enabled internal IDs in NetSuite under *Home > Set Preferences > Show Internal ID.*\n\nYou can find custom segment internal IDs in NetSuite under:\n\n1. *Customization > Lists, Records, & Fields > Custom Segments*.\n2. Click into a custom segment.\n3. Click the hyperlink next to *Custom Record Type*.\n4. Find the internal ID in the table at the bottom.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+ customRecordInternalIDFooter: `You can find custom record internal IDs in NetSuite by following these steps:\n\n1. Enter "Transaction Line Fields" in global search.\n2. Click into a custom record.\n3. Find the internal ID on the left-hand side.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+ customSegmentScriptIDTitle: "What's the script ID?",
+ customSegmentScriptIDFooter: `You can find custom segment script IDs in NetSuite under: \n\n1. *Customization > Lists, Records, & Fields > Custom Segments*.\n2. Click into a custom segment.\n3. Click the *Application and Sourcing* tab near the bottom, then:\n a. If you want to display the custom segment as a *tag* (at the line-item level) in Expensify, click the *Transaction Columns* sub-tab and use the *Field ID*.\n b. If you want to display the custom segment as a *report field* (at the report level) in Expensify, click the *Transactions* sub-tab and use the *Field ID*.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+ customRecordScriptIDTitle: "What's the transaction column ID?",
+ customRecordScriptIDFooter: `You can find custom record script IDs in NetSuite under:\n\n1. Enter "Transaction Line Fields" in global search.\n2. Click into a custom record.\n3. Find the script ID on the left-hand side.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+ customSegmentMappingTitle: 'How should this custom segment be displayed in Expensify?',
+ customRecordMappingTitle: 'How should this custom record be displayed in Expensify?',
+ },
+ errors: {
+ uniqueFieldError: (fieldName: string) => `A custom segment/record with this ${fieldName?.toLowerCase()} already exists.`,
+ },
+ },
+ customLists: {
+ title: 'Custom lists',
+ addText: 'Add custom list',
+ recordTitle: 'Custom list',
+ helpLink: CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS,
+ helpLinkText: 'View detailed instructions',
+ helpText: ' on configuring custom lists.',
+ emptyTitle: 'Add a custom list',
+ fields: {
+ listName: 'Name',
+ internalID: 'Internal ID',
+ transactionFieldID: 'Transaction field ID',
+ mapping: 'Displayed as',
+ },
+ removeTitle: 'Remove custom list',
+ removePrompt: 'Are you sure you want to remove this custom list?',
+ addForm: {
+ listNameTitle: 'Choose a custom list',
+ transactionFieldIDTitle: "What's the transaction field ID?",
+ transactionFieldIDFooter: `You can find transaction field IDs in NetSuite by following these steps:\n\n1. Enter "Transaction Line Fields" in global search.\n2. Click into a custom list.\n3. Find the transaction field ID on the left-hand side.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+ mappingTitle: 'How should this custom list be displayed in Expensify?',
+ },
+ errors: {
+ uniqueTransactionFieldIDError: `A custom list with this transaction field ID already exists.`,
+ },
+ },
},
importTypes: {
[CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT]: {
@@ -2433,6 +2583,42 @@ export default {
reuseExistingConnection: 'Reuse existing connection',
existingConnections: 'Existing connections',
sageIntacctLastSync: (formattedDate: string) => `Sage Intacct - Last synced ${formattedDate}`,
+ employeeDefault: 'Sage Intacct employee default',
+ employeeDefaultDescription: "The employee's default department will be applied to their expenses in Sage Intacct if one exists.",
+ displayedAsTagDescription: "Department will be selectable for each individual expense on an employee's report.",
+ displayedAsReportFieldDescription: "Department selection will apply to all expenses on an employee's report.",
+ toggleImportTitleFirstPart: 'Choose how to handle Sage Intacct ',
+ toggleImportTitleSecondPart: ' in Expensify.',
+ expenseTypes: 'Expense types',
+ expenseTypesDescription: 'Sage Intacct expense types import into Expensify as categories.',
+ importTaxDescription: 'Import purchase tax rate from Sage Intacct.',
+ userDefinedDimensions: 'User-defined dimensions',
+ addUserDefinedDimension: 'Add user-defined dimension',
+ integrationName: 'Integration name',
+ dimensionExists: 'A dimension with this name already exists.',
+ removeDimension: 'Remove user-defined dimension',
+ removeDimensionPrompt: 'Are you sure you want to remove this user-defined dimension?',
+ userDefinedDimension: 'User-defined dimension',
+ addAUserDefinedDimension: 'Add a user-defined dimension',
+ detailedInstructionsLink: 'View detailed instructions',
+ detailedInstructionsRestOfSentence: ' on adding user-defined dimensions.',
+ userDimensionsAdded: (dimensionsCount: number) => `${dimensionsCount} ${Str.pluralize('UDD', `UDDs`, dimensionsCount)} added`,
+ mappingTitle: (mappingName: SageIntacctMappingName): string => {
+ switch (mappingName) {
+ case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.DEPARTMENTS:
+ return 'departments';
+ case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CLASSES:
+ return 'classes';
+ case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.LOCATIONS:
+ return 'locations';
+ case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CUSTOMERS:
+ return 'customers';
+ case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.PROJECTS:
+ return 'projects (jobs)';
+ default:
+ return 'mappings';
+ }
+ },
},
type: {
free: 'Free',
@@ -2549,7 +2735,9 @@ export default {
reportFields: {
addField: 'Add field',
delete: 'Delete field',
- deleteConfirmation: 'Are you sure that you want to delete this field?',
+ deleteFields: 'Delete fields',
+ deleteConfirmation: 'Are you sure you want to delete this report field?',
+ deleteFieldsConfirmation: 'Are you sure you want to delete these report fields?',
emptyReportFields: {
title: "You haven't created any report fields",
subtitle: 'Add a custom field (text, date, or dropdown) that appears on reports.',
@@ -2758,6 +2946,21 @@ export default {
xero: 'Xero',
netsuite: 'NetSuite',
intacct: 'Sage Intacct',
+ connectionName: (integration: ConnectionName) => {
+ switch (integration) {
+ case CONST.POLICY.CONNECTIONS.NAME.QBO:
+ return 'Quickbooks Online';
+ case CONST.POLICY.CONNECTIONS.NAME.XERO:
+ return 'Xero';
+ case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+ return 'NetSuite';
+ case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
+ return 'Sage Intacct';
+ default: {
+ return '';
+ }
+ }
+ },
setup: 'Connect',
lastSync: (relativeDate: string) => `Last synced ${relativeDate}`,
import: 'Import',
@@ -2855,6 +3058,8 @@ export default {
return 'Updating people list';
case 'quickbooksOnlineSyncApplyClassesLocations':
return 'Updating report fields';
+ case 'jobDone':
+ return 'Waiting for imported data to load';
case 'xeroSyncImportChartOfAccounts':
return 'Syncing chart of accounts';
case 'xeroSyncImportCategories':
@@ -2921,6 +3126,13 @@ export default {
defaultVendor: 'Default vendor',
autoSync: 'Auto-sync',
reimbursedReports: 'Sync reimbursed reports',
+ reconciliationAccount: 'Reconciliation account',
+ chooseReconciliationAccount: {
+ chooseBankAccount: 'Choose the bank account that your Expensify Card payments will be reconciled against.',
+ accountMatches: 'Make sure this account matches your ',
+ settlementAccount: 'Expensify Card settlement account ',
+ reconciliationWorks: (lastFourPAN: string) => `(ending in ${lastFourPAN}) so Continuous Reconciliation works properly.`,
+ },
},
bills: {
manageYourBills: 'Manage your bills',
@@ -2963,7 +3175,7 @@ export default {
member: 'Invite member',
members: 'Invite members',
invitePeople: 'Invite new members',
- genericFailureMessage: 'An error occurred inviting the member to the workspace. Please try again.',
+ genericFailureMessage: 'An error occurred while inviting the member to the workspace. Please try again.',
pleaseEnterValidLogin: `Please ensure the email or phone number is valid (e.g. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
user: 'user',
users: 'users',
@@ -2977,7 +3189,7 @@ export default {
inviteMessageTitle: 'Add message',
inviteMessagePrompt: 'Make your invitation extra special by adding a message below',
personalMessagePrompt: 'Message',
- genericFailureMessage: 'An error occurred inviting the member to the workspace. Please try again.',
+ genericFailureMessage: 'An error occurred while inviting the member to the workspace. Please try again.',
inviteNoMembersError: 'Please select at least one member to invite.',
},
distanceRates: {
@@ -3011,7 +3223,7 @@ export default {
currencyInputHelpText: 'All expenses on this workspace will be converted to this currency.',
currencyInputDisabledText: "The default currency can't be changed because this workspace is linked to a USD bank account.",
save: 'Save',
- genericFailureMessage: 'An error occurred updating the workspace. Please try again.',
+ genericFailureMessage: 'An error occurred while updating the workspace. Please try again.',
avatarUploadFailureMessage: 'An error occurred uploading the avatar. Please try again.',
addressContext: 'A Workspace Address is required to enable Expensify Travel. Please enter an address associated with your business.',
},
@@ -3083,6 +3295,30 @@ export default {
errorDescriptionPartTwo: 'reach out to Concierge',
errorDescriptionPartThree: 'for help.',
},
+ upgrade: {
+ reportFields: {
+ title: 'Report fields',
+ description: `Report fields let you specify header-level details, distinct from tags that pertain to expenses on individual line items. These details can encompass specific project names, business trip information, locations, and more.`,
+ pricing: {
+ onlyAvailableOnPlan: 'Report fields are only available on the Control plan, starting at ',
+ amount: '$9 ',
+ perActiveMember: 'per active member per month.',
+ },
+ },
+ note: {
+ upgradeWorkspace: 'Upgrade your workspace to access this feature, or',
+ learnMore: 'learn more',
+ aboutOurPlans: 'about our plans and pricing.',
+ },
+ upgradeToUnlock: 'Unlock this feature',
+ completed: {
+ headline: `You've upgraded your workspace!`,
+ successMessage: (policyName: string) => `You've successfully upgraded your ${policyName} workspace to the Control plan!`,
+ viewSubscription: 'View your subscription',
+ moreDetails: 'for more details.',
+ gotIt: 'Got it, thanks',
+ },
+ },
restrictedAction: {
restricted: 'Restricted',
actionsAreCurrentlyRestricted: ({workspaceName}) => `Actions on the ${workspaceName} workspace are currently restricted`,
@@ -3182,7 +3418,7 @@ export default {
},
markAsComplete: 'Mark as complete',
markAsIncomplete: 'Mark as incomplete',
- assigneeError: 'There was an error assigning this task. Please try another assignee.',
+ assigneeError: 'An error occurred while assigning this task. Please try another assignee.',
genericCreateTaskFailureMessage: 'There was an error creating this task. Please try again later.',
deleteTask: 'Delete task',
deleteConfirmation: 'Are you sure you want to delete this task?',
@@ -3208,6 +3444,7 @@ export default {
screenShareRequest: 'Expensify is inviting you to a screen share',
},
search: {
+ selectMultiple: 'Select multiple',
resultsAreLimited: 'Search results are limited.',
searchResults: {
emptyResults: {
@@ -3620,6 +3857,14 @@ export default {
taxOutOfPolicy: ({taxName}: ViolationsTaxOutOfPolicyParams) => `${taxName ?? 'Tax'} no longer valid`,
taxRateChanged: 'Tax rate was modified',
taxRequired: 'Missing tax rate',
+ none: 'None',
+ taxCodeToKeep: 'Choose which tax code to keep',
+ tagToKeep: 'Choose which tag to keep',
+ isTransactionReimbursable: 'Choose if transaction is reimbursable',
+ merchantToKeep: 'Choose which merchant to keep',
+ descriptionToKeep: 'Choose which description to keep',
+ categoryToKeep: 'Choose which category to keep',
+ isTransactionBillable: 'Choose if transaction is billable',
keepThisOne: 'Keep this one',
hold: 'Hold',
},
@@ -3665,7 +3910,7 @@ export default {
"You appear to be offline. Unfortunately, Expensify Classic doesn't work offline, but New Expensify does. If you prefer to use Expensify Classic, try again when you have an internet connection.",
},
listBoundary: {
- errorMessage: 'There was an error loading more messages.',
+ errorMessage: 'An error occurred while loading more messages.',
tryAgain: 'Try again',
},
systemMessage: {
@@ -3814,7 +4059,7 @@ export default {
},
paymentCard: {
addPaymentCard: 'Add payment card',
- enterPaymentCardDetails: 'Enter your payment card details.',
+ enterPaymentCardDetails: 'Enter your payment card details',
security: 'Expensify is PCI-DSS compliant, uses bank-level encryption, and utilizes redundant infrastructure to protect your data.',
learnMoreAboutSecurity: 'Learn more about our security.',
},
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 0b9e67a6cf2f..d1229c92f64c 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1,6 +1,6 @@
import {Str} from 'expensify-common';
import CONST from '@src/CONST';
-import type {ConnectionName, PolicyConnectionSyncStage} from '@src/types/onyx/Policy';
+import type {ConnectionName, PolicyConnectionSyncStage, SageIntacctMappingName} from '@src/types/onyx/Policy';
import type {
AddressLineParams,
AdminCanceledRequestParams,
@@ -161,6 +161,7 @@ export default {
wallet: 'Billetera',
preferences: 'Preferencias',
view: 'Ver',
+ review: 'Revisar',
not: 'No',
privacyPolicy: 'la Política de Privacidad de Expensify',
addCardTermsOfService: 'Términos de Servicio',
@@ -344,6 +345,7 @@ export default {
shared: 'Compartidos',
drafts: 'Borradores',
finished: 'Finalizados',
+ upgrade: 'Mejora',
companyID: 'Empresa ID',
userID: 'Usuario ID',
disable: 'Deshabilitar',
@@ -370,8 +372,8 @@ export default {
cameraPermissionRequired: 'Permiso para acceder a la cámara',
expensifyDoesntHaveAccessToCamera: 'Expensify no puede tomar fotos sin acceso a la cámara. Haz click en configuración para actualizar los permisos.',
attachmentError: 'Error al adjuntar archivo',
- errorWhileSelectingAttachment: 'Ha ocurrido un error al seleccionar un archivo adjunto. Por favor, inténtalo de nuevo.',
- errorWhileSelectingCorruptedAttachment: 'Ha ocurrido un error al seleccionar un archivo adjunto corrupto. Por favor, inténtalo con otro archivo.',
+ errorWhileSelectingAttachment: 'Se ha producido un error al seleccionar un archivo adjunto. Por favor, inténtalo de nuevo.',
+ errorWhileSelectingCorruptedAttachment: 'Se ha producido un error al seleccionar un archivo adjunto corrupto. Por favor, inténtalo con otro archivo.',
takePhoto: 'Hacer una foto',
chooseFromGallery: 'Elegir de la galería',
chooseDocument: 'Elegir un archivo',
@@ -511,6 +513,7 @@ export default {
replyInThread: 'Responder en el hilo',
joinThread: 'Unirse al hilo',
leaveThread: 'Dejar hilo',
+ copyOnyxData: 'Copiar datos de Onyx',
flagAsOffensive: 'Marcar como ofensivo',
menu: 'Menú',
},
@@ -615,7 +618,7 @@ export default {
takePhoto: 'Haz una foto',
cameraAccess: 'Se requiere acceso a la cámara para hacer fotos de los recibos.',
cameraErrorTitle: 'Error en la cámara',
- cameraErrorMessage: 'Se produjo un error al hacer una foto. Por favor, inténtalo de nuevo.',
+ cameraErrorMessage: 'Se ha producido un error al hacer una foto. Por favor, inténtalo de nuevo.',
dropTitle: 'Suéltalo',
dropMessage: 'Suelta tu archivo aquí',
flash: 'flash',
@@ -816,6 +819,11 @@ export default {
removed: 'eliminó',
transactionPending: 'Transacción pendiente.',
chooseARate: ({unit}: ReimbursementRateParams) => `Selecciona una tasa de reembolso por ${unit} del espacio de trabajo`,
+ unapprove: 'Desaprobar',
+ unapproveReport: 'Anular la aprobación del informe',
+ headsUp: 'Atención!',
+ unapproveWithIntegrationWarning: (accountingIntegration: string) =>
+ `Este informe ya se ha exportado a ${accountingIntegration}. Los cambios realizados en este informe en Expensify pueden provocar discrepancias en los datos y problemas de conciliación de la tarjeta Expensify. ¿Está seguro de que desea anular la aprobación de este informe?`,
},
notificationPreferencesPage: {
header: 'Preferencias de avisos',
@@ -892,13 +900,13 @@ export default {
'Este es tu método de contacto predeterminado. Antes de poder eliminarlo, tendrás que elegir otro método de contacto y haz clic en "Establecer como predeterminado".',
removeContactMethod: 'Eliminar método de contacto',
removeAreYouSure: '¿Estás seguro de que quieres eliminar este método de contacto? Esta acción no se puede deshacer.',
- failedNewContact: 'Hubo un error al añadir este método de contacto.',
+ failedNewContact: 'Se ha producido un error al añadir este método de contacto.',
genericFailureMessages: {
requestContactMethodValidateCode: 'No se ha podido enviar un nuevo código mágico. Espera un rato y vuelve a intentarlo.',
validateSecondaryLogin: 'Código mágico incorrecto o no válido. Inténtalo de nuevo o solicita otro código.',
deleteContactMethod: 'No se ha podido eliminar este método de contacto. Por favor, contacta con Concierge para obtener ayuda.',
setDefaultContactMethod: 'No se pudo establecer un nuevo método de contacto predeterminado. Por favor contacta con Concierge para obtener ayuda.',
- addContactMethod: 'Hubo un error al añadir este método de contacto. Por favor, contacta con Concierge para obtener ayuda.',
+ addContactMethod: 'Se ha producido un error al añadir este método de contacto. Por favor, contacta con Concierge para obtener ayuda.',
enteredMethodIsAlreadySubmited: 'El método de contacto ingresado ya existe.',
passwordRequired: 'Se requiere contraseña',
contactMethodRequired: 'Se requiere método de contacto.',
@@ -935,7 +943,7 @@ export default {
timezonePage: {
timezone: 'Zona horaria',
isShownOnProfile: 'Tu zona horaria se muestra en tu perfil.',
- getLocationAutomatically: 'Detecta tu ubicación automáticamente.',
+ getLocationAutomatically: 'Detecta tu ubicación automáticamente',
},
updateRequiredView: {
updateRequired: 'Actualización requerida',
@@ -1117,7 +1125,7 @@ export default {
addressStreet: 'Por favor, introduce una dirección de facturación válida que no sea un apartado postal.',
addressState: 'Por favor, selecciona un estado.',
addressCity: 'Por favor, introduce una ciudad.',
- genericFailureMessage: 'Se produjo un error al añadir tu tarjeta. Por favor, vuelva a intentarlo.',
+ genericFailureMessage: 'Se ha producido un error al añadir tu tarjeta. Por favor, vuelva a intentarlo.',
password: 'Por favor, introduce tu contraseña de Expensify.',
},
},
@@ -1140,7 +1148,7 @@ export default {
addressStreet: 'Por favor, introduce una dirección de facturación válida que no sea un apartado postal.',
addressState: 'Por favor, selecciona un estado.',
addressCity: 'Por favor, introduce una ciudad.',
- genericFailureMessage: 'Se produjo un error al añadir tu tarjeta. Por favor, vuelva a intentarlo.',
+ genericFailureMessage: 'Se ha producido un error al añadir tu tarjeta. Por favor, vuelva a intentarlo.',
password: 'Por favor, introduce tu contraseña de Expensify.',
},
},
@@ -1151,9 +1159,9 @@ export default {
deleteAccount: 'Eliminar cuenta',
deleteConfirmation: '¿Estás seguro de que quieres eliminar esta cuenta?',
error: {
- notOwnerOfBankAccount: 'Ha ocurrido un error al establecer esta cuenta bancaria como método de pago predeterminado.',
+ notOwnerOfBankAccount: 'Se ha producido un error al establecer esta cuenta bancaria como método de pago predeterminado.',
invalidBankAccount: 'Esta cuenta bancaria está temporalmente suspendida.',
- notOwnerOfFund: 'Ha ocurrido un error al establecer esta tarjeta de crédito como método de pago predeterminado.',
+ notOwnerOfFund: 'Se ha producido un error al establecer esta tarjeta de crédito como método de pago predeterminado.',
setDefaultFailure: 'No se ha podido configurar el método de pago.',
},
addBankAccountFailure: 'Ocurrió un error inesperado al intentar añadir la cuenta bancaria. Inténtalo de nuevo.',
@@ -1368,7 +1376,7 @@ export default {
groupMembersListTitle: 'Directorio de los miembros del grupo.',
lastMemberTitle: '¡Atención!',
lastMemberWarning: 'Ya que eres la última persona aquí, si te vas, este chat quedará inaccesible para todos los miembros. ¿Estás seguro de que quieres salir del chat?',
- defaultReportName: ({displayName}: {displayName: string}) => `Chat de group de ${displayName}`,
+ defaultReportName: ({displayName}: {displayName: string}) => `Chat de groupo de ${displayName}`,
},
languagePage: {
language: 'Idioma',
@@ -1464,6 +1472,7 @@ export default {
title: '¿Qué quieres hacer hoy?',
errorSelection: 'Por favor selecciona una opción para continuar.',
errorContinue: 'Por favor, haz click en continuar para configurar tu cuenta.',
+ errorBackButton: 'Por favor, finaliza las preguntas de configuración para empezar a utilizar la aplicación.',
[CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Cobrar de mi empresa',
[CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Gestionar los gastos de mi equipo',
[CONST.ONBOARDING_CHOICES.PERSONAL_SPEND]: 'Controlar y presupuestar gastos',
@@ -1637,7 +1646,7 @@ export default {
},
hasPhoneLoginError:
'Para añadir una cuenta bancaria verificada, asegúrate de que tu nombre de usuario principal sea un correo electrónico válido y vuelve a intentarlo. Puedes añadir tu número de teléfono como nombre de usuario secundario.',
- hasBeenThrottledError: 'Se produjo un error al intentar añadir tu cuenta bancaria. Por favor, espera unos minutos e inténtalo de nuevo.',
+ hasBeenThrottledError: 'Se ha producido un error al intentar añadir tu cuenta bancaria. Por favor, espera unos minutos e inténtalo de nuevo.',
hasCurrencyError:
'¡Ups! Parece que la moneda de tu espacio de trabajo está configurada en una moneda diferente a USD. Para continuar, por favor configúrala en USD e inténtalo nuevamente.',
error: {
@@ -1683,7 +1692,7 @@ export default {
unknownFilename: 'Archivo desconocido',
passwordRequired: 'Por favor, introduce tu contraseña',
passwordIncorrect: 'Contraseña incorrecta. Por favor, inténtalo de nuevo.',
- failedToLoadPDF: 'Hubo un error al intentar cargar el PDF.',
+ failedToLoadPDF: 'Se ha producido un error al intentar cargar el PDF.',
pdfPasswordForm: {
title: 'PDF protegido con contraseña',
infoText: 'Este PDF esta protegido con contraseña.',
@@ -1705,7 +1714,7 @@ export default {
verifyIdentity: 'Verificar identidad',
letsVerifyIdentity: '¡Vamos a verificar tu identidad!',
butFirst: 'Pero primero, lo aburrido. Lee la jerga legal en el siguiente paso y haz clic en "Aceptar" cuando estés listo.',
- genericError: 'Hubo un error al procesar este paso. Inténtalo de nuevo.',
+ genericError: 'Se ha producido un error al procesar este paso. Inténtalo de nuevo.',
cameraPermissionsNotGranted: 'Permiso para acceder a la cámara',
cameraRequestMessage: 'Necesitamos acceso a tu cámara para completar la verificación de tu cuenta de banco. Por favor habilita los permisos en Configuración > Nuevo Expensify.',
microphonePermissionsNotGranted: 'Permiso para acceder al micrófono',
@@ -2062,6 +2071,11 @@ export default {
welcomeNote: ({workspaceName}: WelcomeNoteParams) =>
`¡Has sido invitado a ${workspaceName}! Descargue la aplicación móvil Expensify en use.expensify.com/download para comenzar a rastrear sus gastos.`,
subscription: 'Suscripción',
+ letsDoubleCheck: 'Verifiquemos que todo esté correcto',
+ reportField: 'Campo del informe',
+ lineItemLevel: 'Nivel de partida',
+ reportLevel: 'Nivel de informe',
+ appliedOnExport: 'No se importa en Expensify, se aplica en la exportación',
},
qbo: {
importDescription: 'Elige que configuraciónes de codificación son importadas desde QuickBooks Online a Expensify.',
@@ -2247,6 +2261,65 @@ export default {
noAccountsFound: 'No se ha encontrado ninguna cuenta',
noAccountsFoundDescription: 'Añade la cuenta en Xero y sincroniza de nuevo la conexión.',
},
+
+ sageIntacct: {
+ preferredExporter: 'Exportador preferido',
+ notConfigured: 'No configurado',
+ exportDate: {
+ label: 'Fecha de exportación',
+ description: 'Utilice esta fecha cuando exporte informes a Sage Intacct.',
+ values: {
+ [CONST.SAGE_INTACCT_EXPORT_DATE.LAST_EXPENSE]: {
+ label: 'Fecha del último gasto',
+ description: 'Fecha del gasto más reciente del informe.',
+ },
+ [CONST.SAGE_INTACCT_EXPORT_DATE.EXPORTED]: {
+ label: 'Fecha de exportación',
+ description: 'Fecha en la que se exportó el informe a Sage Intacct.',
+ },
+ [CONST.SAGE_INTACCT_EXPORT_DATE.SUBMITTED]: {
+ label: 'Fecha de envío',
+ description: 'Fecha de presentación del informe para su aprobación.',
+ },
+ },
+ },
+ reimbursableExpenses: {
+ label: 'Gastos reembolsables de exportación como',
+ description: 'Los gastos reembolsables se exportarán como informes de gastos a Sage Intacct. Las facturas se exportarán como facturas de proveedores.',
+ values: {
+ [CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.EXPENSE_REPORT]: 'Informes de gastos',
+ [CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL]: 'Facturas de proveedores',
+ },
+ },
+ nonReimbursableExpenses: {
+ label: 'Exportar gastos no reembolsables como',
+ description:
+ 'Los gastos no reembolsables se exportarán a Sage Intacct como transacciones de tarjetas de crédito o facturas de proveedores y se abonarán en la cuenta seleccionada a continuación. Más información sobre la asignación de tarjetas a cuentas individuales.',
+ values: {
+ [CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.CREDIT_CARD_CHARGE]: 'Transacciones con tarjeta de crédito',
+ [CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL]: 'Facturas de proveedores',
+ },
+ },
+ creditCardAccount: 'Cuenta de tarjeta de crédito',
+ defaultVendor: 'Proveedor por defecto',
+ defaultVendorDescription: (isReimbursable: boolean): string =>
+ `Establezca un proveedor predeterminado que se aplicará a los gastos ${isReimbursable ? '' : 'no '}reembolsables que no tienen un proveedor coincidente en Sage Intacct.`,
+ exportDescription: 'Configure cómo se exportan los datos de Expensify a Sage Intacct.',
+ exportPreferredExporterNote:
+ 'El exportador preferido puede ser cualquier administrador del área de trabajo, pero también debe ser un administrador del dominio si establece diferentes cuentas de exportación para tarjetas de empresa individuales en Configuración del dominio.',
+ exportPreferredExporterSubNote: 'Una vez configurado, el exportador preferido verá los informes para exportar en su cuenta.',
+ noAccountsFound: 'No se ha encontrado ninguna cuenta',
+ noAccountsFoundDescription: 'Añade la cuenta en Sage Intacct y sincroniza de nuevo la conexión.',
+ autoSync: 'Sincronización automática',
+ autoSyncDescription: 'Sincronice Sage Intacct y Expensify automáticamente, todos los días.',
+ inviteEmployees: 'Invitar a los empleados',
+ inviteEmployeesDescription:
+ 'Importe los registros de empleados de Sage Intacct e invite a los empleados a este espacio de trabajo. Su flujo de trabajo de aprobación será por defecto la aprobación del gerente y se puede configurar aún más en la página Miembros.',
+ syncReimbursedReports: 'Sincronizar informes reembolsados',
+ syncReimbursedReportsDescription:
+ 'Cuando un informe se reembolsa utilizando Expensify ACH, la factura de compra correspondiente se creará en la cuenta de Sage Intacct a continuación.',
+ paymentAccount: 'Cuenta de pago Sage Intacct',
+ },
netsuite: {
subsidiary: 'Subsidiaria',
subsidiarySelectDescription: 'Elige la subsidiaria de NetSuite de la que deseas importar datos.',
@@ -2334,8 +2407,12 @@ export default {
reimbursedReportsDescription:
'Cada vez que se pague un informe utilizando Expensify ACH, se creará el correspondiente pago de la factura en la cuenta de NetSuite indicadas a continuación.',
reimbursementsAccount: 'Cuenta de reembolsos',
+ reimbursementsAccountDescription: 'Elija la cuenta bancaria que utilizará para los reembolsos y crearemos el pago asociado en NetSuite.',
collectionsAccount: 'Cuenta de cobros',
+ collectionsAccountDescription: 'Una vez que una factura se marca como pagada en Expensify y se exporta a NetSuite, aparecerá contra la cuenta de abajo.',
approvalAccount: 'Cuenta de aprobación de cuentas por pagar',
+ approvalAccountDescription:
+ 'Elija la cuenta con la que se aprobarán las transacciones en NetSuite. Si está sincronizando informes reembolsados, esta es también la cuenta con la que se crearán los pagos de facturas.',
defaultApprovalAccount: 'Preferencia predeterminada de NetSuite',
inviteEmployees: 'Invitar empleados y establecer aprobaciones',
inviteEmployeesDescription:
@@ -2349,6 +2426,8 @@ export default {
customFormIDNonReimbursable: 'Gasto no reembolsable',
exportReportsTo: {
label: 'Nivel de aprobación del informe de gastos',
+ description:
+ 'Una vez aprobado un informe de gastos en Expensify y exportado a NetSuite, puede establecer un nivel adicional de aprobación en NetSuite antes de su contabilización.',
values: {
[CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_APPROVED_NONE]: 'Preferencia predeterminada de NetSuite',
[CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_SUPERVISOR_APPROVED]: 'Solo aprobado por el supervisor',
@@ -2358,6 +2437,8 @@ export default {
},
exportVendorBillsTo: {
label: 'Nivel de aprobación de facturas de proveedores',
+ description:
+ 'Una vez aprobada una factura de proveedor en Expensify y exportada a NetSuite, puede establecer un nivel adicional de aprobación en NetSuite antes de su contabilización.',
values: {
[CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVED_NONE]: 'Preferencia predeterminada de NetSuite',
[CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVAL_PENDING]: 'Aprobación pendiente',
@@ -2366,12 +2447,16 @@ export default {
},
exportJournalsTo: {
label: 'Nivel de aprobación de asientos contables',
+ description: 'Una vez aprobado un asiento en Expensify y exportado a NetSuite, puede establecer un nivel adicional de aprobación en NetSuite antes de contabilizarlo.',
values: {
[CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVED_NONE]: 'Preferencia predeterminada de NetSuite',
[CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVAL_PENDING]: 'Aprobación pendiente',
[CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVED]: 'Aprobado para publicación',
},
},
+ error: {
+ customFormID: 'Introduzca un ID numérico válido para el formulario personalizado.',
+ },
},
noAccountsFound: 'No se han encontrado cuentas',
noAccountsFoundDescription: 'Añade la cuenta en NetSuite y sincroniza la conexión de nuevo.',
@@ -2439,10 +2524,79 @@ export default {
jobs: 'proyectos',
label: (importFields: string[], importType: string) => `${importFields.join(' y ')}, ${importType}`,
},
- importTaxDescription: 'Importar grupos de impuestos desde NetSuite',
+ importTaxDescription: 'Importar grupos de impuestos desde NetSuite.',
importCustomFields: {
- customSegments: 'Segmentos/registros personalizados',
- customLists: 'Listas personalizado',
+ chooseOptionBelow: 'Elija una de las opciones siguientes:',
+ requiredFieldError: (fieldName: string) => `Por favor, introduzca el ${fieldName}`,
+ customSegments: {
+ title: 'Segmentos/registros personalizados',
+ addText: 'Añadir segmento/registro personalizado',
+ recordTitle: 'Segmento personalizado',
+ helpLink: CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS,
+ helpLinkText: 'Ver instrucciones detalladas',
+ helpText: ' sobre la configuración de segmentos/registros personalizado.',
+ emptyTitle: 'Añadir un segmento personalizado o un registro personalizado',
+ fields: {
+ segmentName: 'Name',
+ internalID: 'Identificación interna',
+ scriptID: 'ID de guión',
+ mapping: 'Mostrado como',
+ customRecordScriptID: 'ID de columna de transacción',
+ },
+ removeTitle: 'Eliminar segmento/registro personalizado',
+ removePrompt: '¿Está seguro de que desea eliminar este segmento/registro personalizado?',
+ addForm: {
+ customSegmentName: 'nombre de segmento personalizado',
+ customRecordName: 'nombre de registro personalizado',
+ segmentTitle: 'Segmento personalizado',
+ customSegmentAddTitle: 'Añadir segmento personalizado',
+ customRecordAddTitle: 'Añadir registro personalizado',
+ recordTitle: 'Registro personalizado',
+ segmentRecordType: '¿Desea añadir un segmento personalizado o un registro personalizado?',
+ customSegmentNameTitle: '¿Cuál es el nombre del segmento personalizado?',
+ customRecordNameTitle: '¿Cuál es el nombre del registro personalizado?',
+ customSegmentNameFooter: `Puede encontrar los nombres de los segmentos personalizados en NetSuite en la página *Personalizaciones > Vínculos, registros y campos > Segmentos personalizados*.\nn_Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+ customRecordNameFooter: `Puede encontrar nombres de registros personalizados en NetSuite introduciendo el "Campo de columna de transacción" en la búsqueda global.\nn_Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+ customSegmentInternalIDTitle: '¿Cuál es la identificación interna?',
+ customSegmentInternalIDFooter: `En primer lugar, asegúrese de que ha habilitado los ID internos en NetSuite en *Inicio > Establecer preferencias > Mostrar ID interno*. *Personalización > Listas, registros y campos > Segmentos personalizados*.\n2. Haga clic en un segmento personalizado. Haga clic en un segmento personalizado. Haga clic en el hipervínculo situado junto a *Tipo de registro personalizado*.\n4. Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+ customRecordInternalIDFooter: `Puede encontrar IDs internos de registros personalizados en NetSuite siguiendo estos pasos:\n\n1. Introduzca "Campos de línea de transacción" en la búsqueda global. Haga clic en un registro personalizado. Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+ customSegmentScriptIDTitle: '¿Cuál es el ID del guión?',
+ customSegmentScriptIDFooter: `Puede encontrar IDs de script de segmentos personalizados en NetSuite en: \n\n1. *Personalización > Listas, Registros y Campos > Segmentos Personalizados*.\n2. Haga clic en un segmento personalizado. a. Si desea mostrar el segmento personalizado como una *etiqueta* (a nivel de partida) en Expensify, haga clic en la subpestaña *Columnas de transacción* y utilice el *ID de campo*. b. Si desea mostrar el segmento personalizado como una *etiqueta* (a nivel de partida) en Expensify, haga clic en la subpestaña *Columnas de transacción* y utilice el *ID de campo*. Si desea mostrar el segmento personalizado como un *campo de informe* (a nivel de informe) en Expensify, haga clic en la subpestaña *Transacciones* y utilice el *ID de campo*. Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+ customRecordScriptIDTitle: '¿Cuál es el ID de columna de la transacción?',
+ customRecordScriptIDFooter: `Puede encontrar IDs de script de registro personalizados en NetSuite en:\n\n1. Introduzca "Campos de línea de transacción" en la búsqueda global.\n2. Haga clic en un registro personalizado.\n3. Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+ customSegmentMappingTitle: '¿Cómo debería mostrarse este segmento personalizado en Expensify?',
+ customRecordMappingTitle: '¿Cómo debería mostrarse este registro de segmento personalizado en Expensify?',
+ },
+ errors: {
+ uniqueFieldError: (fieldName: string) => `Ya existe un segmento/registro personalizado con este ${fieldName?.toLowerCase()}.`,
+ },
+ },
+ customLists: {
+ title: 'Listas personalizados',
+ addText: 'Añadir lista personalizado',
+ recordTitle: 'Lista personalizado',
+ helpLink: CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS,
+ helpLinkText: 'Ver instrucciones detalladas',
+ helpText: ' sobre cómo configurar listas personalizado.',
+ emptyTitle: 'Añadir una lista personalizado',
+ fields: {
+ listName: 'Nombre',
+ internalID: 'Identificación interna',
+ transactionFieldID: 'ID del campo de transacción',
+ mapping: 'Mostrado como',
+ },
+ removeTitle: 'Eliminar lista personalizado',
+ removePrompt: '¿Está seguro de que desea eliminar esta lista personalizado?',
+ addForm: {
+ listNameTitle: 'Elija una lista personalizada',
+ transactionFieldIDTitle: '¿Cuál es el ID del campo de transacción?',
+ transactionFieldIDFooter: `Puede encontrar los ID de campo de transacción en NetSuite siguiendo estos pasos:\n\n1. Introduzca "Campos de línea de transacción" en búsqueda global. Introduzca "Campos de línea de transacción" en la búsqueda global.\n2. Haga clic en una lista personalizada.\n3. Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+ mappingTitle: '¿Cómo debería mostrarse esta lista personalizada en Expensify?',
+ },
+ errors: {
+ uniqueTransactionFieldIDError: `Ya existe una lista personalizada con este ID de campo de transacción.`,
+ },
+ },
},
importTypes: {
[CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT]: {
@@ -2474,6 +2628,42 @@ export default {
reuseExistingConnection: 'Reutilizar la conexión existente',
existingConnections: 'Conexiones existentes',
sageIntacctLastSync: (formattedDate: string) => `Sage Intacct - Última sincronización ${formattedDate}`,
+ employeeDefault: 'Sage Intacct empleado por defecto',
+ employeeDefaultDescription: 'El departamento por defecto del empleado se aplicará a sus gastos en Sage Intacct si existe.',
+ displayedAsTagDescription: 'Se podrá seleccionar el departamento para cada gasto individual en el informe de un empleado.',
+ displayedAsReportFieldDescription: 'La selección de departamento se aplicará a todos los gastos que figuren en el informe de un empleado.',
+ toggleImportTitleFirstPart: 'Elija cómo gestionar Sage Intacct ',
+ toggleImportTitleSecondPart: ' en Expensify.',
+ expenseTypes: 'Tipos de gastos',
+ expenseTypesDescription: 'Los tipos de gastos de Sage Intacct se importan a Expensify como categorías.',
+ importTaxDescription: 'Importar el tipo impositivo de compra desde Sage Intacct.',
+ userDefinedDimensions: 'Dimensiones definidas por el usuario',
+ addUserDefinedDimension: 'Añadir dimensión definida por el usuario',
+ integrationName: 'Nombre de la integración',
+ dimensionExists: 'Ya existe una dimensión con ese nombre.',
+ removeDimension: 'Eliminar dimensión definida por el usuario',
+ removeDimensionPrompt: 'Está seguro de que desea eliminar esta dimensión definida por el usuario?',
+ userDefinedDimension: 'Dimensión definida por el usuario',
+ addAUserDefinedDimension: 'Añadir una dimensión definida por el usuario',
+ detailedInstructionsLink: 'Ver instrucciones detalladas',
+ detailedInstructionsRestOfSentence: ' para añadir dimensiones definidas por el usuario.',
+ userDimensionsAdded: (dimensionsCount: number) => `${dimensionsCount} ${Str.pluralize('UDD', `UDDs`, dimensionsCount)} añadido`,
+ mappingTitle: (mappingName: SageIntacctMappingName): string => {
+ switch (mappingName) {
+ case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.DEPARTMENTS:
+ return 'departamentos';
+ case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CLASSES:
+ return 'clases';
+ case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.LOCATIONS:
+ return 'lugares';
+ case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CUSTOMERS:
+ return 'clientes';
+ case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.PROJECTS:
+ return 'proyectos (empleos)';
+ default:
+ return 'asignaciones';
+ }
+ },
},
type: {
free: 'Gratis',
@@ -2590,8 +2780,10 @@ export default {
},
reportFields: {
addField: 'Añadir campo',
- delete: 'Eliminar campos',
- deleteConfirmation: '¿Estás seguro de que quieres eliminar esta campos?',
+ delete: 'Eliminar campo',
+ deleteFields: 'Eliminar campos',
+ deleteConfirmation: '¿Está seguro de que desea eliminar este campo del informe?',
+ deleteFieldsConfirmation: '¿Está seguro de que desea eliminar estos campos del informe?',
emptyReportFields: {
title: 'No has creado ningún campo de informe',
subtitle: 'Añade un campo personalizado (texto, fecha o desplegable) que aparezca en los informes.',
@@ -2655,7 +2847,7 @@ export default {
deleteFailureMessage: 'Se ha producido un error al intentar eliminar la etiqueta. Por favor, inténtalo más tarde.',
tagRequiredError: 'Lo nombre de la etiqueta es obligatorio.',
existingTagError: 'Ya existe una etiqueta con este nombre.',
- genericFailureMessage: 'Se produjo un error al actualizar la etiqueta. Por favor, inténtelo nuevamente.',
+ genericFailureMessage: 'Se ha producido un error al actualizar la etiqueta. Por favor, inténtelo nuevamente.',
importedFromAccountingSoftware: 'Etiquetas importadas desde',
},
taxes: {
@@ -2740,6 +2932,21 @@ export default {
xero: 'Xero',
netsuite: 'NetSuite',
intacct: 'Sage Intacct',
+ connectionName: (integration: ConnectionName) => {
+ switch (integration) {
+ case CONST.POLICY.CONNECTIONS.NAME.QBO:
+ return 'Quickbooks Online';
+ case CONST.POLICY.CONNECTIONS.NAME.XERO:
+ return 'Xero';
+ case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+ return 'NetSuite';
+ case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
+ return 'Sage Intacct';
+ default: {
+ return '';
+ }
+ }
+ },
setup: 'Configurar',
lastSync: (relativeDate: string) => `Recién sincronizado ${relativeDate}`,
import: 'Importar',
@@ -2834,6 +3041,8 @@ export default {
return 'Actualizando empleados';
case 'quickbooksOnlineSyncApplyClassesLocations':
return 'Actualizando clases';
+ case 'jobDone':
+ return 'Esperando a que se carguen los datos importados';
case 'xeroSyncImportChartOfAccounts':
return 'Sincronizando plan de cuentas';
case 'xeroSyncImportCategories':
@@ -2889,6 +3098,7 @@ export default {
case 'intacctImportTitle':
return 'Importando datos desde Sage Intacct';
default: {
+ // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
return `Translation missing for stage: ${stage}`;
}
}
@@ -2902,6 +3112,13 @@ export default {
defaultVendor: 'Proveedor predeterminado',
autoSync: 'Autosincronización',
reimbursedReports: 'Sincronizar informes reembolsados',
+ reconciliationAccount: 'Cuenta de conciliación',
+ chooseReconciliationAccount: {
+ chooseBankAccount: 'Elige la cuenta bancaria con la que se conciliarán los pagos de tu Tarjeta Expensify.',
+ accountMatches: 'Asegúrate de que esta cuenta coincide con ',
+ settlementAccount: 'la cuenta de liquidación de tu Tarjeta Expensify ',
+ reconciliationWorks: (lastFourPAN: string) => `(que termina en ${lastFourPAN}) para que la conciliación continua funcione correctamente.`,
+ },
},
card: {
header: 'Desbloquea Tarjetas Expensify gratis',
@@ -3005,7 +3222,7 @@ export default {
member: 'Invitar miembros',
members: 'Invitar miembros',
invitePeople: 'Invitar nuevos miembros',
- genericFailureMessage: 'Se produjo un error al invitar al miembro al espacio de trabajo. Vuelva a intentarlo..',
+ genericFailureMessage: 'Se ha producido un error al invitar al miembro al espacio de trabajo. Vuelva a intentarlo..',
pleaseEnterValidLogin: `Asegúrese de que el correo electrónico o el número de teléfono sean válidos (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
user: 'miembro',
users: 'miembros',
@@ -3020,7 +3237,7 @@ export default {
inviteMessagePrompt: 'Añadir un mensaje para hacer tu invitación destacar',
personalMessagePrompt: 'Mensaje',
inviteNoMembersError: 'Por favor, selecciona al menos un miembro a invitar.',
- genericFailureMessage: 'Se produjo un error al invitar al miembro al espacio de trabajo. Por favor, vuelva a intentarlo..',
+ genericFailureMessage: 'Se ha producido un error al invitar al miembro al espacio de trabajo. Por favor, vuelva a intentarlo..',
},
distanceRates: {
oopsNotSoFast: 'Ups! No tan rápido...',
@@ -3053,7 +3270,7 @@ export default {
currencyInputHelpText: 'Todas los gastos en este espacio de trabajo serán convertidos a esta moneda.',
currencyInputDisabledText: 'La moneda predeterminada no se puede cambiar porque este espacio de trabajo está vinculado a una cuenta bancaria en USD.',
save: 'Guardar',
- genericFailureMessage: 'Se produjo un error al guardar el espacio de trabajo. Por favor, inténtalo de nuevo.',
+ genericFailureMessage: 'Se ha producido un error al guardar el espacio de trabajo. Por favor, inténtalo de nuevo.',
avatarUploadFailureMessage: 'No se pudo subir el avatar. Por favor, inténtalo de nuevo.',
addressContext: 'Se requiere una dirección para habilitar Expensify Travel. Por favor, introduce una dirección asociada con tu negocio.',
},
@@ -3126,6 +3343,30 @@ export default {
errorDescriptionPartTwo: 'contacta con el conserje',
errorDescriptionPartThree: 'por ayuda.',
},
+ upgrade: {
+ reportFields: {
+ title: 'Los campos',
+ description: `Los campos de informe permiten especificar detalles a nivel de cabecera, distintos de las etiquetas que pertenecen a los gastos en partidas individuales. Estos detalles pueden incluir nombres de proyectos específicos, información sobre viajes de negocios, ubicaciones, etc.`,
+ pricing: {
+ onlyAvailableOnPlan: 'Los campos de informe sólo están disponibles en el plan Control, a partir de ',
+ amount: '$9 ',
+ perActiveMember: 'por miembro activo al mes.',
+ },
+ },
+ note: {
+ upgradeWorkspace: 'Mejore su espacio de trabajo para acceder a esta función, o',
+ learnMore: 'más información',
+ aboutOurPlans: 'sobre nuestros planes y precios.',
+ },
+ upgradeToUnlock: 'Desbloquear esta función',
+ completed: {
+ headline: 'Has mejorado tu espacio de trabajo.',
+ successMessage: (policyName: string) => `Ha mejorado correctamente su espacio de trabajo ${policyName} al plan Control.`,
+ viewSubscription: 'Ver su suscripción',
+ moreDetails: 'para obtener más información.',
+ gotIt: 'Entendido, gracias.',
+ },
+ },
restrictedAction: {
restricted: 'Restringido',
actionsAreCurrentlyRestricted: ({workspaceName}) => `Las acciones en el espacio de trabajo ${workspaceName} están actualmente restringidas`,
@@ -3226,7 +3467,7 @@ export default {
},
markAsComplete: 'Marcar como completada',
markAsIncomplete: 'Marcar como incompleta',
- assigneeError: 'Hubo un error al asignar esta tarea. Por favor, inténtalo con otro miembro.',
+ assigneeError: 'Se ha producido un error al asignar esta tarea. Por favor, inténtalo con otro miembro.',
genericCreateTaskFailureMessage: 'Error inesperado al crear el tarea. Por favor, inténtalo más tarde.',
deleteTask: 'Eliminar tarea',
deleteConfirmation: '¿Estás seguro de que quieres eliminar esta tarea?',
@@ -3252,6 +3493,7 @@ export default {
screenShareRequest: 'Expensify te está invitando a compartir la pantalla',
},
search: {
+ selectMultiple: 'Seleccionar múltiples',
resultsAreLimited: 'Los resultados de búsqueda están limitados.',
searchResults: {
emptyResults: {
@@ -4128,6 +4370,14 @@ export default {
taxOutOfPolicy: ({taxName}: ViolationsTaxOutOfPolicyParams) => `${taxName ?? 'El impuesto'} ya no es válido`,
taxRateChanged: 'La tasa de impuesto fue modificada',
taxRequired: 'Falta la tasa de impuesto',
+ none: 'Ninguno',
+ taxCodeToKeep: 'Elige qué tasa de impuesto quieres conservar',
+ tagToKeep: 'Elige qué etiqueta quieres conservar',
+ isTransactionReimbursable: 'Elige si la transacción es reembolsable',
+ merchantToKeep: 'Elige qué comerciante quieres conservar',
+ descriptionToKeep: 'Elige qué descripción quieres conservar',
+ categoryToKeep: 'Elige qué categoría quieres conservar',
+ isTransactionBillable: 'Elige si la transacción es facturable',
keepThisOne: 'Mantener éste',
hold: 'Bloqueado',
},
@@ -4173,7 +4423,7 @@ export default {
'Parece que estás desconectado. Desafortunadamente, Expensify Classic no funciona sin conexión, pero New Expensify sí. Si prefieres utilizar Expensify Classic, inténtalo de nuevo cuando tengas conexión a internet.',
},
listBoundary: {
- errorMessage: 'Se produjo un error al cargar más mensajes.',
+ errorMessage: 'Se ha producido un error al cargar más mensajes.',
tryAgain: 'Inténtalo de nuevo',
},
systemMessage: {
@@ -4324,7 +4574,7 @@ export default {
},
paymentCard: {
addPaymentCard: 'Añade tarjeta de pago',
- enterPaymentCardDetails: 'Introduce los datos de tu tarjeta de pago.',
+ enterPaymentCardDetails: 'Introduce los datos de tu tarjeta de pago',
security: 'Expensify es PCI-DSS obediente, utiliza cifrado a nivel bancario, y emplea infraestructura redundante para proteger tus datos.',
learnMoreAboutSecurity: 'Conozca más sobre nuestra seguridad.',
},
diff --git a/src/libs/API/parameters/CreateWorkspaceReportFieldListValueParams.ts b/src/libs/API/parameters/CreateWorkspaceReportFieldListValueParams.ts
new file mode 100644
index 000000000000..950287bc5d04
--- /dev/null
+++ b/src/libs/API/parameters/CreateWorkspaceReportFieldListValueParams.ts
@@ -0,0 +1,10 @@
+type CreateWorkspaceReportFieldListValueParams = {
+ policyID: string;
+ /**
+ * Stringified JSON object with type of following structure:
+ * Array
+ */
+ reportFields: string;
+};
+
+export default CreateWorkspaceReportFieldListValueParams;
diff --git a/src/libs/API/parameters/CreateWorkspaceReportFieldParams.ts b/src/libs/API/parameters/CreateWorkspaceReportFieldParams.ts
index 13844a279905..33692d210959 100644
--- a/src/libs/API/parameters/CreateWorkspaceReportFieldParams.ts
+++ b/src/libs/API/parameters/CreateWorkspaceReportFieldParams.ts
@@ -1,5 +1,9 @@
type CreateWorkspaceReportFieldParams = {
policyID: string;
+ /**
+ * Stringified JSON object with type of following structure:
+ * Array
+ */
reportFields: string;
};
diff --git a/src/libs/API/parameters/DeletePolicyReportField.ts b/src/libs/API/parameters/DeletePolicyReportField.ts
new file mode 100644
index 000000000000..d79e9b07249e
--- /dev/null
+++ b/src/libs/API/parameters/DeletePolicyReportField.ts
@@ -0,0 +1,10 @@
+type DeletePolicyReportField = {
+ policyID: string;
+ /**
+ * Stringified JSON object with type of following structure:
+ * Array
+ */
+ reportFields: string;
+};
+
+export default DeletePolicyReportField;
diff --git a/src/libs/API/parameters/EnableWorkspaceReportFieldListValueParams.ts b/src/libs/API/parameters/EnableWorkspaceReportFieldListValueParams.ts
new file mode 100644
index 000000000000..7c54a2f4c68b
--- /dev/null
+++ b/src/libs/API/parameters/EnableWorkspaceReportFieldListValueParams.ts
@@ -0,0 +1,10 @@
+type EnableWorkspaceReportFieldListValueParams = {
+ policyID: string;
+ /**
+ * Stringified JSON object with type of following structure:
+ * Array
+ */
+ reportFields: string;
+};
+
+export default EnableWorkspaceReportFieldListValueParams;
diff --git a/src/libs/API/parameters/OpenPolicyInitialPageParams.ts b/src/libs/API/parameters/OpenPolicyInitialPageParams.ts
new file mode 100644
index 000000000000..764abe9a6a77
--- /dev/null
+++ b/src/libs/API/parameters/OpenPolicyInitialPageParams.ts
@@ -0,0 +1,5 @@
+type OpenPolicyInitialPageParams = {
+ policyID: string;
+};
+
+export default OpenPolicyInitialPageParams;
diff --git a/src/libs/API/parameters/OpenPolicyProfilePageParams.ts b/src/libs/API/parameters/OpenPolicyProfilePageParams.ts
new file mode 100644
index 000000000000..55dce33a3dac
--- /dev/null
+++ b/src/libs/API/parameters/OpenPolicyProfilePageParams.ts
@@ -0,0 +1,5 @@
+type OpenPolicyProfilePageParams = {
+ policyID: string;
+};
+
+export default OpenPolicyProfilePageParams;
diff --git a/src/libs/API/parameters/RemoveWorkspaceReportFieldListValueParams.ts b/src/libs/API/parameters/RemoveWorkspaceReportFieldListValueParams.ts
new file mode 100644
index 000000000000..94d90a8dbaae
--- /dev/null
+++ b/src/libs/API/parameters/RemoveWorkspaceReportFieldListValueParams.ts
@@ -0,0 +1,10 @@
+type RemoveWorkspaceReportFieldListValueParams = {
+ policyID: string;
+ /**
+ * Stringified JSON object with type of following structure:
+ * Array
+ */
+ reportFields: string;
+};
+
+export default RemoveWorkspaceReportFieldListValueParams;
diff --git a/src/libs/API/parameters/Search.ts b/src/libs/API/parameters/Search.ts
index 0a8345b0b7e0..60ea54419492 100644
--- a/src/libs/API/parameters/Search.ts
+++ b/src/libs/API/parameters/Search.ts
@@ -1,4 +1,4 @@
-import type {SortOrder} from '@libs/SearchUtils';
+import type {SortOrder} from '@components/Search/types';
type SearchParams = {
hash: number;
diff --git a/src/libs/API/parameters/UnapproveExpenseReportParams.ts b/src/libs/API/parameters/UnapproveExpenseReportParams.ts
new file mode 100644
index 000000000000..ba25424aeda6
--- /dev/null
+++ b/src/libs/API/parameters/UnapproveExpenseReportParams.ts
@@ -0,0 +1,6 @@
+type UnapproveExpenseReportParams = {
+ reportID: string;
+ reportActionID: string;
+};
+
+export default UnapproveExpenseReportParams;
diff --git a/src/libs/API/parameters/UpdateFrequentlyUsedEmojisParams.ts b/src/libs/API/parameters/UpdateFrequentlyUsedEmojisParams.ts
deleted file mode 100644
index f790ada3aad9..000000000000
--- a/src/libs/API/parameters/UpdateFrequentlyUsedEmojisParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-type UpdateFrequentlyUsedEmojisParams = {value: string};
-
-export default UpdateFrequentlyUsedEmojisParams;
diff --git a/src/libs/API/parameters/UpdateNetSuiteCustomFormIDParams.ts b/src/libs/API/parameters/UpdateNetSuiteCustomFormIDParams.ts
new file mode 100644
index 000000000000..01e5db8c1089
--- /dev/null
+++ b/src/libs/API/parameters/UpdateNetSuiteCustomFormIDParams.ts
@@ -0,0 +1,10 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type UpdateNetSuiteCustomFormIDParams = {
+ policyID: string;
+ formID: string;
+ formType: ValueOf;
+};
+
+export default UpdateNetSuiteCustomFormIDParams;
diff --git a/src/libs/API/parameters/UpdateSageIntacctGenericParams.ts b/src/libs/API/parameters/UpdateSageIntacctGenericParams.ts
new file mode 100644
index 000000000000..5ac0ccc21218
--- /dev/null
+++ b/src/libs/API/parameters/UpdateSageIntacctGenericParams.ts
@@ -0,0 +1,7 @@
+type UpdateSageIntacctGenericParams = {
+ [K2 in K]: Type;
+} & {
+ policyID: string;
+};
+
+export default UpdateSageIntacctGenericParams;
diff --git a/src/libs/API/parameters/UpdateSageIntacctGenericTypeParams.ts b/src/libs/API/parameters/UpdateSageIntacctGenericTypeParams.ts
new file mode 100644
index 000000000000..509a06cadb2c
--- /dev/null
+++ b/src/libs/API/parameters/UpdateSageIntacctGenericTypeParams.ts
@@ -0,0 +1,7 @@
+type UpdateSageIntacctGenericTypeParams = {
+ [K2 in K]: Type;
+} & {
+ policyID: string;
+};
+
+export default UpdateSageIntacctGenericTypeParams;
diff --git a/src/libs/API/parameters/UpdateWorkspaceReportFieldInitialValueParams.ts b/src/libs/API/parameters/UpdateWorkspaceReportFieldInitialValueParams.ts
new file mode 100644
index 000000000000..a72781ff1c37
--- /dev/null
+++ b/src/libs/API/parameters/UpdateWorkspaceReportFieldInitialValueParams.ts
@@ -0,0 +1,10 @@
+type UpdateWorkspaceReportFieldInitialValueParams = {
+ policyID: string;
+ /**
+ * Stringified JSON object with type of following structure:
+ * Array
+ */
+ reportFields: string;
+};
+
+export default UpdateWorkspaceReportFieldInitialValueParams;
diff --git a/src/libs/API/parameters/UpgradeToCorporateParams.ts b/src/libs/API/parameters/UpgradeToCorporateParams.ts
new file mode 100644
index 000000000000..ee9d1359c4dd
--- /dev/null
+++ b/src/libs/API/parameters/UpgradeToCorporateParams.ts
@@ -0,0 +1,6 @@
+type UpgradeToCorporateParams = {
+ policyID: string;
+ featureName: string;
+};
+
+export default UpgradeToCorporateParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 848af7e34634..ff62d9b69ea6 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -12,6 +12,8 @@ export type {default as BeginSignInParams} from './BeginSignInParams';
export type {default as CloseAccountParams} from './CloseAccountParams';
export type {default as ConnectBankAccountParams} from './ConnectBankAccountParams';
export type {default as ConnectPolicyToAccountingIntegrationParams} from './ConnectPolicyToAccountingIntegrationParams';
+export type {default as OpenPolicyProfilePageParams} from './OpenPolicyProfilePageParams';
+export type {default as OpenPolicyInitialPageParams} from './OpenPolicyInitialPageParams';
export type {default as SyncPolicyToQuickbooksOnlineParams} from './SyncPolicyToQuickbooksOnlineParams';
export type {default as SyncPolicyToXeroParams} from './SyncPolicyToXeroParams';
export type {default as SyncPolicyToNetSuiteParams} from './SyncPolicyToNetSuiteParams';
@@ -62,7 +64,6 @@ export type {default as UpdateAutomaticTimezoneParams} from './UpdateAutomaticTi
export type {default as UpdateChatPriorityModeParams} from './UpdateChatPriorityModeParams';
export type {default as UpdateDateOfBirthParams} from './UpdateDateOfBirthParams';
export type {default as UpdateDisplayNameParams} from './UpdateDisplayNameParams';
-export type {default as UpdateFrequentlyUsedEmojisParams} from './UpdateFrequentlyUsedEmojisParams';
export type {default as UpdateGroupChatNameParams} from './UpdateGroupChatNameParams';
export type {default as UpdateGroupChatMemberRolesParams} from './UpdateGroupChatMemberRolesParams';
export type {default as UpdateHomeAddressParams} from './UpdateHomeAddressParams';
@@ -151,6 +152,7 @@ export type {default as CreateDistanceRequestParams} from './CreateDistanceReque
export type {default as StartSplitBillParams} from './StartSplitBillParams';
export type {default as SendMoneyParams} from './SendMoneyParams';
export type {default as ApproveMoneyRequestParams} from './ApproveMoneyRequestParams';
+export type {default as UnapproveExpenseReportParams} from './UnapproveExpenseReportParams';
export type {default as EditMoneyRequestParams} from './EditMoneyRequestParams';
export type {default as ReplaceReceiptParams} from './ReplaceReceiptParams';
export type {default as SubmitReportParams} from './SubmitReportParams';
@@ -234,12 +236,20 @@ export type {default as UpdateSubscriptionAutoRenewParams} from './UpdateSubscri
export type {default as UpdateSubscriptionAddNewUsersAutomaticallyParams} from './UpdateSubscriptionAddNewUsersAutomaticallyParams';
export type {default as GenerateSpotnanaTokenParams} from './GenerateSpotnanaTokenParams';
export type {default as UpdateSubscriptionSizeParams} from './UpdateSubscriptionSizeParams';
+export type {default as UpgradeToCorporateParams} from './UpgradeToCorporateParams';
export type {default as DeleteMoneyRequestOnSearchParams} from './DeleteMoneyRequestOnSearchParams';
export type {default as HoldMoneyRequestOnSearchParams} from './HoldMoneyRequestOnSearchParams';
export type {default as UnholdMoneyRequestOnSearchParams} from './UnholdMoneyRequestOnSearchParams';
export type {default as UpdateNetSuiteSubsidiaryParams} from './UpdateNetSuiteSubsidiaryParams';
+export type {default as DeletePolicyReportField} from './DeletePolicyReportField';
export type {default as ConnectPolicyToNetSuiteParams} from './ConnectPolicyToNetSuiteParams';
export type {default as CreateWorkspaceReportFieldParams} from './CreateWorkspaceReportFieldParams';
+export type {default as UpdateWorkspaceReportFieldInitialValueParams} from './UpdateWorkspaceReportFieldInitialValueParams';
+export type {default as EnableWorkspaceReportFieldListValueParams} from './EnableWorkspaceReportFieldListValueParams';
+export type {default as CreateWorkspaceReportFieldListValueParams} from './CreateWorkspaceReportFieldListValueParams';
+export type {default as RemoveWorkspaceReportFieldListValueParams} from './RemoveWorkspaceReportFieldListValueParams';
export type {default as OpenPolicyExpensifyCardsPageParams} from './OpenPolicyExpensifyCardsPageParams';
export type {default as RequestExpensifyCardLimitIncreaseParams} from './RequestExpensifyCardLimitIncreaseParams';
export type {default as UpdateNetSuiteGenericTypeParams} from './UpdateNetSuiteGenericTypeParams';
+export type {default as UpdateNetSuiteCustomFormIDParams} from './UpdateNetSuiteCustomFormIDParams';
+export type {default as UpdateSageIntacctGenericTypeParams} from './UpdateSageIntacctGenericTypeParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 1bf1efc8af24..948ed7f76373 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -1,5 +1,6 @@
import type {ValueOf} from 'type-fest';
import type CONST from '@src/CONST';
+import type {SageIntacctDimension, SageIntacctMappingValue} from '@src/types/onyx/Policy';
import type {EmptyObject} from '@src/types/utils/EmptyObject';
import type * as Parameters from './parameters';
import type SignInUserParams from './parameters/SignInUserParams';
@@ -56,7 +57,6 @@ const WRITE_COMMANDS = {
VALIDATE_LOGIN: 'ValidateLogin',
VALIDATE_SECONDARY_LOGIN: 'ValidateSecondaryLogin',
UPDATE_PREFERRED_EMOJI_SKIN_TONE: 'UpdatePreferredEmojiSkinTone',
- UPDATE_FREQUENTLY_USED_EMOJIS: 'UpdateFrequentlyUsedEmojis',
UPDATE_CHAT_PRIORITY_MODE: 'UpdateChatPriorityMode',
SET_CONTACT_METHOD_AS_DEFAULT: 'SetContactMethodAsDefault',
UPDATE_THEME: 'UpdateTheme',
@@ -131,6 +131,7 @@ const WRITE_COMMANDS = {
RENAME_POLICY_TAG: 'RenamePolicyTag',
SET_WORKSPACE_REQUIRES_CATEGORY: 'SetWorkspaceRequiresCategory',
DELETE_WORKSPACE_CATEGORIES: 'DeleteWorkspaceCategories',
+ DELETE_POLICY_REPORT_FIELD: 'DeletePolicyReportField',
SET_POLICY_TAGS_REQUIRED: 'SetPolicyTagsRequired',
SET_POLICY_REQUIRES_TAG: 'SetPolicyRequiresTag',
RENAME_POLICY_TAG_LIST: 'RenamePolicyTaglist',
@@ -171,6 +172,7 @@ const WRITE_COMMANDS = {
SEND_MONEY_ELSEWHERE: 'SendMoneyElsewhere',
SEND_MONEY_WITH_WALLET: 'SendMoneyWithWallet',
APPROVE_MONEY_REQUEST: 'ApproveMoneyRequest',
+ UNAPPROVE_EXPENSE_REPORT: 'UnapproveExpenseReport',
EDIT_MONEY_REQUEST: 'EditMoneyRequest',
REPLACE_RECEIPT: 'ReplaceReceipt',
SUBMIT_REPORT: 'SubmitReport',
@@ -229,12 +231,17 @@ const WRITE_COMMANDS = {
UPDATE_SUBSCRIPTION_AUTO_RENEW: 'UpdateSubscriptionAutoRenew',
UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY: 'UpdateSubscriptionAddNewUsersAutomatically',
UPDATE_SUBSCRIPTION_SIZE: 'UpdateSubscriptionSize',
+ UPGRADE_TO_CORPORATE: 'UpgradeToCorporate',
DELETE_MONEY_REQUEST_ON_SEARCH: 'DeleteMoneyRequestOnSearch',
HOLD_MONEY_REQUEST_ON_SEARCH: 'HoldMoneyRequestOnSearch',
UNHOLD_MONEY_REQUEST_ON_SEARCH: 'UnholdMoneyRequestOnSearch',
REQUEST_REFUND: 'User_RefundPurchase',
UPDATE_NETSUITE_SUBSIDIARY: 'UpdateNetSuiteSubsidiary',
CREATE_WORKSPACE_REPORT_FIELD: 'CreatePolicyReportField',
+ UPDATE_WORKSPACE_REPORT_FIELD_INITIAL_VALUE: 'SetPolicyReportFieldDefault',
+ ENABLE_WORKSPACE_REPORT_FIELD_LIST_VALUE: 'EnablePolicyReportFieldOption',
+ CREATE_WORKSPACE_REPORT_FIELD_LIST_VALUE: 'CreatePolicyReportFieldOption',
+ REMOVE_WORKSPACE_REPORT_FIELD_LIST_VALUE: 'RemovePolicyReportFieldOption',
UPDATE_NETSUITE_SYNC_TAX_CONFIGURATION: 'UpdateNetSuiteSyncTaxConfiguration',
UPDATE_NETSUITE_CROSS_SUBSIDIARY_CUSTOMER_CONFIGURATION: 'UpdateNetSuiteCrossSubsidiaryCustomerConfiguration',
UPDATE_NETSUITE_DEPARTMENTS_MAPPING: 'UpdateNetSuiteDepartmentsMapping',
@@ -257,16 +264,47 @@ const WRITE_COMMANDS = {
UPDATE_NETSUITE_TAX_POSTING_ACCOUNT: 'UpdateNetSuiteTaxPostingAccount',
UPDATE_NETSUITE_ALLOW_FOREIGN_CURRENCY: 'UpdateNetSuiteAllowForeignCurrency',
UPDATE_NETSUITE_EXPORT_TO_NEXT_OPEN_PERIOD: 'UpdateNetSuiteExportToNextOpenPeriod',
+ UPDATE_NETSUITE_CUSTOM_SEGMENTS: 'UpdateNetSuiteCustomSegments',
+ UPDATE_NETSUITE_CUSTOM_LISTS: 'UpdateNetSuiteCustomLists',
UPDATE_NETSUITE_AUTO_SYNC: 'UpdateNetSuiteAutoSync',
UPDATE_NETSUITE_SYNC_REIMBURSED_REPORTS: 'UpdateNetSuiteSyncReimbursedReports',
UPDATE_NETSUITE_SYNC_PEOPLE: 'UpdateNetSuiteSyncPeople',
UPDATE_NETSUITE_AUTO_CREATE_ENTITIES: 'UpdateNetSuiteAutoCreateEntities',
UPDATE_NETSUITE_ENABLE_NEW_CATEGORIES: 'UpdateNetSuiteEnableNewCategories',
UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_ENABLED: 'UpdateNetSuiteCustomFormIDOptionsEnabled',
+ UPDATE_NETSUITE_REIMBURSEMENT_ACCOUNT_ID: 'UpdateNetSuiteReimbursementAccountID',
+ UPDATE_NETSUITE_COLLECTION_ACCOUNT: 'UpdateNetSuiteCollectionAccount',
+ UPDATE_NETSUITE_EXPORT_REPORTS_TO: 'UpdateNetSuiteExportReportsTo',
+ UPDATE_NETSUITE_VENDOR_BILLS_TO: 'UpdateNetSuiteExportVendorBillsTo',
+ UPDATE_NETSUITE_JOURNALS_TO: 'UpdateNetSuiteExportJournalsTo',
+ UPDATE_NETSUITE_APPROVAL_ACCOUNT: 'UpdateNetSuiteApprovalAccount',
+ UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_REIMBURSABLE: 'UpdateNetSuiteCustomFormIDOptionsReimbursable',
+ UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_NON_REIMBURSABLE: 'UpdateNetSuiteCustomFormIDOptionsNonReimbursable',
REQUEST_EXPENSIFY_CARD_LIMIT_INCREASE: 'RequestExpensifyCardLimitIncrease',
CONNECT_POLICY_TO_SAGE_INTACCT: 'ConnectPolicyToSageIntacct',
+ UPDATE_SAGE_INTACCT_AUTO_SYNC: 'UpdateSageIntacctAutoSync',
+ UPDATE_SAGE_INTACCT_IMPORT_EMPLOYEES: 'UpdateSageIntacctImportEmployees',
+ UPDATE_SAGE_INTACCT_APPROVAL_MODE: 'UpdateSageIntacctApprovalMode',
+ UPDATE_SAGE_INTACCT_SYNC_REIMBURSED_REPORTS: 'UpdateSageIntacctSyncReimbursedReports',
+ UPDATE_SAGE_INTACCT_SYNC_REIMBURSEMENT_ACCOUNT_ID: 'UpdateSageIntacctSyncReimbursementAccountID',
CONNECT_POLICY_TO_NETSUITE: 'ConnectPolicyToNetSuite',
CLEAR_OUTSTANDING_BALANCE: 'ClearOutstandingBalance',
+ UPDATE_SAGE_INTACCT_BILLABLE: 'UpdateSageIntacctBillable',
+ UPDATE_SAGE_INTACCT_DEPARTMENT_MAPPING: 'UpdateSageIntacctDepartmentsMapping',
+ UPDATE_SAGE_INTACCT_CLASSES_MAPPING: 'UpdateSageIntacctClassesMapping',
+ UPDATE_SAGE_INTACCT_LOCATIONS_MAPPING: 'UpdateSageIntacctLocationsMapping',
+ UPDATE_SAGE_INTACCT_CUSTOMERS_MAPPING: 'UpdateSageIntacctCustomersMapping',
+ UPDATE_SAGE_INTACCT_PROJECTS_MAPPING: 'UpdateSageIntacctProjectsMapping',
+ UPDATE_SAGE_INTACCT_SYNC_TAX_CONFIGURATION: 'UpdateSageIntacctSyncTaxConfiguration',
+ UPDATE_SAGE_INTACCT_USER_DIMENSION: 'UpdateSageIntacctUserDimension',
+ UPDATE_SAGE_INTACCT_EXPORTER: 'UpdateSageIntacctExporter',
+ UPDATE_SAGE_INTACCT_EXPORT_DATE: 'UpdateSageIntacctExportDate',
+ UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'UpdateSageIntacctReimbursableExpensesExportDestination',
+ UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'UpdateSageIntacctNonreimbursableExpensesExportDestination',
+ UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_REPORT_EXPORT_DEFAULT_VENDOR: 'UpdateSageIntacctReimbursableExpensesReportExportDefaultVendor',
+ UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_CREDIT_CARD_CHARGE_EXPORT_DEFAULT_VENDOR: 'UpdateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendor',
+ UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_ACCOUNT: 'UpdateSageIntacctNonreimbursableExpensesExportAccount',
+ UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_VENDOR: 'UpdateSageIntacctNonreimbursableExpensesExportVendor',
} as const;
type WriteCommand = ValueOf;
@@ -312,7 +350,6 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.VALIDATE_LOGIN]: Parameters.ValidateLoginParams;
[WRITE_COMMANDS.VALIDATE_SECONDARY_LOGIN]: Parameters.ValidateSecondaryLoginParams;
[WRITE_COMMANDS.UPDATE_PREFERRED_EMOJI_SKIN_TONE]: Parameters.UpdatePreferredEmojiSkinToneParams;
- [WRITE_COMMANDS.UPDATE_FREQUENTLY_USED_EMOJIS]: Parameters.UpdateFrequentlyUsedEmojisParams;
[WRITE_COMMANDS.UPDATE_CHAT_PRIORITY_MODE]: Parameters.UpdateChatPriorityModeParams;
[WRITE_COMMANDS.SET_CONTACT_METHOD_AS_DEFAULT]: Parameters.SetContactMethodAsDefaultParams;
[WRITE_COMMANDS.UPDATE_THEME]: Parameters.UpdateThemeParams;
@@ -387,6 +424,7 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.RENAME_WORKSPACE_CATEGORY]: Parameters.RenameWorkspaceCategoriesParams;
[WRITE_COMMANDS.SET_WORKSPACE_REQUIRES_CATEGORY]: Parameters.SetWorkspaceRequiresCategoryParams;
[WRITE_COMMANDS.DELETE_WORKSPACE_CATEGORIES]: Parameters.DeleteWorkspaceCategoriesParams;
+ [WRITE_COMMANDS.DELETE_POLICY_REPORT_FIELD]: Parameters.DeletePolicyReportField;
[WRITE_COMMANDS.SET_POLICY_REQUIRES_TAG]: Parameters.SetPolicyRequiresTag;
[WRITE_COMMANDS.SET_POLICY_TAGS_REQUIRED]: Parameters.SetPolicyTagsRequired;
[WRITE_COMMANDS.RENAME_POLICY_TAG_LIST]: Parameters.RenamePolicyTaglistParams;
@@ -429,6 +467,7 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.SEND_MONEY_ELSEWHERE]: Parameters.SendMoneyParams;
[WRITE_COMMANDS.SEND_MONEY_WITH_WALLET]: Parameters.SendMoneyParams;
[WRITE_COMMANDS.APPROVE_MONEY_REQUEST]: Parameters.ApproveMoneyRequestParams;
+ [WRITE_COMMANDS.UNAPPROVE_EXPENSE_REPORT]: Parameters.UnapproveExpenseReportParams;
[WRITE_COMMANDS.EDIT_MONEY_REQUEST]: Parameters.EditMoneyRequestParams;
[WRITE_COMMANDS.REPLACE_RECEIPT]: Parameters.ReplaceReceiptParams;
[WRITE_COMMANDS.SUBMIT_REPORT]: Parameters.SubmitReportParams;
@@ -504,6 +543,21 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.REQUEST_REFUND]: null;
[WRITE_COMMANDS.CONNECT_POLICY_TO_SAGE_INTACCT]: Parameters.ConnectPolicyToSageIntacctParams;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_EXPORTER]: Parameters.UpdateSageIntacctGenericTypeParams<'email', string>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_EXPORT_DATE]: Parameters.UpdateSageIntacctGenericTypeParams<'value', string>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: Parameters.UpdateSageIntacctGenericTypeParams<'value', string>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: Parameters.UpdateSageIntacctGenericTypeParams<'value', string>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_REPORT_EXPORT_DEFAULT_VENDOR]: Parameters.UpdateSageIntacctGenericTypeParams<'vendorID', string>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_CREDIT_CARD_CHARGE_EXPORT_DEFAULT_VENDOR]: Parameters.UpdateSageIntacctGenericTypeParams<'vendorID', string>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_ACCOUNT]: Parameters.UpdateSageIntacctGenericTypeParams<'creditCardAccountID', string>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_VENDOR]: Parameters.UpdateSageIntacctGenericTypeParams<'vendorID', string>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_AUTO_SYNC]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_IMPORT_EMPLOYEES]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_APPROVAL_MODE]: Parameters.UpdateSageIntacctGenericTypeParams<'value', string>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_SYNC_REIMBURSED_REPORTS]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_SYNC_REIMBURSEMENT_ACCOUNT_ID]: Parameters.UpdateSageIntacctGenericTypeParams<'vendorID', string>;
+
+ [WRITE_COMMANDS.UPGRADE_TO_CORPORATE]: Parameters.UpgradeToCorporateParams;
// Netsuite parameters
[WRITE_COMMANDS.UPDATE_NETSUITE_SUBSIDIARY]: Parameters.UpdateNetSuiteSubsidiaryParams;
@@ -511,6 +565,10 @@ type WriteCommandParameters = {
// Workspace report field parameters
[WRITE_COMMANDS.CREATE_WORKSPACE_REPORT_FIELD]: Parameters.CreateWorkspaceReportFieldParams;
+ [WRITE_COMMANDS.UPDATE_WORKSPACE_REPORT_FIELD_INITIAL_VALUE]: Parameters.UpdateWorkspaceReportFieldInitialValueParams;
+ [WRITE_COMMANDS.ENABLE_WORKSPACE_REPORT_FIELD_LIST_VALUE]: Parameters.EnableWorkspaceReportFieldListValueParams;
+ [WRITE_COMMANDS.CREATE_WORKSPACE_REPORT_FIELD_LIST_VALUE]: Parameters.CreateWorkspaceReportFieldListValueParams;
+ [WRITE_COMMANDS.REMOVE_WORKSPACE_REPORT_FIELD_LIST_VALUE]: Parameters.RemoveWorkspaceReportFieldListValueParams;
[WRITE_COMMANDS.UPDATE_NETSUITE_SYNC_TAX_CONFIGURATION]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
[WRITE_COMMANDS.UPDATE_NETSUITE_CROSS_SUBSIDIARY_CUSTOMER_CONFIGURATION]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
@@ -534,12 +592,30 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.UPDATE_NETSUITE_TAX_POSTING_ACCOUNT]: Parameters.UpdateNetSuiteGenericTypeParams<'bankAccountID', string>;
[WRITE_COMMANDS.UPDATE_NETSUITE_ALLOW_FOREIGN_CURRENCY]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
[WRITE_COMMANDS.UPDATE_NETSUITE_EXPORT_TO_NEXT_OPEN_PERIOD]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+ [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_SEGMENTS]: Parameters.UpdateNetSuiteGenericTypeParams<'customSegments', string>; // JSON string NetSuiteCustomSegment[]
+ [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_LISTS]: Parameters.UpdateNetSuiteGenericTypeParams<'customLists', string>; // JSON string NetSuiteCustomList[]
[WRITE_COMMANDS.UPDATE_NETSUITE_AUTO_SYNC]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
[WRITE_COMMANDS.UPDATE_NETSUITE_SYNC_REIMBURSED_REPORTS]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
[WRITE_COMMANDS.UPDATE_NETSUITE_SYNC_PEOPLE]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
[WRITE_COMMANDS.UPDATE_NETSUITE_AUTO_CREATE_ENTITIES]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
[WRITE_COMMANDS.UPDATE_NETSUITE_ENABLE_NEW_CATEGORIES]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
[WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_ENABLED]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+ [WRITE_COMMANDS.UPDATE_NETSUITE_REIMBURSEMENT_ACCOUNT_ID]: Parameters.UpdateNetSuiteGenericTypeParams<'bankAccountID', string>;
+ [WRITE_COMMANDS.UPDATE_NETSUITE_COLLECTION_ACCOUNT]: Parameters.UpdateNetSuiteGenericTypeParams<'bankAccountID', string>;
+ [WRITE_COMMANDS.UPDATE_NETSUITE_EXPORT_REPORTS_TO]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf>;
+ [WRITE_COMMANDS.UPDATE_NETSUITE_VENDOR_BILLS_TO]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf>;
+ [WRITE_COMMANDS.UPDATE_NETSUITE_JOURNALS_TO]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf>;
+ [WRITE_COMMANDS.UPDATE_NETSUITE_APPROVAL_ACCOUNT]: Parameters.UpdateNetSuiteGenericTypeParams<'value', string>;
+ [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_REIMBURSABLE]: Parameters.UpdateNetSuiteCustomFormIDParams;
+ [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_NON_REIMBURSABLE]: Parameters.UpdateNetSuiteCustomFormIDParams;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_BILLABLE]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_DEPARTMENT_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_CLASSES_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_LOCATIONS_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_CUSTOMERS_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_PROJECTS_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_SYNC_TAX_CONFIGURATION]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>;
+ [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_USER_DIMENSION]: Parameters.UpdateSageIntacctGenericTypeParams<'dimensions', SageIntacctDimension[]>;
};
const READ_COMMANDS = {
@@ -586,6 +662,8 @@ const READ_COMMANDS = {
OPEN_POLICY_DISTANCE_RATES_PAGE: 'OpenPolicyDistanceRatesPage',
OPEN_POLICY_MORE_FEATURES_PAGE: 'OpenPolicyMoreFeaturesPage',
OPEN_POLICY_ACCOUNTING_PAGE: 'OpenPolicyAccountingPage',
+ OPEN_POLICY_PROFILE_PAGE: 'OpenPolicyProfilePage',
+ OPEN_POLICY_INITIAL_PAGE: 'OpenPolicyInitialPage',
SEARCH: 'Search',
OPEN_SUBSCRIPTION_PAGE: 'OpenSubscriptionPage',
} as const;
@@ -636,6 +714,8 @@ type ReadCommandParameters = {
[READ_COMMANDS.OPEN_POLICY_MORE_FEATURES_PAGE]: Parameters.OpenPolicyMoreFeaturesPageParams;
[READ_COMMANDS.OPEN_POLICY_ACCOUNTING_PAGE]: Parameters.OpenPolicyAccountingPageParams;
[READ_COMMANDS.OPEN_POLICY_EXPENSIFY_CARDS_PAGE]: Parameters.OpenPolicyExpensifyCardsPageParams;
+ [READ_COMMANDS.OPEN_POLICY_PROFILE_PAGE]: Parameters.OpenPolicyProfilePageParams;
+ [READ_COMMANDS.OPEN_POLICY_INITIAL_PAGE]: Parameters.OpenPolicyInitialPageParams;
[READ_COMMANDS.SEARCH]: Parameters.SearchParams;
[READ_COMMANDS.OPEN_SUBSCRIPTION_PAGE]: null;
};
diff --git a/src/libs/Browser/index.ts b/src/libs/Browser/index.ts
index 98ad449c3dd0..aeec4f4def4a 100644
--- a/src/libs/Browser/index.ts
+++ b/src/libs/Browser/index.ts
@@ -1,4 +1,4 @@
-import type {GetBrowser, IsMobile, IsMobileChrome, IsMobileSafari, IsMobileWebKit, IsSafari, OpenRouteInDesktopApp} from './types';
+import type {GetBrowser, IsChromeIOS, IsMobile, IsMobileChrome, IsMobileSafari, IsMobileWebKit, IsSafari, OpenRouteInDesktopApp} from './types';
const getBrowser: GetBrowser = () => '';
@@ -10,8 +10,10 @@ const isMobileChrome: IsMobileChrome = () => false;
const isMobileWebKit: IsMobileWebKit = () => false;
+const isChromeIOS: IsChromeIOS = () => false;
+
const isSafari: IsSafari = () => false;
const openRouteInDesktopApp: OpenRouteInDesktopApp = () => {};
-export {getBrowser, isMobile, isMobileSafari, isMobileWebKit, isSafari, isMobileChrome, openRouteInDesktopApp};
+export {getBrowser, isMobile, isMobileSafari, isMobileWebKit, isSafari, isMobileChrome, isChromeIOS, openRouteInDesktopApp};
diff --git a/src/libs/Browser/index.website.ts b/src/libs/Browser/index.website.ts
index a83fa1cac70e..b89190dc7f78 100644
--- a/src/libs/Browser/index.website.ts
+++ b/src/libs/Browser/index.website.ts
@@ -1,7 +1,7 @@
import CONFIG from '@src/CONFIG';
import CONST from '@src/CONST';
import ROUTES from '@src/ROUTES';
-import type {GetBrowser, IsMobile, IsMobileChrome, IsMobileSafari, IsMobileWebKit, IsSafari, OpenRouteInDesktopApp} from './types';
+import type {GetBrowser, IsChromeIOS, IsMobile, IsMobileChrome, IsMobileSafari, IsMobileWebKit, IsSafari, OpenRouteInDesktopApp} from './types';
/**
* Fetch browser name from UA string
@@ -66,6 +66,14 @@ const isMobileWebKit: IsMobileWebKit = () => {
return /iP(ad|od|hone)/i.test(userAgent) && /WebKit/i.test(userAgent);
};
+/**
+ * Checks if the requesting user agent is a Chrome browser on an iOS mobile device.
+ */
+const isChromeIOS: IsChromeIOS = () => {
+ const userAgent = navigator.userAgent;
+ return /iP(ad|od|hone)/i.test(userAgent) && /CriOS/i.test(userAgent);
+};
+
const isSafari: IsSafari = () => getBrowser() === 'safari' || isMobileSafari();
/**
@@ -109,4 +117,4 @@ const openRouteInDesktopApp: OpenRouteInDesktopApp = (shortLivedAuthToken = '',
}
};
-export {getBrowser, isMobile, isMobileSafari, isMobileWebKit, isSafari, isMobileChrome, openRouteInDesktopApp};
+export {getBrowser, isMobile, isMobileSafari, isMobileWebKit, isSafari, isMobileChrome, isChromeIOS, openRouteInDesktopApp};
diff --git a/src/libs/Browser/types.ts b/src/libs/Browser/types.ts
index 25f305953c87..cb242d3729aa 100644
--- a/src/libs/Browser/types.ts
+++ b/src/libs/Browser/types.ts
@@ -8,8 +8,10 @@ type IsMobileChrome = () => boolean;
type IsMobileWebKit = () => boolean;
+type IsChromeIOS = () => boolean;
+
type IsSafari = () => boolean;
type OpenRouteInDesktopApp = (shortLivedAuthToken?: string, email?: string) => void;
-export type {GetBrowser, IsMobile, IsMobileSafari, IsMobileChrome, IsMobileWebKit, IsSafari, OpenRouteInDesktopApp};
+export type {GetBrowser, IsMobile, IsMobileSafari, IsMobileChrome, IsMobileWebKit, IsSafari, IsChromeIOS, OpenRouteInDesktopApp};
diff --git a/src/libs/CurrencyUtils.ts b/src/libs/CurrencyUtils.ts
index 7b54fbf0bed7..c3b80797d750 100644
--- a/src/libs/CurrencyUtils.ts
+++ b/src/libs/CurrencyUtils.ts
@@ -87,8 +87,9 @@ function convertToBackendAmount(amountAsFloat: number): number {
*
* @note we do not support any currencies with more than two decimal places.
*/
-function convertToFrontendAmountAsInteger(amountAsInt: number): number {
- return Math.trunc(amountAsInt) / 100.0;
+function convertToFrontendAmountAsInteger(amountAsInt: number, currency: string = CONST.CURRENCY.USD): number {
+ const decimals = getCurrencyDecimals(currency);
+ return Number((Math.trunc(amountAsInt) / 100.0).toFixed(decimals));
}
/**
@@ -96,11 +97,12 @@ function convertToFrontendAmountAsInteger(amountAsInt: number): number {
*
* @note we do not support any currencies with more than two decimal places.
*/
-function convertToFrontendAmountAsString(amountAsInt: number | null | undefined): string {
+function convertToFrontendAmountAsString(amountAsInt: number | null | undefined, currency: string = CONST.CURRENCY.USD, withDecimals = true): string {
if (amountAsInt === null || amountAsInt === undefined) {
return '';
}
- return convertToFrontendAmountAsInteger(amountAsInt).toFixed(2);
+ const decimals = withDecimals ? getCurrencyDecimals(currency) : 0;
+ return convertToFrontendAmountAsInteger(amountAsInt, currency).toFixed(decimals);
}
/**
@@ -111,7 +113,7 @@ function convertToFrontendAmountAsString(amountAsInt: number | null | undefined)
* @param currency - IOU currency
*/
function convertToDisplayString(amountInCents = 0, currency: string = CONST.CURRENCY.USD): string {
- const convertedAmount = convertToFrontendAmountAsInteger(amountInCents);
+ const convertedAmount = convertToFrontendAmountAsInteger(amountInCents, currency);
/**
* Fallback currency to USD if it empty string or undefined
*/
@@ -123,9 +125,11 @@ function convertToDisplayString(amountInCents = 0, currency: string = CONST.CURR
style: 'currency',
currency: currencyWithFallback,
- // We are forcing the number of decimals because we override the default number of decimals in the backend for RSD
+ // We are forcing the number of decimals because we override the default number of decimals in the backend for some currencies
// See: https://github.com/Expensify/PHP-Libs/pull/834
- minimumFractionDigits: currency === 'RSD' ? getCurrencyDecimals(currency) : undefined,
+ minimumFractionDigits: getCurrencyDecimals(currency),
+ // For currencies that have decimal places > 2, floor to 2 instead as we don't support more than 2 decimal places.
+ maximumFractionDigits: 2,
});
}
@@ -137,7 +141,7 @@ function convertToDisplayString(amountInCents = 0, currency: string = CONST.CURR
* @param currency - IOU currency
*/
function convertToShortDisplayString(amountInCents = 0, currency: string = CONST.CURRENCY.USD): string {
- const convertedAmount = convertToFrontendAmountAsInteger(amountInCents);
+ const convertedAmount = convertToFrontendAmountAsInteger(amountInCents, currency);
return NumberFormatUtils.format(BaseLocaleListener.getPreferredLocale(), convertedAmount, {
style: 'currency',
@@ -168,14 +172,16 @@ function convertAmountToDisplayString(amount = 0, currency: string = CONST.CURRE
* Acts the same as `convertAmountToDisplayString` but the result string does not contain currency
*/
function convertToDisplayStringWithoutCurrency(amountInCents: number, currency: string = CONST.CURRENCY.USD) {
- const convertedAmount = convertToFrontendAmountAsInteger(amountInCents);
+ const convertedAmount = convertToFrontendAmountAsInteger(amountInCents, currency);
return NumberFormatUtils.formatToParts(BaseLocaleListener.getPreferredLocale(), convertedAmount, {
style: 'currency',
currency,
- // We are forcing the number of decimals because we override the default number of decimals in the backend for RSD
+ // We are forcing the number of decimals because we override the default number of decimals in the backend for some currencies
// See: https://github.com/Expensify/PHP-Libs/pull/834
- minimumFractionDigits: currency === 'RSD' ? getCurrencyDecimals(currency) : undefined,
+ minimumFractionDigits: getCurrencyDecimals(currency),
+ // For currencies that have decimal places > 2, floor to 2 instead as we don't support more than 2 decimal places.
+ maximumFractionDigits: 2,
})
.filter((x) => x.type !== 'currency')
.filter((x) => x.type !== 'literal' || x.value.trim().length !== 0)
diff --git a/src/libs/DateUtils.ts b/src/libs/DateUtils.ts
index 8a8888902e92..0b4a847f3733 100644
--- a/src/libs/DateUtils.ts
+++ b/src/libs/DateUtils.ts
@@ -246,7 +246,7 @@ function datetimeToCalendarTime(locale: Locale, datetime: string, includeTimeZon
*/
function datetimeToRelative(locale: Locale, datetime: string): string {
const date = getLocalDateFromDatetime(locale, datetime);
- return formatDistanceToNow(date, {addSuffix: true});
+ return formatDistanceToNow(date, {addSuffix: true, locale: locale === CONST.LOCALES.EN ? enGB : es});
}
/**
diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts
index dda5427e9c9f..a85db2bc28d8 100644
--- a/src/libs/DistanceRequestUtils.ts
+++ b/src/libs/DistanceRequestUtils.ts
@@ -1,15 +1,16 @@
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
import type {LocaleContextProps} from '@components/LocaleContextProvider';
import type {RateAndUnit} from '@src/CONST';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
-import type {LastSelectedDistanceRates, OnyxInputOrEntry, Report} from '@src/types/onyx';
+import type {LastSelectedDistanceRates, OnyxInputOrEntry} from '@src/types/onyx';
import type {Unit} from '@src/types/onyx/Policy';
import type Policy from '@src/types/onyx/Policy';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import * as CurrencyUtils from './CurrencyUtils';
import * as PolicyUtils from './PolicyUtils';
+import * as ReportConnection from './ReportConnection';
import * as ReportUtils from './ReportUtils';
type MileageRate = {
@@ -28,13 +29,6 @@ Onyx.connect({
},
});
-let allReports: OnyxCollection;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
const METERS_TO_KM = 0.001; // 1 kilometer is 1000 meters
const METERS_TO_MILES = 0.000621371; // There are approximately 0.000621371 miles in a meter
@@ -251,6 +245,7 @@ function convertToDistanceInMeters(distance: number, unit: Unit): number {
* Returns custom unit rate ID for the distance transaction
*/
function getCustomUnitRateID(reportID: string) {
+ const allReports = ReportConnection.getAllReports();
const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
const policy = PolicyUtils.getPolicy(report?.policyID ?? parentReport?.policyID ?? '-1');
diff --git a/src/libs/E2E/reactNativeLaunchingTest.ts b/src/libs/E2E/reactNativeLaunchingTest.ts
index f952998f0aad..f61bee8dae6a 100644
--- a/src/libs/E2E/reactNativeLaunchingTest.ts
+++ b/src/libs/E2E/reactNativeLaunchingTest.ts
@@ -36,6 +36,7 @@ const tests: Tests = {
[E2EConfig.TEST_NAMES.ChatOpening]: require('./tests/chatOpeningTest.e2e').default,
[E2EConfig.TEST_NAMES.ReportTyping]: require('./tests/reportTypingTest.e2e').default,
[E2EConfig.TEST_NAMES.Linking]: require('./tests/linkingTest.e2e').default,
+ [E2EConfig.TEST_NAMES.PreloadedLinking]: require('./tests/preloadedLinkingTest.e2e').default,
};
// Once we receive the TII measurement we know that the app is initialized and ready to be used:
diff --git a/src/libs/E2E/tests/preloadedLinkingTest.e2e.ts b/src/libs/E2E/tests/preloadedLinkingTest.e2e.ts
new file mode 100644
index 000000000000..a36200b1a702
--- /dev/null
+++ b/src/libs/E2E/tests/preloadedLinkingTest.e2e.ts
@@ -0,0 +1,82 @@
+import {DeviceEventEmitter} from 'react-native';
+import type {NativeConfig} from 'react-native-config';
+import Config from 'react-native-config';
+import Timing from '@libs/actions/Timing';
+import E2ELogin from '@libs/E2E/actions/e2eLogin';
+import waitForAppLoaded from '@libs/E2E/actions/waitForAppLoaded';
+import E2EClient from '@libs/E2E/client';
+import getConfigValueOrThrow from '@libs/E2E/utils/getConfigValueOrThrow';
+import getPromiseWithResolve from '@libs/E2E/utils/getPromiseWithResolve';
+import Navigation from '@libs/Navigation/Navigation';
+import Performance from '@libs/Performance';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type ViewableItem = {
+ reportActionID?: string;
+};
+type ViewableItemResponse = Array<{item?: ViewableItem}>;
+
+const test = (config: NativeConfig) => {
+ console.debug('[E2E] Logging in for comment linking');
+
+ const reportID = getConfigValueOrThrow('reportID', config);
+ const linkedReportActionID = getConfigValueOrThrow('linkedReportActionID', config);
+
+ E2ELogin().then((neededLogin) => {
+ if (neededLogin) {
+ return waitForAppLoaded().then(() => E2EClient.submitTestDone());
+ }
+
+ const [appearMessagePromise, appearMessageResolve] = getPromiseWithResolve();
+ const [switchReportPromise, switchReportResolve] = getPromiseWithResolve();
+
+ Promise.all([appearMessagePromise, switchReportPromise])
+ .then(() => {
+ console.debug('[E2E] Test completed successfully, exiting…');
+ E2EClient.submitTestDone();
+ })
+ .catch((err) => {
+ console.debug('[E2E] Error while submitting test results:', err);
+ });
+
+ const subscription = DeviceEventEmitter.addListener('onViewableItemsChanged', (res: ViewableItemResponse) => {
+ console.debug('[E2E] Viewable items retrieved, verifying correct message…', res);
+ if (!!res && res?.[0]?.item?.reportActionID === linkedReportActionID) {
+ appearMessageResolve();
+ subscription.remove();
+ } else {
+ console.debug(`[E2E] Provided message id '${res?.[0]?.item?.reportActionID}' doesn't match to an expected '${linkedReportActionID}'. Waiting for a next one…`);
+ }
+ });
+
+ Performance.subscribeToMeasurements((entry) => {
+ if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
+ console.debug('[E2E] Sidebar loaded, navigating to a report…');
+ Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+ return;
+ }
+
+ if (entry.name === CONST.TIMING.REPORT_INITIAL_RENDER) {
+ console.debug('[E2E] Navigating to linked report action…');
+ Timing.start(CONST.TIMING.SWITCH_REPORT);
+ Performance.markStart(CONST.TIMING.SWITCH_REPORT);
+
+ Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID, linkedReportActionID));
+ return;
+ }
+
+ if (entry.name === CONST.TIMING.CHAT_RENDER) {
+ E2EClient.submitTestResults({
+ branch: Config.E2E_BRANCH,
+ name: 'Comment linking',
+ metric: entry.duration,
+ });
+
+ switchReportResolve();
+ }
+ });
+ });
+};
+
+export default test;
diff --git a/src/libs/EmojiUtils.ts b/src/libs/EmojiUtils.ts
index 6fb5725addfc..007a892c048e 100644
--- a/src/libs/EmojiUtils.ts
+++ b/src/libs/EmojiUtils.ts
@@ -1,4 +1,3 @@
-import {getUnixTime} from 'date-fns';
import {Str} from 'expensify-common';
import memoize from 'lodash/memoize';
import Onyx from 'react-native-onyx';
@@ -235,37 +234,6 @@ function mergeEmojisWithFrequentlyUsedEmojis(emojis: PickerEmojis): EmojiPickerL
return addSpacesToEmojiCategories(mergedEmojis);
}
-/**
- * Get the updated frequently used emojis list by usage
- */
-function getFrequentlyUsedEmojis(newEmoji: Emoji | Emoji[]): FrequentlyUsedEmoji[] {
- let frequentEmojiList = [...frequentlyUsedEmojis];
-
- const maxFrequentEmojiCount = CONST.EMOJI_FREQUENT_ROW_COUNT * CONST.EMOJI_NUM_PER_ROW - 1;
-
- const currentTimestamp = getUnixTime(new Date());
- (Array.isArray(newEmoji) ? [...newEmoji] : [newEmoji]).forEach((emoji) => {
- let currentEmojiCount = 1;
- const emojiIndex = frequentEmojiList.findIndex((e) => e.code === emoji.code);
- if (emojiIndex >= 0) {
- currentEmojiCount = frequentEmojiList[emojiIndex].count + 1;
- frequentEmojiList.splice(emojiIndex, 1);
- }
-
- const updatedEmoji = {...Emojis.emojiCodeTableWithSkinTones[emoji.code], count: currentEmojiCount, lastUpdatedAt: currentTimestamp};
-
- // We want to make sure the current emoji is added to the list
- // Hence, we take one less than the current frequent used emojis
- frequentEmojiList = frequentEmojiList.slice(0, maxFrequentEmojiCount);
- frequentEmojiList.push(updatedEmoji);
-
- // Sort the list by count and lastUpdatedAt in descending order
- frequentEmojiList.sort((a, b) => b.count - a.count || b.lastUpdatedAt - a.lastUpdatedAt);
- });
-
- return frequentEmojiList;
-}
-
/**
* Given an emoji item object, return an emoji code based on its type.
*/
@@ -601,7 +569,6 @@ export {
getLocalizedEmojiName,
getHeaderEmojis,
mergeEmojisWithFrequentlyUsedEmojis,
- getFrequentlyUsedEmojis,
containsOnlyEmojis,
replaceEmojis,
suggestEmojis,
diff --git a/src/libs/Environment/Environment.ts b/src/libs/Environment/Environment.ts
index 1f5a391d3b13..c343788bed05 100644
--- a/src/libs/Environment/Environment.ts
+++ b/src/libs/Environment/Environment.ts
@@ -38,6 +38,13 @@ function isDevelopment(): boolean {
return (Config?.ENVIRONMENT ?? CONST.ENVIRONMENT.DEV) === CONST.ENVIRONMENT.DEV;
}
+/**
+ * Are we running the app in staging?
+ */
+function isStaging(): boolean {
+ return (Config?.ENVIRONMENT ?? CONST.ENVIRONMENT.DEV) === CONST.ENVIRONMENT.STAGING;
+}
+
/**
* Are we running the app in production?
*/
@@ -76,4 +83,4 @@ function getSpotnanaEnvironmentTMCID(): Promise {
return getEnvironment().then((environment) => SPOTNANA_ENVIRONMENT_TMC_ID[environment]);
}
-export {getEnvironment, isInternalTestBuild, isDevelopment, isProduction, getEnvironmentURL, getOldDotEnvironmentURL, getTravelDotEnvironmentURL, getSpotnanaEnvironmentTMCID};
+export {getEnvironment, isInternalTestBuild, isDevelopment, isStaging, isProduction, getEnvironmentURL, getOldDotEnvironmentURL, getTravelDotEnvironmentURL, getSpotnanaEnvironmentTMCID};
diff --git a/src/libs/Log.ts b/src/libs/Log.ts
index 64271dee2265..83965807263a 100644
--- a/src/libs/Log.ts
+++ b/src/libs/Log.ts
@@ -2,7 +2,7 @@
// action would likely cause confusion about which one to use. But most other API methods should happen inside an action file.
/* eslint-disable rulesdir/no-api-in-views */
-import {ExpensiMark, Logger} from 'expensify-common';
+import {Logger} from 'expensify-common';
import Onyx from 'react-native-onyx';
import type {Merge} from 'type-fest';
import CONST from '@src/CONST';
@@ -80,6 +80,5 @@ const Log = new Logger({
isDebug: true,
});
timeout = setTimeout(() => Log.info('Flushing logs older than 10 minutes', true, {}, true), 10 * 60 * 1000);
-ExpensiMark.setLogger(Log);
export default Log;
diff --git a/src/libs/ModifiedExpenseMessage.ts b/src/libs/ModifiedExpenseMessage.ts
index efcba4c23204..38562edb7704 100644
--- a/src/libs/ModifiedExpenseMessage.ts
+++ b/src/libs/ModifiedExpenseMessage.ts
@@ -2,12 +2,13 @@ import Onyx from 'react-native-onyx';
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyTagList, Report, ReportAction} from '@src/types/onyx';
+import type {PolicyTagList, ReportAction} from '@src/types/onyx';
import * as CurrencyUtils from './CurrencyUtils';
import DateUtils from './DateUtils';
import * as Localize from './Localize';
import * as PolicyUtils from './PolicyUtils';
import * as ReportActionsUtils from './ReportActionsUtils';
+import * as ReportConnection from './ReportConnection';
import * as TransactionUtils from './TransactionUtils';
let allPolicyTags: OnyxCollection = {};
@@ -23,13 +24,6 @@ Onyx.connect({
},
});
-let allReports: OnyxCollection;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
/**
* Builds the partial message fragment for a modified field on the expense.
*/
@@ -116,7 +110,7 @@ function getForReportAction(reportID: string | undefined, reportAction: OnyxEntr
return '';
}
const reportActionOriginalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
- const policyID = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.policyID ?? '-1';
+ const policyID = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.policyID ?? '-1';
const removalFragments: string[] = [];
const setFragments: string[] = [];
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index ba296522ccef..0e40fa4d4037 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -316,7 +316,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
};
// Rule disabled because this effect is only for component did mount & will component unmount lifecycle event
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
const CentralPaneScreenOptions = {
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 8a1c22233b95..ce43c78a6fee 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -230,6 +230,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/categories/CategorySettingsPage').default,
[SCREENS.WORKSPACE.ADDRESS]: () => require('../../../../pages/workspace/WorkspaceProfileAddressPage').default,
[SCREENS.WORKSPACE.CATEGORIES_SETTINGS]: () => require('../../../../pages/workspace/categories/WorkspaceCategoriesSettingsPage').default,
+ [SCREENS.WORKSPACE.UPGRADE]: () => require('../../../../pages/workspace/upgrade/WorkspaceUpgradePage').default,
[SCREENS.WORKSPACE.MEMBER_DETAILS]: () => require('../../../../pages/workspace/members/WorkspaceMemberDetailsPage').default,
[SCREENS.WORKSPACE.OWNER_CHANGE_CHECK]: () => require('@pages/workspace/members/WorkspaceOwnerChangeWrapperPage').default,
[SCREENS.WORKSPACE.OWNER_CHANGE_SUCCESS]: () => require('../../../../pages/workspace/members/WorkspaceOwnerChangeSuccessPage').default,
@@ -324,6 +325,16 @@ const SettingsModalStackNavigator = createModalStackNavigator('../../../../pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage').default,
[SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT]: () => require('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportPage').default,
[SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_MAPPING]: () => require('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportMappingPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_VIEW]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_EDIT]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_LIST_ADD]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentPage').default,
[SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS]: () =>
require('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage').default,
[SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT]: () =>
@@ -352,11 +363,40 @@ const SettingsModalStackNavigator = createModalStackNavigator
require('../../../../pages/workspace/accounting/netsuite/export/NetSuiteProvincialTaxPostingAccountSelectPage').default,
[SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_ADVANCED]: () => require('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage').default,
-
- [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: () => require('../../../../pages/workspace/accounting/intacct/IntacctPrerequisitesPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_COLLECTION_ACCOUNT_SELECT]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteExpenseReportApprovalLevelSelectPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteVendorBillApprovalLevelSelectPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteJournalEntryApprovalLevelSelectPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_APPROVAL_ACCOUNT_SELECT]: () =>
+ require('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteApprovalAccountSelectPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_CUSTOM_FORM_ID]: () => require('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage').default,
+
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: () => require('../../../../pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage').default,
[SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: () =>
require('../../../../pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage').default,
[SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: () => require('../../../../pages/workspace/accounting/intacct/ExistingConnectionsPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT]: () => require('../../../../pages/workspace/accounting/intacct/export/SageIntacctExportPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREFERRED_EXPORTER]: () =>
+ require('../../../../pages/workspace/accounting/intacct/export/SageIntacctPreferredExporterPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT_DATE]: () => require('../../../../pages/workspace/accounting/intacct/export/SageIntacctDatePage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES]: () =>
+ require('../../../../pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES]: () =>
+ require('../../../../pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR]: () =>
+ require('../../../../pages/workspace/accounting/intacct/export/SageIntacctDefaultVendorPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]: () =>
+ require('../../../../pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableCreditCardAccountPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED]: () => require('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PAYMENT_ACCOUNT]: () =>
+ require('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctPaymentAccountPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.RECONCILIATION_ACCOUNT_SETTINGS]: () => require('../../../../pages/workspace/accounting/ReconciliationAccountSettingsPage').default,
[SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: () => require('../../../../pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage').default,
[SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET]: () => require('../../../../pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage').default,
[SCREENS.WORKSPACE.TAX_EDIT]: () => require('../../../../pages/workspace/taxes/WorkspaceEditTaxPage').default,
@@ -369,11 +409,24 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/settings/Subscription/PaymentCard/ChangeBillingCurrency').default,
[SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD]: () => require('../../../../pages/settings/Subscription/PaymentCard').default,
[SCREENS.SETTINGS.ADD_PAYMENT_CARD_CHANGE_CURRENCY]: () => require('../../../../pages/settings/PaymentCard/ChangeCurrency').default,
- [SCREENS.WORKSPACE.REPORT_FIELDS_CREATE]: () => require('../../../../pages/workspace/reportFields/WorkspaceCreateReportFieldPage').default,
- [SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES]: () => require('../../../../pages/workspace/reportFields/ReportFieldListValuesPage').default,
- [SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE]: () => require('../../../../pages/workspace/reportFields/ReportFieldAddListValuePage').default,
- [SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS]: () => require('../../../../pages/workspace/reportFields/ValueSettingsPage').default,
- [SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE]: () => require('../../../../pages/workspace/reportFields/ReportFieldEditValuePage').default,
+ [SCREENS.WORKSPACE.REPORT_FIELDS_CREATE]: () => require('../../../../pages/workspace/reportFields/CreateReportFieldsPage').default,
+ [SCREENS.WORKSPACE.REPORT_FIELDS_SETTINGS]: () => require('../../../../pages/workspace/reportFields/ReportFieldsSettingsPage').default,
+ [SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES]: () => require('../../../../pages/workspace/reportFields/ReportFieldsListValuesPage').default,
+ [SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE]: () => require('../../../../pages/workspace/reportFields/ReportFieldsAddListValuePage').default,
+ [SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS]: () => require('../../../../pages/workspace/reportFields/ReportFieldsValueSettingsPage').default,
+ [SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE]: () => require('../../../../pages/workspace/reportFields/ReportFieldsInitialValuePage').default,
+ [SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE]: () => require('../../../../pages/workspace/reportFields/ReportFieldsEditValuePage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_IMPORT]: () => require('../../../../pages/workspace/accounting/intacct/import/SageIntacctImportPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_TOGGLE_MAPPING]: () =>
+ require('../../../../pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_MAPPING_TYPE]: () =>
+ require('../../../../pages/workspace/accounting/intacct/import/SageIntacctMappingsTypePage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_USER_DIMENSIONS]: () =>
+ require('../../../../pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADD_USER_DIMENSION]: () =>
+ require('../../../../pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage').default,
+ [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EDIT_USER_DIMENSION]: () =>
+ require('../../../../pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage').default,
});
const EnablePaymentsStackNavigator = createModalStackNavigator({
@@ -418,10 +471,18 @@ const ProcessMoneyRequestHoldStackNavigator = createModalStackNavigator({
const TransactionDuplicateStackNavigator = createModalStackNavigator({
[SCREENS.TRANSACTION_DUPLICATE.REVIEW]: () => require('../../../../pages/TransactionDuplicate/Review').default,
+ [SCREENS.TRANSACTION_DUPLICATE.MERCHANT]: () => require('../../../../pages/TransactionDuplicate/ReviewMerchant').default,
+ [SCREENS.TRANSACTION_DUPLICATE.CATEGORY]: () => require('../../../../pages/TransactionDuplicate/ReviewCategory').default,
+ [SCREENS.TRANSACTION_DUPLICATE.TAG]: () => require('../../../../pages/TransactionDuplicate/ReviewTag').default,
+ [SCREENS.TRANSACTION_DUPLICATE.DESCRIPTION]: () => require('../../../../pages/TransactionDuplicate/ReviewDescription').default,
+ [SCREENS.TRANSACTION_DUPLICATE.TAX_CODE]: () => require('../../../../pages/TransactionDuplicate/ReviewTaxCode').default,
+ [SCREENS.TRANSACTION_DUPLICATE.BILLABLE]: () => require('../../../../pages/TransactionDuplicate/ReviewBillable').default,
+ [SCREENS.TRANSACTION_DUPLICATE.REIMBURSABLE]: () => require('../../../../pages/TransactionDuplicate/ReviewReimbursable').default,
});
const SearchReportModalStackNavigator = createModalStackNavigator({
[SCREENS.SEARCH.REPORT_RHP]: () => require('../../../../pages/home/ReportScreen').default,
+ [SCREENS.SEARCH.TRANSACTION_HOLD_REASON_RHP]: () => require('../../../../pages/Search/SearchHoldReasonPage').default,
});
const RestrictedActionModalStackNavigator = createModalStackNavigator({
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalScreenOptions.ts b/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalScreenOptions.ts
index 3c5ef1833835..460b0c732797 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalScreenOptions.ts
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalScreenOptions.ts
@@ -1,19 +1,32 @@
-import type {StackNavigationOptions} from '@react-navigation/stack';
+import type {StackCardInterpolationProps, StackNavigationOptions} from '@react-navigation/stack';
import {CardStyleInterpolators} from '@react-navigation/stack';
import {useMemo} from 'react';
+import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import {isSafari} from '@libs/Browser';
+import createModalCardStyleInterpolator from '@navigation/AppNavigator/createModalCardStyleInterpolator';
import type {ThemeStyles} from '@src/styles';
function useModalScreenOptions(getScreenOptions?: (styles: ThemeStyles) => StackNavigationOptions) {
const styles = useThemeStyles();
+ const styleUtils = useStyleUtils();
+ const {isSmallScreenWidth} = useWindowDimensions();
+
+ let cardStyleInterpolator = CardStyleInterpolators.forHorizontalIOS;
+
+ if (isSafari()) {
+ const customInterpolator = createModalCardStyleInterpolator(styleUtils);
+ cardStyleInterpolator = (props: StackCardInterpolationProps) => customInterpolator(isSmallScreenWidth, false, false, props);
+ }
const defaultSubRouteOptions = useMemo(
(): StackNavigationOptions => ({
cardStyle: styles.navigationScreenCardStyle,
headerShown: false,
- cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
+ cardStyleInterpolator,
}),
- [styles],
+ [styles, cardStyleInterpolator],
);
return getScreenOptions?.(styles) ?? defaultSubRouteOptions;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
index 29a2205b2e37..61adcd77da76 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
@@ -4,9 +4,11 @@ import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import NoDropZone from '@components/DragAndDrop/NoDropZone';
import FocusTrapForScreens from '@components/FocusTrap/FocusTrapForScreen';
+import useDisableModalDismissOnEscape from '@hooks/useDisableModalDismissOnEscape';
import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
import useOnboardingLayout from '@hooks/useOnboardingLayout';
import useThemeStyles from '@hooks/useThemeStyles';
+import hasCompletedGuidedSetupFlowSelector from '@libs/hasCompletedGuidedSetupFlowSelector';
import OnboardingModalNavigatorScreenOptions from '@libs/Navigation/AppNavigator/OnboardingModalNavigatorScreenOptions';
import Navigation from '@libs/Navigation/Navigation';
import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
@@ -26,15 +28,11 @@ function OnboardingModalNavigator() {
const styles = useThemeStyles();
const {shouldUseNarrowLayout} = useOnboardingLayout();
const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
- selector: (onboarding) => {
- // onboarding is an array for old accounts and accounts created from olddot
- if (Array.isArray(onboarding)) {
- return true;
- }
- return onboarding?.hasCompletedGuidedSetupFlow;
- },
+ selector: hasCompletedGuidedSetupFlowSelector,
});
+ useDisableModalDismissOnEscape();
+
useEffect(() => {
if (!hasCompletedGuidedSetupFlow) {
return;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
index 05c23797fe0e..6b83c1997693 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
@@ -1,12 +1,15 @@
-import type {StackScreenProps} from '@react-navigation/stack';
+import type {StackCardInterpolationProps, StackScreenProps} from '@react-navigation/stack';
import {createStackNavigator} from '@react-navigation/stack';
import React, {useMemo, useRef} from 'react';
import {View} from 'react-native';
import NoDropZone from '@components/DragAndDrop/NoDropZone';
+import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
+import {isSafari} from '@libs/Browser';
import ModalNavigatorScreenOptions from '@libs/Navigation/AppNavigator/ModalNavigatorScreenOptions';
import * as ModalStackNavigators from '@libs/Navigation/AppNavigator/ModalStackNavigators';
+import createModalCardStyleInterpolator from '@navigation/AppNavigator/createModalCardStyleInterpolator';
import type {AuthScreensParamList, RightModalNavigatorParamList} from '@navigation/types';
import NAVIGATORS from '@src/NAVIGATORS';
import SCREENS from '@src/SCREENS';
@@ -18,9 +21,19 @@ const Stack = createStackNavigator();
function RightModalNavigator({navigation}: RightModalNavigatorProps) {
const styles = useThemeStyles();
+ const styleUtils = useStyleUtils();
const {isSmallScreenWidth} = useWindowDimensions();
- const screenOptions = useMemo(() => ModalNavigatorScreenOptions(styles), [styles]);
const isExecutingRef = useRef(false);
+ const screenOptions = useMemo(() => {
+ const options = ModalNavigatorScreenOptions(styles);
+ // The .forHorizontalIOS interpolator from `@react-navigation` is misbehaving on Safari, so we override it with Expensify custom interpolator
+ if (isSafari()) {
+ const customInterpolator = createModalCardStyleInterpolator(styleUtils);
+ options.cardStyleInterpolator = (props: StackCardInterpolationProps) => customInterpolator(isSmallScreenWidth, false, false, props);
+ }
+
+ return options;
+ }, [isSmallScreenWidth, styleUtils, styles]);
return (
diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.tsx
index 772c51915d1d..f244342c28ae 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.tsx
@@ -58,7 +58,7 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps
}
Welcome.isOnboardingFlowCompleted({onNotCompleted: () => Navigation.navigate(ROUTES.ONBOARDING_ROOT)});
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [isLoadingApp]);
// Parent navigator of the bottom tab bar is the root navigator.
diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.website.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.website.tsx
index 90a7a0df056f..2e1c4c012156 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.website.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.website.tsx
@@ -15,7 +15,9 @@ import * as Session from '@libs/actions/Session';
import interceptAnonymousUser from '@libs/interceptAnonymousUser';
import getTopmostBottomTabRoute from '@libs/Navigation/getTopmostBottomTabRoute';
import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
-import Navigation from '@libs/Navigation/Navigation';
+import linkingConfig from '@libs/Navigation/linkingConfig';
+import getAdaptedStateFromPath from '@libs/Navigation/linkingConfig/getAdaptedStateFromPath';
+import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
import type {RootStackParamList, State} from '@libs/Navigation/types';
import {isCentralPaneName} from '@libs/NavigationUtils';
import {getChatTabBrickRoad} from '@libs/WorkspacesSettingsUtils';
@@ -53,8 +55,13 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps
return;
}
- Welcome.isOnboardingFlowCompleted({onNotCompleted: () => Navigation.navigate(ROUTES.ONBOARDING_ROOT)});
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ Welcome.isOnboardingFlowCompleted({
+ onNotCompleted: () => {
+ const {adaptedState} = getAdaptedStateFromPath(ROUTES.ONBOARDING_ROOT, linkingConfig.config);
+ navigationRef.resetRoot(adaptedState);
+ },
+ });
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [isLoadingApp]);
// Parent navigator of the bottom tab bar is the root navigator.
diff --git a/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/index.tsx b/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/index.tsx
index f35c609402b0..7b928e4cf4df 100644
--- a/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/index.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/index.tsx
@@ -29,7 +29,7 @@ function CustomFullScreenNavigator(props: FullScreenNavigatorProps) {
}
// We need to separately reset state of this navigator to trigger getRehydratedState.
navigation.reset(navigation.getState());
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [isSmallScreenWidth]);
return (
diff --git a/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts b/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
index a1768df5e0d6..5b3cefb63a2d 100644
--- a/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
+++ b/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
@@ -1,13 +1,16 @@
-import type {RouterConfigOptions, StackNavigationState} from '@react-navigation/native';
-import {getPathFromState, StackRouter} from '@react-navigation/native';
+import type {CommonActions, RouterConfigOptions, StackActionType, StackNavigationState} from '@react-navigation/native';
+import {findFocusedRoute, getPathFromState, StackRouter} from '@react-navigation/native';
import type {ParamListBase} from '@react-navigation/routers';
import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import * as Localize from '@libs/Localize';
import getTopmostBottomTabRoute from '@libs/Navigation/getTopmostBottomTabRoute';
import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
import linkingConfig from '@libs/Navigation/linkingConfig';
import getAdaptedStateFromPath from '@libs/Navigation/linkingConfig/getAdaptedStateFromPath';
import type {NavigationPartialRoute, RootStackParamList, State} from '@libs/Navigation/types';
-import {isCentralPaneName} from '@libs/NavigationUtils';
+import {isCentralPaneName, isOnboardingFlowName} from '@libs/NavigationUtils';
+import * as Welcome from '@userActions/Welcome';
+import CONST from '@src/CONST';
import NAVIGATORS from '@src/NAVIGATORS';
import SCREENS from '@src/SCREENS';
import type {ResponsiveStackNavigatorRouterOptions} from './types';
@@ -97,6 +100,23 @@ function compareAndAdaptState(state: StackNavigationState) {
}
}
+function shouldPreventReset(state: StackNavigationState, action: CommonActions.Action | StackActionType) {
+ if (action.type !== CONST.NAVIGATION_ACTIONS.RESET || !action?.payload) {
+ return false;
+ }
+ const currentFocusedRoute = findFocusedRoute(state);
+ const targetFocusedRoute = findFocusedRoute(action?.payload);
+
+ // We want to prevent the user from navigating back to a non-onboarding screen if they are currently on an onboarding screen
+ if (isOnboardingFlowName(currentFocusedRoute?.name) && !isOnboardingFlowName(targetFocusedRoute?.name)) {
+ Welcome.setOnboardingErrorMessage(Localize.translateLocal('onboarding.purpose.errorBackButton'));
+ // We reset the URL as the browser sets it in a way that doesn't match the navigation state
+ // eslint-disable-next-line no-restricted-globals
+ history.replaceState({}, '', getPathFromState(state, linkingConfig.config));
+ return true;
+ }
+}
+
function CustomRouter(options: ResponsiveStackNavigatorRouterOptions) {
const stackRouter = StackRouter(options);
@@ -107,6 +127,12 @@ function CustomRouter(options: ResponsiveStackNavigatorRouterOptions) {
const state = stackRouter.getRehydratedState(partialState, {routeNames, routeParamList, routeGetIdList});
return state;
},
+ getStateForAction(state: StackNavigationState, action: CommonActions.Action | StackActionType, configOptions: RouterConfigOptions) {
+ if (shouldPreventReset(state, action)) {
+ return state;
+ }
+ return stackRouter.getStateForAction(state, action, configOptions);
+ },
};
}
diff --git a/src/libs/Navigation/FreezeWrapper.tsx b/src/libs/Navigation/FreezeWrapper.tsx
index 23513dd87431..fb5f769b19c1 100644
--- a/src/libs/Navigation/FreezeWrapper.tsx
+++ b/src/libs/Navigation/FreezeWrapper.tsx
@@ -20,7 +20,7 @@ function FreezeWrapper({keepVisible = false, children}: FreezeWrapperProps) {
useEffect(() => {
const index = navigation.getState()?.routes.findIndex((route) => route.key === currentRoute.key) ?? 0;
screenIndexRef.current = index;
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
useEffect(() => {
diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts
index e9bfb7227403..6f803ae1e497 100644
--- a/src/libs/Navigation/Navigation.ts
+++ b/src/libs/Navigation/Navigation.ts
@@ -1,10 +1,10 @@
import {findFocusedRoute} from '@react-navigation/core';
import type {EventArg, NavigationContainerEventMap} from '@react-navigation/native';
import {CommonActions, getPathFromState, StackActions} from '@react-navigation/native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
import Log from '@libs/Log';
import {isCentralPaneName, removePolicyIDParamFromState} from '@libs/NavigationUtils';
+import * as ReportConnection from '@libs/ReportConnection';
import * as ReportUtils from '@libs/ReportUtils';
import CONST from '@src/CONST';
import NAVIGATORS from '@src/NAVIGATORS';
@@ -16,10 +16,12 @@ import type {Report} from '@src/types/onyx';
import originalCloseRHPFlow from './closeRHPFlow';
import originalDismissModal from './dismissModal';
import originalDismissModalWithReport from './dismissModalWithReport';
+import getTopmostBottomTabRoute from './getTopmostBottomTabRoute';
import getTopmostCentralPaneRoute from './getTopmostCentralPaneRoute';
import originalGetTopmostReportActionId from './getTopmostReportActionID';
import originalGetTopmostReportId from './getTopmostReportId';
import linkingConfig from './linkingConfig';
+import getMatchingBottomTabRouteForState from './linkingConfig/getMatchingBottomTabRouteForState';
import linkTo from './linkTo';
import navigationRef from './navigationRef';
import setNavigationActionToMicrotaskQueue from './setNavigationActionToMicrotaskQueue';
@@ -35,18 +37,11 @@ let pendingRoute: Route | null = null;
let shouldPopAllStateOnUP = false;
-let allReports: OnyxCollection;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
/**
* Inform the navigation that next time user presses UP we should pop all the state back to LHN.
*/
-function setShouldPopAllStateOnUP() {
- shouldPopAllStateOnUP = true;
+function setShouldPopAllStateOnUP(shouldPopAllStateFlag: boolean) {
+ shouldPopAllStateOnUP = shouldPopAllStateFlag;
}
function canNavigate(methodName: string, params: Record = {}): boolean {
@@ -69,7 +64,7 @@ const dismissModal = (reportID?: string, ref = navigationRef) => {
originalDismissModal(ref);
return;
}
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
originalDismissModalWithReport({reportID, ...report}, ref);
};
// Re-exporting the closeRHPFlow here to fill in default value for navigationRef. The closeRHPFlow isn't defined in this file to avoid cyclic dependencies.
@@ -236,16 +231,40 @@ function goBack(fallbackRoute?: Route, shouldEnforceFallback = false, shouldPopT
const isCentralPaneFocused = isCentralPaneName(findFocusedRoute(navigationRef.current.getState())?.name);
const distanceFromPathInRootNavigator = getDistanceFromPathInRootNavigator(fallbackRoute ?? '');
- // Allow CentralPane to use UP with fallback route if the path is not found in root navigator.
- if (isCentralPaneFocused && fallbackRoute && distanceFromPathInRootNavigator === -1) {
- navigate(fallbackRoute, CONST.NAVIGATION.TYPE.UP);
- return;
+ if (isCentralPaneFocused && fallbackRoute) {
+ // Allow CentralPane to use UP with fallback route if the path is not found in root navigator.
+ if (distanceFromPathInRootNavigator === -1) {
+ navigate(fallbackRoute, CONST.NAVIGATION.TYPE.UP);
+ return;
+ }
+
+ // Add possibility to go back more than one screen in root navigator if that screen is on the stack.
+ if (distanceFromPathInRootNavigator > 0) {
+ navigationRef.current.dispatch(StackActions.pop(distanceFromPathInRootNavigator));
+ return;
+ }
}
- // Add possibility to go back more than one screen in root navigator if that screen is on the stack.
- if (isCentralPaneFocused && fallbackRoute && distanceFromPathInRootNavigator > 0) {
- navigationRef.current.dispatch(StackActions.pop(distanceFromPathInRootNavigator));
- return;
+ // If the central pane is focused, it's possible that we navigated from other central pane with different matching bottom tab.
+ if (isCentralPaneFocused) {
+ const rootState = navigationRef.getRootState();
+ const stateAfterPop = {routes: rootState.routes.slice(0, -1)} as State;
+ const topmostCentralPaneRouteAfterPop = getTopmostCentralPaneRoute(stateAfterPop);
+
+ const topmostBottomTabRoute = getTopmostBottomTabRoute(rootState as State);
+ const matchingBottomTabRoute = getMatchingBottomTabRouteForState(stateAfterPop);
+
+ // If the central pane is defined after the pop action, we need to check if it's synced with the bottom tab screen.
+ // If not, we need to pop to the bottom tab screen/screens to sync it with the new central pane.
+ if (topmostCentralPaneRouteAfterPop && topmostBottomTabRoute?.name !== matchingBottomTabRoute.name) {
+ const bottomTabNavigator = rootState.routes.find((item: NavigationStateRoute) => item.name === NAVIGATORS.BOTTOM_TAB_NAVIGATOR)?.state;
+
+ if (bottomTabNavigator && bottomTabNavigator.index) {
+ const matchingIndex = bottomTabNavigator.routes.findLastIndex((item) => item.name === matchingBottomTabRoute.name);
+ const indexToPop = matchingIndex !== -1 ? bottomTabNavigator.index - matchingIndex : undefined;
+ navigationRef.current.dispatch({...StackActions.pop(indexToPop), target: bottomTabNavigator?.key});
+ }
+ }
}
navigationRef.current.goBack();
diff --git a/src/libs/Navigation/NavigationRoot.tsx b/src/libs/Navigation/NavigationRoot.tsx
index dd3a2890d0ec..a225831b56ff 100644
--- a/src/libs/Navigation/NavigationRoot.tsx
+++ b/src/libs/Navigation/NavigationRoot.tsx
@@ -1,6 +1,7 @@
import type {NavigationState} from '@react-navigation/native';
import {DefaultTheme, findFocusedRoute, NavigationContainer} from '@react-navigation/native';
import React, {useContext, useEffect, useMemo, useRef} from 'react';
+import {useOnyx} from 'react-native-onyx';
import HybridAppMiddleware from '@components/HybridAppMiddleware';
import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
import useActiveWorkspace from '@hooks/useActiveWorkspace';
@@ -8,11 +9,14 @@ import useCurrentReportID from '@hooks/useCurrentReportID';
import useTheme from '@hooks/useTheme';
import useWindowDimensions from '@hooks/useWindowDimensions';
import {FSPage} from '@libs/Fullstory';
+import hasCompletedGuidedSetupFlowSelector from '@libs/hasCompletedGuidedSetupFlowSelector';
import Log from '@libs/Log';
import {getPathFromURL} from '@libs/Url';
import {updateLastVisitedPath} from '@userActions/App';
import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
import type {Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
import AppNavigator from './AppNavigator';
import getPolicyIDFromState from './getPolicyIDFromState';
import linkingConfig from './linkingConfig';
@@ -77,25 +81,37 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
const {isSmallScreenWidth} = useWindowDimensions();
const {setActiveWorkspaceID} = useActiveWorkspace();
- const initialState = useMemo(
- () => {
- if (!lastVisitedPath) {
- return undefined;
- }
+ const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
+ selector: hasCompletedGuidedSetupFlowSelector,
+ });
- const path = initialUrl ? getPathFromURL(initialUrl) : null;
+ const initialState = useMemo(() => {
+ // If the user haven't completed the flow, we want to always redirect them to the onboarding flow.
+ if (!hasCompletedGuidedSetupFlow) {
+ const {adaptedState} = getAdaptedStateFromPath(ROUTES.ONBOARDING_ROOT, linkingConfig.config);
+ return adaptedState;
+ }
- // For non-nullable paths we don't want to set initial state
- if (path) {
- return;
- }
+ // If there is no lastVisitedPath, we can do early return. We won't modify the default behavior.
+ if (!lastVisitedPath) {
+ return undefined;
+ }
- const {adaptedState} = getAdaptedStateFromPath(lastVisitedPath, linkingConfig.config);
- return adaptedState;
- },
- // eslint-disable-next-line react-hooks/exhaustive-deps
- [],
- );
+ const path = initialUrl ? getPathFromURL(initialUrl) : null;
+
+ // If the user opens the root of app "/" it will be parsed to empty string "".
+ // If the path is defined and different that empty string we don't want to modify the default behavior.
+ if (path) {
+ return;
+ }
+
+ // Otherwise we want to redirect the user to the last visited path.
+ const {adaptedState} = getAdaptedStateFromPath(lastVisitedPath, linkingConfig.config);
+ return adaptedState;
+
+ // The initialState value is relevant only on the first render.
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+ }, []);
// https://reactnavigation.org/docs/themes
const navigationTheme = useMemo(
@@ -119,10 +135,8 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
firstRenderRef.current = false;
return;
}
- if (!isSmallScreenWidth) {
- return;
- }
- Navigation.setShouldPopAllStateOnUP();
+
+ Navigation.setShouldPopAllStateOnUP(!isSmallScreenWidth);
}, [isSmallScreenWidth]);
const handleStateChange = (state: NavigationState | undefined) => {
@@ -154,7 +168,7 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
}}
>
{/* HybridAppMiddleware needs to have access to navigation ref and SplashScreenHidden context */}
-
+
diff --git a/src/libs/Navigation/isReportOpenInRHP.ts b/src/libs/Navigation/isReportOpenInRHP.ts
new file mode 100644
index 000000000000..51e8a95bb66b
--- /dev/null
+++ b/src/libs/Navigation/isReportOpenInRHP.ts
@@ -0,0 +1,17 @@
+import type {NavigationState} from '@react-navigation/native';
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+const isReportOpenInRHP = (state: NavigationState | undefined): boolean => {
+ const lastRoute = state?.routes?.at(-1);
+ if (!lastRoute) {
+ return false;
+ }
+ const params = lastRoute.params;
+ if (params && 'screen' in params && typeof params.screen === 'string' && params.screen === SCREENS.RIGHT_MODAL.SEARCH_REPORT) {
+ return true;
+ }
+ return !!(lastRoute.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute.state?.routes?.some((route) => route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT));
+};
+
+export default isReportOpenInRHP;
diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts
index d8312937ed6f..ddef2b1411b3 100644
--- a/src/libs/Navigation/linkTo/index.ts
+++ b/src/libs/Navigation/linkTo/index.ts
@@ -3,6 +3,7 @@ import type {NavigationContainerRef, NavigationState, PartialState} from '@react
import {findFocusedRoute} from '@react-navigation/native';
import {omitBy} from 'lodash';
import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import isReportOpenInRHP from '@libs/Navigation/isReportOpenInRHP';
import extractPolicyIDsFromState from '@libs/Navigation/linkingConfig/extractPolicyIDsFromState';
import {isCentralPaneName} from '@libs/NavigationUtils';
import shallowCompare from '@libs/ObjectUtils';
@@ -68,7 +69,7 @@ export default function linkTo(navigation: NavigationContainerRef route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT);
+ const isReportInRhpOpened = isReportOpenInRHP(rootState);
// If action type is different than NAVIGATE we can't change it to the PUSH safely
if (action?.type === CONST.NAVIGATION.ACTION_TYPE.NAVIGATE) {
diff --git a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
index 1192e4649ea0..83929b7e7d02 100755
--- a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
@@ -38,7 +38,7 @@ const CENTRAL_PANE_TO_RHP_MAPPING: Partial> =
[SCREENS.SETTINGS.ABOUT]: [SCREENS.SETTINGS.APP_DOWNLOAD_LINKS],
[SCREENS.SETTINGS.SAVE_THE_WORLD]: [SCREENS.I_KNOW_A_TEACHER, SCREENS.INTRO_SCHOOL_PRINCIPAL, SCREENS.I_AM_A_TEACHER],
[SCREENS.SETTINGS.TROUBLESHOOT]: [SCREENS.SETTINGS.CONSOLE],
- [SCREENS.SEARCH.CENTRAL_PANE]: [SCREENS.SEARCH.REPORT_RHP],
+ [SCREENS.SEARCH.CENTRAL_PANE]: [SCREENS.SEARCH.REPORT_RHP, SCREENS.SEARCH.TRANSACTION_HOLD_REASON_RHP],
[SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: [
SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD,
SCREENS.SETTINGS.SUBSCRIPTION.SIZE,
diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
index 78732767f4c1..31b44a2681fd 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -2,7 +2,14 @@ import type {FullScreenName} from '@libs/Navigation/types';
import SCREENS from '@src/SCREENS';
const FULL_SCREEN_TO_RHP_MAPPING: Partial> = {
- [SCREENS.WORKSPACE.PROFILE]: [SCREENS.WORKSPACE.NAME, SCREENS.WORKSPACE.ADDRESS, SCREENS.WORKSPACE.CURRENCY, SCREENS.WORKSPACE.DESCRIPTION, SCREENS.WORKSPACE.SHARE],
+ [SCREENS.WORKSPACE.PROFILE]: [
+ SCREENS.WORKSPACE.NAME,
+ SCREENS.WORKSPACE.ADDRESS,
+ SCREENS.WORKSPACE.CURRENCY,
+ SCREENS.WORKSPACE.DESCRIPTION,
+ SCREENS.WORKSPACE.SHARE,
+ SCREENS.WORKSPACE.UPGRADE,
+ ],
[SCREENS.WORKSPACE.REIMBURSE]: [SCREENS.WORKSPACE.RATE_AND_UNIT, SCREENS.WORKSPACE.RATE_AND_UNIT_RATE, SCREENS.WORKSPACE.RATE_AND_UNIT_UNIT],
[SCREENS.WORKSPACE.MEMBERS]: [
SCREENS.WORKSPACE.INVITE,
@@ -59,6 +66,11 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial> = {
SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT,
SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT,
SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_MAPPING,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_VIEW,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_EDIT,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_LIST_ADD,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD,
SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS,
SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT,
SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT,
@@ -75,9 +87,32 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial> = {
SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TAX_POSTING_ACCOUNT_SELECT,
SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT_SELECT,
SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_ADVANCED,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_COLLECTION_ACCOUNT_SELECT,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_APPROVAL_ACCOUNT_SELECT,
+ SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_CUSTOM_FORM_ID,
SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES,
SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS,
SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_IMPORT,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_MAPPING_TYPE,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_TOGGLE_MAPPING,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_USER_DIMENSIONS,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADD_USER_DIMENSION,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EDIT_USER_DIMENSION,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREFERRED_EXPORTER,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT_DATE,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED,
+ SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PAYMENT_ACCOUNT,
+ SCREENS.WORKSPACE.ACCOUNTING.RECONCILIATION_ACCOUNT_SETTINGS,
],
[SCREENS.WORKSPACE.TAXES]: [
SCREENS.WORKSPACE.TAXES_SETTINGS,
@@ -109,12 +144,14 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial> = {
],
[SCREENS.WORKSPACE.REPORT_FIELDS]: [
SCREENS.WORKSPACE.REPORT_FIELDS_CREATE,
+ SCREENS.WORKSPACE.REPORT_FIELDS_SETTINGS,
SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES,
SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE,
SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS,
SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE,
+ SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE,
],
- [SCREENS.WORKSPACE.EXPENSIFY_CARD]: [],
+ [SCREENS.WORKSPACE.EXPENSIFY_CARD]: [SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW],
};
export default FULL_SCREEN_TO_RHP_MAPPING;
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index e6f230432846..5262850d4e81 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -357,6 +357,11 @@ const config: LinkingOptions
+