From ff532b8a11fabdd3087c3c74b733b61aebdb9aa6 Mon Sep 17 00:00:00 2001 From: Rocio Perez-Cano Date: Thu, 26 Oct 2023 20:37:09 -0400 Subject: [PATCH 1/7] Redo lounge access page --- src/languages/en.ts | 5 ----- .../settings/Profile/LoungeAccessPage.js | 22 ++----------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index d5bbe0e336d87..6f6c82b483bb2 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -638,11 +638,6 @@ export default { }, loungeAccessPage: { loungeAccess: 'Lounge access', - headline: 'You qualify for access to our exclusive lounges.', - description: 'The Expensify Lounge is where a "high-end airport lounge" meets a vibrant "co-working space" optimized for like-minded individuals.', - coffeePromo: 'Great coffee and cocktails', - networkingPromo: 'Network with other members', - viewsPromo: 'Incredible views of San Francisco', }, pronounsPage: { pronouns: 'Pronouns', diff --git a/src/pages/settings/Profile/LoungeAccessPage.js b/src/pages/settings/Profile/LoungeAccessPage.js index 81d63592211b7..118fee2620188 100644 --- a/src/pages/settings/Profile/LoungeAccessPage.js +++ b/src/pages/settings/Profile/LoungeAccessPage.js @@ -42,21 +42,6 @@ const defaultProps = { ...withCurrentUserPersonalDetailsDefaultProps, }; -const menuItems = [ - { - translationKey: 'loungeAccessPage.coffeePromo', - icon: Illustrations.CoffeeMug, - }, - { - translationKey: 'loungeAccessPage.networkingPromo', - icon: Illustrations.ChatBubbles, - }, - { - translationKey: 'loungeAccessPage.viewsPromo', - icon: Illustrations.SanFrancisco, - }, -]; - function LoungeAccessPage(props) { const {translate} = useLocalize(); @@ -99,11 +84,8 @@ function LoungeAccessPage(props) { illustration={LottieAnimations.ExpensifyLounge} overlayContent={overlayContent} > - + {props.translate()} + {props.translate()} ); } From e303be2bf849c2ad8f7d6691948774571014aacd Mon Sep 17 00:00:00 2001 From: Rocio Perez-Cano Date: Thu, 26 Oct 2023 20:42:50 -0400 Subject: [PATCH 2/7] Add copy --- src/languages/en.ts | 2 ++ src/languages/es.ts | 8 ++------ src/pages/settings/Profile/LoungeAccessPage.js | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 6f6c82b483bb2..dddb2f019b098 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -638,6 +638,8 @@ export default { }, loungeAccessPage: { loungeAccess: 'Lounge access', + headline: 'The Expensify Lounge is closed', + description: "The Expensify Lounge in San Francisco is closed for the time being, but we'll update this page when it reopens!", }, pronounsPage: { pronouns: 'Pronouns', diff --git a/src/languages/es.ts b/src/languages/es.ts index 6d735b645e1db..c09a41a1b63b0 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -632,12 +632,8 @@ export default { }, loungeAccessPage: { loungeAccess: 'Acceso a la sala vip', - 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.', - coffeePromo: 'Buen café y buenos cócteles', - networkingPromo: 'Conecta con otros miembros', - viewsPromo: 'Increíbles vistas de San Francisco', + headline: 'La sala vip de Expensify está cerrada.', + description: 'La sala vip de Expensify está actualmente cerrada, pero actualizaremos esta página cuando vuelva a abrir.', }, pronounsPage: { pronouns: 'Pronombres', diff --git a/src/pages/settings/Profile/LoungeAccessPage.js b/src/pages/settings/Profile/LoungeAccessPage.js index 118fee2620188..63f9c0ad03666 100644 --- a/src/pages/settings/Profile/LoungeAccessPage.js +++ b/src/pages/settings/Profile/LoungeAccessPage.js @@ -4,12 +4,10 @@ import {withOnyx} from 'react-native-onyx'; import PropTypes from 'prop-types'; import Navigation from '../../../libs/Navigation/Navigation'; import ROUTES from '../../../ROUTES'; -import * as Illustrations from '../../../components/Icon/Illustrations'; import ONYXKEYS from '../../../ONYXKEYS'; import userPropTypes from '../userPropTypes'; import NotFoundPage from '../../ErrorPage/NotFoundPage'; import useLocalize from '../../../hooks/useLocalize'; -import FeatureList from '../../../components/FeatureList'; import IllustratedHeaderPageLayout from '../../../components/IllustratedHeaderPageLayout'; import * as LottieAnimations from '../../../components/LottieAnimations'; import compose from '../../../libs/compose'; From addd581116112bc85692c64c956d98c867e41be6 Mon Sep 17 00:00:00 2001 From: Rocio Perez-Cano Date: Thu, 26 Oct 2023 20:56:42 -0400 Subject: [PATCH 3/7] Remove avatar and emails --- src/languages/en.ts | 2 +- .../settings/Profile/LoungeAccessPage.js | 27 +++---------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index dddb2f019b098..db13570b87a1f 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -638,7 +638,7 @@ export default { }, loungeAccessPage: { loungeAccess: 'Lounge access', - headline: 'The Expensify Lounge is closed', + headline: 'The Expensify Lounge is closed.', description: "The Expensify Lounge in San Francisco is closed for the time being, but we'll update this page when it reopens!", }, pronounsPage: { diff --git a/src/pages/settings/Profile/LoungeAccessPage.js b/src/pages/settings/Profile/LoungeAccessPage.js index 63f9c0ad03666..3472bef134a53 100644 --- a/src/pages/settings/Profile/LoungeAccessPage.js +++ b/src/pages/settings/Profile/LoungeAccessPage.js @@ -51,28 +51,7 @@ function LoungeAccessPage(props) { - - - - {props.currentUserPersonalDetails.displayName ? props.currentUserPersonalDetails.displayName : LocalePhoneNumber.formatPhoneNumber(props.session.email)} - - - {LocalePhoneNumber.formatPhoneNumber(props.session.email)} - - - + /> ); return ( @@ -82,8 +61,8 @@ function LoungeAccessPage(props) { illustration={LottieAnimations.ExpensifyLounge} overlayContent={overlayContent} > - {props.translate()} - {props.translate()} + {translate('loungeAccessPage.headline')} + {translate('loungeAccessPage.description')} ); } From 8515ba63ff2f17c5fcae87bf423cb25222c0c577 Mon Sep 17 00:00:00 2001 From: Rocio Perez-Cano Date: Thu, 26 Oct 2023 21:03:45 -0400 Subject: [PATCH 4/7] Styles --- .../settings/Profile/LoungeAccessPage.js | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/pages/settings/Profile/LoungeAccessPage.js b/src/pages/settings/Profile/LoungeAccessPage.js index 3472bef134a53..9dc7b32730562 100644 --- a/src/pages/settings/Profile/LoungeAccessPage.js +++ b/src/pages/settings/Profile/LoungeAccessPage.js @@ -1,7 +1,5 @@ import React from 'react'; -import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; -import PropTypes from 'prop-types'; import Navigation from '../../../libs/Navigation/Navigation'; import ROUTES from '../../../ROUTES'; import ONYXKEYS from '../../../ONYXKEYS'; @@ -14,20 +12,10 @@ import compose from '../../../libs/compose'; import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../../../components/withCurrentUserPersonalDetails'; import LinearGradient from '../../../components/LinearGradient'; import styles from '../../../styles/styles'; -import Avatar from '../../../components/Avatar'; import Text from '../../../components/Text'; -import * as UserUtils from '../../../libs/UserUtils'; -import CONST from '../../../CONST'; import themeColors from '../../../styles/themes/default'; -import * as LocalePhoneNumber from '../../../libs/LocalePhoneNumber'; const propTypes = { - /** The session of the logged in person */ - session: PropTypes.shape({ - /** Email of the logged in person */ - email: PropTypes.string, - }), - /** Current user details, which will hold whether or not they have Lounge Access */ user: userPropTypes, @@ -35,7 +23,6 @@ const propTypes = { }; const defaultProps = { - session: {}, user: {}, ...withCurrentUserPersonalDetailsDefaultProps, }; @@ -61,8 +48,8 @@ function LoungeAccessPage(props) { illustration={LottieAnimations.ExpensifyLounge} overlayContent={overlayContent} > - {translate('loungeAccessPage.headline')} - {translate('loungeAccessPage.description')} + {translate('loungeAccessPage.headline')} + {translate('loungeAccessPage.description')} ); } @@ -74,9 +61,6 @@ LoungeAccessPage.displayName = 'LoungeAccessPage'; export default compose( withCurrentUserPersonalDetails, withOnyx({ - session: { - key: ONYXKEYS.SESSION, - }, user: { key: ONYXKEYS.USER, }, From 7a7ddfd32432e1ad202f74f8e6641de104424d51 Mon Sep 17 00:00:00 2001 From: Rocio Perez-Cano Date: Thu, 26 Oct 2023 21:10:16 -0400 Subject: [PATCH 5/7] Prettier --- src/pages/settings/Profile/LoungeAccessPage.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/Profile/LoungeAccessPage.js b/src/pages/settings/Profile/LoungeAccessPage.js index 9dc7b32730562..6f2fcb0e19838 100644 --- a/src/pages/settings/Profile/LoungeAccessPage.js +++ b/src/pages/settings/Profile/LoungeAccessPage.js @@ -38,7 +38,7 @@ function LoungeAccessPage(props) { + /> ); return ( @@ -48,7 +48,12 @@ function LoungeAccessPage(props) { illustration={LottieAnimations.ExpensifyLounge} overlayContent={overlayContent} > - {translate('loungeAccessPage.headline')} + + {translate('loungeAccessPage.headline')} + {translate('loungeAccessPage.description')} ); From e434be36a1a4fc433c2219ff032a233d7d64fb5a Mon Sep 17 00:00:00 2001 From: Rocio Perez-Cano Date: Fri, 27 Oct 2023 10:37:39 -0400 Subject: [PATCH 6/7] Remove gradient --- src/pages/settings/Profile/LoungeAccessPage.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/pages/settings/Profile/LoungeAccessPage.js b/src/pages/settings/Profile/LoungeAccessPage.js index 6f2fcb0e19838..627c09a2fe2db 100644 --- a/src/pages/settings/Profile/LoungeAccessPage.js +++ b/src/pages/settings/Profile/LoungeAccessPage.js @@ -10,10 +10,8 @@ import IllustratedHeaderPageLayout from '../../../components/IllustratedHeaderPa import * as LottieAnimations from '../../../components/LottieAnimations'; import compose from '../../../libs/compose'; import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../../../components/withCurrentUserPersonalDetails'; -import LinearGradient from '../../../components/LinearGradient'; import styles from '../../../styles/styles'; import Text from '../../../components/Text'; -import themeColors from '../../../styles/themes/default'; const propTypes = { /** Current user details, which will hold whether or not they have Lounge Access */ @@ -34,19 +32,11 @@ function LoungeAccessPage(props) { return ; } - const overlayContent = () => ( - - ); - return ( Navigation.goBack(ROUTES.SETTINGS)} illustration={LottieAnimations.ExpensifyLounge} - overlayContent={overlayContent} > Date: Mon, 30 Oct 2023 16:19:23 -0400 Subject: [PATCH 7/7] Prettier --- src/pages/settings/Profile/LoungeAccessPage.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/settings/Profile/LoungeAccessPage.js b/src/pages/settings/Profile/LoungeAccessPage.js index 428d110873a58..2be8d2c8b18a3 100644 --- a/src/pages/settings/Profile/LoungeAccessPage.js +++ b/src/pages/settings/Profile/LoungeAccessPage.js @@ -1,17 +1,17 @@ import React from 'react'; import {withOnyx} from 'react-native-onyx'; -import Navigation from '@libs/Navigation/Navigation'; -import ONYXKEYS from '@src/ONYXKEYS'; -import ROUTES from '@src/ROUTES'; -import userPropTypes from '@pages/settings/userPropTypes'; -import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; -import useLocalize from '@hooks/useLocalize'; import IllustratedHeaderPageLayout from '@components/IllustratedHeaderPageLayout'; import * as LottieAnimations from '@components/LottieAnimations'; -import compose from '@libs/compose'; +import Text from '@components/Text'; import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '@components/withCurrentUserPersonalDetails'; +import useLocalize from '@hooks/useLocalize'; +import compose from '@libs/compose'; +import Navigation from '@libs/Navigation/Navigation'; +import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; +import userPropTypes from '@pages/settings/userPropTypes'; import styles from '@styles/styles'; -import Text from '@components/Text'; +import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; const propTypes = { /** Current user details, which will hold whether or not they have Lounge Access */