fix: consolidate 'I am a Teacher' and 'Intro to School Principal' pages #27750

akinwale · 2023-09-19T06:56:28Z

Details

Consolidates the "I am a Teacher" and "Intro to School Principal" pages into a single page for the i-am-a-teacher route.

Fixed Issues

$ #27225
PROPOSAL: #27225 (comment)

Tests

Login to the Expensify app using an email address with a private domain.
Open the global menu and navigate to Save the world > I am a teacher.
Verify that the Intro to School Principal form is displayed.
Sign out and login to Expensify using an email address with a public domain.
Open the global menu and navigate to Save the world > I am a teacher.
Verify that the update your email screen is displayed.

Direct URL navigation (private)

Login to the Expensify app in a web browser using an email address with a private domain
Navigate to the relative URL /teachersunite/i-am-a-teacher
Verify that the Intro to School Principal form is displayed.
Navigate to the relative URL /teachersunite/intro-school-principal
Verify that the Intro to School Principal form is displayed.

Direct URL navigation (public)

Login to the Expensify app in a web browser using an email address with a public domain
Navigate to the relative URL /teachersunite/i-am-a-teacher
Verify that the update your email screen is displayed.
Navigate to the relative URL /teachersunite/intro-school-principal
Verify that the update your email screen is displayed.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

27225-web-private.mp4

27225-web-public.mp4

Mobile Web - Chrome

27225-android-chrome.webm

Mobile Web - Safari

27225-ios-safari.mp4

Desktop

27225-desktop.mp4

iOS

27225-ios-native.mp4

Android

27225-android-native.webm

melvin-bot · 2023-09-19T06:56:33Z

@aimane-chnaif 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]

akinwale · 2023-09-21T13:33:03Z

@aimane-chnaif bump on review, please.

aimane-chnaif · 2023-09-21T13:33:45Z

Let's add some more test steps for the features that PR implemented

aimane-chnaif · 2023-09-21T13:37:52Z

Please pull main.

I am not seeing "Save the world" option anymore from FAB menu

akinwale · 2023-09-21T13:44:38Z

Looks like it was removed again. #27763

@marcochavezf What are the next steps for this PR? Do we just move forward with the direct URL checks?

aimane-chnaif · 2023-09-21T13:46:42Z

ok, so STW button was temporarily removed in #27763.
@marcochavezf 2 options:

hold this PR until STW is live
continue this PR
We can still test by manually showing that button locally. Of course don't commit that code.
QA team will be able to test only direct urls.

aimane-chnaif · 2023-09-21T13:59: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 / Chrome
- iOS / native
- iOS / 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 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 Copy label 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
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.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 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(themeColors.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 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.
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

Web

public domain test

Screen.Recording.2023-09-21.at.2.51.45.PM.mov

Screen.Recording.2023-09-21.at.2.53.02.PM.mov

private domain test

Screen.Recording.2023-09-21.at.2.55.36.PM.mov

Screen.Recording.2023-09-21.at.2.58.09.PM.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

aimane-chnaif

LGTM! Approving in case we decide to continue

marcochavezf · 2023-09-22T04:29:09Z

ok, so STW button was temporarily removed in #27763. @marcochavezf 2 options:

hold this PR until STW is live

continue this PR
We can still test by manually showing that button locally. Of course don't commit that code.
QA team will be able to test only direct urls.

We can continue by just entering the URL directly in the browser. This should continue working after we enable the STW button.

aimane-chnaif · 2023-09-22T04:30:10Z

Thanks

@akinwale conflict arrived

marcochavezf · 2023-09-22T04:30:18Z

Conflicts

akinwale · 2023-09-22T04:48:21Z

@marcochavezf Fixed the merge conflicts.

marcochavezf

LGTM, thank you guys!

OSBotify · 2023-09-22T05:16:37Z

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

OSBotify · 2023-09-22T13:59:02Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 1.3.73-0 🚀

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

OSBotify · 2023-09-25T09:33:53Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.73-1 🚀

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

OSBotify · 2023-09-25T10:05:54Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 1.3.74-0 🚀

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

OSBotify · 2023-09-28T18:48:15Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.74-3 🚀

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

consolidate 'I am a Teacher' and 'Intro to School Principal' pages

da5635c

akinwale requested a review from a team as a code owner September 19, 2023 06:56

melvin-bot bot requested review from aimane-chnaif and removed request for a team September 19, 2023 06:56

akinwale mentioned this pull request Sep 19, 2023

[HOLD for payment 2023-10-02] [$500] "Intro to your school principal" page is accessible with a public email #27225

Closed

6 tasks

Merge remote-tracking branch 'upstream/main' into task-27225

ec36d99

aimane-chnaif approved these changes Sep 21, 2023

View reviewed changes

melvin-bot bot requested a review from marcochavezf September 21, 2023 13:59

marcochavezf assigned akinwale Sep 22, 2023

Merge remote-tracking branch 'upstream/main' into task-27225

a315c5b

marcochavezf approved these changes Sep 22, 2023

View reviewed changes

marcochavezf merged commit 0e9a1c1 into Expensify:main Sep 22, 2023

OSBotify mentioned this pull request Sep 22, 2023

Deploy Checklist: New Expensify 2023-09-22 #28013

Closed

96 tasks

lanitochka17 mentioned this pull request Sep 23, 2023

Fab - Save the world option not displayed in global menu #28084

Closed

6 tasks

This was referenced Sep 25, 2023

Deploy Checklist: New Expensify DUPE 2023-09-25 #28118

Closed

Deploy Checklist: New Expensify 2023-09-25 #28119

Closed

akinwale deleted the task-27225 branch September 25, 2023 12:51

akinwale restored the task-27225 branch September 25, 2023 12:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: consolidate 'I am a Teacher' and 'Intro to School Principal' pages #27750

fix: consolidate 'I am a Teacher' and 'Intro to School Principal' pages #27750

akinwale commented Sep 19, 2023 •

edited

Loading

melvin-bot bot commented Sep 19, 2023

akinwale commented Sep 21, 2023

aimane-chnaif commented Sep 21, 2023

aimane-chnaif commented Sep 21, 2023

akinwale commented Sep 21, 2023

aimane-chnaif commented Sep 21, 2023

aimane-chnaif commented Sep 21, 2023

public domain test

private domain test

aimane-chnaif left a comment

marcochavezf commented Sep 22, 2023

aimane-chnaif commented Sep 22, 2023

marcochavezf commented Sep 22, 2023

akinwale commented Sep 22, 2023

marcochavezf left a comment

OSBotify commented Sep 22, 2023

OSBotify commented Sep 22, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

fix: consolidate 'I am a Teacher' and 'Intro to School Principal' pages #27750

fix: consolidate 'I am a Teacher' and 'Intro to School Principal' pages #27750

Conversation

akinwale commented Sep 19, 2023 • edited Loading

Details

Fixed Issues

Tests

Direct URL navigation (private)

Direct URL navigation (public)

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 19, 2023

akinwale commented Sep 21, 2023

aimane-chnaif commented Sep 21, 2023

aimane-chnaif commented Sep 21, 2023

akinwale commented Sep 21, 2023

aimane-chnaif commented Sep 21, 2023

aimane-chnaif commented Sep 21, 2023

Reviewer Checklist

Screenshots/Videos

public domain test

private domain test

aimane-chnaif left a comment

Choose a reason for hiding this comment

marcochavezf commented Sep 22, 2023

aimane-chnaif commented Sep 22, 2023

marcochavezf commented Sep 22, 2023

akinwale commented Sep 22, 2023

marcochavezf left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 22, 2023

OSBotify commented Sep 22, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

akinwale commented Sep 19, 2023 •

edited

Loading