ordering-ui-react-native 0.16.13 → 0.16.16

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

@@ -18,17 +18,19 @@ import { shape } from '../../utils';
 function SingleProductCardPropsAreEqual(prevProps : any, nextProps : any) {
 	return JSON.stringify(prevProps.product) === JSON.stringify(nextProps.product) && 
 	prevProps.isSoldOut === nextProps.isSoldOut && 
-	prevProps.productAddedToCartLength === nextProps.productAddedToCartLength
+	prevProps.productAddedToCartLength === nextProps.productAddedToCartLength &&
+	prevProps.categoryState === nextProps.categoryState
 }
 
-const SinguleProductCardUI = (props: SingleProductCardParams) => {
+const SinguleProductCardUI = React.memo((props: SingleProductCardParams) => {
 	const {
 		product,
 		isSoldOut,
 		onProductClick,
 		productAddedToCartLength,
 		style,
-		handleFavoriteProduct
+		handleFavoriteProduct,
+		handleUpdateProducts
 	} = props;
 
 	const theme = useTheme();
@@ -210,12 +212,12 @@ const SinguleProductCardUI = (props: SingleProductCardParams) => {
 			)}
 		</CardContainer>
 	);
-}
+}, SingleProductCardPropsAreEqual);
 
-export const SingleProductCard = React.memo((props: SingleProductCardParams) => {
+export const SingleProductCard = (props: SingleProductCardParams) => {
 	const singleProductCardProps = {
 		...props,
 		UIComponent: SinguleProductCardUI
 	}
 	return <SingleProductCardController {...singleProductCardProps} />
-}, SingleProductCardPropsAreEqual);
+}

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

@@ -27,7 +27,8 @@ const StripeElementsFormUI = (props: any) => {
 		paymethod,
 		onCancel,
 		cart,
-		merchantId
+		merchantId,
+		businessIds
 	} = props;
 
 	const theme = useTheme();
@@ -108,7 +109,14 @@ const StripeElementsFormUI = (props: any) => {
 			const { setupIntent, error } = await confirmSetupIntent(requirements, params);
 
 			if (setupIntent?.status === 'Succeeded') {
-				stripeTokenHandler(setupIntent?.paymentMethodId, user, businessId);
+				if (businessIds) {
+					businessIds.forEach((_businessId: any, index: any) => {
+					  const _isNewCard = index === 0
+					  stripeTokenHandler(setupIntent?.paymentMethodId, user, businessId, _isNewCard);
+					})
+				} else {
+					stripeTokenHandler(setupIntent?.paymentMethodId, user, businessId);
+				}
 			}
 
 			if (error) {

package/themes/original/src/components/StripeElementsForm/naked.tsx

@@ -40,7 +40,7 @@ export const StripeElementsForm = (props: any) => {
     }
   }
 
-  const stripeTokenHandler = async (tokenId: string, user: any, businessId: string) => {
+  const stripeTokenHandler = async (tokenId: string, user: any, businessId: string, isNewCard: any = true) => {
     try {
       setState({
         ...state,
@@ -60,7 +60,7 @@ export const StripeElementsForm = (props: any) => {
         })
       })
       const response = await result.json();
-      props.onSelectCard && props.onSelectCard(response.result);
+      isNewCard && props.onSelectCard && props.onSelectCard(response.result);
       setState({
         ...state,
         loadingAdd: false

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

@@ -138,7 +138,7 @@ const UserDetailsUI = (props: any) => {
 			{!(validationFields.loading || formState.loading) && (
 				<UDContainer>
 					<UDHeader>
-						<OText size={16} lineHeight={24} weight={'500'}>
+						<OText size={16} lineHeight={24} weight={'500'} color={theme.colors.textNormal}>
 							{t('CUSTOMER_DETAILS', 'Customer Details')}
 						</OText>
 						{cartStatus !== 2 && (

package/themes/original/src/types/index.tsx

@@ -18,10 +18,10 @@ export interface LoginParams {
 	handleCheckPhoneCode?: any;
 	notificationState?: any;
 	handleReCaptcha?: any;
-    enableReCaptcha?: any;
+	enableReCaptcha?: any;
 	otpType?: string,
-	setOtpType: (type : string) => void,
-	generateOtpCode: (values ?: any) => void,
+	setOtpType: (type: string) => void,
+	generateOtpCode: (values?: any) => void,
 	useLoginOtpEmail?: boolean,
 	useLoginOtpCellphone?: boolean,
 	useLoginOtp?: boolean
@@ -265,9 +265,9 @@ export interface BusinessProductsListParams {
 	setCategoriesLayout?: any,
 	currentCart?: any,
 	setSubcategoriesSelected?: any,
-    subcategoriesSelected?: any,
-    onClickCategory?: any,
-    lazyLoadProductsRecommended?: boolean,
+	subcategoriesSelected?: any,
+	onClickCategory?: any,
+	lazyLoadProductsRecommended?: boolean,
 	isFiltMode?: boolean,
 	handleUpdateProducts?: any
 }
@@ -278,6 +278,7 @@ export interface SingleProductCardParams {
 	onProductClick: any;
 	productAddedToCartLength: number;
 	style?: ViewStyle,
+	categoryState?: any,
 	handleFavoriteProduct?: any,
 	handleUpdateProducts?: any
 }
@@ -313,6 +314,7 @@ export interface OrdersOptionParams {
 	orderList?: any,
 	franchiseId?: any,
 	activeOrders?: boolean,
+	pastOrders?: boolean,
 	pagination?: any,
 	titleContent?: string,
 	customArray?: Array<any>,
@@ -331,8 +333,15 @@ export interface OrdersOptionParams {
 	setOpenMessges?: any,
 	loadMoreStatus?: boolean,
 	refreshOrders?: boolean,
-	setRefreshOrders?: (value : boolean) => void,
-	handleUpdateOrderList?: (orderId: number, changes: any) => {}
+	setRefreshOrders?: (value: boolean) => void,
+	handleUpdateOrderList?: (orderId: number, changes: any) => {},
+	isBusiness?: boolean,
+	isProducts?: boolean,
+	businessOrderIds?: any,
+	products?: any,
+	businessesSearchList?: any,
+	hideOrders?: boolean,
+	BusinessControllerSkeletons?: any,
 }
 export interface ActiveOrdersParams {
 	orders?: any,
@@ -520,7 +529,7 @@ export interface OrderTypeSelectParams {
 	defaultValue?: number;
 	configTypes?: Array<any>;
 	orderTypes: Array<any>;
-	setOrderTypeValue?: (value : number) => any
+	setOrderTypeValue?: (value: number) => any
 }
 export interface UpsellingProductsParams {
 	isCustomMode?: boolean;
@@ -613,26 +622,26 @@ export interface PlaceSpotParams {
 
 export interface PromotionParams {
 	navigation: any,
-    offersState: any,
-    handleSearchValue: any,
-    searchValue: string,
-    offerSelected: any,
-    setOfferSelected: any,
+	offersState: any,
+	handleSearchValue: any,
+	searchValue: string,
+	offerSelected: any,
+	setOfferSelected: any,
 	loadOffers: any
 }
 export interface SessionsParams {
 	navigation: any,
 	sessionsList: any,
-    actionState: any,
-    handleDeleteSession: any,
-    handleDeleteAllSessions: any
+	actionState: any,
+	handleDeleteSession: any,
+	handleDeleteAllSessions: any
 }
 
 export interface otpParams {
 	willVerifyOtpState: boolean,
-	setWillVerifyOtpState: (val : boolean) => void,
+	setWillVerifyOtpState: (val: boolean) => void,
 	onSubmit: () => void,
-	handleLoginOtp: (code : string) => void,
+	handleLoginOtp: (code: string) => void,
 	setAlertState: any
 }
 
@@ -661,3 +670,19 @@ export interface SingleOrderCardParams {
 	isMessageView?: any,
 	handleClickOrder: (value: any) => {}
 }
+
+export interface PreviousBusinessOrderedParams {
+	navigation?: any,
+	businessesList?: any,
+	setBusinessLoading?: any,
+	businessId?: number,
+	onNavigationRedirect?: any,
+	isBusinessesSearchList?: any,
+	businessLoading?: boolean
+}
+
+export interface PreviousProductsOrderedParams {
+	products?: any,
+	onProductClick?: any,
+	isBusinessesSearchList?: boolean
+}