ordering-ui-react-native 0.14.54 → 0.14.57

package/package.json

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

package/src/components/BusinessesListing/index.tsx

@@ -191,7 +191,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
         {isFarAway && (
 					<FarAwayMessage style={styles.farAwayMsg}>
 						<Ionicons name='md-warning-outline' style={styles.iconStyle} />
-						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
       </OrderControlContainer>

package/src/components/StripeElementsForm/index.tsx

@@ -33,19 +33,33 @@ const StripeElementsFormUI = (props: any) => {
   const { confirmSetupIntent, loading: confirmSetupLoading } = useConfirmSetupIntent();
   const [createPmLoading, setCreatePmLoading] = useState(false);
 
-  const billingDetails = {
-    name: `${user.name} ${user.lastname}`,
-    email: user.email,
-    address: user.address
-  };
+  let billingDetails: any = {}
+
+  if (user?.name || user?.lastname) {
+    if (user?.name) {
+      billingDetails.name = user?.name
+    }
+    if (user?.lastname) {
+      billingDetails.name = `${billingDetails?.name} ${user?.lastname}`
+    }
+  }
+
+  if (user?.email) {
+    billingDetails.email = user?.email
+  }
+
+  if (user?.address) {
+    billingDetails.addressLine1 = user?.address
+  }
 
   const createPayMethod = async () => {
+    const params: any = { type: 'Card' }
+    if (Object.keys(billingDetails).length > 0) {
+      params.billingDetails = billingDetails
+    }
     try {
       setCreatePmLoading(true)
-      const { paymentMethod } = await createPaymentMethod({
-        type: 'Card',
-        billingDetails,
-      });
+      const { paymentMethod } = await createPaymentMethod(params);
 
       setCreatePmLoading(false)
       handleSource && handleSource({
@@ -68,11 +82,12 @@ const StripeElementsFormUI = (props: any) => {
       createPayMethod();
       return
     }
+    const params: any = { type: 'Card' }
+    if (Object.keys(billingDetails).length > 0) {
+      params.billingDetails = billingDetails
+    }
     try {
-      const { setupIntent, error } = await confirmSetupIntent(requirements, {
-        type: 'Card',
-        billingDetails,
-      });
+      const { setupIntent, error } = await confirmSetupIntent(requirements, params);
 
       if (setupIntent?.status === 'Succeeded') {
         stripeTokenHandler(setupIntent?.paymentMethodId, user, businessId);

package/src/components/TaxInformation/index.tsx

@@ -36,7 +36,7 @@ export const TaxInformation = (props: taxInformationParams) => {
         ? (product.tax?.id ? product.tax?.id === data?.id : product.tax?.id === null && data?.id === null)
         : type === 'fee'
           ? (product.fee?.id ? product.fee?.id === data?.id : (product.fee?.id === null && data?.id === null))
-          : Object.keys(data?.discounts ?? {}).map(code => code.includes(product?.code))
+          : Object.keys(data?.discounts ?? {}).map(code => code.includes(product?.code)) && product?.offers?.find(offer => offer?.name === data?.name)
     )
   }
 

package/themes/doordash/src/components/BusinessesListing/index.tsx

@@ -197,7 +197,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 			{isFarAway && (
 				<FarAwayMessage style={styles.farAwayMsg}>
 					<Ionicons name='md-warning-outline' style={styles.iconStyle} />
-					<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
+					<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
 				</FarAwayMessage>
 			)}
 			{!auth && (

package/themes/instacart/src/components/BusinessesListing/index.tsx

@@ -155,7 +155,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 				{isFarAway && (
 					<FarAwayMessage style={styles.farAwayMsg}>
 						<Ionicons name='md-warning-outline' style={styles.iconStyle} />
-						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
 				<View style={styles.wrapperOrderOptions}>

package/themes/original/index.tsx

@@ -32,6 +32,7 @@ import { Wallets } from './src/components/Wallets';
 import { PaymentOptionWallet } from './src/components/PaymentOptionWallet';
 import { ProductForm } from './src/components/ProductForm';
 import { UpsellingProducts } from './src/components/UpsellingProducts';
+import { VerifyEmail } from './src/components/VerifyEmail';
 
 import { Toast } from './src/components/shared/OToast';
 import {
@@ -94,6 +95,7 @@ export {
   PaymentOptionWallet,
   ProductForm,
   UpsellingProducts,
+  VerifyEmail,
 
 	// OComponents
 	Toast,

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

@@ -25,7 +25,7 @@ import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome5';
 import FastImage from 'react-native-fast-image'
 
 export const BusinessControllerUI = (props: BusinessControllerParams) => {
-	const { business, handleClick, navigation } = props;
+	const { business, handleClick, navigation, isBusinessOpen } = props;
 	const [{ parsePrice, parseDistance, parseNumber, optimizeImage }] =
 		useUtils();
 	const [orderState] = useOrder();
@@ -122,7 +122,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 					</View>
 				)}
 				<BusinessState>
-					{!business?.open && (
+					{!isBusinessOpen && (
 						<View style={styles.businessStateView}>
 							<OText
 								color={theme.colors.textThird}
@@ -168,7 +168,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
           <OText>{getBusinessType()}</OText>
         </BusinessCategory> */}
 				<Metadata>
-					{!business?.open ? (
+					{!isBusinessOpen ? (
 						<View style={styles.closed}>
 							<OText size={10} color={theme.colors.red}>
 								{t('CLOSED', 'Closed')}

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

@@ -23,7 +23,7 @@ import {
 } from './styles';
 
 export const BusinessFeaturedCtrlUI = (props: BusinessControllerParams) => {
-	const { business, handleClick } = props;
+	const { business, handleClick, isBusinessOpen } = props;
 	const [{ parsePrice, parseDistance, parseNumber, optimizeImage }] =
 		useUtils();
 	const [orderState] = useOrder();
@@ -128,7 +128,7 @@ export const BusinessFeaturedCtrlUI = (props: BusinessControllerParams) => {
             <OText>{getBusinessType()}</OText>
           </BusinessCategory> */}
 					<Metadata>
-						{!business?.open ? (
+						{!isBusinessOpen ? (
 							<View style={styles.closed}>
 								<OText size={10} color={theme.colors.red}>
 									{t('CLOSED', 'Closed')}

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

@@ -130,8 +130,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     disabledDateNumber: {
       color: '#B1BCCC',
       fontSize: 14,
-      fontWeight: '500',
-
+      fontWeight: '500'
     }
   })
 

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

@@ -155,6 +155,10 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const handleTouchDrag = useCallback(() => {
 		setCategoryClicked(false);
 	  }, []);
+	
+	const handleBackNavigation = () => {
+		navigation?.canGoBack() ? navigation.goBack() : navigation.navigate('BottomTab')
+	}
 
 	return (
 		<SafeAreaView
@@ -169,7 +173,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 									imgLeftSrc={theme.images.general.arrow_left}
 									imgRightSrc={null}
 									style={styles.btnBackArrow}
-									onClick={() => navigation?.canGoBack() && navigation.goBack()}
+									onClick={() => handleBackNavigation()}
 									imgLeftStyle={{ tintColor: theme.colors.textNormal, width: 16 }}
 								/>
 							</View>
@@ -231,7 +235,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 								selectedCategoryId={selectedCategoryId}
 								lazyLoadProductsRecommended={business?.lazy_load_products_recommended}
 								setSelectedCategoryId={setSelectedCategoryId}
-              	setCategoryClicked={setCategoryClicked}
+              					setCategoryClicked={setCategoryClicked}
 							/>
 						)}
 					</>
@@ -309,13 +313,13 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 					business={currentCart?.business}
 					cartProducts={currentCart?.products}
 					cart={currentCart}
-          setOpenUpselling={setOpenUpselling}
+          			setOpenUpselling={setOpenUpselling}
 					handleUpsellingPage={handleUpsellingPage}
 					handleCloseUpsellingPage={handleCloseUpsellingPage}
 					openUpselling={openUpselling}
 					canOpenUpselling={canOpenUpselling}
 					setCanOpenUpselling={setCanOpenUpselling}
-          onRedirect={onRedirect}
+          			onRedirect={onRedirect}
 				/>
 			)}
 		</SafeAreaView>

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

@@ -177,11 +177,8 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 	// }, [])
 
 	const handleOnRefresh = () => {
-		const hasMore = !(
-			paginationProps.totalPages === paginationProps.currentPage
-		);
-		if (!businessesList.loading && hasMore) {
-			getBusinesses();
+		if (!businessesList.loading) {
+			getBusinesses(true);
 		}
 	}
 
@@ -315,6 +312,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 									<BusinessFeaturedController
 										key={bAry[0].id}
 										business={bAry[0]}
+										isBusinessOpen={bAry[0]?.open}
 										handleCustomClick={handleBusinessClick}
 										orderType={orderState?.options?.type}
 									/>
@@ -322,6 +320,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 										<BusinessFeaturedController
 											key={bAry[1].id}
 											business={bAry[1]}
+											isBusinessOpen={bAry[1]?.open}
 											handleCustomClick={handleBusinessClick}
 											orderType={orderState?.options?.type}
 										/>
@@ -361,6 +360,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 						<BusinessController
 							key={business.id}
 							business={business}
+							isBusinessOpen={business.open}
 							handleCustomClick={handleBusinessClick}
 							orderType={orderState?.options?.type}
 							navigation={navigation}

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

@@ -103,6 +103,7 @@ const HighestRatedBusinessesUI = (props: HighestRatedBusinessesParams) => {
                     >
                       <BusinessController
                         business={business}
+                        isBusinessOpen={business?.open}
                         handleCustomClick={onBusinessClick}
                         orderType={orderState?.options?.type}
                         navigation={navigation}

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

@@ -5,7 +5,7 @@ import { useTheme } from 'styled-components/native';
 import { OIcon, OText } from '../shared';
 
 const LogoutButtonUI = (props: any) => {
-	const { handleLogoutClick, text, color } = props
+	const { handleLogoutClick, text, color, iconSize } = props
 	const theme = useTheme();
 
 	return (
@@ -15,7 +15,7 @@ const LogoutButtonUI = (props: any) => {
 		>
 			<OIcon
 				src={theme.images.general.logout}
-				width={17}
+				width={iconSize ?? 17}
 				color={color ? color : theme.colors.textNormal}
 				style={{ marginEnd: 14 }}
 			/>