ordering-ui-react-native 0.12.75 → 0.12.76

package/package.json

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

package/src/config.json

@@ -2,7 +2,7 @@
   "app_id": "react-native-app",
   "notification_app": "orderingapp",
   "app_name": "Ordering",
-  "project": "demologistic",
+  "project": "reactdemo",
   "api": {
     "url": "https://apiv4.ordering.co",
     "language": "en",

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

@@ -81,6 +81,7 @@ const BusinessMenuListUI = (props: BusinessMenuListParams) => {
             <IconAntDesign
               name='close'
               color={theme.colors.textThird}
+              style={{ marginLeft: 7 }}
               size={24}
             />
           </TouchableOpacity>
@@ -115,6 +116,11 @@ const BusinessMenuListUI = (props: BusinessMenuListParams) => {
               </DropOption>
             </TouchableOpacity>
           ))}
+          {businessMenuList?.menus && businessMenuList?.menus.length === 0 && (
+            <View>
+              <OText>{t('NO_RESULTS_FOUND', 'Sorry, no results found')}</OText>
+            </View>
+          )}
         </MenuListWrapper>
       </OModal>
     </>

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

@@ -123,6 +123,17 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
       color: '#B1BCCC',
       fontSize: 14,
       fontWeight: '500'
+    },
+    wrapperIcon: {
+      overflow: 'hidden',
+      backgroundColor: 'transparent',
+      marginBottom: 12,
+      width: 25,
+      height: 25,
+      marginStart: 7,
+      alignItems: 'center',
+      justifyContent: 'center',
+      zIndex: 99999
     }
 	})
 
@@ -264,12 +275,13 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
 
   return (
     <>
-      <PreOrderContainer>
+      <PreOrderContainer contentContainerStyle={{ paddingVertical: 30, paddingHorizontal: 40 }}>
         <TouchableOpacity onPress={() => goToBack && goToBack()} style={{ marginBottom: 12 }}>
           <IconAntDesign
             name='close'
             color={theme.colors.textThird}
             size={24}
+            style={{ marginLeft: -4}}
           />
         </TouchableOpacity>
         <BusinessInfoWrapper>
@@ -350,7 +362,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
             {t('ORDER_TIME', 'Order time')}
           </OText>
           <View style={{ flex: 1 }}>
-            {selectDate && datesWhitelist[0].start !== null && (
+            {selectDate && datesWhitelist[0]?.start !== null && (
               <CalendarStrip
                 scrollable
                 style={styles.calendar}
@@ -398,7 +410,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
         <OButton
           text={t('GO_TO_MENU', 'Go to menu')}
           textStyle={{color: 'white'}}
-          style={{borderRadius: 7.6, marginBottom: 50, marginTop: 30}}
+          style={{borderRadius: 7.6, marginBottom: 20, marginTop: 30}}
           onClick={() => handleClickBusiness()}
         />
       </PreOrderContainer>
@@ -409,8 +421,8 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
         customClose
         entireModal
       >
-        <PreorderTypeListWrapper>
-          <TouchableOpacity onPress={() => setIsPreorderTypeList(false)} style={{ marginBottom: 12 }}>
+        <PreorderTypeListWrapper contentContainerStyle={{ paddingVertical: 20, paddingHorizontal: 40}}>
+          <TouchableOpacity onPress={() => setIsPreorderTypeList(false)} style={styles.wrapperIcon}>
             <IconAntDesign
               name='close'
               color={theme.colors.textThird}
@@ -421,6 +433,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
             <TouchableOpacity
               key={index}
               onPress={() => handleClickPreorderType(option)}
+              style={{ zIndex: 99999 }}
             >
               <DropOption
                 numberOfLines={1}

package/themes/original/src/components/BusinessPreorder/styles.tsx

@@ -1,8 +1,6 @@
 import styled, { css } from 'styled-components/native'
 
-export const PreOrderContainer = styled.ScrollView`
-  padding: 20px 40px 30px 40px;
-`
+export const PreOrderContainer = styled.ScrollView``
 
 export const BusinessInfoWrapper = styled.View`
   flex-direction: row;
@@ -45,9 +43,7 @@ export const TimeItem = styled.View`
   `}
 `
 
-export const PreorderTypeListWrapper = styled.ScrollView`
-  padding: 20px 40px 30px 40px;
-`
+export const PreorderTypeListWrapper = styled.ScrollView``
 
 export const DropOption = styled.View`
   padding: 10px;