diff --git a/src/core/Core.tsx b/src/core/Core.tsx
index 95a488954..b9a705325 100644
--- a/src/core/Core.tsx
+++ b/src/core/Core.tsx
@@ -107,7 +107,7 @@ export const Core = () => {
// handles the top color behind the clock
const styles = StyleSheet.create({
- top: { backgroundColor: topColor, paddingTop: insets.top },
+ top: { backgroundColor: topColor, paddingTop: insets.top, flex: 1 },
body: {
backgroundColor: topColor,
},
diff --git a/src/navigation/rootNavigator/index.tsx b/src/navigation/rootNavigator/index.tsx
index e7365da1c..987bbe2f9 100644
--- a/src/navigation/rootNavigator/index.tsx
+++ b/src/navigation/rootNavigator/index.tsx
@@ -331,9 +331,7 @@ export const RootNavigationComponent = ({
options={sharedOptions}
/>
- {appIsSetup && !isKeyboardVisible && (
-
- )}
+ {appIsSetup && }
& CreateProfileScreenProps
-> = ({ route, profile, setProfile, storeProfile, eraseProfile }) => {
- const navigation = route.params.navigation
+> = ({
+ route,
+ navigation,
+ profile,
+ setProfile,
+ storeProfile,
+ eraseProfile,
+}) => {
const editProfile = route.params.editProfile
const [localProfile, setLocalProfile] = useState(profile)
const fullAlias = `${profile.alias}.rsk`
@@ -47,102 +61,111 @@ export const ProfileCreateScreen: React.FC<
}, [])
return (
- <>
-
- navigation.navigate('Home')}>
-
-
-
-
-
- {editProfile ? 'edit profile' : 'create profile'}
-
- {editProfile && (
-
-
+
+
+
+ navigation.goBack()}>
+
+
+
- )}
-
-
-
- {profile.alias ? (
-
- ) : (
-
- )}
-
-
-
- alias
+
+ {editProfile ? 'edit profile' : 'create profile'}
+ {editProfile && (
+
+
+
+ )}
- {!profile?.alias && (
- <>
-
- navigation.navigate('SearchDomain')}
- accessibilityLabel="register new"
- title={'register new'}
+
+
+ {profile.alias ? (
+
+ ) : (
+
-
- >
- )}
-
- {!!profile?.alias && (
-
-
-
-
- {profile?.alias}
-
+ )}
+
+
+
+ alias
+
+
+ {!profile?.alias && (
+ <>
+
+ navigation.navigate('SearchDomain')}
+ accessibilityLabel="register new"
+ title={'register new'}
+ />
-
- setProfile({ ...profile, alias: '' })}>
-
-
+ >
+ )}
+
+ {!!profile?.alias && (
+
+
+
+
+ {profile?.alias}
+
+
+
+ setProfile({ ...profile, alias: '' })}>
+
+
+
-
- )}
+ )}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
- >
+
+
)
}
const styles = StyleSheet.create({
- container: {
+ screen: {
+ flex: 1,
+ backgroundColor: colors.background.darkBlue,
+ },
+ bodyContainer: {
flex: 1,
backgroundColor: colors.background.darkBlue,
paddingTop: 10,