ordering-ui-react-native 0.23.75-test6 → 0.23.76-test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.23.75-test6",
+  "version": "0.23.76-test",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/business/src/components/MapView/index.tsx

@@ -121,6 +121,14 @@ const MapViewComponent = (props: MapViewParams) => {
     };
   }, [isFocused]);
 
+  useEffect(() => {
+    return () => {
+      if (mapRef) {
+        mapRef.current = null
+      }
+    }
+  }, [])
+
   useFocusEffect(
     useCallback(() => {
       setIsFocused(true)
@@ -186,7 +194,7 @@ const MapViewComponent = (props: MapViewParams) => {
             longitude: coordinateLng
           })
         }
-        ref={(ref) => markerRef.current = ref}
+        ref={(ref: any) => markerRef.current = ref}
       >
         <Icon
           name="map-marker"
@@ -262,7 +270,7 @@ const MapViewComponent = (props: MapViewParams) => {
       <View style={{ flex: 1 }}>
         {!isLoadingBusinessMarkers && isFocused ? (
           <View style={{ flex: 1 }}>
-            {/* <MapView
+            <MapView
               ref={mapRef}
               provider={PROVIDER_GOOGLE}
               initialRegion={{
@@ -319,8 +327,8 @@ const MapViewComponent = (props: MapViewParams) => {
                   </Marker>
                 ) : null}
               </>
-            </MapView> */}
-            {/* <OFab
+            </MapView>
+            <OFab
               materialIcon
               iconName="plus"
               onPress={() => onPressZoomIn()}
@@ -333,19 +341,13 @@ const MapViewComponent = (props: MapViewParams) => {
             <OFab
               materialIcon
               iconName="minus"
-              onPress={() => {
-                onPressZoomOut()
-                setAlertState({
-                  open: true,
-                  content: [t('THISISATEST', 'This is a test')]
-                })
-              }}
+              onPress={() => onPressZoomOut()}
               style={{
                 position: 'absolute',
                 bottom: 35,
                 right: 20,
               }}
-            /> */}
+            />
           </View>
         ) : null}
       </View>

package/themes/original/src/components/Home/index.tsx

@@ -1,22 +1,48 @@
-import React, { useEffect } from 'react';
-import { useLanguage, useOrder, useConfig } from 'ordering-components/native';
+import React from 'react';
+import { useLanguage, useOrder, useConfig, useSession, useApi, ToastType, useToast } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import { StyleSheet, View } from 'react-native';
 import { OButton, OIcon, OText } from '../shared';
 import { LanguageSelector } from '../LanguageSelector';
 import { TouchableOpacity } from 'react-native-gesture-handler';
 import { useWindowDimensions, Platform } from 'react-native';
+import uuid from 'react-native-uuid';
 
 export const Home = (props: any) => {
 	const { onNavigationRedirect, businessSlug } = props;
 	const { width, height } = useWindowDimensions();
 	const [, t] = useLanguage();
-	const [orderState] = useOrder();
+	const [orderState, { handleOrderStateLoading, setStateInitialValues }] = useOrder();
 	const [{ configs }] = useConfig()
+	const [, { login }] = useSession()
+	const [ordering] = useApi()
+	const [, { showToast }] = useToast()
 
 	const theme = useTheme();
-	const unaddressedTypes = configs?.unaddressed_order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
-	const isAllowUnaddressOrderType = unaddressedTypes.includes(orderState?.options?.type)
+
+	const handleCreateGuestUser = async (values: any) => {
+		try {
+			await handleOrderStateLoading(true)
+			const { content: { error, result } } = await ordering.users().save(values)
+			if (!error) {
+				await login({
+					user: result,
+					token: result.session?.access_token
+				})
+			} else {
+				showToast(ToastType.Error, t('ERROR_CREATING_GUEST_USER', 'Error creating guest users'))
+			}
+			await handleOrderStateLoading(false)
+		} catch (err) {
+			await handleOrderStateLoading(false)
+			showToast(ToastType.Error, t('ERROR_CREATING_GUEST_USER', 'Error creating guest users'))
+		}
+	}
+
+	const handleUpdateGuest = async () => {
+		const guestToken = uuid.v4()
+		if (guestToken) await handleCreateGuestUser({ guest_token: guestToken })
+	}
 
 	return (
 		<View style={styles.container}>
@@ -47,6 +73,7 @@ export const Home = (props: any) => {
 					isCircle={false}
 					onClick={() => onNavigationRedirect('Login')}
 					imgRightSrc={null}
+					isDisabled={orderState?.loading}
 				/>
 				<OButton
 					text={t('SIGNUP', 'Signup')}
@@ -56,15 +83,13 @@ export const Home = (props: any) => {
 					textStyle={{ color: 'black' }}
 					onClick={() => onNavigationRedirect('Signup')}
 					imgRightSrc={null}
+					isDisabled={orderState?.loading}
 				/>
 				<TouchableOpacity
+					disabled={orderState?.loading}
 					style={{ ...styles.textLink, marginTop: 12 }}
-					onPress={() =>
-						orderState?.options?.address?.address || isAllowUnaddressOrderType
-							? onNavigationRedirect(!!businessSlug ? 'Business' : 'BusinessList', { isGuestUser: true })
-							: onNavigationRedirect('AddressForm', { isGuestUser: true })
-					}>
-					<OText weight="normal" size={18} color={theme.colors.white}>
+					onPress={() => handleUpdateGuest()}>
+					<OText weight="normal" size={18} color={orderState?.loading ? '#ccc' : theme.colors.white}>
 						{t('CONTINUE_AS_GUEST', 'Continue as guest')}
 					</OText>
 				</TouchableOpacity>

package/themes/original/src/components/LoginForm/index.tsx

@@ -107,9 +107,9 @@ const LoginFormUI = (props: LoginParams) => {
 
 	const [isCheckingCode, setCheckingCode] = useState(false)
 
-	const googleLoginEnabled = configs?.google_login_enabled?.value === '1' || !configs?.google_login_enabled?.enabled
-	const facebookLoginEnabled = configs?.facebook_login_enabled?.value === '1' || !configs?.facebook_login_enabled?.enabled
-	const appleLoginEnabled = Platform.OS === 'ios' && (configs?.apple_login_enabled?.value === '1' || !configs?.apple_login_enabled?.enabled)
+	const googleLoginEnabled = configs?.google_login_enabled?.value === '1'
+	const facebookLoginEnabled = configs?.facebook_login_enabled?.value === '1'
+	const appleLoginEnabled = Platform.OS === 'ios' && (configs?.apple_login_enabled?.value === '1')
 
 	const loginStyle = StyleSheet.create({
 		btnOutline: {
@@ -301,7 +301,7 @@ const LoginFormUI = (props: LoginParams) => {
 		setTabLayouts(_tabLayouts)
 	}
 
-	const handleChangePhoneNumber = (number : any, rawNumber: any) => {
+	const handleChangePhoneNumber = (number: any, rawNumber: any) => {
 		setPhoneInputData(number)
 		setCellphoneStartZero && setCellphoneStartZero(rawNumber?.number && rawNumber?.countryCallingCode ? rawNumber?.number : null)
 	}