Skip to content

[Payment due @bernhardoj] [No QA] Add apply to existing unsubmitted expenses toggle to personal expense rules - #100244

Merged
Beamanator merged 2 commits into
mainfrom
nicolas-personal-rules-apply-existing
Sep 17, 2026
Merged

Beamanator merged 2 commits into
mainfrom
nicolas-personal-rules-apply-existing

Conversation

@NicolasBonet

@NicolasBonet NicolasBonet commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

  • Adds an "Apply to existing unsubmitted expenses" toggle to the personal expense rule editor (Account > Expense Rules), matching OldDot and the existing toggle on workspace merchant rules.
  • Saves rules through a new SetPersonalExpenseRules command instead of the generic SetNameValuePair, which can't carry the flag. The payload keeps the same stringified rules array and adds the flag plus the created/edited rule for the backend job.
  • Reuses the already-staged applyToExistingExpenses translation key, with copy updated to match the merchant-rules wording.
  • Deploy order: the Auth PR and Web-Expensify PR adding the backend command and job must be live first.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/674774
PROPOSAL:

Tests

  1. Go to Account > Expense Rules and click New rule.
  2. Set a merchant to match (e.g. "Starbucks") and a category.
  3. Verify a toggle labeled "Apply to existing unsubmitted expenses" appears above the Save rule button, off by default.
  4. Save the rule with the toggle off and verify existing unsubmitted expenses with that merchant are unchanged, and new expenses with that merchant get the category.
  5. Create another unsubmitted expense with merchant "Starbucks" without a category.
  6. Edit the rule, enable the toggle, and save.
  7. Verify the existing unsubmitted "Starbucks" expense picks up the rule's category shortly after saving.
  8. Submit an expense with that merchant, edit the rule again with the toggle on, and verify the submitted expense is not modified.
  • Verify that no errors appear in the JS console

Offline tests

  1. Go offline.
  2. Create or edit a personal expense rule with the toggle on and save.
  3. Verify the rule appears in the list with a pending state.
  4. Go back online and verify the rule persists and existing unsubmitted matching expenses are updated once the request completes.

QA Steps

Same as tests.

  • 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
  • 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 followed proper code patterns (see Reviewing the code)
    • 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 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)
  • 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)
  • 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.
  • 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

MacOS: Chrome / Safari
CleanShot.2026-09-03.at.10.33.28.AM.mp4

@OSBotify

OSBotify commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

🦜 Polyglot Parrot! 🦜

Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues:

View the translation diff
diff --git a/src/languages/de.ts b/src/languages/de.ts
index c7e953e6..c9029321 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -3112,7 +3112,7 @@ ${amount} für ${merchant} – ${date}`,
             merchantHint: 'Gib . ein, um eine Regel zu erstellen, die für alle Händler gilt',
             addToReport: 'Zu einem Bericht mit dem Namen hinzufügen',
             createReport: 'Bericht bei Bedarf erstellen',
-            applyToExistingExpenses: 'Auf bestehende nicht eingereichte Ausgaben anwenden',
+            applyToExistingExpenses: 'Auf vorhandene nicht eingereichte Ausgaben anwenden',
             confirmError: 'Gib ein Händlerunternehmen ein und nimm mindestens eine Aktualisierung vor',
             confirmErrorMerchant: 'Bitte Händler eingeben',
             confirmErrorUpdate: 'Bitte wende mindestens ein Update an',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 301d98d2..ef68f81f 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -3166,7 +3166,7 @@ ${amount} για ${merchant} - ${date}`,
             merchantHint: 'Πληκτρολογήστε . για να δημιουργήσετε έναν κανόνα που ισχύει για όλους τους εμπόρους',
             addToReport: 'Προσθήκη σε αναφορά με όνομα',
             createReport: 'Δημιουργήστε αναφορά αν χρειάζεται',
-            applyToExistingExpenses: 'Εφαρμογή σε υφιστάμενες μη υποβληθείσες δαπάνες',
+            applyToExistingExpenses: 'Εφαρμογή σε υπάρχουσες μη υποβληθείσες δαπάνες',
             confirmError: 'Εισαγάγετε τον έμπορο και εφαρμόστε τουλάχιστον μία ενημέρωση',
             confirmErrorMerchant: 'Παρακαλούμε εισαγάγετε τον έμπορο',
             confirmErrorUpdate: 'Παρακαλούμε εφαρμόστε τουλάχιστον μία ενημέρωση',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 5d282422..4755a68d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3020,7 +3020,7 @@ ${amount} para ${merchant} - ${date}`,
             merchantHint: 'Escribe . para crear una regla que se aplique a todos los comercios',
             addToReport: 'Añadir a un informe llamado',
             createReport: 'Crear informe si es necesario',
-            applyToExistingExpenses: 'Aplicar a gastos existentes no enviados',
+            applyToExistingExpenses: 'Aplicar a los gastos existentes no enviados',
             confirmError: 'Introduce el comercio y aplica al menos una actualización',
             confirmErrorMerchant: 'Por favor, introduce el comercio',
             confirmErrorUpdate: 'Por favor, aplica al menos una actualización',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 71664c36..9f9b6491 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -3119,7 +3119,7 @@ ${amount} pour ${merchant} - ${date}`,
             merchantHint: 'Tapez . pour créer une règle qui s’applique à tous les marchands',
             addToReport: 'Ajouter à une note de frais nommée',
             createReport: 'Créer une note de frais si nécessaire',
-            applyToExistingExpenses: 'Appliquer aux dépenses non soumises existantes',
+            applyToExistingExpenses: 'Appliquer aux dépenses existantes non soumises',
             confirmError: 'Saisissez un commerçant et appliquez au moins une mise à jour',
             confirmErrorMerchant: 'Veuillez saisir le commerçant',
             confirmErrorUpdate: 'Veuillez appliquer au moins une mise à jour',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index a3001596..963722c3 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -2995,7 +2995,7 @@ ${amount},商户:${merchant} - 日期:${date}`,
             merchantHint: '输入 . 可创建适用于所有商家的规则',
             addToReport: '添加到报表,名称为',
             createReport: '如有必要则创建报表',
-            applyToExistingExpenses: '应用到现有未提交的报销费用',
+            applyToExistingExpenses: '应用到现有未提交报销',
             confirmError: '输入商户并应用至少一项更新',
             confirmErrorMerchant: '请输入商户',
             confirmErrorUpdate: '请至少应用一个更新',

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply 😉

View workflow run

@codecov

codecov Bot commented Sep 3, 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/libs/API/types.ts 100.00% <ø> (ø)
src/pages/settings/Rules/RulePageBase.tsx 0.00% <0.00%> (ø)
src/libs/actions/User.ts 39.82% <0.00%> (-0.18%) ⬇️
... and 206 files with indirect coverage changes

@github-actions github-actions Bot changed the title Add apply to existing unsubmitted expenses toggle to personal expense rules [No QA] Add apply to existing unsubmitted expenses toggle to personal expense rules Sep 3, 2026
@OSBotify

This comment has been minimized.

@NicolasBonet
NicolasBonet force-pushed the nicolas-personal-rules-apply-existing branch from 42e39c2 to a4d678e Compare September 3, 2026 14:21
@NicolasBonet NicolasBonet changed the title [No QA] Add apply to existing unsubmitted expenses toggle to personal expense rules [Hold Web-E#55851] Add apply to existing unsubmitted expenses toggle to personal expense rules Sep 3, 2026
@github-actions github-actions Bot changed the title [Hold Web-E#55851] Add apply to existing unsubmitted expenses toggle to personal expense rules [No QA] [Hold Web-E#55851] Add apply to existing unsubmitted expenses toggle to personal expense rules Sep 3, 2026
@OSBotify

This comment has been minimized.

@OSBotify

This comment has been minimized.

@NicolasBonet
NicolasBonet force-pushed the nicolas-personal-rules-apply-existing branch from b592ec2 to 57daf9b Compare September 15, 2026 15:47
@NicolasBonet NicolasBonet changed the title [No QA] [Hold Web-E#55851] Add apply to existing unsubmitted expenses toggle to personal expense rules [No QA] Add apply to existing unsubmitted expenses toggle to personal expense rules Sep 15, 2026
@OSBotify

This comment has been minimized.

@NicolasBonet
NicolasBonet force-pushed the nicolas-personal-rules-apply-existing branch from 57daf9b to 6871001 Compare September 15, 2026 17:00
@OSBotify

This comment has been minimized.

@NicolasBonet
NicolasBonet marked this pull request as ready for review September 15, 2026 17:09
@melvin-bot
melvin-bot Bot requested review from flaviadefaria and removed request for a team September 15, 2026 17:09
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 15, 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-09-15T17:20:08.684169Z 6871001 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 commented Sep 15, 2026

Copy link
Copy Markdown

Concierge reviewer checklist:

  • I have verified the accuracy of the article
    • The article is within a hub that makes sense, and the navigation is correct
    • All processes, screenshots, and examples align with current product behavior.
    • All links within the doc have been verified for correct destination and functionality.
  • I have verified the readability of the article
    • The article's language is clear, concise, and free of jargon.
    • The grammar, spelling, and punctuation are correct.
    • The article contains at least one image, or that an image is not necessary
  • I have verified the formatting of the article
    • The article has consistent formatting (headings, bullet points, etc.) with other HelpDot articles and that aligns with the HelpDot formatting standards.
    • The article has proper text spacing and breaks for readability.
  • I have verified the article has the appropriate tone and style
    • The article's tone is professional, friendly, and suitable for the target audience.
    • The article's tone, terminology, and voice are consistent throughout.
  • I have verified the overall quality of the article
    • The article is not missing any information, nor does it contain redundant information.
    • The article fully addresses user needs.
  • I have verified that all requested improvements have been addressed

For more detailed instructions on completing this checklist, see How do I review a HelpDot PR as a Concierge Team member?

cc @sakluger

@melvin-bot
melvin-bot Bot requested review from bernhardoj and sakluger and removed request for a team September 15, 2026 17:09
@melvin-bot

melvin-bot Bot commented Sep 15, 2026

Copy link
Copy Markdown

@bernhardoj @sakluger One of you needs to 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]

enabledWhenOffline
shouldRenderFooterAboveSubmit
footerContent={
<View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.mb4]}>

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.

❌ CONSISTENCY-3 (docs)

This footerContent block manually rebuilds a label-plus-Switch toggle row (a <View> with flexRow/justifyContentBetween, a <Text> label, and a <Switch> with a matching accessibilityLabel). That exact pattern is already provided by ToggleSettingOptionRow, which is imported in this file and used just above (lines 271-282) for the createReport toggle. Reimplementing it inline duplicates the toggle-row markup, styling, and accessibility wiring that already exists in a shared component.

Reuse the existing component instead of hand-rolling the row:

footerContent={
    <ToggleSettingOptionRow
        isActive={shouldUpdateMatchingTransactions}
        onToggle={setShouldUpdateMatchingTransactions}
        switchAccessibilityLabel={translate('expenseRulesPage.addRule.applyToExistingExpenses')}
        title={translate('expenseRulesPage.addRule.applyToExistingExpenses')}
        wrapperStyle={styles.mb4}
    />
}

Reviewed at: 6871001 | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

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.

Valid review

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.

Added @bernhardoj

@github-actions

Copy link
Copy Markdown
Contributor

HelpDot Documentation Review

Overall Assessment

This PR documents a new Apply to existing unsubmitted expenses toggle for Personal Expense Rules. The only documentation file changed is docs/articles/new-expensify/settings/Personal-Expense-Rules.md (all other files are code/translations and are out of scope for this review). The doc changes are well-targeted: they add the optional toggle step to both the create and edit procedures, correct the previously inaccurate "rules never apply retroactively" statements, and rewrite the relevant FAQ answer to reflect the new behavior. The changes are accurate, consistent, and closely follow the governance conventions.

Scores Summary

  • Readability: 9/10 - New steps are clear, sequential, and action-oriented. The "(Optional)" prefix and the explanatory clarifications (submitted vs. unsubmitted) read cleanly and improve scannability.
  • AI Readiness: 9/10 - Changes reuse the exact feature/toggle name consistently across steps, explanatory text, and FAQ, which reinforces semantic retrieval. Frontmatter (title, description, keywords, internalScope) was already present and untouched; the FAQ question maps well to real search intent.
  • Style Compliance: 9/10 - The toggle name Apply to existing unsubmitted expenses is bolded and matches the en.ts UI string exactly, per the toggle/UI-referencing rules. Step numbering was correctly renumbered after inserting the new step.

Key Findings

  • Correct, consistent use of the exact UI toggle label with bold formatting across all four touchpoints (create steps, edit steps, applied-behavior section, FAQ).
  • The FAQ answer was correctly flipped from "No" to a precise "Yes, for unsubmitted expenses" with the submitted-expense exclusion clearly stated - accurate and search-aligned.
  • The toggle is introduced with "Enable Apply to existing unsubmitted expenses", which is compliant with the toggle phrasing in the naming conventions. No blocking issues.
  • Minor consistency note (pre-existing, not introduced here): surrounding H2 headings use Title Case (e.g. "How to Create an Expense Rule") rather than sentence/task-based casing; the diff does not touch these, so no penalty applies to this PR.

Recommendations

  • No required changes. Optionally, confirm the toggle label placement guidance (web vs. mobile) matches the actual UI footer position, since the switch is rendered in a footer above the submit button.
  • Keep the toggle label in the doc in sync with en.ts if the UI string changes later.

Files Reviewed

  • docs/articles/new-expensify/settings/Personal-Expense-Rules.md - Approved; accurate, well-formatted additions consistent with governance.

Note: Detailed line-by-line feedback has been provided as inline comments.

@bernhardoj

bernhardoj commented Sep 16, 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 proper code patterns were followed (see Reviewing the code)
    • 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 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • 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 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 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.
  • 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
web.mp4

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@OSBotify

Copy link
Copy Markdown
Contributor

A preview of your ExpensifyHelp changes have been deployed to https://916f7bfa.helpdot.pages.dev ⚡️

Updated articles:

@bernhardoj bernhardoj 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.

LGTM

@melvin-bot melvin-bot Bot changed the title [No QA] Add apply to existing unsubmitted expenses toggle to personal expense rules [Payment due @bernhardoj] [No QA] Add apply to existing unsubmitted expenses toggle to personal expense rules Sep 17, 2026
@melvin-bot

melvin-bot Bot commented Sep 17, 2026

Copy link
Copy Markdown

🎯 @bernhardoj, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/674774.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@sakluger sakluger 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.

Help site updates look good to me. 👍

@Beamanator Beamanator 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.

LGTM

@Beamanator
Beamanator merged commit d6d3fe5 into main Sep 17, 2026
49 of 51 checks passed
@Beamanator
Beamanator deleted the nicolas-personal-rules-apply-existing branch September 17, 2026 15:53
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

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.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.4.82-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review: yes, one follow-up change was required. Draft PR: Docs updates for E/A#100244 Apply to existing unsubmitted expenses toggle

What this PR already covered

docs/articles/new-expensify/settings/Personal-Expense-Rules.md was updated in this PR and is accurate. I verified every label in it against the live UI on web:

Article text Live UI
Apply to existing unsubmitted expenses Apply to existing unsubmitted expenses, off by default
New rule New rule
Save rule Save rule
Account Account

Add rule page showing the Apply to existing unsubmitted expenses toggle above Save rule

What was missing

Changing the copy to Apply to existing unsubmitted expenses made the personal rule toggle and the workspace merchant rule toggle read identically — both now render from the same wording (en.ts:3249 and en.ts:8408).

But docs/articles/new-expensify/workspaces/Workspace-Merchant-Rules.md:126 still described that toggle as "apply to existing expenses" — quoted, lowercase, and a label that never existed in the UI. Step 6 of the create flow paraphrased it too. Both break the mandatory toggle rules in HELPSITE_NAMING_CONVENTIONS.md (exact label, bolded, no quotes), and the two articles now contradicted each other about the same control.

The draft PR fixes both lines and adds that already-submitted expenses are never updated by a rule.

One thing I did not change

The Account settings menu item and page heading render as Expense rules (lowercase r, from en.ts:3217), but Personal-Expense-Rules.md writes Expense Rules throughout. That is a pre-existing capitalization mismatch, not something this PR introduced, so I left it out to keep the diff scoped. Say the word if you want it cleaned up in the same PR.

I also left docs/articles/expensify-classic/expenses/Expense-Rules.md alone — that documents the Expensify Classic label, which this PR did not change.


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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.4.86-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.4.89-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.4.89-0 🚀

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

Bundle Size Analysis (Sentry):

@melvin-bot

melvin-bot Bot commented Sep 18, 2026

Copy link
Copy Markdown

🤖 Payment issue created: #101622

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.

6 participants