Skip to content

[Rules Revamp R1] Add tabbed Rules page layout and restructure General tab#93185

Open
Krishna2323 wants to merge 102 commits into
Expensify:mainfrom
Krishna2323:krishna2323/rules-revamp-r1
Open

[Rules Revamp R1] Add tabbed Rules page layout and restructure General tab#93185
Krishna2323 wants to merge 102 commits into
Expensify:mainfrom
Krishna2323:krishna2323/rules-revamp-r1

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #92739
PROPOSAL:

Tests

  • Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

  • Same as QA Steps

QA Steps

Prerequisites

  • Should have access to rulesRevamp beta.

Beta gate

  1. With beta off → legacy rules page (no tabs).
  2. With beta on → tabbed revamp (General / Card restrictions / Expense defaults, + Rule).

General tab

  1. Confirm titles: Flag expenses older than, Flag expenses above amount, Flag receipt line items, Require receipts, Require fields…
  2. Open each row → RHP title matches; save a change → row description updates.

Flag receipt line items

  1. Toggle without saving → not persisted on return.
  2. Toggle + Save → persisted.
  3. Offline: save → only changed toggles grey out; General tab row greys out; clears after sync.

Require receipts

  1. Enable toggle, leave amount empty, save → field error + form alert; fix the errors focuses first invalid field.
  2. Both toggles on with receipt amount > itemized amount → errors on both fields.
  3. Offline: change only one toggle/amount + save → only that row greys out (not the other).

Require fields / Cash / Billable

  1. Change toggles or selection → Save → persists and General tab updates.
  2. Offline: pending grey-out on changed row + parent General tab row.

Card restrictions & Expense defaults tabs

  1. Tables render with correct columns/badges; edit + save updates table.
  2. Bulk select + delete works.
  3. Card restrictions shows upsell when card not enabled.

+ Rule flows

  1. Restrict card spend and Apply expense defaults — create/edit/save from + Rule.

Regression

  1. eReceipts + attendee tracking toggles still save with offline pending feedback.
  2. Legacy page unchanged when beta is off.
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
android_hybrid.mp4
Android: mWeb Chrome
android_mWeb.mp4
iOS: Native
ios_hybrid.mp4
iOS: mWeb Safari
ios_mWeb.mp4
MacOS: Chrome / Safari
web_chrome.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@melvin-bot

melvin-bot Bot commented Jun 10, 2026

Copy link
Copy Markdown

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:

  1. Look at the code and make sure there are no malicious changes.
  2. 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

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
… subtitle color

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
…eceiptsPage

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
…d beta gate

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
…r default spend rule

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
…th layout

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
…tion, responsive sizing, full-width layout, and fix tab icon

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
…ault rule press

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323

Copy link
Copy Markdown
Contributor Author

All issues are fixed

@JS00001 JS00001 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to update this to support this PR which just merged: #93063

@JS00001

JS00001 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

@Expensify/design I agree with @situchan , this doesn't look right. Should/can we update it?
image

@JS00001

JS00001 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor
image Selected prohibited expenses dont show up inline

@JS00001

JS00001 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Cant save a merchant rule:

Screen.Recording.2026-06-19.at.8.17.24.AM.mov

@JS00001

JS00001 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

"Allow" doesnt show the merchant selection or merchant type selection

image

Probably similar to having to merge out the changes from the PR I linked above

@JS00001

JS00001 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Pemitted currencies is not selectable, again, also because this needs to be merged out from the PR above

@JS00001

JS00001 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

IDK how, but I'm getting an infinite loop of requests:

Screen.Recording.2026-06-19.at.8.26.01.AM.mov

@JS00001

JS00001 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

@Krishna2323 (and @Expensify/design), I talked with @shawnborton , and we decided to keep the empty state consistent with every other table:

image

Lets update it to match this. @Krishna2323 lets also remove the extra params from the table header that we needed to create the previous empty state

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@JS00001

JS00001 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Did we remove the 'Company Card Required' toggle? we should probably add that rule back

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Comment thread src/components/SpendRules/SpendRuleRestrictionTypeToggleRevamp.tsx
Comment thread src/components/Table/TableHeader.tsx Outdated
Comment thread src/components/Table/TableHeader.tsx Outdated
Comment thread src/components/Tables/WorkspaceExpenseDefaultsTable/index.tsx Outdated
Comment thread src/components/Tables/WorkspaceSpendRulesTable/WorkspaceSpendRulesTableRow.tsx Outdated
Comment thread src/pages/workspace/rules/PolicyRulesPageRevamp.tsx Outdated
Comment thread src/pages/workspace/rules/PolicyRulesPageRevamp.tsx Outdated
@Krishna2323

Copy link
Copy Markdown
Contributor Author

Did we remove the 'Company Card Required' toggle? we should probably add that rule back

"Require company cards for all purchases" exists on the current page, but I don't see it in the General tab designs. I assume this is now handled under the Card restrictions page?

It will be re-added in R2, specifically in the Flag for review section. Given that all these changes are happening under a beta, we're fine with it being removed for R1 and then we'll address in R2.

Ref: #92739 (comment)

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323

Copy link
Copy Markdown
Contributor Author

@codex review

@Krishna2323

Copy link
Copy Markdown
Contributor Author

Cant save a merchant rule:

can't repro this issue

this doesn't look right. Should/can we update it? image

@Expensify/design 👀 please

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 16bcde2e4b

ℹ️ 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".

const headerButtons = getHeaderContent();

const handleGetExpensifyCardPress = useCallback(() => {
enableExpensifyCard(policyID, true, true);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Gate the Expensify Card upsell by write access

In the revamp, this page is accessible with read access to Rules, but the card-rules empty state calls enableExpensifyCard for any viewer. On a workspace where Expensify Cards are disabled and the user can read rules but cannot change workspace features, pressing “Get the card” optimistically flips areExpensifyCardsEnabled and navigates before the backend rejects it. Please gate this CTA with the appropriate write access/read-only modal, as other Expensify Card promotion entry points do.

Useful? React with 👍 / 👎.

Comment on lines +61 to +62
const [receiptEnabled, setReceiptEnabled] = useState(initialReceiptEnabled);
const [itemizedEnabled, setItemizedEnabled] = useState(initialItemizedEnabled);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Sync receipt toggles after policy data loads

When this new RHP is opened from a cold/deep link, AccessOrNotFoundWrapper shows a loading screen after these hooks have already run with policy undefined, so receiptEnabled and itemizedEnabled stay false even after openWorkspace loads existing receipt thresholds. The UI then shows both requirements off, and pressing Save sends empty strings to setPolicyMaxExpenseAmountNoReceipt/NoItemizedReceipt, disabling the existing rules. Please initialize or resync this draft state only after the policy values are available.

Useful? React with 👍 / 👎.

Comment on lines +50 to +51
const [categoryRequired, setCategoryRequired] = useState(initialCategoryRequired);
const [tagRequired, setTagRequired] = useState(initialTagRequired);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Sync required-field toggles after policy data loads

These local states are initialized only once, before the wrapper has finished loading the policy on a cold/deep link. If the workspace already requires category or tag, the loaded initial*Required values update to true but categoryRequired/tagRequired remain false, so the page displays the rules as disabled and Save calls the setters to turn them off. Please resync the draft toggles when the policy loads or defer rendering the editable state until it is available.

Useful? React with 👍 / 👎.

Comment on lines +62 to +63
const initialProhibitedExpenses = useMemo(() => getProhibitedExpensesState(policy?.prohibitedExpenses), [policy?.prohibitedExpenses]);
const [draftProhibitedExpenses, setDraftProhibitedExpenses] = useState(initialProhibitedExpenses);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Sync prohibited expense draft after policy data loads

For the revamp flow, this draft is captured from initialProhibitedExpenses only on the first render. On a direct load the policy is still undefined while the wrapper fetches it, so the draft starts with all prohibited expenses false and never picks up the loaded policy values; Save then persists that all-false draft and clears any existing prohibited expense flags. Please update the draft when the policy values arrive or avoid creating it from the empty policy state.

Useful? React with 👍 / 👎.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants