ordering-ui-react-native 0.17.9 → 0.17.11

package/package.json

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

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

@@ -13,6 +13,7 @@ import { useTheme } from 'styled-components/native';
 import { useLocation } from '../../hooks/useLocation';
 import { FloatingButton } from '../FloatingButton';
 import { showLocation } from 'react-native-map-link';
+import { transformDistance } from '../../utils';
 
 export const DriverMap = (props: GoogleMapsParams) => {
   const {
@@ -56,6 +57,7 @@ export const DriverMap = (props: GoogleMapsParams) => {
     content: Array<string>;
     key?: string | null;
   }>({ open: false, content: [], key: null });
+  const distanceUnit = configState?.configs?.distance_unit?.value
 
   const {
     hasLocation,
@@ -475,9 +477,10 @@ export const DriverMap = (props: GoogleMapsParams) => {
                 src={theme.images.general.arrow_distance}
                 style={styles.arrowDistance}
               />
-              <OText size={12} numberOfLines={3}>{`${(
-                distancesFromTwoPlacesKm
-              ).toFixed(2)} ${t('KM', 'KM')}`}</OText>
+              <OText size={12} numberOfLines={3}>
+                {`${transformDistance(distancesFromTwoPlacesKm, distanceUnit)} ${t(distanceUnit.toUpperCase(), distanceUnit)}`} 
+              </OText>
+
             </View>
             <View style={{ width: '75%', paddingRight: 20 }}>
               <OText

package/themes/business/src/utils/index.tsx

@@ -345,3 +345,11 @@ export const getOrderStatus = (s: string, t: any) => {
 
   return objectStatus && objectStatus;
 };
+
+export const transformDistance = (value : number, distanceUnit?: string) => {
+  return distanceUnit === 'mi'
+    ? (value / 1.609).toFixed(2)
+    : distanceUnit === 'ft'
+      ? (value * 3280.84).toFixed(0)
+      : (value).toFixed(2)
+}

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

@@ -149,7 +149,7 @@ export const BusinessItemAccordion = (props: any) => {
 						<OButton
 							onClick={handleClickCheckout}
 							textStyle={{ color: 'white', textAlign: 'center', flex: 1 }}
-							style={{ width: 160, flexDirection: 'row', justifyContent: 'center', borderRadius: 7.6, shadowOpacity: 0 }}
+							style={{ width: 180, flexDirection: 'row', justifyContent: 'center', borderRadius: 7.6, shadowOpacity: 0 }}
 							text={t('CHECKOUT', 'Checkout')}
 							bgColor={(cart?.subtotal < cart?.minimum || !cart?.valid_address) ? theme.colors.secundary : theme.colors.primary}
 							borderColor={theme.colors.primary}

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

@@ -97,7 +97,8 @@ export const ProfessionalFilter = (props: ProfessionalFilterParams) => {
                 />
               ) : (
                 <OIcon
-                  src={theme?.images?.dummies?.product}
+                  src={theme?.images?.general?.user}
+                  cover={false}
                   style={styles.photoStyle}
                 />
               )}

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

@@ -6,7 +6,7 @@ import CalendarPicker from 'react-native-calendar-picker'
 import FeatherIcon from 'react-native-vector-icons/Feather';
 import moment from 'moment'
 import SelectDropdown from 'react-native-select-dropdown'
-import { OButton, OText } from '../shared'
+import { OButton, OText, OIcon } from '../shared'
 import IconAntDesign from 'react-native-vector-icons/AntDesign'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { ProfessionalProfileParams } from '../../types'
@@ -58,6 +58,9 @@ export const ProfessionalProfile = (props: ProfessionalProfileParams) => {
       height: 40,
       marginBottom: 30
     },
+    photoStyle: {
+      alignSelf: 'center'
+    }
   })
 
   const onDateChange = (date: any) => {
@@ -151,13 +154,21 @@ export const ProfessionalProfile = (props: ProfessionalProfileParams) => {
 
   return (
     <Container>
-			<ProfessionalPhoto
-				source={{
-					uri:
-          professional?.photo ||
-						optimizeImage(theme.images.general.user, 'h_250,c_limit'),
-				}}
-      />
+      {!!professional?.photo ? (
+        <ProfessionalPhoto
+          source={{
+            uri: professional?.photo
+          }}
+        />
+      ) : (
+        <OIcon
+          src={theme.images.general.user}
+          style={styles.photoStyle}
+          cover={false}
+          width={200}
+          height={200}
+        />
+      )}
       <InfoWrapper>
         <OText
           size={20}

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

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef } from 'react'
 import { useTheme } from 'styled-components/native'
 import { Platform, View, StyleSheet, Dimensions, ScrollView, TouchableOpacity } from 'react-native'
-import { OText, OButton, OModal } from '../shared'
+import { OText, OButton, OModal, OIcon } from '../shared'
 import FastImage from 'react-native-fast-image'
 import IconAntDesign from 'react-native-vector-icons/AntDesign'
 import SelectDropdown from 'react-native-select-dropdown'
@@ -241,13 +241,21 @@ const ServiceFormUI = (props: ServiceFormParams) => {
   return (
     <>
       <Container>
-        <ProfessionalPhoto
-          source={{
-            uri:
-            product?.images ||
-              optimizeImage(theme?.images?.dummies?.product, 'h_250,c_limit'),
-          }}
-        />
+        {!!product?.images ? (
+          <ProfessionalPhoto
+            source={{
+              uri: product?.images
+            }}
+          />
+        ) : (
+          <OIcon
+            src={theme?.images?.dummies?.product}
+            cover={false}
+            style={{ alignSelf: 'center' }}
+            width={200}
+            height={200}
+          />
+        )}
         <InfoWrapper>
           <OText
             size={20}
@@ -301,14 +309,22 @@ const ServiceFormUI = (props: ServiceFormParams) => {
               onPress={() => setIsOpen(true)}
             >
               <View style={{ flexDirection: 'row' }}>
-                <FastImage
-                  style={styles.photoStyle}
-                  source={{
-                    uri: optimizeImage(currentProfessional?.photo, 'h_250,c_limit'),
-                    priority: FastImage.priority.normal,
-                  }}
-                  resizeMode={FastImage.resizeMode.cover}
-                />
+                {!!currentProfessional?.photo ? (
+                  <FastImage
+                    style={styles.photoStyle}
+                    source={{
+                      uri: optimizeImage(currentProfessional?.photo, 'h_250,c_limit'),
+                      priority: FastImage.priority.normal,
+                    }}
+                    resizeMode={FastImage.resizeMode.cover}
+                  />
+                ) : (
+                  <OIcon
+                    src={theme?.images?.general?.user}
+                    cover={false}
+                    style={styles.photoStyle}
+                  />
+                )}
                 <View style={{ marginLeft: 14 }}>
                   <OText
                     size={14}
@@ -532,14 +548,22 @@ const ServiceFormUI = (props: ServiceFormParams) => {
               onPress={() => handleChangeProfessional(professional)}
             >
               <View style={{ flexDirection: 'row' }}>
-                <FastImage
-                  style={styles.photoStyle}
-                  source={{
-                    uri: optimizeImage(professional?.photo, 'h_250,c_limit'),
-                    priority: FastImage.priority.normal,
-                  }}
-                  resizeMode={FastImage.resizeMode.cover}
-                />
+                {!!professional?.photo ? (
+                  <FastImage
+                    style={styles.photoStyle}
+                    source={{
+                      uri: optimizeImage(professional?.photo, 'h_250,c_limit'),
+                      priority: FastImage.priority.normal,
+                    }}
+                    resizeMode={FastImage.resizeMode.cover}
+                  />
+                ) : (
+                  <OIcon
+                    src={theme?.images?.general?.user}
+                    cover={false}
+                    style={styles.photoStyle}
+                  />
+                )}
                 <View style={{ marginLeft: 14 }}>
                   <OText
                     size={14}