Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add lounge access page for users who qualify for lounge membership #20881

Merged
merged 18 commits into from
Jun 23, 2023

Conversation

yuwenmemon
Copy link
Contributor

@yuwenmemon yuwenmemon commented Jun 16, 2023

Pullerbearing (@narefyev91)
cc @Beamanator @amyevans

Details

Create a page that will show for users who have lounge access that describes the lounge a bit (but more importantly can be used by our lounge staff to verify a user is a paying member)

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/287746

Tests/QA

  1. As a user who has a subscription and billing card on file (or is a policy member of a corporate policy that is active) go to Settings -> Profile
  2. Make sure there is a "Lounge Access" Menu item at the bottom of your profile
  3. Click it
  4. Make sure it takes you to the page in the screenshots below

  1. As a user with a freshly created account with no billing card on file go to Settings -> profile
  2. Make sure you do not see a Lounge Access Menu item at the bottom of your profile.

Offline tests

QA Steps

  • 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
    • 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 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

Screenshot 2023-06-20 at 3 12 37 PM
Screenshot 2023-06-20 at 3 12 44 PM

Mobile Web - Chrome

Screenshot 2023-06-20 at 3 15 50 PM

Mobile Web - Safari

Screenshot 2023-06-20 at 3 13 59 PM

Desktop

Screenshot 2023-06-20 at 3 16 37 PM

iOS

Screenshot 2023-06-20 at 3 12 13 PM

Android

Screenshot 2023-06-20 at 3 12 31 PM

@yuwenmemon yuwenmemon self-assigned this Jun 16, 2023
@yuwenmemon yuwenmemon marked this pull request as ready for review June 20, 2023 22:21
@yuwenmemon yuwenmemon requested a review from a team as a code owner June 20, 2023 22:21
@melvin-bot melvin-bot bot requested review from narefyev91 and removed request for a team June 20, 2023 22:21
@melvin-bot
Copy link

melvin-bot bot commented Jun 20, 2023

@narefyev91 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]

@yuwenmemon yuwenmemon changed the title Add lounge access page for users who qualify for lounge membership [HOLD FOR COPY] Add lounge access page for users who qualify for lounge membership Jun 20, 2023
@yuwenmemon
Copy link
Contributor Author

Placing a HOLD as we're still waiting on copy from @mallenexpensify

@mallenexpensify mallenexpensify changed the title [HOLD FOR COPY] Add lounge access page for users who qualify for lounge membership Add lounge access page for users who qualify for lounge membership Jun 20, 2023
@mallenexpensify
Copy link
Contributor

Removed hold, copy and notes added here
https://github.com/Expensify/Expensify/issues/287746#issuecomment-1599714990

@yuwenmemon
Copy link
Contributor Author

Still waiting on Spanish translations.

@yuwenmemon
Copy link
Contributor Author

Allright we got it. This is ready to go!

};

function LoungeAccessPage(props) {
const menuItems = [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we can place menuItems outside of function

title={props.translate('loungeAccessPage.loungeAccess')}
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
/>
<ScrollView contentContainerStyle={[safeAreaPaddingBottomStyle]}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you do not need [] here - you are using only one style

onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
/>
<ScrollView contentContainerStyle={[safeAreaPaddingBottomStyle]}>
<View style={[illustrationStyle]}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here you can avoid using []

<View style={[illustrationStyle]}>
<Illustrations.Lounge />
</View>
<View style={[styles.pageWrapperNotCentered]}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here you can avoid using []

>
{props.translate('loungeAccessPage.headline')}
</Text>
<Text style={[styles.baseFontStyle]}>{props.translate('loungeAccessPage.description')}</Text>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here you can avoid using []

@yuwenmemon
Copy link
Contributor Author

Thanks @narefyev91 - updated!

@amyevans amyevans self-requested a review June 21, 2023 22:17
@amyevans
Copy link
Contributor

Adding myself as a reviewer, though I likely can't get to it until tomorrow morning.

@narefyev91
Copy link
Contributor

@yuwenmemon Hey - can you please check why does your PR showing soooo many line changes
Screenshot 2023-06-22 at 10 36 21

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@narefyev91 - I think this file is why there's so many line changes 😅

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep - it's cause of the SVG files

@narefyev91
Copy link
Contributor

narefyev91 commented Jun 22, 2023

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 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 web web1
Mobile Web - Chrome

android-web
android-web2

Mobile Web - Safari

ios-web2
ios-web1
ios-web3

Desktop desktop2 desktop1
iOS

ios
ios2

Android

android2
android

Copy link
Contributor

@narefyev91 narefyev91 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
🎀 👀 🎀 C+ reviewed

@melvin-bot
Copy link

melvin-bot bot commented Jun 22, 2023

🎯 @narefyev91, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #21306.

Copy link
Contributor

@amyevans amyevans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor comments! @Expensify/design do you want to review too?

@@ -28,6 +31,7 @@ import PinkBill from '../../../assets/images/simple-illustrations/simple-illustr
import CreditCardsNew from '../../../assets/images/simple-illustrations/simple-illustration__credit-cards.svg';
import InvoiceBlue from '../../../assets/images/simple-illustrations/simple-illustration__invoice.svg';
import LockOpen from '../../../assets/images/simple-illustrations/simple-illustration__lockopen.svg';
import Lounge from '../../../assets/images/product-illustrations/lounge-top-bg.svg';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB/nit picks, but 1) I wonder if we should just name this lounge.svg instead (to stay consistent with how the result of product illustrations are named - doesn't seem like they incorporate placement details into the name), 2) there's some dubious alpha ordering in this import section 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM!

loungeAccess: 'Acceso al lounge',
headline: 'Podrás acceder a nuestras salas vip exclusivas.',
description:
'La sala vip Expensify es el punto de encuentro entre una “sala vip de aeropuerto de alta gama” y un vibrante “espacio de co-working” optimizado para personas con ideas afines.',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'La sala vip Expensify es el punto de encuentro entre una sala vip de aeropuerto de alta gama y un vibrante espacio de co-working optimizado para personas con ideas afines.',
'La sala vip Expensify es el punto de encuentro entre una "sala vip de aeropuerto de alta gama" y un vibrante "espacio de co-working" optimizado para personas con ideas afines.',

@@ -464,6 +464,13 @@ const SettingsModalStackNavigator = createModalStackNavigator([
},
name: 'Settings_App_Download_Links',
},
{
getComponent: () => {
const SettingsLoungeAccessPage = require('../../../pages/settings/LoungeAccessPage').default;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's nest this under Profile to follow existing directory organization patterns

Suggested change
const SettingsLoungeAccessPage = require('../../../pages/settings/LoungeAccessPage').default;
const SettingsLoungeAccessPage = require('../../../pages/settings/Profile/LoungeAccessPage').default;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thoughts on this one @yuwenmemon?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sorry missed this! Sounds good one sec...

const illustrationStyle = props.isSmallScreenWidth
? {
width: props.windowWidth,
height: 0.64 * props.windowWidth,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB but I think we could make this line more self-documenting by using an aspect ratio constant or something?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM!

Comment on lines 66 to 73
<MenuItem
key={item.translationKey}
title={props.translate(item.translationKey)}
icon={item.icon}
iconWidth={60}
iconHeight={60}
iconStyles={[styles.mr3, styles.ml3]}
/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about the use of the <MenuItem /> component here, since these aren't really menu items (they don't go anywhere). I don't know offhand if we have a more appropriate component to use (like a ListItem). The main issue I see with it is the hover styles, so maybe you can just pass some custom styles to get around it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, maybe no highlighting on hover? Good idea!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handled this with interactive={false}!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh perfect, easy peas.

}
: {};

return (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should check if the user has the NVP here as well, and return <NotFoundPage />; if they don't. Otherwise users who are slightly tech savvy (which, it's SF 😄) could just navigate to the URL directly

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, great thought!

@@ -118,6 +122,16 @@ function ProfilePage(props) {
onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS)}
shouldShowRightIcon
/>
{props.user.hasLoungeAccess && (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add hasLoungeAccess to userPropTypes?

@yuwenmemon
Copy link
Contributor Author

Updated!

Copy link
Contributor

@amyevans amyevans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 🎉

Question still stands on whether this should get design review though, and one additional question: should we hold merge until after SNH given the feature freeze?

@yuwenmemon
Copy link
Contributor Author

yuwenmemon commented Jun 23, 2023

@amyevans I'm fine waiting - although at the same time, this doesn't touch anything close to any sort of chat functionality 🤔 Gonna ask about it here

@yuwenmemon
Copy link
Contributor Author

@amyevans
Copy link
Contributor

Sounds good, are you able to merge? Strangely I'm now seeing this:
Screenshot 2023-06-23 at 11 16 18 AM

Asked in Slack too

@yuwenmemon
Copy link
Contributor Author

Yep seeing the same thing

@amyevans
Copy link
Contributor

It just wasn't meant to be 😏

@amyevans amyevans merged commit 685c745 into main Jun 23, 2023
@amyevans amyevans deleted the yuwen-loungeAccessPage branch June 23, 2023 15:51
@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.32-1 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.32-5 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants