{% for article in section.articles %}
{% assign article_href = section.href | append: '/' | append: article.href %}
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..ebad41aa2267 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,56 @@ 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.
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
-
-## 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'.
+# Using Your Expensify Visa® Commercial Card
+
+## Getting Started
+### 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.
+
+### 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.
+
+## 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.
+
+## Enabling Notifications
+Download the Expensify mobile app and enable push notifications to stay updated on spending activity and potential fraud.
+
+#### 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.
+
+#### 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/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..b058329577c7 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageTypeAPPLCFBundleShortVersionString
- 9.0.4
+ 9.0.5CFBundleSignature????CFBundleURLTypes
@@ -40,7 +40,7 @@
CFBundleVersion
- 9.0.4.7
+ 9.0.5.7FullStoryOrgId
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index ce34b27d72e3..8ada0ff4c266 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
CFBundlePackageTypeBNDLCFBundleShortVersionString
- 9.0.4
+ 9.0.5CFBundleSignature????CFBundleVersion
- 9.0.4.7
+ 9.0.5.7
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 9b89c5e2790f..29789966f751 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
CFBundleName$(PRODUCT_NAME)CFBundleShortVersionString
- 9.0.4
+ 9.0.5CFBundleVersion
- 9.0.4.7
+ 9.0.5.7NSExtensionNSExtensionPointIdentifier
diff --git a/package-lock.json b/package-lock.json
index abc223a50b38..c26df45d799f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "9.0.4-7",
+ "version": "9.0.5-7",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "9.0.4-7",
+ "version": "9.0.5-7",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
@@ -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",
@@ -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",
@@ -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
@@ -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",
diff --git a/package.json b/package.json
index bc7306ee3782..f69d61115851 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "9.0.4-7",
+ "version": "9.0.5-7",
"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,7 +60,8 @@
"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",
@@ -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/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/src/CONST.ts b/src/CONST.ts
index 2512ecf5cde0..caf0b1453fae 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',
@@ -719,7 +720,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',
@@ -1389,6 +1390,10 @@ const CONST = {
4: 'enterCredentials',
},
IMPORT_CUSTOM_FIELDS: ['customSegments', 'customLists'],
+ CUSTOM_FORM_ID_TYPE: {
+ REIMBURSABLE: 'reimbursable',
+ NON_REIMBURSABLE: 'nonReimbursable',
+ },
SYNC_OPTIONS: {
SYNC_REIMBURSED_REPORTS: 'syncReimbursedReports',
SYNC_PEOPLE: 'syncPeople',
@@ -1457,6 +1462,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',
/**
@@ -2335,6 +2351,7 @@ const CONST = {
PRIVATE_NOTES: 'privateNotes',
DELETE: 'delete',
MARK_AS_INCOMPLETE: 'markAsIncomplete',
+ UNAPPROVE: 'unapprove',
},
EDIT_REQUEST_FIELD: {
AMOUNT: 'amount',
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..5d6b5492d15c 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -562,6 +562,8 @@ const ONYXKEYS = {
SAGE_INTACCT_CREDENTIALS_FORM_DRAFT: 'sageIntacctCredentialsFormDraft',
NETSUITE_TOKEN_INPUT_FORM: 'netsuiteTokenInputForm',
NETSUITE_TOKEN_INPUT_FORM_DRAFT: 'netsuiteTokenInputFormDraft',
+ NETSUITE_CUSTOM_FORM_ID_FORM: 'netsuiteCustomFormIDForm',
+ NETSUITE_CUSTOM_FORM_ID_FORM_DRAFT: 'netsuiteCustomFormIDFormDraft',
},
} as const;
@@ -626,6 +628,7 @@ type OnyxFormValuesMapping = {
[ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM]: FormTypes.IssueNewExpensifyCardForm;
[ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM]: FormTypes.SageIntactCredentialsForm;
[ONYXKEYS.FORMS.NETSUITE_TOKEN_INPUT_FORM]: FormTypes.NetSuiteTokenInputForm;
+ [ONYXKEYS.FORMS.NETSUITE_CUSTOM_FORM_ID_FORM]: FormTypes.NetSuiteCustomFormIDForm;
};
type OnyxFormDraftValuesMapping = {
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 9f7b564ead62..f8a0f4c71b19 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -791,6 +791,10 @@ const ROUTES = {
route: 'settings/workspaces/:policyID/reportFields',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/reportFields` as const,
},
+ WORKSPACE_REPORT_FIELD_SETTINGS: {
+ route: 'settings/workspaces/:policyID/reportField/:reportFieldKey',
+ getRoute: (policyID: string, reportFieldKey: string) => `settings/workspaces/${policyID}/reportField/${encodeURIComponent(reportFieldKey)}` as const,
+ },
WORKSPACE_CREATE_REPORT_FIELD: {
route: 'settings/workspaces/:policyID/reportFields/new',
getRoute: (policyID: string) => `settings/workspaces/${policyID}/reportFields/new` as const,
@@ -1078,6 +1082,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,
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 589432c2abc1..766727e1a2c2 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -299,6 +299,13 @@ 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',
@@ -325,6 +332,7 @@ const SCREENS = {
TAG_EDIT: 'Tag_Edit',
TAXES: 'Workspace_Taxes',
REPORT_FIELDS: 'Workspace_ReportFields',
+ REPORT_FIELD_SETTINGS: 'Workspace_ReportField_Settings',
REPORT_FIELDS_CREATE: 'Workspace_ReportFields_Create',
REPORT_FIELDS_LIST_VALUES: 'Workspace_ReportFields_ListValues',
REPORT_FIELDS_ADD_VALUE: 'Workspace_ReportFields_AddValue',
diff --git a/src/components/AddPlaidBankAccount.tsx b/src/components/AddPlaidBankAccount.tsx
index a112b36705c3..4de286183ea8 100644
--- a/src/components/AddPlaidBankAccount.tsx
+++ b/src/components/AddPlaidBankAccount.tsx
@@ -153,7 +153,7 @@ function AddPlaidBankAccount({
return unsubscribeToNavigationShortcuts;
// disabling this rule, as we want this to run only on the first render
- // 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/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..4b3f0f70db24 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -147,7 +147,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],
);
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/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx
index dc8638f018d4..4bcfdc61077f 100644
--- a/src/components/ConnectionLayout.tsx
+++ b/src/components/ConnectionLayout.tsx
@@ -66,6 +66,9 @@ type ConnectionLayoutProps = {
/** Handler for back button press */
onBackButtonPress?: () => void;
+
+ /** Whether or not to block user from accessing the page */
+ shouldBeBlocked?: boolean;
};
type ConnectionLayoutContentProps = Pick;
@@ -99,6 +102,7 @@ function ConnectionLayout({
titleAlreadyTranslated,
reverseConnectionEmptyCheck = false,
onBackButtonPress = () => Navigation.goBack(),
+ shouldBeBlocked = false,
}: ConnectionLayoutProps) {
const {translate} = useLocalize();
@@ -123,7 +127,7 @@ function ConnectionLayout({
policyID={policyID}
accessVariants={accessVariants}
featureName={featureName}
- shouldBeBlocked={reverseConnectionEmptyCheck ? !isConnectionEmpty : isConnectionEmpty}
+ shouldBeBlocked={(reverseConnectionEmptyCheck ? !isConnectionEmpty : isConnectionEmpty) || shouldBeBlocked}
>
{
// 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/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/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..a4b9df5916af 100644
--- a/src/components/Form/FormProvider.tsx
+++ b/src/components/Form/FormProvider.tsx
@@ -176,7 +176,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 +239,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/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/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/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/MoneyRequestAmountInput.tsx b/src/components/MoneyRequestAmountInput.tsx
index 0c3868312c41..791b3e4d5e48 100644
--- a/src/components/MoneyRequestAmountInput.tsx
+++ b/src/components/MoneyRequestAmountInput.tsx
@@ -103,7 +103,7 @@ const getNewSelection = (oldSelection: Selection, prevLength: number, newLength:
return {start: cursorPosition, end: cursorPosition};
};
-const defaultOnFormatAmount = (amount: number) => 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/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/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..bcead42a64f2 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 {
diff --git a/src/components/Pressable/GenericPressable/BaseGenericPressable.tsx b/src/components/Pressable/GenericPressable/BaseGenericPressable.tsx
index 377007d40c54..5237ff486631 100644
--- a/src/components/Pressable/GenericPressable/BaseGenericPressable.tsx
+++ b/src/components/Pressable/GenericPressable/BaseGenericPressable.tsx
@@ -36,6 +36,7 @@ function GenericPressable(
onPressOut,
accessible = true,
fullDisabled = false,
+ interactive = true,
...rest
}: PressableProps,
ref: PressableRef,
@@ -67,6 +68,9 @@ function GenericPressable(
* Returns the cursor style based on the state of Pressable
*/
const cursorStyle = useMemo(() => {
+ 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/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/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/index.tsx b/src/components/Search/index.tsx
index 5454ffc61757..8445cb3bc72e 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -84,7 +84,7 @@ function Search({query, policyIDs, sortBy, sortOrder}: SearchProps) {
}
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;
diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
index c9dc773c8818..99330478c75f 100644
--- a/src/components/SelectionList/BaseListItem.tsx
+++ b/src/components/SelectionList/BaseListItem.tsx
@@ -82,6 +82,7 @@ function BaseListItem({
onSelectRow(item);
}}
disabled={isDisabled && !item.isSelected}
+ interactive={item.isInteractive}
accessibilityLabel={item.text ?? ''}
role={CONST.ROLE.BUTTON}
hoverDimmingValue={1}
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index ae70e5525393..8b6ba790e6b0 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -222,7 +222,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 +248,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 +259,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 +278,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 +337,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]);
/**
diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index 9e0599d839df..5af3d84bf32f 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -22,6 +22,9 @@ function ActionCell({onButtonPress, action = CONST.SEARCH.ACTION_TYPES.VIEW, isL
const styles = useThemeStyles();
const theme = useTheme();
const StyleUtils = useStyleUtils();
+ if (!isLargeScreenWidth) {
+ return null;
+ }
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';
diff --git a/src/components/SelectionList/Search/TransactionListItemRow.tsx b/src/components/SelectionList/Search/TransactionListItemRow.tsx
index 9f0799143373..23f9234819c3 100644
--- a/src/components/SelectionList/Search/TransactionListItemRow.tsx
+++ b/src/components/SelectionList/Search/TransactionListItemRow.tsx
@@ -14,6 +14,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';
@@ -114,16 +115,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 +169,25 @@ function TypeCell({transactionItem, isLargeScreenWidth}: TransactionCellProps) {
function CategoryCell({isLargeScreenWidth, showTooltip, transactionItem}: TransactionCellProps) {
const styles = useThemeStyles();
- return isLargeScreenWidth ? (
+ return (
- ) : (
-
);
}
@@ -250,42 +262,39 @@ function TransactionListItemRow({
isLargeScreenWidth={false}
showTooltip={false}
/>
-
+
-
-
-
-
+ {item.category && (
+
+
+
+ )}
@@ -309,7 +318,7 @@ function TransactionListItemRow({
@@ -317,14 +326,14 @@ function TransactionListItemRow({
@@ -342,7 +351,7 @@ function TransactionListItemRow({
{item.shouldShowCategory && (
@@ -351,7 +360,7 @@ function TransactionListItemRow({
{item.shouldShowTag && (
@@ -361,7 +370,7 @@ function TransactionListItemRow({
@@ -371,14 +380,14 @@ function TransactionListItemRow({
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index a20f0ae18c58..d40a6f0fa225 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -81,6 +81,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;
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/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..7e598a929ae3 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`) : '';
@@ -89,7 +89,7 @@ function StateSelector(
brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
errorText={errorText}
onPress={() => {
- const activeRoute = Navigation.getActiveRoute();
+ const activeRoute = Navigation.getActiveRouteWithoutParams();
didOpenStateSelector.current = true;
Navigation.navigate(stateSelectorRoute.getRoute(stateCode, activeRoute, label));
}}
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 {}}: 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/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/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/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/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/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/languages/en.ts b/src/languages/en.ts
index f23f96af6ac7..8330beab6f08 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -814,6 +814,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',
@@ -932,7 +937,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',
@@ -1008,7 +1013,7 @@ export default {
},
returnToClassic: 'Switch to Expensify Classic',
help: 'Help',
- accountSettings: 'Account Settings',
+ accountSettings: 'Account settings',
account: 'Account',
general: 'General',
},
@@ -2294,8 +2299,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:
@@ -2309,6 +2318,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',
@@ -2318,6 +2328,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',
@@ -2326,12 +2337,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.',
@@ -2399,7 +2414,7 @@ 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',
@@ -2761,6 +2776,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',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index a304473a1605..00501b07f219 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -817,6 +817,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',
@@ -936,7 +941,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',
@@ -1369,7 +1374,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',
@@ -2335,8 +2340,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:
@@ -2350,6 +2359,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',
@@ -2359,6 +2370,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',
@@ -2367,12 +2380,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.',
@@ -2440,7 +2457,7 @@ 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',
@@ -2743,6 +2760,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',
diff --git a/src/libs/API/parameters/PolicyReportFieldsReplace.ts b/src/libs/API/parameters/PolicyReportFieldsReplace.ts
new file mode 100644
index 000000000000..c6d1834f0789
--- /dev/null
+++ b/src/libs/API/parameters/PolicyReportFieldsReplace.ts
@@ -0,0 +1,10 @@
+type PolicyReportFieldsReplace = {
+ policyID: string;
+ /**
+ * Stringified JSON object with type of following structure:
+ * Array
+ */
+ reportFields: string;
+};
+
+export default PolicyReportFieldsReplace;
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/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/index.ts b/src/libs/API/parameters/index.ts
index c50f0c4fdbc2..ef012f224336 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -153,6 +153,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';
@@ -242,8 +243,10 @@ export type {default as DeleteMoneyRequestOnSearchParams} from './DeleteMoneyReq
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 PolicyReportFieldsReplace} from './PolicyReportFieldsReplace';
export type {default as ConnectPolicyToNetSuiteParams} from './ConnectPolicyToNetSuiteParams';
export type {default as CreateWorkspaceReportFieldParams} from './CreateWorkspaceReportFieldParams';
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';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 17554e10313f..b20a0039d847 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -132,6 +132,7 @@ const WRITE_COMMANDS = {
SET_WORKSPACE_REQUIRES_CATEGORY: 'SetWorkspaceRequiresCategory',
UPDATE_POLICY_CATEGORY_GL_CODE: 'UpdatePolicyCategoryGLCode',
DELETE_WORKSPACE_CATEGORIES: 'DeleteWorkspaceCategories',
+ POLICY_REPORT_FIELDS_REPLACE: 'Policy_ReportFields_Replace',
SET_POLICY_TAGS_REQUIRED: 'SetPolicyTagsRequired',
SET_POLICY_REQUIRES_TAG: 'SetPolicyRequiresTag',
RENAME_POLICY_TAG_LIST: 'RenamePolicyTaglist',
@@ -172,6 +173,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',
@@ -265,6 +267,14 @@ const WRITE_COMMANDS = {
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',
CONNECT_POLICY_TO_NETSUITE: 'ConnectPolicyToNetSuite',
@@ -390,6 +400,7 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.SET_WORKSPACE_REQUIRES_CATEGORY]: Parameters.SetWorkspaceRequiresCategoryParams;
[WRITE_COMMANDS.DELETE_WORKSPACE_CATEGORIES]: Parameters.DeleteWorkspaceCategoriesParams;
[WRITE_COMMANDS.UPDATE_POLICY_CATEGORY_GL_CODE]: Parameters.UpdatePolicyCategoryGLCodeParams;
+ [WRITE_COMMANDS.POLICY_REPORT_FIELDS_REPLACE]: Parameters.PolicyReportFieldsReplace;
[WRITE_COMMANDS.SET_POLICY_REQUIRES_TAG]: Parameters.SetPolicyRequiresTag;
[WRITE_COMMANDS.SET_POLICY_TAGS_REQUIRED]: Parameters.SetPolicyTagsRequired;
[WRITE_COMMANDS.RENAME_POLICY_TAG_LIST]: Parameters.RenamePolicyTaglistParams;
@@ -432,6 +443,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;
@@ -544,6 +556,14 @@ type WriteCommandParameters = {
[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;
};
const READ_COMMANDS = {
diff --git a/src/libs/CurrencyUtils.ts b/src/libs/CurrencyUtils.ts
index 7b54fbf0bed7..be7ce9aca8b5 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): string {
if (amountAsInt === null || amountAsInt === undefined) {
return '';
}
- return convertToFrontendAmountAsInteger(amountAsInt).toFixed(2);
+ const decimals = getCurrencyDecimals(currency);
+ 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
*/
@@ -137,7 +139,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,7 +170,7 @@ 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,
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/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 e4af933479c4..c5b5f059f8ae 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -251,6 +251,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/tags/WorkspaceEditTagsPage').default,
[SCREENS.WORKSPACE.TAG_CREATE]: () => require('../../../../pages/workspace/tags/WorkspaceCreateTagPage').default,
[SCREENS.WORKSPACE.TAG_EDIT]: () => require('../../../../pages/workspace/tags/EditTagPage').default,
+ [SCREENS.WORKSPACE.REPORT_FIELD_SETTINGS]: () => require('../../../../pages/workspace/reportFields/WorkspaceReportFieldSettingsPage').default,
[SCREENS.WORKSPACE.TAXES_SETTINGS]: () => require('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsPage').default,
[SCREENS.WORKSPACE.TAXES_SETTINGS_CUSTOM_TAX_NAME]: () => require('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName').default,
[SCREENS.WORKSPACE.TAXES_SETTINGS_FOREIGN_CURRENCY_DEFAULT]: () => require('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency').default,
@@ -354,6 +355,19 @@ 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.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/IntacctPrerequisitesPage').default,
[SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: () =>
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..8c531a918af8 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.website.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.website.tsx
@@ -54,7 +54,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/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/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..15d4ac6e4b31 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';
@@ -35,13 +35,6 @@ 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.
*/
@@ -69,7 +62,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.
diff --git a/src/libs/Navigation/NavigationRoot.tsx b/src/libs/Navigation/NavigationRoot.tsx
index dd3a2890d0ec..db64aea7ffe8 100644
--- a/src/libs/Navigation/NavigationRoot.tsx
+++ b/src/libs/Navigation/NavigationRoot.tsx
@@ -93,7 +93,7 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
const {adaptedState} = getAdaptedStateFromPath(lastVisitedPath, linkingConfig.config);
return adaptedState;
},
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[],
);
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 8cf320ea0acb..af8dd14c1653 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -82,6 +82,13 @@ 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,
@@ -121,6 +128,7 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial> = {
SCREENS.WORKSPACE.DISTANCE_RATE_DETAILS,
],
[SCREENS.WORKSPACE.REPORT_FIELDS]: [
+ SCREENS.WORKSPACE.REPORT_FIELD_SETTINGS,
SCREENS.WORKSPACE.REPORT_FIELDS_CREATE,
SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES,
SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index bc4e0fd7dfd9..d8a871261299 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -401,6 +401,27 @@ const config: LinkingOptions['config'] = {
[SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_ADVANCED]: {
path: ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.route,
},
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT]: {
+ path: ROUTES.POLICY_ACCOUNTING_NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT.route,
+ },
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_COLLECTION_ACCOUNT_SELECT]: {
+ path: ROUTES.POLICY_ACCOUNTING_NETSUITE_COLLECTION_ACCOUNT_SELECT.route,
+ },
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT]: {
+ path: ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT.route,
+ },
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT]: {
+ path: ROUTES.POLICY_ACCOUNTING_NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT.route,
+ },
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT]: {
+ path: ROUTES.POLICY_ACCOUNTING_NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT.route,
+ },
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_APPROVAL_ACCOUNT_SELECT]: {
+ path: ROUTES.POLICY_ACCOUNTING_NETSUITE_APPROVAL_ACCOUNT_SELECT.route,
+ },
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_CUSTOM_FORM_ID]: {
+ path: ROUTES.POLICY_ACCOUNTING_NETSUITE_CUSTOM_FORM_ID.route,
+ },
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.route},
[SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTER_CREDENTIALS.route},
[SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXISTING_CONNECTIONS.route},
@@ -532,6 +553,12 @@ const config: LinkingOptions['config'] = {
orderWeight: Number,
},
},
+ [SCREENS.WORKSPACE.REPORT_FIELD_SETTINGS]: {
+ path: ROUTES.WORKSPACE_REPORT_FIELD_SETTINGS.route,
+ parse: {
+ reportFieldName: (reportFieldKey: string) => decodeURIComponent(reportFieldKey),
+ },
+ },
[SCREENS.WORKSPACE.TAXES_SETTINGS]: {
path: ROUTES.WORKSPACE_TAXES_SETTINGS.route,
},
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 0764cd6627af..08ba596e4e81 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -245,6 +245,10 @@ type SettingsNavigatorParamList = {
orderWeight: number;
tagName: string;
};
+ [SCREENS.WORKSPACE.REPORT_FIELD_SETTINGS]: {
+ policyID: string;
+ reportFieldKey: string;
+ };
[SCREENS.WORKSPACE.TAG_LIST_VIEW]: {
policyID: string;
orderWeight: number;
@@ -488,6 +492,28 @@ type SettingsNavigatorParamList = {
[SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_ADVANCED]: {
policyID: string;
};
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT]: {
+ policyID: string;
+ };
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_COLLECTION_ACCOUNT_SELECT]: {
+ policyID: string;
+ };
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT]: {
+ policyID: string;
+ };
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT]: {
+ policyID: string;
+ };
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT]: {
+ policyID: string;
+ };
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_APPROVAL_ACCOUNT_SELECT]: {
+ policyID: string;
+ };
+ [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_CUSTOM_FORM_ID]: {
+ policyID: string;
+ expenseType: ValueOf;
+ };
[SCREENS.GET_ASSISTANCE]: {
backTo: Routes;
};
diff --git a/src/libs/Notification/PushNotification/subscribePushNotification/index.ts b/src/libs/Notification/PushNotification/subscribePushNotification/index.ts
index 18099f157d6a..d60e66f8d535 100644
--- a/src/libs/Notification/PushNotification/subscribePushNotification/index.ts
+++ b/src/libs/Notification/PushNotification/subscribePushNotification/index.ts
@@ -1,5 +1,4 @@
import Onyx from 'react-native-onyx';
-import type {OnyxCollection} from 'react-native-onyx';
import applyOnyxUpdatesReliably from '@libs/actions/applyOnyxUpdatesReliably';
import * as ActiveClientManager from '@libs/ActiveClientManager';
import Log from '@libs/Log';
@@ -7,13 +6,14 @@ import Navigation from '@libs/Navigation/Navigation';
import type {ReportActionPushNotificationData} from '@libs/Notification/PushNotification/NotificationType';
import getPolicyEmployeeAccountIDs from '@libs/PolicyEmployeeListUtils';
import {extractPolicyIDFromPath} from '@libs/PolicyUtils';
+import * as ReportConnection from '@libs/ReportConnection';
import {doesReportBelongToWorkspace} from '@libs/ReportUtils';
import Visibility from '@libs/Visibility';
import * as Modal from '@userActions/Modal';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
-import type {OnyxUpdatesFromServer, Report} from '@src/types/onyx';
+import type {OnyxUpdatesFromServer} from '@src/types/onyx';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import PushNotification from '..';
@@ -28,13 +28,6 @@ Onyx.connect({
},
});
-let allReports: OnyxCollection;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
function getLastUpdateIDAppliedToClient(): Promise {
return new Promise((resolve) => {
Onyx.connect({
@@ -82,7 +75,7 @@ function navigateToReport({reportID, reportActionID}: ReportActionPushNotificati
Log.info('[PushNotification] Navigating to report', false, {reportID, reportActionID});
const policyID = lastVisitedPath && extractPolicyIDFromPath(lastVisitedPath);
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
const policyEmployeeAccountIDs = policyID ? getPolicyEmployeeAccountIDs(policyID) : [];
const reportBelongsToWorkspace = policyID && !isEmptyObject(report) && doesReportBelongToWorkspace(report, policyEmployeeAccountIDs, policyID);
diff --git a/src/libs/OnyxAwareParser.ts b/src/libs/OnyxAwareParser.ts
deleted file mode 100644
index c058775341c2..000000000000
--- a/src/libs/OnyxAwareParser.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import {ExpensiMark} from 'expensify-common';
-import Onyx from 'react-native-onyx';
-import ONYXKEYS from '@src/ONYXKEYS';
-
-const parser = new ExpensiMark();
-
-const reportIDToNameMap: Record = {};
-const accountIDToNameMap: Record = {};
-
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- callback: (report) => {
- if (!report) {
- return;
- }
-
- reportIDToNameMap[report.reportID] = report.reportName ?? report.displayName ?? report.reportID;
- },
-});
-
-Onyx.connect({
- key: ONYXKEYS.PERSONAL_DETAILS_LIST,
- callback: (personalDetailsList) => {
- Object.values(personalDetailsList ?? {}).forEach((personalDetails) => {
- if (!personalDetails) {
- return;
- }
-
- accountIDToNameMap[personalDetails.accountID] = personalDetails.login ?? String(personalDetails.accountID);
- });
- },
-});
-
-function parseHtmlToMarkdown(
- html: string,
- reportIDToName?: Record,
- accountIDToName?: Record,
- cacheVideoAttributes?: (videoSource: string, videoAttrs: string) => void,
-): string {
- return parser.htmlToMarkdown(html, {reportIDToName: reportIDToName ?? reportIDToNameMap, accountIDToName: accountIDToName ?? accountIDToNameMap, cacheVideoAttributes});
-}
-
-function parseHtmlToText(
- html: string,
- reportIDToName?: Record,
- accountIDToName?: Record,
- cacheVideoAttributes?: (videoSource: string, videoAttrs: string) => void,
-): string {
- return parser.htmlToText(html, {reportIDToName: reportIDToName ?? reportIDToNameMap, accountIDToName: accountIDToName ?? accountIDToNameMap, cacheVideoAttributes});
-}
-
-export {parseHtmlToMarkdown, parseHtmlToText};
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index fc73c85b0354..f20d27ffdf22 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -53,6 +53,7 @@ import * as PersonalDetailsUtils from './PersonalDetailsUtils';
import * as PhoneNumber from './PhoneNumber';
import * as PolicyUtils from './PolicyUtils';
import * as ReportActionUtils from './ReportActionsUtils';
+import * as ReportConnection from './ReportConnection';
import * as ReportUtils from './ReportUtils';
import * as TaskUtils from './TaskUtils';
import * as TransactionUtils from './TransactionUtils';
@@ -339,13 +340,6 @@ Onyx.connect({
},
});
-let allReports: OnyxCollection = {};
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
let allReportsDraft: OnyxCollection;
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT_DRAFT,
@@ -357,6 +351,7 @@ Onyx.connect({
* Get the report or draft report given a reportID
*/
function getReportOrDraftReport(reportID: string | undefined): OnyxEntry {
+ const allReports = ReportConnection.getAllReports();
if (!allReports && !allReportsDraft) {
return undefined;
}
@@ -2495,11 +2490,6 @@ function filterOptions(options: Options, searchInputValue: string, config?: Filt
values.push(item.login.replace(emailRegex, ''));
}
- if (!item.isChatRoom) {
- const participantNames = getParticipantNames(item.participantsList ?? []);
- values = values.concat(Array.from(participantNames));
- }
-
if (item.isThread) {
if (item.alternateText) {
values.push(item.alternateText);
@@ -2509,7 +2499,11 @@ function filterOptions(options: Options, searchInputValue: string, config?: Filt
if (item.subtitle) {
values.push(item.subtitle);
}
- } else {
+ }
+
+ if (!item.isChatRoom) {
+ const participantNames = getParticipantNames(item.participantsList ?? []);
+ values = values.concat(Array.from(participantNames));
values = values.concat(getParticipantsLoginsArray(item));
}
diff --git a/src/libs/Parser.ts b/src/libs/Parser.ts
new file mode 100644
index 000000000000..cbfeb6e40922
--- /dev/null
+++ b/src/libs/Parser.ts
@@ -0,0 +1,51 @@
+// eslint-disable-next-line no-restricted-imports
+import {ExpensiMark} from 'expensify-common';
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+import Log from './Log';
+import * as ReportConnection from './ReportConnection';
+
+const accountIDToNameMap: Record = {};
+
+Onyx.connect({
+ key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+ callback: (personalDetailsList) => {
+ Object.values(personalDetailsList ?? {}).forEach((personalDetails) => {
+ if (!personalDetails) {
+ return;
+ }
+
+ accountIDToNameMap[personalDetails.accountID] = personalDetails.login ?? String(personalDetails.accountID);
+ });
+ },
+});
+
+type Extras = {
+ reportIDToName?: Record;
+ accountIDToName?: Record;
+ cacheVideoAttributes?: (vidSource: string, attrs: string) => void;
+ videoAttributeCache?: Record;
+};
+
+class ExpensiMarkWithContext extends ExpensiMark {
+ htmlToMarkdown(htmlString: string, extras?: Extras): string {
+ return super.htmlToMarkdown(htmlString, {
+ reportIDToName: extras?.reportIDToName ?? ReportConnection.getAllReportsNameMap(),
+ accountIDToName: extras?.accountIDToName ?? accountIDToNameMap,
+ cacheVideoAttributes: extras?.cacheVideoAttributes,
+ });
+ }
+
+ htmlToText(htmlString: string, extras?: Extras): string {
+ return super.htmlToText(htmlString, {
+ reportIDToName: extras?.reportIDToName ?? ReportConnection.getAllReportsNameMap(),
+ accountIDToName: extras?.accountIDToName ?? accountIDToNameMap,
+ cacheVideoAttributes: extras?.cacheVideoAttributes,
+ });
+ }
+}
+
+ExpensiMarkWithContext.setLogger(Log);
+const Parser = new ExpensiMarkWithContext();
+
+export default Parser;
diff --git a/src/libs/PersonalDetailsUtils.ts b/src/libs/PersonalDetailsUtils.ts
index 8bdf0cb1d5fe..9beb3d382696 100644
--- a/src/libs/PersonalDetailsUtils.ts
+++ b/src/libs/PersonalDetailsUtils.ts
@@ -32,11 +32,16 @@ Onyx.connect({
},
});
+const hiddenTranslation = Localize.translateLocal('common.hidden');
+const youTranslation = Localize.translateLocal('common.you').toLowerCase();
+
+const regexMergedAccount = new RegExp(CONST.REGEX.MERGED_ACCOUNT_PREFIX);
+
function getDisplayNameOrDefault(passedPersonalDetails?: Partial | null, defaultValue = '', shouldFallbackToHidden = true, shouldAddCurrentUserPostfix = false): string {
let displayName = passedPersonalDetails?.displayName ?? '';
// If the displayName starts with the merged account prefix, remove it.
- if (new RegExp(CONST.REGEX.MERGED_ACCOUNT_PREFIX).test(displayName)) {
+ if (regexMergedAccount.test(displayName)) {
// Remove the merged account prefix from the displayName.
displayName = displayName.replace(CONST.REGEX.MERGED_ACCOUNT_PREFIX, '');
}
@@ -48,7 +53,7 @@ function getDisplayNameOrDefault(passedPersonalDetails?: Partial type === CONST.NETSUITE_ACCOUNT_TYPE.BANK || type === CONST.NETSUITE_ACCOUNT_TYPE.CREDIT_CARD);
+
+ return accountOptions.map(({id, name}) => ({
+ value: id,
+ text: name,
+ keyForList: id,
+ isSelected: selectedBankAccountId === id,
+ }));
+}
+
+function getNetSuiteCollectionAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+ const payableAccounts = policy?.connections?.netsuite.options.data.payableList ?? [];
+ const accountOptions = (payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.BANK);
+
+ return accountOptions.map(({id, name}) => ({
+ value: id,
+ text: name,
+ keyForList: id,
+ isSelected: selectedBankAccountId === id,
+ }));
+}
+
+function getNetSuiteApprovalAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+ const payableAccounts = policy?.connections?.netsuite.options.data.payableList ?? [];
+ const defaultApprovalAccount: NetSuiteAccount = {
+ id: CONST.NETSUITE_APPROVAL_ACCOUNT_DEFAULT,
+ name: Localize.translateLocal('workspace.netsuite.advancedConfig.defaultApprovalAccount'),
+ type: CONST.NETSUITE_ACCOUNT_TYPE.ACCOUNTS_PAYABLE,
+ };
+ const accountOptions = [defaultApprovalAccount].concat((payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.ACCOUNTS_PAYABLE));
+
+ return accountOptions.map(({id, name}) => ({
+ value: id,
+ text: name,
+ keyForList: id,
+ isSelected: selectedBankAccountId === id,
+ }));
+}
+
function getCustomersOrJobsLabelNetSuite(policy: Policy | undefined, translate: LocaleContextProps['translate']): string | undefined {
const importMapping = policy?.connections?.netsuite?.options?.config?.syncOptions?.mapping;
if (!importMapping?.customers && !importMapping?.jobs) {
@@ -670,6 +712,9 @@ export {
getNetSuiteVendorOptions,
canUseTaxNetSuite,
canUseProvincialTaxNetSuite,
+ getNetSuiteReimbursableAccountOptions,
+ getNetSuiteCollectionAccountOptions,
+ getNetSuiteApprovalAccountOptions,
getNetSuitePayableAccountOptions,
getNetSuiteReceivableAccountOptions,
getNetSuiteInvoiceItemOptions,
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 0cda663931e4..3f8acd0e06fe 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -20,8 +20,9 @@ import isReportMessageAttachment from './isReportMessageAttachment';
import * as Localize from './Localize';
import Log from './Log';
import type {MessageElementBase, MessageTextElement} from './MessageElement';
-import {parseHtmlToText} from './OnyxAwareParser';
+import Parser from './Parser';
import * as PersonalDetailsUtils from './PersonalDetailsUtils';
+import * as ReportConnection from './ReportConnection';
import type {OptimisticIOUReportAction, PartialReportAction} from './ReportUtils';
import StringUtils from './StringUtils';
// eslint-disable-next-line import/no-cycle
@@ -46,15 +47,6 @@ type MemberChangeMessageRoomReferenceElement = {
type MemberChangeMessageElement = MessageTextElement | MemberChangeMessageUserMentionElement | MemberChangeMessageRoomReferenceElement;
-let allReports: OnyxCollection = {};
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (reports) => {
- allReports = reports;
- },
-});
-
let allReportActions: OnyxCollection;
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
@@ -351,6 +343,14 @@ function getSortedReportActions(reportActions: ReportAction[] | null, shouldSort
return sortedActions;
}
+/**
+ * Returns filtered list for one transaction view as we don't want to display IOU action type in the one-transaction view
+ * Separated it from getCombinedReportActions, so it can be reused
+ */
+function getFilteredForOneTransactionView(reportActions: ReportAction[]): ReportAction[] {
+ return reportActions.filter((action) => !isSentMoneyReportAction(action));
+}
+
/**
* Returns a sorted and filtered list of report actions from a report and it's associated child
* transaction thread report in order to correctly display reportActions from both reports in the one-transaction report view.
@@ -370,7 +370,7 @@ function getCombinedReportActions(
// Filter out request money actions because we don't want to show any preview actions for one transaction reports
const filteredTransactionThreadReportActions = transactionThreadReportActions?.filter((action) => action.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED);
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
const isSelfDM = report?.chatType === CONST.REPORT.CHAT_TYPE.SELF_DM;
// Filter out request and send money request actions because we don't want to show any preview actions for one transaction reports
const filteredReportActions = [...reportActions, ...filteredTransactionThreadReportActions].filter((action) => {
@@ -664,8 +664,13 @@ function replaceBaseURLInPolicyChangeLogAction(reportAction: ReportAction): Repo
}
function getLastVisibleAction(reportID: string, actionsToMerge: OnyxCollection | OnyxCollectionInputValue = {}): OnyxEntry {
- const reportActions = Object.values(fastMerge(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {}, actionsToMerge ?? {}, true));
- const visibleReportActions = Object.values(reportActions ?? {}).filter((action): action is ReportAction => shouldReportActionBeVisibleAsLastAction(action));
+ let reportActions: Array = [];
+ if (!_.isEmpty(actionsToMerge)) {
+ reportActions = Object.values(fastMerge(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {}, actionsToMerge ?? {}, true));
+ } else {
+ reportActions = Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {});
+ }
+ const visibleReportActions = reportActions.filter((action): action is ReportAction => shouldReportActionBeVisibleAsLastAction(action));
const sortedReportActions = getSortedReportActions(visibleReportActions, true);
if (sortedReportActions.length === 0) {
return undefined;
@@ -827,7 +832,7 @@ function getMostRecentReportActionLastModified(): string {
// We might not have actions so we also look at the report objects to see if any have a lastVisibleActionLastModified that is more recent. We don't need to get
// any reports that have been updated before either a recently updated report or reportAction as we should be up to date on these
- Object.values(allReports ?? {}).forEach((report) => {
+ Object.values(ReportConnection.getAllReports() ?? {}).forEach((report) => {
const reportLastVisibleActionLastModified = report?.lastVisibleActionLastModified ?? report?.lastVisibleActionCreated;
if (!reportLastVisibleActionLastModified || reportLastVisibleActionLastModified < mostRecentReportActionLastModified) {
return;
@@ -898,7 +903,7 @@ function isTaskAction(reportAction: OnyxEntry): boolean {
*/
function getOneTransactionThreadReportID(reportID: string, reportActions: OnyxEntry | ReportAction[], isOffline: boolean | undefined = undefined): string | undefined {
// If the report is not an IOU, Expense report, or Invoice, it shouldn't be treated as one-transaction report.
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
if (report?.type !== CONST.REPORT.TYPE.IOU && report?.type !== CONST.REPORT.TYPE.EXPENSE && report?.type !== CONST.REPORT.TYPE.INVOICE) {
return;
}
@@ -1075,11 +1080,11 @@ function getReportActionText(reportAction: PartialReportAction): string {
// Sometime html can be an empty string
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const text = (message?.html || message?.text) ?? '';
- return text ? parseHtmlToText(text) : '';
+ return text ? Parser.htmlToText(text) : '';
}
function getTextFromHtml(html?: string): string {
- return html ? parseHtmlToText(html) : '';
+ return html ? Parser.htmlToText(html) : '';
}
function getMemberChangeMessageFragment(reportAction: OnyxEntry): Message {
@@ -1137,7 +1142,6 @@ function isOldDotReportAction(action: ReportAction | OldDotReportAction) {
CONST.REPORT.ACTIONS.TYPE.SHARE,
CONST.REPORT.ACTIONS.TYPE.STRIPE_PAID,
CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL,
- CONST.REPORT.ACTIONS.TYPE.UNAPPROVED,
CONST.REPORT.ACTIONS.TYPE.UNSHARE,
CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT,
CONST.REPORT.ACTIONS.TYPE.DONATION,
@@ -1172,7 +1176,7 @@ function getMessageOfOldDotReportAction(oldDotAction: PartialReportAction | OldD
case CONST.REPORT.ACTIONS.TYPE.CHANGE_FIELD: {
const {oldValue, newValue, fieldName} = originalMessage;
if (!oldValue) {
- Localize.translateLocal('report.actions.type.changeFieldEmpty', {newValue, fieldName});
+ return Localize.translateLocal('report.actions.type.changeFieldEmpty', {newValue, fieldName});
}
return Localize.translateLocal('report.actions.type.changeField', {oldValue, newValue, fieldName});
}
@@ -1329,8 +1333,7 @@ function isActionableJoinRequest(reportAction: OnyxEntry): reportA
* @param reportID
*/
function isActionableJoinRequestPending(reportID: string): boolean {
- const sortedReportActions = getSortedReportActions(Object.values(getAllReportActions(reportID)));
- const findPendingRequest = sortedReportActions.find(
+ const findPendingRequest = Object.values(getAllReportActions(reportID)).find(
(reportActionItem) => isActionableJoinRequest(reportActionItem) && getOriginalMessage(reportActionItem)?.choice === ('' as JoinWorkspaceResolution),
);
return !!findPendingRequest;
@@ -1376,7 +1379,7 @@ function wasActionTakenByCurrentUser(reportAction: OnyxInputOrEntry {
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
const reportActions = getAllReportActions(report?.reportID ?? '');
const action = Object.values(reportActions ?? {})?.find((reportAction) => {
const IOUTransactionID = isMoneyRequestAction(reportAction) ? getOriginalMessage(reportAction)?.IOUTransactionID : -1;
@@ -1477,6 +1480,7 @@ export {
getTextFromHtml,
isTripPreview,
getIOUActionForReportID,
+ getFilteredForOneTransactionView,
};
export type {LastVisibleMessage};
diff --git a/src/libs/ReportConnection.ts b/src/libs/ReportConnection.ts
new file mode 100644
index 000000000000..86e73229e84b
--- /dev/null
+++ b/src/libs/ReportConnection.ts
@@ -0,0 +1,47 @@
+import type {OnyxCollection} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report} from '@src/types/onyx';
+import * as PriorityModeActions from './actions/PriorityMode';
+import * as ReportHelperActions from './actions/Report';
+
+// Dynamic Import to avoid circular dependency
+const UnreadIndicatorUpdaterHelper = () => import('./UnreadIndicatorUpdater');
+
+const reportIDToNameMap: Record = {};
+let allReports: OnyxCollection;
+Onyx.connect({
+ key: ONYXKEYS.COLLECTION.REPORT,
+ waitForCollectionCallback: true,
+ callback: (value) => {
+ allReports = value;
+ UnreadIndicatorUpdaterHelper().then((module) => {
+ module.triggerUnreadUpdate();
+ });
+ // Each time a new report is added we will check to see if the user should be switched
+ PriorityModeActions.autoSwitchToFocusMode();
+
+ if (!value) {
+ return;
+ }
+ Object.values(value).forEach((report) => {
+ if (!report) {
+ return;
+ }
+ reportIDToNameMap[report.reportID] = report.reportName ?? report.displayName ?? report.reportID;
+ ReportHelperActions.handleReportChanged(report);
+ });
+ },
+});
+
+// This function is used to get all reports
+function getAllReports() {
+ return allReports;
+}
+
+// This function is used to get all reports name map
+function getAllReportsNameMap() {
+ return reportIDToNameMap;
+}
+
+export {getAllReports, getAllReportsNameMap};
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 342e2439ed66..bf1d86dad32f 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1,5 +1,5 @@
import {format} from 'date-fns';
-import {ExpensiMark, Str} from 'expensify-common';
+import {Str} from 'expensify-common';
import {isEmpty} from 'lodash';
import lodashEscape from 'lodash/escape';
import lodashFindLastIndex from 'lodash/findLastIndex';
@@ -63,13 +63,14 @@ import ModifiedExpenseMessage from './ModifiedExpenseMessage';
import linkingConfig from './Navigation/linkingConfig';
import Navigation from './Navigation/Navigation';
import * as NumberUtils from './NumberUtils';
-import {parseHtmlToText} from './OnyxAwareParser';
+import Parser from './Parser';
import Permissions from './Permissions';
import * as PersonalDetailsUtils from './PersonalDetailsUtils';
import * as PhoneNumber from './PhoneNumber';
import * as PolicyUtils from './PolicyUtils';
import type {LastVisibleMessage} from './ReportActionsUtils';
import * as ReportActionsUtils from './ReportActionsUtils';
+import * as ReportConnection from './ReportConnection';
import StringUtils from './StringUtils';
import * as SubscriptionUtils from './SubscriptionUtils';
import * as TransactionUtils from './TransactionUtils';
@@ -187,6 +188,11 @@ type OptimisticApprovedReportAction = Pick<
'actionName' | 'actorAccountID' | 'automatic' | 'avatar' | 'isAttachment' | 'originalMessage' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'created' | 'pendingAction'
>;
+type OptimisticUnapprovedReportAction = Pick<
+ ReportAction,
+ 'actionName' | 'actorAccountID' | 'automatic' | 'avatar' | 'isAttachment' | 'originalMessage' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'created' | 'pendingAction'
+>;
+
type OptimisticSubmittedReportAction = Pick<
ReportAction,
| 'actionName'
@@ -473,7 +479,6 @@ let isAnonymousUser = false;
const parsedReportActionMessageCache: Record = {};
const defaultAvatarBuildingIconTestID = 'SvgDefaultAvatarBuilding Icon';
-
Onyx.connect({
key: ONYXKEYS.SESSION,
callback: (value) => {
@@ -501,13 +506,6 @@ Onyx.connect({
},
});
-let allReports: OnyxCollection;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
let allReportsDraft: OnyxCollection;
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT_DRAFT,
@@ -552,23 +550,6 @@ Onyx.connect({
},
});
-let lastUpdatedReport: OnyxEntry;
-
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- callback: (value) => {
- if (!value) {
- return;
- }
-
- lastUpdatedReport = value;
- },
-});
-
-function getLastUpdatedReport(): OnyxEntry {
- return lastUpdatedReport;
-}
-
function getCurrentUserAvatar(): AvatarSource | undefined {
return currentUserPersonalDetails?.avatar;
}
@@ -585,6 +566,7 @@ function getChatType(report: OnyxInputOrEntry | Participant): ValueOf {
+ const allReports = ReportConnection.getAllReports();
if (!allReports && !allReportsDraft) {
return undefined;
}
@@ -611,7 +593,7 @@ function getParentReport(report: OnyxEntry): OnyxEntry {
if (!report?.parentReportID) {
return undefined;
}
- return allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`];
+ return ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`];
}
/**
@@ -652,17 +634,18 @@ function getPolicyType(report: OnyxInputOrEntry, policies: OnyxCollectio
return policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.type ?? '';
}
+const unavailableTranslation = Localize.translateLocal('workspace.common.unavailable');
/**
* Get the policy name from a given report
*/
function getPolicyName(report: OnyxInputOrEntry, returnEmptyIfNotFound = false, policy?: OnyxInputOrEntry): string {
- const noPolicyFound = returnEmptyIfNotFound ? '' : Localize.translateLocal('workspace.common.unavailable');
+ const noPolicyFound = returnEmptyIfNotFound ? '' : unavailableTranslation;
if (isEmptyObject(report)) {
return noPolicyFound;
}
if ((!allPolicies || Object.keys(allPolicies).length === 0) && !report?.policyName) {
- return Localize.translateLocal('workspace.common.unavailable');
+ return unavailableTranslation;
}
const finalPolicy = policy ?? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`];
@@ -706,7 +689,7 @@ function isExpenseReport(report: OnyxInputOrEntry): boolean {
* Checks if a report is an IOU report using report or reportID
*/
function isIOUReport(reportOrID: OnyxInputOrEntry | string): boolean {
- const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
+ const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
return report?.type === CONST.REPORT.TYPE.IOU;
}
@@ -771,13 +754,20 @@ function isReportManager(report: OnyxEntry): boolean {
* Checks if the supplied report has been approved
*/
function isReportApproved(reportOrID: OnyxInputOrEntry | string, parentReportAction: OnyxEntry = undefined): boolean {
- const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
+ const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
if (!report) {
return parentReportAction?.childStateNum === CONST.REPORT.STATE_NUM.APPROVED && parentReportAction?.childStatusNum === CONST.REPORT.STATUS_NUM.APPROVED;
}
return report?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && report?.statusNum === CONST.REPORT.STATUS_NUM.APPROVED;
}
+/**
+ * Checks if the supplied report has been manually reimbursed
+ */
+function isReportManuallyReimbursed(report: OnyxEntry): boolean {
+ return report?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && report?.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED;
+}
+
/**
* Checks if the supplied report is an expense report in Open state and status.
*/
@@ -808,6 +798,7 @@ function hasParticipantInArray(report: OnyxEntry, memberAccountIDs: numb
* Whether the Money Request report is settled
*/
function isSettled(reportID: string | undefined): boolean {
+ const allReports = ReportConnection.getAllReports();
if (!allReports || !reportID) {
return false;
}
@@ -829,6 +820,7 @@ function isSettled(reportID: string | undefined): boolean {
* Whether the current user is the submitter of the report
*/
function isCurrentUserSubmitter(reportID: string): boolean {
+ const allReports = ReportConnection.getAllReports();
if (!allReports) {
return false;
}
@@ -891,7 +883,7 @@ function isInvoiceRoom(report: OnyxEntry): boolean {
function isInvoiceRoomWithID(reportID?: string): boolean {
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`];
return isInvoiceRoom(report);
}
@@ -972,7 +964,7 @@ function isOpenInvoiceReport(report: OnyxEntry): boolean {
* Whether the provided report is a chat room
*/
function isChatRoom(report: OnyxEntry): boolean {
- return isUserCreatedPolicyRoom(report) || isDefaultRoom(report) || isInvoiceRoom(report);
+ return isUserCreatedPolicyRoom(report) || isDefaultRoom(report) || isInvoiceRoom(report) || isTripRoom(report);
}
/**
@@ -1011,7 +1003,7 @@ function isWorkspaceTaskReport(report: OnyxEntry): boolean {
if (!isTaskReport(report)) {
return false;
}
- const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
+ const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
return isPolicyExpenseChat(parentReport);
}
@@ -1052,13 +1044,12 @@ function isSystemChat(report: OnyxEntry): boolean {
* Only returns true if this is our main 1:1 DM report with Concierge.
*/
function isConciergeChatReport(report: OnyxInputOrEntry): boolean {
- const participantAccountIDs = Object.keys(report?.participants ?? {})
- .map(Number)
- .filter((accountID) => accountID !== currentUserAccountID);
- return participantAccountIDs.length === 1 && participantAccountIDs[0] === CONST.ACCOUNT_ID.CONCIERGE && !isChatThread(report);
+ const participantAccountIDs = Object.keys(report?.participants ?? {});
+ return participantAccountIDs.length === 1 && Number(participantAccountIDs[0]) === CONST.ACCOUNT_ID.CONCIERGE && !isChatThread(report);
}
function findSelfDMReportID(): string | undefined {
+ const allReports = ReportConnection.getAllReports();
if (!allReports) {
return;
}
@@ -1266,7 +1257,7 @@ function isArchivedRoom(report: OnyxInputOrEntry, reportNameValuePairs?:
*/
function isArchivedRoomWithID(reportID?: string) {
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`];
return isArchivedRoom(report);
}
@@ -1398,7 +1389,7 @@ function isChildReport(report: OnyxEntry): boolean {
function isExpenseRequest(report: OnyxInputOrEntry): boolean {
if (isThread(report)) {
const parentReportAction = ReportActionsUtils.getParentReportAction(report);
- const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
+ const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
return isExpenseReport(parentReport) && !isEmptyObject(parentReportAction) && ReportActionsUtils.isTransactionThread(parentReportAction);
}
return false;
@@ -1411,7 +1402,7 @@ function isExpenseRequest(report: OnyxInputOrEntry): boolean {
function isIOURequest(report: OnyxInputOrEntry): boolean {
if (isThread(report)) {
const parentReportAction = ReportActionsUtils.getParentReportAction(report);
- const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
+ const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
return isIOUReport(parentReport) && !isEmptyObject(parentReportAction) && ReportActionsUtils.isTransactionThread(parentReportAction);
}
return false;
@@ -1433,7 +1424,7 @@ function isTrackExpenseReport(report: OnyxInputOrEntry): boolean {
* Checks if a report is an IOU or expense request.
*/
function isMoneyRequest(reportOrID: OnyxEntry | string): boolean {
- const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
+ const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
return isIOURequest(report) || isExpenseRequest(report);
}
@@ -1441,7 +1432,7 @@ function isMoneyRequest(reportOrID: OnyxEntry | string): boolean {
* Checks if a report is an IOU or expense report.
*/
function isMoneyRequestReport(reportOrID: OnyxInputOrEntry | string): boolean {
- const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
+ const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
return isIOUReport(report) || isExpenseReport(report);
}
@@ -1668,7 +1659,7 @@ function getReportRecipientAccountIDs(report: OnyxEntry, currentLoginAcc
// In 1:1 chat threads, the participants will be the same as parent report. If a report is specifically a 1:1 chat thread then we will
// get parent report and use its participants array.
if (isThread(report) && !(isTaskReport(report) || isMoneyRequestReport(report))) {
- const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
+ const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
if (isOneOnOneChat(parentReport)) {
finalReport = parentReport;
}
@@ -1857,6 +1848,7 @@ function getPersonalDetailsForAccountID(accountID: number): Partial | string,
shouldUseShortDisplayName = true,
): string {
- const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
+ const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
const submitterDisplayName = getDisplayNameForParticipant(report?.ownerAccountID, shouldUseShortDisplayName) ?? '';
const originalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
let messageKey: TranslationPaths;
@@ -2238,7 +2230,7 @@ function getReimbursementDeQueuedActionMessage(
reportOrID: OnyxEntry | string,
isLHNPreview = false,
): string {
- const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
+ const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
const originalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
const amount = originalMessage?.amount;
const currency = originalMessage?.currency;
@@ -2392,7 +2384,7 @@ function hasNonReimbursableTransactions(iouReportID: string | undefined): boolea
}
function getMoneyRequestSpendBreakdown(report: OnyxInputOrEntry, allReportsDict?: OnyxCollection): SpendBreakdown {
- const allAvailableReports = allReportsDict ?? allReports;
+ const allAvailableReports = allReportsDict ?? ReportConnection.getAllReports();
let moneyRequestReport;
if (isMoneyRequestReport(report) || isInvoiceReport(report)) {
moneyRequestReport = report;
@@ -2739,7 +2731,7 @@ function canEditFieldOfMoneyRequest(reportAction: OnyxInputOrEntry
}
const iouMessage = ReportActionsUtils.getOriginalMessage(reportAction);
- const moneyRequestReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouMessage?.IOUReportID}`] ?? ({} as Report);
+ const moneyRequestReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${iouMessage?.IOUReportID}`] ?? ({} as Report);
const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${iouMessage?.IOUTransactionID}`] ?? ({} as Transaction);
if (isSettled(String(moneyRequestReport.reportID)) || isReportApproved(String(moneyRequestReport.reportID))) {
@@ -2987,7 +2979,7 @@ function getReportPreviewMessage(
isForListPreview = false,
originalReportAction: OnyxInputOrEntry = iouReportAction,
): string {
- const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
+ const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
const reportActionMessage = ReportActionsUtils.getReportActionHtml(iouReportAction);
if (isEmptyObject(report) || !report?.reportID) {
@@ -3310,7 +3302,7 @@ function parseReportActionHtmlToText(reportAction: OnyxEntry, repo
const logins = PersonalDetailsUtils.getLoginsByAccountIDs(accountIDs);
accountIDs.forEach((id, index) => (accountIDToName[id] = logins[index]));
- const textMessage = Str.removeSMSDomain(parseHtmlToText(html, reportIDToName, accountIDToName));
+ const textMessage = Str.removeSMSDomain(Parser.htmlToText(html, {reportIDToName, accountIDToName}));
parsedReportActionMessageCache[key] = textMessage;
return textMessage;
@@ -3455,10 +3447,13 @@ function getReportName(report: OnyxEntry, policy?: OnyxEntry, pa
}
// Not a room or PolicyExpenseChat, generate title from first 5 other participants
- const participantsWithoutCurrentUser = Object.keys(report?.participants ?? {})
- .map(Number)
- .filter((accountID) => accountID !== currentUserAccountID)
- .slice(0, 5);
+ const participantsWithoutCurrentUser: number[] = [];
+ Object.keys(report?.participants ?? {}).forEach((accountID) => {
+ const accID = Number(accountID);
+ if (accID !== currentUserAccountID && participantsWithoutCurrentUser.length < 5) {
+ participantsWithoutCurrentUser.push(accID);
+ }
+ });
const isMultipleParticipantReport = participantsWithoutCurrentUser.length > 1;
return participantsWithoutCurrentUser.map((accountID) => getDisplayNameForParticipant(accountID, isMultipleParticipantReport)).join(', ');
}
@@ -3662,7 +3657,6 @@ function getParsedComment(text: string, parsingDetails?: ParsingDetails): string
isGroupPolicyReport = isReportInGroupPolicy(currentReport);
}
- const parser = new ExpensiMark();
const textWithMention = text.replace(CONST.REGEX.SHORT_MENTION, (match) => {
if (!Str.isValidMention(match)) {
return match;
@@ -3673,7 +3667,7 @@ function getParsedComment(text: string, parsingDetails?: ParsingDetails): string
});
return text.length <= CONST.MAX_MARKUP_LENGTH
- ? parser.replace(textWithMention, {shouldEscapeText: parsingDetails?.shouldEscapeText, disabledRules: isGroupPolicyReport ? [] : ['reportMentions']})
+ ? Parser.replace(textWithMention, {shouldEscapeText: parsingDetails?.shouldEscapeText, disabledRules: isGroupPolicyReport ? [] : ['reportMentions']})
: lodashEscape(text);
}
@@ -3682,7 +3676,7 @@ function getReportDescriptionText(report: Report): string {
return '';
}
- return parseHtmlToText(report.description);
+ return Parser.htmlToText(report.description);
}
function getPolicyDescriptionText(policy: OnyxEntry): string {
@@ -3690,7 +3684,7 @@ function getPolicyDescriptionText(policy: OnyxEntry): string {
return '';
}
- return parseHtmlToText(policy.description);
+ return Parser.htmlToText(policy.description);
}
function buildOptimisticAddCommentReportAction(
@@ -3712,10 +3706,10 @@ function buildOptimisticAddCommentReportAction(
textForNewComment = CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML;
} else if (isTextOnly) {
htmlForNewComment = commentText;
- textForNewComment = parseHtmlToText(htmlForNewComment);
+ textForNewComment = Parser.htmlToText(htmlForNewComment);
} else {
htmlForNewComment = `${commentText}${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`;
- textForNewComment = `${parseHtmlToText(commentText)}\n${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`;
+ textForNewComment = `${Parser.htmlToText(commentText)}\n${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`;
}
const isAttachment = !text && file !== undefined;
@@ -3959,7 +3953,7 @@ function buildOptimisticInvoiceReport(chatReportID: string, policyID: string, re
function buildOptimisticExpenseReport(chatReportID: string, policyID: string, payeeAccountID: number, total: number, currency: string, reimbursable = true): OptimisticExpenseReport {
// The amount for Expense reports are stored as negative value in the database
const storedTotal = total * -1;
- const policyName = getPolicyName(allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`]);
+ const policyName = getPolicyName(ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`]);
const formattedTotal = CurrencyUtils.convertToDisplayString(storedTotal, currency);
const policy = getPolicy(policyID);
@@ -4039,6 +4033,9 @@ function getIOUReportActionMessage(iouReportID: string, type: string, total: num
case CONST.REPORT.ACTIONS.TYPE.APPROVED:
iouMessage = `approved ${amount}`;
break;
+ case CONST.REPORT.ACTIONS.TYPE.UNAPPROVED:
+ iouMessage = `unapproved ${amount}`;
+ break;
case CONST.IOU.REPORT_ACTION_TYPE.CREATE:
iouMessage = `submitted ${amount}${comment && ` for ${comment}`}`;
break;
@@ -4201,6 +4198,36 @@ function buildOptimisticApprovedReportAction(amount: number, currency: string, e
};
}
+/**
+ * Builds an optimistic APPROVED report action with a randomly generated reportActionID.
+ */
+function buildOptimisticUnapprovedReportAction(amount: number, currency: string, expenseReportID: string): OptimisticUnapprovedReportAction {
+ return {
+ actionName: CONST.REPORT.ACTIONS.TYPE.UNAPPROVED,
+ actorAccountID: currentUserAccountID,
+ automatic: false,
+ avatar: getCurrentUserAvatar(),
+ isAttachment: false,
+ originalMessage: {
+ amount,
+ currency,
+ expenseReportID,
+ },
+ message: getIOUReportActionMessage(expenseReportID, CONST.REPORT.ACTIONS.TYPE.UNAPPROVED, Math.abs(amount), '', currency),
+ person: [
+ {
+ style: 'strong',
+ text: getCurrentUserDisplayNameOrEmail(),
+ type: 'TEXT',
+ },
+ ],
+ reportActionID: NumberUtils.rand64(),
+ shouldShow: true,
+ created: DateUtils.getDBTime(),
+ pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+ };
+}
+
/**
* Builds an optimistic MOVED report action with a randomly generated reportActionID.
* This action is used when we move reports across workspaces.
@@ -5219,7 +5246,7 @@ function isUnread(report: OnyxEntry): boolean {
}
function isIOUOwnedByCurrentUser(report: OnyxEntry, allReportsDict?: OnyxCollection): boolean {
- const allAvailableReports = allReportsDict ?? allReports;
+ const allAvailableReports = allReportsDict ?? ReportConnection.getAllReports();
if (!report || !allAvailableReports) {
return false;
}
@@ -5382,30 +5409,28 @@ function shouldReportBeInOptionList({
// This can also happen for anyone accessing a public room or archived room for which they don't have access to the underlying policy.
// Optionally exclude reports that do not belong to currently active workspace
- const participantAccountIDs = Object.keys(report?.participants ?? {}).map(Number);
-
if (
!report?.reportID ||
!report?.type ||
report?.reportName === undefined ||
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
report?.isHidden ||
- (participantAccountIDs.length === 0 &&
+ (!report?.participants &&
+ // We omit sending back participants for chat rooms when searching for reports since they aren't needed to display the results and can get very large.
+ // So we allow showing rooms with no participants–in any other circumstances we should never have these reports with no participants in Onyx.
+ !isChatRoom(report) &&
!isChatThread(report) &&
- !isPublicRoom(report) &&
- !isUserCreatedPolicyRoom(report) &&
!isArchivedRoom(report) &&
!isMoneyRequestReport(report) &&
!isTaskReport(report) &&
!isSelfDM(report) &&
!isSystemChat(report) &&
- !isGroupChat(report) &&
- !isInvoiceRoom(report))
+ !isGroupChat(report))
) {
return false;
}
- if (participantAccountIDs.includes(CONST.ACCOUNT_ID.NOTIFICATIONS) && (!currentUserAccountID || !AccountUtils.isAccountIDOddNumber(currentUserAccountID))) {
+ if (report?.participants?.[CONST.ACCOUNT_ID.NOTIFICATIONS] && (!currentUserAccountID || !AccountUtils.isAccountIDOddNumber(currentUserAccountID))) {
return false;
}
@@ -5501,6 +5526,7 @@ function shouldReportBeInOptionList({
* Returns the system report from the list of reports.
*/
function getSystemChat(): OnyxEntry {
+ const allReports = ReportConnection.getAllReports();
if (!allReports) {
return undefined;
}
@@ -5511,7 +5537,7 @@ function getSystemChat(): OnyxEntry {
/**
* Attempts to find a report in onyx with the provided list of participants. Does not include threads, task, expense, room, and policy expense chat.
*/
-function getChatByParticipants(newParticipantList: number[], reports: OnyxCollection = allReports, shouldIncludeGroupChats = false): OnyxEntry {
+function getChatByParticipants(newParticipantList: number[], reports: OnyxCollection = ReportConnection.getAllReports(), shouldIncludeGroupChats = false): OnyxEntry {
const sortedNewParticipantList = newParticipantList.sort();
return Object.values(reports ?? {}).find((report) => {
const participantAccountIDs = Object.keys(report?.participants ?? {});
@@ -5539,7 +5565,7 @@ function getChatByParticipants(newParticipantList: number[], reports: OnyxCollec
/**
* Attempts to find an invoice chat report in onyx with the provided policyID and receiverID.
*/
-function getInvoiceChatByParticipants(policyID: string, receiverID: string | number, reports: OnyxCollection = allReports): OnyxEntry {
+function getInvoiceChatByParticipants(policyID: string, receiverID: string | number, reports: OnyxCollection = ReportConnection.getAllReports()): OnyxEntry {
return Object.values(reports ?? {}).find((report) => {
if (!report || !isInvoiceRoom(report)) {
return false;
@@ -5558,7 +5584,7 @@ function getInvoiceChatByParticipants(policyID: string, receiverID: string | num
* Attempts to find a policy expense report in onyx that is owned by ownerAccountID in a given policy
*/
function getPolicyExpenseChat(ownerAccountID: number, policyID: string): OnyxEntry {
- return Object.values(allReports ?? {}).find((report: OnyxEntry) => {
+ return Object.values(ReportConnection.getAllReports() ?? {}).find((report: OnyxEntry) => {
// If the report has been deleted, then skip it
if (!report) {
return false;
@@ -5569,7 +5595,7 @@ function getPolicyExpenseChat(ownerAccountID: number, policyID: string): OnyxEnt
}
function getAllPolicyReports(policyID: string): Array> {
- return Object.values(allReports ?? {}).filter((report) => report?.policyID === policyID);
+ return Object.values(ReportConnection.getAllReports() ?? {}).filter((report) => report?.policyID === policyID);
}
/**
@@ -5582,7 +5608,7 @@ function chatIncludesChronos(report: OnyxInputOrEntry): boolean {
function chatIncludesChronosWithID(reportID?: string): boolean {
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`];
return chatIncludesChronos(report);
}
@@ -5732,7 +5758,7 @@ function getReportIDFromLink(url: string | null): string {
*/
function hasIOUWaitingOnCurrentUserBankAccount(chatReport: OnyxInputOrEntry): boolean {
if (chatReport?.iouReportID) {
- const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReport?.iouReportID}`];
+ const iouReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReport?.iouReportID}`];
if (iouReport?.isWaitingOnBankAccount && iouReport?.ownerAccountID === currentUserAccountID) {
return true;
}
@@ -6053,6 +6079,7 @@ function shouldReportShowSubscript(report: OnyxEntry): boolean {
* Return true if reports data exists
*/
function isReportDataReady(): boolean {
+ const allReports = ReportConnection.getAllReports();
return !isEmptyObject(allReports) && Object.keys(allReports ?? {}).some((key) => allReports?.[key]?.reportID);
}
@@ -6076,7 +6103,7 @@ function getAddWorkspaceRoomOrChatReportErrors(report: OnyxEntry): Error
* Return true if the expense report is marked for deletion.
*/
function isMoneyRequestReportPendingDeletion(reportOrID: OnyxEntry | string): boolean {
- const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
+ const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
if (!isMoneyRequestReport(report)) {
return false;
}
@@ -6104,7 +6131,9 @@ function getOriginalReportID(reportID: string, reportAction: OnyxInputOrEntry, policy: OnyxEntry,
}
function getWorkspaceChats(policyID: string, accountIDs: number[]): Array> {
+ const allReports = ReportConnection.getAllReports();
return Object.values(allReports ?? {}).filter((report) => isPolicyExpenseChat(report) && (report?.policyID ?? '-1') === policyID && accountIDs.includes(report?.ownerAccountID ?? -1));
}
@@ -6147,6 +6177,7 @@ function getWorkspaceChats(policyID: string, accountIDs: number[]): Array> {
+ const allReports = ReportConnection.getAllReports();
return Object.values(allReports ?? {}).filter((report) => (report?.policyID ?? '-1') === policyID);
}
@@ -6451,7 +6482,7 @@ function shouldUseFullTitleToDisplay(report: OnyxEntry): boolean {
}
function getRoom(type: ValueOf, policyID: string): OnyxEntry {
- const room = Object.values(allReports ?? {}).find((report) => report?.policyID === policyID && report?.chatType === type && !isThread(report));
+ const room = Object.values(ReportConnection.getAllReports() ?? {}).find((report) => report?.policyID === policyID && report?.chatType === type && !isThread(report));
return room;
}
@@ -6579,15 +6610,18 @@ function getNonHeldAndFullAmount(iouReport: OnyxEntry, policy: OnyxEntry
const transactions = TransactionUtils.getAllReportTransactions(iouReport?.reportID ?? '-1');
const hasPendingTransaction = transactions.some((transaction) => !!transaction.pendingAction);
+ // if the report is an expense report, the total amount should be negated
+ const coefficient = isExpenseReport(iouReport) ? -1 : 1;
+
if (hasUpdatedTotal(iouReport, policy) && hasPendingTransaction) {
const unheldTotal = transactions.reduce((currentVal, transaction) => currentVal - (!TransactionUtils.isOnHold(transaction) ? transaction.amount : 0), 0);
- return [CurrencyUtils.convertToDisplayString(unheldTotal, iouReport?.currency), CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * -1, iouReport?.currency)];
+ return [CurrencyUtils.convertToDisplayString(unheldTotal, iouReport?.currency), CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * coefficient, iouReport?.currency)];
}
return [
- CurrencyUtils.convertToDisplayString((iouReport?.unheldTotal ?? 0) * -1, iouReport?.currency),
- CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * -1, iouReport?.currency),
+ CurrencyUtils.convertToDisplayString((iouReport?.unheldTotal ?? 0) * coefficient, iouReport?.currency),
+ CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * coefficient, iouReport?.currency),
];
}
@@ -6817,7 +6851,7 @@ function shouldCreateNewMoneyRequestReport(existingIOUReport: OnyxInputOrEntry report && report?.[reportFieldToCompare] === tripRoomReportID)
.map((report) => report?.reportID);
return tripTransactionReportIDs.flatMap((reportID) => TransactionUtils.getAllReportTransactions(reportID));
@@ -7013,6 +7047,7 @@ function canReportBeMentionedWithinPolicy(report: OnyxEntry, policyID: s
}
function shouldShowMerchantColumn(transactions: Transaction[]) {
+ const allReports = ReportConnection.getAllReports();
return transactions.some((transaction) => isExpenseReport(allReports?.[transaction.reportID] ?? null));
}
@@ -7027,11 +7062,11 @@ function isChatUsedForOnboarding(report: OnyxEntry): boolean {
* Get the report (system or concierge chat) used for the user's onboarding process.
*/
function getChatUsedForOnboarding(): OnyxEntry {
- return Object.values(allReports ?? {}).find(isChatUsedForOnboarding);
+ return Object.values(ReportConnection.getAllReports() ?? {}).find(isChatUsedForOnboarding);
}
function findPolicyExpenseChatByPolicyID(policyID: string): OnyxEntry {
- return Object.values(allReports ?? {}).find((report) => isPolicyExpenseChat(report) && report?.policyID === policyID);
+ return Object.values(ReportConnection.getAllReports() ?? {}).find((report) => isPolicyExpenseChat(report) && report?.policyID === policyID);
}
export {
@@ -7039,6 +7074,7 @@ export {
areAllRequestsBeingSmartScanned,
buildOptimisticAddCommentReportAction,
buildOptimisticApprovedReportAction,
+ buildOptimisticUnapprovedReportAction,
buildOptimisticCancelPaymentReportAction,
buildOptimisticChangedTaskAssigneeReportAction,
buildOptimisticChatReport,
@@ -7127,7 +7163,6 @@ export {
getIcons,
getIconsForParticipants,
getIndicatedMissingPaymentMethod,
- getLastUpdatedReport,
getLastVisibleMessage,
getMoneyRequestOptions,
getMoneyRequestSpendBreakdown,
@@ -7251,6 +7286,7 @@ export {
isPublicAnnounceRoom,
isPublicRoom,
isReportApproved,
+ isReportManuallyReimbursed,
isReportDataReady,
isReportFieldDisabled,
isReportFieldOfTypeTitle,
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 3f7ee1b167c2..4f227e04482a 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -1,7 +1,7 @@
import {Str} from 'expensify-common';
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
-import type {ChatReportSelector, PolicySelector, ReportActionsSelector} from '@hooks/useReportIDs';
+import type {PolicySelector, ReportActionsSelector} from '@hooks/useReportIDs';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {PersonalDetails, PersonalDetailsList, ReportActions, TransactionViolation} from '@src/types/onyx';
@@ -68,7 +68,7 @@ type MiniReport = {
*/
function getOrderedReportIDs(
currentReportId: string | null,
- allReports: OnyxCollection,
+ allReports: OnyxCollection,
betas: OnyxEntry,
policies: OnyxCollection,
priorityMode: OnyxEntry,
@@ -82,7 +82,7 @@ function getOrderedReportIDs(
const allReportsDictValues = Object.values(allReports ?? {});
// Filter out all the reports that shouldn't be displayed
- let reportsToDisplay: Array = [];
+ let reportsToDisplay: Array = [];
allReportsDictValues.forEach((report) => {
if (!report) {
return;
diff --git a/src/libs/StringUtils.ts b/src/libs/StringUtils.ts
index 393ecddb4c36..fffd54506fcb 100644
--- a/src/libs/StringUtils.ts
+++ b/src/libs/StringUtils.ts
@@ -105,4 +105,13 @@ function lineBreaksToSpaces(text = '') {
return text.replace(CONST.REGEX.LINE_BREAK, ' ');
}
-export default {sanitizeString, isEmptyString, removeInvisibleCharacters, normalizeAccents, normalizeCRLF, getAcronym, lineBreaksToSpaces};
+/**
+ * Get the first line of the string
+ */
+function getFirstLine(text = '') {
+ // Split the input string by newline characters and return the first element of the resulting array
+ const lines = text.split('\n');
+ return lines[0];
+}
+
+export default {sanitizeString, isEmptyString, removeInvisibleCharacters, normalizeAccents, normalizeCRLF, getAcronym, lineBreaksToSpaces, getFirstLine};
diff --git a/src/libs/TaskUtils.ts b/src/libs/TaskUtils.ts
index 332d82915463..bd0bd10cd83e 100644
--- a/src/libs/TaskUtils.ts
+++ b/src/libs/TaskUtils.ts
@@ -1,21 +1,11 @@
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report} from '@src/types/onyx';
import type {Message} from '@src/types/onyx/ReportAction';
import type ReportAction from '@src/types/onyx/ReportAction';
import * as Localize from './Localize';
import {getReportActionHtml, getReportActionText} from './ReportActionsUtils';
-
-let allReports: OnyxCollection = {};
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (reports) => {
- allReports = reports;
- },
-});
+import * as ReportConnection from './ReportConnection';
/**
* Given the Task reportAction name, return the appropriate message to be displayed and copied to clipboard.
@@ -39,7 +29,7 @@ function getTaskReportActionMessage(action: OnyxEntry): Pick = {};
Onyx.connect({
@@ -37,13 +39,6 @@ Onyx.connect({
callback: (value) => (allTransactionViolations = value),
});
-let allReports: OnyxCollection;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
let currentUserEmail = '';
let currentUserAccountID = -1;
Onyx.connect({
@@ -197,6 +192,7 @@ function isCreatedMissing(transaction: OnyxEntry) {
}
function areRequiredFieldsEmpty(transaction: OnyxEntry): boolean {
+ const allReports = ReportConnection.getAllReports();
const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] ?? null;
const isFromExpenseReport = parentReport?.type === CONST.REPORT.TYPE.EXPENSE;
const isSplitPolicyExpenseChat = !!transaction?.comment?.splits?.some((participant) => allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${participant.chatReportID}`]?.isOwnPolicyExpenseChat);
@@ -724,9 +720,11 @@ function hasWarningTypeViolation(transactionID: string, transactionViolations: O
/**
* Calculates tax amount from the given expense amount and tax percentage
*/
-function calculateTaxAmount(percentage: string, amount: number) {
+function calculateTaxAmount(percentage: string, amount: number, currency: string) {
const divisor = Number(percentage.slice(0, -1)) / 100 + 1;
- return Math.round(amount - amount / divisor) / 100;
+ const taxAmount = (amount - amount / divisor) / 100;
+ const decimals = getCurrencyDecimals(currency);
+ return parseFloat(taxAmount.toFixed(decimals));
}
/**
@@ -908,7 +906,7 @@ function compareDuplicateTransactionFields(transactionID: string): {keep: Partia
}
function getTransactionID(threadReportID: string): string {
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${threadReportID}`] ?? null;
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${threadReportID}`] ?? null;
const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
const IOUTransactionID = ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction)?.IOUTransactionID ?? '-1' : '-1';
diff --git a/src/libs/UnreadIndicatorUpdater/index.ts b/src/libs/UnreadIndicatorUpdater/index.ts
index 7698433c33c1..2546225bd6ea 100644
--- a/src/libs/UnreadIndicatorUpdater/index.ts
+++ b/src/libs/UnreadIndicatorUpdater/index.ts
@@ -1,17 +1,14 @@
import debounce from 'lodash/debounce';
import memoize from 'lodash/memoize';
import type {OnyxCollection} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
+import * as ReportConnection from '@libs/ReportConnection';
import * as ReportUtils from '@libs/ReportUtils';
import Navigation, {navigationRef} from '@navigation/Navigation';
import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
import type {Report} from '@src/types/onyx';
import updateUnread from './updateUnread';
-let allReports: OnyxCollection = {};
-
-export default function getUnreadReportsForUnreadIndicator(reports: OnyxCollection, currentReportID: string) {
+function getUnreadReportsForUnreadIndicator(reports: OnyxCollection, currentReportID: string) {
return Object.values(reports ?? {}).filter(
(report) =>
ReportUtils.isUnread(report) &&
@@ -40,23 +37,16 @@ export default function getUnreadReportsForUnreadIndicator(reports: OnyxCollecti
const memoizedGetUnreadReportsForUnreadIndicator = memoize(getUnreadReportsForUnreadIndicator);
const triggerUnreadUpdate = debounce(() => {
- const currentReportID = navigationRef.isReady() ? Navigation.getTopmostReportId() ?? '-1' : '-1';
+ const currentReportID = navigationRef?.isReady?.() ? Navigation.getTopmostReportId() ?? '-1' : '-1';
// We want to keep notification count consistent with what can be accessed from the LHN list
- const unreadReports = memoizedGetUnreadReportsForUnreadIndicator(allReports, currentReportID);
+ const unreadReports = memoizedGetUnreadReportsForUnreadIndicator(ReportConnection.getAllReports(), currentReportID);
updateUnread(unreadReports.length);
}, CONST.TIMING.UNREAD_UPDATE_DEBOUNCE_TIME);
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (reportsFromOnyx) => {
- allReports = reportsFromOnyx;
- triggerUnreadUpdate();
- },
-});
-
-navigationRef.addListener('state', () => {
+navigationRef?.addListener?.('state', () => {
triggerUnreadUpdate();
});
+
+export {triggerUnreadUpdate, getUnreadReportsForUnreadIndicator};
diff --git a/src/libs/WorkspacesSettingsUtils.ts b/src/libs/WorkspacesSettingsUtils.ts
index 62c034145d4b..d827a6cae000 100644
--- a/src/libs/WorkspacesSettingsUtils.ts
+++ b/src/libs/WorkspacesSettingsUtils.ts
@@ -10,20 +10,13 @@ import * as CurrencyUtils from './CurrencyUtils';
import type {Phrase, PhraseParameters} from './Localize';
import * as OptionsListUtils from './OptionsListUtils';
import {hasCustomUnitsError, hasEmployeeListError, hasPolicyError, hasTaxRateError} from './PolicyUtils';
+import * as ReportConnection from './ReportConnection';
import * as ReportUtils from './ReportUtils';
type CheckingMethod = () => boolean;
-let allReports: OnyxCollection;
-
type BrickRoad = ValueOf | undefined;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
let allPolicies: OnyxCollection;
Onyx.connect({
@@ -100,6 +93,7 @@ function hasWorkspaceSettingsRBR(policy: Policy) {
}
function getChatTabBrickRoad(policyID?: string): BrickRoad | undefined {
+ const allReports = ReportConnection.getAllReports();
if (!allReports) {
return undefined;
}
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 48c70021cacc..df199a2a36ae 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -24,6 +24,7 @@ import type {
StartSplitBillParams,
SubmitReportParams,
TrackExpenseParams,
+ UnapproveExpenseReportParams,
UpdateMoneyRequestParams,
} from '@libs/API/parameters';
import {WRITE_COMMANDS} from '@libs/API/types';
@@ -42,6 +43,7 @@ import Permissions from '@libs/Permissions';
import * as PhoneNumber from '@libs/PhoneNumber';
import * as PolicyUtils from '@libs/PolicyUtils';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
import type {OptimisticChatReport, OptimisticCreatedReportAction, OptimisticIOUReportAction, TransactionDetails} from '@libs/ReportUtils';
import * as ReportUtils from '@libs/ReportUtils';
import * as SubscriptionUtils from '@libs/SubscriptionUtils';
@@ -165,13 +167,6 @@ Onyx.connect({
},
});
-let allReports: OnyxCollection | null = null;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value ?? null),
-});
-
let allReportsDraft: OnyxCollection;
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT_DRAFT,
@@ -295,6 +290,7 @@ Onyx.connect({
* Get the report or draft report given a reportID
*/
function getReportOrDraftReport(reportID: string | undefined): OnyxEntry {
+ const allReports = ReportConnection.getAllReports();
if (!allReports && !allReportsDraft) {
return undefined;
}
@@ -502,7 +498,7 @@ function buildOnyxDataForMoneyRequest(
if (TransactionUtils.isDistanceRequest(transaction)) {
newQuickAction = CONST.QUICK_ACTIONS.REQUEST_DISTANCE;
}
- const existingTransactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${existingTransactionThreadReportID}`] ?? null;
+ const existingTransactionThreadReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${existingTransactionThreadReportID}`] ?? null;
if (chatReport) {
optimisticData.push({
@@ -1218,7 +1214,7 @@ function buildOnyxDataForTrackExpense(
} else if (isDistanceRequest) {
newQuickAction = CONST.QUICK_ACTIONS.TRACK_DISTANCE;
}
- const existingTransactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${existingTransactionThreadReportID}`] ?? null;
+ const existingTransactionThreadReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${existingTransactionThreadReportID}`] ?? null;
if (chatReport) {
optimisticData.push(
@@ -1573,6 +1569,7 @@ function getDeleteTrackExpenseInformation(
actionableWhisperReportActionID = '',
resolution = '',
) {
+ const allReports = ReportConnection.getAllReports();
// STEP 1: Get all collections we're updating
const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
@@ -1916,6 +1913,7 @@ function getMoneyRequestInformation(
let isNewChatReport = false;
let chatReport = !isEmptyObject(parentChatReport) && parentChatReport?.reportID ? parentChatReport : null;
+ const allReports = ReportConnection.getAllReports();
// If this is a policyExpenseChat, the chatReport must exist and we can get it from Onyx.
// report is null if the flow is initiated from the global create menu. However, participant always stores the reportID if it exists, which is the case for policyExpenseChats
if (!chatReport && isPolicyExpenseChat) {
@@ -2132,7 +2130,7 @@ function getTrackExpenseInformation(
// STEP 1: Get existing chat report
let chatReport = !isEmptyObject(parentChatReport) && parentChatReport?.reportID ? parentChatReport : null;
-
+ const allReports = ReportConnection.getAllReports();
// The chatReport always exists, and we can get it from Onyx if chatReport is null.
if (!chatReport) {
chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${participant.reportID}`] ?? null;
@@ -2491,6 +2489,7 @@ function getUpdateMoneyRequestParams(
const clearedPendingFields = Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, null]));
const errorFields = Object.fromEntries(Object.keys(pendingFields).map((key) => [key, {[DateUtils.getMicroseconds()]: Localize.translateLocal('iou.error.genericEditFailureMessage')}]));
+ const allReports = ReportConnection.getAllReports();
// Step 2: Get all the collections being updated
const transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
@@ -2557,6 +2556,22 @@ function getUpdateMoneyRequestParams(
[updatedReportAction.reportActionID]: updatedReportAction as OnyxTypes.ReportAction,
},
});
+ optimisticData.push({
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.reportID}`,
+ value: {
+ lastVisibleActionCreated: updatedReportAction.created,
+ lastReadTime: updatedReportAction.created,
+ },
+ });
+ failureData.push({
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.reportID}`,
+ value: {
+ lastVisibleActionCreated: transactionThread?.lastVisibleActionCreated,
+ lastReadTime: transactionThread?.lastReadTime,
+ },
+ });
successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread?.reportID}`,
@@ -2779,6 +2794,7 @@ function getUpdateTrackExpenseParams(
const clearedPendingFields = Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, null]));
const errorFields = Object.fromEntries(Object.keys(pendingFields).map((key) => [key, {[DateUtils.getMicroseconds()]: Localize.translateLocal('iou.error.genericEditFailureMessage')}]));
+ const allReports = ReportConnection.getAllReports();
// Step 2: Get all the collections being updated
const transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
@@ -2945,6 +2961,7 @@ function updateMoneyRequestDate(
const transactionChanges: TransactionChanges = {
created: value,
};
+ const allReports = ReportConnection.getAllReports();
const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
let data: UpdateMoneyRequestData;
@@ -2985,6 +3002,7 @@ function updateMoneyRequestMerchant(
const transactionChanges: TransactionChanges = {
merchant: value,
};
+ const allReports = ReportConnection.getAllReports();
const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
let data: UpdateMoneyRequestData;
@@ -3073,6 +3091,7 @@ function updateMoneyRequestDistance({
waypoints,
routes,
};
+ const allReports = ReportConnection.getAllReports();
const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
let data: UpdateMoneyRequestData;
@@ -3113,6 +3132,7 @@ function updateMoneyRequestDescription(
const transactionChanges: TransactionChanges = {
comment,
};
+ const allReports = ReportConnection.getAllReports();
const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
let data: UpdateMoneyRequestData;
@@ -3781,7 +3801,7 @@ function getOrCreateOptimisticSplitChatReport(existingSplitChatReportID: string,
const existingChatReportID = existingSplitChatReportID || participants[0].reportID;
// Check if the report is available locally if we do have one
- let existingSplitChatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${existingChatReportID}`];
+ let existingSplitChatReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${existingChatReportID}`];
const allParticipantsAccountIDs = [...participantAccountIDs, currentUserAccountID];
if (!existingSplitChatReport) {
@@ -4073,7 +4093,9 @@ function createSplitsAndOnyxData(
}
// STEP 2: Get existing IOU/Expense report and update its total OR build a new optimistic one
- let oneOnOneIOUReport: OneOnOneIOUReport = oneOnOneChatReport.iouReportID ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`] : null;
+ let oneOnOneIOUReport: OneOnOneIOUReport = oneOnOneChatReport.iouReportID
+ ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`]
+ : null;
const shouldCreateNewOneOnOneIOUReport = ReportUtils.shouldCreateNewMoneyRequestReport(oneOnOneIOUReport, oneOnOneChatReport);
if (!oneOnOneIOUReport || shouldCreateNewOneOnOneIOUReport) {
@@ -4805,6 +4827,7 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
let oneOnOneChatReport: OnyxEntry;
let isNewOneOnOneChatReport = false;
+ const allReports = ReportConnection.getAllReports();
if (isPolicyExpenseChat) {
// The workspace chat reportID is saved in the splits array when starting a split expense with a workspace
oneOnOneChatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${participant.chatReportID}`];
@@ -4962,6 +4985,7 @@ function editRegularMoneyRequest(
policyTags: OnyxTypes.PolicyTagList,
policyCategories: OnyxTypes.PolicyCategories,
) {
+ const allReports = ReportConnection.getAllReports();
// STEP 1: Get all collections we're updating
const transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
@@ -5262,6 +5286,7 @@ function updateMoneyRequestAmountAndCurrency({
taxCode,
taxAmount,
};
+ const allReports = ReportConnection.getAllReports();
const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
let data: UpdateMoneyRequestData;
@@ -5275,6 +5300,7 @@ function updateMoneyRequestAmountAndCurrency({
}
function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false) {
+ const allReports = ReportConnection.getAllReports();
// STEP 1: Get all collections we're updating
const iouReportID = ReportActionsUtils.isMoneyRequestAction(reportAction) ? ReportActionsUtils.getOriginalMessage(reportAction)?.IOUReportID : '-1';
const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`] ?? null;
@@ -5586,7 +5612,7 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
function deleteTrackExpense(chatReportID: string, transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false) {
// STEP 1: Get all collections we're updating
- const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
+ const chatReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
if (!ReportUtils.isSelfDM(chatReport)) {
return deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView);
}
@@ -6359,6 +6385,95 @@ function approveMoneyRequest(expenseReport: OnyxEntry, full?:
API.write(WRITE_COMMANDS.APPROVE_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
}
+function unapproveExpenseReport(expenseReport: OnyxEntry) {
+ if (isEmptyObject(expenseReport)) {
+ return;
+ }
+
+ const currentNextStep = allNextSteps[`${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`] ?? null;
+
+ const optimisticUnapprovedReportAction = ReportUtils.buildOptimisticUnapprovedReportAction(expenseReport.total ?? 0, expenseReport.currency ?? '', expenseReport.reportID);
+ const optimisticNextStep = NextStepUtils.buildNextStep(expenseReport, CONST.REPORT.STATUS_NUM.SUBMITTED);
+
+ const optimisticReportActionData: OnyxUpdate = {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+ value: {
+ [optimisticUnapprovedReportAction.reportActionID]: {
+ ...(optimisticUnapprovedReportAction as OnyxTypes.ReportAction),
+ pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+ },
+ },
+ };
+ const optimisticIOUReportData: OnyxUpdate = {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`,
+ value: {
+ ...expenseReport,
+ lastMessageText: ReportActionsUtils.getReportActionText(optimisticUnapprovedReportAction),
+ lastMessageHtml: ReportActionsUtils.getReportActionHtml(optimisticUnapprovedReportAction),
+ stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+ statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+ pendingFields: {
+ partial: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+ },
+ },
+ };
+
+ const optimisticNextStepData: OnyxUpdate = {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`,
+ value: optimisticNextStep,
+ };
+
+ const optimisticData: OnyxUpdate[] = [optimisticIOUReportData, optimisticReportActionData, optimisticNextStepData];
+
+ const successData: OnyxUpdate[] = [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+ value: {
+ [optimisticUnapprovedReportAction.reportActionID]: {
+ pendingAction: null,
+ },
+ },
+ },
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`,
+ value: {
+ pendingFields: {
+ partial: null,
+ },
+ },
+ },
+ ];
+
+ const failureData: OnyxUpdate[] = [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+ value: {
+ [optimisticUnapprovedReportAction.reportActionID]: {
+ errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.other'),
+ },
+ },
+ },
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`,
+ value: currentNextStep,
+ },
+ ];
+
+ const parameters: UnapproveExpenseReportParams = {
+ reportID: expenseReport.reportID,
+ reportActionID: optimisticUnapprovedReportAction.reportActionID,
+ };
+
+ API.write(WRITE_COMMANDS.UNAPPROVE_EXPENSE_REPORT, parameters, {optimisticData, successData, failureData});
+}
+
function submitReport(expenseReport: OnyxTypes.Report) {
if (expenseReport.policyID && SubscriptionUtils.shouldRestrictUserBillableActions(expenseReport.policyID)) {
Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(expenseReport.policyID));
@@ -7016,6 +7131,7 @@ function getIOURequestPolicyID(transaction: OnyxEntry, re
export {
approveMoneyRequest,
+ unapproveExpenseReport,
canApproveIOU,
canIOUBePaid,
cancelPayment,
diff --git a/src/libs/actions/Policy/Member.ts b/src/libs/actions/Policy/Member.ts
index f8472bd43098..218bf3a93c69 100644
--- a/src/libs/actions/Policy/Member.ts
+++ b/src/libs/actions/Policy/Member.ts
@@ -1,4 +1,3 @@
-import {ExpensiMark} from 'expensify-common';
import type {NullishDeep, OnyxCollection, OnyxCollectionInputValue, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
import * as API from '@libs/API';
@@ -12,6 +11,7 @@ import type {
import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
import * as ErrorUtils from '@libs/ErrorUtils';
import Log from '@libs/Log';
+import Parser from '@libs/Parser';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
import * as PhoneNumber from '@libs/PhoneNumber';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
@@ -627,7 +627,7 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
const params: AddMembersToWorkspaceParams = {
employees: JSON.stringify(logins.map((login) => ({email: login}))),
- welcomeNote: new ExpensiMark().replace(welcomeNote),
+ welcomeNote: Parser.replace(welcomeNote),
policyID,
};
if (!isEmptyObject(membersChats.reportCreationData)) {
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index acd42b6202c7..33d906652af6 100644
--- a/src/libs/actions/Policy/Policy.ts
+++ b/src/libs/actions/Policy/Policy.ts
@@ -51,6 +51,7 @@ import * as PhoneNumber from '@libs/PhoneNumber';
import * as PolicyUtils from '@libs/PolicyUtils';
import {navigateWhenEnableFeature} from '@libs/PolicyUtils';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
import * as ReportUtils from '@libs/ReportUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
import type {PolicySelector} from '@pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover';
@@ -125,13 +126,6 @@ Onyx.connect({
},
});
-let allReports: OnyxCollection;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
let lastAccessedWorkspacePolicyID: OnyxEntry;
Onyx.connect({
key: ONYXKEYS.LAST_ACCESSED_WORKSPACE_POLICY_ID,
@@ -259,7 +253,7 @@ function deleteWorkspace(policyID: string, policyName: string) {
: []),
];
- const reportsToArchive = Object.values(allReports ?? {}).filter(
+ const reportsToArchive = Object.values(ReportConnection.getAllReports() ?? {}).filter(
(report) => report?.policyID === policyID && (ReportUtils.isChatRoom(report) || ReportUtils.isPolicyExpenseChat(report) || ReportUtils.isTaskReport(report)),
);
const finallyData: OnyxUpdate[] = [];
diff --git a/src/libs/actions/Policy/ReportFields.ts b/src/libs/actions/Policy/ReportField.ts
similarity index 69%
rename from src/libs/actions/Policy/ReportFields.ts
rename to src/libs/actions/Policy/ReportField.ts
index 220432cbc3c6..4a6c5ed4fad5 100644
--- a/src/libs/actions/Policy/ReportFields.ts
+++ b/src/libs/actions/Policy/ReportField.ts
@@ -1,7 +1,7 @@
import type {NullishDeep, OnyxCollection} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
import * as API from '@libs/API';
-import type {CreateWorkspaceReportFieldParams} from '@libs/API/parameters';
+import type {CreateWorkspaceReportFieldParams, PolicyReportFieldsReplace} from '@libs/API/parameters';
import {WRITE_COMMANDS} from '@libs/API/types';
import * as ErrorUtils from '@libs/ErrorUtils';
import * as ReportUtils from '@libs/ReportUtils';
@@ -10,7 +10,8 @@ import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {WorkspaceReportFieldsForm} from '@src/types/form/WorkspaceReportFieldsForm';
import INPUT_IDS from '@src/types/form/WorkspaceReportFieldsForm';
-import type {Policy, PolicyReportField} from '@src/types/onyx';
+import type {Policy, PolicyReportField, Report} from '@src/types/onyx';
+import type {OnyxValueWithOfflineFeedback} from '@src/types/onyx/OnyxCommon';
import type {OnyxData} from '@src/types/onyx/Request';
let listValues: string[];
@@ -34,7 +35,6 @@ Onyx.connect({
if (!key) {
return;
}
-
if (value === null || value === undefined) {
// If we are deleting a policy, we have to check every report linked to that policy
// and unset the draft indicator (pencil icon) alongside removing any draft comments. Clearing these values will keep the newly archived chats from being displayed in the LHN.
@@ -136,7 +136,7 @@ function createReportField(policyID: string, {name, type, initialValue}: CreateR
const previousFieldList = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.fieldList ?? {};
const fieldID = generateFieldID(name);
const fieldKey = ReportUtils.getReportFieldKey(fieldID);
- const newReportField: PolicyReportField = {
+ const newReportField: OnyxValueWithOfflineFeedback = {
name,
type,
defaultValue: initialValue,
@@ -149,6 +149,7 @@ function createReportField(policyID: string, {name, type, initialValue}: CreateR
keys: [],
externalIDs: [],
isTax: false,
+ pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
};
const onyxData: OnyxData = {
optimisticData: [
@@ -159,9 +160,6 @@ function createReportField(policyID: string, {name, type, initialValue}: CreateR
fieldList: {
[fieldKey]: newReportField,
},
- pendingFields: {
- [fieldKey]: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
- },
errorFields: null,
},
},
@@ -171,8 +169,8 @@ function createReportField(policyID: string, {name, type, initialValue}: CreateR
key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
onyxMethod: Onyx.METHOD.MERGE,
value: {
- pendingFields: {
- [fieldKey]: null,
+ fieldList: {
+ [fieldKey]: {pendingAction: null},
},
errorFields: null,
},
@@ -186,9 +184,6 @@ function createReportField(policyID: string, {name, type, initialValue}: CreateR
fieldList: {
[fieldKey]: null,
},
- pendingFields: {
- [fieldKey]: null,
- },
errorFields: {
[fieldKey]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.reportFields.genericFailureMessage'),
},
@@ -204,6 +199,76 @@ function createReportField(policyID: string, {name, type, initialValue}: CreateR
API.write(WRITE_COMMANDS.CREATE_WORKSPACE_REPORT_FIELD, parameters, onyxData);
}
+function deleteReportFields(policyID: string, reportFieldsToUpdate: string[]) {
+ const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+ const allReportFields = policy?.fieldList ?? {};
+
+ const updatedReportFields = Object.fromEntries(Object.entries(allReportFields).filter(([key]) => !reportFieldsToUpdate.includes(key)));
+ const optimisticReportFields = reportFieldsToUpdate.reduce>>>((acc, reportFieldKey) => {
+ acc[reportFieldKey] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+ return acc;
+ }, {});
+
+ const successReportFields = reportFieldsToUpdate.reduce>((acc, reportFieldKey) => {
+ acc[reportFieldKey] = null;
+ return acc;
+ }, {});
+
+ const failureReportFields = reportFieldsToUpdate.reduce>>>((acc, reportFieldKey) => {
+ acc[reportFieldKey] = {pendingAction: null};
+ return acc;
+ }, {});
+
+ const onyxData: OnyxData = {
+ optimisticData: [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+ value: {
+ fieldList: optimisticReportFields,
+ },
+ },
+ ],
+ successData: [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+ value: {
+ fieldList: successReportFields,
+ errorFields: null,
+ },
+ },
+ ],
+ failureData: [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+ value: {
+ fieldList: failureReportFields,
+ errorFields: {
+ fieldList: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+ },
+ },
+ },
+ ],
+ };
+
+ const parameters: PolicyReportFieldsReplace = {
+ policyID,
+ reportFields: JSON.stringify(Object.values(updatedReportFields)),
+ };
+
+ API.write(WRITE_COMMANDS.POLICY_REPORT_FIELDS_REPLACE, parameters, onyxData);
+}
+
export type {CreateReportFieldArguments};
-export {setInitialCreateReportFieldsForm, createReportFieldsListValue, renameReportFieldsListValue, setReportFieldsListValueEnabled, deleteReportFieldsListValue, createReportField};
+export {
+ deleteReportFields,
+ setInitialCreateReportFieldsForm,
+ createReportFieldsListValue,
+ renameReportFieldsListValue,
+ setReportFieldsListValueEnabled,
+ deleteReportFieldsListValue,
+ createReportField,
+};
diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts
index dfb41b2d9015..2558969be2f3 100644
--- a/src/libs/actions/Policy/Tag.ts
+++ b/src/libs/actions/Policy/Tag.ts
@@ -363,7 +363,7 @@ function clearPolicyTagErrors(policyID: string, tagName: string, tagListIndex: n
});
}
-function clearPolicyTagListError(policyID: string, tagListIndex: number, errorField: string) {
+function clearPolicyTagListErrorField(policyID: string, tagListIndex: number, errorField: string) {
const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {};
if (!policyTag.name) {
@@ -379,6 +379,20 @@ function clearPolicyTagListError(policyID: string, tagListIndex: number, errorFi
});
}
+function clearPolicyTagListErrors(policyID: string, tagListIndex: number) {
+ const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {};
+
+ if (!policyTag.name) {
+ return;
+ }
+
+ Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`, {
+ [policyTag.name]: {
+ errors: null,
+ },
+ });
+}
+
function renamePolicyTag(policyID: string, policyTag: {oldName: string; newName: string}, tagListIndex: number) {
const tagList = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {};
const tag = tagList.tags?.[policyTag.oldName];
@@ -569,7 +583,7 @@ function renamePolicyTaglist(policyID: string, policyTagListName: {oldName: stri
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
value: {
- [newName]: {...oldPolicyTags, name: newName, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+ [newName]: {...oldPolicyTags, name: newName, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, errors: null},
[oldName]: null,
},
},
@@ -589,12 +603,12 @@ function renamePolicyTaglist(policyID: string, policyTagListName: {oldName: stri
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
value: {
- errors: {
- [oldName]: oldName,
- [newName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.genericFailureMessage'),
- },
[newName]: null,
- [oldName]: oldPolicyTags,
+ [oldName]: {
+ ...oldPolicyTags,
+ pendingAction: null,
+ errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.genericFailureMessage'),
+ },
},
},
],
@@ -725,7 +739,8 @@ export {
setPolicyTagsRequired,
createPolicyTag,
clearPolicyTagErrors,
- clearPolicyTagListError,
+ clearPolicyTagListErrors,
+ clearPolicyTagListErrorField,
deletePolicyTags,
enablePolicyTags,
openPolicyTagsPage,
diff --git a/src/libs/actions/PriorityMode.ts b/src/libs/actions/PriorityMode.ts
index a4561d44d5a0..beec327a2e40 100644
--- a/src/libs/actions/PriorityMode.ts
+++ b/src/libs/actions/PriorityMode.ts
@@ -1,11 +1,10 @@
import debounce from 'lodash/debounce';
-import type {OnyxCollection} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
import Log from '@libs/Log';
+import * as ReportConnection from '@libs/ReportConnection';
import * as ReportUtils from '@libs/ReportUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report} from '@src/types/onyx';
/**
* This actions file is used to automatically switch a user into #focus mode when they exceed a certain number of reports. We do this primarily for performance reasons.
@@ -35,18 +34,6 @@ Onyx.connect({
// eslint-disable-next-line @typescript-eslint/no-use-before-define
const autoSwitchToFocusMode = debounce(tryFocusModeUpdate, 300, {leading: true});
-let allReports: OnyxCollection | undefined = {};
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (reports) => {
- allReports = reports;
-
- // Each time a new report is added we will check to see if the user should be switched
- autoSwitchToFocusMode();
- },
-});
-
let isLoadingReportData = true;
Onyx.connect({
key: ONYXKEYS.IS_LOADING_REPORT_DATA,
@@ -87,11 +74,10 @@ function resetHasReadRequiredDataFromStorage() {
resolveIsReadyPromise = resolve;
});
isLoadingReportData = true;
- allReports = {};
}
function checkRequiredData() {
- if (allReports === undefined || hasTriedFocusMode === undefined || isInFocusMode === undefined || isLoadingReportData) {
+ if (ReportConnection.getAllReports() === undefined || hasTriedFocusMode === undefined || isInFocusMode === undefined || isLoadingReportData) {
return;
}
@@ -112,6 +98,7 @@ function tryFocusModeUpdate() {
}
const validReports = [];
+ const allReports = ReportConnection.getAllReports();
Object.keys(allReports ?? {}).forEach((key) => {
const report = allReports?.[key];
if (!report) {
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index a1a52b64d49f..9870b561ad6f 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1,5 +1,5 @@
import {format as timezoneFormat, utcToZonedTime} from 'date-fns-tz';
-import {ExpensiMark, Str} from 'expensify-common';
+import {Str} from 'expensify-common';
import isEmpty from 'lodash/isEmpty';
import {DeviceEventEmitter, InteractionManager, Linking} from 'react-native';
import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
@@ -62,7 +62,7 @@ import {registerPaginationConfig} from '@libs/Middleware/Pagination';
import Navigation from '@libs/Navigation/Navigation';
import type {NetworkStatus} from '@libs/NetworkConnection';
import LocalNotification from '@libs/Notification/LocalNotification';
-import {parseHtmlToMarkdown, parseHtmlToText} from '@libs/OnyxAwareParser';
+import Parser from '@libs/Parser';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
import * as PhoneNumber from '@libs/PhoneNumber';
import getPolicyEmployeeAccountIDs from '@libs/PolicyEmployeeListUtils';
@@ -70,6 +70,7 @@ import {extractPolicyIDFromPath} from '@libs/PolicyUtils';
import processReportIDDeeplink from '@libs/processReportIDDeeplink';
import * as Pusher from '@libs/Pusher/pusher';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
import * as ReportUtils from '@libs/ReportUtils';
import {doesReportBelongToWorkspace} from '@libs/ReportUtils';
import type {OptimisticAddCommentReportAction} from '@libs/ReportUtils';
@@ -190,20 +191,6 @@ Onyx.connect({
},
});
-const currentReportData: OnyxCollection = {};
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- callback: (report, key) => {
- if (!key || !report) {
- return;
- }
- const reportID = CollectionUtils.extractCollectionItemID(key);
- currentReportData[reportID] = report;
- // eslint-disable-next-line @typescript-eslint/no-use-before-define
- handleReportChanged(report);
- },
-});
-
let isNetworkOffline = false;
let networkStatus: NetworkStatus;
Onyx.connect({
@@ -242,7 +229,6 @@ Onyx.connect({
callback: (value) => (reportMetadata = value),
});
-const allReports: OnyxCollection = {};
const typingWatchTimers: Record = {};
let reportIDDeeplinkedFromOldDot: string | undefined;
@@ -493,7 +479,7 @@ function addActions(reportID: string, text = '', file?: FileObject) {
lastReadTime: currentTime,
};
- const report = currentReportData?.[reportID];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
if (!isEmptyObject(report) && ReportUtils.getReportNotificationPreference(report) === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
optimisticReport.notificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS;
@@ -667,7 +653,7 @@ function updateGroupChatName(reportID: string, reportName: string) {
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: {
- reportName: currentReportData?.[reportID]?.reportName ?? null,
+ reportName: ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.reportName ?? null,
errors: {
reportName: Localize.translateLocal('common.genericErrorMessage'),
},
@@ -704,7 +690,7 @@ function updateGroupChatAvatar(reportID: string, file?: File | CustomRNImageMani
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: {
- avatarUrl: currentReportData?.[reportID]?.avatarUrl ?? null,
+ avatarUrl: ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.avatarUrl ?? null,
pendingFields: {
avatar: null,
},
@@ -767,7 +753,7 @@ function openReport(
const optimisticReport = reportActionsExist(reportID)
? {}
: {
- reportName: allReports?.[reportID]?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME,
+ reportName: ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME,
};
const optimisticData: OnyxUpdate[] = [
@@ -951,7 +937,7 @@ function openReport(
}
}
- parameters.clientLastReadTime = currentReportData?.[reportID]?.lastReadTime ?? '';
+ parameters.clientLastReadTime = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.lastReadTime ?? '';
const paginationConfig = {
resourceID: reportID,
@@ -1060,7 +1046,7 @@ function navigateToAndOpenChildReport(childReportID = '-1', parentReportAction:
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(childReportID));
} else {
const participantAccountIDs = [...new Set([currentUserAccountID, Number(parentReportAction.actorAccountID)])];
- const parentReport = allReports?.[parentReportID];
+ const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`];
// Threads from DMs and selfDMs don't have a chatType. All other threads inherit the chatType from their parent
const childReportChatType = parentReport && ReportUtils.isSelfDM(parentReport) ? undefined : parentReport?.chatType;
const newChat = ReportUtils.buildOptimisticChatReport(
@@ -1252,7 +1238,9 @@ function markCommentAsUnread(reportID: string, reportActionCreated: string) {
}, null);
// If no action created date is provided, use the last action's from other user
- const actionCreationTime = reportActionCreated || (latestReportActionFromOtherUsers?.created ?? allReports?.[reportID]?.lastVisibleActionCreated ?? DateUtils.getDBTime(0));
+ const actionCreationTime =
+ reportActionCreated ||
+ (latestReportActionFromOtherUsers?.created ?? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.lastVisibleActionCreated ?? DateUtils.getDBTime(0));
// We subtract 1 millisecond so that the lastReadTime is updated to just before a given reportAction's created date
// For example, if we want to mark a report action with ID 100 and created date '2014-04-01 16:07:02.999' unread, we set the lastReadTime to '2014-04-01 16:07:02.998'
@@ -1354,9 +1342,7 @@ function handleReportChanged(report: OnyxEntry) {
return;
}
- if (allReports && report?.reportID) {
- allReports[report.reportID] = report;
-
+ if (report?.reportID) {
if (ReportUtils.isConciergeChatReport(report)) {
conciergeChatReportID = report.reportID;
}
@@ -1512,21 +1498,19 @@ function removeLinksFromHtml(html: string, links: string[]): string {
* @param videoAttributeCache cache of video attributes ([videoSource]: videoAttributes)
*/
function handleUserDeletedLinksInHtml(newCommentText: string, originalCommentMarkdown: string, videoAttributeCache?: Record): string {
- const parser = new ExpensiMark();
if (newCommentText.length > CONST.MAX_MARKUP_LENGTH) {
return newCommentText;
}
- const htmlForNewComment = parser.replace(newCommentText, {
+ const htmlForNewComment = Parser.replace(newCommentText, {
extras: {videoAttributeCache},
});
- const removedLinks = parser.getRemovedMarkdownLinks(originalCommentMarkdown, newCommentText);
+ const removedLinks = Parser.getRemovedMarkdownLinks(originalCommentMarkdown, newCommentText);
return removeLinksFromHtml(htmlForNewComment, removedLinks);
}
/** Saves a new message for a comment. Marks the comment as edited, which will be reflected in the UI. */
function editReportComment(reportID: string, originalReportAction: OnyxEntry, textForNewComment: string, videoAttributeCache?: Record) {
- const parser = new ExpensiMark();
const originalReportID = ReportUtils.getOriginalReportID(reportID, originalReportAction);
if (!originalReportID || !originalReportAction) {
@@ -1537,7 +1521,7 @@ function editReportComment(reportID: string, originalReportAction: OnyxEntry rule.name).filter((name) => name !== 'autolink')};
- parsedOriginalCommentHTML = parser.replace(originalCommentMarkdown, autolinkFilter);
+ const autolinkFilter = {filterRules: Parser.rules.map((rule) => rule.name).filter((name) => name !== 'autolink')};
+ parsedOriginalCommentHTML = Parser.replace(originalCommentMarkdown, autolinkFilter);
}
// Delete the comment if it's empty
@@ -1757,7 +1741,7 @@ function toggleSubscribeToChildReport(childReportID = '-1', parentReportAction:
}
} else {
const participantAccountIDs = [...new Set([currentUserAccountID, Number(parentReportAction?.actorAccountID)])];
- const parentReport = allReports?.[parentReportID];
+ const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`];
const newChat = ReportUtils.buildOptimisticChatReport(
participantAccountIDs,
ReportActionsUtils.getReportActionText(parentReportAction),
@@ -2170,7 +2154,7 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
/** Deletes a report, along with its reportActions, any linked reports, and any linked IOU report. */
function deleteReport(reportID: string) {
- const report = currentReportData?.[reportID];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
const onyxData: Record = {
[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]: null,
[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]: null,
@@ -2322,7 +2306,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
}
// We don't want to send a local notification if the user preference is daily, mute or hidden.
- const notificationPreference = allReports?.[reportID]?.notificationPreference ?? CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS;
+ const notificationPreference = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.notificationPreference ?? CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS;
if (notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS) {
Log.info(`${tag} No notification because user preference is to be notified: ${notificationPreference}`);
return false;
@@ -2340,7 +2324,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
return false;
}
- const report = currentReportData?.[reportID];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
if (!report || (report && report.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)) {
Log.info(`${tag} No notification because the report does not exist or is pending deleted`, false);
return false;
@@ -2374,9 +2358,10 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
Log.info('[LocalNotification] Creating notification');
- const report = allReports?.[reportID] ?? null;
+ const localReportID = `${ONYXKEYS.COLLECTION.REPORT}${reportID}`;
+ const report = ReportConnection.getAllReports()?.[localReportID] ?? null;
if (!report) {
- Log.hmmm("[LocalNotification] couldn't show report action notification because the report wasn't found", {reportID, reportActionID: reportAction.reportActionID});
+ Log.hmmm("[LocalNotification] couldn't show report action notification because the report wasn't found", {localReportID, reportActionID: reportAction.reportActionID});
return;
}
@@ -2596,7 +2581,17 @@ function getCurrentUserAccountID(): number {
}
function navigateToMostRecentReport(currentReport: OnyxEntry) {
- const lastAccessedReportID = ReportUtils.findLastAccessedReport(allReports, false, undefined, false, false, reportMetadata, undefined, [], currentReport?.reportID)?.reportID;
+ const lastAccessedReportID = ReportUtils.findLastAccessedReport(
+ ReportConnection.getAllReports(),
+ false,
+ undefined,
+ false,
+ false,
+ reportMetadata,
+ undefined,
+ [],
+ currentReport?.reportID,
+ )?.reportID;
if (lastAccessedReportID) {
const lastAccessedReportRoute = ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID ?? '-1');
@@ -2621,7 +2616,7 @@ function joinRoom(report: OnyxEntry) {
}
function leaveGroupChat(reportID: string) {
- const report = currentReportData?.[reportID];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
if (!report) {
Log.warn('Attempting to leave Group Chat that does not existing locally');
return;
@@ -2649,7 +2644,7 @@ function leaveGroupChat(reportID: string) {
/** Leave a report by setting the state to submitted and closed */
function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = false) {
- const report = currentReportData?.[reportID];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
if (!report) {
return;
@@ -2732,7 +2727,7 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
/** Invites people to a room */
function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmailsToAccountIDs) {
- const report = currentReportData?.[reportID];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
if (!report) {
return;
}
@@ -2826,7 +2821,7 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmails
}
function clearAddRoomMemberError(reportID: string, invitedAccountID: string) {
- const report = currentReportData?.[reportID];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
pendingChatMembers: report?.pendingChatMembers?.filter((pendingChatMember) => pendingChatMember.accountID !== invitedAccountID),
participants: {
@@ -2888,7 +2883,7 @@ function inviteToGroupChat(reportID: string, inviteeEmailsToAccountIDs: InvitedE
* Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
*/
function removeFromRoom(reportID: string, targetAccountIDs: number[]) {
- const report = currentReportData?.[reportID];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
if (!report) {
return;
}
@@ -3846,4 +3841,5 @@ export {
updateLoadingInitialReportAction,
clearAddRoomMemberError,
clearAvatarErrors,
+ handleReportChanged,
};
diff --git a/src/libs/actions/ReportActions.ts b/src/libs/actions/ReportActions.ts
index 395c99fc4b26..b3718079441f 100644
--- a/src/libs/actions/ReportActions.ts
+++ b/src/libs/actions/ReportActions.ts
@@ -1,10 +1,11 @@
import type {OnyxCollection} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
import * as ReportActionUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
import * as ReportUtils from '@libs/ReportUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report as OnyxReportType, ReportActions} from '@src/types/onyx';
+import type {ReportActions} from '@src/types/onyx';
import type ReportAction from '@src/types/onyx/ReportAction';
import * as Report from './Report';
@@ -17,13 +18,6 @@ Onyx.connect({
callback: (value) => (allReportActions = value),
});
-let allReports: OnyxCollection;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
function clearReportActionErrors(reportID: string, reportAction: ReportAction, keys?: string[]) {
const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
@@ -85,7 +79,7 @@ function clearAllRelatedReportActionErrors(reportID: string, reportAction: Repor
clearReportActionErrors(reportID, reportAction, keys);
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
if (report?.parentReportID && report?.parentReportActionID && ignore !== 'parent') {
const parentReportAction = ReportActionUtils.getReportAction(report.parentReportID, report.parentReportActionID);
const parentErrorKeys = Object.keys(parentReportAction?.errors ?? {}).filter((err) => errorKeys.includes(err));
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 013ae698ed3f..0a7244bde1e5 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -12,6 +12,7 @@ import Navigation from '@libs/Navigation/Navigation';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
import * as ReportUtils from '@libs/ReportUtils';
import playSound, {SOUNDS} from '@libs/Sound';
import CONST from '@src/CONST';
@@ -77,13 +78,6 @@ Onyx.connect({
},
});
-let allReports: OnyxCollection;
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (value) => (allReports = value),
-});
-
/**
* Clears out the task info from the store
*/
@@ -909,14 +903,14 @@ function getParentReport(report: OnyxEntry): OnyxEntry {
- return allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+ return ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
}
/**
@@ -1129,7 +1123,7 @@ function canModifyTask(taskReport: OnyxEntry, sessionAccountID
}
function clearTaskErrors(reportID: string) {
- const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+ const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
// Delete the task preview in the parent report
if (report?.pendingFields?.createChat === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts
index 546c553ae672..9b79a31ef738 100644
--- a/src/libs/actions/Transaction.ts
+++ b/src/libs/actions/Transaction.ts
@@ -127,7 +127,7 @@ function saveWaypoint(transactionID: string, index: string, waypoint: RecentWayp
if (!recentWaypointAlreadyExists && waypoint !== null) {
const clonedWaypoints = lodashClone(recentWaypoints);
clonedWaypoints.unshift(waypoint);
- Onyx.merge(ONYXKEYS.NVP_RECENT_WAYPOINTS, clonedWaypoints.slice(0, 5));
+ Onyx.merge(ONYXKEYS.NVP_RECENT_WAYPOINTS, clonedWaypoints.slice(0, CONST.RECENT_WAYPOINTS_NUMBER));
}
}
diff --git a/src/libs/actions/Welcome.ts b/src/libs/actions/Welcome.ts
index cee4e24041f1..a90c386d02b6 100644
--- a/src/libs/actions/Welcome.ts
+++ b/src/libs/actions/Welcome.ts
@@ -1,5 +1,5 @@
import {NativeModules} from 'react-native';
-import type {OnyxCollection, OnyxUpdate} from 'react-native-onyx';
+import type {OnyxUpdate} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
import * as API from '@libs/API';
import {WRITE_COMMANDS} from '@libs/API/types';
@@ -9,7 +9,6 @@ import type {OnboardingPurposeType} from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type Onboarding from '@src/types/onyx/Onboarding';
-import type OnyxPolicy from '@src/types/onyx/Policy';
import type TryNewDot from '@src/types/onyx/TryNewDot';
let onboarding: Onboarding | [] | undefined;
@@ -202,23 +201,6 @@ Onyx.connect({
},
});
-const allPolicies: OnyxCollection = {};
-Onyx.connect({
- key: ONYXKEYS.COLLECTION.POLICY,
- callback: (val, key) => {
- if (!key) {
- return;
- }
-
- if (val === null || val === undefined) {
- delete allPolicies[key];
- return;
- }
-
- allPolicies[key] = {...allPolicies[key], ...val};
- },
-});
-
Onyx.connect({
key: ONYXKEYS.NVP_TRYNEWDOT,
callback: (value) => {
diff --git a/src/libs/actions/connections/NetSuiteCommands.ts b/src/libs/actions/connections/NetSuiteCommands.ts
index 20f7fcd6e483..66bf482d6ef2 100644
--- a/src/libs/actions/connections/NetSuiteCommands.ts
+++ b/src/libs/actions/connections/NetSuiteCommands.ts
@@ -7,7 +7,7 @@ import {WRITE_COMMANDS} from '@libs/API/types';
import * as ErrorUtils from '@libs/ErrorUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
-import type {Connections} from '@src/types/onyx/Policy';
+import type {Connections, NetSuiteCustomFormID} from '@src/types/onyx/Policy';
import type {OnyxData} from '@src/types/onyx/Request';
type SubsidiaryParam = {
@@ -729,7 +729,107 @@ function updateNetSuiteCustomFormIDOptionsEnabled(policyID: string, value: boole
API.write(WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_ENABLED, parameters, onyxData);
}
+function updateNetSuiteReimbursementAccountID(policyID: string, bankAccountID: string, oldBankAccountID?: string) {
+ const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.REIMBURSEMENT_ACCOUNT_ID, bankAccountID, oldBankAccountID);
+
+ const parameters = {
+ policyID,
+ bankAccountID,
+ };
+ API.write(WRITE_COMMANDS.UPDATE_NETSUITE_REIMBURSEMENT_ACCOUNT_ID, parameters, onyxData);
+}
+
+function updateNetSuiteCollectionAccount(policyID: string, bankAccountID: string, oldBankAccountID?: string) {
+ const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.COLLECTION_ACCOUNT, bankAccountID, oldBankAccountID);
+
+ const parameters = {
+ policyID,
+ bankAccountID,
+ };
+ API.write(WRITE_COMMANDS.UPDATE_NETSUITE_COLLECTION_ACCOUNT, parameters, onyxData);
+}
+
+function updateNetSuiteExportReportsTo(
+ policyID: string,
+ approvalLevel: ValueOf,
+ oldApprovalLevel: ValueOf,
+) {
+ const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_REPORTS_TO, approvalLevel, oldApprovalLevel);
+
+ const parameters = {
+ policyID,
+ value: approvalLevel,
+ };
+ API.write(WRITE_COMMANDS.UPDATE_NETSUITE_EXPORT_REPORTS_TO, parameters, onyxData);
+}
+
+function updateNetSuiteExportVendorBillsTo(
+ policyID: string,
+ approvalLevel: ValueOf,
+ oldApprovalLevel: ValueOf,
+) {
+ const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_VENDOR_BILLS_TO, approvalLevel, oldApprovalLevel);
+
+ const parameters = {
+ policyID,
+ value: approvalLevel,
+ };
+ API.write(WRITE_COMMANDS.UPDATE_NETSUITE_VENDOR_BILLS_TO, parameters, onyxData);
+}
+
+function updateNetSuiteExportJournalsTo(
+ policyID: string,
+ approvalLevel: ValueOf,
+ oldApprovalLevel: ValueOf,
+) {
+ const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_JOURNALS_TO, approvalLevel, oldApprovalLevel);
+
+ const parameters = {
+ policyID,
+ value: approvalLevel,
+ };
+ API.write(WRITE_COMMANDS.UPDATE_NETSUITE_JOURNALS_TO, parameters, onyxData);
+}
+
+function updateNetSuiteApprovalAccount(policyID: string, value: string, oldValue: string) {
+ const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.APPROVAL_ACCOUNT, value, oldValue);
+
+ const parameters = {
+ policyID,
+ value,
+ };
+ API.write(WRITE_COMMANDS.UPDATE_NETSUITE_APPROVAL_ACCOUNT, parameters, onyxData);
+}
+
+function updateNetSuiteCustomFormIDOptions(
+ policyID: string,
+ value: string,
+ isReimbursable: boolean,
+ exportDestination: ValueOf,
+ oldCustomFormID?: NetSuiteCustomFormID,
+) {
+ const customFormIDKey = isReimbursable ? CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_TYPE.REIMBURSABLE : CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_TYPE.NON_REIMBURSABLE;
+ const data = {
+ [customFormIDKey]: {
+ [CONST.NETSUITE_MAP_EXPORT_DESTINATION[exportDestination]]: value,
+ },
+ };
+ const oldData = {
+ [customFormIDKey]: oldCustomFormID?.[customFormIDKey] ?? null,
+ };
+ const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_OPTIONS, data, oldData);
+
+ const commandName = isReimbursable ? WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_REIMBURSABLE : WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_NON_REIMBURSABLE;
+ const parameters = {
+ policyID,
+ formType: CONST.NETSUITE_MAP_EXPORT_DESTINATION[exportDestination],
+ formID: value,
+ };
+ API.write(commandName, parameters, onyxData);
+}
+
export {
+ connectPolicyToNetSuite,
updateNetSuiteSubsidiary,
updateNetSuiteSyncTaxConfiguration,
updateNetSuiteExporter,
@@ -755,5 +855,11 @@ export {
updateNetSuiteAutoCreateEntities,
updateNetSuiteEnableNewCategories,
updateNetSuiteCustomFormIDOptionsEnabled,
- connectPolicyToNetSuite,
+ updateNetSuiteReimbursementAccountID,
+ updateNetSuiteCollectionAccount,
+ updateNetSuiteExportReportsTo,
+ updateNetSuiteExportVendorBillsTo,
+ updateNetSuiteExportJournalsTo,
+ updateNetSuiteApprovalAccount,
+ updateNetSuiteCustomFormIDOptions,
};
diff --git a/src/libs/markAllPolicyReportsAsRead.ts b/src/libs/markAllPolicyReportsAsRead.ts
index 49001a851cf5..259a5e426d89 100644
--- a/src/libs/markAllPolicyReportsAsRead.ts
+++ b/src/libs/markAllPolicyReportsAsRead.ts
@@ -1,32 +1,21 @@
-import Onyx from 'react-native-onyx';
-import ONYXKEYS from '@src/ONYXKEYS';
import type {Report} from '@src/types/onyx';
import * as ReportActionFile from './actions/Report';
+import * as ReportConnection from './ReportConnection';
import * as ReportUtils from './ReportUtils';
export default function markAllPolicyReportsAsRead(policyID: string) {
- const connectionID = Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (allReports) => {
- if (!allReports) {
- return;
- }
+ let delay = 0;
+ const allReports = ReportConnection.getAllReports() ?? {};
+ Object.keys(allReports).forEach((key: string) => {
+ const report: Report | null | undefined = allReports[key];
+ if (report?.policyID !== policyID || !ReportUtils.isUnread(report)) {
+ return;
+ }
- let delay = 0;
- Object.keys(allReports).forEach((key: string) => {
- const report: Report | null | undefined = allReports[key];
- if (report?.policyID !== policyID || !ReportUtils.isUnread(report)) {
- return;
- }
+ setTimeout(() => {
+ ReportActionFile.readNewestAction(report?.reportID);
+ }, delay);
- setTimeout(() => {
- ReportActionFile.readNewestAction(report?.reportID);
- }, delay);
-
- delay += 1000;
- });
- Onyx.disconnect(connectionID);
- },
+ delay += 1000;
});
}
diff --git a/src/libs/migrations/Participants.ts b/src/libs/migrations/Participants.ts
index 3dbbef486d68..eccaa0662f2f 100644
--- a/src/libs/migrations/Participants.ts
+++ b/src/libs/migrations/Participants.ts
@@ -1,6 +1,7 @@
import Onyx from 'react-native-onyx';
import type {NullishDeep, OnyxCollection} from 'react-native-onyx';
import Log from '@libs/Log';
+import * as ReportConnection from '@libs/ReportConnection';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Report} from '@src/types/onyx';
import type {Participants} from '@src/types/onyx/Report';
@@ -11,14 +12,7 @@ type OldReportCollection = Record>;
function getReports(): Promise> {
return new Promise((resolve) => {
- const connectionID = Onyx.connect({
- key: ONYXKEYS.COLLECTION.REPORT,
- waitForCollectionCallback: true,
- callback: (reports) => {
- Onyx.disconnect(connectionID);
- return resolve(reports);
- },
- });
+ resolve(ReportConnection.getAllReports());
});
}
diff --git a/src/pages/AddressPage.tsx b/src/pages/AddressPage.tsx
index 852c57595b70..a1daa938af4c 100644
--- a/src/pages/AddressPage.tsx
+++ b/src/pages/AddressPage.tsx
@@ -42,7 +42,7 @@ function AddressPage({title, address, updateAddress, isLoadingApp = true}: Addre
setCurrentCountry(address.country);
setCity(address.city);
setZipcode(address.zip);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [address?.state, address?.country, address?.city, address?.zip]);
const handleAddressChange = useCallback((value: unknown, key: unknown) => {
diff --git a/src/pages/EditReportFieldPage.tsx b/src/pages/EditReportFieldPage.tsx
index 69f959d6545f..d489e58493d3 100644
--- a/src/pages/EditReportFieldPage.tsx
+++ b/src/pages/EditReportFieldPage.tsx
@@ -77,11 +77,11 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps)
const value = form[fieldKey];
if (isReportFieldTitle) {
ReportActions.updateReportName(report.reportID, value, report.reportName ?? '');
+ Navigation.goBack();
} else {
ReportActions.updateReportField(report.reportID, {...reportField, value: value === '' ? null : value}, reportField);
+ Navigation.dismissModal(report?.reportID);
}
-
- Navigation.dismissModal(report?.reportID);
};
const handleReportFieldDelete = () => {
diff --git a/src/pages/InviteReportParticipantsPage.tsx b/src/pages/InviteReportParticipantsPage.tsx
index 91fdd903ec3a..a4d5c5518ba2 100644
--- a/src/pages/InviteReportParticipantsPage.tsx
+++ b/src/pages/InviteReportParticipantsPage.tsx
@@ -76,7 +76,7 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
setInvitePersonalDetails(inviteOptions.personalDetails);
setRecentReports(inviteOptions.recentReports);
setSelectedOptions(newSelectedOptions);
- // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want to recalculate when selectedOptions change
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want to recalculate when selectedOptions change
}, [personalDetails, betas, searchTerm, excludedUsers, options]);
const sections = useMemo(() => {
diff --git a/src/pages/LogInWithShortLivedAuthTokenPage.tsx b/src/pages/LogInWithShortLivedAuthTokenPage.tsx
index 47843aa434fa..8a0d71ec8d8c 100644
--- a/src/pages/LogInWithShortLivedAuthTokenPage.tsx
+++ b/src/pages/LogInWithShortLivedAuthTokenPage.tsx
@@ -71,7 +71,7 @@ function LogInWithShortLivedAuthTokenPage({route, account}: LogInWithShortLivedA
});
}
// The only dependencies of the effect are based on props.route
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [route]);
if (account?.isLoading) {
diff --git a/src/pages/LogOutPreviousUserPage.tsx b/src/pages/LogOutPreviousUserPage.tsx
index d46b13459c46..622a7db6e086 100644
--- a/src/pages/LogOutPreviousUserPage.tsx
+++ b/src/pages/LogOutPreviousUserPage.tsx
@@ -67,7 +67,7 @@ function LogOutPreviousUserPage({session, route, isAccountLoading}: LogOutPrevio
SessionActions.signInWithShortLivedAuthToken(email, shortLivedAuthToken);
}
// We only want to run this effect once on mount (when the page first loads after transitioning from OldDot)
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [initialURL]);
useEffect(() => {
@@ -86,7 +86,7 @@ function LogOutPreviousUserPage({session, route, isAccountLoading}: LogOutPrevio
navigateToExitUrl(exitUrl);
});
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [initialURL, isAccountLoading]);
return ;
diff --git a/src/pages/NewChatConfirmPage.tsx b/src/pages/NewChatConfirmPage.tsx
index 17e5708803cd..f72850c8f7bd 100644
--- a/src/pages/NewChatConfirmPage.tsx
+++ b/src/pages/NewChatConfirmPage.tsx
@@ -129,7 +129,7 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
FileUtils.readFileAsync(stashedLocalAvatarImage, newGroupDraft?.avatarFileName ?? '', onSuccess, onFailure, newGroupDraft?.avatarFileType ?? '');
// we only need to run this when the component re-mounted
- // 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/pages/PrivateNotes/PrivateNotesEditPage.tsx b/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
index 596e49c880e6..8ee260065b63 100644
--- a/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
+++ b/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
@@ -19,7 +19,7 @@ import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
import type {PrivateNotesNavigatorParamList} from '@libs/Navigation/types';
-import {parseHtmlToMarkdown} from '@libs/OnyxAwareParser';
+import Parser from '@libs/Parser';
import * as ReportUtils from '@libs/ReportUtils';
import updateMultilineInputRange from '@libs/updateMultilineInputRange';
import type {WithReportAndPrivateNotesOrNotFoundProps} from '@pages/home/report/withReportAndPrivateNotesOrNotFound';
@@ -52,7 +52,7 @@ function PrivateNotesEditPage({route, personalDetailsList, report, session}: Pri
// We need to edit the note in markdown format, but display it in HTML format
const [privateNote, setPrivateNote] = useState(
- () => ReportActions.getDraftPrivateNote(report.reportID).trim() || parseHtmlToMarkdown(report?.privateNotes?.[Number(route.params.accountID)]?.note ?? '').trim(),
+ () => ReportActions.getDraftPrivateNote(report.reportID).trim() || Parser.htmlToMarkdown(report?.privateNotes?.[Number(route.params.accountID)]?.note ?? '').trim(),
);
/**
@@ -93,7 +93,7 @@ function PrivateNotesEditPage({route, personalDetailsList, report, session}: Pri
const originalNote = report?.privateNotes?.[Number(route.params.accountID)]?.note ?? '';
let editedNote = '';
if (privateNote.trim() !== originalNote.trim()) {
- editedNote = ReportActions.handleUserDeletedLinksInHtml(privateNote.trim(), parseHtmlToMarkdown(originalNote).trim());
+ editedNote = ReportActions.handleUserDeletedLinksInHtml(privateNote.trim(), Parser.htmlToMarkdown(originalNote).trim());
ReportActions.updatePrivateNotes(report.reportID, Number(route.params.accountID), editedNote);
}
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx
index 3645a0dcf52d..9bbe9f5adbc4 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx
@@ -245,7 +245,7 @@ function ReimbursementAccountPage({
BankAccounts.setPlaidEvent(null);
}
fetchData(false, isStepToOpenEmpty);
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []); // The empty dependency array ensures this runs only once after the component mounts.
useEffect(() => {
@@ -311,7 +311,7 @@ function ReimbursementAccountPage({
Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute(getRouteForCurrentStep(currentStep), policyID, backTo));
},
- // eslint-disable-next-line react-hooks/exhaustive-deps
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[isOffline, reimbursementAccount, route, hasACHDataBeenLoaded, shouldShowContinueSetupButton],
);
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 58a0fe1a80b8..c9440ee548af 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -21,6 +21,7 @@ import PromotedActionsBar, {PromotedActions} from '@components/PromotedActionsBa
import RoomHeaderAvatars from '@components/RoomHeaderAvatars';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
@@ -107,6 +108,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
const [isLastMemberLeavingGroupModalVisible, setIsLastMemberLeavingGroupModalVisible] = useState(false);
const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+ const [isUnapproveModalVisible, setIsUnapproveModalVisible] = useState(false);
const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? '-1'}`], [policies, report?.policyID]);
const isPolicyAdmin = useMemo(() => PolicyUtils.isPolicyAdmin(policy), [policy]);
const isPolicyEmployee = useMemo(() => PolicyUtils.isPolicyEmployee(report?.policyID ?? '-1', policies), [report?.policyID, policies]);
@@ -134,7 +136,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
const shouldDisableRename = useMemo(() => ReportUtils.shouldDisableRename(report), [report]);
const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(report);
- // eslint-disable-next-line react-hooks/exhaustive-deps -- policy is a dependency because `getChatRoomSubtitle` calls `getPolicyName` which in turn retrieves the value from the `policy` value stored in Onyx
+ // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- policy is a dependency because `getChatRoomSubtitle` calls `getPolicyName` which in turn retrieves the value from the `policy` value stored in Onyx
const chatRoomSubtitle = useMemo(() => ReportUtils.getChatRoomSubtitle(report), [report, policy]);
const isSystemChat = useMemo(() => ReportUtils.isSystemChat(report), [report]);
const isGroupChat = useMemo(() => ReportUtils.isGroupChat(report), [report]);
@@ -179,7 +181,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
typeof requestParentReportAction?.actorAccountID === 'number' && typeof session?.accountID === 'number' && requestParentReportAction.actorAccountID === session?.accountID;
const isDeletedParentAction = ReportActionsUtils.isDeletedAction(requestParentReportAction);
- const moneyRequestReport = useMemo(() => {
+ const moneyRequestReport: OnyxEntry = useMemo(() => {
if (caseID === CASES.MONEY_REQUEST) {
return parentReport;
}
@@ -197,6 +199,11 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
const canDeleteRequest = isActionOwner && (ReportUtils.canAddOrDeleteTransactions(moneyRequestReport) || isSelfDMTrackExpenseReport) && !isDeletedParentAction;
const shouldShowDeleteButton = shouldShowTaskDeleteButton || canDeleteRequest;
+ const canUnapproveRequest =
+ ReportUtils.isExpenseReport(report) &&
+ (ReportUtils.isReportManager(report) || isPolicyAdmin) &&
+ (ReportUtils.isReportApproved(report) || ReportUtils.isReportManuallyReimbursed(report));
+
useEffect(() => {
if (canDeleteRequest) {
return;
@@ -224,6 +231,15 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
Report.leaveGroupChat(report.reportID);
}, [isChatRoom, isPolicyEmployee, isPolicyExpenseChat, report.reportID, report.visibility]);
+ const unapproveExpenseReportOrShowModal = useCallback(() => {
+ if (PolicyUtils.hasAccountingConnections(policy)) {
+ setIsUnapproveModalVisible(true);
+ return;
+ }
+ Navigation.dismissModal();
+ IOU.unapproveExpenseReport(moneyRequestReport);
+ }, [moneyRequestReport, policy]);
+
const shouldShowLeaveButton =
!isThread && (isGroupChat || (isChatRoom && ReportUtils.canLeaveChat(report, policy)) || (isPolicyExpenseChat && !report.isOwnPolicyExpenseChat && !isPolicyAdmin));
@@ -356,6 +372,16 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
},
});
}
+
+ if (canUnapproveRequest) {
+ items.push({
+ key: CONST.REPORT_DETAILS_MENU_ITEM.UNAPPROVE,
+ icon: Expensicons.CircularArrowBackwards,
+ translationKey: 'iou.unapprove',
+ isAnonymousAction: false,
+ action: () => unapproveExpenseReportOrShowModal(),
+ });
+ }
return items;
}, [
isSelfDM,
@@ -380,6 +406,8 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
isPolicyAdmin,
session,
leaveChat,
+ canUnapproveRequest,
+ unapproveExpenseReportOrShowModal,
]);
const displayNamesWithTooltips = useMemo(() => {
@@ -399,6 +427,14 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
/>
) : null;
+ const connectedIntegration = Object.values(CONST.POLICY.CONNECTIONS.NAME).find((integration) => !!policy?.connections?.[integration]);
+ const connectedIntegrationName = connectedIntegration ? translate('workspace.accounting.connectionName', connectedIntegration) : '';
+ const unapproveWarningText = (
+
+
+