ordering-ui-react-native 0.21.31-testing → 0.21.32-release

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

@@ -25,6 +25,7 @@ const FloatingButtonUI = (props: FloatingButtonParams) => {
     secondButton,
     widthButton,
     isPadding,
+    isHideRejectButtons
   } = props;
 
   const theme = useTheme();
@@ -61,39 +62,41 @@ const FloatingButtonUI = (props: FloatingButtonParams) => {
           width: '100%',
           justifyContent: 'space-between',
         }}>
-        <Button
-          secondButton={secondButton}
-          style={[
-            {
-              borderWidth: colorTxt1 ? 1 : 0,
-              borderColor: colorTxt1 ? colorTxt1 : null,
-            },
-            secondButton
-              ? { backgroundColor: firstColorCustom || styles.primaryBtn }
-              : color
-              ? { backgroundColor: color }
-              : styles.primaryBtn,
-            ,
-            { width: widthButton },
-          ]}
-          onPress={firstButtonClick}
-          disabled={disabled}>
-          <OText color={theme.colors.white} size={16} mLeft={20}>
-            {btnLeftValueShow ? btnLeftValue : ''}
-          </OText>
+        {!isHideRejectButtons && (
+          <Button
+            secondButton={secondButton}
+            style={[
+              {
+                borderWidth: colorTxt1 ? 1 : 0,
+                borderColor: colorTxt1 ? colorTxt1 : null,
+              },
+              secondButton
+                ? { backgroundColor: firstColorCustom || styles.primaryBtn }
+                : color
+                ? { backgroundColor: color }
+                : styles.primaryBtn,
+              ,
+              { width: widthButton },
+            ]}
+            onPress={firstButtonClick}
+            disabled={disabled}>
+            <OText color={theme.colors.white} size={16} mLeft={20}>
+              {btnLeftValueShow ? btnLeftValue : ''}
+            </OText>
 
-          <OText
-            style={styles.btnTextStyle}
-            color={colorTxt1 ? colorTxt1 : theme.colors.white}
-            numberOfLines={2}
-            adjustsFontSizeToFit>
-            {btnText}
-          </OText>
+            <OText
+              style={styles.btnTextStyle}
+              color={colorTxt1 ? colorTxt1 : theme.colors.white}
+              numberOfLines={2}
+              adjustsFontSizeToFit>
+              {btnText}
+            </OText>
 
-          <OText color={theme.colors.white} size={16} mRight={20}>
-            {btnRightValueShow ? btnRightValue : ''}
-          </OText>
-        </Button>
+            <OText color={theme.colors.white} size={16} mRight={20}>
+              {btnRightValueShow ? btnRightValue : ''}
+            </OText>
+          </Button>
+        )}
 
         {secondButton && (
           <Button

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

@@ -50,12 +50,16 @@ export const GoogleMap = (props: GoogleMapsParams) => {
   const ASPECT_RATIO = width / height;
   const [isMapReady, setIsMapReady] = useState(false);
   const [markerPosition, setMarkerPosition] = useState({
-    latitude: locations ? locations[locations.length - 1].lat : location.lat,
-    longitude: locations ? locations[locations.length - 1].lng : location.lng,
+    latitude: locations 
+      ? typeof locations[locations.length - 1].lat === 'string' ? parseFloat(locations[locations.length - 1].lat) || 0 : locations[locations.length - 1].lat || 0
+      : typeof location?.lat === 'string' ? parseFloat(location?.lat) || 0 : location?.lat || 0,
+    longitude: locations 
+      ? typeof locations[locations.length - 1].lng === 'string' ? parseFloat(locations[locations.length - 1].lng) || 0 : locations[locations.length - 1].lng || 0
+      : typeof location?.lng === 'string' ? parseFloat(location?.lng) || 0 : location?.lng || 0,
   });
   const [region, setRegion] = useState({
-    latitude: location.lat,
-    longitude: location.lng,
+    latitude: typeof location?.lat === 'string' ? parseFloat(location?.lat) || 0 : location?.lat || 0,
+    longitude: typeof location?.lng === 'string' ? parseFloat(location?.lng) || 0 : location?.lng || 0,
     latitudeDelta: 0.001,
     longitudeDelta: 0.001 * ASPECT_RATIO,
   });
@@ -78,12 +82,15 @@ export const GoogleMap = (props: GoogleMapsParams) => {
   let MARKERS =
     locations &&
     locations.map((location: { lat: number; lng: number; level: number }) => {
-      return location.level === 4 && driverLocation?.lat
+      return location.level === 4 && driverLocation?.lat && driverLocation?.lng
         ? {
-          latitude: driverLocation?.lat,
-          longitude: driverLocation?.lng,
+          latitude: typeof driverLocation?.lat === 'string' ? parseFloat(driverLocation?.lat) || 0 : driverLocation?.lat,
+          longitude: typeof driverLocation?.lng === 'string' ? parseFloat(driverLocation?.lng) || 0 : driverLocation?.lng,
         }
-        : { latitude: location.lat, longitude: location.lng };
+        : {
+          latitude: typeof location?.lat === 'string' ? parseFloat(location?.lat) || 0 : location?.lat,
+          longitude: typeof location?.lng === 'string' ? parseFloat(location?.lng) || 0 : location?.lng
+        };
     });
 
   const handleArrowBack: any = () => {

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

@@ -138,7 +138,10 @@ export const Home = (props: any) => {
                       placeholder={t('PROJECT_NAME', 'Project Name')}
                       icon={theme.images.general.project}
                       iconColor={theme.colors.arrowColor}
-                      onChange={(e: any) => onChange(e?.target?.value)}
+                      onChange={(e: any) => {
+                        const project = e?.target?.value?.replace(/\s/g, '')
+                        onChange(project)
+                      }}
                       selectionColor={theme.colors.primary}
                       color={theme.colors.white}
                       value={value}
@@ -148,6 +151,7 @@ export const Home = (props: any) => {
                       autoCapitalize='none'
                       blurOnSubmit={false}
                       onSubmitEditing={() => handleSubmit(onSubmit)()}
+                      isValueSync
                     />
                   )}
                 />

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

@@ -25,8 +25,7 @@ const LanguageSelectorUI = (props: LanguageSelectorParams) => {
       value: language?.code,
       label: language?.name,
       inputLabel: language?.code.toUpperCase(),
-      countryCode: langCountries.find(item => item.value == language?.code)
-        ?.countryCode,
+      countryCode: langCountries.find(item => item.value == language?.code)?.countryCode,
     };
   });