Skip to content

UI updates to add/update rules#93212

Merged
yuwenmemon merged 19 commits into
mainfrom
chore/92736-ui-changes
Jun 15, 2026
Merged

UI updates to add/update rules#93212
yuwenmemon merged 19 commits into
mainfrom
chore/92736-ui-changes

Conversation

@NicolasBonet

@NicolasBonet NicolasBonet commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Follow up for #92736 due to a missing design review

Fixed Issues

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

Tests

  1. Go to a Control workspace
  2. Click in Rules
  3. Scroll down to the AI rules section
  4. Type the rule
  5. Click Save
  6. Edit the rule with a new content
  7. Click Save
  8. Open the rule
  9. Click delete and confirm
  10. Verify the rule is deleted
  • Verify that no errors appear in the JS console

Offline tests

N/A

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 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
    • 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

MacOS: Chrome / Safari
Screen.Recording.2026-06-10.at.5.10.53.PM.mov

@NicolasBonet NicolasBonet requested a review from a team June 10, 2026 21:33
@NicolasBonet NicolasBonet marked this pull request as ready for review June 10, 2026 21:33
@NicolasBonet NicolasBonet requested review from a team as code owners June 10, 2026 21:33
@melvin-bot melvin-bot Bot requested review from ShridharGoel and heyjennahay and removed request for a team June 10, 2026 21:33
@melvin-bot

melvin-bot Bot commented Jun 10, 2026

Copy link
Copy Markdown

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

@melvin-bot melvin-bot Bot removed the request for review from a team June 10, 2026 21:33
@NicolasBonet NicolasBonet changed the title Minor ui updates to add/update rules UI updates to add/update rules Jun 10, 2026
@OSBotify

This comment has been minimized.

@ShridharGoel

ShridharGoel commented Jun 10, 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 there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (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
    • 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 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)
  • 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
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • 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
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • 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 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 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.
  • 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
Screen.Recording.2026-06-11.at.3.24.05.AM.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-06-11.at.3.15.52.AM.mov

@ShridharGoel

ShridharGoel commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Videos for design team

Screen.Recording.2026-06-11.at.3.15.52.AM.mov
Screen.Recording.2026-06-11.at.3.24.05.AM.mov

Comment thread src/languages/en.ts Outdated
deleteRuleConfirmation: 'Are you sure you want to delete this rule?',
describeRuleTitle: 'Describe your rule',
describeRuleSubtitle: 'Describe your rule and Concierge will build it',
describeRuleTitle: 'Describe your rule and Concierge will build it.',

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.

Can this not overflow to the second line and overlap with the user's prompt text (like on narrow screens in languages where the text is longer) because it is used as the floating label?

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.

Like this

Screenshot 2026-06-11 at 3 28 28 AM

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.

What dimensions are you using?

@NicolasBonet NicolasBonet Jun 11, 2026

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.

Fixed either way to be limited to one line: c3b9bae

image

@NicolasBonet NicolasBonet force-pushed the chore/92736-ui-changes branch from 16818f2 to 0c97b99 Compare June 10, 2026 22:17
@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

Let us know when we can run a build to review this

NicolasBonet and others added 7 commits June 11, 2026 09:24
…ted summaries and update prompt display logic in AIRulesSection. This change allows for a more descriptive title to be shown, improving clarity for users.
…ule.title ?? rule.prompt` to ensure a fallback to prompt when title is not available, enhancing user clarity.
Cover title/prompt fallback, whitespace normalization, sort order,
pending-delete visibility online vs offline, and rule item / add
button navigation paths.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…Label components

This update introduces a new prop to control the label's behavior in multiline inputs, ensuring it can remain on a single line and ellipsize as needed. The prop has been added to the relevant types, implementations, and usage in AddAIRulePage and EditAIRulePage components.
@NicolasBonet NicolasBonet force-pushed the chore/92736-ui-changes branch from c3b9bae to 89e38fd Compare June 11, 2026 14:24
@codecov

codecov Bot commented Jun 11, 2026

Copy link
Copy Markdown

@shawnborton

Copy link
Copy Markdown
Contributor

@NicolasBonet @yuwenmemon @puneetlath I'm curious if you all are planning to address my other feedback from the original PR? Again, I set up a rule that didn't even work and it had a lot of unexpected user flows (random message from a bot, bot was added as an admin but wasn't announced as a system message in the #admins room, the rule I made for approval didn't even work, etc).

I understand all of this is behind a beta - but do we have more clear guidance on what the ideal user flow is for this?

@shawnborton

Copy link
Copy Markdown
Contributor

but can make it shorter if we want to.

Let's just skip this for now, we can follow up later if we feel strongly.

@shawnborton

Copy link
Copy Markdown
Contributor

Ultra minor nit: I think I'd remove the trailing period here since it's a floating label and not a sentence
CleanShot 2026-06-15 at 17 12 53@2x

@shawnborton

Copy link
Copy Markdown
Contributor

We can follow up with this later but I would love to move the Delete button to just be a trash can icon in the top RHP header

CleanShot 2026-06-15 at 17 14 17@2x

So yeah, I think this is good to merge so we can keep marching forwards.

@shawnborton

Copy link
Copy Markdown
Contributor

On the contrary, can we please add a period at the end of this sentence here:
CleanShot 2026-06-15 at 17 17 35@2x

@NicolasBonet all good on my end from here, just letting you know I will be away from laptop for the next 3 hours or so 🇪🇸 so feel free to get things merged without me

Add period to AI rules section subtitle and drop trailing period from
the floating label since it's not a sentence.
@OSBotify

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/es.ts b/src/languages/es.ts
index 29adbbefdbc..609905dacfa 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1753,7 +1753,6 @@ const translations: TranslationDeepObject<typeof en> = {
                 }
             },
             [CONST.NEXT_STEP.MESSAGE_KEY.WAITING_TO_MARK_AS_DONE]: (actor, actorType, _eta, _etaType) => {
-                // eslint-disable-next-line default-case
                 switch (actorType) {
                     case CONST.NEXT_STEP.ACTOR_TYPE.CURRENT_USER:
                         return `Esperando a que <strong>tú</strong> lo marques como listo.`;
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 1ff1bf7ca74..821cb0b1675 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -1,6 +1,7 @@
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
+ * / (_ / -_) _ \/ -_) __/ _ \`/ __/ -_) _  /
  * \___/\__/_//_/\__/_/  \_,_/\__/\__/\_,_/
  *
  * This file was automatically generated. Please consider these alternatives before manually editing it:
@@ -862,7 +863,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Cette discussion est avec ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `C’est ici que <strong>${submitterDisplayName}</strong> soumettra des dépenses à <strong>${workspaceName}</strong>. Utilisez simplement le bouton +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'C\u2019est ici que vous suivrez vos dépenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'C’est ici que vous suivrez vos dépenses',
         beginningOfChatHistorySelfDM: 'Ceci est votre espace personnel. Utilisez-le pour vos notes, tâches, brouillons et rappels.',
         beginningOfChatHistorySystemDM: 'Bienvenue ! Procédons à la configuration.',
         chatWithAccountManager: 'Discutez avec votre gestionnaire de compte ici',
@@ -7420,7 +7421,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
             },
             agentRules: {
                 title: 'Règles Agent',
-                subtitle: 'Décrivez des règles flexibles qui s’exécutent quand vous en avez besoin.',
+                subtitle: 'Décrivez des règles flexibles qui s’exécutent lorsque vous en avez besoin.',
                 addRule: 'Ajouter une règle Agent',
                 findRule: 'Rechercher une règle Agent',
                 addRuleTitle: 'Ajouter une règle',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 7f1bd2f81d0..a8016a388be 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7378,7 +7378,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
             },
             agentRules: {
                 title: 'Regole Agente',
-                subtitle: 'Descrivi regole flessibili che vengono eseguite quando ne hai bisogno.',
+                subtitle: 'Descrivi regole flessibili che si attivano quando ne hai bisogno.',
                 addRule: 'Aggiungi regola Agente',
                 findRule: 'Trova regola Agente',
                 addRuleTitle: 'Aggiungi regola',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index c35a517859c..cec7aa3e23c 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7296,7 +7296,7 @@ ${reportName}
             },
             agentRules: {
                 title: 'エージェント ルール',
-                subtitle: '必要なときに実行される柔軟なルールを記述します。',
+                subtitle: '必要なときに実行できる柔軟なルールについて説明します。',
                 addRule: 'エージェント ルールを追加',
                 findRule: 'エージェント ルールを検索',
                 addRuleTitle: 'ルールを追加',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 6274c4251ee..bb3329a866d 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7353,14 +7353,14 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
             },
             agentRules: {
                 title: 'Agentregels',
-                subtitle: 'Beschrijf flexibele regels die worden uitgevoerd wanneer je ze nodig hebt.',
+                subtitle: 'Beschrijf flexibele regels die worden uitgevoerd wanneer jij ze nodig hebt.',
                 addRule: 'Agentregel toevoegen',
                 findRule: 'Agentregel zoeken',
                 addRuleTitle: 'Regel toevoegen',
                 editRuleTitle: 'Regel bewerken',
                 deleteRule: 'Regel verwijderen',
                 deleteRuleConfirmation: 'Weet je zeker dat je deze regel wilt verwijderen?',
-                describeRuleTitle: 'Beschrijf je regel en Concierge maakt hem voor je',
+                describeRuleTitle: 'Beschrijf je regel en Concierge stelt hem voor je op',
                 disclaimer: 'AI-agents kunnen fouten maken.',
             },
         },
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index b8b2ef30742..cf95d4dd117 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7346,14 +7346,14 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
             },
             agentRules: {
                 title: 'Zasady Agenta',
-                subtitle: 'Opisz elastyczne reguły, które działają wtedy, gdy ich potrzebujesz.',
+                subtitle: 'Opisuj elastyczne reguły, które uruchamiają się wtedy, gdy ich potrzebujesz.',
                 addRule: 'Dodaj regułę Agenta',
                 findRule: 'Znajdź regułę Agenta',
                 addRuleTitle: 'Dodaj regułę',
                 editRuleTitle: 'Edytuj regułę',
                 deleteRule: 'Usuń regułę',
                 deleteRuleConfirmation: 'Na pewno chcesz usunąć tę regułę?',
-                describeRuleTitle: 'Opisz swoją regułę, a Concierge ją utworzy',
+                describeRuleTitle: 'Opisz swoją regułę, a Concierge ją zbuduje',
                 disclaimer: 'Agenci AI mogą popełniać błędy.',
             },
         },
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 0a03d4f77ad..ab77c8cfe8b 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7352,7 +7352,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
             },
             agentRules: {
                 title: 'Regras de Agente',
-                subtitle: 'Descreva regras flexíveis que rodam quando você precisa.',
+                subtitle: 'Descreva regras flexíveis que sejam executadas quando você precisar.',
                 addRule: 'Adicionar regra de Agente',
                 findRule: 'Encontrar regra de Agente',
                 addRuleTitle: 'Adicionar regra',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index d86821de609..ffad1e949a6 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7164,14 +7164,14 @@ ${reportName}
             },
             agentRules: {
                 title: '代理规则',
-                subtitle: '描述在你需要时运行的灵活规则。',
+                subtitle: '根据需要随时运行的灵活规则说明',
                 addRule: '添加代理规则',
                 findRule: '查找代理规则',
                 addRuleTitle: '添加规则',
                 editRuleTitle: '编辑规则',
                 deleteRule: '删除规则',
                 deleteRuleConfirmation: '确定要删除此规则吗?',
-                describeRuleTitle: '描述你的规则,我们会由 Concierge 为你创建',
+                describeRuleTitle: '描述你的规则,我们会由 Concierge 来创建',
                 disclaimer: 'AI 智能体可能会犯错。',
             },
         },

Note

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

View workflow run

@NicolasBonet

Copy link
Copy Markdown
Contributor Author

Fixed the two wording ones @shawnborton, for the delete we can follow up, but Rules in general have the same pattern, so I didn't change that one

isPerDiemRequest only checked iouRequestType, which is not always
populated (e.g. for transactions reconstituted on the client without
the request-type field). Fall back to the per diem customUnit name so
inline edit permissions correctly disable amount and merchant fields.
@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@yuwenmemon

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 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
    • 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 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)
  • 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
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • 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
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • 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 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 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.
  • 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

@yuwenmemon yuwenmemon merged commit 088ea43 into main Jun 15, 2026
37 of 39 checks passed
@yuwenmemon yuwenmemon deleted the chore/92736-ui-changes branch June 15, 2026 19:39
@github-actions

Copy link
Copy Markdown
Contributor

🚧 @yuwenmemon 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/yuwenmemon in version: 9.4.9-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed the changes in this PR against the help site files under docs/articles and no help site updates are required.

Why: This is a cosmetic/design-review follow-up. The changes don't alter any documented feature, workflow, button label, or behavior:

  • shouldLabelStayOnSingleLine prop on BaseTextInput/TextInputLabel — internal rendering of the floating label (clip to a single line + ellipsize). Not user-facing in a documentable way.
  • AI prompt HTML-error timing in AgentAIPromptSection.tsx — the invalid-character error now shows on save rather than while typing. Internal UX detail, not documented.
  • Copy tweaks — added a trailing period to the Agent Rules subtitle and merged the "Describe your rule" title + subtitle into a single line.

I checked the three articles that mention this feature — Create-Agent-Rules.md, How-to-Write-Agent-Rules.md, and Workspace-Rules.md — and none of them quote the changed copy strings or reference the label/error-display behavior touched here. So there's nothing to update.

Since no changes are required, I did not create a draft help site PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.9-0 🚀

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

@ShridharGoel

Copy link
Copy Markdown
Contributor

@mallenexpensify Looks like no payment issue was created for this - can you have a look?

@mallenexpensify

Copy link
Copy Markdown
Contributor

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants