@wasto/cms-components 1.5.12 → 1.5.14

package/dist/index.d.mts

@@ -185,7 +185,8 @@ type PageProps = PropsWithChildren & {
     pullToRefresh?: boolean;
 };
 /**
- * Page shell: top safe area + optional vertical scroll.
+ * Page shell: optional vertical scroll.
+ * Top safe area only when no navigation header (avoids a double inset band).
  * No global horizontal padding — each block uses ContentInset or is full-bleed
  * (map, calendar grid). Bottom inset is handled by BottomTab when using tabs.
  */
@@ -430,7 +431,7 @@ type WasteCollectionPlace = {
         /** Ex: "Lundi", "Mardi", ... (mapping lundi=0 … dimanche=6) */
         name: string;
         wasteTypeId: string;
-        biweekly?: boolean;
+        everyWeeks?: number;
         startDate?: string;
     }>;
     /** Périodes d’exception (pas de collecte) */

package/dist/index.d.ts

@@ -185,7 +185,8 @@ type PageProps = PropsWithChildren & {
     pullToRefresh?: boolean;
 };
 /**
- * Page shell: top safe area + optional vertical scroll.
+ * Page shell: optional vertical scroll.
+ * Top safe area only when no navigation header (avoids a double inset band).
  * No global horizontal padding — each block uses ContentInset or is full-bleed
  * (map, calendar grid). Bottom inset is handled by BottomTab when using tabs.
  */
@@ -430,7 +431,7 @@ type WasteCollectionPlace = {
         /** Ex: "Lundi", "Mardi", ... (mapping lundi=0 … dimanche=6) */
         name: string;
         wasteTypeId: string;
-        biweekly?: boolean;
+        everyWeeks?: number;
         startDate?: string;
     }>;
     /** Périodes d’exception (pas de collecte) */

package/dist/index.js

@@ -271,18 +271,22 @@ function LocalProvider({
       };
       let resolvedDeviceId = null;
       if (!previewMode) {
-        const newDeviceId = generateDeviceId();
+        const existingDeviceId = await import_async_storage.default.getItem(keys.device);
+        const nextDeviceId = existingDeviceId || generateDeviceId();
         await client.public.analytics.track({
-          id: newDeviceId,
+          id: nextDeviceId,
           cityId,
+          wasteCollectionPlaceId: placeId,
           platform: import_react_native.Platform.OS,
           osVersion: null,
           appVersion: null,
           deviceModel: null
         });
-        await import_async_storage.default.setItem(keys.device, newDeviceId);
-        setDeviceId(newDeviceId);
-        resolvedDeviceId = newDeviceId;
+        if (!existingDeviceId) {
+          await import_async_storage.default.setItem(keys.device, nextDeviceId);
+        }
+        setDeviceId(nextDeviceId);
+        resolvedDeviceId = nextDeviceId;
       } else {
         setDeviceId(null);
       }
@@ -356,6 +360,25 @@ function LocalProvider({
     };
     void loadLocalData();
   }, [keys, previewMode]);
+  (0, import_react3.useEffect)(() => {
+    if (previewMode || !deviceId || !selectedCityId) return;
+    void client.public.analytics.track({
+      id: deviceId,
+      cityId: selectedCityId,
+      wasteCollectionPlaceId: selectedPlaceId,
+      platform: import_react_native.Platform.OS,
+      osVersion: null,
+      appVersion: null,
+      deviceModel: null
+    }).catch(() => {
+    });
+  }, [
+    client.public.analytics,
+    deviceId,
+    previewMode,
+    selectedCityId,
+    selectedPlaceId
+  ]);
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
     LocalContext,
     {
@@ -746,13 +769,16 @@ function getCollectionsForDay(wasteTypes, wasteCollectionPlaces, dateOffset, sel
       return targetDate.getTime() >= from.getTime() && targetDate.getTime() < to.getTime();
     });
     if (hasException) continue;
-    if (day.biweekly && day.startDate) {
+    if (day.startDate) {
       const start = new Date(day.startDate);
+      start.setHours(0, 0, 0, 0);
+      const everyWeeks = Math.max(1, Number(day.everyWeeks) || 1);
       const diffDays = Math.floor(
         (targetDate.getTime() - start.getTime()) / (1e3 * 60 * 60 * 24)
       );
       const weeks = Math.floor(diffDays / 7);
-      if (weeks < 0 || weeks % 2 !== 0) continue;
+      if (weeks < 0) continue;
+      if (everyWeeks > 1 && weeks % everyWeeks !== 0) continue;
     }
     const wt = wasteTypes.find((w) => w.id === day.wasteTypeId);
     if (!wt) continue;
@@ -2210,33 +2236,58 @@ async function registerExpoPushToken(options) {
 
 // src/components/push/PushTokenRegistrar.tsx
 function PushTokenRegistrar() {
-  const { deviceId } = useLocal();
+  const { deviceId, selectedCityId, selectedPlaceId } = useLocal();
   const { previewMode, reportError: reportError2 } = useWasto();
   const client = useWastoClient();
   const lastRegistered = (0, import_react8.useRef)(null);
+  const inFlight = (0, import_react8.useRef)(false);
   (0, import_react8.useEffect)(() => {
     if (previewMode || import_react_native8.Platform.OS === "web" || !deviceId) return;
-    if (lastRegistered.current === deviceId) return;
     let cancelled = false;
-    void (async () => {
+    const tryRegister = async () => {
+      if (cancelled || inFlight.current) return;
+      const registrationKey = `${deviceId}:${selectedPlaceId ?? ""}:${selectedCityId ?? ""}`;
+      if (lastRegistered.current === registrationKey) return;
+      inFlight.current = true;
       try {
         const token = await registerExpoPushToken({
           deviceId,
-          registerPushToken: (id, pushToken) => client.public.devices.registerPushToken(id, { token: pushToken })
+          registerPushToken: (id, pushToken) => client.public.devices.registerPushToken(id, {
+            token: pushToken,
+            cityId: selectedCityId,
+            wasteCollectionPlaceId: selectedPlaceId
+          })
         });
         if (!cancelled && token) {
-          lastRegistered.current = deviceId;
+          lastRegistered.current = registrationKey;
         }
       } catch (error) {
         if (!cancelled) {
           reportError2(error, { source: "push", deviceId });
         }
+      } finally {
+        inFlight.current = false;
       }
-    })();
+    };
+    void tryRegister();
+    const sub = import_react_native8.AppState.addEventListener("change", (state) => {
+      if (state === "active") {
+        lastRegistered.current = null;
+        void tryRegister();
+      }
+    });
     return () => {
       cancelled = true;
+      sub.remove();
     };
-  }, [client.public.devices, deviceId, previewMode, reportError2]);
+  }, [
+    client.public.devices,
+    deviceId,
+    previewMode,
+    reportError2,
+    selectedCityId,
+    selectedPlaceId
+  ]);
   return null;
 }
 
@@ -6369,7 +6420,7 @@ function buildSchedule(wasteTypes, places, selectedPlaceId) {
       dayOfWeek: dayIndex,
       wasteTypeId: day.wasteTypeId,
       color: typeof color === "string" && color.trim().length > 0 ? color : "#7C7C7C",
-      biweekly: day.biweekly,
+      everyWeeks: Math.max(1, Number(day.everyWeeks) || 1),
       startDate: day.startDate
     });
   }
@@ -6383,14 +6434,13 @@ function computeWasteTypesForDay(day, year, month, schedule, exceptions) {
   const daySchedules = schedule.filter((s) => s.dayOfWeek === mondayBasedDay);
   const wasteTypes = [];
   for (const s of daySchedules) {
-    if (s.biweekly && s.startDate) {
+    const everyWeeks = Math.max(1, Number(s.everyWeeks) || 1);
+    if (s.startDate) {
       const weeksSinceStart = getWeeksSinceStart(s.startDate, date);
-      if (weeksSinceStart >= 0 && weeksSinceStart % 2 === 0) {
-        wasteTypes.push({ wasteTypeId: s.wasteTypeId, color: s.color });
-      }
-    } else if (!s.biweekly) {
-      wasteTypes.push({ wasteTypeId: s.wasteTypeId, color: s.color });
+      if (weeksSinceStart < 0) continue;
+      if (everyWeeks > 1 && weeksSinceStart % everyWeeks !== 0) continue;
     }
+    wasteTypes.push({ wasteTypeId: s.wasteTypeId, color: s.color });
   }
   const filtered = [];
   for (const wt of wasteTypes) {
@@ -8186,18 +8236,14 @@ var DEFAULT_HEADER_ACTIONS = [
   }
 ];
 function resolveLogoUri(apiUrl, el) {
-  if (el.sourceType === "media") {
+  const url = (el.url || "").trim();
+  if (url) return url;
+  if (el.sourceType === "media" || el.mediaId) {
     return publicMediaUrl(apiUrl, el.mediaId);
   }
-  const url = (el.url || "").trim();
-  return url || null;
+  return null;
 }
-function HeaderLogo({
-  element
-}) {
-  const { apiUrl } = useWasto();
-  const uri = resolveLogoUri(apiUrl, element);
-  if (!uri) return null;
+function HeaderLogoImage({ uri }) {
   return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
     import_react_native34.Image,
     {
@@ -8208,6 +8254,22 @@ function HeaderLogo({
     }
   );
 }
+function HeaderLogo({
+  element
+}) {
+  const { apiUrl } = useWasto();
+  const uri = resolveLogoUri(apiUrl, element);
+  if (!uri) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(HeaderLogoImage, { uri });
+}
+function CityLogoFallback() {
+  const { apiUrl } = useWasto();
+  const appData = useOptionalAppData();
+  const logoMediaId = typeof appData?.city?.logoMediaId === "string" ? appData.city.logoMediaId : null;
+  const uri = publicMediaUrl(apiUrl, logoMediaId);
+  if (!uri) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(HeaderLogoImage, { uri });
+}
 function HeaderActionButton({
   onPress,
   accessibilityLabel,
@@ -8248,6 +8310,7 @@ function Header({
     return raw.filter((el) => el.type !== "title");
   }, [headerConfig]);
   const hasCustomActions = elements.some((el) => el.type === "action");
+  const hasLogo = elements.some((el) => el.type === "logo");
   const bySlot = (0, import_react35.useMemo)(() => {
     const left = [];
     const center = [];
@@ -8369,7 +8432,8 @@ function Header({
               )
             }
           ) : null,
-          bySlot.left.map(renderElement)
+          bySlot.left.map(renderElement),
+          !hasLogo ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CityLogoFallback, {}) : null
         ] }),
         /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
           import_react_native34.View,
@@ -8401,6 +8465,7 @@ function Header({
               )
             }
           ) : null,
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CityLogoFallback, {}),
           /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Title, { text: screenTitle, level: "1" })
         ] }),
         /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(import_react_native34.View, { style: styles29.actions, children: defaultActions })
@@ -8425,9 +8490,9 @@ var styles29 = import_react_native34.StyleSheet.create({
     alignItems: "center",
     justifyContent: "space-between",
     paddingHorizontal: SPACE.pageX,
-    paddingVertical: 12,
+    paddingVertical: 6,
     gap: 10,
-    minHeight: 56
+    minHeight: 44
   },
   left: {
     flexDirection: "row",
@@ -8952,6 +9017,7 @@ function LocationsMap(props) {
 // src/components/page/Page.tsx
 var import_react38 = require("react");
 var import_react_native36 = require("react-native");
+var import_elements = require("@react-navigation/elements");
 var import_jsx_runtime45 = require("react/jsx-runtime");
 function Page({
   children,
@@ -8961,7 +9027,9 @@ function Page({
   const { theme } = useTheme();
   const t = resolveTheme(theme);
   const themedStyles = createThemedStyles16(theme);
-  const topInset = useSafeAreaPadding(["top"]);
+  const headerHeight = (0, import_react38.useContext)(import_elements.HeaderHeightContext);
+  const hasNavHeader = typeof headerHeight === "number" && headerHeight > 0;
+  const topInset = useSafeAreaPadding(hasNavHeader ? [] : ["top"]);
   const appData = useOptionalAppData();
   const [refreshing, setRefreshing] = (0, import_react38.useState)(false);
   const enableRefresh = pullToRefresh ?? scroll;

package/dist/index.mjs

@@ -212,18 +212,22 @@ function LocalProvider({
       };
       let resolvedDeviceId = null;
       if (!previewMode) {
-        const newDeviceId = generateDeviceId();
+        const existingDeviceId = await AsyncStorage.getItem(keys.device);
+        const nextDeviceId = existingDeviceId || generateDeviceId();
         await client.public.analytics.track({
-          id: newDeviceId,
+          id: nextDeviceId,
           cityId,
+          wasteCollectionPlaceId: placeId,
           platform: Platform.OS,
           osVersion: null,
           appVersion: null,
           deviceModel: null
         });
-        await AsyncStorage.setItem(keys.device, newDeviceId);
-        setDeviceId(newDeviceId);
-        resolvedDeviceId = newDeviceId;
+        if (!existingDeviceId) {
+          await AsyncStorage.setItem(keys.device, nextDeviceId);
+        }
+        setDeviceId(nextDeviceId);
+        resolvedDeviceId = nextDeviceId;
       } else {
         setDeviceId(null);
       }
@@ -297,6 +301,25 @@ function LocalProvider({
     };
     void loadLocalData();
   }, [keys, previewMode]);
+  useEffect(() => {
+    if (previewMode || !deviceId || !selectedCityId) return;
+    void client.public.analytics.track({
+      id: deviceId,
+      cityId: selectedCityId,
+      wasteCollectionPlaceId: selectedPlaceId,
+      platform: Platform.OS,
+      osVersion: null,
+      appVersion: null,
+      deviceModel: null
+    }).catch(() => {
+    });
+  }, [
+    client.public.analytics,
+    deviceId,
+    previewMode,
+    selectedCityId,
+    selectedPlaceId
+  ]);
   return /* @__PURE__ */ jsx2(
     LocalContext,
     {
@@ -705,13 +728,16 @@ function getCollectionsForDay(wasteTypes, wasteCollectionPlaces, dateOffset, sel
       return targetDate.getTime() >= from.getTime() && targetDate.getTime() < to.getTime();
     });
     if (hasException) continue;
-    if (day.biweekly && day.startDate) {
+    if (day.startDate) {
       const start = new Date(day.startDate);
+      start.setHours(0, 0, 0, 0);
+      const everyWeeks = Math.max(1, Number(day.everyWeeks) || 1);
       const diffDays = Math.floor(
         (targetDate.getTime() - start.getTime()) / (1e3 * 60 * 60 * 24)
       );
       const weeks = Math.floor(diffDays / 7);
-      if (weeks < 0 || weeks % 2 !== 0) continue;
+      if (weeks < 0) continue;
+      if (everyWeeks > 1 && weeks % everyWeeks !== 0) continue;
     }
     const wt = wasteTypes.find((w) => w.id === day.wasteTypeId);
     if (!wt) continue;
@@ -2108,7 +2134,7 @@ var styles4 = StyleSheet4.create({
 
 // src/components/push/PushTokenRegistrar.tsx
 import { useEffect as useEffect6, useRef as useRef3 } from "react";
-import { Platform as Platform5 } from "react-native";
+import { AppState, Platform as Platform5 } from "react-native";
 
 // src/push/registerExpoPushToken.ts
 import { Platform as Platform4 } from "react-native";
@@ -2200,33 +2226,58 @@ async function registerExpoPushToken(options) {
 
 // src/components/push/PushTokenRegistrar.tsx
 function PushTokenRegistrar() {
-  const { deviceId } = useLocal();
+  const { deviceId, selectedCityId, selectedPlaceId } = useLocal();
   const { previewMode, reportError: reportError2 } = useWasto();
   const client = useWastoClient();
   const lastRegistered = useRef3(null);
+  const inFlight = useRef3(false);
   useEffect6(() => {
     if (previewMode || Platform5.OS === "web" || !deviceId) return;
-    if (lastRegistered.current === deviceId) return;
     let cancelled = false;
-    void (async () => {
+    const tryRegister = async () => {
+      if (cancelled || inFlight.current) return;
+      const registrationKey = `${deviceId}:${selectedPlaceId ?? ""}:${selectedCityId ?? ""}`;
+      if (lastRegistered.current === registrationKey) return;
+      inFlight.current = true;
       try {
         const token = await registerExpoPushToken({
           deviceId,
-          registerPushToken: (id, pushToken) => client.public.devices.registerPushToken(id, { token: pushToken })
+          registerPushToken: (id, pushToken) => client.public.devices.registerPushToken(id, {
+            token: pushToken,
+            cityId: selectedCityId,
+            wasteCollectionPlaceId: selectedPlaceId
+          })
         });
         if (!cancelled && token) {
-          lastRegistered.current = deviceId;
+          lastRegistered.current = registrationKey;
         }
       } catch (error) {
         if (!cancelled) {
           reportError2(error, { source: "push", deviceId });
         }
+      } finally {
+        inFlight.current = false;
       }
-    })();
+    };
+    void tryRegister();
+    const sub = AppState.addEventListener("change", (state) => {
+      if (state === "active") {
+        lastRegistered.current = null;
+        void tryRegister();
+      }
+    });
     return () => {
       cancelled = true;
+      sub.remove();
     };
-  }, [client.public.devices, deviceId, previewMode, reportError2]);
+  }, [
+    client.public.devices,
+    deviceId,
+    previewMode,
+    reportError2,
+    selectedCityId,
+    selectedPlaceId
+  ]);
   return null;
 }
 
@@ -6387,7 +6438,7 @@ function buildSchedule(wasteTypes, places, selectedPlaceId) {
       dayOfWeek: dayIndex,
       wasteTypeId: day.wasteTypeId,
       color: typeof color === "string" && color.trim().length > 0 ? color : "#7C7C7C",
-      biweekly: day.biweekly,
+      everyWeeks: Math.max(1, Number(day.everyWeeks) || 1),
       startDate: day.startDate
     });
   }
@@ -6401,14 +6452,13 @@ function computeWasteTypesForDay(day, year, month, schedule, exceptions) {
   const daySchedules = schedule.filter((s) => s.dayOfWeek === mondayBasedDay);
   const wasteTypes = [];
   for (const s of daySchedules) {
-    if (s.biweekly && s.startDate) {
+    const everyWeeks = Math.max(1, Number(s.everyWeeks) || 1);
+    if (s.startDate) {
       const weeksSinceStart = getWeeksSinceStart(s.startDate, date);
-      if (weeksSinceStart >= 0 && weeksSinceStart % 2 === 0) {
-        wasteTypes.push({ wasteTypeId: s.wasteTypeId, color: s.color });
-      }
-    } else if (!s.biweekly) {
-      wasteTypes.push({ wasteTypeId: s.wasteTypeId, color: s.color });
+      if (weeksSinceStart < 0) continue;
+      if (everyWeeks > 1 && weeksSinceStart % everyWeeks !== 0) continue;
     }
+    wasteTypes.push({ wasteTypeId: s.wasteTypeId, color: s.color });
   }
   const filtered = [];
   for (const wt of wasteTypes) {
@@ -8264,18 +8314,14 @@ var DEFAULT_HEADER_ACTIONS = [
   }
 ];
 function resolveLogoUri(apiUrl, el) {
-  if (el.sourceType === "media") {
+  const url = (el.url || "").trim();
+  if (url) return url;
+  if (el.sourceType === "media" || el.mediaId) {
     return publicMediaUrl(apiUrl, el.mediaId);
   }
-  const url = (el.url || "").trim();
-  return url || null;
+  return null;
 }
-function HeaderLogo({
-  element
-}) {
-  const { apiUrl } = useWasto();
-  const uri = resolveLogoUri(apiUrl, element);
-  if (!uri) return null;
+function HeaderLogoImage({ uri }) {
   return /* @__PURE__ */ jsx41(
     Image11,
     {
@@ -8286,6 +8332,22 @@ function HeaderLogo({
     }
   );
 }
+function HeaderLogo({
+  element
+}) {
+  const { apiUrl } = useWasto();
+  const uri = resolveLogoUri(apiUrl, element);
+  if (!uri) return null;
+  return /* @__PURE__ */ jsx41(HeaderLogoImage, { uri });
+}
+function CityLogoFallback() {
+  const { apiUrl } = useWasto();
+  const appData = useOptionalAppData();
+  const logoMediaId = typeof appData?.city?.logoMediaId === "string" ? appData.city.logoMediaId : null;
+  const uri = publicMediaUrl(apiUrl, logoMediaId);
+  if (!uri) return null;
+  return /* @__PURE__ */ jsx41(HeaderLogoImage, { uri });
+}
 function HeaderActionButton({
   onPress,
   accessibilityLabel,
@@ -8326,6 +8388,7 @@ function Header({
     return raw.filter((el) => el.type !== "title");
   }, [headerConfig]);
   const hasCustomActions = elements.some((el) => el.type === "action");
+  const hasLogo = elements.some((el) => el.type === "logo");
   const bySlot = useMemo20(() => {
     const left = [];
     const center = [];
@@ -8447,7 +8510,8 @@ function Header({
               )
             }
           ) : null,
-          bySlot.left.map(renderElement)
+          bySlot.left.map(renderElement),
+          !hasLogo ? /* @__PURE__ */ jsx41(CityLogoFallback, {}) : null
         ] }),
         /* @__PURE__ */ jsx41(
           View29,
@@ -8479,6 +8543,7 @@ function Header({
               )
             }
           ) : null,
+          /* @__PURE__ */ jsx41(CityLogoFallback, {}),
           /* @__PURE__ */ jsx41(Title, { text: screenTitle, level: "1" })
         ] }),
         /* @__PURE__ */ jsx41(View29, { style: styles29.actions, children: defaultActions })
@@ -8503,9 +8568,9 @@ var styles29 = StyleSheet30.create({
     alignItems: "center",
     justifyContent: "space-between",
     paddingHorizontal: SPACE.pageX,
-    paddingVertical: 12,
+    paddingVertical: 6,
     gap: 10,
-    minHeight: 56
+    minHeight: 44
   },
   left: {
     flexDirection: "row",
@@ -9031,8 +9096,13 @@ function LocationsMap(props) {
 }
 
 // src/components/page/Page.tsx
-import { useCallback as useCallback13, useState as useState26 } from "react";
+import {
+  useCallback as useCallback13,
+  useContext as useContext10,
+  useState as useState26
+} from "react";
 import { RefreshControl, ScrollView as ScrollView11, StyleSheet as StyleSheet32, View as View31 } from "react-native";
+import { HeaderHeightContext } from "@react-navigation/elements";
 import { jsx as jsx45 } from "react/jsx-runtime";
 function Page({
   children,
@@ -9042,7 +9112,9 @@ function Page({
   const { theme } = useTheme();
   const t = resolveTheme(theme);
   const themedStyles = createThemedStyles16(theme);
-  const topInset = useSafeAreaPadding(["top"]);
+  const headerHeight = useContext10(HeaderHeightContext);
+  const hasNavHeader = typeof headerHeight === "number" && headerHeight > 0;
+  const topInset = useSafeAreaPadding(hasNavHeader ? [] : ["top"]);
   const appData = useOptionalAppData();
   const [refreshing, setRefreshing] = useState26(false);
   const enableRefresh = pullToRefresh ?? scroll;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wasto/cms-components",
-  "version": "1.5.12",
+  "version": "1.5.14",
   "description": "Wast'O CMS React Native components",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
@@ -44,12 +44,16 @@
     "react-native-gesture-handler": "*",
     "react-native-markdown-display": "*",
     "react-native-reanimated": "*",
-    "react-native-safe-area-context": "*"
+    "react-native-safe-area-context": "*",
+    "@react-navigation/elements": "*"
   },
   "peerDependenciesMeta": {
     "@maplibre/maplibre-react-native": {
       "optional": true
     },
+    "@react-navigation/elements": {
+      "optional": true
+    },
     "@sentry/react-native": {
       "optional": true
     },
@@ -75,6 +79,7 @@
   "devDependencies": {
     "@maplibre/maplibre-react-native": "11.3.6",
     "@react-navigation/bottom-tabs": "^7.4.0",
+    "@react-navigation/elements": "^2.9.10",
     "@sentry/react-native": "~6.22.0",
     "@types/react": "~19.2.2",
     "expo-constants": "~18.0.9",
@@ -87,7 +92,7 @@
     "react-native-reanimated": "~4.1.1",
     "tsup": "^8.5.1",
     "typescript": "^6.0.2",
-    "@wasto/sdk": "1.0.4"
+    "@wasto/sdk": "1.0.5"
   },
   "keywords": [],
   "author": "",

package/src/components/header/Header.tsx

@@ -8,6 +8,7 @@ import {
 } from "react-native";
 import { useTheme } from "../../contexts/ThemeContext";
 import { useWasto } from "../../contexts/WastoContext";
+import { useOptionalAppData } from "../../contexts/AppDataContext";
 import { useSafeAreaPadding } from "../../helpers/useSafeAreaPadding";
 import { Title } from "../title/Title";
 import { Theme } from "../../types/Theme";
@@ -98,21 +99,16 @@ function resolveLogoUri(
     apiUrl: string,
     el: AppHeaderLogoElement,
 ): string | null {
-    if (el.sourceType === "media") {
+    const url = (el.url || "").trim();
+    if (url) return url;
+    // Fallback média (export parfois laisse mediaId si rewrite manqué)
+    if (el.sourceType === "media" || el.mediaId) {
         return publicMediaUrl(apiUrl, el.mediaId);
     }
-    const url = (el.url || "").trim();
-    return url || null;
+    return null;
 }
 
-function HeaderLogo({
-    element,
-}: {
-    readonly element: AppHeaderLogoElement;
-}): ReactNode {
-    const { apiUrl } = useWasto();
-    const uri = resolveLogoUri(apiUrl, element);
-    if (!uri) return null;
+function HeaderLogoImage({ uri }: { readonly uri: string }): ReactNode {
     return (
         <Image
             source={{ uri }}
@@ -123,6 +119,29 @@ function HeaderLogo({
     );
 }
 
+function HeaderLogo({
+    element,
+}: {
+    readonly element: AppHeaderLogoElement;
+}): ReactNode {
+    const { apiUrl } = useWasto();
+    const uri = resolveLogoUri(apiUrl, element);
+    if (!uri) return null;
+    return <HeaderLogoImage uri={uri} />;
+}
+
+function CityLogoFallback(): ReactNode {
+    const { apiUrl } = useWasto();
+    const appData = useOptionalAppData();
+    const logoMediaId =
+        typeof appData?.city?.logoMediaId === "string"
+            ? appData.city.logoMediaId
+            : null;
+    const uri = publicMediaUrl(apiUrl, logoMediaId);
+    if (!uri) return null;
+    return <HeaderLogoImage uri={uri} />;
+}
+
 function HeaderActionButton({
     onPress,
     accessibilityLabel,
@@ -174,6 +193,7 @@ export function Header({
         return raw.filter((el) => el.type !== "title");
     }, [headerConfig]);
     const hasCustomActions = elements.some((el) => el.type === "action");
+    const hasLogo = elements.some((el) => el.type === "logo");
 
     const bySlot = useMemo(() => {
         const left: AppHeaderElement[] = [];
@@ -300,6 +320,7 @@ export function Header({
                                 </HeaderActionButton>
                             ) : null}
                             {bySlot.left.map(renderElement)}
+                            {!hasLogo ? <CityLogoFallback /> : null}
                         </View>
                         <View
                             style={styles.slotCenter}
@@ -328,6 +349,7 @@ export function Header({
                                     />
                                 </HeaderActionButton>
                             ) : null}
+                            <CityLogoFallback />
                             <Title text={screenTitle} level="1" />
                         </View>
                         <View style={styles.actions}>{defaultActions}</View>
@@ -357,9 +379,9 @@ const styles = StyleSheet.create({
         alignItems: "center",
         justifyContent: "space-between",
         paddingHorizontal: SPACE.pageX,
-        paddingVertical: 12,
+        paddingVertical: 6,
         gap: 10,
-        minHeight: 56,
+        minHeight: 44,
     },
     left: {
         flexDirection: "row",

package/src/components/page/Page.tsx

@@ -1,5 +1,12 @@
-import { PropsWithChildren, useCallback, useState, type ReactNode } from "react";
+import {
+    PropsWithChildren,
+    useCallback,
+    useContext,
+    useState,
+    type ReactNode,
+} from "react";
 import { RefreshControl, ScrollView, StyleSheet, View } from "react-native";
+import { HeaderHeightContext } from "@react-navigation/elements";
 import { useTheme } from "../../contexts/ThemeContext";
 import { useOptionalAppData } from "../../contexts/AppDataContext";
 import { useSafeAreaPadding } from "../../helpers/useSafeAreaPadding";
@@ -18,7 +25,8 @@ export type PageProps = PropsWithChildren & {
 };
 
 /**
- * Page shell: top safe area + optional vertical scroll.
+ * Page shell: optional vertical scroll.
+ * Top safe area only when no navigation header (avoids a double inset band).
  * No global horizontal padding — each block uses ContentInset or is full-bleed
  * (map, calendar grid). Bottom inset is handled by BottomTab when using tabs.
  */
@@ -30,7 +38,9 @@ export function Page({
     const { theme } = useTheme();
     const t = resolveTheme(theme);
     const themedStyles = createThemedStyles(theme);
-    const topInset = useSafeAreaPadding(["top"]);
+    const headerHeight = useContext(HeaderHeightContext);
+    const hasNavHeader = typeof headerHeight === "number" && headerHeight > 0;
+    const topInset = useSafeAreaPadding(hasNavHeader ? [] : ["top"]);
     const appData = useOptionalAppData();
     const [refreshing, setRefreshing] = useState(false);
 

package/src/components/push/PushTokenRegistrar.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useRef, type ReactNode } from "react";
-import { Platform } from "react-native";
+import { AppState, Platform } from "react-native";
 import { useLocal } from "../../contexts/LocalContext";
 import { useWasto } from "../../contexts/WastoContext";
 import { useWastoClient } from "../../hooks/useWastoClient";
@@ -7,41 +7,71 @@ import { registerExpoPushToken } from "../../push/registerExpoPushToken";
 
 /**
  * Registers the Expo push token once a deviceId exists.
+ * Retries when the app comes back to the foreground (permission granted in OS settings).
+ * Associates the token with the selected collection place (→ city → city group).
  * Renders nothing — mount inside LocalProvider.
  */
 export function PushTokenRegistrar(): ReactNode {
-    const { deviceId } = useLocal();
+    const { deviceId, selectedCityId, selectedPlaceId } = useLocal();
     const { previewMode, reportError } = useWasto();
     const client = useWastoClient();
     const lastRegistered = useRef<string | null>(null);
+    const inFlight = useRef(false);
 
     useEffect(() => {
         if (previewMode || Platform.OS === "web" || !deviceId) return;
-        if (lastRegistered.current === deviceId) return;
 
         let cancelled = false;
 
-        void (async () => {
+        const tryRegister = async () => {
+            if (cancelled || inFlight.current) return;
+            const registrationKey = `${deviceId}:${selectedPlaceId ?? ""}:${selectedCityId ?? ""}`;
+            if (lastRegistered.current === registrationKey) return;
+
+            inFlight.current = true;
             try {
                 const token = await registerExpoPushToken({
                     deviceId,
                     registerPushToken: (id: string, pushToken: string) =>
-                        client.public.devices.registerPushToken(id, { token: pushToken }),
+                        client.public.devices.registerPushToken(id, {
+                            token: pushToken,
+                            cityId: selectedCityId,
+                            wasteCollectionPlaceId: selectedPlaceId,
+                        }),
                 });
                 if (!cancelled && token) {
-                    lastRegistered.current = deviceId;
+                    lastRegistered.current = registrationKey;
                 }
             } catch (error) {
                 if (!cancelled) {
                     reportError(error, { source: "push", deviceId });
                 }
+            } finally {
+                inFlight.current = false;
+            }
+        };
+
+        void tryRegister();
+
+        const sub = AppState.addEventListener("change", (state) => {
+            if (state === "active") {
+                lastRegistered.current = null;
+                void tryRegister();
             }
-        })();
+        });
 
         return () => {
             cancelled = true;
+            sub.remove();
         };
-    }, [client.public.devices, deviceId, previewMode, reportError]);
+    }, [
+        client.public.devices,
+        deviceId,
+        previewMode,
+        reportError,
+        selectedCityId,
+        selectedPlaceId,
+    ]);
 
     return null;
 }

package/src/contexts/LocalContext.tsx

@@ -93,18 +93,22 @@ export function LocalProvider({
 
             let resolvedDeviceId: string | null = null;
             if (!previewMode) {
-                const newDeviceId = generateDeviceId();
+                const existingDeviceId = await AsyncStorage.getItem(keys.device);
+                const nextDeviceId = existingDeviceId || generateDeviceId();
                 await client.public.analytics.track({
-                    id: newDeviceId,
+                    id: nextDeviceId,
                     cityId: cityId,
+                    wasteCollectionPlaceId: placeId,
                     platform: Platform.OS,
                     osVersion: null,
                     appVersion: null,
                     deviceModel: null,
                 });
-                await AsyncStorage.setItem(keys.device, newDeviceId);
-                setDeviceId(newDeviceId);
-                resolvedDeviceId = newDeviceId;
+                if (!existingDeviceId) {
+                    await AsyncStorage.setItem(keys.device, nextDeviceId);
+                }
+                setDeviceId(nextDeviceId);
+                resolvedDeviceId = nextDeviceId;
             } else {
                 // Studio preview: never create analytics devices / persist device id.
                 setDeviceId(null);
@@ -190,6 +194,29 @@ export function LocalProvider({
         void loadLocalData();
     }, [keys, previewMode]);
 
+    useEffect(() => {
+        if (previewMode || !deviceId || !selectedCityId) return;
+        void client.public.analytics
+            .track({
+                id: deviceId,
+                cityId: selectedCityId,
+                wasteCollectionPlaceId: selectedPlaceId,
+                platform: Platform.OS,
+                osVersion: null,
+                appVersion: null,
+                deviceModel: null,
+            })
+            .catch(() => {
+                // Heartbeat best-effort: the sector is already stored locally.
+            });
+    }, [
+        client.public.analytics,
+        deviceId,
+        previewMode,
+        selectedCityId,
+        selectedPlaceId,
+    ]);
+
     return (
         <LocalContext
             value={{

package/src/helpers/nextCollection.ts

@@ -23,7 +23,7 @@ export type WasteCollectionPlace = {
         /** Ex: "Lundi", "Mardi", ... (mapping lundi=0 … dimanche=6) */
         name: string;
         wasteTypeId: string;
-        biweekly?: boolean;
+        everyWeeks?: number;
         startDate?: string;
     }>;
     /** Périodes d’exception (pas de collecte) */
@@ -90,13 +90,16 @@ export function getCollectionsForDay(
         });
         if (hasException) continue;
 
-        if (day.biweekly && day.startDate) {
+        if (day.startDate) {
             const start = new Date(day.startDate);
+            start.setHours(0, 0, 0, 0);
+            const everyWeeks = Math.max(1, Number(day.everyWeeks) || 1);
             const diffDays = Math.floor(
                 (targetDate.getTime() - start.getTime()) / (1000 * 60 * 60 * 24),
             );
             const weeks = Math.floor(diffDays / 7);
-            if (weeks < 0 || weeks % 2 !== 0) continue;
+            if (weeks < 0) continue;
+            if (everyWeeks > 1 && weeks % everyWeeks !== 0) continue;
         }
 
         const wt = wasteTypes.find((w) => w.id === day.wasteTypeId);

package/src/hooks/useCollectionCalendar.ts

@@ -31,7 +31,7 @@ export type CollectionScheduleEntry = {
     dayOfWeek: number; // lundi=0 ... dimanche=6
     wasteTypeId: string;
     color: string;
-    biweekly?: boolean;
+    everyWeeks?: number;
     startDate?: string;
 };
 
@@ -255,7 +255,7 @@ function buildSchedule(
     const rawDays = (selected.collectionDays || []) as Array<{
         name: string;
         wasteTypeId: string;
-        biweekly?: boolean;
+        everyWeeks?: number;
         startDate?: string;
     }>;
 
@@ -268,7 +268,7 @@ function buildSchedule(
             dayOfWeek: dayIndex,
             wasteTypeId: day.wasteTypeId,
             color: typeof color === "string" && color.trim().length > 0 ? color : "#7C7C7C",
-            biweekly: day.biweekly,
+            everyWeeks: Math.max(1, Number(day.everyWeeks) || 1),
             startDate: day.startDate,
         });
     }
@@ -293,14 +293,13 @@ function computeWasteTypesForDay(
 
     const wasteTypes: WasteTypeInfoForDay[] = [];
     for (const s of daySchedules) {
-        if (s.biweekly && s.startDate) {
+        const everyWeeks = Math.max(1, Number(s.everyWeeks) || 1);
+        if (s.startDate) {
             const weeksSinceStart = getWeeksSinceStart(s.startDate, date);
-            if (weeksSinceStart >= 0 && weeksSinceStart % 2 === 0) {
-                wasteTypes.push({ wasteTypeId: s.wasteTypeId, color: s.color });
-            }
-        } else if (!s.biweekly) {
-            wasteTypes.push({ wasteTypeId: s.wasteTypeId, color: s.color });
+            if (weeksSinceStart < 0) continue;
+            if (everyWeeks > 1 && weeksSinceStart % everyWeeks !== 0) continue;
         }
+        wasteTypes.push({ wasteTypeId: s.wasteTypeId, color: s.color });
     }
 
     // Filtre des exceptions: si l’exception cible un wasteTypeId précis, on ne garde pas ce type pendant la période.