Skip to content

feat: Expand GBR/RBR with an "action badge"#85025

Merged
mountiny merged 12 commits intoExpensify:mainfrom
aimane-chnaif:feature-84764
Mar 12, 2026
Merged

feat: Expand GBR/RBR with an "action badge"#85025
mountiny merged 12 commits intoExpensify:mainfrom
aimane-chnaif:feature-84764

Conversation

@aimane-chnaif
Copy link
Contributor

@aimane-chnaif aimane-chnaif commented Mar 12, 2026

Explanation of Change

Based on discussion:

Anything that isn't Submit, Approve, Pay, Fix, or Pinned is just 🟢. All 🔴 are Fix for now.
We can add more later if we choose to, but it's ok for these other less common ones to just stay dots for now.

image

Note: I intentionally disabled this feature in production yet to avoid PR being reverted. This gate will be removed once this passes QA

Fixed Issues

$ #84764

Tests

  1. Login any account with workspace
  2. Create draft expense without any violation, submit, approve
  3. Observe LHN
  4. Verify that action badge (Submit, Approve, Pay) shows properly (previously 🟢)
  5. Create expense with violation
  6. Verify that action badge Fix shows (previously 🔴)
  7. Verify that pinned chat has action badge Pinned with small pin icon (previously large pin icon only)
  8. Verify that all other GBRs keep unchanged (🟢)
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

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
    • 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 mchrome
iOS: Native ios
iOS: mWeb Safari msafari
MacOS: Chrome / Safari web web-focus web-light

@melvin-bot
Copy link

melvin-bot bot commented Mar 12, 2026

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

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

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

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

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

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

Copy link

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

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: e7b3cd6738

ℹ️ About Codex in GitHub

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

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

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

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

Copy link

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

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: 9d4f8c3eee

ℹ️ About Codex in GitHub

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

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

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

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

Copy link

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

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: 9d4f8c3eee

ℹ️ About Codex in GitHub

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

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

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

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

Copy link

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

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: ed08930183

ℹ️ About Codex in GitHub

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

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

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

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

@aimane-chnaif aimane-chnaif marked this pull request as ready for review March 12, 2026 08:49
@aimane-chnaif aimane-chnaif requested review from a team as code owners March 12, 2026 08:49
@melvin-bot melvin-bot bot requested review from ikevin127 and trjExpensify and removed request for a team March 12, 2026 08:49
@melvin-bot
Copy link

melvin-bot bot commented Mar 12, 2026

@ikevin127 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 March 12, 2026 08:49
Copy link

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

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: 8f3129f1b5

ℹ️ About Codex in GitHub

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

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

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

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

@github-actions
Copy link
Contributor

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

@github-actions

This comment has been minimized.

@shawnborton
Copy link
Contributor

Feels pretty good. Can you adjust the small condensed badge (at the global leve) to make the icon just 4px away from the text? Right now the gap feels a bit too big:
CleanShot 2026-03-12 at 08 22 14@2x

It's currently 8px, it should be 4px:
CleanShot 2026-03-12 at 08 23 21@2x

@shawnborton
Copy link
Contributor

When an active item has a default badge, we need to adjust the badge's background color:
CleanShot 2026-03-12 at 08 23 49@2x

Take a look at Workspace > Invoices for instance:
CleanShot 2026-03-12 at 08 34 43@2x

@aimane-chnaif
Copy link
Contributor Author

aimane-chnaif commented Mar 12, 2026

When an active item has a default badge, we need to adjust the badge's background color: CleanShot 2026-03-12 at 08 23 49@2x

Take a look at Workspace > Invoices for instance: CleanShot 2026-03-12 at 08 34 43@2x

@shawnborton should we update badge background on active item only or both active and inactive to match workspace tab?

EDIT: nvm, I see only active item on workspace tab.

@rushatgabhane
Copy link
Member

In production we don't have this feature, right?

The badges now have text in them, so we should improve the accessibility labels here imo.

@aimane-chnaif
Copy link
Contributor Author

In production we don't have this feature, right?

The badges now have text in them, so we should improve the accessibility labels here imo.

ok what is new announcement you'd suggest?

Add action at the end of "Your review is required"?

i.e. "You review is required. Approve"

@rushatgabhane
Copy link
Member

rushatgabhane commented Mar 12, 2026

@aimane-chnaif yes i think appending using a comma is the way to go

Your review is required, Approve

And for pinned, just Pinned would work

@github-actions
Copy link
Contributor

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

@github-actions
Copy link
Contributor

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

Android 🤖 iOS 🍎
❌ FAILED ❌ ❌ FAILED ❌
The QR code can't be generated, because the Android build failed The QR code can't be generated, because the iOS build failed
Web 🕸️
https://85025.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@Pujan92
Copy link
Contributor

Pujan92 commented Mar 12, 2026

@shawnborton can you plz check comment to confirm

@shawnborton
Copy link
Contributor

The updated colors look good to me at least 👍

@aimane-chnaif
Copy link
Contributor Author

All comments are addressed

Copy link
Contributor

@Pujan92 Pujan92 left a comment

Choose a reason for hiding this comment

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

LGTM!

@melvin-bot
Copy link

melvin-bot bot commented Mar 12, 2026

We did not find an internal engineer to review this PR, trying to assign a random engineer to #84764 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@melvin-bot melvin-bot bot requested a review from mountiny March 12, 2026 18:18
@mountiny
Copy link
Contributor

@codex review

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Thanks for testing, I think I would just keep an eye on this PR and if it did not cause any performance regression, but the changes were tested and look good, we can move ahead

Comment on lines +101 to +107
if (hasKeyTriggeredCompute(ONYXKEYS.COLLECTION.POLICY, sourceValues)) {
if (isFullyComputed && Object.keys(previousPolicies ?? {}).length === 0 && Object.keys(policies ?? {}).length > 0) {
isFullyComputed = false;
}
previousPolicies = policies;
}

Copy link
Contributor

Choose a reason for hiding this comment

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

@TMisiukiewicz @BartekObudzinski I would keep an eye on this from performance perspective

Copy link

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

Choose a reason for hiding this comment

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

💡 Codex Review

styles.ml2,

P2 Badge Keep Badge default wrapper spacing unchanged

Changing the shared Badge base margin from ml1 to ml2 applies to every badge instance, not just the new LHN action badges. This introduces broad spacing regressions in existing screens that rely on the default badge layout (or only partially override it), so the LHN spacing should be handled locally instead of modifying the global default.

ℹ️ About Codex in GitHub

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

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

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

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

@mountiny
Copy link
Contributor

@aimane-chnaif the badge margin, that has also been accepted by design team right?

@aimane-chnaif
Copy link
Contributor Author

@aimane-chnaif the badge margin, that has also been accepted by design team right?

right

@mountiny mountiny merged commit 337c3f6 into Expensify:main Mar 12, 2026
34 checks passed
@github-actions
Copy link
Contributor

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.3.37-0 🚀

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

@mitarachim
Copy link

Deploy Blocker #85187 was identified to be related to this PR.

@jponikarchuk
Copy link

Deploy Blocker #85201 was identified to be related to this PR.

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.

9 participants