Fix: Place schedule demo button on the discount banner when there is one by truph01 · Pull Request #57092 · Expensify/App

truph01 · 2025-02-19T10:37:13Z

Explanation of Change

Fixed Issues

$ #55879
PROPOSAL: #55879 (comment)

Tests

Open app and sign in with new account.
Choose "Manage my team's expenses" > Finish onboarding steps.
In LHN, choose #admin room.
Verify the "Schedule a demo" and "Claim offer" button are displayed as:

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open app and sign in with new account.
Choose "Manage my team's expenses" > Finish onboarding steps.
In LHN, choose #admin room.
Verify the "Schedule a demo" and "Claim offer" button are displayed as:

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-02-19.at.17.36.40.mov

Android: mWeb Chrome

Screen.Recording.2025-02-19.at.17.34.56.mov

iOS: Native

Screen.Recording.2025-02-19.at.17.26.58.mov

iOS: mWeb Safari

Screen.Recording.2025-02-19.at.17.09.10.mov

MacOS: Chrome / Safari

Screen.Recording.2025-02-19.at.16.56.32.mov

MacOS: Desktop

Screen.Recording.2025-02-19.at.17.32.47.mov

melvin-bot · 2025-02-19T10:37:19Z

@dubielzyk-expensify @fedirjh One of you needs to 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]

shawnborton · 2025-02-19T13:04:04Z

I think we want the gap between buttons to be 8px - it looks a bit larger right now:

shawnborton · 2025-02-19T13:06:02Z

Not a blocker at all but: is it possible to get the admin button in the room header before the room animates in? It feels slightly jarring:

CleanShot.2025-02-19.at.08.04.58.mp4

fedirjh · 2025-02-19T19:43:37Z

@truph01 The dismiss button is not displayed for me

src/pages/settings/Subscription/CardSection/BillingBanner/EarlyDiscountBanner.tsx

src/pages/home/HeaderView.tsx

shawnborton · 2025-02-19T23:20:53Z

The dismiss button is not displayed for me

I believe the dismiss icon is only showed per a certain condition, like if the trial is past X days or something. I think @dannymcclain knows what the deal is there!

dannymcclain · 2025-02-20T14:29:57Z

I believe the dismiss icon is only showed per a certain condition, like if the trial is past X days or something. I think @dannymcclain knows what the deal is there!

Yeah I do believe dismiss is only shown under certain conditions, but TBH I don't know exactly what those conditions are. @ryanschaffer can you clarify here?

truph01 · 2025-02-20T20:42:24Z

I think we want the gap between buttons to be 8px - it looks a bit larger right now:

PR is updated to address it. Result:

I think there is no need to pass extra prop here. we can just update the title to include the dismissButton . That should be simpler.

PR is updated to address it. Result:

shawnborton · 2025-02-21T13:19:33Z

Nice, this is feeling pretty good to me.

fedirjh · 2025-02-21T14:21:58Z

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 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. 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: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

fedirjh · 2025-02-21T14:47:52Z

@Expensify/design Is this expected ? Shouldn’t the button be displayed in full size in mobile ?

shawnborton · 2025-02-21T14:53:04Z

Hmm no, in that case it should go full width.

fedirjh · 2025-02-21T16:25:34Z

@truph01 Can you handle this in this PR ? I can replicate the same behaviour in staging so it's not caused by this PR.

fedirjh · 2025-02-21T16:33:47Z

@truph01 This code change should fix it:

Code Diff

diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 5cae1d65ccc..0c1f013d004 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -214,18 +214,11 @@ function HeaderView({report, parentReportAction, onNavigationMenuButtonClicked,
             onPress={() => {
                 openExternalLink(account?.guideDetails?.calendarLink ?? '');
             }}
-            style={shouldUseNarrowLayout && shouldShowGuideBookingButtonInEarlyDiscountBanner && [styles.flex1]}
+            style={[styles.flex1]}
             icon={CalendarSolid}
         />
     );
 
-    const getGuideBookButtonStyles = () => {
-        if (isChatUsedForOnboarding) {
-            return [styles.pb3, styles.pl5, styles.w50, styles.pr1];
-        }
-        return [styles.pb3, styles.ph5];
-    };
-
     return (
         <>
             <View
@@ -338,7 +331,7 @@ function HeaderView({report, parentReportAction, onNavigationMenuButtonClicked,
                                         </View>
                                     )}
                                 </PressableWithoutFeedback>
-                                <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
+                                <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter, styles.gap2]}>
                                     {!shouldShowGuideBookingButtonInEarlyDiscountBanner && shouldShowGuideBooking && !shouldUseNarrowLayout && guideBookingButton}
                                     {!shouldUseNarrowLayout && !shouldShowDiscount && isChatUsedForOnboarding && (
                                         <FreeTrial
@@ -369,10 +362,8 @@ function HeaderView({report, parentReportAction, onNavigationMenuButtonClicked,
                     )}
                 </View>
                 {!isParentReportLoading && !isLoading && canJoin && shouldUseNarrowLayout && <View style={[styles.ph5, styles.pb2]}>{joinButton}</View>}
-                <View style={isChatUsedForOnboarding && !shouldShowDiscount && shouldShowGuideBooking && [styles.dFlex, styles.flexRow]}>
-                    {!shouldShowGuideBookingButtonInEarlyDiscountBanner && !isLoading && shouldShowGuideBooking && shouldUseNarrowLayout && (
-                        <View style={getGuideBookButtonStyles()}>{guideBookingButton}</View>
-                    )}
+                <View style={isChatUsedForOnboarding && !shouldShowDiscount && shouldShowGuideBooking && [styles.dFlex, styles.flexRow, styles.gap2, styles.pb3, styles.ph5]}>
+                    {!shouldShowGuideBookingButtonInEarlyDiscountBanner && !isLoading && shouldShowGuideBooking && shouldUseNarrowLayout && guideBookingButton}
                     {!isLoading && !shouldShowDiscount && isChatUsedForOnboarding && shouldUseNarrowLayout && (
                         <FreeTrial
                             pressable
diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyDiscountBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyDiscountBanner.tsx
index 705b83b7796..cefa4ba0604 100644
--- a/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyDiscountBanner.tsx
+++ b/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyDiscountBanner.tsx
@@ -54,24 +54,25 @@ function EarlyDiscountBanner({isSubscriptionPage, GuideBookingButton, onDismisse
     }, [firstDayFreeTrial]);
 
     const dismissButton = useMemo(
-        () => (
-            <Tooltip text={translate('common.close')}>
-                <PressableWithFeedback
-                    onPress={() => {
-                        setIsDismissed(true);
-                        onDismissedDiscountBanner?.();
-                    }}
-                    role={CONST.ROLE.BUTTON}
-                    accessibilityLabel={translate('common.close')}
-                >
-                    <Icon
-                        src={Expensicons.Close}
-                        fill={theme.icon}
-                    />
-                </PressableWithFeedback>
-            </Tooltip>
-        ),
-        [theme.icon, translate, onDismissedDiscountBanner],
+        () =>
+            discountInfo?.discountType === 50 && (
+                <Tooltip text={translate('common.close')}>
+                    <PressableWithFeedback
+                        onPress={() => {
+                            setIsDismissed(true);
+                            onDismissedDiscountBanner?.();
+                        }}
+                        role={CONST.ROLE.BUTTON}
+                        accessibilityLabel={translate('common.close')}
+                    >
+                        <Icon
+                            src={Expensicons.Close}
+                            fill={theme.icon}
+                        />
+                    </PressableWithFeedback>
+                </Tooltip>
+            ),
+        [discountInfo?.discountType, translate, theme.icon, onDismissedDiscountBanner],
     );
 
     const rightComponent = useMemo(() => {
@@ -85,7 +86,7 @@ function EarlyDiscountBanner({isSubscriptionPage, GuideBookingButton, onDismisse
                     text={translate('subscription.billingBanner.earlyDiscount.claimOffer')}
                     onPress={() => Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION.getRoute(Navigation.getActiveRoute()))}
                 />
-                {discountInfo?.discountType === 25 && (shouldUseNarrowLayout ? undefined : dismissButton)}
+                {!shouldUseNarrowLayout && dismissButton}
             </View>
         );
     }, [
@@ -99,7 +100,6 @@ function EarlyDiscountBanner({isSubscriptionPage, GuideBookingButton, onDismisse
         styles.gap2,
         styles.flex1,
         translate,
-        discountInfo?.discountType,
         GuideBookingButton,
         dismissButton,
     ]);
@@ -125,7 +125,7 @@ function EarlyDiscountBanner({isSubscriptionPage, GuideBookingButton, onDismisse
                     <Text>{translate('subscription.billingBanner.earlyDiscount.onboardingChatTitle.phrase2', {discountType: discountInfo?.discountType})}</Text>
                 </Text>
             )}
-            {discountInfo?.discountType === 25 && (shouldUseNarrowLayout ? dismissButton : undefined)}
+            {shouldUseNarrowLayout && dismissButton}
         </View>
     );
 
diff --git a/src/pages/settings/Subscription/FreeTrial.tsx b/src/pages/settings/Subscription/FreeTrial.tsx
index 1d82614d66f..3d99372742c 100644
--- a/src/pages/settings/Subscription/FreeTrial.tsx
+++ b/src/pages/settings/Subscription/FreeTrial.tsx
@@ -56,7 +56,7 @@ function FreeTrial({badgeStyles, pressable = false, addSpacing = false, success
         />
     );
 
-    return addSpacing ? <View style={inARow ? [styles.pb3, styles.pr5, styles.w50, styles.pl1] : [styles.pb3, styles.ph5]}>{freeTrial}</View> : freeTrial;
+    return addSpacing ? <View style={inARow ? [styles.flex1] : [styles.pb3, styles.ph5]}>{freeTrial}</View> : freeTrial;
 }
 
 FreeTrial.displayName = 'FreeTrial';

truph01 · 2025-02-25T07:46:09Z

Working on the fix.

truph01 · 2025-02-25T08:29:14Z

@fedirjh Thanks for your suggested code in this comment. However, I previously investigated the issue and found a solution that only requires a one-line change, which helps minimize the risk of regression. Let's first test whether my change in this commit resolves the issue. If it doesn't, I'll proceed with your suggested changes. Below are the results after applying my fix:

With the admins report where isChatUsedForOnboarding is false:

App/src/pages/home/HeaderView.tsx

Line 205 in eaa3be4

const isChatUsedForOnboarding = isChatUsedForOnboardingReportUtils(report, onboardingPurposeSelected);
With the admins report where isChatUsedForOnboarding is true and discountInfo?.discountType === 25 is true:

With the admins report where isChatUsedForOnboarding is true and discountInfo?.discountType === 25 is true but already clicked on "x" button to dismiss the banner:

With the admins report where isChatUsedForOnboarding is true and shouldShowDiscountBanner() is false:

App/src/pages/home/HeaderView.tsx

Line 191 in eaa3be4

    
           const shouldShowDiscount = useMemo(() => shouldShowDiscountBanner() && !isArchivedReport(reportNameValuePairs), [firstDayFreeTrial, lastDayFreeTrial, reportNameValuePairs]);

fedirjh

@truph01 Thank you for the update. I’ve noticed that there is still no gap between the buttons in the wide-screen views. The code I provided here should fix and simplify thi. To further explain my changes, I observed that we are not utilizing styles correctly: instead of using flex and gap prop styles, we were relying on padding and margin to space items, which doesn’t look ideal to me.

src/pages/settings/Subscription/CardSection/BillingBanner/EarlyDiscountBanner.tsx

truph01 · 2025-02-26T07:41:06Z

@fedirjh I applied your code changes here, which removes the getGuideBookButtonStyles function. However, I encountered an issue when applying that change:

Because of this, I only incorporated some of the changes, rather than all of them:

Added gap2 style to fix the missing gap between buttons on wide screens via commit.
Updated the dismiss button to follow the DRY principle via commit.

Result:

fedirjh

Looks good to me

MonilBhavsar

Looks good, thanks!

OSBotify · 2025-02-26T22:52:25Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-02-27T21:07:32Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.1.7-1 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2025-03-03T16:43:37Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.7-2 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	failure ❌

shubham1206agra · 2025-05-12T14:38:53Z

src/pages/home/HeaderView.tsx

                openExternalLink(account?.guideDetails?.calendarLink ?? '');
            }}
-            style={!shouldUseNarrowLayout && isChatUsedForOnboarding && styles.mr2}
+            style={shouldUseNarrowLayout && shouldShowGuideBookingButtonInEarlyDiscountBanner && [styles.flex1]}


This PR introduced a style bug, detailed here #58974

truph01 added 3 commits February 19, 2025 16:34

fix: Display schedule demo in discount banner

c22a141

fix: move the schedule button back to header once dismissed the banner

693e0e0

fix: banner layout issue in native device

673c2f1

truph01 requested a review from a team as a code owner February 19, 2025 10:37

melvin-bot bot requested review from dubielzyk-expensify and fedirjh and removed request for a team February 19, 2025 10:37

truph01 changed the title ~~Fix/55879~~ Fix: Place schedule demo button on the discount banner when there is one Feb 19, 2025

truph01 mentioned this pull request Feb 19, 2025

[Due for payment 2025-03-21] [Due for payment 2025-03-10] [$250] Make the Schedule Demo a primary static button and place it on the discount banner when there is one #55879

Closed

fedirjh suggested changes Feb 19, 2025

View reviewed changes

truph01 added 3 commits February 21, 2025 03:18

merge main

7817dc9

fix: minor styles update

d50e95d

fix: remove introducing dismissButton prop

2eebd17

merge main

0f7b258

fix: schedule button width

bb51107

fedirjh reviewed Feb 25, 2025

View reviewed changes

truph01 added 3 commits February 26, 2025 13:58

merge main

87ac6d1

fix: update dismissButton component to follow DRY

11c9d82

fix: missing gap2 style in large screen

ecade31

fedirjh approved these changes Feb 26, 2025

View reviewed changes

melvin-bot bot requested a review from MonilBhavsar February 26, 2025 09:33

MonilBhavsar approved these changes Feb 26, 2025

View reviewed changes

MonilBhavsar merged commit 85254c9 into Expensify:main Feb 26, 2025
17 checks passed

github-actions bot mentioned this pull request Feb 27, 2025

Deploy Checklist: New Expensify 2025-02-27 #57563

Closed

40 tasks

samranahm mentioned this pull request Mar 7, 2025

[Due for payment 2025-03-21] Close icon of Early Discount Banner has no margin right. #58033

Closed

8 tasks

shubham1206agra mentioned this pull request May 12, 2025

Early discount countdown banner #54901

Merged

50 tasks

shubham1206agra reviewed May 12, 2025

View reviewed changes

Conversation

truph01 commented Feb 19, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 19, 2025

Uh oh!

shawnborton commented Feb 19, 2025

Uh oh!

shawnborton commented Feb 19, 2025

Uh oh!

fedirjh commented Feb 19, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shawnborton commented Feb 19, 2025

Uh oh!

dannymcclain commented Feb 20, 2025

Uh oh!

truph01 commented Feb 20, 2025

Uh oh!

shawnborton commented Feb 21, 2025

Uh oh!

fedirjh commented Feb 21, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

fedirjh commented Feb 21, 2025

Uh oh!

shawnborton commented Feb 21, 2025

Uh oh!

fedirjh commented Feb 21, 2025

Uh oh!

fedirjh commented Feb 21, 2025

Uh oh!

truph01 commented Feb 25, 2025

Uh oh!

truph01 commented Feb 25, 2025

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

truph01 commented Feb 26, 2025

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Feb 26, 2025

Uh oh!

github-actions bot commented Feb 27, 2025

Uh oh!

github-actions bot commented Mar 3, 2025

Uh oh!

shubham1206agra May 12, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!