ordering-ui-react-native 0.17.12-release → 0.17.13-release

package/package.json

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

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

@@ -84,7 +84,8 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 	const appState = useRef(AppState.currentState)
 	const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
 	const [refreshing] = useState(false);
-	const hideCities = (theme?.business_listing_view?.components?.cities?.hidden || orderState?.options?.type !== 2) ?? true
+	const allCitiesDisabled = citiesState?.cities?.every((city: any) => !city.enabled)
+	const hideCities = (theme?.business_listing_view?.components?.cities?.hidden || orderState?.options?.type !== 2 || allCitiesDisabled) ?? true
 	const hideHero = theme?.business_listing_view?.components?.business_hero?.hidden
 	const hidePreviousOrders = theme?.business_listing_view?.components?.previous_orders_block?.hidden
 	const hideHighestBusiness = theme?.business_listing_view?.components?.highest_rated_business_block?.hidden
@@ -293,6 +294,12 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 		setIsOpenCities(false)
 	}, [orderState?.options?.city_id])
 
+	useEffect(() => {
+		if (!citiesState?.cities?.length || !orderState?.options?.city_id) return
+		const selectedCity = citiesState?.cities?.find((city: any) => city?.id === orderState?.options?.city_id)
+		if (!selectedCity || !selectedCity?.enabled) changeCityFilter(null)
+	}, [citiesState, orderState?.options?.city_id])
+
 	if (logosLayout) {
 		return (
 			<BusinessLogosContainer

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

@@ -47,7 +47,7 @@ export const CitiesControl = (props: any) => {
   return (
     <Container height={height - top - bottom - 60 - (isKeyboardShow ? 250 : 0)}>
       <View>
-        {cities?.map((city: any) => (
+        {cities?.map((city: any) => city?.enabled && (
           <CityElement
             key={city?.id}
             activeOpacity={1}