ordering-ui-react-native 0.17.36 → 0.17.38

package/package.json

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

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

@@ -589,10 +589,11 @@ const AddressFormUI = (props: AddressFormParams) => {
 													borderColor: theme.colors.border,
 													flexGrow: 1,
 													fontSize: 15,
-													paddingHorizontal: 16,
+													paddingLeft: 16,
+													paddingRight: 32,
 													minHeight: 50,
 													fontFamily: 'Poppins-Regular',
-													marginBottom: 24,
+													marginBottom: 24
 												},
 											}}
 										/>
@@ -600,9 +601,9 @@ const AddressFormUI = (props: AddressFormParams) => {
 								/>
 
 								{(
-									((!isEditing && !isGuestUser && !formState.changes?.address) ||
-										(isEditing && !isGuestUser && !formState.changes?.address && formState.changes?.address !== undefined)) ||
-									(isGuestUser && !formState.changes?.address)) &&
+									((!isEditing && !isGuestUser) ||
+										(isEditing && !isGuestUser)) ||
+									(isGuestUser)) &&
 									(
 										<View style={styles.pinIcon}>
 											<GPSButton

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

@@ -5,6 +5,7 @@ import { useTheme } from 'styled-components/native';
 import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons'
 import RNPickerSelect from 'react-native-picker-select'
 import { ServiceForm } from '../ServiceForm';
+import FastImage from 'react-native-fast-image'
 
 import {
 	Accordion,
@@ -157,12 +158,40 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 							{(product?.images || theme?.images?.dummies?.product) && (
 								<ProductImage>
 									{isFromCheckout ? (
-										<OIcon url={optimizeImage(product?.images || theme?.images?.dummies?.product, 'h_100,c_limit')} style={{ ...styles.productImage, ...{ width: 82, height: 82 } }} />
+										product?.images ? (
+											<FastImage
+												style={{ ...styles.productImage, ...{ width: 82, height: 82 } }}
+												source={{
+													uri: optimizeImage(product?.images, 'h_100,c_limit'),
+													priority: FastImage.priority.normal,
+												}}
+												resizeMode={FastImage.resizeMode.cover}
+											/>
+										) : (
+											<OIcon
+												src={theme?.images?.dummies?.product}
+												style={{ ...styles.productImage, ...{ width: 82, height: 82 } }}
+											/>
+										)
 									) : (
-										<OIcon url={optimizeImage(product?.images || theme?.images?.dummies?.product, 'h_100,c_limit')} style={styles.productImage} />
+										product?.images ? (
+											<FastImage
+												style={styles.productImage}
+												source={{
+													uri: optimizeImage(product?.images, 'h_100,c_limit'),
+													priority: FastImage.priority.normal,
+												}}
+												resizeMode={FastImage.resizeMode.cover}
+											/>
+										) : (
+											<OIcon
+												src={theme?.images?.dummies?.product}
+												style={styles.productImage}
+											/>
+										)
 									)}
 								</ProductImage>
-							)}
+								)}
 							{!!product?.calendar_event ? (
 								<View style={{ flex: 1, marginLeft: 10, flexDirection: 'column' }}>
 									<View>

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

@@ -26,7 +26,14 @@ const OImage = (props: Props): React.ReactElement => {
 	return (
 		<Wrapper style={{ borderRadius: props.style?.borderRadius, overflow: 'hidden', marginHorizontal: props.style?.marginHorizontal }}>
 			<SImage
-				source={props.src ? props.src : props.url ? { uri: props.url } : props.dummy}
+				source={
+					props.src
+						? props.src
+						: props.url
+							? typeof props.url === 'number'
+								? props.url
+								: { uri: props.url }
+							: props.dummy}
 				style={{
 					tintColor: props.color,
 					flex: props.isWrap ? 1 : 0,