ordering-ui-react-native 0.22.30 → 0.22.32

package/package.json

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

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

@@ -165,14 +165,16 @@ const MapViewComponent = (props: MapViewParams) => {
           size={50}
           color={theme.colors.primary}
         />
-        <View style={styles.view}>
-          <OIcon
-            style={styles.image}
-            src={{ uri: customer ? marker?.customer?.photo : marker?.business?.logo }}
-            width={25}
-            height={25}
-          />
-        </View>
+        {(!!marker?.customer?.photo || !!marker?.business?.logo) && (
+          <View style={styles.view}>
+            <OIcon
+              style={styles.image}
+              src={{ uri: customer ? marker?.customer?.photo : marker?.business?.logo }}
+              width={25}
+              height={25}
+            />
+          </View>
+        )}
         <Callout
           onPress={() => !!orderIds && orderIds.toString().includes(',') ? onNavigationRedirect('Orders') : onNavigationRedirect('OrderDetails', { order: marker })}
         >
@@ -193,8 +195,8 @@ const MapViewComponent = (props: MapViewParams) => {
             {((customer && marker?.customer?.city?.address_notes) || !customer) && (
               <OText>{customer ? marker?.customer?.city?.address_notes : marker?.business?.city?.name}</OText>
             )}
-            {((customer && marker?.business?.zipcode) || (!customer && marker?.business?.zipcode)) && (
-              <OText>{customer ? marker?.customer?.zipcode : marker?.business?.zipcode}</OText>
+            {((customer && !!marker?.business?.zipcode) || (!customer && !!marker?.business?.zipcode)) && (
+              <OText>{customer ? marker?.customer?.zipcode ?? '' : marker?.business?.zipcode ?? ''}</OText>
             )}
             {customer && !!marker?.customer?.internal_number && (
               <OText>{marker?.customer?.internal_number}</OText>

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

@@ -6,7 +6,7 @@ import { useTheme } from 'styled-components/native';
 import { Wrapper } from './styles';
 import { OText, OIcon } from '../shared';
 import { PhoneInputParams } from '../../types';
-import { transformCountryCode } from '../../utils';
+import { transformCountryCode, findExitingCode } from '../../utils';
 
 export const PhoneInputNumber = (props: PhoneInputParams) => {
   const {
@@ -97,10 +97,13 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
         containerStyle={{ width: '100%' }}
         ref={phoneInput}
         defaultValue={userphoneNumber || defaultValue}
-        defaultCode={
-          defaultCode
-            ? transformCountryCode(defaultCode)
-            : configs?.default_country_code?.value
+        defaultCode={defaultCode ?
+					!isNaN(defaultCode)
+						? transformCountryCode(defaultCode)
+						: findExitingCode(defaultCode)
+					: !isNaN((configs?.default_country_code?.value || '')?.replace(/\+/g, ''))
+             ? transformCountryCode((configs?.default_country_code?.value || '')?.replace(/\+/g, ''))
+             : findExitingCode(configs?.default_country_code?.value?.toUpperCase())
         }
         onChangeFormattedText={(text: string) => handleChangeNumber(text)}
         countryPickerProps={{

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

@@ -146,6 +146,11 @@ export const transformCountryCode = (countryCode: number) => {
   return code?.countryCode;
 };
 
+export const findExitingCode = (countryCode: string) => {
+  const code = CODES.find((code: any) => code.countryCode === (countryCode || '').toUpperCase())
+  return code?.countryCode
+}
+
 /**
  * Function to check if a number is decimal or not
  * @param {*} value number to check if decimal or not