From 451950883ae089797827d1d0d2ffe07c99163b60 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 12 May 2022 13:34:54 -0700
Subject: [PATCH] Build updates & remove testing items.

---
 app.json                                      |  6 +-
 .../screen-main/screen-main.component.jsx     |  2 +-
 .../screen-settings.component.jsx             |  6 +-
 .../screen-sign-in.component.jsx              | 79 +++++++++++--------
 eas.json                                      | 12 +--
 package.json                                  |  6 +-
 redux/user/user.sagas.js                      |  9 +--
 7 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/app.json b/app.json
index 00e938d..a2f626e 100644
--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "ImEX Mobile",
     "slug": "imexmobile",
-    "version": "1.3.3",
+    "version": "1.3.5",
     "extra": {
       "expover": "1"
     },
@@ -11,12 +11,12 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "com.imex.imexmobile",
-      "buildNumber": "1.3.3",
+      "buildNumber": "1",
       "googleServicesFile": "./GoogleService-Info.plist"
     },
     "android": {
       "package": "com.imex.imexmobile",
-      "versionCode": 1030300,
+      "versionCode": 1100001,
       "googleServicesFile": "./google-services.json"
     },
     "splash": {
diff --git a/components/screen-main/screen-main.component.jsx b/components/screen-main/screen-main.component.jsx
index 3d524ad..0641953 100644
--- a/components/screen-main/screen-main.component.jsx
+++ b/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";
diff --git a/components/screen-settings/screen-settings.component.jsx b/components/screen-settings/screen-settings.component.jsx
index 32ce074..b9d55b9 100644
--- a/components/screen-settings/screen-settings.component.jsx
+++ b/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>
diff --git a/components/screen-sign-in/screen-sign-in.component.jsx b/components/screen-sign-in/screen-sign-in.component.jsx
index 4234b3a..57ce1c9 100644
--- a/components/screen-sign-in/screen-sign-in.component.jsx
+++ b/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>
   );
 }
diff --git a/eas.json b/eas.json
index 50821b5..3ad2a22 100644
--- a/eas.json
+++ b/eas.json
@@ -3,14 +3,14 @@
     "version": ">= 0.52.0"
   },
   "build": {
-    "development": {
+    "test": {
       "developmentClient": true,
-      "distribution": "internal"
+      "distribution": "internal",
+      "releaseChannel": "test"
     },
-    "preview": {
-      "distribution": "internal"
-    },
-    "production": {}
+    "production": {
+      "release-channel": "production"
+    }
   },
   "submit": {
     "production": {}
diff --git a/package.json b/package.json
index 9c61e46..9ee842b 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,8 @@
     "eject": "expo eject",
     "release:test": "expo publish --release-channel test",
     "release:production": "expo publish --release-channel production",
-    "build:ios:production": "expo build:ios --release-channel production",
-    "build:ios:test": "expo build:ios --release-channel test",
-    "build:android:production": "expo build:android --release-channel production",
-    "build:android:test": "expo build:android --release-channel test"
+    "build:production": "eas build --profile production",
+    "build:test": "eas build --profile test"
   },
   "dependencies": {
     "@apollo/client": "^3.7.0-alpha.3",
diff --git a/redux/user/user.sagas.js b/redux/user/user.sagas.js
index c670659..2d096e3 100644
--- a/redux/user/user.sagas.js
+++ b/redux/user/user.sagas.js
@@ -109,14 +109,7 @@ export function* signInSuccessSaga({ payload }) {
 
     const shop = yield client.query({ query: QUERY_BODYSHOP });
     logImEXEvent("imexmobile_sign_in_success", payload);
-    yield put(
-      setBodyshop({
-        ...shop.data.bodyshops[0],
-        uselocalmediaserver: true,
-        localmediaserverhttp: "http://192.168.1.235:8000", //TODO: ENSURE THAT THIS HAS BEEN REMOVED POST TESTING.
-        localmediaservernetwork: "\\192.168.1.235:8000", //TODO: ENSURE THAT THIS HAS BEEN REMOVED POST TESTING.
-      })
-    );
+    yield put(setBodyshop(shop.data.bodyshops[0]));
   } catch (error) {
     console.log("UH-OH. Couldn't get shop details.", error);
   }