Skip to content

[Suggested Follow-ups][R1] Update the buttons styling & refactor#80782

Merged
marcochavezf merged 8 commits intoExpensify:mainfrom
software-mansion-labs:feat/concierge-followups-release-1-buton-styling-refactor
Jan 29, 2026
Merged

[Suggested Follow-ups][R1] Update the buttons styling & refactor#80782
marcochavezf merged 8 commits intoExpensify:mainfrom
software-mansion-labs:feat/concierge-followups-release-1-buton-styling-refactor

Conversation

@jmusial
Copy link
Contributor

@jmusial jmusial commented Jan 28, 2026

Explanation of Change

This is a follow up to #80539.
The PR includes refactor and follow up button styling changes.

Fixed Issues

$ #80686

PROPOSAL:

Tests

Pre requisites:

  • Have expensifail or swmansion account
  • Use staging server
  1. Open the app
  2. Go to concierge chat and prompt him to give actionable follow ups
  3. The follow ups should be generated and shown with new styles.
  4. The other actionable buttons from concierge should remain the same for now

Offline tests

N/A

QA Steps

Same as tests

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 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 image
Android: mWeb Chrome image
iOS: Native image
iOS: mWeb Safari image
MacOS: Chrome / Safari
0089.release.1.follow.up.mov

@codecov
Copy link

codecov bot commented Jan 28, 2026

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 Δ
...ponents/ReportActionItem/ActionableItemButtons.tsx 100.00% <100.00%> (ø)
...rtActionFollowupUtils/stripFollowupListFromHtml.ts 100.00% <100.00%> (ø)
src/libs/ReportActionsUtils.ts 54.77% <ø> (-0.18%) ⬇️
src/libs/actions/Report/index.ts 58.02% <100.00%> (ø)
src/pages/inbox/report/PureReportActionItem.tsx 53.81% <100.00%> (+0.18%) ⬆️
src/styles/index.ts 45.14% <ø> (ø)
src/libs/ReportActionFollowupUtils/index.ts 95.23% <88.88%> (ø)
src/libs/actions/Report/SuggestedFollowup.ts 90.90% <90.90%> (ø)
... and 35 files with indirect coverage changes

@jmusial jmusial marked this pull request as ready for review January 28, 2026 21:06
@jmusial jmusial requested review from a team as code owners January 28, 2026 21:06
@melvin-bot melvin-bot bot requested review from Krishna2323 and removed request for a team January 28, 2026 21:07
@melvin-bot
Copy link

melvin-bot bot commented Jan 28, 2026

@Krishna2323 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 requested review from joekaufmanexpensify and removed request for a team January 28, 2026 21:07
@jmusial
Copy link
Contributor Author

jmusial commented Jan 28, 2026

@Expensify/design please take a look @ the buttons and let me know your thoughts.

For the sprint work we'll enable the new look just for the follow ups as we're worrying the testing may take too long if we enable it for all rn. Those will be enabled in a follow up.

import Onyx from 'react-native-onyx';
import type {Ancestor} from '@libs/ReportUtils';
// eslint-disable-next-line @dword-design/import-alias/prefer-alias
import {addComment, buildOptimisticResolvedFollowups} from '@userActions/Report';
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ CONSISTENCY-5 (docs)

ESLint rule disablement lacks justification.

Reasoning: ESLint rule disables without justification can mask underlying issues and reduce code quality. Clear documentation ensures team members understand exceptions, promoting better maintainability.

Suggested fix: Add a comment explaining why the import-alias rule needs to be disabled here.

// eslint-disable-next-line @dword-design/import-alias/prefer-alias
// Direct import needed to avoid circular dependency with Report action file
import {addComment, buildOptimisticResolvedFollowups} from '@userActions/Report';

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@jmusial
Copy link
Contributor Author

jmusial commented Jan 28, 2026

@Krishna2323 this PR has a high priority, do you have some time to take look at it rn ?

@jmusial
Copy link
Contributor Author

jmusial commented Jan 28, 2026

@codex review

paddingBottom: 8,
backgroundColor: 'transparent',
borderWidth: 1,
borderColor: theme.border,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

when we're hovering the message change this to button press

Same as on the expense

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated look cc @dubielzyk-expensify

Screen.Recording.2026-01-28.at.13.59.05.mov

@mkhutornyi
Copy link
Contributor

@Krishna2323 this PR has a high priority, do you have some time to take look at it rn ?

I can help otherwise since I reviewed previous PR.

@Beamanator Beamanator requested review from mkhutornyi and removed request for Krishna2323 January 28, 2026 21:45
@Beamanator
Copy link
Contributor

@mkhutornyi yes please thanks so much for offering!

@Krishna2323 sorry sir but we need quick reviews here and @mkhutornyi helped us review related PRs yesterday 🙏

@jmusial
Copy link
Contributor Author

jmusial commented Jan 28, 2026

@mkhutornyi go ahead plz, there still some burder changes coming after chat with the design team, but they should not change to much

@chatgpt-codex-connector
Copy link

Codex Review: Didn't find any major issues. 🎉

ℹ️ 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

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

@mkhutornyi
Copy link
Contributor

mkhutornyi commented Jan 28, 2026

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
    • 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 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
ios.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mov

const followupListMatch = html.match(followUpListRegex);
if (!followupListMatch) {
const doc = parseDocument(html);
const followupListElements = DomUtils.getElementsByTagName('followup-list', doc, true);
Copy link
Contributor

Choose a reason for hiding this comment

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

Will this work on native too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

looked good when I was testing

* @param timezoneParam - The user's timezone
* @param ancestors - Array of ancestor reports for proper threading
*/
function resolveSuggestedFollowup(
Copy link
Contributor

Choose a reason for hiding this comment

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

Now that this is moved to seprate file, can we fully deprecate this in actions/Report.ts?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oooops... done 😄

@github-actions
Copy link
Contributor

@jmusial
Copy link
Contributor Author

jmusial commented Jan 29, 2026

For me none of them are centered? Is this a particular plaform ?

@jmusial can you share screenshot? I tested on iOS

Ok, so I think it's expected since they are buttons and this is consistent with how buttons behave. I just got all "long" followups when testing :D

@mkhutornyi
Copy link
Contributor

ios bug

ok so this is expected? btw let's not block on this
cc: @Expensify/design

Copy link
Contributor

@joekaufmanexpensify joekaufmanexpensify left a comment

Choose a reason for hiding this comment

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

WN project

@melvin-bot
Copy link

melvin-bot bot commented Jan 29, 2026

We did not find an internal engineer to review this PR, trying to assign a random engineer to #80686 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 thienlnam January 29, 2026 00:58
thienlnam
thienlnam previously approved these changes Jan 29, 2026
@jmusial
Copy link
Contributor Author

jmusial commented Jan 29, 2026

ios bug ok so this is expected? btw let's not block on this cc: @Expensify/design

Ok, after a quick catchup with @dannymcclain:
they should all be left aligned, and regular font. On it now

@mkhutornyi
Copy link
Contributor

If left aligned, container should be stretched or not?

Example:

example

@jmusial jmusial dismissed stale reviews from thienlnam and joekaufmanexpensify via 1933e22 January 29, 2026 01:10
@jmusial
Copy link
Contributor Author

jmusial commented Jan 29, 2026

If left aligned, container should be stretched or not?

Example:

example

This is a new look :) Those should be full width but text left aligned on mobile, not stretched on desktop

image

Copy link
Contributor

@marcochavezf marcochavezf left a comment

Choose a reason for hiding this comment

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

:shipit:

@mkhutornyi
Copy link
Contributor

Looks good

mobile:

ios

web:

web

@marcochavezf marcochavezf merged commit e8c033b into Expensify:main Jan 29, 2026
41 of 55 checks passed
@melvin-bot melvin-bot bot added the Emergency label Jan 29, 2026
@melvin-bot
Copy link

melvin-bot bot commented Jan 29, 2026

@marcochavezf looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@OSBotify
Copy link
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.

@marcochavezf
Copy link
Contributor

I thought all the checks were passing, but it seems some of the test jobs were canceled. Re-running them here https://github.com/Expensify/App/actions/runs/21461693077

@marcochavezf
Copy link
Contributor

Tests are passing here, removing the Emergency label

@shawnborton
Copy link
Contributor

Discussed in Slack but I think we should update these button styles to look more buttony. Perhaps @dannymcclain and @dubielzyk-expensify can handle in person tomorrow?

@dannymcclain
Copy link
Contributor

Yeah happy to!

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/marcochavezf in version: 9.3.11-16 🚀

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

@m-natarajan
Copy link

@jmusial @thienlnam @marcochavezf Concierge is flagging expensifail account as test accounts and not getting any respones. Is this expected or can you please suggest any workaround for this

prompt.ccg.mp4

@OSBotify
Copy link
Contributor

OSBotify commented Feb 5, 2026

🚀 Deployed to production by https://github.com/Julesssss in version: 9.3.12-1 🚀

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

text={props.shouldUseLocalization ? translate(item.text as TranslationPaths) : item.text}
medium
success={item.isPrimary}
innerStyles={props.styles?.button}
Copy link
Contributor

Choose a reason for hiding this comment

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

This PR introduced a bug where suggested response button text gets clipped instead of wrapping to the next line, because styles.breakWord was not applied to the button text styles. Fixed in #82113 / #83048

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.