ordering-ui-react-native 0.23.19 → 0.23.21

package/package.json

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

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

@@ -168,28 +168,38 @@ const NewOrderNotificationUI = (props: any) => {
   }
 
   useEffect(() => {
+    const handleEventTypeOne = (o: any) => {
+      handleEventNotification(1, o, orderStatus)
+    }
+    const handleEventTypeTwo = (o: any) => {
+      handleEventNotification(2, o, orderStatus)
+    }
+    const handleEventTypeThree = (o: any) => {
+      handleEventNotification(3, o, orderStatus)
+    }
+
     if (!events?._events?.message_added_notification || events?._events?.message_added_notification?.length < 2) {
-      events.on('message_added_notification', (o: any) => handleEventNotification(1, o, orderStatus))
+      events.on('message_added_notification', handleEventTypeOne)
     }
     if (!events?._events?.order_added_notification || events?._events?.order_added_notification?.length < 2) {
-      events.on('order_added_notification', (o: any) => handleEventNotification(2, o, orderStatus))
+      events.on('order_added_notification', handleEventTypeTwo)
     }
     if (!events?._events?.order_updated_notification || events?._events?.order_updated_notification?.length < 2) {
-      events.on('order_updated_notification', (o: any) => handleEventNotification(3, o, orderStatus))
+      events.on('order_updated_notification', handleEventTypeThree)
     }
     if (!events?._events?.request_register_notification || events?._events?.request_register_notification?.length < 2) {
-      events.on('request_register_notification', (o: any) => handleEventNotification(2, o, orderStatus))
+      events.on('request_register_notification', handleEventTypeTwo)
     }
     if (!events?._events?.request_update_notification || events?._events?.request_update_notification?.length < 2) {
-      events.on('request_update_notification', (o: any) => handleEventNotification(3, o, orderStatus))
+      events.on('request_update_notification', handleEventTypeThree)
     }
 
     return () => {
-      events.off('message_added_notification', (o: any) => handleEventNotification(1, o))
-      events.off('order_added_notification', (o: any) => handleEventNotification(2, o))
-      events.off('order_updated_notification', (o: any) => handleEventNotification(3, o))
-      events.off('request_register_notification', (o: any) => handleEventNotification(2, o))
-      events.off('request_update_notification', (o: any) => handleEventNotification(3, o))
+      events.off('message_added_notification', handleEventTypeOne)
+      events.off('order_added_notification', handleEventTypeTwo)
+      events.off('order_updated_notification', handleEventTypeThree)
+      events.off('request_register_notification', handleEventTypeTwo)
+      events.off('request_update_notification', handleEventTypeThree)
     }
   }, [orderStatus, events])
 

package/themes/business/src/components/PreviousOrders/OrderItem.tsx

@@ -61,8 +61,8 @@ export const OrderItem = React.memo((props: any) => {
   const styles = StyleSheet.create({
     cardButton: {
       flex: 1,
-      paddingVertical: (isIpad || isTablet) ? 20 : 5,
-      marginBottom: IS_PORTRAIT ? 25 : 0,
+      paddingVertical: (isIpad || isTablet) ? 20 : 15,
+      marginBottom: IS_PORTRAIT ? 15 : 0,
       marginLeft: 3,
       backgroundColor: order?.time_status === 'delayed' 
         ? theme.colors.danger100

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

@@ -1047,6 +1047,7 @@ const CheckoutUI = (props: any) => {
 					<OModal
 						open={isOpen}
 						onClose={() => setIsOpen(false)}
+						showToastInsideModal
 					>
 						<View style={styles.detailWrapper}>
 							<UserDetails

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

@@ -123,7 +123,7 @@ export const UserFormDetailsUI = (props: any) => {
 		};
 		if (field.code && field.code === 'email') {
 			rules.pattern = {
-				value: /[&,()%";:ç?<>{}\\[\]\s]/g,
+				value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
 				message: t('INVALID_ERROR_EMAIL', 'Invalid email address').replace(
 					'_attribute_',
 					t('EMAIL', 'Email'),

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

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Modal, StyleSheet, Text, SafeAreaView, View, TouchableOpacity, Platform } from "react-native";
 import styled from 'styled-components/native';
 import AntDesignIcon from 'react-native-vector-icons/AntDesign'
-
+import { Toast } from '../../../../../src/components/shared/OToast'
 interface Props {
 	open?: boolean;
 	title?: string;
@@ -22,6 +22,7 @@ interface Props {
 	styleCloseButton?: any,
 	isAvoidKeyBoardView?: boolean;
 	styleContainerCloseButton?: any;
+	showToastInsideModal?: boolean;
 }
 const KeyboardView = styled.KeyboardAvoidingView`
   flex-grow: 1;
@@ -47,7 +48,8 @@ const OModal = (props: Props): React.ReactElement => {
 		style,
 		styleCloseButton,
 		styleContainerCloseButton,
-		isAvoidKeyBoardView
+		isAvoidKeyBoardView,
+		showToastInsideModal
 	} = props
 
 	const renderSafeAreaView = () => (
@@ -94,6 +96,9 @@ const OModal = (props: Props): React.ReactElement => {
 			onRequestClose={() => onClose && onClose()}
 			style={{ height: '100%', flex: 1, position: 'absolute', ...style, zIndex: 9999 }}
 		>
+			{showToastInsideModal && (
+				<Toast />
+			)}
 			{isAvoidKeyBoardView ? (
 				<KeyboardView
 					enabled