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() { })} - {Updates.releaseChannel} + Release Channel {Updates.releaseChannel} - - {t("settings.labels.version", { - number: Constants.manifest.version, - })} - {`${process.env.NODE_ENV || ""} ${Updates.releaseChannel || ""}`} - - - )} - + + + + + + )} + + + + {t("settings.labels.version", { + number: Constants.manifest.version, + })} + ); } 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); }