ordering-ui-react-native 0.11.57 → 0.11.58

package/package.json

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

package/src/components/OrderCreating/index.tsx

@@ -67,13 +67,17 @@ export const OrderCreating = (props: any) => {
     let hour = 0
     let min = 0
     if (orderState?.options?.type === 1 && cart) {
-      hour = (cart?.business?.delivery_time).split(':')[0]
-      min = (cart?.business?.delivery_time).split(':')[1]
+      if (cart?.business?.delivery_time) {
+        hour = (cart?.business?.delivery_time).split(':')[0]
+        min = (cart?.business?.delivery_time).split(':')[1]
+      }
     }
 
     if (orderState?.options?.type === 2 && cart) {
-      hour = (cart?.business?.pickup_time).split(':')[0]
-      min = (cart?.business?.pickup_time).split(':')[1]
+      if (cart?.business?.pickup_time) {
+        hour = (cart?.business?.pickup_time).split(':')[0]
+        min = (cart?.business?.pickup_time).split(':')[1]
+      }
     }
     return getHourMin(hour, min)
   }

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

@@ -90,6 +90,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 			height: 50,
 			maxHeight: 50,
 			minHeight: 50,
+			flex: 1,
 		},
 		textAreaStyles: {
 			borderColor: theme.colors.border,
@@ -495,7 +496,10 @@ const AddressFormUI = (props: AddressFormParams) => {
 	}, [orderState.loading]);
 
 	return (
-		<ScrollView>
+		<ScrollView
+			keyboardShouldPersistTaps='always'
+			listViewDisplayed={false}
+		>
 			<NavBar
 				title={t('WHERE_DO_WE_DELIVERY', 'Where do we delivery?')}
 				titleAlign={'center'}
@@ -504,7 +508,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 				paddingTop={20}
 				btnStyle={{ paddingLeft: 40 }}
 				titleStyle={{ fontSize: 14 }}
-				titleWrapStyle={{ flexBasis: '75%' }}
+				titleWrapStyle={{ paddingHorizontal: 0 }}
 			/>
 			<TouchableWithoutFeedback onPress={Keyboard.dismiss}>
 				<AddressFormContainer style={{ height: 600, overflow: 'scroll' }}>

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

@@ -60,8 +60,9 @@ const FloatingButtonUI = (props: FloatingButtonParams) => {
 
 	return (
 		<Container
-			isIos={Platform.OS === 'ios'}
-			style={{ paddingBottom: bottom + 16 }}>
+			style={{
+				paddingBottom: Platform.OS === 'ios' ? 0 : bottom + 16
+			}}>
 
 			<View style={styles.infoCont}>
 				<OText color={theme.colors.textNormal} size={16} lineHeight={24} weight={'600'} mRight={20}>

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

@@ -1,4 +1,4 @@
-import styled, { css } from 'styled-components/native'
+import styled from 'styled-components/native'
 
 export const Container = styled.View`
   position: absolute;
@@ -21,6 +21,6 @@ export const Button = styled.TouchableOpacity`
   align-items: center;
   border-radius: 7.6px;
   height: 44px;
-  max-height; 44px;
+  max-height: 44px;
   padding-horizontal: 20px;
 `

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

@@ -25,7 +25,8 @@ const UserDetailsUI = (props: any) => {
 		validationFields,
 		isUserDetailsEdit,
 		phoneUpdate,
-		togglePhoneUpdate
+		togglePhoneUpdate,
+		isCheckout
 	} = props
 
 	const theme = useTheme();
@@ -116,7 +117,7 @@ const UserDetailsUI = (props: any) => {
 							)}
 						</UDInfo>
 					) : (
-						<UserFormDetailsUI {...props} phoneUpdate={phoneUpdate} togglePhoneUpdate={togglePhoneUpdate} />
+						<UserFormDetailsUI {...props} phoneUpdate={phoneUpdate} togglePhoneUpdate={togglePhoneUpdate} isCheckout={isCheckout} />
 					)}
 				</UDContainer>
 			)}

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

@@ -14,7 +14,6 @@ export const UDWrapper = styled.View`
   flex-direction: column;
   width: 100%;
   margin-top: 20px;
-  padding-bottom: 50px;
 `
 
 export const UDLoader = styled.View`

package/themes/original/src/layouts/Container.tsx

@@ -4,7 +4,7 @@ import { Platform } from 'react-native';
 
 const ContainerStyled = styled.ScrollView`
   flex: 1;
-  ${(props: any) => !props.nopadding && css`
+  ${(props: any) => !props.noPadding && css`
     padding: ${Platform.OS === 'ios' ? '0px 40px' : '20px 40px'};
   `}
   background-color: ${(props: any) => props.theme.colors.backgroundPage};