@developer_tribe/react-native-comnyx 0.14.0 → 0.16.0

package/src/constants/translations.ts

@@ -58,10 +58,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Copy to Clipboard',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Select media source',
+    'chat.media.pick.photo': 'Choose Photo',
+    'chat.media.pick.video': 'Choose Video',
   },
   tr: {
     'customer.form.title': 'Merhaba👋',
@@ -119,10 +118,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Panoya Kopyala',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Medya kaynağı seçin',
+    'chat.media.pick.photo': 'Fotoğraf Seç',
+    'chat.media.pick.video': 'Video Seç',
   },
   es: {
     'customer.form.title': 'Hola👋',
@@ -182,10 +180,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Copiar al Portapapeles',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Seleccionar fuente de medios',
+    'chat.media.pick.photo': 'Elegir Foto',
+    'chat.media.pick.video': 'Elegir Video',
   },
   fr: {
     'customer.form.title': 'Bonjour👋',
@@ -246,10 +243,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Copier dans le Presse-papiers',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Sélectionner la source média',
+    'chat.media.pick.photo': 'Choisir une Photo',
+    'chat.media.pick.video': 'Choisir une Vidéo',
   },
   de: {
     'customer.form.title': 'Hallo👋',
@@ -311,10 +307,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'In die Zwischenablage kopieren',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Medienquelle auswählen',
+    'chat.media.pick.photo': 'Foto auswählen',
+    'chat.media.pick.video': 'Video auswählen',
   },
   it: {
     'customer.form.title': 'Ciao👋',
@@ -373,10 +368,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Copia negli Appunti',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Seleziona sorgente media',
+    'chat.media.pick.photo': 'Scegli Foto',
+    'chat.media.pick.video': 'Scegli Video',
   },
   pt: {
     'customer.form.title': 'Olá👋',
@@ -438,10 +432,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
       'Copiar para a Área de Transferência',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Selecionar fonte de mídia',
+    'chat.media.pick.photo': 'Escolher Foto',
+    'chat.media.pick.video': 'Escolher Vídeo',
   },
   ru: {
     'customer.form.title': 'Привет👋',
@@ -502,10 +495,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Скопировать в буфер обмена',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Выберите источник медиа',
+    'chat.media.pick.photo': 'Выбрать Фото',
+    'chat.media.pick.video': 'Выбрать Видео',
   },
   ja: {
     'customer.form.title': 'こんにちは👋',
@@ -563,10 +555,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'クリップボードにコピー',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'メディアソースを選択',
+    'chat.media.pick.photo': '写真を選択',
+    'chat.media.pick.video': '動画を選択',
   },
   zh: {
     'customer.form.title': '你好👋',
@@ -619,10 +610,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': '复制到剪贴板',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': '选择媒体来源',
+    'chat.media.pick.photo': '选择照片',
+    'chat.media.pick.video': '选择视频',
   },
   ar: {
     'customer.form.title': 'مرحباً👋',
@@ -678,10 +668,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'نسخ إلى الحافظة',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'اختر مصدر الوسائط',
+    'chat.media.pick.photo': 'اختر صورة',
+    'chat.media.pick.video': 'اختر فيديو',
   },
   id: {
     'customer.form.title': 'Halo👋',
@@ -738,10 +727,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Salin ke Clipboard',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Pilih sumber media',
+    'chat.media.pick.photo': 'Pilih Foto',
+    'chat.media.pick.video': 'Pilih Video',
   },
   vi: {
     'customer.form.title': 'Xin chào👋',
@@ -797,10 +785,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Sao chép vào Clipboard',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Chọn nguồn phương tiện',
+    'chat.media.pick.photo': 'Chọn Ảnh',
+    'chat.media.pick.video': 'Chọn Video',
   },
   sv: {
     'customer.form.title': 'Hej👋',
@@ -858,10 +845,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Kopiera till Urklipp',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Välj mediakälla',
+    'chat.media.pick.photo': 'Välj Foto',
+    'chat.media.pick.video': 'Välj Video',
   },
   ko: {
     'customer.form.title': '안녕하세요👋',
@@ -915,10 +901,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': '클립보드에 복사',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': '미디어 소스 선택',
+    'chat.media.pick.photo': '사진 선택',
+    'chat.media.pick.video': '동영상 선택',
   },
   hi: {
     'customer.form.title': 'नमस्ते👋',
@@ -977,10 +962,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'क्लिपबोर्ड में कॉपी करें',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'मीडिया स्रोत चुनें',
+    'chat.media.pick.photo': 'फोटो चुनें',
+    'chat.media.pick.video': 'वीडियो चुनें',
   },
   nl: {
     'customer.form.title': 'Hallo👋',
@@ -1038,10 +1022,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Kopieer naar Klembord',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Selecteer mediabron',
+    'chat.media.pick.photo': 'Kies Foto',
+    'chat.media.pick.video': 'Kies Video',
   },
   he: {
     'customer.form.title': 'שלום👋',
@@ -1095,10 +1078,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'העתק ללוח',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'בחר מקור מדיה',
+    'chat.media.pick.photo': 'בחר תמונה',
+    'chat.media.pick.video': 'בחר סרטון',
   },
   uk: {
     'customer.form.title': 'Привіт👋',
@@ -1157,10 +1139,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Скопіювати в буфер обміну',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Оберіть джерело медіа',
+    'chat.media.pick.photo': 'Обрати Фото',
+    'chat.media.pick.video': 'Обрати Відео',
   },
   hu: {
     'customer.form.title': 'Helló👋',
@@ -1220,10 +1201,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Vágólapra másolás',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Válasszon médiaforrást',
+    'chat.media.pick.photo': 'Fotó kiválasztása',
+    'chat.media.pick.video': 'Videó kiválasztása',
   },
   ro: {
     'customer.form.title': 'Salut👋',
@@ -1284,10 +1264,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Copiază în Clipboard',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Selectați sursa media',
+    'chat.media.pick.photo': 'Alegeți Foto',
+    'chat.media.pick.video': 'Alegeți Video',
   },
   ms: {
     'customer.form.title': 'Hai👋',
@@ -1344,10 +1323,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Salin ke Clipboard',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Pilih sumber media',
+    'chat.media.pick.photo': 'Pilih Foto',
+    'chat.media.pick.video': 'Pilih Video',
   },
   az: {
     'customer.form.title': 'Salam👋',
@@ -1405,10 +1383,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Klipdorda kopyala',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Media mənbəyini seçin',
+    'chat.media.pick.photo': 'Şəkil Seç',
+    'chat.media.pick.video': 'Video Seç',
   },
   hr: {
     'customer.form.title': 'Bok👋',
@@ -1464,10 +1441,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Kopiraj u međuspremnik',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Odaberite izvor medija',
+    'chat.media.pick.photo': 'Odaberi Fotografiju',
+    'chat.media.pick.video': 'Odaberi Video',
   },
   kk: {
     'customer.form.title': 'Сәлем👋',
@@ -1525,10 +1501,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Буферге көшіру',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Медиа көзін таңдаңыз',
+    'chat.media.pick.photo': 'Фото таңдау',
+    'chat.media.pick.video': 'Бейне таңдау',
   },
   af: {
     'customer.form.title': 'Hallo👋',
@@ -1587,10 +1562,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Kopieer naar Klembord',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Kies mediabron',
+    'chat.media.pick.photo': 'Kies Foto',
+    'chat.media.pick.video': 'Kies Video',
   },
   yo: {
     'customer.form.title': 'Báwo👋',
@@ -1645,10 +1619,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Kopier til Udklipsholderen',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Yan oríṣun iṣẹ́ amóhùn',
+    'chat.media.pick.photo': 'Yan Àwòrán',
+    'chat.media.pick.video': 'Yan Fídíò',
   },
   da: {
     'customer.form.title': 'Hej👋',
@@ -1705,10 +1678,9 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Kopier til Udklipsholderen',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Vælg mediekilde',
+    'chat.media.pick.photo': 'Vælg Foto',
+    'chat.media.pick.video': 'Vælg Video',
   },
   pl: {
     'customer.form.title': 'Cześć👋',
@@ -1765,9 +1737,8 @@ export const LocalizationList: Record<LanguageCode, LocalizationKeys> = {
     'notifications.optIn.copyToClipboard': 'Kopiuj do schowka',
     'chat.media.uploading': 'Uploading...',
     'chat.media.upload.failed': 'Upload failed',
-    'chat.media.pick.title': 'Add Media',
-    'chat.media.pick.photo': 'Photo',
-    'chat.media.pick.video': 'Video',
-    'chat.media.pick.cancel': 'Cancel',
+    'chat.media.pick.title': 'Wybierz źródło mediów',
+    'chat.media.pick.photo': 'Wybierz Zdjęcie',
+    'chat.media.pick.video': 'Wybierz Wideo',
   },
 } as const;

package/src/hooks/usePolling.ts

@@ -13,12 +13,19 @@ export function usePolling() {
   const lastMessage = data ? data[data.length - 1] : null;
   useEffect(() => {
     const created_at = lastMessage?.created_at;
-    let interval: ReturnType<typeof setInterval> | null = null;
-    if (customer && created_at) {
-      interval = setInterval(() => {
-        getNewCustomerConversation(customer?.external_id, created_at, {
-          fake: useAppStore.getState().fake,
-        }).then((newData) => {
+    if (!customer || !created_at) {
+      return undefined;
+    }
+    const controller = new AbortController();
+    const interval = setInterval(() => {
+      getNewCustomerConversation(
+        customer.external_id,
+        created_at,
+        { fake: useAppStore.getState().fake },
+        controller.signal
+      )
+        .then((newData) => {
+          if (controller.signal.aborted) return;
           setData((prevData) => {
             const newMessages = newData.page.data;
             const existingIds = new Set(prevData?.map((msg) => msg.id));
@@ -34,13 +41,16 @@ export function usePolling() {
               ...(prevData ?? []),
             ];
           });
+        })
+        .catch((err) => {
+          if (controller.signal.aborted) return;
+          console.warn('[Comnyx] Polling failed:', err);
         });
-      }, NEW_MESSAGES_CHECK_INTERVAL);
-    }
+    }, NEW_MESSAGES_CHECK_INTERVAL);
+
     return () => {
-      if (interval) {
-        clearInterval(interval);
-      }
+      clearInterval(interval);
+      controller.abort();
     };
   }, [customer, lastMessage?.created_at, setData]);
 }

package/src/hooks/useThemeColors.ts

@@ -1,5 +1,14 @@
-import { lightTheme, type ThemeColors } from '../types/Theme';
+import { useMemo } from 'react';
+import { darkTheme, lightTheme, type ThemeColors } from '../types/Theme';
+import { useAppStore } from '../store/store';
 
 export function useThemeColors(): ThemeColors {
-  return lightTheme;
+  const theme = useAppStore((s) => s.theme);
+  const override = useAppStore((s) => s.themeOverride);
+
+  return useMemo(() => {
+    const base = theme === 'dark' ? darkTheme : lightTheme;
+    const patch = override?.[theme];
+    return patch ? { ...base, ...patch } : base;
+  }, [theme, override]);
 }

package/src/index.ts

@@ -5,6 +5,18 @@ export { ComnyxSupport } from './support';
 export { ComnyxNotifications } from './notifications';
 //types
 export { NotificationPermissionStatus } from './NativeComnyx';
+export type {
+  ThemeColors,
+  ThemeColorsOverride,
+  ThemeOverrideConfig,
+} from './types/Theme';
+export type {
+  SupportConfig,
+  SupportHeaderRenderProps,
+  SupportErrorRenderProps,
+  SupportMessageRenderProps,
+  SupportSendPayload,
+} from './support';
 
 //deprecated
 export { registerOneSignalForComnyx } from './register/collectData';

package/src/notifications/initializeNotifications.ts

@@ -81,10 +81,11 @@ function changePermissionStatus(status: NotificationPermissionStatus) {
 
 async function initializeNativeNotifications(options: InitializeOptions) {
   const state = useAppStore.getState();
-  //TODO: better event listener. Event listener doesn't work if its set after initialize
+  // Listeners are attached BEFORE nativeComnyx.initialize so that a
+  // synchronous TOKEN_INIT emission (e.g. cached APN token on iOS) is not
+  // lost between native resolve and JS subscription.
   globalSubscriptions.subscriptionsForNotification = [
     ComnyxNotifications.addEventListener('TOKEN_INIT', (data) => {
-      console.log('TOKEN_INIT', data);
       useAppStore.getState().setToken(data.token);
       if (Platform.OS === 'ios') {
         accumulator.add({
@@ -168,7 +169,11 @@ export async function initializeNotifications(
   globalSubscriptions.subscriptionsForOptIn = AppState.addEventListener(
     'change',
     async (nextAppState) => {
-      if (nextAppState === 'active') {
+      // AppState callbacks are fire-and-forget — any throw here becomes an
+      // unhandled rejection that can surface as a red-screen in the host app.
+      // Keep the whole body inside a guard.
+      try {
+        if (nextAppState !== 'active') return;
         const permissionGivenInForeground =
           await ComnyxNotifications.checkOptIn();
         changePermissionStatus(permissionGivenInForeground);
@@ -179,24 +184,21 @@ export async function initializeNotifications(
           if (!state.notificationInitialized) {
             await initializeNativeNotifications(options);
           }
-        } else {
-          if (params.showOptInOnForeground) {
-            ComnyxNotifications.optIn().then(async (permissionResultInner) => {
-              changePermissionStatus(permissionResultInner);
-              if (
-                permissionResultInner === NotificationPermissionStatus.GRANTED
-              ) {
-                await initializeNativeNotifications(options);
-              } else if (
-                permissionResultInner === NotificationPermissionStatus.BLOCKED
-              ) {
-                if (params.linkToSettings) {
-                  showAlertDialog();
-                }
-              }
-            });
-          }
+          return;
+        }
+        if (!params.showOptInOnForeground) return;
+        const permissionResultInner = await ComnyxNotifications.optIn();
+        changePermissionStatus(permissionResultInner);
+        if (permissionResultInner === NotificationPermissionStatus.GRANTED) {
+          await initializeNativeNotifications(options);
+        } else if (
+          permissionResultInner === NotificationPermissionStatus.BLOCKED &&
+          params.linkToSettings
+        ) {
+          showAlertDialog();
         }
+      } catch (err) {
+        console.warn('[Comnyx] AppState handler failed', err);
       }
     }
   );

package/src/register/Accumulator.ts

@@ -1,4 +1,4 @@
-import type { CreateCustomerRequest } from '../types/Customer';
+import type { CreateCustomerRequest, CustomParameter } from '../types/Customer';
 
 const ACCUMULATOR_DEBOUNCE_TIME_IN_MS = 3000;
 
@@ -21,11 +21,17 @@ export class Accumulator {
 
   add(data: Partial<Omit<CreateCustomerRequest, 'externalId'>>) {
     if (!this.registerData) {
-      throw new Error('Register data is not set');
+      // Late events (push token callbacks, AppState changes) may arrive
+      // after logout() or before login(). Ignore silently instead of
+      // throwing so the host app is not crashed by SDK-internal races.
+      console.warn(
+        '[Comnyx] add() called before register/after logout — ignored'
+      );
+      return;
     }
 
     // First, create a map of existing custom parameters by name
-    const customParamsMap = new Map<string, string>();
+    const customParamsMap = new Map<string, CustomParameter['value']>();
 
     // Add existing parameters to the map
     (this.registerData.customParameters || []).forEach((param) => {
@@ -59,10 +65,19 @@ export class Accumulator {
 
   async flush() {
     if (!this.registerData) {
-      throw new Error('Register data is not set');
+      console.warn(
+        '[Comnyx] flush() called before register/after logout — ignored'
+      );
+      return;
     }
     if (this.listener) {
-      await this.listener(this.registerData!);
+      try {
+        await this.listener(this.registerData!);
+      } catch (err) {
+        console.error('[Comnyx] flush listener error', err);
+        this.reset();
+        return;
+      }
       this.registerData = {
         ...this.registerData,
         customParameters: [],
@@ -74,14 +89,16 @@ export class Accumulator {
 
   debounce() {
     if (!this.registerData) {
-      throw new Error('Register data is not set');
+      return;
     }
     this.reset();
     this.__select_time = setTimeout(() => {
-      if (this.listener) {
-        this.listener(this.registerData!);
+      if (this.listener && this.registerData) {
+        Promise.resolve(this.listener(this.registerData)).catch((err) => {
+          console.error('[Comnyx] debounce listener error', err);
+        });
         this.registerData = {
-          ...this.registerData!,
+          ...this.registerData,
           customParameters: [],
         };
         this._isListenerCalledOnce = true;

package/src/register/collectData.ts

@@ -1,12 +1,20 @@
+import type { CustomParameter } from '../types/Customer';
 import { accumulator } from './Accumulator';
 
-export function collectData<T>(key: string | Record<string, any>, value?: T) {
+export function collectData(key: string, value: CustomParameter['value']): void;
+export function collectData(
+  data: Partial<Parameters<typeof accumulator.add>[0]>
+): void;
+export function collectData(
+  key: string | Partial<Parameters<typeof accumulator.add>[0]>,
+  value?: CustomParameter['value']
+) {
   if (typeof key === 'string') {
     accumulator.add({
       customParameters: [
         {
           name: key,
-          value,
+          value: value ?? null,
         },
       ],
     });