Remove `Save the World` from Global Create, and move it into Settings by aeioual · Pull Request #37175 · Expensify/App

aeioual · 2024-02-24T19:18:24Z

Details

Fixed Issues

$ #36649
PROPOSAL: #36649 (comment)

Tests

Same as QA step

Verify that no errors appear in the JS console

Offline tests

Same as QA step

QA Steps

Go to Profile settings
From LHN, select Save the World above the logout button
This is a redesign so we move save the world to profile settings

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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed 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 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 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.js 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.
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

MacOS: Chrome / Safari

simplescreenrecorder-2024-04-07_01.33.38.mp4

iOS: mWeb Safari

Android: mWeb Chrome

iOS: Native

Android: Native

MacOS: Desktop

melvin-bot · 2024-02-24T19:18:29Z

@dannymcclain @Ollyws 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]

aeioual · 2024-02-24T19:19:27Z

@Ollyws , i am waiting for comment and comment to be addressed, will upload the videos after it :)

Other than that the PR is complete you can review it as well

dannymcclain · 2024-02-26T14:29:39Z

@Amarparab2024 I commented with answers to your questions here!

Ollyws · 2024-02-27T10:44:58Z

@Amarparab2024 is this ready for review or are we still finishing some things off?

aeioual · 2024-02-27T10:49:14Z

Sorry for delay, Only thing remaining is to add the header illustrations for save the world, you can start the review i will update it before EOD, the PR is technically complete:)

…

On Tue, Feb 27, 2024 at 4:15 PM Olly ***@***.***> wrote: @Amarparab2024 <https://github.com/Amarparab2024> is this ready for review or are we still finishing some things off? — Reply to this email directly, view it on GitHub <#37175 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/BFJQ62MI63YQBEE2ZK6KYNDYVW2LNAVCNFSM6AAAAABDYHEFBKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSNRWGI3TCOBXGU> . You are receiving this because you were mentioned.Message ID: ***@***.***>

aeioual · 2024-02-27T20:12:57Z

PR ready for review @Ollyws , I know the videos are pending, Will update them by tomorrow, in the meantime you can checkoff your review as the PR is completed :)

Also, @Ollyws , i am not able to highlight save the world option when it is selected, can you help me with this please?

dannymcclain · 2024-02-27T21:04:04Z

Generally this is looking pretty good! Obviously we need to get that highlight/selected thing figured out for the nav item, but the layout is looking good.

I did discover this one weird thing on a small viewport: when I open the RHP to "sign up" or whatever we call it and click the back button, the Save the world screen animates from the wrong side.

CleanShot.2024-02-27.at.15.00.11.mp4

Ollyws · 2024-02-29T17:11:20Z

Also, @Ollyws , i am not able to highlight save the world option when it is selected, can you help me with this please?

The reason this isn't working is because because here the active route is settingssavetheword(because we're naming it here) while the item.routename is settingsteachersunite because we're setting the route to that here.

Ollyws · 2024-04-03T09:16:05Z

@Amarparab2024 Could you take a look at the conflicts? Thanks.

aeioual · 2024-04-04T09:05:46Z

oh didn’t realize there was a conflict, I’ll resolve this by EOD, had no access to laptop since yesterday, sorry about that :)

…

On Wed, Apr 3, 2024 at 2:46 PM Olly ***@***.***> wrote: @Amarparab2024 <https://github.com/Amarparab2024> Could you take a look at the conflicts? Thanks. — Reply to this email directly, view it on GitHub <#37175 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/BFJQ62PQU7NQIYSGGN2VR53Y3PCGXAVCNFSM6AAAAABDYHEFBKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDAMZUGAYDSMBTHE> . You are receiving this because you were mentioned.Message ID: ***@***.***>

aeioual · 2024-04-05T00:45:33Z

@Ollyws , PR is all yours :)

Ollyws · 2024-04-05T11:06:40Z

@Amarparab2024 Could you please add testing steps?

aeioual · 2024-04-06T07:34:42Z

Done with the testing steps @Ollyws

Ollyws · 2024-04-06T10:38:33Z

@Amarparab2024 as per #36649 (comment) I think we can get rid of the old /teachersunite route.

aeioual · 2024-04-06T19:56:43Z

Merged main and removed the old route @Ollyws :)

github-actions · 2024-04-08T06:39:39Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/37175/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/37175/index.html

Desktop 💻	Web 🕸️
❌ FAILED ❌	https://37175.pr-testing.expensify.com
The QR code can't be generated, because the Desktop build failed

👀 View the workflow run that generated this build 👀

shawnborton · 2024-04-08T06:47:08Z

This feels pretty good to me. The only thing I really found was that when you choose an option in the card for either "I know a teacher" or "I am a teacher" - should we be auto-focusing the first field in the form that shows up? I would think yes to be consistent with other places.

Ollyws · 2024-04-08T09:35:50Z

On other pages in the settings, for example /settings/profile/display-name, legal-name or address we're not auto focusing so I'm not sure it makes sense to auto-focus here either really.

shawnborton · 2024-04-08T09:44:53Z

Got it, that works for me - happy to stay consistent here.

Ollyws · 2024-04-08T09:51:38Z

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 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 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.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(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.
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

01_Android_Native.mp4

Android: mWeb Chrome

02_Android_Chrome.mp4

iOS: Native

03_iOS_Native.mp4

iOS: mWeb Safari

04_iOS_Safari.mp4

MacOS: Chrome / Safari

05_MacOS_Chrome.mp4

MacOS: Desktop

06_MacOS_Desktop.mp4

Ollyws

LGTM.

marcochavezf

Code LGTM, I'm just confirming the redirect change we'd need to do before merging the PR

OSBotify · 2024-04-09T00:26:28Z

✋ 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 · 2024-04-10T17:45:18Z

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

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

OSBotify · 2024-04-10T17:54:11Z

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

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

OSBotify · 2024-04-10T19:33:24Z

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

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

OSBotify · 2024-04-18T04:31:09Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.62-17 🚀

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

aeioual added 10 commits February 25, 2024 00:41

Update ROUTES.ts

118a6d4

Update SCREENS.ts

804fe4a

Update ModalStackNavigators.tsx

9d3bec7

Update config.ts

e4d9f7b

Update ImTeacherUpdateEmailPage.tsx

cac93d7

Update IntroSchoolPrincipalPage.tsx

c5658bd

Update KnowATeacherPage.tsx

ece8a45

Update SaveTheWorldPage.tsx

4d285c6

Update InitialSettingsPage.js

a2cd758

Update FloatingActionButtonAndPopover.js

89371d4

aeioual requested a review from a team as a code owner February 24, 2024 19:18

melvin-bot Bot requested review from Ollyws and dannymcclain and removed request for a team February 24, 2024 19:18

aeioual added 5 commits February 28, 2024 01:29

Update Illustrations.ts

b4ab920

Update SaveTheWorldPage.tsx

8dac188

Create simple-illustration__teachers-unite.svg

8d80ca0

merge changes

c28bb4d

Merge branch 'main' into issue36649

61ae205

aeioual added 2 commits February 28, 2024 02:23

Update InitialSettingsPage.tsx

54f6ee8

Update InitialSettingsPage.tsx

b6b630e

Update SCREENS.ts

94c9f2b

Resolve merge conflict

49c3366

aeioual requested a review from a team as a code owner April 5, 2024 00:44

aeioual added 2 commits April 5, 2024 06:16

Add modalstack navigator

4382bdd

Fix linter

161391d

aeioual and others added 2 commits April 7, 2024 01:13

Merge branch 'Expensify:main' into issue36649

9bdbb68

Remove old teachersunite route

11fc00a

shawnborton added the Ready To Build label Apr 8, 2024

Ollyws approved these changes Apr 8, 2024

View reviewed changes

melvin-bot Bot requested a review from marcochavezf April 8, 2024 09:52

marcochavezf approved these changes Apr 9, 2024

View reviewed changes

marcochavezf merged commit 76c7fa9 into Expensify:main Apr 9, 2024

github-actions Bot mentioned this pull request Apr 10, 2024

Deploy Checklist: New Expensify 2024-04-10 #40026

Closed

shubham1206agra mentioned this pull request Apr 11, 2024

Save the world - Back button opens Save the world page with chat LHN instead of menu list #40084

Closed

2 of 6 tasks

Conversation

aeioual commented Feb 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Feb 24, 2024

Uh oh!

aeioual commented Feb 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dannymcclain commented Feb 26, 2024

Uh oh!

Ollyws commented Feb 27, 2024

Uh oh!

aeioual commented Feb 27, 2024 via email

Uh oh!

aeioual commented Feb 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dannymcclain commented Feb 27, 2024

Uh oh!

Ollyws commented Feb 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Ollyws commented Apr 3, 2024

Uh oh!

aeioual commented Apr 4, 2024 via email

Uh oh!

aeioual commented Apr 5, 2024

Uh oh!

Ollyws commented Apr 5, 2024

Uh oh!

aeioual commented Apr 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Ollyws commented Apr 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aeioual commented Apr 6, 2024

Uh oh!

github-actions Bot commented Apr 8, 2024

Uh oh!

shawnborton commented Apr 8, 2024

Uh oh!

Ollyws commented Apr 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shawnborton commented Apr 8, 2024

Uh oh!

Ollyws commented Apr 8, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

Ollyws left a comment

Choose a reason for hiding this comment

Uh oh!

marcochavezf left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Apr 9, 2024

Uh oh!

OSBotify commented Apr 10, 2024

Uh oh!

OSBotify commented Apr 10, 2024

Uh oh!

OSBotify commented Apr 10, 2024

Uh oh!

OSBotify commented Apr 18, 2024

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

aeioual commented Feb 24, 2024 •

edited

Loading

aeioual commented Feb 24, 2024 •

edited

Loading

aeioual commented Feb 27, 2024 •

edited

Loading

Ollyws commented Feb 29, 2024 •

edited

Loading

aeioual commented Apr 6, 2024 •

edited

Loading

Ollyws commented Apr 6, 2024 •

edited

Loading

Ollyws commented Apr 8, 2024 •

edited

Loading