[Payment due @Krishna2323] Add support for SmartScan hotel nightly rate category violations by akinwale · Pull Request #97596 · Expensify/App

akinwale · 2026-07-31T16:46:11Z

Explanation of Change

When a workspace category's Flag amounts over limit (limit type: Individual expense) is applied to an expense whose SmartScanned receipt has hotel reservation dates, the limit is now compared against the average nightly rate (total ÷ nights) rather than the full expense amount.

Expenses without reservation dates are unaffected, and the receipt-required and itemized-receipt-required thresholds continue to use the full amount. The overLimit and overCategoryLimit violations show new "Nightly rate over…" copy when the limit was applied per night, distinguished by the nights field the backend now returns.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/632262
PROPOSAL: https://github.com/Expensify/Expensify/issues/632262#issuecomment-5110547879

Tests

Prerequisites

Advanced Duplicate Detection enabled
Workspace Rules enabled
- Max expense amount set (eg. $200)
Category limit set (eg. Travel category; Flag amounts over $300, Type: Individual expense).

Test: Nightly rate under Category limit

Launch Expensify.
Navigate the workspace policy expense chat.
Create a new expense and upload a hotel receipt with a $250 nightly rate and a total up to $500 or higher (the receipt must have reservation start and end dates).
Set the category to Travel.
Click the Create expense button.
After the scan is complete, verify that the expense limit violation is not triggered and no error message is displayed.

Verify that no errors appear in the JS console

Test: Nightly rate over Category limit

Launch Expensify.
Navigate the workspace policy expense chat.
Create a new expense and upload a hotel receipt with a $350 nightly rate and a total up to $500 or higher (the receipt must have reservation start and end dates).
Set the category to Travel.
Click the Create expense button.
After the scan is complete, verify that the expense limit violation is triggered and the nightly rate error message is displayed.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test steps.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-07-31T16:46:16Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

codecov · 2026-07-31T16:51:10Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/libs/DebugUtils.ts	`69.09% <ø> (ø)`
src/libs/Violations/ViolationsUtils.ts	`81.70% <100.00%> (+1.01%)`	⬆️
...categories/DynamicExpenseLimitTypeSelectorPage.tsx	`0.00% <ø> (ø)`
...ForReviewRules/FlagForReviewRuleAmountPageBase.tsx	`0.00% <ø> (ø)`
src/libs/TransactionUtils/index.ts	`93.00% <66.66%> (+0.61%)`	⬆️
... and 521 files with indirect coverage changes

melvin-bot · 2026-08-06T19:11:07Z

@Krishna2323 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Krishna2323 · 2026-08-06T19:12:22Z

@akinwale I can review if required.

akinwale · 2026-08-06T19:13:51Z

@akinwale I can review if required.

@Krishna2323 Please go ahead. Thanks.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8b55cd376b

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

… days for night counting

garrettmknight

Steps look good to me.

Krishna2323 · 2026-08-06T20:29:46Z


+        // A SmartScanned multi-day reservation is measured against its average nightly rate rather than its total
+        const reservationNights = TransactionUtils.getReservationNights(updatedTransaction);
+        const amountForLimitCheck = reservationNights > 0 ? expenseAmount / reservationNights : expenseAmount;


Does the backend floor/round/ceil the per-night average, and at what precision?

There is no rounding in the backend. The divided value is compared directly with the actual limit for the violation check.

Krishna2323 · 2026-08-06T20:50:24Z

            canCalculateAmountViolations && !isInvoiceTransaction && TransactionUtils.hasReservationList(updatedTransaction) && isSameCurrency && expenseAmount > -updatedTransaction.amount;
        const shouldCategoryShowOverLimitViolation =
-            canCalculateAmountViolations && !isInvoiceTransaction && typeof categoryOverLimit === 'number' && expenseAmount > categoryOverLimit && isControlPolicy;
+            canCalculateAmountViolations && !isInvoiceTransaction && typeof categoryOverLimit === 'number' && amountForLimitCheck > categoryOverLimit && isControlPolicy;


Per-night averaging also applies to the workspace-level Max expense amount rule (shouldShowOverLimitViolation uses amountForLimitCheck), but only the category copy mentions it. I think we should add the same sentence to maxExpenseAmountDescription?

The explicit requirement was to update just the category copy.

Admin sets a "Flag amounts over" amount on the Hotel (or Car Rental) category and selects "Individual expense" as the limit type.

If SmartScan detects reservationStartDate and reservationEndDate on a receipt in that category, we calculate the per-night average (amount / nights) and use that instead of the total expense amount when checking against the threshold.

If no reservation dates are detected, the limit type behaves as it does today - flagging based on the full expense amount.

We'll update the explainer text under "Individual expense" to note that multi-day reservations are evaluated using the per-night average rather than the total.

@sakluger can provide some more insight for this.

That's a really good question. I hadn't considered that this would apply to the workspace limit, I originally intended for it to only apply to the category limits. Let me check with the team.

We should only apply the nightly rate to category limits, not the overall workspace max expense amount. We would expect the global max amount to always trigger for any expenses over that amount.

flaviadefaria · 2026-08-19T09:37:48Z

@Krishna2323 @akinwale @sakluger added a comment in Slack regarding this.

Should this logic also apply to the overall workspace "Max expense amount" limit, or only to category limits?

I’d expect the category-level max expense amount to override the general max whenever a specific limit is set for that category. Otherwise, there’s not much value in defining a category-specific maximum if it only takes effect when it’s lower than the general limit.

Especially if this matches how the product currently behaves, I’d keep it as is.

sakluger · 2026-08-20T16:46:03Z

I agree with @flaviadefaria. We shouldn't change the logic for when to use a category limit vs the overall limit. I assume that today, any defined category limit overrides the workspace limit.

flaviadefaria · 2026-08-21T10:00:02Z

Cool, so I think we're good to move forward. @akinwale @Krishna2323, what are the next steps here?

Krishna2323 · 2026-08-24T12:40:09Z

@akinwale, could you please resolve the conflicts and make the requested changes?

MonilBhavsar · 2026-09-02T12:33:34Z

+ * Returns the number of nights covered by a SmartScanned reservation receipt, or 0 when the
+ * transaction has no usable reservation range.
+ */
+function getReservationNights(transaction: OnyxEntry<Transaction>): number {


Would this be better suited in TravelUtils libs?

Not necessarily. It's more useful for determining if a particular transaction would be processed on a per-night amount basis for checking the transaction violations.

MonilBhavsar · 2026-09-03T18:55:48Z

Why these changes in actions files?

This must be from an incorrect or incomplete merge. I'll restore the file from the main branch.

Krishna2323 · 2026-09-08T15:09:05Z

@akinwale friendly bump

akinwale · 2026-09-09T22:43:05Z

@MonilBhavsar I have merged with the latest main. All tests are now passing.

MonilBhavsar

@akinwale , there are still changes in .github/actions/javascript/isDeployChecklistLocked/index.js and tests are failing. Please check

akinwale · 2026-09-10T06:28:37Z

@MonilBhavsar Restored the file from main. The only failing GH check I see is Verify peer review, which always fails.

flaviadefaria · 2026-09-10T09:25:39Z

It would be really great if we could merge this by tomorrow at the latest.

MonilBhavsar · 2026-09-10T20:34:38Z

Unlike every other locale, expenseSubtitle is unchanged here. Is it expected?

I have regenerated the translations for the changed paths.

MonilBhavsar · 2026-09-10T20:46:40Z


+        // A SmartScanned multi-day reservation is measured against its average nightly rate rather than its total
+        const reservationNights = TransactionUtils.getReservationNights(updatedTransaction);
+        const amountForLimitCheck = reservationNights > 0 ? expenseAmount / reservationNights : expenseAmount;


Could this per-night calculation also affect Category total limits? For example, a $500 five-night hotel expense with a $300 daily category limit is checked as $100/night and would not be flagged. Should we restrict this behavior to the Individual expense limit type?

Yes, we only want to apply the per-night limit to the "Individual expense" category limit type, not the "Category total" limit type. See https://github.com/Expensify/Expensify/issues/632262#issuecomment-4997562779.

sakluger · 2026-09-11T03:32:36Z

I have a call on Monday with the customer who requested this. What are the chances that we can get it merged tomorrow or Monday?

flaviadefaria · 2026-09-11T09:27:04Z

@MonilBhavsar @akinwale are we on track for merging this today?

…nslations

akinwale · 2026-09-11T09:47:44Z

@MonilBhavsar @akinwale are we on track for merging this today?

@MonilBhavsar I have updated the nightly limit check to Individual expense and tested to validate that it works as expected. The daily category limit type would trigger the violation.

@flaviadefaria Hopefully.

github-actions · 2026-09-11T13:15:30Z

🚧 MonilBhavsar has triggered a test Expensify/App build. You can view the workflow run here.

OSBotify · 2026-09-11T13:18:52Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-09-11T13:19:52Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #97596.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-9af638c-ce32ccf-ffa11ab29e59172713396f23413b3bdc1a4a2c02/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-9af638c-ce32ccf-b5c183ca2afc949dd54e4f28c2c48b9ec6382917/index.html

Web 🕸️
https://97596.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-09-11T21:59:02Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.4.77-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

MelvinBot · 2026-09-11T22:11:09Z

Yes — help site changes are required, and I've opened a draft PR for them: #101008

Why

This PR changed how a workspace category's Flag amounts over cap is measured, and the help site described that setting as nothing more than "Set a spending cap for this category."

Two things are now undocumented:

The cap can be measured per night. When the Type is Individual expense and the expense has a SmartScanned hotel receipt with check-in and check-out dates, the cap is compared against the average nightly rate (total ÷ nights) instead of the full total. An admin who sets a $300 cap and watches a $900 hotel expense go unflagged has nothing in the help site explaining why.
The Type row itself was never documented. Neither article mentioned that Flag amounts over has Individual expense and Category total options, so there was no place for the new behavior to attach to.

What I changed

docs/articles/new-expensify/workspaces/Create-expense-categories.md

Expanded the Flag amounts over bullet to cover the Amount field and the Type row, with both options.
Added a FAQ entry, How is Flag amounts over applied to a multi-day hotel expense?, with a worked example and an explicit list of what still uses the full expense total.

docs/articles/new-expensify/workspaces/Workspace-Rules.md

Expanded the same bullet under How to configure Category Rules, cross-linked to the new FAQ.
Clarified that Max expense amount is always compared against the full expense total, including a multi-day hotel expense.

Scope boundaries I read out of the diff, and how I verified the labels

From ViolationsUtils.ts, the nightly average applies only to the category cap when the limit type is EXPENSE (or unset). These still compare against the full total, so the docs say so explicitly:

Max expense amount — shouldShowOverLimitViolation still uses expenseAmount
Require receipts over and Require itemized receipts over — unchanged
Flag amounts over with Type set to Category total

I also documented the new violation string — Nightly rate over [amount]/person category limit — from en.ts, and noted that the full-total case still reads Amount over [amount]/person category limit. Since only overCategoryLimit got the new copy, the docs don't claim the workspace-level overLimit violation ever reports a nightly rate.

Every label in the new copy was read off the live app on web rather than the source: the Category rules section header, the Flag amounts over row and page, the Amount field, the Type row, the Individual expense / Category total options and their verbatim subtitles, and Max expense amount under Expenses on the Rules page. Screenshots are in the docs PR body.

docs/HELPSITE_NAMING_CONVENTIONS.md, docs/HELP_AUTHORING_GUIDELINES.md, and docs/TEMPLATE.md were applied: no new headings outside the existing # FAQ section, the new FAQ heading is a question, all UI labels are bolded with exact capitalization, and the cross-link is relative. npm run spell-changed passes on both files.

@akinwale, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

view run · no recording available

m-natarajan · 2026-09-11T22:35:17Z

@akinwale @Krishna2323 @garrettmknight Is applause.expensifail.com domain enabled for Advanced Duplicate Detection or do we have to provide accounts for the same?

luacmartins · 2026-09-15T00:51:26Z

@akinwale @MonilBhavsar @Krishna2323 can you check the comment above please?

OSBotify · 2026-09-15T00:58:22Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.4.77-4 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android

melvin-bot · 2026-09-15T01:00:30Z

🤖 Payment issue created: #101133

add support for SmartScan hotel nightly rate violations

21e3b0f

melvin-bot Bot assigned akinwale Jul 31, 2026

fix hotelReservationStartDate and hotelReservationEndDate references

d1698fb

akinwale changed the title ~~[HOLD Auth 23387] Add support for SmartScan hotel nightly rate violations~~ Add support for SmartScan hotel nightly rate violations Aug 4, 2026

akinwale added 3 commits August 4, 2026 09:13

Merge remote-tracking branch 'origin/main' into task-app-632262-ee

86489da

Merge remote-tracking branch 'origin/main' into task-app-632262-ee

6621ed5

add translations

8b55cd3

akinwale marked this pull request as ready for review August 6, 2026 19:11

akinwale requested review from a team as code owners August 6, 2026 19:11

melvin-bot Bot requested a review from Krishna2323 August 6, 2026 19:11

melvin-bot Bot requested review from garrettmknight and removed request for a team August 6, 2026 19:11

chatgpt-codex-connector Bot reviewed Aug 6, 2026

View reviewed changes

Comment thread src/libs/Violations/ViolationsUtils.ts Outdated

Comment thread src/libs/TransactionUtils/index.ts Outdated

rebuild over-limit violations for changed night context, use calendar…

b6a04df

… days for night counting

garrettmknight previously approved these changes Aug 6, 2026

View reviewed changes

Krishna2323 reviewed Aug 6, 2026

View reviewed changes

akinwale added 2 commits August 24, 2026 08:34

Merge remote-tracking branch 'origin/main' into task-app-632262-ee

1918a95

remove workspace nightly over-limit violation

bf0557c

akinwale dismissed garrettmknight’s stale review via bf0557c August 24, 2026 15:01

MonilBhavsar reviewed Sep 3, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into task-app-632262-ee

fca4d88

akinwale requested a review from MonilBhavsar September 9, 2026 22:42

MonilBhavsar reviewed Sep 10, 2026

View reviewed changes

restore from main

92ccc9e

akinwale force-pushed the task-app-632262-ee branch from a61fea7 to 92ccc9e Compare September 10, 2026 06:26

MonilBhavsar reviewed Sep 10, 2026

View reviewed changes

limit nightly violation check to individual expense types, update tra…

0139f0c

…nslations

akinwale requested a review from MonilBhavsar September 11, 2026 09:47

MonilBhavsar approved these changes Sep 11, 2026

View reviewed changes

MonilBhavsar merged commit 9af638c into Expensify:main Sep 11, 2026
36 of 38 checks passed

OSBotify mentioned this pull request Sep 11, 2026

Deploy Checklist: New Expensify 2026-09-11 #100992

Closed

50 tasks

MelvinBot mentioned this pull request Sep 11, 2026

[No QA] Docs updates for E/A#97596 category limit nightly rate for multi-day reservations #101008

Open

40 tasks

melvin-bot Bot mentioned this pull request Sep 15, 2026

[Due for payment 2026-09-22] Payment issue for E/App PR#97596 #101133

Open

Conversation

akinwale commented Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jul 31, 2026

Uh oh!

codecov Bot commented Jul 31, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Aug 6, 2026

Uh oh!

Krishna2323 commented Aug 6, 2026

Uh oh!

akinwale commented Aug 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

garrettmknight left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akinwale Aug 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

flaviadefaria commented Aug 19, 2026

Uh oh!

sakluger commented Aug 20, 2026

Uh oh!

flaviadefaria commented Aug 21, 2026

Uh oh!

Krishna2323 commented Aug 24, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Sep 8, 2026

Uh oh!

akinwale commented Sep 9, 2026

Uh oh!

MonilBhavsar left a comment

Choose a reason for hiding this comment

Uh oh!

akinwale commented Sep 10, 2026

Uh oh!

flaviadefaria commented Sep 10, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akinwale Sep 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

akinwale commented Jul 31, 2026 •

edited

Loading

codecov Bot commented Jul 31, 2026 •

edited by github-actions Bot

Loading

akinwale Aug 7, 2026 •

edited

Loading

akinwale Sep 11, 2026 •

edited

Loading

MelvinBot commented Sep 11, 2026 •

edited

Loading