ordering-ui-react-native 0.17.31 → 0.17.33

package/package.json

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

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

@@ -9,7 +9,7 @@ const TitleWrapper = styled.View`
   padding-horizontal: 10px;
 `
 const TitleTopWrapper = styled.View`
-  flex-grow: 1;
+  flex: 1;
   flex-direction: row;
   align-items: center;
 `
@@ -40,7 +40,8 @@ interface Props {
 	style?: ViewStyle,
 	titleWrapStyle?: ViewStyle,
 	paddingTop?: number,
-	isVertical?: boolean
+	isVertical?: boolean,
+	noMargin?: any
 }
 
 const NavBar = (props: Props) => {
@@ -96,10 +97,9 @@ const NavBar = (props: Props) => {
 						style={
 							{
 								textAlign: props.titleAlign ? props.titleAlign : 'center',
-								marginRight: props.showCall ? 0 : 40,
+								marginRight: (props.showCall || !!props.noMargin) ? 0 : 40,
 								color: props.titleColor || theme.colors.textNormal,
 								paddingHorizontal: props.titleAlign == 'left' ? 12 : 0,
-								width: '100%',
 								...props.titleStyle,
 							}
 						}

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

@@ -101,6 +101,7 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 						title={t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will your order type?')}
 						titleAlign={'center'}
 						titleStyle={{ fontSize: 14 }}
+						noMargin
 					/>
 					{
 						items.length > 0 && (

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

@@ -528,13 +528,13 @@ export const ProductOptionsUI = (props: any) => {
 											style={styles.slide1}
 											key={i}
 										>
-											{String(img).includes('image') ? (
+											{String(img).includes('image') || typeof img === 'number' ? (
 												<FastImage
 													style={{ height: '100%', opacity: isSoldOut ? 0.5 : 1, aspectRatio: 3 / 2 }}
-													source={{
+													source={typeof img !== 'number' ? {
 														uri: optimizeImage(img, 'h_1024,c_limit'),
 														priority: FastImage.priority.normal,
-													}}
+													} : img}
 												/>
 											) : (
 												<>

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

@@ -173,7 +173,8 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
           {(!!order.business?.logo || theme?.images?.dummies?.businessLogo) && (
             <Logo style={styles.logoWrapper}>
               <OIcon
-                url={optimizeImage(order.business?.logo || theme?.images?.dummies?.businessLogo, 'h_300,c_limit')}
+                url={optimizeImage(order.business?.logo, 'h_300,c_limit')}
+                src={optimizeImage(!order.business?.logo && theme?.images?.dummies?.businessLogo, 'h_300,c_limit')}
                 style={styles.logo}
               />
             </Logo>