diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js --- a/native/account/logged-out-modal.react.js +++ b/native/account/logged-out-modal.react.js @@ -58,6 +58,7 @@ import { splashBackgroundURI } from './background-info'; import LogInPanel from './log-in-panel.react'; import type { LogInState } from './log-in-panel.react'; +import LoggedOutStaffInfo from './logged-out-staff-info.react'; import RegisterPanel from './register-panel.react'; import type { RegisterState } from './register-panel.react'; import SIWEPanel from './siwe-panel.react'; @@ -468,13 +469,9 @@ ); } - let staffUserHasBeenLoggedInIndicator = null; - if (this.props.staffCanSee && this.props.staffUserHasBeenLoggedIn) { - staffUserHasBeenLoggedInIndicator = ( - - STAFF HAS BEEN LOGGED IN - - ); + let loggedOutStaffInfoCard = null; + if (this.props.staffCanSee || this.props.staffUserHasBeenLoggedIn) { + loggedOutStaffInfoCard = ; } if (this.state.mode === 'siwe') { @@ -504,7 +501,7 @@ const opacityStyle = { opacity: this.buttonOpacity }; buttons = ( - {staffUserHasBeenLoggedInIndicator} + {loggedOutStaffInfoCard} {siweButton} ( + + ), + [colors.vibrantGreenButton], + ); + const crossIcon = React.useMemo( + () => ( + + ), + [colors.vibrantRedButton], + ); + + const isDevBuildStyle = React.useMemo(() => { + return [ + styles.infoText, + __DEV__ ? styles.infoTextTrue : styles.infoTextFalse, + ]; + }, [styles.infoText, styles.infoTextFalse, styles.infoTextTrue]); + + const isStaffReleaseStyle = React.useMemo(() => { + return [ + styles.infoText, + isStaffRelease ? styles.infoTextTrue : styles.infoTextFalse, + ]; + }, [styles.infoText, styles.infoTextFalse, styles.infoTextTrue]); + + const hasStaffUserLoggedInStyle = React.useMemo(() => { + return [ + styles.infoText, + staffUserHasBeenLoggedIn ? styles.infoTextTrue : styles.infoTextFalse, + ]; + }, [ + staffUserHasBeenLoggedIn, + styles.infoText, + styles.infoTextFalse, + styles.infoTextTrue, + ]); + + return ( + + + + {__DEV__ ? checkIcon : crossIcon} + __DEV__ + + + {isStaffRelease ? checkIcon : crossIcon} + isStaffRelease + + + {staffUserHasBeenLoggedIn ? checkIcon : crossIcon} + + staffUserHasBeenLoggedIn + + + + + ); +} + +const unboundStyles = { + cell: { + flexDirection: 'row', + alignItems: 'center', + }, + infoBadge: { + backgroundColor: 'codeBackground', + borderRadius: 6, + justifyContent: 'flex-start', + marginBottom: 10, + marginLeft: 40, + marginRight: 40, + marginTop: 10, + padding: 8, + }, + infoText: { + fontFamily: 'OpenSans-Semibold', + fontSize: 14, + lineHeight: 24, + paddingLeft: 4, + textAlign: 'left', + }, + infoTextFalse: { + color: 'vibrantRedButton', + }, + infoTextTrue: { + color: 'vibrantGreenButton', + }, +}; + +export default LoggedOutStaffInfo;