ordering-ui-react-native 0.14.73 → 0.14.76

package/package.json

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

package/themes/kiosk/src/components/BusinessesListing/index.tsx

@@ -45,7 +45,7 @@ const BusinessesListingUI = (props: any) => {
             </OText>
             <OText
               size={WIDTH_SCREEN * 0.014}
-              color={theme.colors.paleGray}
+              color={theme.colors.letterGray}
               style={{
                 paddingHorizontal: 15,
                 paddingBottom: 40

package/themes/kiosk/src/components/LogoutButton/index.tsx

@@ -9,7 +9,7 @@ import { _clearStoreData, _retrieveStoreData } from '../../../../../src/provider
 const LogoutButtonUI = (props: any) => {
   const { handleLogoutClick, formState, ButtonUI } = props
 
-  const [theme] = useTheme();
+  const theme = useTheme();
   const [, { setStateValues }] = useOrder();
   const [, { showToast }] = useToast();
   const [, t] = useLanguage();

package/themes/kiosk/src/components/LogoutPopup/index.tsx

@@ -1,15 +1,15 @@
 import React, { useState } from 'react';
 import { Modal } from 'react-native';
-import { useLanguage, LogoutAction, useApi, useSession } from 'ordering-components/native';
-
+import { useLanguage, LogoutAction, useApi, useSession, useBusiness, useOrder } from 'ordering-components/native';
 import { useForm, Controller } from 'react-hook-form';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons'
+import { useTheme } from 'styled-components/native';
 
 import NavBar from '../NavBar';
 import { OSBody, OSContainer, OSContent } from './styles';
 import { OButton, OInput, OText } from '../shared';
 import { useDeviceOrientation, PORTRAIT } from '../../../../../src/hooks/DeviceOrientation';
-import { useTheme } from 'styled-components/native';
+import { _clearStoreData, _retrieveStoreData } from '../../../../../src/providers/StoreUtil'
 
 const LogoutPopupUI = (props: Props) => {
   const {
@@ -19,13 +19,15 @@ const LogoutPopupUI = (props: Props) => {
   } = props;
 
   const theme = useTheme();
+  const [, { setStateValues }] = useOrder();
   const [ordering] = useApi();
   const [{ token }] = useSession();
   const [, t] = useLanguage();
+  const [, { setBusiness }] = useBusiness();
   const [orientationState] = useDeviceOrientation();
   const { control, handleSubmit, errors } = useForm();
   const [passwordSee, setPasswordSee] = useState(false);
-  const [logoutState, setLogoutState] = useState({ loading: false, error: false, result: [] })
+  const [logoutState, setLogoutState] = useState<any>({ loading: false, error: false, result: [] })
 
   const fetchPassword = async (body: any) => {
     try {
@@ -43,12 +45,12 @@ const LogoutPopupUI = (props: Props) => {
         result
       })
       return { error, result }
-    } catch (e) {
+    } catch (e: any) {
       setLogoutState({
         ...logoutState,
         loading: false,
         error: true,
-        result: e
+        result: [e?.message]
       })
     }
   }
@@ -56,7 +58,17 @@ const LogoutPopupUI = (props: Props) => {
   const onSubmit = async (values: any) => {
     const result = await fetchPassword(values)
     if (result?.result === 'OK') {
-      handleLogoutClick();
+      const res: any = await handleLogoutClick();
+      if (res) {
+        _clearStoreData({ excludedKeys: ['isTutorial'] })
+        setBusiness({})
+        setStateValues({
+          options: {
+            moment: null
+          },
+          carts: {},
+        })
+      }
       onClose();
     }
   }

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

@@ -110,7 +110,8 @@ const OrderProgressUI = (props: any) => {
     const deliveryTime = order?.delivery_datetime_utc
       ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'YYYY-MM-DD HH:mm' })
       : parseDate(order?.delivery_datetime, { utc: false, outputFormat: 'YYYY-MM-DD HH:mm' })
-    const [hour, minute] = time.split(':')
+    const hour = time?.split(':')?.[0]
+    const minute = time?.split(':')?.[1]
     const result = time ? (parseInt(hour, 10) * 60) + parseInt(minute, 10) : 0
     const returnedDate = moment(deliveryTime).add(result, 'minutes').format('hh:mm A')
     return returnedDate

package/themes/original/src/components/shared/OInput.tsx

@@ -90,7 +90,7 @@ const OInput = (props: Props): React.ReactElement => {
 				onSubmitEditing={props.onSubmitEditing}
 				blurOnSubmit={props.blurOnSubmit}
 				ref={(e : any) => {
-					props.forwardRef.current = e
+					props.forwardRef && (props.forwardRef.current = e)
 				}}
 				style={props?.inputStyle}
 			/>