@os1-platform/dispatch-mobile 3.2.0 → 3.2.2

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

@@ -41,10 +41,10 @@ import { TouchableOpacity } from 'react-native';
 import ModalWidget from '../../../components/widgets/ModalWidget';
 import {
   ScreenNameSdkConstants,
-  SentryEventNameSdkConstants,
+  EventNameSdkConstants,
   SeverityLevelValue,
-} from '../../../analytics/sentry/SentrySdkConstants';
-import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
+} from '../../../analytics/events/AnalyticsSdkConstants';
+import { fireEventWithScreenName } from '../../../analytics/events/AnalyticsUtils';
 
 const ListItem = ({ lineItem }: { lineItem: LineItem }) => (
   <View style={{ justifyContent: 'center' }}>
@@ -133,7 +133,7 @@ const DeliverET = (props: DeliverETInput) => {
               const cta = 'Back Arrow';
               fireEventWithScreenName({
                 severityLevel: SeverityLevelValue.LOG,
-                eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+                eventName: EventNameSdkConstants.BUTTON_CLICKED,
                 screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN,
                 cta: cta,
               });
@@ -213,7 +213,7 @@ const DeliverET = (props: DeliverETInput) => {
             const cta = 'Exit';
             fireEventWithScreenName({
               severityLevel: SeverityLevelValue.LOG,
-              eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+              eventName: EventNameSdkConstants.BUTTON_CLICKED,
               screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN,
               cta: cta,
             });
@@ -228,7 +228,7 @@ const DeliverET = (props: DeliverETInput) => {
             const cta = 'Cancel';
             fireEventWithScreenName({
               severityLevel: SeverityLevelValue.LOG,
-              eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+              eventName: EventNameSdkConstants.BUTTON_CLICKED,
               screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN,
               cta: cta,
             });
@@ -360,7 +360,7 @@ const DeliverET = (props: DeliverETInput) => {
                       const cta = 'Confirm';
                       fireEventWithScreenName({
                         severityLevel: SeverityLevelValue.LOG,
-                        eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+                        eventName: EventNameSdkConstants.BUTTON_CLICKED,
                         screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN,
                         cta: cta,
                       });
@@ -411,7 +411,7 @@ const DeliverET = (props: DeliverETInput) => {
                           fireEventWithScreenName({
                             severityLevel: SeverityLevelValue.LOG,
                             eventName:
-                              SentryEventNameSdkConstants.BUTTON_CLICKED,
+                              EventNameSdkConstants.BUTTON_CLICKED,
                             screenName:
                               ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN,
                             cta: cta,
@@ -480,7 +480,7 @@ const DeliverET = (props: DeliverETInput) => {
                       const cta = 'Confirm';
                       fireEventWithScreenName({
                         severityLevel: SeverityLevelValue.LOG,
-                        eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+                        eventName: EventNameSdkConstants.BUTTON_CLICKED,
                         screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN,
                         cta: cta,
                       });
@@ -516,7 +516,7 @@ const DeliverET = (props: DeliverETInput) => {
                             fireEventWithScreenName({
                               severityLevel: SeverityLevelValue.LOG,
                               eventName:
-                                SentryEventNameSdkConstants.BUTTON_CLICKED,
+                                EventNameSdkConstants.BUTTON_CLICKED,
                               screenName:
                                 ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN,
                               cta: cta,

package/src/components/executiontasks/display/DisplayModalET.tsx

@@ -21,8 +21,8 @@ import {
   DeliverPickupStyles,
   Fonts,
 } from '../../../styles/executionTasks/CommonStyles';
-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 DisplayModalET = (props: DisplayETInput) => {
   const [modalVisible, setModalVisible] = useState(props.showDialog);
@@ -96,7 +96,7 @@ const DisplayModalET = (props: DisplayETInput) => {
                   onPress={async () => {
                     await sendEtOutput(true);
                     const cta = props.positiveBtn;
-                    fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DISPLAY_MODAL_ET, cta: cta });    
+                    fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DISPLAY_MODAL_ET, cta: cta });    
 
                   }}
                   testID="primary"
@@ -112,7 +112,7 @@ const DisplayModalET = (props: DisplayETInput) => {
                     onPress={async () => {
                       await sendEtOutput(false);
                       const cta = props.negativeBtn;
-                      fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DISPLAY_MODAL_ET, cta: cta });    
+                      fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DISPLAY_MODAL_ET, cta: cta });    
   
                     }}
                     testID="secondary"

package/src/components/executiontasks/doodle/SignatureET.tsx

@@ -34,14 +34,14 @@ import GoBackModal from '../../../components/widgets/GoBackModal';
 import { useFocusEffect } from '@react-navigation/native';
 import { getStr } from '../../../locale/util';
 import Str from '../../../locale/Str';
-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';
 import LocationManager from '../../../manager/location/LocationManager';
 import callbackHandler from '../../../manager/sdk/callbacksHandler';
 
 const SignatureET = (props: SignatureInput) => {
   
-  const signatureViewRef = useRef<any>();
+  const signatureViewRef = useRef<any>(null);
   const [dragged, setDragged] = useState(0);
   const dragRef = useRef<number>(0);
   const [showBackModal, setShowBackModal] = useState(false);
@@ -79,7 +79,7 @@ const SignatureET = (props: SignatureInput) => {
                 props.navigation.goBack();
               }
               const cta = 'Back Arrow';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
 
   
             }}
@@ -214,7 +214,7 @@ lineHeight: 24 }}>{props.title}</Text>
                 }
                 signatureViewRef.current?.resetImage();
                 const cta = 'Clear';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
   
     
               }}
@@ -278,7 +278,7 @@ lineHeight: 24 }}>{props.title}</Text>
             onPress={async () => {
               await saveAndSubmit(true, '');
               const cta = getStr(Str.skip);
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
 
             }}>{getStr(Str.skip)}
           </Button>
@@ -296,7 +296,7 @@ lineHeight: 24 }}>{props.title}</Text>
             mode={'contained'}
             onPress={async () => {signatureViewRef.current?.saveImage()
               const cta = 'Proceed';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
 
             }
               

package/src/components/executiontasks/dropCash/DropCashET.tsx

@@ -12,8 +12,8 @@ import {
 import { isEmptyOrBlank } from '../../../utils/utils';
 import { CommonStyles } from '../../../styles/executionTasks/CommonStyles';
 import { getPaymentValue } from '../payments/PaymentUtils';
-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 styles = PaymentStyles;
 
@@ -93,7 +93,7 @@ const DropCashET = (props: DropCashInput) => {
                 )),
               });
               const cta = 'Cancel';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DROP_CASH_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DROP_CASH_ET_SCREEN, cta: cta });    
 
 
             }}
@@ -140,7 +140,7 @@ const DropCashET = (props: DropCashInput) => {
                 });
               } else setInputError('Please enter valid amount.');
               const cta = 'Drop Cash';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DROP_CASH_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DROP_CASH_ET_SCREEN, cta: cta });    
 
             }}
           >

package/src/components/executiontasks/dropCash/SLDropCash.tsx

@@ -25,10 +25,10 @@ import { useFocusEffect } from '@react-navigation/native';
 import { BackHandler } from 'react-native';
 import {
   ScreenNameSdkConstants,
-  SentryEventNameSdkConstants,
+  EventNameSdkConstants,
   SeverityLevelValue,
-} from '../../../analytics/sentry/SentrySdkConstants';
-import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
+} from '../../../analytics/events/AnalyticsSdkConstants';
+import { fireEventWithScreenName } from '../../../analytics/events/AnalyticsUtils';
 
 const SLDropCash = (props: DropCashInput) => {
   const [amountCollected, setAmountCollected] = useState(
@@ -90,7 +90,7 @@ const SLDropCash = (props: DropCashInput) => {
               const cta = 'Back Arrow';
               fireEventWithScreenName({
                 severityLevel: SeverityLevelValue.LOG,
-                eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+                eventName: EventNameSdkConstants.BUTTON_CLICKED,
                 screenName: ScreenNameSdkConstants.SL_DROP_CASH_ET_SCREEN,
                 cta: cta,
               });
@@ -268,7 +268,7 @@ const SLDropCash = (props: DropCashInput) => {
                   const cta = 'Confirm';
                   fireEventWithScreenName({
                     severityLevel: SeverityLevelValue.LOG,
-                    eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+                    eventName: EventNameSdkConstants.BUTTON_CLICKED,
                     screenName: ScreenNameSdkConstants.SL_DROP_CASH_ET_SCREEN,
                     cta: cta,
                   });
@@ -300,7 +300,7 @@ const SLDropCash = (props: DropCashInput) => {
                     const cta = 'Cancel';
                     fireEventWithScreenName({
                       severityLevel: SeverityLevelValue.LOG,
-                      eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+                      eventName: EventNameSdkConstants.BUTTON_CLICKED,
                       screenName: ScreenNameSdkConstants.SL_DROP_CASH_ET_SCREEN,
                       cta: cta,
                     });

package/src/components/executiontasks/forms/widgets/DateTimeWidget.tsx

@@ -10,8 +10,8 @@ import DateTimePicker, { DateTimePickerEvent } from '@react-native-community/dat
 import type { WidgetProps } from '@rjsf/core';
 import { useFormContext } from 'rjsf-native';
 import SdkColors, { ColorTheme } from '../../../../styles/SdkColors';
-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 MODES = {
@@ -65,7 +65,7 @@ const DateTimeWidget = ({
     <View style={styles.container}>
       <TouchableOpacity onPress={() => {setShow(true)
                 const cta = label;
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DATE_TIME_WIDGET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DATE_TIME_WIDGET_SCREEN, cta: cta });    
   
       }}>
         <TextInput

package/src/components/executiontasks/forms/widgets/QRBarcodeScannerWidget.tsx

@@ -9,10 +9,10 @@ import {
 } from 'react-native';
 import type { WidgetProps } from '@rjsf/core';
 import { useFormContext } from 'rjsf-native';
-import { AntDesign } from '@expo/vector-icons';
+import AntDesign from '@react-native-vector-icons/ant-design';
 import CScanner from '../../scan/sub_components/CScanner';
-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 QRBarcodeScannerWidget = ({
   id,
@@ -43,7 +43,7 @@ const QRBarcodeScannerWidget = ({
     <View style={styles.container}>
       <TouchableOpacity onPress={() => {setShow(true)
                  const cta = label;
-                 fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.QRBARCODE_WIDGET_SCREEN, cta: cta });    
+                 fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.QRBARCODE_WIDGET_SCREEN, cta: cta });    
    
       
       }}>
@@ -103,7 +103,7 @@ function ScannerDialog(props: ScannerDialogProps) {
               }}
             />
             <AntDesign
-              name="closecircleo"
+              name="close-circle"
               size={40}
               color="blue"
               onPress={() => {

package/src/components/executiontasks/imageCapture/ImageCapture.tsx

@@ -17,8 +17,8 @@ import GoBackModal from '../../../components/widgets/GoBackModal';
 import { useFocusEffect } from '@react-navigation/native';
 import Circle from "./circle-xmark.svg"
 import CameraIcon from "./camera.svg"
-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';
 import LocationManager from '../../../manager/location/LocationManager';
 import callbackHandler from '../../../manager/sdk/callbacksHandler';
 
@@ -71,7 +71,7 @@ const ImageCapture = (props: any) => {
                 setShowBackModal(true);
               else props.navigation.goBack();
               const cta = "Back Arrow";
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
 
             }}
             name="arrow-back"
@@ -138,7 +138,7 @@ const ImageCapture = (props: any) => {
               onPress={() => {
                 onPress()
                 const cta = "Camera Icon";
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
 
               }}
             >
@@ -157,7 +157,7 @@ const ImageCapture = (props: any) => {
             onPress={() => {
               captureImage(index)
               const cta = "Click Photo";
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
 
             }}
             uppercase={false}
@@ -190,7 +190,7 @@ const ImageCapture = (props: any) => {
             onPress={() => {
               onPress()
               const cta = "Circle Icon";
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
 
             }}
             style={{
@@ -343,7 +343,7 @@ const ImageCapture = (props: any) => {
         onPress={async () => {
           await deleteImage(index);
           const cta = "Delete Icon";
-          fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
+          fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
 
         }}
       />
@@ -396,7 +396,7 @@ const ImageCapture = (props: any) => {
                 )),
               });
               const cta = "Cancel";
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
 
             }}
           >
@@ -422,7 +422,7 @@ const ImageCapture = (props: any) => {
             onPress={async () => {
               await handleSubmit();
               const cta = "Proceed";
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN, cta: cta });
 
             }}
           >

package/src/components/executiontasks/payments/completePayment/CompletePaymentET.tsx

@@ -32,8 +32,8 @@ import GoBackModal from '../../../../components/widgets/GoBackModal';
 import { hasGoBackConnector } from '../../../../components/utils';
 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 CompletePaymentET = (props: CompletePaymentInput) => {
   const [disableProceed, setDisableProceed] = useState(false);
@@ -73,7 +73,7 @@ const CompletePaymentET = (props: CompletePaymentInput) => {
                 setShowBackModal(true);
               else props.navigation.goBack();
               const cta = "Back Arrow";
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.COMPLETE_PAYMENT_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.COMPLETE_PAYMENT_ET_SCREEN, cta: cta });    
        
             }}
             name="arrow-back"
@@ -172,7 +172,7 @@ const CompletePaymentET = (props: CompletePaymentInput) => {
                   setDisableProceed(true);
                   props.onSubmitET(etOutput);
                   const cta = "Continue";
-                  fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.COMPLETE_PAYMENT_ET_SCREEN, cta: cta });    
+                  fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.COMPLETE_PAYMENT_ET_SCREEN, cta: cta });    
            
                 }}
               >
@@ -203,7 +203,7 @@ const CompletePaymentET = (props: CompletePaymentInput) => {
                   setDisableProceed(true);
                   props.onSubmitET(etOutput);
                   const cta = "Cancel";
-                  fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.COMPLETE_PAYMENT_ET_SCREEN, cta: cta });    
+                  fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.COMPLETE_PAYMENT_ET_SCREEN, cta: cta });    
            
                 }}
               >

package/src/components/executiontasks/payments/init/InitPaymentET.tsx

@@ -23,8 +23,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 styles = PaymentStyles;
 
@@ -77,7 +77,7 @@ const InitPaymentET = (props: InitPaymentInput) => {
                 setShowBackModal(true);
               else props.navigation.goBack();
               const cta = "Back Arrow";
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.INIT_PAYMENT_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.INIT_PAYMENT_ET_SCREEN, cta: cta });    
      
             }}
             name="arrow-back"
@@ -131,7 +131,7 @@ const InitPaymentET = (props: InitPaymentInput) => {
           onPress={() => {
             setPaymentMode(item);
             const cta = paymentMode === item ? 'paymentMode checked' : 'paymentMode unchecked';
-            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.INIT_PAYMENT_ET_SCREEN, cta: cta });    
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.INIT_PAYMENT_ET_SCREEN, cta: cta });    
 
           }}
         />
@@ -140,7 +140,7 @@ const InitPaymentET = (props: InitPaymentInput) => {
           onPress={() => {
             setPaymentMode(item);
             const cta = item;
-            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.INIT_PAYMENT_ET_SCREEN, cta: cta });    
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.INIT_PAYMENT_ET_SCREEN, cta: cta });    
 
           }}
         >
@@ -208,7 +208,7 @@ const InitPaymentET = (props: InitPaymentInput) => {
                   )),
                 });
                 const cta = 'Cancel';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.INIT_PAYMENT_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.INIT_PAYMENT_ET_SCREEN, cta: cta });    
     
               }}
             >
@@ -247,7 +247,7 @@ const InitPaymentET = (props: InitPaymentInput) => {
                   });
                 } else showToast('No payment mode selected');
                 const cta = 'Collect';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.INIT_PAYMENT_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.INIT_PAYMENT_ET_SCREEN, cta: cta });    
     
               }}
             >

package/src/components/executiontasks/payments/processPayment/ProcessPaymentET.tsx

@@ -23,8 +23,8 @@ import { GO_BACK_EVENT_CODE } from '../../../../constants/constants';
 import GoBackModal from '../../../../components/widgets/GoBackModal';
 import { hasGoBackConnector } from '../../../../components/utils';
 import { useFocusEffect } from '@react-navigation/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 styles = PaymentStyles;
 
@@ -68,7 +68,7 @@ const ProcessPaymentET = (props: ProcessPaymentInput) => {
                 setShowBackModal(true);
               else props.navigation.goBack();
               const cta = 'Back Arrow';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.PROCESS_PAYMENT_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.PROCESS_PAYMENT_ET_SCREEN, cta: cta });    
   
             }}
             name="arrow-back"
@@ -208,7 +208,7 @@ const ProcessPaymentET = (props: ProcessPaymentInput) => {
                   )),
                 });
                 const cta = 'Cancel';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.PROCESS_PAYMENT_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.PROCESS_PAYMENT_ET_SCREEN, cta: cta });    
     
               }}
             >
@@ -268,7 +268,7 @@ const ProcessPaymentET = (props: ProcessPaymentInput) => {
                   setInputError('Please enter valid amount.');
                 }
                 const cta = 'Next';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.PROCESS_PAYMENT_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.PROCESS_PAYMENT_ET_SCREEN, cta: cta });    
     
               }}
             >

package/src/components/executiontasks/pickup/PickupET.tsx

@@ -7,8 +7,8 @@ import { getBaseETResponse } from '../../../utils/ExecTaskUtils';
 import { getEventCodeByET } from '../../../manager/dispatchCodes/EventCodeContainer';
 import { EntityCode, ExecutionTaskID } from '../../../models/execTasks/ETConfig';
 import type { LineItem } from '../deliver/DeliverETInput';
-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}>
@@ -75,7 +75,7 @@ const PickupET = (props: PickupETInput) => {
                   )),
                 });
                 const cta = 'Cancel';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.PICKUP_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.PICKUP_ET_SCREEN, cta: cta });    
     
               }}
             >
@@ -104,7 +104,7 @@ const PickupET = (props: PickupETInput) => {
                   )),
                 });
                 const cta = 'Pickup';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.PICKUP_ET_SCREEN, cta: cta });    
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.PICKUP_ET_SCREEN, cta: cta });    
     
               }}
             >

package/src/components/executiontasks/pickup/SLPickupET.tsx

@@ -28,8 +28,8 @@ import { getStrVal } from '../../../locale/util';
 import Str from '../../../locale/Str';
 import CircleMark from '../../../icons/CircleMark';
 import ModalWidget from '../../../components/widgets/ModalWidget';
-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 }) => (
@@ -96,7 +96,7 @@ const SLPickupET = (props: PickupETInput) => {
                 setShowBackModal(true);
               else props.navigation.goBack();
               const cta = 'Back Arrow';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });    
   
             }}
             name="arrow-back"
@@ -172,7 +172,7 @@ const SLPickupET = (props: PickupETInput) => {
             }
             setShowBackModal(false);
             const cta = 'Exit';
-            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });
           },
           styles: styles.primaryButtonStyles,
         }}
@@ -182,7 +182,7 @@ const SLPickupET = (props: PickupETInput) => {
             setGoBack(false);
             setShowPickupModal(true);
             const cta = 'Cancel';
-            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });    
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });    
 
           },
           styles: styles.secondaryButtonStyles,
@@ -220,7 +220,7 @@ const SLPickupET = (props: PickupETInput) => {
                   setShowPickupModal(false);
                   setGoBack(true);
                   const cta = 'Circle Mark Icon';
-                  fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });    
+                  fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });    
     
                 }}
                 style={styles.crossIcon}
@@ -274,7 +274,7 @@ const SLPickupET = (props: PickupETInput) => {
                       )),
                     });
                     const cta = 'Yes';
-                    fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });    
+                    fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });    
       
                   }}
                 >
@@ -304,7 +304,7 @@ const SLPickupET = (props: PickupETInput) => {
                       )),
                     });
                     const cta = 'No';
-                    fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });    
+                    fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: EventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_PICKUP_ET_SCREEN, cta: cta });    
       
                   }}
                 >