Skip to content

[cp staging] Revert "Merge pull request #104155 from Krishna2323/krishna2323/issue-102277-expense-defaults" - #105888

Merged
JS00001 merged 1 commit into
Expensify:mainfrom
Krishna2323:krishna2323/revert-104155-expense-defaults
Nov 4, 2026
Merged

JS00001 merged 1 commit into
Expensify:mainfrom
Krishna2323:krishna2323/revert-104155-expense-defaults

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

This reverts commit 5fe4be0, which added amount and tag conditions to expense default rules.

Explanation of Change

Reverts #104155, which added three capabilities to expense default rules: matching on a tag, setting an amount, and creating a rule with no merchant at all.

Before that PR, MerchantRulePageBase required a merchant to save or preview a rule, and a category could only narrow a merchant rule further. This revert restores that requirement, so an expense default rule once again matches on a merchant, optionally narrowed by a category, and sets any field except amount.

Every blocker listed below either targets a field that no longer exists (105805, 105811, 105812, 105819, 105862) or a rule shape that can no longer be authored (105817, 105822, 105828, 105829, 105855, 105859). 105817 is worth calling out: its premise is "rule can be created without merchant", which is exactly the capability being reverted.

Two conflicts came up against current main and were resolved by hand:

  • src/pages/iou/request/step/DynamicIOURequestStepCategoryCreate.tsx keeps main's version. The revert wanted to restore the inline create-and-apply block, but Offer to create the searched-for category when a category search has no results #105575 later replaced that with the useCreateAndApplyCategory hook, and that PR is not being reverted.
  • config/oxlint/oxlint.seatbelt.tsv takes the revert's entries, matching the files that come back.

Two caveats for QA. 105822 and 105855 may still reproduce using a rule that matches on both a merchant and a category, since that shape still exists:

  • 105822: if the engine ignores the category half of the filter, the rule applies to every expense from that merchant regardless of its category.
  • 105855: deleting the category used by a merchant-plus-category rule may still leave the rule listed.

Neither is caused by this PR, and the client sends the correct filter tree in both cases, so if they still reproduce they need a backend fix rather than another revert.

Fixed Issues

$ #105805
$ #105811
$ #105812
$ #105817
$ #105819
$ #105822
$ #105828
$ #105829
$ #105855
$ #105859
$ #105862

PROPOSAL: N/A, revert of a deploy-blocking PR

Tests

Precondition: a Control workspace with Rules, Categories and Tags enabled.

  1. Go to workspace settings > Rules > Add rule > Apply expense defaults.
  2. Verify the matching section offers Merchant and Category only, with no Tag option.
  3. Verify the defaults section has no Amount field.
  4. Leave the merchant empty, set a Category default, and try to save.
  5. Verify the rule cannot be saved and an error is shown on the merchant field.
  6. Enter a merchant to match, set a Category default, and save the rule.
  7. Verify the rule is listed on the Expense defaults tab with the right summary.
  8. Open the saved rule, change the default category, and save.
  9. Verify the summary updates.
  10. Open the rule and tap Preview, and verify the matching expenses are listed.
  11. Delete the rule and verify it disappears from the list.
  12. Create an expense whose merchant matches the rule.
  13. Verify the expense opens without crashing and the category default is applied.
  • Verify that no errors appear in the JS console

Offline tests

  1. Go offline.
  2. Create an expense default rule matching on a merchant.
  3. Verify the rule appears in the list greyed out with a pending style.
  4. Delete it and verify it stays listed with a struck-through pending delete.
  5. Go back online.
  6. Verify the pending styles clear and the list matches what the server returns.

QA Steps

Precondition: a Control workspace with Rules, Categories and Tags enabled.

  1. Go to workspace settings > Rules > Add rule > Apply expense defaults.
  2. Verify there is no Tag option in the matching section and no Amount field in the defaults section (105811, 105819, 105812).
  3. Leave the merchant empty and try to save the rule.
  4. Verify it cannot be saved without a merchant (105817, 105859).
  5. Enter a merchant to match, set a Category default, and save the rule.
  6. Create an expense using that merchant.
  7. Open the expense from the report.
  8. Verify the expense opens and does not crash (105805).
  9. Verify the rule's category is applied and the amount and currency are left exactly as entered (105862).
  10. Open the rule again and verify the summary reads correctly with no amount in it (105812).
  11. Open the rule and tap Preview, and verify only expenses from that merchant are listed (105828, 105829).
  • 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Monosnap.screencast.2026-11-04.16-22-16.mp4

@melvin-bot

melvin-bot Bot commented Nov 4, 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 bun ./scripts/generateTranslations.ts --help

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

@Krishna2323

Copy link
Copy Markdown
Contributor Author

@MelvinBot review

@Krishna2323
Krishna2323 marked this pull request as ready for review November 4, 2026 10:06
@Krishna2323
Krishna2323 requested review from a team as code owners November 4, 2026 10:06
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-04T10:33:45.324363Z 6d252e4 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@melvin-bot
melvin-bot Bot removed request for a team November 4, 2026 10:06
@melvin-bot

melvin-bot Bot commented Nov 4, 2026

Copy link
Copy Markdown

@situchan 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]

@situchan

situchan commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot confirm #104155 was cleanly reverted

@situchan situchan closed this Nov 4, 2026
@situchan situchan reopened this Nov 4, 2026
@situchan

situchan commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

Sorry fat finger

@codecov

codecov Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/CONST/index.ts 95.96% <ø> (ø)
src/SCREENS.ts 100.00% <ø> (ø)
...MoneyRequestConfirmationList/FieldAutoSelector.tsx 73.07% <100.00%> (+1.07%) ⬆️
...nts/MoneyRequestConfirmationList/TaxController.tsx 96.77% <100.00%> (-0.79%) ⬇️
...MoneyRequestConfirmationList/hooks/useTaxAmount.ts 100.00% <100.00%> (ø)
...oneyRequestConfirmationList/sections/DateField.tsx 72.15% <ø> (-0.69%) ⬇️
...DefaultsTable/WorkspaceExpenseDefaultsTableRow.tsx 3.50% <ø> (ø)
...nts/Tables/WorkspaceExpenseDefaultsTable/index.tsx 2.04% <100.00%> (ø)
src/hooks/useUpdateTransactionCategory.ts 100.00% <100.00%> (ø)
src/libs/CategoryContextualRulesUtils.ts 94.11% <100.00%> (+2.01%) ⬆️
... and 44 more
... and 12 files with indirect coverage changes

@MelvinBot

MelvinBot commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

🤖 Web test steps verification results: ⚠️ partial

Verified on dev NewDot web: the matching expense opened without crashing, Equipment applied automatically, and 12.34 USD remained unchanged. Preview showed the matching expense and deletion removed the rule; offline and console checks remain blocked.

Deleted merchant rule no longer appears in search

Step Status
T1: Open Apply expense defaultsOpened through workspace Rules.
✅
T2: Merchant and Category matching onlyMatching dialog offered no Tag option.
✅
T3: No Amount defaultFull form read-back contained no Amount field.
✅
T4: Save with merchant emptySelected Advertising and attempted saving without a merchant.
✅
T5: Merchant validation blocks savingForm displayed “This field is required” and “Please enter a merchant”.
Required merchant validation blocks saving
✅
T6: Save merchant ruleSaved MelvinPR105888 with Advertising as its category default.
✅
T7: Correct list summarySummary showed the matching merchant and Advertising default.
✅
T8: Edit category defaultChanged Advertising to Equipment and saved.
✅
T9: Summary updatesList showed Equipment after saving.
✅
T10: Preview matching expensesPreview listed the created merchant expense: $12.34, Equipment.
✅
T11: Delete ruleAfter deletion, searching its merchant returned no results.
Deleted merchant rule no longer appears in search
✅
T12: Recreate rule, then create matching expenseCreated the expense before deleting the existing rule. The delete-then-recreate sequence was not tested.
⚠️
T13: Expense opens and category appliesExpense details rendered with Equipment; activity attributed the category to workspace rules.
Opened matching expense with Equipment applied automatically
✅
O1: Go offlineUnsupported by the available testing interface.
⚠️
O2: Create rule offlineBlocked by unavailable offline setup.
⚠️
O3: Verify pending creation styleOffline creation was not exercised.
⚠️
O4: Verify pending deletion styleOffline deletion was not exercised.
⚠️
O5: Go onlineOffline/online switching was unavailable.
⚠️
O6: Verify synchronization clears pending stylesOffline synchronization was not exercised.
⚠️
Q1: Open Apply expense defaultsCovered by equivalent T1 navigation evidence.
✅
Q2: No Tag matching or Amount defaultCovered by T2–T3 form read-backs.
✅
Q3: Attempt saving without merchantCovered by T4's save attempt.
✅
Q4: Merchant is requiredCovered by T5 validation evidence.
Equivalent Q4 evidence: missing merchant prevents saving
✅
Q5: Save merchant rule with categoryCovered by T6 creation and T8 category update.
✅
Q6: Create matching expenseCreated MelvinPR105888 expense with 12.34 USD.
✅
Q7: Open expense from reportOpened its report and expense details.
✅
Q8: Expense does not crashExpense details and Amount editor rendered successfully.
Matching expense details rendered successfully
✅
Q9: Category applies; amount and currency stay unchangedEquipment applied automatically. Amount editor confirmed 12.34 USD, matching creation inputs.
Opened matching expense with Equipment applied automatically
✅
Q10: Correct summary without AmountReopened rule retained merchant and Equipment; no Amount default appeared.
✅
Q11: Preview excludes other merchantsOnly the matching expense appeared, but no different-merchant control expense was created.
⚠️
C1: No JavaScript console errorsConsole inspection was unavailable; absence of errors is not confirmed.
⚠️

view run · no recording available

@MelvinBot

Copy link
Copy Markdown
Contributor

Not completely clean. The feature changes from Support expense defaults for more than just merchants are reversed. The later category-creation hook is preserved.

However, the conflict resolution restores the entire old lint baseline, including unrelated suppressions (config/oxlint/oxlint.seatbelt.tsv:1434–1436). Keep the PR base’s baseline and restore only entries required by restored files.


view run

…323/issue-102277-expense-defaults"

This reverts commit 5fe4be0, which added
amount and tag conditions to expense default rules.

Deploy blockers 105805, 105811, 105812, 105819 and 105862 all come from the
amount condition. Reverting clears them while the rules engine work continues.

The conflict in DynamicIOURequestStepCategoryCreate.tsx keeps main's version,
because useCreateAndApplyCategory landed after this PR and is not being
reverted.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323
Krishna2323 force-pushed the krishna2323/revert-104155-expense-defaults branch from 6d252e4 to 9f34259 Compare November 4, 2026 10:23

@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: 6d252e47b3

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

}

function getTaxExpenseRules(policy: OnyxEntry<Policy>): ExpenseRule[] {
return policy?.rules?.expenseRules?.filter((rule) => rule.tax) ?? [];

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Migrate category defaults before switching back to policy storage

For a workspace that created a category-tax default while the parent version was live, that default was written as a SetRule in rules_; this resolver now reads only policy.rules.expenseRules, and this revert does not migrate or delete the existing record. Those defaults therefore disappear from category settings and the client tax lookup falls back to the workspace default, so affected expenses no longer get the configured category rate. Preserve the existing records in the lookup or migrate them before switching storage back.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Accurate, but staging only. #104155 is in 9.5.31-0-staging and not in 9.5.30-0, which is current production, so the only rules_ category tax defaults that exist were made by QA in the last day.

cc: @JS00001 for backend cleanup instead if needed.

Comment thread src/libs/RuleUtils.ts
const hasCreateTransactionTrigger = getRuleTriggers(rule).some((trigger) => trigger === CONST.RULES.TRIGGERS.CREATE_TRANSACTION);
const hasSetAction = actions.some((action) => action?.name === CONST.RULES.ACTIONS.SET);
const hasCondition = getRuleFilterLeaves(rule.filters).length > 0;
const hasMerchantFilter = getRuleFilterLeaves(rule.filters).some((leaf) => leaf.left === CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT);

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Keep saved merchantless rules reachable for cleanup

When a workspace saved a tag-only default while this feature was live, hasMerchantFilter is false, so isExpenseDefaultRule filters the persisted record out of getPolicyExpenseDefaultRules and the Expense defaults table. This revert sends no DeleteRule, so the backend rule can keep applying while the admin loses the row needed to inspect or delete it. Keep existing merchantless rules visible and read-only for removal, or clean them up during the rollback.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Confirmed, and this is the one I'd act on. After the revert isExpenseDefaultRule requires a merchant filter, so a tag-only or category-only rule saved yesterday drops out of the table while the server record survives and may keep applying. Staging only, same reasoning as above.

@JS00001 should these merchantless rules_ records be deleted on staging? A rule that still applies but no admin can see is worse than one that is gone.

value: key,
keyForList: key,
isSelected: key === selectedTaxRate,
isDisabled: value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,

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 Exclude disabled tax rates from the category picker

If a workspace has a disabled tax rate that is not pending deletion, this list still marks it selectable because isDisabled checks only pendingAction. Saving it writes a category default, but getSelectableCategoryTaxCode rejects disabled IDs and falls back to the workspace default, so the saved rate never applies. Use isSelectableTaxRate or otherwise mark disabled rates unavailable.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Not caused by this PR. That isDisabled line is byte for byte identical to the pre-#104155 version of this file, which has been in production for a while, and the revert restores it unchanged. Real bug, but it needs its own issue rather than riding along on a revert.

Comment on lines +157 to +158
const actions: string[] = [];
for (const {field, value} of summaryFields) {

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 Show persisted amount actions in rule summaries

For a merchant-scoped rule saved before this revert with an amount action, the row remains in getPolicyExpenseDefaultRules, but getMerchantRuleFormValues now declines it and this summary builder has no FIELD.AMOUNT case. The read-only row therefore omits the amount (and an amount-only rule appears empty) even though the stored rule can keep changing expenses. Retain a read-only summary for stored amount actions or migrate/remove those records.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Same root cause as 1 and 2: a revert orphans records written while the feature was live. Staging only. Adding a read-only summary path for amounts would mean keeping part of the reverted code, which defeats the point of the revert.

"../../src/pages/workspace/rules/MerchantRules/ExpenseDefaultTypePage.tsx" "@typescript-eslint/no-deprecated/MenuItem" 1
"../../src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx" "@typescript-eslint/no-deprecated/MenuItemWithTopDescription" 1
"../../src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx" "rulesdir/no-onyx-loading-status" 1

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.

This line seems no longer needed

@situchan

situchan commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible 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 checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified any copy / text that was added to the app 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-11-04.at.12.04.12.PM.mov

@melvin-bot
melvin-bot Bot requested review from JS00001 and luacmartins November 4, 2026 12:11
@JS00001 JS00001 changed the title Revert "Merge pull request #104155 from Krishna2323/krishna2323/issue-102277-expense-defaults" [cp staging] Revert "Merge pull request #104155 from Krishna2323/krishna2323/issue-102277-expense-defaults" Nov 4, 2026
@JS00001
JS00001 merged commit fb50a47 into Expensify:main Nov 4, 2026
39 of 52 checks passed
@github-actions

github-actions Bot commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

✋ 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

github-actions Bot commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

OSBotify pushed a commit that referenced this pull request Nov 4, 2026
…-expense-defaults

[cp staging] Revert "Merge pull request #104155 from Krishna2323/krishna2323/issue-102277-expense-defaults"

(cherry picked from commit fb50a47)

(cherry-picked to staging by blimpich)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Nov 4, 2026
@OSBotify OSBotify mentioned this pull request Nov 4, 2026
99 tasks done
@OSBotify

OSBotify commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.5.31-2 🚀

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

@os-botify

os-botify Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

🔁 Filed a Staging retest request for deploy blockers #105805, #105811, #105812, #105817, #105819, #105822, #105828, #105829, #105855, #105859, #105862 after this PR was cherry-picked to staging.

@OSBotify

OSBotify commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.5.31-4 🚀

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

Bundle Size Analysis (Sentry):

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

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants