ordering-ui-react-native 0.22.40-release → 0.22.41-release

package/package.json

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

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

@@ -1,14 +1,15 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { TouchableOpacity, StyleSheet } from 'react-native';
-import { LogoutAction } from 'ordering-components/native';
-import { useLanguage } from 'ordering-components/native';
+import { LogoutAction, ToastType, useToast } from 'ordering-components/native';
+import { useLanguage, useSession } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import { OIcon, OText } from '../shared';
 import { _retrieveStoreData, _clearStoreData } from '../../providers/StoreUtil';
 
 const LogoutButtonUI = (props: any) => {
-  const { handleLogoutClick } = props;
+  const { handleLogoutClick, formState } = props;
   const [, t] = useLanguage();
+  const [, { showToast }] = useToast()
   const theme = useTheme();
 
   const handleClick = async () => {
@@ -19,6 +20,12 @@ const LogoutButtonUI = (props: any) => {
     }
   };
 
+  useEffect(() => {
+    if (formState?.result?.error) {
+      showToast(ToastType.Error, t(formState?.result?.result))
+    }
+  }, [formState?.result])
+
   const styles = StyleSheet.create({
     container: {
       alignItems: 'center',
@@ -53,9 +60,11 @@ const LogoutButtonUI = (props: any) => {
 };
 
 export const LogoutButton = (props: any) => {
+  const [{ user }] = useSession()
   const logoutProps = {
     ...props,
     isNative: true,
+    isDriverApp: user?.level === 4,
     UIComponent: LogoutButtonUI,
   };
 

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef, useCallback } from 'react';
-import { Dimensions, SafeAreaView, StyleSheet, View } from 'react-native';
+import { Dimensions, Platform, SafeAreaView, StyleSheet, View } from 'react-native';
 import { useFocusEffect } from '@react-navigation/native'
 import MapView, {
   PROVIDER_GOOGLE,
@@ -263,8 +263,8 @@ const MapViewComponent = (props: MapViewParams) => {
               style={{ flex: 1 }}
               zoomTapEnabled
               zoomEnabled
-              zoomControlEnabled
-              cacheEnabled
+              zoomControlEnabled={!(isDeliveryApp && Platform.OS === 'android')}
+              cacheEnabled={(isDeliveryApp && Platform.OS === 'android' && isFocused) || Platform.OS === 'ios' || !isDeliveryApp}
               moveOnMarkerPress
               onTouchStart={() => (following.current = false)}
             >