Skip to content

fix: claim offer banner in concierge page is not centered #61688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Conversation

samranahm
Copy link
Contributor

Explanation of Change

We were passing onboardingHelpDropdownButton to EarlyDiscountBanner even when no button available now we will explicitly check shouldShowOnBoardingHelpDropdownButton and in case of false Claim offer will take full space in banner

Fixed Issues

$ #61662
PROPOSAL:

Tests

  1. Login with gmail account
  2. Complete onboarding via track and budget expenses
  3. Create a workspace
  4. Tap overview and change it to control workspace
  5. Go to concierge & note claim offer banner
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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

Screenshot 2025-05-08 at 5 47 56 PM
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@samranahm samranahm requested a review from a team as a code owner May 8, 2025 12:49
@melvin-bot melvin-bot bot requested review from hungvu193 and removed request for a team May 8, 2025 12:49
Copy link

melvin-bot bot commented May 8, 2025

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

@hungvu193
Copy link
Contributor

On it

@hungvu193
Copy link
Contributor

Please complete screenshots for all the platform @samranahm

@@ -82,7 +82,7 @@ function EarlyDiscountBanner({isSubscriptionPage, GuideBookingButton, onboarding
const smallScreenStyle = shouldUseNarrowLayout ? [styles.flex0, styles.flexBasis100, styles.justifyContentCenter] : [];
return (
<View style={[styles.flexRow, styles.gap2, smallScreenStyle, styles.alignItemsCenter]}>
<View style={[shouldUseNarrowLayout && styles.w50]}>{onboardingHelpDropdownButton}</View>
{!!onboardingHelpDropdownButton && <View style={[styles.w50]}>{onboardingHelpDropdownButton}</View>}
Copy link
Contributor

@hungvu193 hungvu193 May 8, 2025

Choose a reason for hiding this comment

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

I'm really curious about styles.w50 here. If there's case 3 buttons appear at the same time then we'll have broken UI again.

Copy link
Contributor

Choose a reason for hiding this comment

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

Can we use flex layout solution here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let me take a look

@@ -82,7 +82,7 @@ function EarlyDiscountBanner({isSubscriptionPage, GuideBookingButton, onboarding
const smallScreenStyle = shouldUseNarrowLayout ? [styles.flex0, styles.flexBasis100, styles.justifyContentCenter] : [];
return (
<View style={[styles.flexRow, styles.gap2, smallScreenStyle, styles.alignItemsCenter]}>
<View style={[shouldUseNarrowLayout && styles.w50]}>{onboardingHelpDropdownButton}</View>
{!!onboardingHelpDropdownButton && <View style={[styles.w50]}>{onboardingHelpDropdownButton}</View>}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we use flex layout solution here?

@samranahm
Copy link
Contributor Author

@hungvu193 I don't think we should have a condition where we display all three buttons in Early Discount banner on smallScreenWidth, because on large screen we will always have one or two buttons in early discount banner because Onboarding help is always in header.

So to cater the case where we want to display three buttons we can adjust this condition shouldShowGuideBookingButtonInEarlyDiscountBanner to also check if there is already Onboarding button in Early discount banner then show the GuideBookingButton in header on smallScreenWidth

@Expensify/design

@hungvu193
Copy link
Contributor

@hungvu193 I don't think we should have a condition where we display all three buttons in Early Discount banner on smallScreenWidth, because on large screen we will always have one or two buttons in early discount banner because Onboarding help is always in header.

Is there any issue with using flex layout here? Both guideButton and claim offer button are using flex.

@samranahm
Copy link
Contributor Author

@hungvu193 Using flex layout make the Onboarding help button bit larger than claim offer is this expected

Screenshot 2025-05-08 at 10 04 06 PM

@hungvu193
Copy link
Contributor

We previously used Flex layout for all the buttons. But it had an issue with Spanish language when the text is too long.

If we use width: 50% here, we have a similar issue with the smaller layout, the button doesn't shrink when the width is smaller.

With width 50% With flexShrink: 1, flexGrow: 1, flexBasis: 'auto'
Image 1 Image 2

@samranahm
Copy link
Contributor Author

Ahh, It make sense. Thanks for pointing this out.

@hungvu193
Copy link
Contributor

We still need the confirmation from Design team

@samranahm
Copy link
Contributor Author

Alright, lets wait for design team if they decided to make any change we will proceed with that.

@hungvu193
Copy link
Contributor

Little bump @Expensify/design to give your thoughts on this:

#61688 (comment)

@samranahm samranahm closed this May 9, 2025
@samranahm samranahm force-pushed the 61662-center-claim-offer-button branch from 3ff31a5 to f2b8304 Compare May 9, 2025 13:10
@shawnborton
Copy link
Contributor

Looks like this was closed but the version for "With flexShrink: 1, flexGrow: 1, flexBasis: 'auto'" was definitely feeling better to me.

@hungvu193
Copy link
Contributor

@samranahm I think you closed this by accident right?

@samranahm
Copy link
Contributor Author

I am planing to open to open a new PR that will link to our issue not the blocker, and i will use the flexShrink: 1, flexGrow: 1, flexBasis: 'auto'" there

@hungvu193
Copy link
Contributor

Please link the blocker. Thanks

@samranahm samranahm deleted the 61662-center-claim-offer-button branch May 9, 2025 21:15
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.

3 participants