add SafeAreaView, fix styles

Emurgo · Jul 29, 2021 · 4fd8fa7 · 4fd8fa7
1 parent 14bed4d
commit 4fd8fa7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/components/Settings/RemoveWalletScreen.js b/src/components/Settings/RemoveWalletScreen.js
@@ -1,6 +1,7 @@
 // @flow
 
 import React from 'react'
+import {SafeAreaView} from 'react-native-safe-area-context'
 import {useSelector, useDispatch} from 'react-redux'
 import {View, ScrollView} from 'react-native'
 import {injectIntl, defineMessages, type IntlShape} from 'react-intl'
@@ -75,7 +76,7 @@ const RemoveWalletScreen = ({intl, navigation}: Props) => {
   const disabled = (!isHW && !hasMnemonicWrittenDown) || walletName !== typedWalletName
 
   return (
-    <View style={styles.container}>
+    <SafeAreaView edges={['left', 'right', 'bottom']} style={styles.container}>
       <StatusBar type={'dark'} />
 
       <ScrollView bounces={false} contentContainerStyle={styles.contentContainer}>
@@ -84,6 +85,8 @@ const RemoveWalletScreen = ({intl, navigation}: Props) => {
           <Text style={styles.description}>{intl.formatMessage(messages.descriptionParagraph2)}</Text>
         </View>
 
+        <Spacer height={32} />
+
         <View style={styles.walletInfo}>
           <Text style={styles.walletNameLabel}>{intl.formatMessage(messages.walletName)}</Text>
           <Spacer height={8} />
@@ -124,7 +127,7 @@ const RemoveWalletScreen = ({intl, navigation}: Props) => {
           disabled={disabled}
         />
       </View>
-    </View>
+    </SafeAreaView>
   )
 }
 

diff --git a/src/components/Settings/styles/RemoveWalletScreen.style.js b/src/components/Settings/styles/RemoveWalletScreen.style.js
@@ -19,9 +19,7 @@ const styles = StyleSheet.create({
     textAlign: 'center',
   },
 
-  walletInfo: {
-    flex: 1,
-  },
+  walletInfo: {},
   walletNameLabel: {
     fontSize: 16,
   },
@@ -31,9 +29,7 @@ const styles = StyleSheet.create({
   },
 
   contentContainer: {
-    paddingTop: 8,
     padding: 16,
-    flexGrow: 1,
   },
 
   actions: {