ordering-ui-react-native 0.17.10 → 0.17.11-release

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

@@ -7,7 +7,7 @@ import { Wrapper } from './styles'
 
 import { PhoneInputParams } from '../../types';
 import { OIcon, OText } from '../shared';
-import { transformCountryCode } from '../../utils'
+import { findExitingCode, transformCountryCode } from '../../utils'
 
 export const PhoneInputNumber = (props: PhoneInputParams) => {
 	const {
@@ -113,7 +113,7 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 					!isNaN(defaultCode)
 						? transformCountryCode(defaultCode)
 						: defaultCode
-					: configs?.default_country_code?.value}
+					: findExitingCode(configs?.default_country_code?.value?.toUpperCase())}
 				onChangeFormattedText={(text: string) => handleChangeNumber(text)}
 				withDarkTheme
 				onChangeCountry={(country) => changeCountry?.(country)}
@@ -124,7 +124,7 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 				flagButtonStyle={flagStyle}
 				countryPickerButtonStyle={{ ...style.countryBtn, ...boxStyle ? boxStyle : {} }}
 				placeholder={t('PHONE_NUMBER', 'Phone Number')}
-				textInputProps={{ autoCompleteType: 'tel', ref: forwardRef, ...textInputProps }}
+				textInputProps={{ keyboardType: 'number-pad', autoCompleteType: 'tel', textContentType: 'telephoneNumber', dataDetectorTypes: 'phoneNumber', ref: forwardRef, ...textInputProps }}
 				containerStyle={{ width: '100%' }}
 				renderDropdownImage={noDropIcon ? <View /> : <OIcon src={theme.images.general.arrow_down} width={13} color={'#B1BCCC'}></OIcon>}
 			/>

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

@@ -23,13 +23,14 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
     isInputMode,
     setSpotNumber,
     setVehicle,
-    handleChangeSpot
+    handleChangeSpot,
+    setPlaceSpotNumber
   } = props
 
   const theme = useTheme()
   const [, t] = useLanguage()
   const [orderState] = useOrder()
-	const [, { showToast }] = useToast();
+  const [, { showToast }] = useToast();
 
   const [placeGroupSelected, setPlaceGroupSelected] = useState<any>(null)
   const vehicleInputAllowed = [4, 5]
@@ -135,10 +136,15 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
   useEffect(() => {
     if (spotState?.error?.length > 0) {
       const errorText = manageErrorsToShow(spotState?.error)
-			showToast(ToastType.Error, errorText)
+      showToast(ToastType.Error, errorText)
     }
   }, [spotState?.error])
 
+  const onChangePlaceSpot = (value: string) => {
+    setSpotNumber(value)
+    setPlaceSpotNumber(value)
+  }
+
   return (
     <PlaceSpotContainer>
       {isInputMode ? (
@@ -220,12 +226,12 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
             value={spotNumber?.toString() ?? ''}
             placeholder={placeholderText}
             type='number-pad'
-            onChange={(value: string) => setSpotNumber(value)}
+            onChange={(value: string) => onChangePlaceSpot(value)}
             style={{
               borderColor: theme.colors.border,
               borderRadius: 7.6
             }}
-						inputStyle={{ fontSize: 12, color: theme.colors.textNormal }}
+            inputStyle={{ fontSize: 12, color: theme.colors.textNormal }}
           />
           <View style={{ alignItems: 'flex-start' }}>
             <OButton
@@ -278,7 +284,7 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
                     onSelect={(place: any) => handlerChangePlace(place)}
                     placeholder={t('SELECT_YOUR_SPOT', 'Select your spot')}
                     options={getPlaces()}
-                    defaultValue={placesState?.places?.find((place : any) => place?.id === cart?.place_id)}
+                    defaultValue={placesState?.places?.find((place: any) => place?.id === cart?.place_id)}
                     isModal
                   />
                 </View>

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

@@ -19,7 +19,8 @@ export const PreviousOrders = (props: PreviousOrdersParams) => {
 		handleReorder,
 		reorderLoading,
 		orderID,
-		handleUpdateOrderList
+		handleUpdateOrderList,
+		loading
 	} = props;
 
 	const theme = useTheme();
@@ -42,7 +43,7 @@ export const PreviousOrders = (props: PreviousOrdersParams) => {
 					handleUpdateOrderList={handleUpdateOrderList}
 				/>
 			))}
-			{pagination.totalPages && pagination.currentPage < pagination.totalPages && (
+			{!loading && pagination.totalPages && pagination.currentPage < pagination.totalPages && (
 				<WrappButton>
 					<OButton
 						onClick={loadMoreOrders}