Merge pull request #23061 from Expensify/Rory-WorkspacePage

Beamanator · web-flow · commit e945abb13750 · 2023-07-26T10:40:18.000+03:00
Implement animated WorkspacesListPage and LoungeAccessPage
diff --git a/assets/animations/ExpensifyLounge.json b/assets/animations/ExpensifyLounge.json
diff --git a/assets/animations/WorkspacePlanet.json b/assets/animations/WorkspacePlanet.json
diff --git a/src/CONST.js b/src/CONST.js
@@ -2542,9 +2542,6 @@ const CONST = {
         ADJUSTABLE: 'adjustable',
         IMAGE: 'image',
     },
-    SETTINGS_LOUNGE_ACCESS: {
-        HEADER_IMAGE_ASPECT_RATIO: 0.64,
-    },
     TRANSLATION_KEYS: {
         ATTACHMENT: 'common.attachment',
     },
diff --git a/src/SCREENS.js b/src/SCREENS.js
@@ -11,5 +11,6 @@ export default {
     TRANSITION_BETWEEN_APPS: 'TransitionBetweenApps',
     SETTINGS: {
         PREFERENCES: 'Settings_Preferences',
+        WORKSPACES: 'Settings_Workspaces',
     },
 };
diff --git a/src/components/Avatar.js b/src/components/Avatar.js
@@ -11,7 +11,7 @@ import * as Expensicons from './Icon/Expensicons';
 import Image from './Image';
 import styles from '../styles/styles';
 import * as ReportUtils from '../libs/ReportUtils';
-import useOnNetworkReconnect from '../hooks/useOnNetworkReconnect';
+import useNetwork from '../hooks/useNetwork';
 
 const propTypes = {
     /** Source for the avatar. Can be a URL or an icon. */
@@ -64,7 +64,7 @@ const defaultProps = {
 function Avatar(props) {
     const [imageError, setImageError] = useState(false);
 
-    useOnNetworkReconnect(() => setImageError(false));
+    useNetwork({onReconnect: () => setImageError(false)});
 
     if (!props.source) {
         return null;
diff --git a/src/components/FeatureList.js b/src/components/FeatureList.js
@@ -0,0 +1,53 @@
+import _ from 'underscore';
+import React from 'react';
+import {View} from 'react-native';
+import PropTypes from 'prop-types';
+import menuItemPropTypes from './menuItemPropTypes';
+import MenuItem from './MenuItem';
+import styles from '../styles/styles';
+import useLocalize from '../hooks/useLocalize';
+import Text from './Text';
+
+const propTypes = {
+    /** A list of menuItems representing the feature list. */
+    menuItems: PropTypes.arrayOf(PropTypes.shape({...menuItemPropTypes, translationKey: PropTypes.string})).isRequired,
+
+    /** A headline translation key to show above the feature list. */
+    headline: PropTypes.string.isRequired,
+
+    /** A description translation key to show below the headline and above the feature list. */
+    description: PropTypes.string.isRequired,
+};
+
+function FeatureList({menuItems, headline, description}) {
+    const {translate} = useLocalize();
+    return (
+        <>
+            <View style={[styles.w100, styles.ph5, styles.pb5]}>
+                <Text
+                    style={[styles.textHeadline, styles.preWrap, styles.mb2]}
+                    numberOfLines={2}
+                >
+                    {translate(headline)}
+                </Text>
+                <Text style={styles.baseFontStyle}>{translate(description)}</Text>
+            </View>
+            {_.map(menuItems, ({translationKey, icon}) => (
+                <MenuItem
+                    key={translationKey}
+                    title={translate(translationKey)}
+                    icon={icon}
+                    iconWidth={60}
+                    iconHeight={60}
+                    iconStyles={[styles.mr3, styles.ml3]}
+                    interactive={false}
+                />
+            ))}
+        </>
+    );
+}
+
+FeatureList.propTypes = propTypes;
+FeatureList.displayName = 'FeatureList';
+
+export default FeatureList;
diff --git a/src/components/IllustratedHeaderPageLayout.js b/src/components/IllustratedHeaderPageLayout.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import React from 'react';
 import PropTypes from 'prop-types';
 import {ScrollView, View} from 'react-native';
@@ -9,35 +10,45 @@ import styles from '../styles/styles';
 import themeColors from '../styles/themes/default';
 import * as StyleUtils from '../styles/StyleUtils';
 import useWindowDimensions from '../hooks/useWindowDimensions';
+import FixedFooter from './FixedFooter';
 
 const propTypes = {
     ...headerWithBackButtonPropTypes,
 
     /** Children to display in the lower half of the page (below the header section w/ an animation) */
     children: PropTypes.node.isRequired,
 
-    /** The background color to apply in the upper half of the screen. */
-    backgroundColor: PropTypes.string.isRequired,
-
     /** The illustration to display in the header. Can be either an SVG component or a JSON object representing a Lottie animation. */
     illustration: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).isRequired,
+
+    /** The background color to apply in the upper half of the screen. */
+    backgroundColor: PropTypes.string,
+
+    /** A fixed footer to display at the bottom of the page. */
+    footer: PropTypes.node,
+};
+
+const defaultProps = {
+    backgroundColor: themeColors.appBG,
+    footer: null,
 };
 
-function IllustratedHeaderPageLayout({backgroundColor, children, illustration, ...propsToPassToHeader}) {
+function IllustratedHeaderPageLayout({backgroundColor, children, illustration, footer, ...propsToPassToHeader}) {
     const {windowHeight} = useWindowDimensions();
     return (
         <ScreenWrapper
             style={[StyleUtils.getBackgroundColorStyle(backgroundColor)]}
             shouldEnablePickerAvoiding={false}
             includeSafeAreaPaddingBottom={false}
+            offlineIndicatorStyle={[StyleUtils.getBackgroundColorStyle(themeColors.appBG)]}
         >
             {({safeAreaPaddingBottomStyle}) => (
                 <>
                     <HeaderWithBackButton
                         // eslint-disable-next-line react/jsx-props-no-spreading
                         {...propsToPassToHeader}
-                        titleColor={themeColors.iconColorfulBackground}
-                        iconFill={themeColors.iconColorfulBackground}
+                        titleColor={backgroundColor === themeColors.appBG ? undefined : themeColors.textColorfulBackground}
+                        iconFill={backgroundColor === themeColors.appBG ? undefined : themeColors.iconColorfulBackground}
                     />
                     <View style={[styles.flex1, StyleUtils.getBackgroundColorStyle(themeColors.appBG)]}>
                         <ScrollView
@@ -55,6 +66,7 @@ function IllustratedHeaderPageLayout({backgroundColor, children, illustration, .
                             </View>
                             <View style={[styles.pt5]}>{children}</View>
                         </ScrollView>
+                        {!_.isNull(footer) && <FixedFooter>{footer}</FixedFooter>}
                     </View>
                 </>
             )}
@@ -63,6 +75,7 @@ function IllustratedHeaderPageLayout({backgroundColor, children, illustration, .
 }
 
 IllustratedHeaderPageLayout.propTypes = propTypes;
+IllustratedHeaderPageLayout.defaultProps = defaultProps;
 IllustratedHeaderPageLayout.displayName = 'IllustratedHeaderPageLayout';
 
 export default IllustratedHeaderPageLayout;
diff --git a/src/components/LottieAnimations.js b/src/components/LottieAnimations.js
@@ -1,6 +1,8 @@
+import ExpensifyLounge from '../../assets/animations/ExpensifyLounge.json';
 import Fireworks from '../../assets/animations/Fireworks.json';
 import Hands from '../../assets/animations/Hands.json';
 import PreferencesDJ from '../../assets/animations/PreferencesDJ.json';
 import ReviewingBankInfo from '../../assets/animations/ReviewingBankInfo.json';
+import WorkspacePlanet from '../../assets/animations/WorkspacePlanet.json';
 
-export {Fireworks, Hands, PreferencesDJ, ReviewingBankInfo};
+export {ExpensifyLounge, Fireworks, Hands, PreferencesDJ, ReviewingBankInfo, WorkspacePlanet};
diff --git a/src/components/MagicCodeInput.js b/src/components/MagicCodeInput.js
@@ -11,7 +11,7 @@ import TextInput from './TextInput';
 import FormHelpMessage from './FormHelpMessage';
 import {withNetwork} from './OnyxProvider';
 import networkPropTypes from './networkPropTypes';
-import useOnNetworkReconnect from '../hooks/useOnNetworkReconnect';
+import useNetwork from '../hooks/useNetwork';
 import * as Browser from '../libs/Browser';
 
 const propTypes = {
@@ -142,7 +142,7 @@ function MagicCodeInput(props) {
         props.onFulfill(props.value);
     };
 
-    useOnNetworkReconnect(validateAndSubmit);
+    useNetwork({onReconnect: validateAndSubmit});
 
     useEffect(() => {
         validateAndSubmit();
diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
@@ -18,17 +18,14 @@ import colors from '../styles/colors';
 import MultipleAvatars from './MultipleAvatars';
 import * as defaultWorkspaceAvatars from './Icon/WorkspaceDefaultAvatars';
 import PressableWithSecondaryInteraction from './PressableWithSecondaryInteraction';
-import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
 import * as DeviceCapabilities from '../libs/DeviceCapabilities';
 import ControlSelection from '../libs/ControlSelection';
 import variables from '../styles/variables';
 import * as Session from '../libs/actions/Session';
 import Hoverable from './Hoverable';
+import useWindowDimensions from '../hooks/useWindowDimensions';
 
-const propTypes = {
-    ...menuItemPropTypes,
-    ...windowDimensionsPropTypes,
-};
+const propTypes = menuItemPropTypes;
 
 const defaultProps = {
     badgeText: undefined,
@@ -76,7 +73,9 @@ const defaultProps = {
     shouldGreyOutWhenDisabled: true,
 };
 
-function MenuItem(props) {
+const MenuItem = React.forwardRef((props, ref) => {
+    const {isSmallScreenWidth} = useWindowDimensions();
+
     const isDeleted = _.contains(props.style, styles.offlineFeedback.deleted);
     const descriptionVerticalMargin = props.shouldShowDescriptionOnTop ? styles.mb1 : styles.mt1;
     const titleTextStyle = StyleUtils.combineStyles(
@@ -118,7 +117,7 @@ function MenuItem(props) {
 
                         props.onPress(e);
                     }, props.isAnonymousAction)}
-                    onPressIn={() => props.shouldBlockSelection && props.isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
+                    onPressIn={() => props.shouldBlockSelection && isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
                     onPressOut={ControlSelection.unblock}
                     onSecondaryInteraction={props.onSecondaryInteraction}
                     style={({pressed}) => [
@@ -130,7 +129,7 @@ function MenuItem(props) {
                         props.shouldGreyOutWhenDisabled && props.disabled && styles.buttonOpacityDisabled,
                     ]}
                     disabled={props.disabled}
-                    ref={props.forwardedRef}
+                    ref={ref}
                     accessibilityRole={CONST.ACCESSIBILITY_ROLE.MENUITEM}
                     accessibilityLabel={props.title}
                 >
@@ -301,20 +300,10 @@ function MenuItem(props) {
             )}
         </Hoverable>
     );
-}
+});
 
 MenuItem.propTypes = propTypes;
+MenuItem.defaultProps = defaultProps;
 MenuItem.displayName = 'MenuItem';
 
-const MenuItemWithWindowDimensions = withWindowDimensions(
-    React.forwardRef((props, ref) => (
-        <MenuItem
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            forwardedRef={ref}
-        />
-    )),
-);
-MenuItemWithWindowDimensions.defaultProps = defaultProps;
-
-export default MenuItemWithWindowDimensions;
+export default MenuItem;
diff --git a/src/components/MenuItemWithTopDescription.js b/src/components/MenuItemWithTopDescription.js
@@ -2,9 +2,7 @@ import React from 'react';
 import menuItemPropTypes from './menuItemPropTypes';
 import MenuItem from './MenuItem';
 
-const propTypes = {
-    ...menuItemPropTypes,
-};
+const propTypes = menuItemPropTypes;
 
 function MenuItemWithTopDescription(props) {
     return (
diff --git a/src/components/ScreenWrapper/index.js b/src/components/ScreenWrapper/index.js
@@ -122,7 +122,7 @@ class ScreenWrapper extends React.Component {
                                               })
                                             : this.props.children
                                     }
-                                    {this.props.isSmallScreenWidth && this.props.shouldShowOfflineIndicator && <OfflineIndicator />}
+                                    {this.props.isSmallScreenWidth && this.props.shouldShowOfflineIndicator && <OfflineIndicator style={this.props.offlineIndicatorStyle} />}
                                 </PickerAvoidingView>
                             </KeyboardAvoidingView>
                         </View>
diff --git a/src/components/ScreenWrapper/propTypes.js b/src/components/ScreenWrapper/propTypes.js
@@ -1,4 +1,5 @@
 import PropTypes from 'prop-types';
+import stylePropTypes from '../../styles/stylePropTypes';
 import {windowDimensionsPropTypes} from '../withWindowDimensions';
 import {environmentPropTypes} from '../withEnvironment';
 
@@ -41,6 +42,9 @@ const propTypes = {
 
     /** Whether to show offline indicator */
     shouldShowOfflineIndicator: PropTypes.bool,
+
+    /** Styles for the offline indicator */
+    offlineIndicatorStyle: stylePropTypes,
 };
 
 const defaultProps = {
@@ -54,6 +58,7 @@ const defaultProps = {
     shouldEnableMaxHeight: false,
     shouldEnablePickerAvoiding: true,
     shouldShowOfflineIndicator: true,
+    offlineIndicatorStyle: [],
 };
 
 export {propTypes, defaultProps};
diff --git a/src/hooks/useNetwork.js b/src/hooks/useNetwork.js
@@ -2,11 +2,13 @@ import {useRef, useContext, useEffect} from 'react';
 import {NetworkContext} from '../components/OnyxProvider';
 
 /**
- * @param {Function} onNetworkReconnect
+ * @param {Object} [options]
+ * @param {Function} [options.onReconnect]
+ * @returns {Object}
  */
-export default function useOnNetworkReconnect(onNetworkReconnect) {
-    const callback = useRef(onNetworkReconnect);
-    callback.current = onNetworkReconnect;
+export default function useNetwork({onReconnect = () => {}} = {}) {
+    const callback = useRef(onReconnect);
+    callback.current = onReconnect;
 
     const {isOffline} = useContext(NetworkContext);
     const prevOfflineStatusRef = useRef(isOffline);
@@ -24,4 +26,6 @@ export default function useOnNetworkReconnect(onNetworkReconnect) {
         // Used to store previous prop values to compare on next render
         prevOfflineStatusRef.current = isOffline;
     }, [isOffline]);
+
+    return {isOffline};
 }
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -1130,6 +1130,11 @@ export default {
         emptyWorkspace: {
             title: 'Create a new workspace',
             subtitle: "Workspaces are where you'll chat with your team, reimburse expenses, issue cards, send invoices, pay bills, and more — all in one place.",
+            features: {
+                trackAndCollect: 'Track and collect receipts',
+                companyCards: 'Company credit cards',
+                reimbursements: 'Easy reimbursements',
+            },
         },
         new: {
             newWorkspace: 'New workspace',
diff --git a/src/languages/es.js b/src/languages/es.js
@@ -1139,6 +1139,11 @@ export default {
         emptyWorkspace: {
             title: 'Crear un nuevo espacio de trabajo',
             subtitle: 'En los espacios de trabajo es donde puedes chatear con tu equipo, reembolsar gastos, emitir tarjetas, enviar y pagar facturas y mas — todo en un mismo lugar',
+            features: {
+                trackAndCollect: 'Organiza recibos',
+                companyCards: 'Tarjetas de crédito corporativas',
+                reimbursements: 'Reembolsos fáciles',
+            },
         },
         new: {
             newWorkspace: 'Nuevo espacio de trabajo',
@@ -1467,7 +1472,7 @@ export default {
         expenseManagement: 'Gestión de Gastos',
         spendManagement: 'Control de Gastos',
         expenseReports: 'Informes de Gastos',
-        companyCreditCard: 'Tarjeta de Crédito de Empresa',
+        companyCreditCard: 'Tarjeta de Crédito Corporativa',
         receiptScanningApp: 'Aplicación de Escaneado de Recibos',
         billPay: 'Pago de Facturas',
         invoicing: 'Facturación',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
@@ -316,7 +316,7 @@ const SettingsModalStackNavigator = createModalStackNavigator([
             const SettingsWorkspacesPage = require('../../../pages/workspace/WorkspacesListPage').default;
             return SettingsWorkspacesPage;
         },
-        name: 'Settings_Workspaces',
+        name: SCREENS.SETTINGS.WORKSPACES,
     },
     {
         getComponent: () => {
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
@@ -38,7 +38,7 @@ export default {
                             Settings_Root: {
                                 path: ROUTES.SETTINGS,
                             },
-                            Settings_Workspaces: {
+                            [SCREENS.SETTINGS.WORKSPACES]: {
                                 path: ROUTES.SETTINGS_WORKSPACES,
                                 exact: true,
                             },
diff --git a/src/pages/settings/Profile/LoungeAccessPage.js b/src/pages/settings/Profile/LoungeAccessPage.js
diff --git a/src/pages/workspace/WorkspacePageWithSections.js b/src/pages/workspace/WorkspacePageWithSections.js
diff --git a/src/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js
diff --git a/src/styles/styles.js b/src/styles/styles.js
diff --git a/src/styles/themes/default.js b/src/styles/themes/default.js
