Add lounge access page for users who qualify for lounge membership by yuwenmemon · Pull Request #20881 · Expensify/App

yuwenmemon · 2023-06-16T00:26:17Z

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

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
Make sure there is a "Lounge Access" Menu item at the bottom of your profile
Click it
Make sure it takes you to the page in the screenshots below

As a user with a freshly created account with no billing card on file go to Settings -> profile
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

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

…ssPage

melvin-bot · 2023-06-20T22:21:51Z

@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 · 2023-06-20T22:23:01Z

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

mallenexpensify · 2023-06-20T23:32:46Z

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

yuwenmemon · 2023-06-21T00:10:04Z

Still waiting on Spanish translations.

yuwenmemon · 2023-06-21T01:50:36Z

Allright we got it. This is ready to go!

narefyev91 · 2023-06-21T07:00:03Z

+};
+
+function LoungeAccessPage(props) {
+    const menuItems = [


i think we can place menuItems outside of function

narefyev91 · 2023-06-21T07:02:14Z

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


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

narefyev91 · 2023-06-21T07:04:19Z

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


same here you can avoid using []

narefyev91 · 2023-06-21T07:07:51Z

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


same here you can avoid using []

narefyev91 · 2023-06-21T07:07:56Z

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


same here you can avoid using []

…ssPage

yuwenmemon · 2023-06-21T19:06:15Z

Thanks @narefyev91 - updated!

amyevans · 2023-06-21T22:17:50Z

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

narefyev91 · 2023-06-22T07:37:20Z

@yuwenmemon Hey - can you please check why does your PR showing soooo many line changes

Beamanator · 2023-06-22T08:35:22Z

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

Yep - it's cause of the SVG files

narefyev91 · 2023-06-22T08:36:46Z

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

narefyev91

LGTM!
🎀 👀 🎀 C+ reviewed

melvin-bot · 2023-06-22T11:40:51Z

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

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

amyevans

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

amyevans · 2023-06-22T18:59:08Z

 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';


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 😄

amyevans · 2023-06-22T19:00:35Z

+        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.',


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.',

amyevans · 2023-06-22T19:07:12Z

    },
+    {
+        getComponent: () => {
+            const SettingsLoungeAccessPage = require('../../../pages/settings/LoungeAccessPage').default;


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;

Thoughts on this one @yuwenmemon?

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

amyevans · 2023-06-22T19:35:14Z

+    const illustrationStyle = props.isSmallScreenWidth
+        ? {
+              width: props.windowWidth,
+              height: 0.64 * props.windowWidth,


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

amyevans · 2023-06-22T19:49:03Z

+                            <MenuItem
+                                key={item.translationKey}
+                                title={props.translate(item.translationKey)}
+                                icon={item.icon}
+                                iconWidth={60}
+                                iconHeight={60}
+                                iconStyles={[styles.mr3, styles.ml3]}
+                            />


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?

Yeah, maybe no highlighting on hover? Good idea!

Handled this with interactive={false}!

Oh perfect, easy peas.

amyevans · 2023-06-22T19:58:38Z

+          }
+        : {};
+
+    return (


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

Ah yes, great thought!

amyevans · 2023-06-22T20:00:37Z

                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS)}
                    shouldShowRightIcon
                />
+                {props.user.hasLoungeAccess && (


Should we add hasLoungeAccess to userPropTypes?

…ssPage

yuwenmemon · 2023-06-22T22:05:06Z

Updated!

amyevans

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 · 2023-06-23T00:04:32Z

@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 · 2023-06-23T15:05:02Z

@amyevans looks like we're good to merge here! https://expensify.slack.com/archives/C04QEB4MJEQ/p1687532615305669?thread_ts=1687478534.233329&cid=C04QEB4MJEQ

amyevans · 2023-06-23T15:19:41Z

Sounds good, are you able to merge? Strangely I'm now seeing this:

Asked in Slack too

yuwenmemon · 2023-06-23T15:30:50Z

Yep seeing the same thing

amyevans · 2023-06-23T15:34:49Z

It just wasn't meant to be 😏

OSBotify · 2023-06-23T15:55:53Z

✋ 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-06-23T22:16:46Z

🚀 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 · 2023-06-26T20:47:23Z

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

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

Add lounge access page for users who qualify for lounge membership

c20a006

yuwenmemon self-assigned this Jun 16, 2023

yuwenmemon added 8 commits June 16, 2023 14:11

Merge branch 'main' of github.com:Expensify/App into yuwen-loungeAcce…

a4d524f

…ssPage

Add assets for lounge page

2c480b3

Pull main

43ee7c1

Fix icon margin in menu

0e3f048

Simplify styles

a9ab57e

Fix styling

198cb8c

Final styling updates

9dd6f61

Remove unneccerssary translateion

931f9a1

yuwenmemon marked this pull request as ready for review June 20, 2023 22:21

yuwenmemon requested a review from a team as a code owner June 20, 2023 22:21

melvin-bot Bot requested review from narefyev91 and removed request for a team June 20, 2023 22:21

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

pretttier

928e644

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

Get final copy in english

eb2d741

Spanish copy

cad43f3

narefyev91 reviewed Jun 21, 2023

View reviewed changes

Merge branch 'main' of github.com:Expensify/App into yuwen-loungeAcce…

028be2f

…ssPage

yuwenmemon added 2 commits June 21, 2023 12:04

PR comments

13ac67c

prettier

9d9d2a1

amyevans self-requested a review June 21, 2023 22:17

Beamanator reviewed Jun 22, 2023

View reviewed changes

narefyev91 approved these changes Jun 22, 2023

View reviewed changes

melvin-bot Bot mentioned this pull request Jun 22, 2023

Payment issue for E/App PR#20881 #21306

Closed

amyevans requested changes Jun 22, 2023

View reviewed changes

yuwenmemon added 2 commits June 22, 2023 14:36

Merge branch 'main' of github.com:Expensify/App into yuwen-loungeAcce…

ebec0eb

…ssPage

Improvements from PR review

2dcce6e

yuwenmemon force-pushed the yuwen-loungeAccessPage branch from 6036e52 to 2dcce6e Compare June 22, 2023 22:04

Move Lounge Access Page

b0c4b69

amyevans approved these changes Jun 22, 2023

View reviewed changes

amyevans merged commit 685c745 into main Jun 23, 2023

amyevans deleted the yuwen-loungeAccessPage branch June 23, 2023 15:51

OSBotify mentioned this pull request Jun 24, 2023

Deploy Checklist: New Expensify 2023-06-24 #21477

Closed

45 tasks

situchan mentioned this pull request Aug 29, 2023

[HOLD for payment 2023-08-28] [$1000] Web - Lounge access icon does not change color on hover #22766

Closed

6 tasks

	'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.',

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

Uh oh!

Conversation

yuwenmemon commented Jun 16, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests/QA

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jun 20, 2023

Uh oh!

yuwenmemon commented Jun 20, 2023

Uh oh!

mallenexpensify commented Jun 20, 2023

Uh oh!

yuwenmemon commented Jun 21, 2023

Uh oh!

yuwenmemon commented Jun 21, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yuwenmemon commented Jun 21, 2023

Uh oh!

amyevans commented Jun 21, 2023

Uh oh!

narefyev91 commented Jun 22, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

narefyev91 commented Jun 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

narefyev91 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Jun 22, 2023

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

yuwenmemon commented Jun 16, 2023 •

edited

Loading

narefyev91 commented Jun 22, 2023 •

edited

Loading

yuwenmemon commented Jun 23, 2023 •

edited

Loading