Build updates & remove testing items.

components/screen-main/screen-main.component.jsx

@@ -5,7 +5,7 @@ import { createStackNavigator } from "@react-navigation/stack";
 import i18n from "i18next";
 import React, { useEffect } from "react";
 import { Button } from "react-native-paper";
-import { SafeAreaView } from "react-native-safe-area-context";
+import { SafeAreaView } from "react-native";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.analytics";

components/screen-settings/screen-settings.component.jsx

@@ -1,8 +1,8 @@
 import Constants from "expo-constants";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { Button, View, Text } from "react-native";
-import { Title } from "react-native-paper";
+import { View, Text } from "react-native";
+import { Title, Button } from "react-native-paper";
 import { purgeStoredState } from "redux-persist";
 import SignOutButton from "../sign-out-button/sign-out-button.component";
 import * as Updates from "expo-updates";
@@ -25,7 +25,7 @@ export default function ScreenSettingsComponent() {
         })}
       </Title>
 
-      <Text>{Updates.releaseChannel}</Text>
+      <Text>Release Channel {Updates.releaseChannel}</Text>
       <SignOutButton />
       <Button title="Purge State" onPress={() => purgeStoredState()} />
     </View>

components/screen-sign-in/screen-sign-in.component.jsx

@@ -47,43 +47,52 @@ export function SignIn({ emailSignInStart, signingIn }) {
         <Image style={localStyles.logo} source={Logo} />
         <Title>{t("app.title")}</Title>
       </View>
-      <Formik initialValues={{ email: "", password: "" }} onSubmit={formSubmit}>
-        {({ handleChange, handleBlur, handleSubmit, values }) => (
-          <View>
-            <TextInput
-              label={t("signin.fields.email")}
-              mode="outlined"
-              autoCapitalize="none"
-              keyboardType="email-address"
-              onChangeText={handleChange("email")}
-              onBlur={handleBlur("email")}
-              value={values.email}
-              style={[localStyles.input]}
-            />
 
-            <TextInput
-              label={t("signin.fields.password")}
-              mode="outlined"
-              secureTextEntry={true}
-              onChangeText={handleChange("password")}
-              onBlur={handleBlur("password")}
-              value={values.password}
-              style={[localStyles.input]}
-            />
+      <View style={{ flex: 1 }}>
+        <Formik
+          initialValues={{ email: "", password: "" }}
+          onSubmit={formSubmit}
+        >
+          {({ handleChange, handleBlur, handleSubmit, values }) => (
+            <View>
+              <TextInput
+                label={t("signin.fields.email")}
+                mode="outlined"
+                autoCapitalize="none"
+                keyboardType="email-address"
+                onChangeText={handleChange("email")}
+                onBlur={handleBlur("email")}
+                value={values.email}
+                style={[localStyles.input]}
+              />
 
-            <SignInErrorAlertComponent />
-            <Button mode="outlined" loading={signingIn} onPress={handleSubmit}>
-              <Text>{t("signin.actions.signin")}</Text>
-            </Button>
-            <Text>
-              {t("settings.labels.version", {
-                number: Constants.manifest.version,
-              })}
-              {`${process.env.NODE_ENV || ""} ${Updates.releaseChannel || ""}`}
-            </Text>
-          </View>
-        )}
-      </Formik>
+              <TextInput
+                label={t("signin.fields.password")}
+                mode="outlined"
+                secureTextEntry={true}
+                onChangeText={handleChange("password")}
+                onBlur={handleBlur("password")}
+                value={values.password}
+                style={[localStyles.input]}
+              />
+
+              <SignInErrorAlertComponent />
+              <Button
+                mode="outlined"
+                loading={signingIn}
+                onPress={handleSubmit}
+              >
+                <Text>{t("signin.actions.signin")}</Text>
+              </Button>
+            </View>
+          )}
+        </Formik>
+      </View>
+      <Text style={{ padding: 10, alignSelf: "center" }}>
+        {t("settings.labels.version", {
+          number: Constants.manifest.version,
+        })}
+      </Text>
     </View>
   );
 }