diff --git a/native/account/registration/connect-ethereum.react.js b/native/account/registration/connect-ethereum.react.js
--- a/native/account/registration/connect-ethereum.react.js
+++ b/native/account/registration/connect-ethereum.react.js
@@ -5,6 +5,7 @@
import RegistrationButtonContainer from './registration-button-container.react.js';
import RegistrationButton from './registration-button.react.js';
+import RegistrationContainer from './registration-container.react.js';
import RegistrationContentContainer from './registration-content-container.react.js';
import type { RegistrationNavigationProp } from './registration-navigator.react.js';
import type { CoolOrNerdMode } from './registration-types.js';
@@ -108,39 +109,36 @@
const onSkip = React.useCallback(() => {}, []);
return (
-
-
-
- Do you want to connect an Ethereum Wallet to your account?
-
- {body}
-
-
-
-
-
-
-
-
+ <>
+
+
+
+ Do you want to connect an Ethereum Wallet to your account?
+
+ {body}
+
+
+
+
+
+
+
+
+
{siwePanel}
-
+ >
);
}
const unboundStyles = {
- container: {
- backgroundColor: 'panelBackground',
- justifyContent: 'space-between',
- flex: 1,
- },
scrollViewContentContainer: {
flexGrow: 1,
},
diff --git a/native/account/registration/cool-or-nerd-mode-selection.react.js b/native/account/registration/cool-or-nerd-mode-selection.react.js
--- a/native/account/registration/cool-or-nerd-mode-selection.react.js
+++ b/native/account/registration/cool-or-nerd-mode-selection.react.js
@@ -2,10 +2,11 @@
import invariant from 'invariant';
import * as React from 'react';
-import { Text, View } from 'react-native';
+import { Text } from 'react-native';
import RegistrationButtonContainer from './registration-button-container.react.js';
import RegistrationButton from './registration-button.react.js';
+import RegistrationContainer from './registration-container.react.js';
import RegistrationContentContainer from './registration-content-container.react.js';
import type { RegistrationNavigationProp } from './registration-navigator.react.js';
import {
@@ -48,7 +49,7 @@
const buttonState = currentSelection ? 'enabled' : 'disabled';
const styles = useStyles(unboundStyles);
return (
-
+
To begin, choose your fighter
@@ -92,16 +93,11 @@
variant={buttonState}
/>
-
+
);
}
const unboundStyles = {
- container: {
- backgroundColor: 'panelBackground',
- justifyContent: 'space-between',
- flex: 1,
- },
header: {
fontSize: 24,
color: 'panelForegroundLabel',
diff --git a/native/account/registration/keyserver-selection.react.js b/native/account/registration/keyserver-selection.react.js
--- a/native/account/registration/keyserver-selection.react.js
+++ b/native/account/registration/keyserver-selection.react.js
@@ -2,10 +2,11 @@
import invariant from 'invariant';
import * as React from 'react';
-import { Text, TextInput, View } from 'react-native';
+import { Text, TextInput } from 'react-native';
import RegistrationButtonContainer from './registration-button-container.react.js';
import RegistrationButton from './registration-button.react.js';
+import RegistrationContainer from './registration-container.react.js';
import RegistrationContentContainer from './registration-content-container.react.js';
import type { RegistrationNavigationProp } from './registration-navigator.react.js';
import {
@@ -78,7 +79,7 @@
const styles = useStyles(unboundStyles);
const colors = useColors();
return (
-
+
Select a keyserver to join
@@ -132,16 +133,11 @@
variant={buttonState}
/>
-
+
);
}
const unboundStyles = {
- container: {
- backgroundColor: 'panelBackground',
- justifyContent: 'space-between',
- flex: 1,
- },
header: {
fontSize: 24,
color: 'panelForegroundLabel',
diff --git a/native/account/registration/registration-container.react.js b/native/account/registration/registration-container.react.js
new file mode 100644
--- /dev/null
+++ b/native/account/registration/registration-container.react.js
@@ -0,0 +1,36 @@
+// @flow
+
+import * as React from 'react';
+import { SafeAreaView } from 'react-native-safe-area-context';
+
+import { useStyles } from '../../themes/colors.js';
+import type { ViewStyle } from '../../types/styles.js';
+
+const safeAreaEdges = ['bottom'];
+
+type Props = {
+ +children: React.Node,
+ +style?: ViewStyle,
+};
+function RegistrationContainer(props: Props): React.Node {
+ const styles = useStyles(unboundStyles);
+ const style = React.useMemo(
+ () => [styles.container, props.style],
+ [styles.container, props.style],
+ );
+ return (
+
+ {props.children}
+
+ );
+}
+
+const unboundStyles = {
+ container: {
+ flex: 1,
+ backgroundColor: 'panelBackground',
+ justifyContent: 'space-between',
+ },
+};
+
+export default RegistrationContainer;
diff --git a/native/account/registration/registration-navigator.react.js b/native/account/registration/registration-navigator.react.js
--- a/native/account/registration/registration-navigator.react.js
+++ b/native/account/registration/registration-navigator.react.js
@@ -6,7 +6,6 @@
type StackNavigationHelpers,
} from '@react-navigation/stack';
import * as React from 'react';
-import { SafeAreaView } from 'react-native-safe-area-context';
import ConnectEthereum from './connect-ethereum.react.js';
import CoolOrNerdModeSelection from './cool-or-nerd-mode-selection.react.js';
@@ -19,9 +18,6 @@
type ScreenParamList,
type RegistrationParamList,
} from '../../navigation/route-names.js';
-import { useStyles } from '../../themes/colors.js';
-
-const safeAreaEdges = ['bottom'];
export type RegistrationNavigationProp<
RouteName: $Keys = $Keys,
@@ -49,32 +45,22 @@
};
// eslint-disable-next-line no-unused-vars
function RegistrationNavigator(props: Props): React.Node {
- const styles = useStyles(unboundStyles);
return (
-
-
-
-
-
-
-
+
+
+
+
+
);
}
-const unboundStyles = {
- container: {
- flex: 1,
- backgroundColor: 'panelBackground',
- },
-};
-
export default RegistrationNavigator;