Fix: Add avatar details to the Lounge Access Page #26687

Pujan92 · 2023-09-04T16:18:45Z

Details

#24381

Fixed Issues

$ #24381
PROPOSAL: #24381 (comment)

Tests

Goto Settings -> Profile -> Lounge access
Verify user details has been shown on top of the animation

Verify that no errors appear in the JS console

Offline tests

Goto Settings -> Profile -> Lounge access
Verify user details has been shown on top of the animation

QA Steps

Goto Settings -> Profile -> Lounge access
Verify user details has been shown on top of the animation

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 / Chrome
- iOS / native
- iOS / 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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-09-04T16:18:49Z

@Santhosh-Sellavel 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]

Pujan92 · 2023-09-04T16:30:40Z

@shawnborton Plz confirm the new change by checking the Screenshots in the PR details.

shawnborton · 2023-09-05T13:40:29Z

It seems like that top lounge illustration isn't as tall as it could be, though I'm not sure if that is related to anything you did here. In our mocks, we have it at 240px tall.

So ignoring that, I think it looks pretty good to me. cc @Expensify/design for a second opinion too.

roryabraham · 2023-09-05T14:11:03Z

src/pages/settings/Profile/LoungeAccessPage.js

-    },
-})(LoungeAccessPage);
+export default compose(
+    withLocalize,


Please use the useLocalize hook instead.

roryabraham · 2023-09-05T14:11:36Z

src/pages/settings/Profile/LoungeAccessPage.js

    /** Current user details, which will hold whether or not they have Lounge Access */
    user: userPropTypes,
+
+    ...withLocalizePropTypes,


Also remove these prop types after switching to useLocalize hook

Pujan92 · 2023-09-05T14:34:27Z

It seems like that top lounge illustration isn't as tall as it could be, though I'm not sure if that is related to anything you did here. In our mocks, we have it at 240px tall.

I think this current file isn't the right one which has a high width and height compared to other animation files.

roryabraham

thanks for making that change

Santhosh-Sellavel · 2023-09-06T19:09:57Z

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

Santhosh-Sellavel

LGTM, thanks for the early review @roryabraham!

@thienlnam I'll let you decide whether this should be on merge freeze or not?

thienlnam · 2023-09-06T21:58:20Z

Going to put this on hold for the merge freeze!

roryabraham

can you also pull main, merge it into this branch, and retest?

roryabraham · 2023-09-11T06:33:44Z

src/pages/settings/Profile/LoungeAccessPage.js

@@ -35,18 +57,46 @@ const menuItems = [
    },
 ];

-function LoungeAccessPage({user}) {
+function LoungeAccessPage(props) {


NAB for now but let's generally try to stick with using props destructuring. This will be required when we migrate to TypeScript

Pujan92 · 2023-09-11T10:26:31Z

can you also pull main, merge it into this branch, and retest?

Done and seems fine.

OSBotify · 2023-09-12T03:58:16Z

✋ 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-13T09:14:56Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.3.69-0 🚀

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

OSBotify · 2023-09-14T10:29:10Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.69-2 🚀

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

OSBotify · 2023-09-14T10:56:16Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.3.70-0 🚀

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

OSBotify · 2023-09-18T10:14:15Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.70-8 🚀

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

overlay content changes for lounge access page

cd3787a

Pujan92 requested a review from a team as a code owner September 4, 2023 16:18

melvin-bot bot requested review from Santhosh-Sellavel and removed request for a team September 4, 2023 16:18

lint fix

4442f2e

Pujan92 mentioned this pull request Sep 4, 2023

[HOLD for payment 2023-09-21] [$1000] Add avatar details to the Lounge Access Page #24381

Closed

Pujan92 mentioned this pull request Sep 5, 2023

[HOLD for payment 2024-01-24] [$500] Implement new layout in About page #26779

Closed

roryabraham requested changes Sep 5, 2023

View reviewed changes

PR comment addressed

39b622c

roryabraham approved these changes Sep 5, 2023

View reviewed changes

Santhosh-Sellavel approved these changes Sep 6, 2023

View reviewed changes

melvin-bot bot requested a review from thienlnam September 6, 2023 19:11

thienlnam changed the title ~~Fix: Add avatar details to the Lounge Access Page~~ [HOLD FREEZE] Fix: Add avatar details to the Lounge Access Page Sep 6, 2023

roryabraham reviewed Sep 11, 2023

View reviewed changes

roryabraham changed the title ~~[HOLD FREEZE] Fix: Add avatar details to the Lounge Access Page~~ Fix: Add avatar details to the Lounge Access Page Sep 11, 2023

Merge branch 'main' into fix/24381

67a4d12

roryabraham merged commit a2000cb into Expensify:main Sep 12, 2023

OSBotify mentioned this pull request Sep 13, 2023

Deploy Checklist: New Expensify 2023-09-13 #27313

Closed

72 tasks

OSBotify mentioned this pull request Sep 14, 2023

Deploy Checklist: New Expensify 2023-09-14 #27425

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Add avatar details to the Lounge Access Page #26687

Fix: Add avatar details to the Lounge Access Page #26687

Pujan92 commented Sep 4, 2023 •

edited

Loading

melvin-bot bot commented Sep 4, 2023

Pujan92 commented Sep 4, 2023

shawnborton commented Sep 5, 2023

roryabraham Sep 5, 2023

roryabraham Sep 5, 2023

Pujan92 Sep 5, 2023

Pujan92 commented Sep 5, 2023

roryabraham left a comment

Santhosh-Sellavel commented Sep 6, 2023

Santhosh-Sellavel left a comment

thienlnam commented Sep 6, 2023

roryabraham left a comment

roryabraham Sep 11, 2023

Pujan92 commented Sep 11, 2023

OSBotify commented Sep 12, 2023

OSBotify commented Sep 13, 2023

OSBotify commented Sep 14, 2023

OSBotify commented Sep 14, 2023

OSBotify commented Sep 18, 2023

Fix: Add avatar details to the Lounge Access Page #26687

Fix: Add avatar details to the Lounge Access Page #26687

Conversation

Pujan92 commented Sep 4, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 4, 2023

Pujan92 commented Sep 4, 2023

shawnborton commented Sep 5, 2023

roryabraham Sep 5, 2023

Choose a reason for hiding this comment

roryabraham Sep 5, 2023

Choose a reason for hiding this comment

Pujan92 Sep 5, 2023

Choose a reason for hiding this comment

Pujan92 commented Sep 5, 2023

roryabraham left a comment

Choose a reason for hiding this comment

Santhosh-Sellavel commented Sep 6, 2023

Reviewer Checklist

Screenshots/Videos

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

thienlnam commented Sep 6, 2023

roryabraham left a comment

Choose a reason for hiding this comment

roryabraham Sep 11, 2023

Choose a reason for hiding this comment

Pujan92 commented Sep 11, 2023

OSBotify commented Sep 12, 2023

OSBotify commented Sep 13, 2023

OSBotify commented Sep 14, 2023

OSBotify commented Sep 14, 2023

OSBotify commented Sep 18, 2023

Pujan92 commented Sep 4, 2023 •

edited

Loading