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 @@ -1,10 +1,10 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome'; import _isEqual from 'lodash/fp/isEqual'; import * as React from 'react'; import { View, - StyleSheet, Text, TouchableOpacity, Image, @@ -15,7 +15,6 @@ } from 'react-native'; import Animated, { EasingNode } from 'react-native-reanimated'; import { SafeAreaView } from 'react-native-safe-area-context'; -import Icon from '@expo/vector-icons/FontAwesome'; import { useDispatch } from 'react-redux'; import { isLoggedIn } from 'lib/selectors/user-selectors'; @@ -41,6 +40,7 @@ derivedDimensionsInfoSelector, } from '../selectors/dimensions-selectors'; import { splashStyleSelector } from '../splash'; +import { useStyles } from '../themes/colors'; import type { EventSubscription, KeyboardEvent } from '../types/react-native'; import type { ImageStyle } from '../types/styles'; import { @@ -113,6 +113,7 @@ +loggedIn: boolean, +dimensions: DerivedDimensionsInfo, +splashStyle: ImageStyle, + +styles: typeof unboundStyles, // Redux dispatch functions +dispatch: Dispatch, ... @@ -450,18 +451,27 @@ }; render() { + const { styles } = this.props; + let panel = null; let buttons = null; let siweButton = null; if (__DEV__) { siweButton = ( - - SIWE - + <> + + SIWE + + + + or + + + ); } @@ -580,7 +590,7 @@ }; } -const styles = StyleSheet.create({ +const unboundStyles = { animationContainer: { flex: 1, }, @@ -635,7 +645,32 @@ right: 0, top: 0, }, -}); + siweOr: { + flex: 1, + flexDirection: 'row', + marginBottom: 18, + marginTop: 14, + }, + siweOrLeftHR: { + borderColor: 'logInSpacer', + borderTopWidth: 1, + flex: 1, + marginRight: 18, + marginTop: 10, + }, + siweOrRightHR: { + borderColor: 'logInSpacer', + borderTopWidth: 1, + flex: 1, + marginLeft: 18, + marginTop: 10, + }, + siweOrText: { + color: 'white', + fontSize: 17, + textAlign: 'center', + }, +}; const isForegroundSelector = createIsForegroundSelector( LoggedOutModalRouteName, @@ -656,6 +691,7 @@ const loggedIn = useSelector(isLoggedIn); const dimensions = useSelector(derivedDimensionsInfoSelector); const splashStyle = useSelector(splashStyleSelector); + const styles = useStyles(unboundStyles); const dispatch = useDispatch(); return ( @@ -669,6 +705,7 @@ loggedIn={loggedIn} dimensions={dimensions} splashStyle={splashStyle} + styles={styles} dispatch={dispatch} /> ); diff --git a/native/themes/colors.js b/native/themes/colors.js --- a/native/themes/colors.js +++ b/native/themes/colors.js @@ -83,6 +83,7 @@ vibrantGreenButton: '#00C853', vibrantRedButton: '#F53100', tooltipBackground: '#E0E0E0', + logInSpacer: '#FFFFFF33', }); export type Colors = $Exact; @@ -159,6 +160,7 @@ vibrantGreenButton: '#00C853', vibrantRedButton: '#F53100', tooltipBackground: '#1F1F1F', + logInSpacer: '#FFFFFF33', }); const colors = { light, dark };