Hot fixes 0.0.10

app.json

@@ -6,5 +6,5 @@
   "versionFlag": "private-beta-rc",
   "requiredServerVersion": "0.0.10",
 
-  "productionMode": true
+  "productionMode": false
 }

src/components/input/GlassButton.js

@@ -3,11 +3,15 @@ import { StyleSheet, Text, TouchableOpacity } from 'react-native';
 import Styles, { Colors, Fonts } from '../../styles/Styles';
 
 const GlassButton = ({ children, onPress, buttonText, style, disabled, fontSize = 19 }) => (
-  <TouchableOpacity onPress={onPress} disabled={disabled} style={{
-    ...styles.container,
-    ...style,
-    backgroundColor: disabled ? Colors.purple2 : Colors.purple1,
-  }}>
+  <TouchableOpacity
+    onPress={onPress}
+    disabled={disabled}
+    style={{
+      ...styles.container,
+      ...style,
+      backgroundColor: disabled ? `${Colors.lightGrey}60` : Colors.purple1,
+      shadowOpacity: disabled ? 0 : 0.5,
+    }}>
     {children == null ? (
       <Text style={{
         ...Fonts.bold(fontSize, Colors.white),

src/components/other/DebugUrlsMenu.js

@@ -106,7 +106,6 @@ const DebugUrlsMenu = () => {
         </>
       )}
     </View>
-
   );
 };
 

src/components/viewSlider/ViewSlider.js

@@ -111,6 +111,17 @@ const ViewSlider = ({ children, onViewIndexChanged = () => {} }, ref) => {
           </Text>
         </TouchableOpacity>
       )}
+      {currentViewIndex === 0 && (
+        <TouchableOpacity
+          style={{ ...Styles.center, position: 'absolute', bottom: 0, width: '100%' }}
+          onPress={() => setCurrentViewIndex(1)}
+          hitSlop={{ top: 30, bottom: 30, left: 30, right: 30 }}
+        >
+          <Text style={{ marginBottom: 10, ...Fonts.bold(13, Colors.lightGrey) }}>
+            I dont have an account
+          </Text>
+        </TouchableOpacity>
+      )}
       {currentViewIndex > 1 && currentViewIndex < children.length - 1 && (
         <DotIndicator
           currentIndex={currentViewIndex - 1}

src/screens/Onboarding.js

@@ -17,7 +17,6 @@ import { AntDesign, FontAwesome5, MaterialCommunityIcons, MaterialIcons } from '
 import { openCamera, openPicker } from 'react-native-image-crop-picker';
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import { PERMISSIONS, request, requestNotifications, RESULTS } from 'react-native-permissions';
-import BackgroundGeolocation from 'react-native-background-geolocation';
 import DropyLogo from '../assets/svgs/dropy_logo_grey.svg';
 import Styles, { Colors, Fonts } from '../styles/Styles';
 import OnboardingLines from '../assets/svgs/onboarding_lines.svg';
@@ -210,7 +209,6 @@ export default function Onboarding({ navigation }) {
   };
 
   const handleLogin = async () => {
-    setLoading(true);
     const emailValid = loginEmailInputRef.current?.isValid();
 
     if (!emailValid) {
@@ -222,8 +220,12 @@ export default function Onboarding({ navigation }) {
     await requestNotificationsPermissions();
 
     try {
+      setLoading(true);
       const userInfos = await API.login(email, password);
-      setUser(userInfos);
+      // Fix #322 permissions granting messing with states -> sockets not initializing
+      setTimeout(() => {
+        setUser(userInfos);
+      }, 1000);
     } catch (error) {
       setLoading(false);
       if (error.response.status === 404) {
@@ -383,19 +385,22 @@ export default function Onboarding({ navigation }) {
               onEdited={setEmail}
               isEmail
               defaultValue={email}
+              autoComplete='email'
             />
             <FormInput
               placeholder='Password'
               inputStyle={{ backgroundColor: Colors.lighterGrey }}
               isPassword
               onEdited={setPassword}
               defaultValue={password}
+              autoComplete='password'
             />
           </View>
           <LoadingGlassButton
             onPress={handleLogin}
             disabled={email.length === 0 || password.length === 0}
             text='Login'
+            loading={loading}
           />
         </View>
 
@@ -463,6 +468,7 @@ export default function Onboarding({ navigation }) {
               inputStyle={{ backgroundColor: Colors.lighterGrey }}
               isEmail
               defaultValue={email}
+              autoComplete='email'
             />
             <FormInput
               ref={passwordInputRef}
@@ -471,6 +477,7 @@ export default function Onboarding({ navigation }) {
               inputStyle={{ backgroundColor: Colors.lighterGrey }}
               isPassword
               defaultValue={password}
+              autoComplete='password-new'
             />
             <FormInput
               ref={passwordConfirmationInputRef}
@@ -479,6 +486,7 @@ export default function Onboarding({ navigation }) {
               inputStyle={{ backgroundColor: Colors.lighterGrey }}
               isPassword
               defaultValue={passwordConfirmation}
+              autoComplete='password-new'
             />
           </View>
           <LoadingGlassButton

src/screens/SettingScreen.js

@@ -1,5 +1,4 @@
-/* eslint-disable no-undef */
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import {
   Linking,
   SafeAreaView,
@@ -12,6 +11,7 @@ import {
 } from 'react-native';
 import { responsiveWidth } from 'react-native-responsive-dimensions';
 import { AntDesign, Feather, Ionicons } from '@expo/vector-icons';
+import KeyboardSpacer from 'react-native-keyboard-spacer';
 import AppInfo from '../../app.json';
 import Styles, { Colors, Fonts } from '../styles/Styles';
 import { BackgroundGeolocationContext } from '../states/BackgroundGolocationContextProvider';
@@ -32,14 +32,19 @@ const SettingsScreen = ({ navigation }) => {
   const { sendAlert } = useOverlay();
 
   const [notificationsSettings, setNotificationsSettings] = useState(null);
+  const notificatinsSettingsRef = useRef(null);
 
   useEffect(() => {
     fetchNotificationsSettings();
+    return () => {
+      if (notificatinsSettingsRef.current != null)
+        postNotificationsSettings(notificatinsSettingsRef.current);
+    };
   }, []);
 
   useEffect(() => {
-    if (notificationsSettings)
-      postNotificationsSettings();
+    if (notificationsSettings != null)
+      notificatinsSettingsRef.current = notificationsSettings;
   }, [notificationsSettings]);
 
   const fetchNotificationsSettings = async () => {
@@ -57,9 +62,10 @@ const SettingsScreen = ({ navigation }) => {
     }
   };
 
-  const postNotificationsSettings = async () => {
+  const postNotificationsSettings = async (settings) => {
+    console.log('postNotificationsSettings', settings);
     try {
-      await API.postNotificationsSettings(notificationsSettings);
+      await API.postNotificationsSettings(settings);
     } catch (error) {
       sendAlert({
         title: 'Notifications settings not updated',
@@ -71,6 +77,8 @@ const SettingsScreen = ({ navigation }) => {
   };
 
   const logout = async () => {
+    await postNotificationsSettings(notificatinsSettingsRef.current);
+    notificatinsSettingsRef.current = null;
     await API.logout();
     navigation.reset({
       index: 0,
@@ -173,6 +181,7 @@ const SettingsScreen = ({ navigation }) => {
 
         <View style={styles.spacer} />
 
+        {/* eslint-disable-next-line no-undef */}
         <TouchableOpacity onLongPress={() => (user.isDeveloper || __DEV__) && setDeveloperMode((old) => !old)} activeOpacity={1}>
           <View style={styles.infoTextContainer}>
             <Ionicons name='git-branch' size={19} color={Colors.darkGrey} />
@@ -195,7 +204,12 @@ const SettingsScreen = ({ navigation }) => {
         </TouchableOpacity>
 
         <DebugText marginBottom={20}>DEV MODE</DebugText>
-        {(developerMode || customUrls) && <DebugUrlsMenu /> }
+        {(developerMode || customUrls) && (
+          <>
+            <DebugUrlsMenu />
+            <KeyboardSpacer />
+          </>
+        )}
       </ScrollView>
     </SafeAreaView>
   );

src/screens/Splash.js

@@ -13,7 +13,7 @@ import Storage from '../utils/storage';
 const Splash = ({ navigation, route }) => {
   const { cancelAutoLogin = false } = route.params ?? {};
 
-  const { setUser, user } = useCurrentUser();
+  const { setUser, user, customUrls } = useCurrentUser();
 
   const { sendAlert } = useOverlay();
 
@@ -26,14 +26,17 @@ const Splash = ({ navigation, route }) => {
       handleLoginSuccess();
   }, [user]);
 
-  const navigateToOnboarding = () => navigation.reset({ index: 0, routes: [{ name: 'Onboarding' }] });
+  const navigateToOnboarding = () => {
+    navigation.reset({ index: 0, routes: [{ name: 'Onboarding' }] });
+  };
 
   const launch = async () => {
     const ready = await appIsReady();
     console.log(`Splash launch : app is ready -> ${ready}`);
 
     if (!ready) {
-      navigateToOnboarding();
+      if (customUrls != null)
+        navigateToOnboarding();
       return;
     }
 
@@ -61,6 +64,7 @@ const Splash = ({ navigation, route }) => {
 
   const appIsReady = async () => {
     try {
+      await API.init();
       const isCompatibleWithServer = await API.serverVersionIsCompatible();
 
       if (!isCompatibleWithServer) {

src/services/API.js

@@ -5,21 +5,25 @@ import AppInfo from '../../app.json';
 const DOMAIN_PREFIX = AppInfo.productionMode ? '' : 'preprod-';
 const API_BASE_URL = `https://${DOMAIN_PREFIX}api.dropy-app.com`;
 
-const AXIOS_PARAMS = {
-  baseURL: API_BASE_URL,
-  timeout: 5000,
-};
-
-let axios = Axios.create(AXIOS_PARAMS);
+let axios = null;
 
-const getHeaders = () => axios.defaults.headers.common;
+const init = async () => {
+  let baseURL = API_BASE_URL;
 
-const loadCustomUrl = async () => {
   const customUrls = await Storage.getItem('@custom_urls');
-  if (customUrls != null)
-    axios.defaults.baseURL = customUrls.api ?? API_BASE_URL;
+  if (customUrls?.api != null) {
+    console.log('Using custom urls', customUrls);
+    baseURL = customUrls.api;
+  }
+
+  axios = Axios.create({
+    baseURL,
+    timeout: 5000,
+  });
 };
 
+const getHeaders = () => axios.defaults.headers.common;
+
 const register = async (displayName, email, password, newsLetter) => {
   const response = await axios.post('/register', {
     displayName,
@@ -30,7 +34,7 @@ const register = async (displayName, email, password, newsLetter) => {
 
   const { accessToken, refreshToken, expires, profile: user } = response.data;
 
-  axios = Axios.create(AXIOS_PARAMS);
+  await init();
   axios.defaults.headers.common.Authorization = accessToken;
 
   await Storage.setItem('@auth_tokens', { accessToken, refreshToken, expires });
@@ -46,16 +50,15 @@ const login = async (email, password) => {
 
   const { accessToken, refreshToken, expires, profile: user } = response.data;
 
-  axios = Axios.create(AXIOS_PARAMS);
-  loadCustomUrl();
+  await init();
   axios.defaults.headers.common.Authorization = accessToken;
 
   await Storage.setItem('@auth_tokens', { accessToken, refreshToken, expires });
 
   return user;
 };
 
-const refreshTokenUrl = () => `${API_BASE_URL}/refresh`;
+const refreshTokenUrl = () => `${axios.defaults.baseURL}/refresh`;
 
 const postUserDeviceToken = (deviceToken) => {
   const result = axios.post('/user/updateDeviceToken', {
@@ -64,7 +67,7 @@ const postUserDeviceToken = (deviceToken) => {
   return result;
 };
 
-const userBackgroundGeolocationPingUrl = () => `${API_BASE_URL}/user/backgroundGeolocationPing`;
+const userBackgroundGeolocationPingUrl = () => `${axios.defaults.baseURL}/user/backgroundGeolocationPing`;
 
 const getDropyMedia = async (dropyId) => {
   const result = await axios.get(`/dropy/${dropyId}/media`);
@@ -174,7 +177,7 @@ const refreshToken = async (token) => {
 
   const { accessToken, refreshToken, expires } = response.data;
 
-  axios = Axios.create(AXIOS_PARAMS);
+  await init();
   axios.defaults.headers.common.Authorization = accessToken;
 
   await Storage.setItem('@auth_tokens', { accessToken, refreshToken, expires });
@@ -188,8 +191,7 @@ const getUserProfile = async () => {
 };
 
 const logout = async () => {
-  axios = Axios.create(AXIOS_PARAMS);
-  loadCustomUrl();
+  await init();
   const removedItem = await Storage.removeItem('@auth_tokens');
   return removedItem;
 };
@@ -231,6 +233,7 @@ const API = {
   logout,
   getNotificationsSettings,
   postNotificationsSettings,
+  init,
 };
 
 export default API;

src/states/UserContextProvider.js

@@ -15,10 +15,10 @@ const UserProvider = ({ children }) => {
   }, [user]);
 
   useEffect(() => {
-    loadStoredIPs();
+    loadCustomUrls();
   }, []);
 
-  const loadStoredIPs = async () => {
+  const loadCustomUrls = async () => {
     const customUrls = await Storage.getItem('@custom_urls');
     if (!customUrls)
       return;