@os1-platform/dispatch-mobile 3.2.0 → 3.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@os1-platform/dispatch-mobile",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "Dispatch SDK React Native Package",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -49,8 +49,8 @@
     "ios"
   ],
   "license": "MIT",
-  "author": "Amit Sanvedi <amit.sanvedi@delhivery.com> (https://github.com/FoxtrotPlatform/platform-coreos-dispatch-sdk)",
-  "homepage": "https://github.com/FoxtrotPlatform/platform-coreos-dispatch-sdk/#readme",
+  "author": "Anuj Sharma <anuj.sharma11@delhivery.com> (https://github.com/delhivery/platform-coreos-dispatch-sdk)",
+  "homepage": "https://github.com/delhivery/platform-coreos-dispatch-sdk?tab=readme-ov-file#readme",
   "devDependencies": {
     "@apollo/client": "^3.5.6",
     "@babel/core": "^7.25.2",
@@ -59,25 +59,25 @@
     "@babel/runtime": "^7.25.0",
     "@commitlint/config-conventional": "^11.0.0",
     "@expo-google-fonts/ibm-plex-sans": "0.4.1",
-    "@react-native-async-storage/async-storage": "1.23.1",
-    "@react-native-community/cli": "15.0.1",
-    "@react-native-community/cli-platform-android": "15.0.1",
-    "@react-native-community/cli-platform-ios": "15.0.1",
-    "@react-native-community/datetimepicker": "8.2.0",
+    "@react-native-async-storage/async-storage": "2.1.2",
+    "@react-native-community/cli": "18.0.0",
+    "@react-native-community/cli-platform-android": "18.0.0",
+    "@react-native-community/cli-platform-ios": "18.0.0",
+    "@react-native-community/datetimepicker": "8.4.1",
     "@react-native-community/netinfo": "11.4.1",
-    "@react-native-cookies/cookies": "^6.0.8",
-    "@react-native-firebase/analytics": "20.1.0",
-    "@react-native-firebase/app": "20.1.0",
-    "@react-native-firebase/crashlytics": "20.1.0",
-    "@react-native-firebase/messaging": "20.1.0",
-    "@react-native-firebase/remote-config": "20.1.0",
-    "@react-native/eslint-config": "0.77.3",
-    "@react-native/metro-config": "0.77.3",
-    "@react-native/typescript-config": "0.77.3",
-    "@react-navigation/native": "^6.0.6",
-    "@react-navigation/native-stack": "^6.2.5",
+    "@react-native-community/slider": "5.2.0",
+    "@react-native-cookies/cookies": "^6.2.1",
+    "@react-native-firebase/analytics": "22.4.0",
+    "@react-native-firebase/app": "22.4.0",
+    "@react-native-firebase/crashlytics": "22.4.0",
+    "@react-native-firebase/messaging": "22.4.0",
+    "@react-native-firebase/remote-config": "22.4.0",
+    "@react-native/eslint-config": "0.79.6",
+    "@react-native/metro-config": "0.79.6",
+    "@react-native/typescript-config": "0.79.6",
+    "@react-navigation/native": "7.1.6",
+    "@react-navigation/native-stack": "7.3.5",
     "@release-it/conventional-changelog": "^2.0.0",
-    "@sentry/react-native": "~6.10.0",
     "@tsconfig/react-native": "^3.0.0",
     "@types/enzyme": "^3.10.10",
     "@types/i18n-js": "^3.8.8",
@@ -85,87 +85,92 @@
     "@types/json-logic-js": "^1.2.1",
     "@types/jsonpath-plus": "^5.0.2",
     "@types/lodash": "^4.14.182",
-    "@types/react": "~18.3.12",
-    "@types/react-test-renderer": "^18.0.0",
+    "@types/react": "^19.0.0",
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "@typescript-eslint/parser": "^5.29.0",
-    "axios": "1.5.1",
+    "axios": "1.14.0",
     "babel-plugin-module-resolver": "^4.0.0",
     "commitlint": "^11.0.0",
     "eslint": "^8.19.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "expo": "~52.0.46",
-    "expo-blur": "~14.0.3",
-    "expo-camera": "~16.0.18",
-    "expo-file-system": "~18.0.12",
-    "expo-font": "~13.0.4",
-    "expo-image-picker": "~16.0.6",
-    "expo-location": "~18.0.10",
-    "expo-sqlite": "~15.1.4",
+    "expo": "~53.0.20",
+    "expo-blur": "~14.1.5",
+    "expo-camera": "~16.1.11",
+    "expo-file-system": "~18.1.11",
+    "expo-font": "~13.3.2",
+    "expo-image": "~2.4.1",
+    "expo-image-picker": "~16.1.4",
+    "expo-location": "~18.1.6",
+    "expo-sqlite": "~15.2.14",
     "graphql": "^16.2.0",
     "husky": "^4.2.5",
     "jest": "^29.6.3",
-    "jest-expo": "~52.0.6",
+    "jest-expo": "~53.0.10",
     "msw": "^0.34.0",
     "patch-package": "^8.0.0",
     "pod-install": "^0.1.0",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "2.8.8",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
-    "react-native": "0.77.3",
+    "react": "19.0.0",
+    "react-dom": "19.0.0",
+    "react-native": "0.79.6",
     "react-native-builder-bob": "^0.18.0",
-    "react-native-compressor": "^1.8.24",
+    "react-native-compressor": "^1.16.0",
     "react-native-dropdown-picker": "^5.4.0",
-    "react-native-fast-image": "^8.6.3",
     "react-native-get-random-values": "~1.11.0",
-    "react-native-image-picker": "7.0.2",
-    "react-native-paper": "5.14.1",
-    "react-native-safe-area-context": "5.1.0",
-    "react-native-screens": "4.10.0",
-    "react-test-renderer": "18.3.1",
+    "react-native-image-picker": "8.2.1",
+    "react-native-paper": "5.15.0",
+    "react-native-safe-area-context": "5.4.0",
+    "react-native-screens": "~4.11.1",
     "release-it": "^14.2.2",
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
     "@apollo/client": "^3.5.6",
     "@expo-google-fonts/ibm-plex-sans": "^0.4.1",
-    "@react-native-async-storage/async-storage": "2.1.0",
-    "@react-native-community/datetimepicker": "8.2.0",
+    "@react-native-async-storage/async-storage": "2.2.0",
+    "@react-native-community/datetimepicker": "8.4.1",
     "@react-native-community/netinfo": "11.4.1",
-    "@react-native-firebase/analytics": "20.1.0",
-    "@react-native-firebase/app": "20.1.0",
-    "@react-native-firebase/crashlytics": "20.1.0",
-    "@react-native-firebase/messaging": "20.1.0",
-    "@react-native-firebase/remote-config": "20.1.0",
-    "@react-navigation/native": "^6.0.6",
-    "@react-navigation/native-stack": "^6.2.5",
-    "@sentry/react-native": "~6.10.0",
-    "axios": "1.5.1",
-    "expo": "~52.0.46",
-    "expo-blur": "~14.0.3",
-    "expo-camera": "~16.0.18",
-    "expo-file-system": "~18.0.12",
-    "expo-font": "~13.0.4",
-    "expo-image-picker": "~16.0.6",
-    "expo-location": "~18.0.10",
-    "expo-sqlite": "~15.1.4",
+    "@react-native-community/slider": "5.2.0",
+    "@react-native-firebase/analytics": "22.4.0",
+    "@react-native-firebase/app": "22.4.0",
+    "@react-native-firebase/crashlytics": "22.4.0",
+    "@react-native-firebase/messaging": "22.4.0",
+    "@react-native-firebase/remote-config": "22.4.0",
+    "@react-navigation/native": "7.1.6",
+    "@react-navigation/native-stack": "7.3.5",
+    "axios": "1.14.0",
+    "expo": "~53.0.20",
+    "expo-blur": "~14.1.5",
+    "expo-camera": "~16.1.11",
+    "expo-file-system": "~18.1.11",
+    "expo-font": "~13.3.2",
+    "expo-image": "~2.4.1",
+    "expo-image-picker": "~16.1.4",
+    "expo-location": "~18.1.6",
+    "expo-sqlite": "~15.2.14",
     "graphql": "^16.2.0",
-    "react": "18.3.1",
-    "react-native": "0.77.3",
-    "react-native-compressor": "^1.8.24",
+    "react": "19.0.0",
+    "react-native": "0.79.6",
+    "react-native-compressor": "^1.16.0",
     "react-native-dropdown-picker": "^5.4.0",
     "react-native-get-random-values": "~1.11.0",
-    "react-native-paper": "5.14.1",
-    "react-native-safe-area-context": "5.1.0",
-    "react-native-screens": "4.10.0"
+    "react-native-paper": "5.15.0",
+    "react-native-safe-area-context": "5.4.0",
+    "react-native-screens": "~4.11.1"
   },
   "dependencies": {
-    "@coralogix/react-native-sdk": "^1.0.15",
-    "@os1-platform/platform-coreos-execution-engine-sdk": "1.1.5",
+    "@coralogix/react-native-sdk": "^1.0.26",
+    "@os1-platform/platform-coreos-execution-engine-sdk": "1.1.8",
+    "@react-native-vector-icons/ant-design": "^12.3.0",
+    "@react-native-vector-icons/entypo": "^12.3.0",
+    "@react-native-vector-icons/evil-icons": "^12.3.0",
+    "@react-native-vector-icons/feather": "^12.3.0",
+    "@react-native-vector-icons/material-design-icons": "^12.3.0",
+    "@react-native-vector-icons/material-icons": "^12.3.0",
     "@rjsf/core": "^2.2.0",
-    "apollo-link-timeout": "^4.0.0",
+    "apollo-link-timeout": "^5.0.4",
     "decompress": "^4.2.1",
     "i18n-js": "^4.3.2",
     "json-logic-js": "^2.0.1",
@@ -173,16 +178,15 @@
     "jwt-decode": "^3.1.2",
     "latlng-to-dms": "^1.0.2",
     "lodash": "^4.17.21",
+    "promise": "^8.3.0",
     "react-native-fs": "^2.20.0",
-    "react-native-image-marker": "1.2.6",
+    "react-native-image-marker": "1.2.11",
     "react-native-otp-textinput": "1.1.7",
-    "react-native-svg": "15.11.1",
+    "react-native-svg": "15.11.2",
     "recyclerlistview": "^4.2.0",
     "rjsf-native": "^1.0.14",
     "toggle-switch-react-native": "^3.3.0",
-    "uuid-by-string": "^4.0.0",
-    "@react-native-vector-icons/material-design-icons": "^12.3.0",
-    "@react-native-vector-icons/material-icons": "^12.3.0"
+    "uuid-by-string": "^4.0.0"
   },
   "husky": {},
   "commitlint": {

package/src/analytics/events/AnalyticsModels.ts

@@ -0,0 +1,32 @@
+
+export type SeverityLevel = 'fatal' | 'error' | 'warning' | 'log' | 'info' | 'debug' | string;
+
+export interface AnalyticsEventInput {
+    severityLevel: SeverityLevel,
+    eventName: string,
+    cta?: string,
+    screenName?: string,
+    extraParams?: any
+}
+
+export interface AnalyticsEvent {
+    level?: SeverityLevel;
+    message?: string;
+    tags?: { [key: string]: any };
+    extra?: any;
+    user?: {
+        id?: string;
+        email?: string;
+        username?: string;
+    };
+    platform?: string;
+    environment?: string;
+}
+
+export interface DispatchAndUserData {
+    dispatchId?: string|null,
+    tenantId?: string|null,
+    userId?: string|null,
+    userName?: string|null,
+    userEmail?: string|null,
+}

package/src/analytics/{sentry/SentrySdkConstants.ts → events/AnalyticsSdkConstants.ts}

@@ -43,7 +43,7 @@ export enum ScreenNameSdkConstants {
     API_ERROR =  "API_ERROR ",
 };
 
-export enum SentryEventNameSdkConstants{
+export enum EventNameSdkConstants{
     API_CALL = "API_CALL",
     API_RESPONSE = "API_RESPONSE",
     API_ERROR = "API_ERROR",

package/src/analytics/{sentry/SentryAnalyticsSingleton.ts → events/AnalyticsSingleton.ts}

@@ -1,26 +1,26 @@
-import { DispatchAndUserData } from './SentryModels';
+import { DispatchAndUserData } from './AnalyticsModels';
 
-export default class SentryAnalyticsSingleton {
+export default class AnalyticsSingleton {
 
     private dispatchAndUserData: DispatchAndUserData | null = null
     //
     public static ref: string | null = "";
     //
-    private static instance: SentryAnalyticsSingleton;
+    private static instance: AnalyticsSingleton;
     //
     private constructor() {
     }
 
     public dereferenceVars() {
-        SentryAnalyticsSingleton.ref = null
+        AnalyticsSingleton.ref = null
         this.dispatchAndUserData = null
     }
     //
-    public static getInstance(): SentryAnalyticsSingleton {
-        if (!SentryAnalyticsSingleton.instance) {
-            SentryAnalyticsSingleton.instance = new SentryAnalyticsSingleton();
+    public static getInstance(): AnalyticsSingleton {
+        if (!AnalyticsSingleton.instance) {
+            AnalyticsSingleton.instance = new AnalyticsSingleton();
         }
-        return SentryAnalyticsSingleton.instance;
+        return AnalyticsSingleton.instance;
     }
     //    
     public getDispatchAndUserData(): DispatchAndUserData | null {

package/src/analytics/{sentry/SentryAnalyticsUtils.ts → events/AnalyticsUtils.ts}

@@ -1,24 +1,22 @@
-import * as Sentry from '@sentry/react-native';
 import { Platform } from 'react-native';
-import { Event, User } from '@sentry/types';
-import SentryAnalyticsSingleton from './SentryAnalyticsSingleton';
-import { SentryEvent } from './SentryModels';
+import AnalyticsSingleton from './AnalyticsSingleton';
+import { AnalyticsEventInput, AnalyticsEvent } from './AnalyticsModels';
 import { fireFirebaseEvent } from '../firebase/FirebaseLogging';
-import { SentryEventNameSdkConstants } from './SentrySdkConstants';
+import { EventNameSdkConstants } from './AnalyticsSdkConstants';
 
-export async function fireEventWithScreenName({ severityLevel, eventName, cta = "N/A", screenName = "N/A", extraParams = null }: SentryEvent) {
+export async function fireEventWithScreenName({ severityLevel, eventName, cta = "N/A", screenName = "N/A", extraParams = null }: AnalyticsEventInput) {
 
   //ignoring the button clicked event for now
-  if (eventName === SentryEventNameSdkConstants.BUTTON_CLICKED) return;
+  if (eventName === EventNameSdkConstants.BUTTON_CLICKED) return;
   // 
-  const singletonInstance = SentryAnalyticsSingleton.getInstance();
+  const singletonInstance = AnalyticsSingleton.getInstance();
   const tenantId = singletonInstance.getDispatchAndUserData()?.tenantId ?? "N/A"
   const dispatchId = singletonInstance.getDispatchAndUserData()?.dispatchId ?? "N/A"
   const userId = singletonInstance.getDispatchAndUserData()?.userId ?? "N/A"
   const userName = singletonInstance.getDispatchAndUserData()?.userName ?? "N/A"
   const userEmail = singletonInstance.getDispatchAndUserData()?.userEmail ?? "N/A"
   //
-  var event: Event = {
+  var event: AnalyticsEvent = {
     level: severityLevel,
     message: eventName,
     tags: {
@@ -26,33 +24,31 @@ export async function fireEventWithScreenName({ severityLevel, eventName, cta =
       dispatchId: dispatchId ?? "N/A",
       screenName: screenName ?? "N/A",
       cta: cta ?? "N/A",
-      ref: SentryAnalyticsSingleton.ref,
+      ref: AnalyticsSingleton.ref,
     },
     extra: extraParams ?? '',
   };
 
   //fetch user details only if tenantId is present
   if (tenantId != null && tenantId?.trim() != "") {
-    let user: User = {};
-    user.id = userId ?? "N/A";
-    user.email = userEmail ?? "N/A";
-    user.username = userName ?? "N/A";
-    event.user = user;
+    event.user = {
+      id: userId ?? "N/A",
+      email: userEmail ?? "N/A",
+      username: userName ?? "N/A",
+    };
   }
   //
-  event.platform = Platform.OS
-  event.environment = await getEnvironment();
+  event.platform = Platform.OS;
+  event.environment = getEnvironment();
   //
-  Sentry.captureEvent(event);
   //fire firebase event 
-
   await fireFirebaseEvent(event.message ?? "No_Event_Name", event);
 }
 
-const getEnvironment = async () => {
+const getEnvironment = () => {
   if (__DEV__) {
     return "development";
   } else {
     return "production";
   }
-};
+};

package/src/analytics/firebase/FirebaseLogging.ts

@@ -1,15 +1,15 @@
 import analytics from '@react-native-firebase/analytics';
-import { Event } from '@sentry/types';
-import { SentryEventNameSdkConstants } from '../sentry/SentrySdkConstants';
+import { AnalyticsEvent } from '../events/AnalyticsModels';
+import { EventNameSdkConstants } from '../events/AnalyticsSdkConstants';
 
-export async function fireFirebaseEvent(eventName: string, data: Event) {
+export async function fireFirebaseEvent(eventName: string, data: AnalyticsEvent) {
   let strEventVal = eventName;
   try {
     if (
-      eventName === SentryEventNameSdkConstants.API_CALL ||
-      eventName === SentryEventNameSdkConstants.API_RESPONSE ||
-      eventName === SentryEventNameSdkConstants.API_ERROR ||
-      eventName === SentryEventNameSdkConstants.APP_LOG
+      eventName === EventNameSdkConstants.API_CALL ||
+      eventName === EventNameSdkConstants.API_RESPONSE ||
+      eventName === EventNameSdkConstants.API_ERROR ||
+      eventName === EventNameSdkConstants.APP_LOG
     ) {
       if (data?.extra) {
         strEventVal = JSON.stringify(data?.extra);

package/src/components/executiontasks/cancellation/CancelET.tsx

@@ -21,9 +21,9 @@ import ReasonCodeContainer from '../../../manager/dispatchCodes/ReasonCodeContai
 import type { ReasonsRow } from '../../../manager/syncmanager/DBConfig';
 import EventCodeContainer from '../../../manager/dispatchCodes/EventCodeContainer';
 import IconButton from '../../widgets/IconButton';
-import { AntDesign } from '@expo/vector-icons';
-import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../../analytics/sentry/SentrySdkConstants';
-import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
+import AntDesign from '@react-native-vector-icons/ant-design';
+import { ScreenNameSdkConstants, EventNameSdkConstants, SeverityLevelValue } from '../../../analytics/events/AnalyticsSdkConstants';
+import { fireEventWithScreenName } from '../../../analytics/events/AnalyticsUtils';
 
 const ICON_SIZE = 12;
 
@@ -59,7 +59,7 @@ const CancelET = (props: CancellationInput) => {
             onPress={() => {
               setCancelReason(item); 
               const cta = cancelReason === item ? 'Cancel reason checked' : 'Cancel reason unchecked';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
             }}
           />
           <Text
@@ -67,7 +67,7 @@ const CancelET = (props: CancellationInput) => {
             onPress={() => {
               setCancelReason(item);
               const cta = item;
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
  
             }}
           >
@@ -89,7 +89,7 @@ const CancelET = (props: CancellationInput) => {
             onPress={() => {
               setCancelEvent(item);
               const cta = cancelReason === item ? 'Cancel reason checked' : 'Cancel reason unchecked';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
     
             }}
           />
@@ -98,7 +98,7 @@ const CancelET = (props: CancellationInput) => {
             onPress={() => {
               setCancelEvent(item);
               const cta = item;
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
  
             }}
           >
@@ -151,7 +151,7 @@ const CancelET = (props: CancellationInput) => {
               onPress={() => {
                 setShowEventCode(!showEventCode);
                 const cta = 'Select Event'.toUpperCase();
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
    
               }}
             >
@@ -184,7 +184,7 @@ const CancelET = (props: CancellationInput) => {
               onPress={() => {
                 setShowReasonCode(!showReasonCode);
                 const cta = 'Select Reason'.toUpperCase();
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
    
               }}
             >
@@ -237,7 +237,7 @@ const CancelET = (props: CancellationInput) => {
               }
             }
             const cta = 'Proceed';
-            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
 
           }
         }

package/src/components/executiontasks/captureInput/CaptureText.tsx

@@ -19,8 +19,8 @@ import { hasGoBackConnector } from '../../../components/utils';
 import GoBackModal from '../../../components/widgets/GoBackModal';
 import { useFocusEffect } from '@react-navigation/native';
 import { BackHandler } from 'react-native';
-import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../../analytics/sentry/SentrySdkConstants';
-import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
+import { ScreenNameSdkConstants, EventNameSdkConstants, SeverityLevelValue } from '../../../analytics/events/AnalyticsSdkConstants';
+import { fireEventWithScreenName } from '../../../analytics/events/AnalyticsUtils';
 
 const CaptureText = (props: CaptureTextInput) => {
   const [showBackModal, setShowBackModal] = useState(false);
@@ -40,7 +40,7 @@ const CaptureText = (props: CaptureTextInput) => {
                 setShowBackModal(true);
               else props.navigation.goBack();
               const cta = 'Back Arrow';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_TEXT_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_TEXT_SCREEN, cta: cta });    
  
             }}
             name="arrow-back"
@@ -136,7 +136,7 @@ const CaptureText = (props: CaptureTextInput) => {
                 )),
               });
               const cta = 'Cancel';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_TEXT_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_TEXT_SCREEN, cta: cta });    
  
             }
           }
@@ -170,7 +170,7 @@ const CaptureText = (props: CaptureTextInput) => {
                 attemptCount: 0,
               });
               const cta = 'Next';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_TEXT_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_TEXT_SCREEN, cta: cta });    
  
             }
           }

package/src/components/executiontasks/collectPayment/components/ProcessPayment.tsx

@@ -85,12 +85,12 @@ import Storage from '../../../../utils/storage';
 import { PaymentContext } from '../../../../utils/context/paymentContext';
 import { ENDPOINTS } from '../../../../constants/apiConstants';
 import { Timer } from '../../../../components/widgets/Timer';
-import { fireEventWithScreenName } from '../../../../analytics/sentry/SentryAnalyticsUtils';
+import { fireEventWithScreenName } from '../../../../analytics/events/AnalyticsUtils';
 import {
   ScreenNameSdkConstants,
-  SentryEventNameSdkConstants,
+  EventNameSdkConstants,
   SeverityLevelValue,
-} from '../../../../analytics/sentry/SentrySdkConstants';
+} from '../../../../analytics/events/AnalyticsSdkConstants';
 import Logger, { LOG_TYPE } from '../../../../utils/Logger';
 
 const styles = PaymentStyles;
@@ -105,7 +105,7 @@ const ProcessPayment = (props: CollectPaymentInput & ProcessPaymentInput) => {
   const [isRetryEnabled, setIsRetryEnabled] = useState(false);
   const [backDisable, setBackDisable] = useState(true);
 
-  const timerRef: any = useRef();
+  const timerRef: any = useRef(null);
   const paymentRefId =
     props.route.params[RouteParams.ROOT_META_DATA].paymentConfig?.paymentRefId;
   // For back button timer
@@ -393,7 +393,7 @@ const ProcessPayment = (props: CollectPaymentInput & ProcessPaymentInput) => {
                     onNext();
                     fireEventWithScreenName({
                       severityLevel: SeverityLevelValue.LOG,
-                      eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+                      eventName: EventNameSdkConstants.BUTTON_CLICKED,
                       screenName: ScreenNameSdkConstants.MODEL_WIDGET_SCREEN,
                       cta: 'Yes',
                     });
@@ -425,7 +425,7 @@ const ProcessPayment = (props: CollectPaymentInput & ProcessPaymentInput) => {
                     setGoBackModal(false);
                     fireEventWithScreenName({
                       severityLevel: SeverityLevelValue.LOG,
-                      eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+                      eventName: EventNameSdkConstants.BUTTON_CLICKED,
                       screenName: ScreenNameSdkConstants.MODEL_WIDGET_SCREEN,
                       cta: 'Cancel',
                     });
@@ -1139,8 +1139,8 @@ const PaymentLink = (
     message: '',
   });
   const [isTimerActive, setIsTimerActive] = useState(true);
-  const timerRef: any = useRef();
-  const statusTimerRef: any = useRef();
+  const timerRef: any = useRef(null);
+  const statusTimerRef: any = useRef(null);
 
   const paymentRefId =
     props.route.params[RouteParams.ROOT_META_DATA].paymentConfig?.paymentRefId;

package/src/components/executiontasks/deliver/DeliverET.tsx

@@ -12,8 +12,8 @@ import {
   EntityCode,
   ExecutionTaskID,
 } from '../../../models/execTasks/ETConfig';
-import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../../analytics/sentry/SentrySdkConstants';
-import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
+import { ScreenNameSdkConstants, EventNameSdkConstants, SeverityLevelValue } from '../../../analytics/events/AnalyticsSdkConstants';
+import { fireEventWithScreenName } from '../../../analytics/events/AnalyticsUtils';
 
 const ListItem = ({ lineItem }: { lineItem: LineItem }) => (
   <Card style={deliverETStyles.item}>
@@ -79,7 +79,7 @@ const DeliverET = (props: DeliverETInput) => {
                   )),
                 });
                 const cta = 'Cancel';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DELIVER_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DELIVER_ET_SCREEN, cta: cta });    
    
               }}
             >
@@ -108,7 +108,7 @@ const DeliverET = (props: DeliverETInput) => {
                   remark: remarks,
                 });
                 const cta = 'Deliver';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DELIVER_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DELIVER_ET_SCREEN, cta: cta });    
 
               }}
             >