ordering-ui-react-native 0.16.92 → 0.16.93

package/package.json

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

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

@@ -46,7 +46,7 @@ export const BusinessBasicInformation = (
 	const [openBusinessReviews, setOpenBusinessReviews] = useState(false);
 	const [businessInformationObtained, setBusinessInformationObtained] = useState(false)
 	const [businessReviewsObtained, setBusinessReviewsObtainedbtained] = useState(false)
-	const isChewLayout = theme?.business_view?.components?.header?.components?.layout?.type === 'original'
+	const isChewLayout = theme?.business_view?.components?.header?.components?.layout?.type === 'chew'
 	const showLogo = !theme?.business_view?.components?.header?.components?.business?.components?.logo?.hidden
 
 	const styles = StyleSheet.create({
@@ -272,7 +272,7 @@ export const BusinessBasicInformation = (
 						: { ...styles.headerStyle, backgroundColor: theme.colors.backgroundGray }
 				}
 				{...(!loading && { source: {
-					uri: header || optimizeImage(businessState?.business?.header, 'h_250,c_limit')
+					uri: header || optimizeImage(businessState?.business?.header || theme?.images?.dummies?.businessHeader, 'h_250,c_limit')
 				}})}
 				imageStyle={{ opacity: isChewLayout ? 0.5 : 1 }}
 			>
@@ -304,7 +304,7 @@ export const BusinessBasicInformation = (
 							<FastImage
 								style={styles.logoStyle}
 								source={{
-									uri: logo || optimizeImage(businessState?.business?.logo, 'h_70,c_limit'),
+									uri: logo || optimizeImage(businessState?.business?.logo || theme?.images?.dummies?.businessLogo, 'h_70,c_limit'),
 									priority: FastImage.priority.high,
 									cache:FastImage.cacheControl.web
 								}}

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

@@ -175,7 +175,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 						<FastImage
 							style={{ height: 120 }}
 							source={{
-								uri: optimizeImage(businessHeader || business?.header, 'h_500,c_limit'),
+								uri: optimizeImage(businessHeader || business?.header || theme.images.dummies.businessHeader, 'h_500,c_limit'),
 								priority: FastImage.priority.normal,
 							}}
 							resizeMode={FastImage.resizeMode.cover}
@@ -204,7 +204,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 								<FastImage
 									style={{ width: 56, height: 56 }}
 									source={{
-										uri: optimizeImage(businessLogo || business?.logo, 'h_150,c_limit'),
+										uri: optimizeImage(businessLogo || business?.logo || theme.images.dummies.businessLogo, 'h_150,c_limit'),
 										priority: FastImage.priority.normal,
 									}}
 									resizeMode={FastImage.resizeMode.cover}

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

@@ -38,6 +38,7 @@ export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 
 	const theme = useTheme();
 	const [isOpenAllCategories, setIsOpenAllCategories] = useState(false)
+	const defaultImage = (name : string) => theme.images?.categories?.[name.toLowerCase()]
 
 	useEffect(() => {
 		if(typesState?.types?.length > 0){
@@ -197,9 +198,9 @@ export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 									isOpenAllCategories && setIsOpenAllCategories(false)
 								}}
 							>
-								{item.image ? (
+								{(item.image || defaultImage(item.name)) ? (
 									<OIcon
-										url={item.image}
+										url={item.image || defaultImage(item.name)}
 										style={styles.logo}
 									/>
 								) : (

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

@@ -18,7 +18,8 @@ import {
 	useSession,
 	useOrder,
 	useConfig,
-	useUtils
+	useUtils,
+	useOrderingTheme
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import Ionicons from 'react-native-vector-icons/Ionicons'
@@ -75,13 +76,15 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 		logosLayout
 	} = props;
 	const theme = useTheme();
+	const [orderingTheme] = useOrderingTheme()
 	const isFocused = useIsFocused();
 	const appState = useRef(AppState.currentState)
 	const searchBarRef = useRef<any>()
 	const [appStateVisible, setAppStateVisible] = useState(appState.current);
-	const isChewLayout = theme?.header?.components?.layout?.type === 'original'
+	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
 	const hideCities = theme?.business_listing_view?.components?.cities?.hidden ?? true
 	const [refreshing] = useState(false);
+	const bgHeader =  orderingTheme?.theme?.business_listing_view?.components?.business_hero?.components?.image 
 	const styles = StyleSheet.create({
 		container: {
 			marginBottom: 0,
@@ -455,7 +458,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 			</View>
 			{!isChewLayout ? (
 				<HeaderWrapper
-					source={theme.images.backgrounds.business_list_header}
+					source={bgHeader ? {uri: bgHeader} : theme.images.backgrounds.business_list_header}
 					style={{ paddingTop: top + 20 }}
 					resizeMode='cover'
 				>

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useLanguage } from 'ordering-components/native'
+import { useLanguage, useOrderingTheme } from 'ordering-components/native'
 import { Dimensions } from 'react-native'
 import RNRestart from 'react-native-restart'
 import { OText, OIcon, OButton } from '../shared'
@@ -16,7 +16,8 @@ export const NetworkError = (props: NoNetworkParams) => {
   } = props
   const theme = useTheme()
   const [, t] = useLanguage()
-
+  const [orderingTheme] = useOrderingTheme()
+  const urlimage = orderingTheme?.theme?.no_internet?.components?.image
   const noNetworkImage = image || theme.images.general.noNetwork
   const deviceWidth = Dimensions.get('screen').width
 
@@ -38,7 +39,8 @@ export const NetworkError = (props: NoNetworkParams) => {
       </OText>
       <ImageContainer>
         <OIcon
-          src={noNetworkImage}
+          src={!urlimage && noNetworkImage}
+          url={urlimage}
           width={(deviceWidth - 80) * 0.9}
           height={(deviceWidth - 80) * 0.8}
         />

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

@@ -20,12 +20,13 @@ export const NotFoundSource = (props: NotFoundSourceParams) => {
 	const theme = useTheme();
 
 	const errorImage = image || theme.images.general.notFound
+	const isUrl = errorImage.includes('http')
 
 	return (
 		<NotFound>
 			{errorImage && (
 				<NotFoundImage>
-					<OIcon src={errorImage} width={260} height={220} />
+					<OIcon url={isUrl && errorImage} src={!isUrl && errorImage} width={260} height={220} />
 				</NotFoundImage>
 			)}
 			{content && conditioned && !errorImage && <OText color={theme.colors.disabled} size={18} style={{ textAlign: 'center' }}>{content}</OText>}

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

@@ -346,7 +346,7 @@ export const ProductOptionsUI = (props: any) => {
 	useEffect(() => {
 		const imageList: any = []
 		const videoList: any = []
-		product?.images && imageList.push(product.images)
+		product?.images?.length > 0 ? imageList.push(product.images) : imageList.push(theme?.images?.dummies?.product)
 		if (product?.gallery && product?.gallery.length > 0) {
 			for (const img of product?.gallery) {
 				if (img?.file) {

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

@@ -143,12 +143,12 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 			>
 				<View style={{ flexDirection: 'row', alignItems: 'flex-start' }}>
 					<ContentInfo>
-						{product?.images && (
+						{(product?.images || theme?.images?.dummies?.product) && (
 							<ProductImage>
 								{isFromCheckout ? (
-									<OIcon url={optimizeImage(product?.images, 'h_100,c_limit')} style={{ ...styles.productImage, ...{ width: 82, height: 82 } }} />
+									<OIcon url={optimizeImage(product?.images || theme?.images?.dummies?.product, 'h_100,c_limit')} style={{ ...styles.productImage, ...{ width: 82, height: 82 } }} />
 								) : (
-									<OIcon url={optimizeImage(product?.images, 'h_100,c_limit')} style={styles.productImage} />
+									<OIcon url={optimizeImage(product?.images || theme?.images?.dummies?.product, 'h_100,c_limit')} style={styles.productImage} />
 								)}
 							</ProductImage>
 						)}

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

@@ -170,10 +170,10 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
         activeOpacity={0.7}
       >
         <InnerContainer>
-          {!!order.business?.logo && (
+          {(!!order.business?.logo || theme?.images?.dummies?.businessLogo) && (
             <Logo style={styles.logoWrapper}>
               <OIcon
-                url={optimizeImage(order.business?.logo, 'h_300,c_limit')}
+                url={optimizeImage(order.business?.logo || theme?.images?.dummies?.businessLogo, 'h_300,c_limit')}
                 style={styles.logo}
               />
             </Logo>

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

@@ -222,11 +222,11 @@ const SingleProductCardUI = React.memo((props: SingleProductCardParams) => {
 									</OText>
 								</RibbonBox>
 							)}
-							{product?.images && (
+							{(product?.images || theme?.images?.dummies?.product) && (
 								<FastImage
 									style={styles.productStyle}
 									source={{
-										uri: optimizeImage(product?.images, 'h_250,c_limit'),
+										uri: optimizeImage(product?.images || theme?.images?.dummies?.product, 'h_250,c_limit'),
 										priority: FastImage.priority.normal,
 									}}
 									resizeMode={FastImage.resizeMode.cover}

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

@@ -48,8 +48,6 @@ const WalletsUI = (props: any) => {
   const [{ parsePrice }] = useUtils()
   const [{ configs }] = useConfig()
 
-  console.log(theme)
-
   const styles = StyleSheet.create({
     logoStyle: {
       width: 120,
@@ -65,7 +63,7 @@ const WalletsUI = (props: any) => {
 
   const [tabSelected, setTabSelected] = useState(isWalletCashEnabled ? 'cash' : 'credit_point')
   const [openHistory, setOpenHistory] = useState(false)
-  const isChewLayout = theme?.wallets_view?.components?.layout?.type === 'original'
+  const isChewLayout = theme?.wallets_view?.components?.layout?.type === 'chew'
 
   const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletPointsEnabled)