fix: change button color for one-button modals to grey#81374
fix: change button color for one-button modals to grey#81374Valforte merged 19 commits intoExpensify:mainfrom
Conversation
melvin-bot
bot
requested review from
heyjennahay and
parasharrajat
and removed request for
a team and
heyjennahay
|
@parasharrajat 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] |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: bb5044f122
ℹ️ 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".
|
@daledah Can you prioritize this? |
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
|
@parasharrajat i updated, please check again |
src/components/ConfirmContent.tsx
Outdated
| )} | ||
| <Button | ||
| success={success} | ||
| success={shouldShowCancelButton && !danger ? true : success} |
There was a problem hiding this comment.
This can be success={shouldShowCancelButton ? success : false}
There was a problem hiding this comment.
And the default prop value of success will remain true.
There was a problem hiding this comment.
@parasharrajat i tried it in this commit but the success will still false if we pass shouldShowCancelButton = fasle and success = true like i mentioned here
There was a problem hiding this comment.
That is correct. shouldShowCancelButton is false, then success should be false too so that grey button is shown.
There was a problem hiding this comment.
We don't want to show green or red buttons when there is only one button which is (shouldShowCancelButton = false)
There was a problem hiding this comment.
@parasharrajat So the expected here is that the button should be greyed, right? Because shouldShowCancelButton = false
There was a problem hiding this comment.
@parasharrajat i reverted to the previous version to match your suggestion
tests/unit/ConfirmContentTest.tsx
Outdated
|
|
||
| const testCases = [ | ||
| {shouldShowCancelButton: false, danger: false, success: false, expectedSuccess: false}, | ||
| {shouldShowCancelButton: false, danger: false, success: true, expectedSuccess: true}, |
There was a problem hiding this comment.
Expected should be false as we are showing one button, so the button should be greyed.
There was a problem hiding this comment.
@parasharrajat After checking again, i found that if we pass success as true the button should be success. Is that right?
|
@daledah Merge main. |
|
Looks like it does not work properly. Here on this export warning modal, Danger button is gone. 02.03.2026_20.11.26_REC.mp4 |
|
Bump @daledah |
|
checking now |
|
@parasharrajat The rootcause is that we don't pass App/src/components/MoneyReportHeader.tsx Lines 1718 to 1725 in 55d0b33 It's working fine here App/src/pages/workspace/tags/ImportTagsOptionsPage.tsx Lines 176 to 182 in 55d0b33 
|
|
@daledah I see. It should be success not danger so it should default to success without passing the prop based on the current implementation. Can you check what is wrong here? From staging
|
src/components/ConfirmModal.tsx
Outdated
| cancelText = '', | ||
| prompt = '', | ||
| success = true, | ||
| success = false, |
There was a problem hiding this comment.
THis should be remain true as as I said earlier.
There was a problem hiding this comment.
Thanks @parasharrajat, I only changed it in ConfirmContent and missed updating it here. I’ve updated it now — please check again.
|
Did you review this #81374 (comment) request? |
|
@daledah #81374 (comment) .... 👀 |
|
@parasharrajat i added the comment here. Could you please check it? |
|
@parasharrajat after investigating, i think we should set the default value of the |
|
@daledah Did you try this #81374 (comment)? I am trying to get reply from you on that thread since quite some time. |
|
@parasharrajat i replied here |
This reverts commit 0b41f8c.
Screenshots🔲 iOS / native04.03.2026_18.14.43_REC.mp4🔲 MacOS / Chrome04.03.2026_18.11.04_REC.mp4 |
parasharrajat
left a comment
parasharrajat
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
- 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.
toggleReportand notonIconClick). - I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g.
myBool && <MyComponent />. - 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 approved by marketing by adding the
Waiting for Copylabel for a copy review on the original GH to get the correct copy. - 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
- 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.
- 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 usingAvatarhave 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.js 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added
Designlabel so the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
🎀 👀 🎀 C+ reviewed
|
🚧 @Valforte has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/Valforte in version: 9.3.34-0 🚀
|
|
🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.34-2 🚀
|
4 participants
Explanation of Change
Fixed Issues
$ #80929
PROPOSAL: #80929 (comment)
Tests
Cannot delete or disable all tagsis displayed andgot itbutton is greyOffline tests
Same as tests
QA Steps
Same as tests
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-02-05.at.14.19.45.mov