diff --git a/mobile-app/api/_request.ts b/mobile-app/api/_request.ts index bfdfd48..7ce90c3 100644 --- a/mobile-app/api/_request.ts +++ b/mobile-app/api/_request.ts @@ -10,7 +10,7 @@ export function getUrl (gateway: APIService = "VENDOR_GATEWAY"): string { let url: string if (environment === 'development') { - url = `${NetworkMapper.PLAYGROUND}:${PlaygroundServicePort[gateway]}/${ApiRoute[gateway]}/v1` + url = `https://588a-197-210-53-185.ngrok-free.app/${ApiRoute[gateway]}/v1` } else { url =`${NetworkMapper.PRODUCTION}/${ApiRoute[gateway]}/v1` } diff --git a/mobile-app/hooks/useCachedResource.tsx b/mobile-app/hooks/useCachedResource.tsx index cfbd59f..57443f6 100644 --- a/mobile-app/hooks/useCachedResource.tsx +++ b/mobile-app/hooks/useCachedResource.tsx @@ -1,9 +1,11 @@ import {useEffect, useState} from "react"; import {Logger} from '@api/logging.util' import * as Font from 'expo-font' -import {MaterialIcons, MaterialCommunityIcons} from '@expo/vector-icons' +import { MaterialCommunityIcons} from '@expo/vector-icons' import NanaOmnesBold from '@assets/app/fonts/nana-font-bold.otf' import NanaOmnesRegular from '@assets/app/fonts/nana-font.otf' + + /** * Delaying splash screen to load additional resources prior to rendering the app * @return boolean when loading complete diff --git a/mobile-app/screens/AppNavigator/SettingsNavigator/screens/RestaurantProfile.tsx b/mobile-app/screens/AppNavigator/SettingsNavigator/screens/RestaurantProfile.tsx index e7a2425..5c08b85 100644 --- a/mobile-app/screens/AppNavigator/SettingsNavigator/screens/RestaurantProfile.tsx +++ b/mobile-app/screens/AppNavigator/SettingsNavigator/screens/RestaurantProfile.tsx @@ -9,7 +9,7 @@ import {useNavigation} from "@react-navigation/native"; import * as Location from 'expo-location' import * as ImagePicker from "expo-image-picker"; import { RootState, useAppDispatch, useAppSelector } from "@store/index"; -import { ShowToast, showTost } from "@components/commons/Toast"; +import { showTost } from "@components/commons/Toast"; import { fetchProfile } from "@store/profile.reducer"; import { _api } from "@api/_request"; import * as Device from 'expo-device' @@ -169,7 +169,9 @@ export function RestaurantProfile (): JSX.Element { const { status } = await Location.requestForegroundPermissionsAsync(); if (status !== 'granted') { - ShowToast('error', RestaurantProfileInteraction.GET_LOCATION_FAILED) + showTost(toast, RestaurantProfileInteraction.GET_LOCATION_FAILED, 'error') + setGettingLocation(false) + return } const {coords: {longitude, latitude}} = await Location.getCurrentPositionAsync({ accuracy: 6 @@ -180,7 +182,6 @@ export function RestaurantProfile (): JSX.Element { showTost(toast, RestaurantProfileInteraction.COORD_UPDATE, 'success') - console.log([longitude, latitude]) try { await _api.requestData({ method: 'put', diff --git a/mobile-app/screens/AppNavigator/SettingsNavigator/screens/RestaurantSettings.tsx b/mobile-app/screens/AppNavigator/SettingsNavigator/screens/RestaurantSettings.tsx index 367ca11..7ed9af0 100644 --- a/mobile-app/screens/AppNavigator/SettingsNavigator/screens/RestaurantSettings.tsx +++ b/mobile-app/screens/AppNavigator/SettingsNavigator/screens/RestaurantSettings.tsx @@ -201,7 +201,7 @@ export function RestaurantSettings (): JSX.Element { { updateTime('cutoffTime',value) diff --git a/mobile-app/screens/OnboardingNavigator/screens/Onboarding.screen.tsx b/mobile-app/screens/OnboardingNavigator/screens/Onboarding.screen.tsx index 59ac129..25b632b 100644 --- a/mobile-app/screens/OnboardingNavigator/screens/Onboarding.screen.tsx +++ b/mobile-app/screens/OnboardingNavigator/screens/Onboarding.screen.tsx @@ -34,7 +34,7 @@ export function OnboardingScreen(): JSX.Element { colors={['rgba(0,0,0,0.6)', 'rgba(0,0,0,0)']} // Adjust the overlay color and opacity here style={tailwind('absolute top-0 left-0 right-0 bottom-0')} /> - + - + navigator.navigate(OnboardingScreenName.SIGN_UP_PROFILE)} label="Sign up" @@ -56,7 +56,7 @@ export function OnboardingScreen(): JSX.Element { testId="GenericButton.Onboarding.Continue" /> navigator.navigate(OnboardingScreenName.LOGIN)} label="Log in" labelColor={tailwind('text-white text-2xl font-normal')} diff --git a/mobile-app/screens/OnboardingNavigator/screens/Signup/SignupBusiness.screen.tsx b/mobile-app/screens/OnboardingNavigator/screens/Signup/SignupBusiness.screen.tsx index a5f78ea..fd03d6b 100644 --- a/mobile-app/screens/OnboardingNavigator/screens/Signup/SignupBusiness.screen.tsx +++ b/mobile-app/screens/OnboardingNavigator/screens/Signup/SignupBusiness.screen.tsx @@ -1,5 +1,5 @@ import React, {useEffect, useRef, useState} from 'react'; -import {TextInput, View} from 'react-native'; +import {TextInput, View, ScrollView} from 'react-native'; import { tailwind } from '@tailwind'; import { StackScreenProps } from '@react-navigation/stack'; import { SafeAreaView } from 'react-native-safe-area-context'; @@ -103,7 +103,7 @@ export function SignupBusinessScreen({ route }: SignupBusinessProps): JSX.Elemen return ( - + {!_loading && } - + );