Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions app/views/LoginSignupView.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ const styles = StyleSheet.create({
paddingVertical: 30
},
safeArea: {
paddingBottom: 30
paddingBottom: 30,
flex: 1
},
serviceButton: {
borderRadius: 2,
Expand Down Expand Up @@ -421,18 +422,22 @@ class LoginSignupView extends React.Component {
render() {
const { theme } = this.props;
return (
<ScrollView
style={[
sharedStyles.containerScrollView,
sharedStyles.container,
styles.container,
{ backgroundColor: themes[theme].backgroundColor },
isTablet && sharedStyles.tabletScreenContent
]}
{...scrollPersistTaps}
<SafeAreaView
testID='welcome-view'
forceInset={{ vertical: 'never' }}
style={[styles.safeArea, { backgroundColor: themes[theme].backgroundColor }]}
>
<StatusBar theme={theme} />
<SafeAreaView testID='welcome-view' forceInset={{ vertical: 'never' }} style={styles.safeArea}>
<ScrollView
style={[
sharedStyles.containerScrollView,
sharedStyles.container,
styles.container,
{ backgroundColor: themes[theme].backgroundColor },
isTablet && sharedStyles.tabletScreenContent
]}
{...scrollPersistTaps}
>
<StatusBar theme={theme} />
{this.renderServices()}
{this.renderServicesSeparator()}
<Button
Expand All @@ -449,8 +454,8 @@ class LoginSignupView extends React.Component {
theme={theme}
testID='welcome-view-register'
/>
</SafeAreaView>
</ScrollView>
</ScrollView>
</SafeAreaView>
);
}
}
Expand Down