@rpcbase/client 0.437.0 → 0.439.0

package/dist/index.js

@@ -434,6 +434,10 @@ function _temp8() {
   };
 }
 let apiClient;
+const isApiClientRequestOptions = (value) => {
+  if (!value || typeof value !== "object") return false;
+  return "signal" in value;
+};
 const initApiClient = async (args) => {
   if (env.SSR) {
     if (!args) {
@@ -441,7 +445,7 @@ const initApiClient = async (args) => {
     }
     const {
       getServerApiClient
-    } = await import("./getServerApiClient-BzqOKL0g.js");
+    } = await import("./getServerApiClient-DnG8591C.js");
     apiClient = await getServerApiClient(args.app);
   } else {
     const axios = (await import("axios/dist/browser/axios.cjs")).default;
@@ -453,7 +457,8 @@ const initApiClient = async (args) => {
       }
     });
     const createMethod = (method) => {
-      return async (path, payload, _ctx) => {
+      return async (path, payload, ctxOrOptions, options) => {
+        const requestOptions = isApiClientRequestOptions(ctxOrOptions) ? ctxOrOptions : options;
         const config = {
           method,
           url: path,
@@ -462,6 +467,9 @@ const initApiClient = async (args) => {
           } : {
             data: payload
           },
+          ...requestOptions?.signal ? {
+            signal: requestOptions.signal
+          } : {},
           headers: {
             // ...(typeof ctxOrPath !== 'string' && {
             //   // 'X-Custom-Header': ctxOrPath.someHeaderValue,
@@ -2328,6 +2336,7 @@ const DELIVERY_KEY_PREFIX = "rb:notifications:delivery:";
 const DELIVERY_LOCK_PREFIX = "rb-notifications-delivery:";
 const FALLBACK_DELIVERY_LOCK_KEY_PREFIX = "rb:notifications:delivery-lock:";
 const NOTIFICATION_TAB_ID = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`;
+const DEFAULT_NOTIFICATION_APP_NAME = "default";
 const NotificationsRealtimeContext = createContext(null);
 const toIso = (value) => {
   if (value instanceof Date) return value.toISOString();
@@ -2362,19 +2371,58 @@ const buildDisabledTopics = (settings) => {
     return pref.inApp === false ? topic : null;
   }).filter((topic) => Boolean(topic));
 };
-const getWebpushLink = (item) => {
+const getNotificationLink = (item) => {
+  const dataLink = item.data?.link?.trim();
+  if (dataLink) return dataLink;
   const platformWebpush = item.platform?.webpush;
   if (!platformWebpush || typeof platformWebpush !== "object" || Array.isArray(platformWebpush)) return "";
   const fcmOptions = platformWebpush.fcmOptions;
   if (!fcmOptions || typeof fcmOptions !== "object" || Array.isArray(fcmOptions)) return "";
-  return typeof fcmOptions.link === "string" ? fcmOptions.link : "";
-};
-const getScopedUserKey = (userId) => encodeURIComponent(userId);
-const getTabStateKey = (userId) => `${TAB_STATE_KEY_PREFIX}${getScopedUserKey(userId)}:${NOTIFICATION_TAB_ID}`;
-const getTabStateKeyPrefix = (userId) => `${TAB_STATE_KEY_PREFIX}${getScopedUserKey(userId)}:`;
-const getDeliveryKey = (userId, notificationId) => `${DELIVERY_KEY_PREFIX}${getScopedUserKey(userId)}:${encodeURIComponent(notificationId)}`;
-const getDeliveryLockName = (userId) => `${DELIVERY_LOCK_PREFIX}${getScopedUserKey(userId)}`;
-const getFallbackDeliveryLockKey = (userId) => `${FALLBACK_DELIVERY_LOCK_KEY_PREFIX}${getScopedUserKey(userId)}`;
+  const link = fcmOptions.link;
+  return typeof link === "string" ? link.trim() : "";
+};
+const getNotificationActionMode = (item) => {
+  return item.data?.linkMode === "merge_current_search" ? "merge_current_search" : "navigate";
+};
+const getNotificationAction = (item) => {
+  const link = getNotificationLink(item);
+  if (!link) return null;
+  return {
+    link,
+    mode: getNotificationActionMode(item)
+  };
+};
+const pushUrlWithoutReload = (url) => {
+  window.history.pushState(window.history.state, "", url);
+  window.dispatchEvent(new PopStateEvent("popstate", {
+    state: window.history.state
+  }));
+};
+const applyNotificationAction = (action) => {
+  if (action.mode === "merge_current_search") {
+    const currentUrl = new URL(window.location.href);
+    const actionUrl = new URL(action.link, currentUrl);
+    actionUrl.searchParams.forEach((value, key) => {
+      currentUrl.searchParams.set(key, value);
+    });
+    if (actionUrl.hash) {
+      currentUrl.hash = actionUrl.hash;
+    }
+    pushUrlWithoutReload(`${currentUrl.pathname}${currentUrl.search}${currentUrl.hash}`);
+    return;
+  }
+  window.location.href = action.link;
+};
+const getNormalizedNotificationAppName = (appName) => {
+  const normalized = typeof appName === "string" ? appName.trim() : "";
+  return normalized || DEFAULT_NOTIFICATION_APP_NAME;
+};
+const getScopedNotificationKey = (userId, appName) => `${encodeURIComponent(appName)}:${encodeURIComponent(userId)}`;
+const getTabStateKey = (userId, appName) => `${TAB_STATE_KEY_PREFIX}${getScopedNotificationKey(userId, appName)}:${NOTIFICATION_TAB_ID}`;
+const getTabStateKeyPrefix = (userId, appName) => `${TAB_STATE_KEY_PREFIX}${getScopedNotificationKey(userId, appName)}:`;
+const getDeliveryKey = (userId, appName, notificationId) => `${DELIVERY_KEY_PREFIX}${getScopedNotificationKey(userId, appName)}:${encodeURIComponent(notificationId)}`;
+const getDeliveryLockName = (userId, appName) => `${DELIVERY_LOCK_PREFIX}${getScopedNotificationKey(userId, appName)}`;
+const getFallbackDeliveryLockKey = (userId, appName) => `${FALLBACK_DELIVERY_LOCK_KEY_PREFIX}${getScopedNotificationKey(userId, appName)}`;
 const getLocalStorage = () => {
   if (typeof window === "undefined") return null;
   try {
@@ -2402,7 +2450,7 @@ const isDocumentActive = () => {
   if (typeof document === "undefined") return false;
   return document.visibilityState === "visible" && document.hasFocus();
 };
-const writeNotificationTabState = (userId) => {
+const writeNotificationTabState = (userId, appName) => {
   const storage = getLocalStorage();
   if (!storage) return;
   const state = {
@@ -2411,24 +2459,24 @@ const writeNotificationTabState = (userId) => {
     updatedAt: Date.now()
   };
   try {
-    storage.setItem(getTabStateKey(userId), JSON.stringify(state));
+    storage.setItem(getTabStateKey(userId, appName), JSON.stringify(state));
   } catch {
     return;
   }
 };
-const removeNotificationTabState = (userId) => {
+const removeNotificationTabState = (userId, appName) => {
   const storage = getLocalStorage();
   if (!storage) return;
   try {
-    storage.removeItem(getTabStateKey(userId));
+    storage.removeItem(getTabStateKey(userId, appName));
   } catch {
     return;
   }
 };
-const hasActiveNotificationTab = (userId) => {
+const hasActiveNotificationTab = (userId, appName) => {
   const storage = getLocalStorage();
   if (!storage) return false;
-  const prefix = getTabStateKeyPrefix(userId);
+  const prefix = getTabStateKeyPrefix(userId, appName);
   const now = Date.now();
   try {
     for (let index = storage.length - 1; index >= 0; index -= 1) {
@@ -2447,13 +2495,13 @@ const hasActiveNotificationTab = (userId) => {
   }
   return false;
 };
-const claimNotificationDeliveriesFromStorage = (items, userId, mode) => {
+const claimNotificationDeliveriesFromStorage = (items, userId, appName, mode) => {
   const storage = getLocalStorage();
   if (!storage) return items;
   const now = Date.now();
   const claimed = [];
   for (const item of items) {
-    const key = getDeliveryKey(userId, item.id);
+    const key = getDeliveryKey(userId, appName, item.id);
     const current = parseJsonRecord(storage.getItem(key));
     const deliveredAt = typeof current?.deliveredAt === "number" ? current.deliveredAt : 0;
     if (deliveredAt && now - deliveredAt < DELIVERY_TTL_MS) continue;
@@ -2474,7 +2522,7 @@ const claimNotificationDeliveriesFromStorage = (items, userId, mode) => {
   }
   return claimed;
 };
-const acquireFallbackDeliveryLock = (userId) => {
+const acquireFallbackDeliveryLock = (userId, appName) => {
   const storage = getLocalStorage();
   if (!storage) {
     return {
@@ -2482,7 +2530,7 @@ const acquireFallbackDeliveryLock = (userId) => {
       expiresAt: Date.now() + FALLBACK_DELIVERY_LOCK_TTL_MS
     };
   }
-  const key = getFallbackDeliveryLockKey(userId);
+  const key = getFallbackDeliveryLockKey(userId, appName);
   const now = Date.now();
   try {
     const current = parseJsonRecord(storage.getItem(key));
@@ -2502,10 +2550,10 @@ const acquireFallbackDeliveryLock = (userId) => {
     };
   }
 };
-const releaseFallbackDeliveryLock = (userId, marker) => {
+const releaseFallbackDeliveryLock = (userId, appName, marker) => {
   const storage = getLocalStorage();
   if (!storage) return;
-  const key = getFallbackDeliveryLockKey(userId);
+  const key = getFallbackDeliveryLockKey(userId, appName);
   try {
     const stored = parseJsonRecord(storage.getItem(key));
     if (stored?.token === marker.token) {
@@ -2515,25 +2563,25 @@ const releaseFallbackDeliveryLock = (userId, marker) => {
     return;
   }
 };
-const withFallbackDeliveryLock = (userId, callback, fallback) => {
-  const marker = acquireFallbackDeliveryLock(userId);
+const withFallbackDeliveryLock = (userId, appName, callback, fallback) => {
+  const marker = acquireFallbackDeliveryLock(userId, appName);
   if (!marker) return fallback;
   try {
     return callback();
   } finally {
-    releaseFallbackDeliveryLock(userId, marker);
+    releaseFallbackDeliveryLock(userId, appName, marker);
   }
 };
-const claimNotificationDeliveries = async (items, userId, mode) => {
+const claimNotificationDeliveries = async (items, userId, appName, mode) => {
   if (items.length === 0) return [];
   const claim = () => {
-    if (mode === "native" && hasActiveNotificationTab(userId)) return [];
-    return claimNotificationDeliveriesFromStorage(items, userId, mode);
+    if (mode === "native" && hasActiveNotificationTab(userId, appName)) return [];
+    return claimNotificationDeliveriesFromStorage(items, userId, appName, mode);
   };
   const locks = getLockManager();
-  if (!locks) return withFallbackDeliveryLock(userId, claim, []);
+  if (!locks) return withFallbackDeliveryLock(userId, appName, claim, []);
   try {
-    const claimed = await locks.request(getDeliveryLockName(userId), {
+    const claimed = await locks.request(getDeliveryLockName(userId, appName), {
       mode: "exclusive",
       ifAvailable: true
     }, (lock) => {
@@ -2563,16 +2611,16 @@ const canShowNativeNotification = () => {
   if (!("Notification" in window)) return false;
   return window.Notification.permission === "granted";
 };
-const focusNotificationLink = (link) => {
+const focusNotificationAction = (action) => {
   window.focus();
-  if (link) {
-    window.location.href = link;
+  if (action) {
+    applyNotificationAction(action);
   }
 };
 const showNativeNotification = (item) => {
   if (!canShowNativeNotification()) return;
   try {
-    const link = getWebpushLink(item);
+    const action = getNotificationAction(item);
     const browserNotification = new window.Notification(item.title, {
       body: item.body,
       icon: item.image,
@@ -2580,10 +2628,11 @@ const showNativeNotification = (item) => {
       data: {
         ...item.data,
         notificationId: item.id,
-        link
+        link: action?.link ?? "",
+        linkMode: action?.mode ?? "navigate"
       }
     });
-    browserNotification.onclick = () => focusNotificationLink(link);
+    browserNotification.onclick = () => focusNotificationAction(action);
   } catch {
     return;
   }
@@ -2596,7 +2645,7 @@ const showNativeNotifications = (items) => {
         body: "Open the notifications drawer to view them.",
         tag: `${NATIVE_NOTIFICATION_TAG_PREFIX}:summary`
       });
-      browserNotification.onclick = () => focusNotificationLink("");
+      browserNotification.onclick = () => focusNotificationAction(null);
     } catch {
       return;
     }
@@ -2606,25 +2655,26 @@ const showNativeNotifications = (items) => {
     showNativeNotification(item);
   }
 };
-const showNotificationsForCurrentFocusState = async (items, userId) => {
-  writeNotificationTabState(userId);
+const showNotificationsForCurrentFocusState = async (items, userId, appName) => {
+  writeNotificationTabState(userId, appName);
   if (isDocumentActive()) {
-    const claimed2 = await claimNotificationDeliveries(items, userId, "in-app");
+    const claimed2 = await claimNotificationDeliveries(items, userId, appName, "in-app");
     if (claimed2.length > 0) {
       showInAppNotifications(claimed2);
     }
     return;
   }
   if (!canShowNativeNotification()) return;
-  const claimed = await claimNotificationDeliveries(items, userId, "native");
+  const claimed = await claimNotificationDeliveries(items, userId, appName, "native");
   if (claimed.length > 0) {
     showNativeNotifications(claimed);
   }
 };
 function NotificationsRealtimeProvider(t0) {
-  const $ = c(52);
+  const $ = c(57);
   const {
     userId,
+    appName,
     limit: t1,
     toastOnNew: t2,
     children
@@ -2640,207 +2690,217 @@ function NotificationsRealtimeProvider(t0) {
     t3 = $[1];
   }
   const trimmedUserId = t3;
-  const canUseRts = Boolean(trimmedUserId);
   let t4;
-  if ($[2] !== canUseRts || $[3] !== trimmedUserId) {
-    t4 = canUseRts ? {
-      userId: trimmedUserId
-    } : {};
-    $[2] = canUseRts;
-    $[3] = trimmedUserId;
-    $[4] = t4;
+  if ($[2] !== appName) {
+    t4 = getNormalizedNotificationAppName(appName);
+    $[2] = appName;
+    $[3] = t4;
   } else {
-    t4 = $[4];
+    t4 = $[3];
   }
+  const normalizedAppName = t4;
+  const canUseRts = Boolean(trimmedUserId);
   let t5;
-  if ($[5] !== canUseRts) {
-    t5 = {
-      key: "rb.notifications.settings",
-      limit: 1,
-      enabled: canUseRts
-    };
-    $[5] = canUseRts;
+  if ($[4] !== canUseRts || $[5] !== trimmedUserId) {
+    t5 = canUseRts ? {
+      userId: trimmedUserId
+    } : {};
+    $[4] = canUseRts;
+    $[5] = trimmedUserId;
     $[6] = t5;
   } else {
     t5 = $[6];
   }
-  const settingsQuery = useQuery("RBNotificationSettings", t4, t5);
-  const settings = settingsQuery.data?.[0] ?? null;
   let t6;
-  if ($[7] !== settings) {
-    t6 = buildDisabledTopics(settings);
-    $[7] = settings;
+  if ($[7] !== canUseRts) {
+    t6 = {
+      key: "rb.notifications.settings",
+      limit: 1,
+      enabled: canUseRts
+    };
+    $[7] = canUseRts;
     $[8] = t6;
   } else {
     t6 = $[8];
   }
-  const disabledTopics = t6;
+  const settingsQuery = useQuery("RBNotificationSettings", t5, t6);
+  const settings = settingsQuery.data?.[0] ?? null;
   let t7;
+  if ($[9] !== settings) {
+    t7 = buildDisabledTopics(settings);
+    $[9] = settings;
+    $[10] = t7;
+  } else {
+    t7 = $[10];
+  }
+  const disabledTopics = t7;
+  let t8;
   bb0: {
     if (!canUseRts) {
-      let t83;
-      if ($[9] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-        t83 = {};
-        $[9] = t83;
+      let t93;
+      if ($[11] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+        t93 = {};
+        $[11] = t93;
       } else {
-        t83 = $[9];
+        t93 = $[11];
       }
-      t7 = t83;
+      t8 = t93;
       break bb0;
     }
-    let t82;
-    if ($[10] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-      t82 = {
+    let t92;
+    if ($[12] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+      t92 = {
         $exists: false
       };
-      $[10] = t82;
+      $[12] = t92;
     } else {
-      t82 = $[10];
+      t92 = $[12];
     }
     let base;
-    if ($[11] !== disabledTopics || $[12] !== trimmedUserId) {
+    if ($[13] !== disabledTopics || $[14] !== trimmedUserId) {
       base = {
         userId: trimmedUserId,
-        archivedAt: t82
+        archivedAt: t92
       };
       if (disabledTopics.length > 0) {
-        let t92;
-        if ($[14] !== disabledTopics) {
-          t92 = {
+        let t102;
+        if ($[16] !== disabledTopics) {
+          t102 = {
             $nin: disabledTopics
           };
-          $[14] = disabledTopics;
-          $[15] = t92;
+          $[16] = disabledTopics;
+          $[17] = t102;
         } else {
-          t92 = $[15];
+          t102 = $[17];
         }
-        base.topic = t92;
+        base.topic = t102;
       }
-      $[11] = disabledTopics;
-      $[12] = trimmedUserId;
-      $[13] = base;
+      $[13] = disabledTopics;
+      $[14] = trimmedUserId;
+      $[15] = base;
     } else {
-      base = $[13];
+      base = $[15];
     }
-    t7 = base;
+    t8 = base;
   }
-  const query = t7;
-  let t8;
-  if ($[16] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t8 = {
+  const query = t8;
+  let t9;
+  if ($[18] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t9 = {
       createdAt: -1
     };
-    $[16] = t8;
+    $[18] = t9;
   } else {
-    t8 = $[16];
+    t9 = $[18];
   }
-  let t9;
-  if ($[17] !== canUseRts || $[18] !== limit) {
-    t9 = {
+  let t10;
+  if ($[19] !== canUseRts || $[20] !== limit) {
+    t10 = {
       key: "rb.notifications",
-      sort: t8,
+      sort: t9,
       limit,
       enabled: canUseRts
     };
-    $[17] = canUseRts;
-    $[18] = limit;
-    $[19] = t9;
+    $[19] = canUseRts;
+    $[20] = limit;
+    $[21] = t10;
   } else {
-    t9 = $[19];
+    t10 = $[21];
   }
-  const notificationsQuery = useQuery("RBNotification", query, t9);
-  let t10;
+  const notificationsQuery = useQuery("RBNotification", query, t10);
+  let t11;
   bb1: {
     const raw = notificationsQuery.data;
     if (!Array.isArray(raw)) {
-      let t113;
-      if ($[20] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-        t113 = [];
-        $[20] = t113;
+      let t123;
+      if ($[22] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+        t123 = [];
+        $[22] = t123;
       } else {
-        t113 = $[20];
+        t123 = $[22];
       }
-      t10 = t113;
+      t11 = t123;
       break bb1;
     }
-    let t112;
-    if ($[21] !== raw) {
-      t112 = raw.map(_temp).filter(_temp2);
-      $[21] = raw;
-      $[22] = t112;
+    let t122;
+    if ($[23] !== raw) {
+      t122 = raw.map(_temp).filter(_temp2);
+      $[23] = raw;
+      $[24] = t122;
     } else {
-      t112 = $[22];
+      t122 = $[24];
     }
-    t10 = t112;
+    t11 = t122;
   }
-  const notifications = t10;
-  let t11;
-  if ($[23] !== notifications) {
-    t11 = notifications.reduce(_temp3, 0);
-    $[23] = notifications;
-    $[24] = t11;
-  } else {
-    t11 = $[24];
-  }
-  const unreadCount = t11;
+  const notifications = t11;
   let t12;
   if ($[25] !== notifications) {
-    t12 = notifications.reduce(_temp4, 0);
+    t12 = notifications.reduce(_temp3, 0);
     $[25] = notifications;
     $[26] = t12;
   } else {
     t12 = $[26];
   }
-  const unseenCount = t12;
+  const unreadCount = t12;
   let t13;
-  if ($[27] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t13 = /* @__PURE__ */ new Set();
-    $[27] = t13;
+  if ($[27] !== notifications) {
+    t13 = notifications.reduce(_temp4, 0);
+    $[27] = notifications;
+    $[28] = t13;
   } else {
-    t13 = $[27];
+    t13 = $[28];
   }
-  const lastToastIds = useRef(t13);
-  const hasSeededToastIds = useRef(false);
+  const unseenCount = t13;
   let t14;
-  if ($[28] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t14 = Date.now();
-    $[28] = t14;
+  if ($[29] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t14 = /* @__PURE__ */ new Set();
+    $[29] = t14;
   } else {
-    t14 = $[28];
+    t14 = $[29];
   }
-  const toastStartMs = useRef(t14);
+  const lastToastIds = useRef(t14);
+  const hasSeededToastIds = useRef(false);
   let t15;
-  if ($[29] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t15 = () => {
+  if ($[30] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t15 = Date.now();
+    $[30] = t15;
+  } else {
+    t15 = $[30];
+  }
+  const toastStartMs = useRef(t15);
+  let t16;
+  if ($[31] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t16 = () => {
       hasSeededToastIds.current = false;
       lastToastIds.current = /* @__PURE__ */ new Set();
       toastStartMs.current = Date.now();
     };
-    $[29] = t15;
-  } else {
-    t15 = $[29];
-  }
-  let t16;
-  if ($[30] !== trimmedUserId) {
-    t16 = [trimmedUserId];
-    $[30] = trimmedUserId;
     $[31] = t16;
   } else {
     t16 = $[31];
   }
-  useEffect(t15, t16);
   let t17;
+  if ($[32] !== normalizedAppName || $[33] !== trimmedUserId) {
+    t17 = [normalizedAppName, trimmedUserId];
+    $[32] = normalizedAppName;
+    $[33] = trimmedUserId;
+    $[34] = t17;
+  } else {
+    t17 = $[34];
+  }
+  useEffect(t16, t17);
   let t18;
-  if ($[32] !== canUseRts || $[33] !== trimmedUserId) {
-    t17 = () => {
+  let t19;
+  if ($[35] !== canUseRts || $[36] !== normalizedAppName || $[37] !== trimmedUserId) {
+    t18 = () => {
       if (!canUseRts) {
         return;
       }
       if (typeof window === "undefined" || typeof document === "undefined") {
         return;
       }
-      const writeState = () => writeNotificationTabState(trimmedUserId);
-      const removeState = () => removeNotificationTabState(trimmedUserId);
+      const writeState = () => writeNotificationTabState(trimmedUserId, normalizedAppName);
+      const removeState = () => removeNotificationTabState(trimmedUserId, normalizedAppName);
       writeState();
       const intervalId = window.setInterval(writeState, ACTIVE_TAB_HEARTBEAT_MS);
       window.addEventListener("focus", writeState);
@@ -2858,20 +2918,21 @@ function NotificationsRealtimeProvider(t0) {
         removeState();
       };
     };
-    t18 = [canUseRts, trimmedUserId];
-    $[32] = canUseRts;
-    $[33] = trimmedUserId;
-    $[34] = t17;
-    $[35] = t18;
+    t19 = [canUseRts, normalizedAppName, trimmedUserId];
+    $[35] = canUseRts;
+    $[36] = normalizedAppName;
+    $[37] = trimmedUserId;
+    $[38] = t18;
+    $[39] = t19;
   } else {
-    t17 = $[34];
-    t18 = $[35];
+    t18 = $[38];
+    t19 = $[39];
   }
-  useEffect(t17, t18);
-  let t19;
+  useEffect(t18, t19);
   let t20;
-  if ($[36] !== canUseRts || $[37] !== notifications || $[38] !== notificationsQuery.loading || $[39] !== toastOnNew || $[40] !== trimmedUserId) {
-    t19 = () => {
+  let t21;
+  if ($[40] !== canUseRts || $[41] !== normalizedAppName || $[42] !== notifications || $[43] !== notificationsQuery.loading || $[44] !== toastOnNew || $[45] !== trimmedUserId) {
+    t20 = () => {
       if (!toastOnNew) {
         return;
       }
@@ -2892,7 +2953,7 @@ function NotificationsRealtimeProvider(t0) {
           return createdAtMs >= toastStartMs.current - NEW_NOTIFICATION_START_TOLERANCE_MS;
         });
         if (eligible.length) {
-          showNotificationsForCurrentFocusState(eligible, trimmedUserId);
+          showNotificationsForCurrentFocusState(eligible, trimmedUserId, normalizedAppName);
         }
         return;
       }
@@ -2913,51 +2974,52 @@ function NotificationsRealtimeProvider(t0) {
       if (!eligible_0.length) {
         return;
       }
-      showNotificationsForCurrentFocusState(eligible_0, trimmedUserId);
+      showNotificationsForCurrentFocusState(eligible_0, trimmedUserId, normalizedAppName);
     };
-    t20 = [canUseRts, notifications, notificationsQuery.loading, toastOnNew, trimmedUserId];
-    $[36] = canUseRts;
-    $[37] = notifications;
-    $[38] = notificationsQuery.loading;
-    $[39] = toastOnNew;
-    $[40] = trimmedUserId;
-    $[41] = t19;
-    $[42] = t20;
+    t21 = [canUseRts, normalizedAppName, notifications, notificationsQuery.loading, toastOnNew, trimmedUserId];
+    $[40] = canUseRts;
+    $[41] = normalizedAppName;
+    $[42] = notifications;
+    $[43] = notificationsQuery.loading;
+    $[44] = toastOnNew;
+    $[45] = trimmedUserId;
+    $[46] = t20;
+    $[47] = t21;
   } else {
-    t19 = $[41];
-    t20 = $[42];
+    t20 = $[46];
+    t21 = $[47];
   }
-  useEffect(t19, t20);
-  let t21;
-  if ($[43] !== notifications || $[44] !== notificationsQuery.error || $[45] !== notificationsQuery.loading || $[46] !== unreadCount || $[47] !== unseenCount) {
-    t21 = {
+  useEffect(t20, t21);
+  let t22;
+  if ($[48] !== notifications || $[49] !== notificationsQuery.error || $[50] !== notificationsQuery.loading || $[51] !== unreadCount || $[52] !== unseenCount) {
+    t22 = {
       notifications,
       unreadCount,
       unseenCount,
       loading: notificationsQuery.loading,
       error: notificationsQuery.error
     };
-    $[43] = notifications;
-    $[44] = notificationsQuery.error;
-    $[45] = notificationsQuery.loading;
-    $[46] = unreadCount;
-    $[47] = unseenCount;
-    $[48] = t21;
+    $[48] = notifications;
+    $[49] = notificationsQuery.error;
+    $[50] = notificationsQuery.loading;
+    $[51] = unreadCount;
+    $[52] = unseenCount;
+    $[53] = t22;
   } else {
-    t21 = $[48];
-  }
-  const value = t21;
-  const t22 = canUseRts ? value : null;
-  let t23;
-  if ($[49] !== children || $[50] !== t22) {
-    t23 = /* @__PURE__ */ jsx(NotificationsRealtimeContext.Provider, { value: t22, children });
-    $[49] = children;
-    $[50] = t22;
-    $[51] = t23;
+    t22 = $[53];
+  }
+  const value = t22;
+  const t23 = canUseRts ? value : null;
+  let t24;
+  if ($[54] !== children || $[55] !== t23) {
+    t24 = /* @__PURE__ */ jsx(NotificationsRealtimeContext.Provider, { value: t23, children });
+    $[54] = children;
+    $[55] = t23;
+    $[56] = t24;
   } else {
-    t23 = $[51];
+    t24 = $[56];
   }
-  return t23;
+  return t24;
 }
 function _temp5(n_2) {
   return n_2.id;