enatega · dependabot · Sep 24, 2025 · Sep 24, 2025 · Sep 25, 2025 · Sep 26, 2025
diff --git a/enatega-multivendor-admin/app/layout.tsx b/enatega-multivendor-admin/app/layout.tsx
@@ -1,5 +1,6 @@
 import { NextIntlClientProvider } from 'next-intl';
 import { getLocale, getMessages } from 'next-intl/server';
+import Script from 'next/script';
 
 // ✅ Add metadata export for favicon
 export const metadata = {
@@ -22,6 +23,18 @@ export default async function RootLayout({
 
   return (
     <html lang={locale}>
+       <head>
+        {/* Microsoft Clarity */}
+        <Script id="microsoft-clarity" strategy="afterInteractive">
+          {`
+            (function(c,l,a,r,i,t,y){
+        c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
+        t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
+        y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
+    })(window, document, "clarity", "script", "tjqxrz689j");
+          `}
+        </Script>
+      </head>
       <body>
         <NextIntlClientProvider messages={messages}>
           {children}

diff --git a/enatega-multivendor-app/App.js b/enatega-multivendor-app/App.js
@@ -34,6 +34,8 @@ import './i18next'
 import * as SplashScreen from 'expo-splash-screen'
 import TextDefault from './src/components/Text/TextDefault/TextDefault'
 import { ErrorBoundary } from './src/components/ErrorBoundary'
+import * as Clarity from '@microsoft/react-native-clarity';
+
 
 // LogBox.ignoreLogs([
 //   // 'Warning: ...',
@@ -42,6 +44,11 @@ import { ErrorBoundary } from './src/components/ErrorBoundary'
 // ]) // Ignore log notification by message
 // LogBox.ignoreAllLogs() // Ignore all log notifications
 
+
+Clarity.initialize('mcdyi6urgs', {
+  logLevel: Clarity.LogLevel.Verbose, // Note: Use "LogLevel.Verbose" value while testing to debug initialization issues.
+});
+
 Notifications.setNotificationHandler({
   handleNotification: async (notification) => {
     return {
@@ -127,9 +134,9 @@ export default function App() {
   }, [location])
 
   // For Permission
-  useEffect(() => {
+/*   useEffect(() => {
     requestTrackingPermissions()
-  }, [])
+  }, []) */
 
   // For Sentry
   // useEffect(() => {

diff --git a/enatega-multivendor-app/app.json b/enatega-multivendor-app/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "Enatega Multi",
     "scheme": "enategamultivendor",
-    "version": "1.0.96",
+    "version": "1.0.97",
     "description": "Enatega is a starter kit food ordering app built in React Native using Expo for IOS and Android. It's made keeping good aesthetics in mind as well keeping the best coding practices in mind. Its fully customisable to easily help you in your next food delivery project. https://market.nativebase.io/view/react-native-food-delivery-backend-app",
     "slug": "enategamultivendor",
     "owner": "ninjas_code",
@@ -23,6 +23,11 @@
     "assetBundlePatterns": ["**/*"],
     "userInterfaceStyle": "automatic",
     "ios": {
+      "splash": {
+        "image": "./assets/splash.png",
+        "resizeMode": "cover",
+        "backgroundColor": "#ffffff"
+      },
       "entitlements": {
         "com.apple.developer.networking.wifi-info": true
       },
@@ -53,10 +58,15 @@
       "androidCollapsedTitle": "Enatega Multivendor"
     },
     "android": {
-      "versionCode": 96,
+      "versionCode": 97,
       "package": "com.enatega.multivendor",
       "userInterfaceStyle": "automatic",
       "googleServicesFile": "./google-services.json",
+      "splash": {
+        "image": "./assets/splash.png",
+        "resizeMode": "cover",
+        "backgroundColor": "#ffffff"
+      },
       "config": {
         "googleMaps": {
           "apiKey": "AIzaSyCcm7_Wd7uvmC9YnYLu2JHGWPt6z1MaL1E"

diff --git a/enatega-multivendor-app/package-lock.json b/enatega-multivendor-app/package-lock.json
diff --git a/enatega-multivendor-app/package.json b/enatega-multivendor-app/package.json
@@ -44,6 +44,7 @@
     "@babel/plugin-transform-object-rest-spread": "^7.23.4",
     "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
     "@expo/vector-icons": "^14.1.0",
+    "@microsoft/react-native-clarity": "^4.3.3",
     "@react-native-async-storage/async-storage": "2.1.2",
     "@react-native-community/datetimepicker": "8.4.1",
     "@react-native-community/netinfo": "11.4.1",

diff --git a/enatega-multivendor-app/src/apollo/queries.js b/enatega-multivendor-app/src/apollo/queries.js
@@ -322,6 +322,30 @@ export const restaurantPreviewFragment = gql`
     }
   }
 `
+
+export const RESTAURANTS_CARD_FRAGMENT = gql`
+  fragment RestaurantCardPreviewFields on RestaurantCardPreview {
+    _id
+    name
+    image
+    logo
+    slug
+    shopType
+    deliveryTime
+    reviewAverage
+    cuisines
+    openingTimes {
+      day
+      times {
+        startTime
+        endTime
+      }
+    }
+    isAvailable
+    isActive
+  }
+`;
+
 export const profile = `
         query{
           profile{

diff --git a/enatega-multivendor-app/src/components/ErrorBoundary/index.jsx b/enatega-multivendor-app/src/components/ErrorBoundary/index.jsx
@@ -12,6 +12,7 @@ export class ErrorBoundary extends Component {
   }
 
   static getDerivedStateFromError(error) {
+    console.log(error)
     return { hasError: true, error };
   }
 

diff --git a/enatega-multivendor-app/src/context/Location.js b/enatega-multivendor-app/src/context/Location.js
@@ -13,17 +13,16 @@ const GET_ZONES = gql`
 export const LocationContext = createContext()
 
 export const LocationProvider = ({ children }) => {
-  const { permission } = useWatchLocation()
 
   const [location, setLocation] = useState(null)
   const [cities, setCities] = useState([])
   const [permissionState, setPermissionState] = useState(null)
   const [isConnected, setIsConnected] = useState(false)
   const { loading, error, data, refetch } = useQuery(GET_ZONES)
 
-  useEffect(() => {
-    setPermissionState(permission)
-  }, [permission])
+  // useEffect(() => {
+  //   setPermissionState(permission)
+  // }, [permission])
 
   useEffect(() => {
     if (location) {

diff --git a/enatega-multivendor-app/src/routes/index.js b/enatega-multivendor-app/src/routes/index.js
@@ -276,8 +276,7 @@ function BottomTabNavigator() {
 
 function AppContainer() {
   const client = useApolloClient()
-  const { permissionState } = useContext(LocationContext)
-  const { location, permission } = useWatchLocation()
+  const { permissionState, location } = useContext(LocationContext)
   const lastNotificationResponse = Notifications.useLastNotificationResponse()
   const handleNotification = useCallback(
     async (response) => {
@@ -304,6 +303,7 @@ function AppContainer() {
     }
   }, [lastNotificationResponse])
 
+  console.log({ permissionState, location })
 
   return (
     <SafeAreaProvider>
@@ -312,7 +312,7 @@ function AppContainer() {
           navigationService.setGlobalRef(ref)
         }}
       >
-        {!permissionState?.granted ? <LocationStack /> : <MainNavigator />}
+        {!permissionState?.granted || !location ? <LocationStack /> : <MainNavigator />}
 
         {/* {<LocationStack />}
         <MainNavigator /> */}

diff --git a/enatega-multivendor-app/src/screens/CurrentLocation/CurrentLocation.js b/enatega-multivendor-app/src/screens/CurrentLocation/CurrentLocation.js
@@ -26,8 +26,7 @@ import useWatchLocation from '../../ui/hooks/useWatchLocation'
 
 export default function CurrentLocation() {
   const Analytics = analytics()
-  const { onRequestPermission } = useWatchLocation()
-  // const [permissionState, setPermissionState] = useState(permission)
+  const { permission, onRequestPermission } = useWatchLocation()
   const { t, i18n } = useTranslation()
   const [loading, setLoading] = useState(false)
   const [isCheckingZone, setIsCheckingZone] = useState(false)
@@ -97,25 +96,66 @@ export default function CurrentLocation() {
     }, 100)
   }
 
+  async function checkCityMatch(new_location = null) {
+    console.log('calling checkCityMatch', new_location)
+    const cl_p = new_location || currentLocation
+    if (!cl_p || !cities.length) return
+    // console.log("Checking city match for location:", currentLocation);
+    // console.log("Cities list:", cities);
+
+    console.log({ cl_p })
+
+    setIsCheckingZone(true)
+
+    const matchingCity = checkLocationInCities(cl_p, filterCities())
+    if (matchingCity) {
+      try {
+        const response = await getAddress(cl_p.latitude, cl_p.longitude)
+        // console.log("Fetched Address Data:", response);
+        const locationData = {
+          label: 'Location',
+          deliveryAddress: response.formattedAddress,
+          latitude: cl_p.latitude,
+          longitude: cl_p.longitude,
+          city: response.city
+        }
+
+        setLocation(locationData)
+        setTimeout(() => {
+          setIsCheckingZone(false)
+          navigation.navigate('Main')
+        }, 100)
+      } catch (error) {
+        // console.error('Error getting address:', error)
+        setIsCheckingZone(false)
+      }
+    } else {
+      // console.warn("No matching city found for this location.");
+      setIsCheckingZone(false)
+    }
+  }
+
   async function getCurrentLocationOnStart() {
+    console.log('calling getCurrentLocationOnStart', permissionState)
+    setLoading(true)
+
     // Handle permission request result
     if (!permissionState) return
 
-    if (!permissionState?.granted && permissionState?.status !== 'granted') {
+    if (!permissionState?.granted) {
       console.log('Location permission not granted')
       return
     }
 
     // Permission is granted, continue with location logic
+    const { error, coords } = await getCurrentLocation()
 
-    setLoading(true)
-
-    const { error, coords, message } = await getCurrentLocation()
     if (error) {
       // console.log("Location error:",message, error)
       setLoading(false)
       return
     }
+
     // console.log("Fetched Location:", coords);
     const userLocation = {
       latitude: coords.latitude,
@@ -134,7 +174,6 @@ export default function CurrentLocation() {
 
     // ❌ Permanently denied (cannot ask again)
     if (!permission_response?.canAskAgain) {
-      console.log('sadahsdjkasdhajksh')
       // Optionally prompt user to open settings
       if (Platform.OS === 'ios') {
         Linking.openURL('app-settings:') // iOS deep link to app settings
@@ -163,44 +202,9 @@ export default function CurrentLocation() {
 
   useEffect(() => {
     getCurrentLocationOnStart()
-  }, [permissionState])
+  }, [permissionState, permission])
 
   useEffect(() => {
-    async function checkCityMatch() {
-      if (!currentLocation || !cities.length) return
-      // console.log("Checking city match for location:", currentLocation);
-      // console.log("Cities list:", cities);
-
-      setIsCheckingZone(true)
-
-      const matchingCity = checkLocationInCities(currentLocation, filterCities())
-      if (matchingCity) {
-        try {
-          const response = await getAddress(currentLocation.latitude, currentLocation.longitude)
-          // console.log("Fetched Address Data:", response);
-          const locationData = {
-            label: 'Location',
-            deliveryAddress: response.formattedAddress,
-            latitude: currentLocation.latitude,
-            longitude: currentLocation.longitude,
-            city: response.city
-          }
-
-          setLocation(locationData)
-          setTimeout(() => {
-            setIsCheckingZone(false)
-            navigation.navigate('Main')
-          }, 100)
-        } catch (error) {
-          // console.error('Error getting address:', error)
-          setIsCheckingZone(false)
-        }
-      } else {
-        // console.warn("No matching city found for this location.");
-        setIsCheckingZone(false)
-      }
-    }
-
     checkCityMatch()
   }, [currentLocation, cities])
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ export class ErrorBoundary extends Component { @@
       }
       static getDerivedStateFromError(error) {
+        console.log(error)
         return { hasError: true, error };
       }
@@ Expand Down @@