Add Guide booking link to #admins header #54352

nkdengineer · 2024-12-19T09:34:24Z

Explanation of Change

Fixed Issues

$ #53764
PROPOSAL: #53764 (comment)

Tests

Login with new account (without +)
Complete onboarding workflow
Create a new workspace
Go to admin room
Verify that: 'Schedule a demo' is displayed in the top right

Verify that no errors appear in the JS console

Offline tests

same as tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
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 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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-12-20T08:14:33Z

@dubielzyk-expensify @eh2077 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]

eh2077 · 2024-12-24T01:02:06Z

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

eh2077 · 2025-01-02T15:14:23Z

src/languages/es.ts

@@ -4565,6 +4565,7 @@ const translations = {
        description: 'Elige una de las siguientes opciones:',
        chatWithConcierge: 'Chatear con Concierge',
        scheduleSetupCall: 'Concertar una llamada',
+        scheduleADemo: 'Schedule a demo',


Can you please confirm the copy from the team?

Asking here

@nkdengineer The copy is confirmed in slack. Can you please update it?

eh2077 · 2025-01-03T13:33:04Z

The button is not aligned with the Start a free trial button. I'm not sure if it matters cc @Expensify/design

shawnborton · 2025-01-03T14:04:44Z

Oh wow... yeah, this is an interesting one. For mobile, I would suggest we make it so that those two buttons just split width width 50/50 on one single line with 8px between them.

Then, we typically don't show two green buttons at once. So I think I would make the "Schedule a demo" button just use our standard primary button styles (not green) so that we don't have two competing green buttons shown in the same spot. Can you apply those changes and we can review from there? Thanks!

dubielzyk-expensify · 2025-01-06T04:40:18Z

Agree with both points Shawn is making above. The double-green button feels wrong.

dannymcclain · 2025-01-06T15:12:43Z

100% agree. And if the buttons can't fit next to each other horizontally, I think it would be ok to stack them, as long as only one of them is green. But I'd love to see how they look horizontally first.

nkdengineer · 2025-01-07T09:31:40Z

@Expensify/design This is the demo after update, do you have any comments?

shawnborton · 2025-01-07T09:40:03Z

This looks incorrect:

Both buttons should fill the available space, and only have a gap of 8px in between. Something more like this:

Can we also make sure the green button is the first in the group?

nkdengineer · 2025-01-07T09:47:54Z

thanks @shawnborton, will update soon

nkdengineer · 2025-01-07T16:08:16Z

@eh2077 @Expensify/design i updated

dannymcclain · 2025-01-07T16:11:28Z

Looks good to me!

shawnborton · 2025-01-07T16:23:36Z

Yup, much better!

dubielzyk-expensify · 2025-01-08T04:26:30Z

This is being a bit pedantic, but is it worth having the green button on the right and primary on the left? Kinda feels more appropriate to have the most important button closer to the anchor point and I feel like we've done that elsewhere? I could be very wrong here, so feel free to correct me @Expensify/design

shawnborton · 2025-01-08T09:22:35Z

Ah, I was modeling this off of the upcoming changes we have for @JmillsExpensify 's report actions project, where the green CTA is on the left:

What are your thoughts on that?

dannymcclain · 2025-01-08T14:30:10Z

Yeah it's the same way with workspace editor pages like Categories:

I also tend to like the main (green) action being on the right more but I don't know that I have any strong rationale for that preference (maybe it feels more like moving forward? reading left to right? I dunno). I think unless we're going to change this order everywhere, I say let's just leave it how it is for now.

shawnborton · 2025-01-08T14:42:01Z

Ah, another good reference point. Let's see what Jon thinks but yeah, I think I'd be down to just keep green on the left.

I'm definitely with both of you though... I can totally see where people are more used to the green being on the right side.

dubielzyk-expensify · 2025-01-09T02:32:01Z

Oh if it's already like this then ignore me and plow ahead. Thanks for the education!

We can change it later. Don't think it's worth messing if it's already consistently like this

eh2077 · 2025-01-09T12:54:32Z

shawnborton · 2025-01-09T14:36:52Z

Looking good, Let's Get This Merged™️

eh2077 · 2025-01-10T13:55:24Z

@nkdengineer Please help to solve the conflicts and update the Spanish copy, thank you!

nkdengineer · 2025-01-13T04:08:30Z

@eh2077 i updated

eh2077 · 2025-01-09T12:56:42Z

src/languages/es.ts

@@ -4565,6 +4565,7 @@ const translations = {
        description: 'Elige una de las siguientes opciones:',
        chatWithConcierge: 'Chatear con Concierge',
        scheduleSetupCall: 'Concertar una llamada',
+        scheduleADemo: 'Schedule a demo',


@nkdengineer The copy is confirmed in slack. Can you please update it?

eh2077 · 2025-01-20T11:34:44Z

@grgia All yours!

OSBotify · 2025-01-20T12:42:42Z

✋ 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-01-21T08:30:23Z

🚀 Deployed to staging by https://github.com/grgia in version: 9.0.88-0 🚀

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

trjExpensify · 2025-01-21T11:52:57Z

@nkdengineer marking this as a deploy blocker because of two app crashes which show a undefined toString TypeError coming from this line introduced in this PR:

App/src/pages/home/HeaderView.tsx

Line 153 in a478562

    
           const shouldShowGuideBooking = !!account && report?.reportID.toString() === account?.adminsRoomReportID?.toString() && !!account?.guideDetails?.calendarLink;

TypeError: Cannot read properties of undefined (reading 'toString')

I'll create a thread now in #open-source with the vids and to discuss.

trjExpensify · 2025-01-21T12:04:57Z

@mountiny school'd me on that label doing nothing on this PR, so I'm removing it and created a DB issue here: #55519

izarutskaya · 2025-01-22T10:10:35Z

@nkdengineer QA found issue when validation the PR on Android only - issue #55590

https://platform.applause.com/services/links/v1/external/c53bfb6b3b4d783db9bbb4736cba2cede8c1bd5e75a9ddc7fb5fedf1943e5402

nkdengineer · 2025-01-22T10:12:43Z

We're waiting the backend change to fix it.

github-actions · 2025-01-23T18:05:50Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.88-7 🚀

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

eh2077 · 2025-02-04T13:25:45Z

src/pages/settings/Subscription/FreeTrial.tsx

            text={freeTrialText}
            badgeStyles={badgeStyles}
        />
    );

-    return addSpacing ? <View style={[styles.pb3, styles.ph5]}>{freeTrial}</View> : freeTrial;
+    return addSpacing ? <View style={inARow ? [styles.pb3, styles.pr5, styles.w50, styles.pl1] : [styles.pb3, styles.ph5]}>{freeTrial}</View> : freeTrial;


This caused an issue on small screen - the test is overflow

[HOLD for payment 2025-02-04] [HOLD for payment 2025-01-30] [$250] mWeb - "Free trial: 30 days left" overlaps with the box on narrow display #55522

nkdengineer added 3 commits December 19, 2024 16:33

Add Guide booking link to #admins header

4c92345

Merge branch 'main' into fix/53764

f67ab42

fix lint

8228c83

nkdengineer marked this pull request as ready for review December 20, 2024 08:14

nkdengineer requested a review from a team as a code owner December 20, 2024 08:14

melvin-bot bot requested review from dubielzyk-expensify and eh2077 December 20, 2024 08:14

melvin-bot bot removed the request for review from a team December 20, 2024 08:14

fix conflict

dbb5aff

eh2077 reviewed Jan 2, 2025

View reviewed changes

Merge branch 'main' into fix/53764

e94e9ea

fix styles 2 buttons

23114fe

resolve conflict

45c7501

eh2077 approved these changes Jan 13, 2025

View reviewed changes

melvin-bot bot requested a review from grgia January 13, 2025 12:20

nkdengineer added 2 commits January 15, 2025 11:01

resolve conflict

843ac76

fix lint

d4619b1

grgia requested a review from eh2077 January 15, 2025 16:37

resolve conflict

2904d75

eh2077 approved these changes Jan 16, 2025

View reviewed changes

grgia approved these changes Jan 20, 2025

View reviewed changes

grgia merged commit 18a3ea1 into Expensify:main Jan 20, 2025
17 checks passed

github-actions bot mentioned this pull request Jan 21, 2025

Deploy Checklist: New Expensify 2025-01-21 #55507

Closed

53 tasks

trjExpensify added the DeployBlockerCash This issue or pull request should block deployment label Jan 21, 2025

trjExpensify mentioned this pull request Jan 21, 2025

[HOLD for payment 2025-02-04] [HOLD for payment 2025-01-30] App crash - TypeError: Cannot read properties of undefined (reading 'toString') #55519

Closed

8 tasks

trjExpensify removed the DeployBlockerCash This issue or pull request should block deployment label Jan 21, 2025

Beamanator mentioned this pull request Jan 21, 2025

[CP Staging] remove toString method #55521

Merged

50 tasks

ahmedGaber93 mentioned this pull request Jan 21, 2025

[HOLD for payment 2025-02-04] [HOLD for payment 2025-01-30] [$250] mWeb - "Free trial: 30 days left" overlaps with the box on narrow display #55522

Closed

8 tasks

mitarachim mentioned this pull request Jan 22, 2025

PR54352-Room-The "Schedule a demo" button is not displayed in the #admin room #55590

Closed

8 tasks

melvin-bot bot mentioned this pull request Jan 23, 2025

[HOLD for payment 2025-01-30] [$250] [New Feature] Add Guide booking link to #admins header #53764

Open

8 tasks

eh2077 reviewed Feb 4, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Guide booking link to #admins header #54352

Add Guide booking link to #admins header #54352

nkdengineer commented Dec 19, 2024 •

edited

Loading

melvin-bot bot commented Dec 20, 2024

eh2077 commented Dec 24, 2024 •

edited

Loading

eh2077 Jan 2, 2025

nkdengineer Jan 7, 2025

eh2077 Jan 9, 2025

eh2077 commented Jan 3, 2025

shawnborton commented Jan 3, 2025

dubielzyk-expensify commented Jan 6, 2025

dannymcclain commented Jan 6, 2025

nkdengineer commented Jan 7, 2025

shawnborton commented Jan 7, 2025

nkdengineer commented Jan 7, 2025

nkdengineer commented Jan 7, 2025

dannymcclain commented Jan 7, 2025

shawnborton commented Jan 7, 2025

dubielzyk-expensify commented Jan 8, 2025

shawnborton commented Jan 8, 2025

dannymcclain commented Jan 8, 2025 •

edited

Loading

shawnborton commented Jan 8, 2025

dubielzyk-expensify commented Jan 9, 2025

eh2077 commented Jan 9, 2025

shawnborton commented Jan 9, 2025

eh2077 commented Jan 10, 2025

nkdengineer commented Jan 13, 2025

eh2077 Jan 9, 2025

eh2077 commented Jan 20, 2025

OSBotify commented Jan 20, 2025

github-actions bot commented Jan 21, 2025

trjExpensify commented Jan 21, 2025

trjExpensify commented Jan 21, 2025

izarutskaya commented Jan 22, 2025

nkdengineer commented Jan 22, 2025

github-actions bot commented Jan 23, 2025

eh2077 Feb 4, 2025

Add Guide booking link to #admins header #54352

Add Guide booking link to #admins header #54352

Conversation

nkdengineer commented Dec 19, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 20, 2024

eh2077 commented Dec 24, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eh2077 Jan 2, 2025

Choose a reason for hiding this comment

nkdengineer Jan 7, 2025

Choose a reason for hiding this comment

eh2077 Jan 9, 2025

Choose a reason for hiding this comment

eh2077 commented Jan 3, 2025

shawnborton commented Jan 3, 2025

dubielzyk-expensify commented Jan 6, 2025

dannymcclain commented Jan 6, 2025

nkdengineer commented Jan 7, 2025

shawnborton commented Jan 7, 2025

nkdengineer commented Jan 7, 2025

nkdengineer commented Jan 7, 2025

dannymcclain commented Jan 7, 2025

shawnborton commented Jan 7, 2025

dubielzyk-expensify commented Jan 8, 2025

shawnborton commented Jan 8, 2025

dannymcclain commented Jan 8, 2025 • edited Loading

shawnborton commented Jan 8, 2025

dubielzyk-expensify commented Jan 9, 2025

eh2077 commented Jan 9, 2025

shawnborton commented Jan 9, 2025

eh2077 commented Jan 10, 2025

nkdengineer commented Jan 13, 2025

eh2077 Jan 9, 2025

Choose a reason for hiding this comment

eh2077 commented Jan 20, 2025

OSBotify commented Jan 20, 2025

github-actions bot commented Jan 21, 2025

trjExpensify commented Jan 21, 2025

trjExpensify commented Jan 21, 2025

izarutskaya commented Jan 22, 2025

nkdengineer commented Jan 22, 2025

github-actions bot commented Jan 23, 2025

eh2077 Feb 4, 2025

Choose a reason for hiding this comment

nkdengineer commented Dec 19, 2024 •

edited

Loading

eh2077 commented Dec 24, 2024 •

edited

Loading

dannymcclain commented Jan 8, 2025 •

edited

Loading