@umituz/react-native-design-system 2.9.21 → 2.9.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-design-system",
-  "version": "2.9.21",
+  "version": "2.9.23",
   "description": "Universal design system for React Native apps - Consolidated package with atoms, molecules, organisms, theme, typography, responsive, safe area, exception, infinite scroll, UUID, image, timezone, offline, onboarding, and loading utilities",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/device/infrastructure/services/DeviceExtrasCollector.ts

@@ -12,6 +12,7 @@ import { Dimensions } from 'react-native';
 import * as Localization from 'expo-localization';
 import { DeviceInfoService } from './DeviceInfoService';
 import { ApplicationInfoService } from './ApplicationInfoService';
+import { DeviceIdService } from './DeviceIdService';
 import { PersistentDeviceIdService } from './PersistentDeviceIdService';
 
 /**
@@ -21,43 +22,48 @@ import { PersistentDeviceIdService } from './PersistentDeviceIdService';
  */
 export interface DeviceExtras {
   [key: string]: string | number | boolean | undefined;
-  deviceId?: string;
-  platform?: string;
-  deviceModel?: string;
-  deviceBrand?: string;
-  deviceName?: string;
-  deviceType?: number;
-  deviceYearClass?: number;
-  isDevice?: boolean;
-  osName?: string;
-  osVersion?: string;
-  osBuildId?: string;
-  totalMemory?: number;
-  appVersion?: string;
-  buildNumber?: string;
-  locale?: string;
-  region?: string;
-  timezone?: string;
-  screenWidth?: number;
-  screenHeight?: number;
-  screenScale?: number;
-  fontScale?: number;
-  isLandscape?: boolean;
+  /** The stable ID stored in Keychain/SecureStore */
+  deviceId: string;
+  /** Alias for deviceId for clarity in Firestore */
+  persistentDeviceId: string;
+  /** The raw native platform ID (IDFV on iOS, Android ID on Android) */
+  nativeDeviceId: string;
+  platform: string;
+  deviceModel: string;
+  deviceBrand: string;
+  deviceName: string;
+  deviceType: number | string;
+  deviceYearClass: number | string;
+  isDevice: boolean;
+  osName: string;
+  osVersion: string;
+  osBuildId: string;
+  totalMemory: number | string;
+  appVersion: string;
+  buildNumber: string;
+  locale: string;
+  region: string;
+  timezone: string;
+  screenWidth: number;
+  screenHeight: number;
+  screenScale: number;
+  fontScale: number;
+  isLandscape: boolean;
 }
 
 /**
  * Get device locale code
  */
-function getDeviceLocale(): string | undefined {
+function getDeviceLocale(): string {
   try {
     const locales = Localization.getLocales();
     if (locales && locales.length > 0) {
       const locale = locales[0];
-      return locale?.languageTag || undefined;
+      return locale?.languageTag || '-';
     }
-    return undefined;
+    return '-';
   } catch {
-    return undefined;
+    return '-';
   }
 }
 
@@ -77,40 +83,68 @@ function getDeviceLocale(): string | undefined {
  */
 export async function collectDeviceExtras(): Promise<DeviceExtras> {
   try {
-    const [deviceInfo, appInfo, deviceId] = await Promise.all([
+    const [deviceInfo, appInfo, deviceId, nativeDeviceId] = await Promise.all([
       DeviceInfoService.getDeviceInfo(),
       ApplicationInfoService.getApplicationInfo(),
       PersistentDeviceIdService.getDeviceId(),
+      DeviceIdService.getDeviceId(),
     ]);
 
     const locale = getDeviceLocale();
     const { width, height, scale, fontScale } = Dimensions.get('screen');
 
     return {
-      deviceId,
-      platform: deviceInfo.platform,
-      deviceModel: deviceInfo.modelName || undefined,
-      deviceBrand: deviceInfo.brand || undefined,
-      deviceName: deviceInfo.deviceName || undefined,
-      deviceType: deviceInfo.deviceType ?? undefined,
-      deviceYearClass: deviceInfo.deviceYearClass ?? undefined,
-      isDevice: deviceInfo.isDevice,
-      osName: deviceInfo.osName || undefined,
-      osVersion: deviceInfo.osVersion || undefined,
-      osBuildId: deviceInfo.osBuildId || undefined,
-      totalMemory: deviceInfo.totalMemory ?? undefined,
-      appVersion: appInfo.nativeApplicationVersion || undefined,
-      buildNumber: appInfo.nativeBuildVersion || undefined,
+      deviceId: deviceId || '-',
+      persistentDeviceId: deviceId || '-',
+      nativeDeviceId: nativeDeviceId || '-',
+      platform: deviceInfo.platform || '-',
+      deviceModel: deviceInfo.modelName || '-',
+      deviceBrand: deviceInfo.brand || '-',
+      deviceName: deviceInfo.deviceName || '-',
+      deviceType: deviceInfo.deviceType ?? '-',
+      deviceYearClass: deviceInfo.deviceYearClass ?? '-',
+      isDevice: deviceInfo.isDevice ?? false,
+      osName: deviceInfo.osName || '-',
+      osVersion: deviceInfo.osVersion || '-',
+      osBuildId: deviceInfo.osBuildId || '-',
+      totalMemory: deviceInfo.totalMemory ?? '-',
+      appVersion: appInfo.nativeApplicationVersion || '-',
+      buildNumber: appInfo.nativeBuildVersion || '-',
       locale,
-      region: deviceInfo.region || undefined,
-      timezone: deviceInfo.timezone || undefined,
-      screenWidth: Math.round(width),
-      screenHeight: Math.round(height),
-      screenScale: scale,
-      fontScale,
+      region: deviceInfo.region || '-',
+      timezone: deviceInfo.timezone || '-',
+      screenWidth: Math.round(width) || 0,
+      screenHeight: Math.round(height) || 0,
+      screenScale: scale || 1,
+      fontScale: fontScale || 1,
       isLandscape: width > height,
     };
   } catch {
-    return {};
+    return {
+      deviceId: '-',
+      persistentDeviceId: '-',
+      nativeDeviceId: '-',
+      platform: '-',
+      deviceModel: '-',
+      deviceBrand: '-',
+      deviceName: '-',
+      deviceType: '-',
+      deviceYearClass: '-',
+      isDevice: false,
+      osName: '-',
+      osVersion: '-',
+      osBuildId: '-',
+      totalMemory: '-',
+      appVersion: '-',
+      buildNumber: '-',
+      locale: '-',
+      region: '-',
+      timezone: '-',
+      screenWidth: 0,
+      screenHeight: 0,
+      screenScale: 1,
+      fontScale: 1,
+      isLandscape: false,
+    };
   }
 }