@os1-platform/dispatch-mobile 2.1.4 → 2.1.6

package/src/analytics/sentry/SentryModels.ts

@@ -0,0 +1,18 @@
+
+import {SeverityLevel} from '@sentry/types';
+
+export interface SentryEvent {
+    severityLevel: SeverityLevel,
+    eventName: string,
+    cta?: string,
+    screenName?: string,
+    extraParams?: any
+}
+
+export interface DispatchAndUserData {
+    dispatchId?: string|null,
+    tenantId?: string|null,
+    userId?: string|null,
+    userName?: string|null,
+    userEmail?: string|null,
+}

package/src/analytics/sentry/SentrySdkConstants.ts

@@ -0,0 +1,74 @@
+export enum ScreenNameSdkConstants {
+    PICKUP_ET_SCREEN = "PICKUP_ET_SCREEN",
+    SL_PICKUP_ET_SCREEN = "SL_PICKUP_ET_SCREEN",
+    DELIVER_ET_SCREEN = "DELIVER_ET_SCREEN",
+    SL_DELIVER_ET_SCREEN = "SL_DELIVER_ET_SCREEN",
+    SIGNATURE_ET_SCREEN = "SIGNATURE_ET_SCREEN",
+    CAPTURE_IMAGE_ET_SCREEN = "CAPTURE_IMAGE_ET_SCREEN",
+    RETURN_CASH_ET_SCREEN = "RETURN_CASH_ET_SCREEN",
+    COLLECT_CASH_ET_SCREEN = "COLLECT_CASH_ET_SCREEN",
+    RESCHEDULE_ET_SCREEN = "RESCHEDULE_ET_SCREEN",
+    RETURN_ORDER_ET_SCREEN = "RETURN_ORDER_ET_SCREEN",
+    FORM_ET_SCREEN = "FORM_ET_SCREEN",
+
+    //RT ETs
+    DROP_CASH_ET_SCREEN = "DROP_CASH_ET_SCREEN",
+    SL_DROP_CASH_ET_SCREEN = "SL_DROP_CASH_ET_SCREEN",
+    COMPLETE_PAYMENT_ET_SCREEN = "COMPLETE_PAYMENT_ET_SCREEN",
+    INIT_PAYMENT_ET_SCREEN = "INIT_PAYMENT_ET_SCREEN",
+    PROCESS_PAYMENT_ET_SCREEN = "PROCESS_PAYMENT_ET_SCREEN",
+
+    SCAN_ET_SCREEN = "SCAN_ET_SCREEN",
+    SUMMARY_PAGE_SCREEN = "SUMMARY_PAGE_SCREEN",
+
+    VALIDATE_OTP_ET_SCREEN = "VALIDATE_OTP_ET_SCREEN",
+    VERIFY_OTP_ET_SCREEN = "VERIFY_OTP_ET_SCREEN",
+    VERIFY_LOCATION_ET_SCREEN = "VERIFY_LOCATION_ET_SCREEN",
+    TAB_COMPONENT_SCREEN = "TAB_COMPONENT_SCREEN",
+    SPLIT_TEXT_INPUT_SCREEN = "SPLIT_TEXT_INPUT_SCREEN",
+    SCAN_BAR_CUSTOM_SCREEN = "SCAN_BAR_CUSTOM_SCREEN",
+    SEARCH_BAR_SCREEN = "SEARCH_BAR_SCREEN",
+    MODEL_WIDGET_SCREEN = "MODEL_WIDGET_SCREEN",
+    CANCEL_ET_SCREEN = "CANCEL_ET_SCREEN",
+    CAPTURE_TEXT_SCREEN = "CAPTURE_TEXT_SCREEN",
+    DISPLAY_MODAL_ET = "DISPLAY_MODAL_ET",
+    DATE_TIME_WIDGET_SCREEN = "DATE_TIME_WIDGET_SCREEN",
+    QRBARCODE_WIDGET_SCREEN = "QRBARCODE_WIDGET_SCREEN",
+    CANCEL_ORDER_DIALOG_SCREEN = "CANCEL_ORDER_DIALOG_SCREEN",
+    CARD_WIDGET_SCREEN = "CARD_WIDGET_SCREEN",
+
+    //error messages
+    APP_ERROR =  "APP_ERROR ",
+    SDK_ERROR =  "SDK_ERROR ",
+    API_ERROR =  "API_ERROR ",
+};
+
+export enum SentryEventNameSdkConstants{
+    BUTTON_CLICKED = "BUTTON_CLICKED",
+    SDK_INIT_STARTED = "SDK_INIT_STARTED",   
+    SDK_INIT_DONE = "SDK_INIT_DONE",   
+    PICKUP_ET_OPENED = "PICKUP_ET_OPENED",   
+    DELIVER_ET_OPENED = "DELIVER_ET_OPENED",   
+    SIGNATURE_ET_OPENED = "SIGNATURE_ET_OPENED",   
+    CAPTURE_IMAGE_ET_OPENED = "CAPTURE_IMAGE_ET_OPENED",   
+    COLLECT_CASH_ET_OPENED = "COLLECT_CASH_ET_OPENED",   
+    RETURN_CASH_ET_OPENED = "RETURN_CASH_ET_OPENED",   
+    RETURN_ORDER_ET_OPENED = "RETURN_ORDER_ET_OPENED",   
+    //    
+    RESCHEDULE_ET_OPENED = "RESCHEDULE_ET_OPENED",    
+    FORM_ET_OPENED = "FORM_ET_OPENED",
+
+    //RT ETs
+    SCAN_ET_OPENED = "SCAN_ET_OPENED",
+    VERIFY_OTP_ET_OPENED = "VERIFY_OTP_ET_OPENED",
+    VERIFY_LOCATION_ET_OPENED = "VERIFY_LOCATION_ET_OPENED",
+}
+
+export enum SeverityLevelValue {
+    FATAL =  "fatal ",
+    ERROR = "error",
+    WARNING = "warning",
+    LOG = "log",
+    INFO = "info",
+    DEBUG = "debug",
+};

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

@@ -22,6 +22,8 @@ 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';
 
 const ICON_SIZE = 12;
 
@@ -55,13 +57,18 @@ const CancelET = (props: CancellationInput) => {
             value={item}
             status={cancelReason === item ? 'checked' : 'unchecked'}
             onPress={() => {
-              setCancelReason(item);
+              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 });    
             }}
           />
           <Text
             style={styles.reasonTextStyle}
             onPress={() => {
               setCancelReason(item);
+              const cta = item;
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+ 
             }}
           >
             {item}
@@ -81,12 +88,18 @@ const CancelET = (props: CancellationInput) => {
             status={cancelEvent === item ? 'checked' : 'unchecked'}
             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 });    
+    
             }}
           />
           <Text
             style={styles.reasonTextStyle}
             onPress={() => {
               setCancelEvent(item);
+              const cta = item;
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+ 
             }}
           >
             {item}
@@ -137,6 +150,9 @@ const CancelET = (props: CancellationInput) => {
               style={styles.codeHeaderStyle}
               onPress={() => {
                 setShowEventCode(!showEventCode);
+                const cta = 'Select Event'.toUpperCase();
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+   
               }}
             >
               <Text style={styles.codesHeaderTextStyle}>
@@ -167,6 +183,9 @@ const CancelET = (props: CancellationInput) => {
               style={styles.codeHeaderStyle}
               onPress={() => {
                 setShowReasonCode(!showReasonCode);
+                const cta = 'Select Reason'.toUpperCase();
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+   
               }}
             >
               <Text style={styles.codesHeaderTextStyle}>
@@ -217,7 +236,11 @@ const CancelET = (props: CancellationInput) => {
                 Alert.alert('No reason selected');
               }
             }
-          }}
+            const cta = 'Proceed';
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CANCEL_ET_SCREEN, cta: cta });    
+
+          }
+        }
         >
           Proceed
         </Button>

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

@@ -19,6 +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';
 
 const CaptureText = (props: CaptureTextInput) => {
   const [showBackModal, setShowBackModal] = useState(false);
@@ -36,6 +38,9 @@ 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 });    
+ 
             }}
             name="arrow-back"
             color={'black'}
@@ -130,7 +135,11 @@ const CaptureText = (props: CaptureTextInput) => {
                   ExecutionTaskID.CAPTURE_INPUT
                 )),
               });
-            }}
+              const cta = 'Cancel';
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_TEXT_SCREEN, cta: cta });    
+ 
+            }
+          }
           >
             Cancel
           </Button>
@@ -160,7 +169,11 @@ const CaptureText = (props: CaptureTextInput) => {
                   false,
                 attemptCount: 0,
               });
-            }}
+              const cta = 'Next';
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.CAPTURE_TEXT_SCREEN, cta: cta });    
+ 
+            }
+          }
           >
             Next
           </Button>

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

@@ -12,6 +12,8 @@ import {
   EntityCode,
   ExecutionTaskID,
 } from '../../../models/execTasks/ETConfig';
+import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../../analytics/sentry/SentrySdkConstants';
+import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
 
 const ListItem = ({ lineItem }: { lineItem: LineItem }) => (
   <Card style={deliverETStyles.item}>
@@ -76,6 +78,9 @@ const DeliverET = (props: DeliverETInput) => {
                     ExecutionTaskID.DELIVER
                   )),
                 });
+                const cta = 'Cancel';
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DELIVER_ET_SCREEN, cta: cta });    
+   
               }}
             >
               Cancel
@@ -102,6 +107,9 @@ const DeliverET = (props: DeliverETInput) => {
                   )),
                   remark: remarks,
                 });
+                const cta = 'Deliver';
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DELIVER_ET_SCREEN, cta: cta });    
+
               }}
             >
               Deliver

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

@@ -37,6 +37,8 @@ import Str from '../../../locale/Str';
 import CircleMark from '../../../icons/circleMark.svg';
 import { TouchableOpacity } from 'react-native';
 import ModalWidget from '../../../components/widgets/ModalWidget';
+import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../../analytics/sentry/SentrySdkConstants';
+import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
 
 const ListItem = ({ lineItem }: { lineItem: LineItem }) => (
   <View style={{ justifyContent: 'center' }}>
@@ -56,8 +58,7 @@ const getMessage = (
   title: string | undefined
 ) => {
   try {
-    const isReturnOrder = title?.toString()?.toLowerCase()?.includes("return");
-    //message ||
+    const isReturnOrder = title?.toString()?.toLowerCase()?.includes("return");    //message ||
     //Str.DEFAULT_DELIVER_MESSAGE
     const msg = getStrVal(isReturnOrder ? Str.DEFAULT_RETURN_MESSAGE : Str.DEFAULT_DELIVER_MESSAGE, Str.count, returnPackageCount && returnPackageCount >= 1 ? returnPackageCount : '');
     return msg;
@@ -120,6 +121,8 @@ const DeliverET = (props: DeliverETInput) => {
                 setShowDeliverModal(false);
                 props.navigation.goBack();
               }
+              const cta = 'Back Arrow';
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN, cta: cta });
             }}
             name="arrow-back"
             color={'black'}
@@ -193,6 +196,9 @@ const DeliverET = (props: DeliverETInput) => {
               props.navigation.goBack();
             }
             setShowBackModal(false);
+            const cta = 'Exit';
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN, cta: cta });
+
           },
           styles: styles.primaryButtonStyles,
         }}
@@ -201,6 +207,9 @@ const DeliverET = (props: DeliverETInput) => {
           onPress: () => {
             setGoBack(false);
             setShowDeliverModal(true);
+            const cta = 'Cancel';
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN, cta: cta });
+
           },
           styles: styles.secondaryButtonStyles,
         }}
@@ -314,6 +323,9 @@ const DeliverET = (props: DeliverETInput) => {
                           remark: `${pkgCount} Packages returned`,
                         });
                       } else setInputError('Please enter valid count.');
+                      const cta = 'Confirm';
+                      fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN, cta: cta });
+
                     }}
                   >
                     Confirm
@@ -354,6 +366,9 @@ const DeliverET = (props: DeliverETInput) => {
                   onPress={() => {
                     setShowDeliverModal(false);
                     setGoBack(true);
+                    const cta = 'Circle Icon';
+                    fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN, cta: cta });
+
                   }}
                   style={styles.crossIcon}
                   hitSlop={{ bottom: 10, top: 10, right: 10, left: 10 }}
@@ -367,9 +382,6 @@ const DeliverET = (props: DeliverETInput) => {
                   <Text style={DeliverPickupStyles.messageText}>
                     {getMessage(props.returnPackageCount, props.message, props.title)}
                   </Text>
-                  {/* {(props.title?.trim?.toString()?.toLowerCase()?.includes("return")) && <Text style={DeliverPickupStyles.messageText}>
-                    {getStrVal(Str.DEFAULT_DELIVER_MESSAGE, Str.count, props.returnPackageCount && props.returnPackageCount >= 1 ? props.returnPackageCount : '')}
-                  </Text>} */}
                   {(props.title?.toString()?.toLowerCase()?.includes("return")) == false && <Text style={DeliverPickupStyles.messageText}>
                     {props?.shipCount ? getStrVal(Str.shipments, Str.count, props.shipCount) : ''}
                   </Text>}
@@ -407,6 +419,9 @@ const DeliverET = (props: DeliverETInput) => {
                         )),
                         remark: '',
                       });
+                      const cta = 'Confirm';
+                      fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN, cta: cta });
+
                     }}
                   >
                     Confirm
@@ -433,6 +448,8 @@ const DeliverET = (props: DeliverETInput) => {
                             ExecutionTaskID.DELIVER
                           )),
                         });
+                        const cta = 'Cancel';
+                        fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_DELIVER_ET_SCREEN, cta: cta });
                       }}
                     >
                       Cancel

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

@@ -21,6 +21,8 @@ import {
   DeliverPickupStyles,
   Fonts,
 } from '../../../styles/executionTasks/CommonStyles';
+import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../../analytics/sentry/SentrySdkConstants';
+import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
 
 const DisplayModalET = (props: DisplayETInput) => {
   const [modalVisible, setModalVisible] = useState(props.showDialog);
@@ -93,6 +95,9 @@ 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 });    
+
                   }}
                   testID="primary"
                 >
@@ -106,6 +111,9 @@ const DisplayModalET = (props: DisplayETInput) => {
                     style={[CommonStyles.cancelButton, { marginTop: 5 }]}
                     onPress={async () => {
                       await sendEtOutput(false);
+                      const cta = props.negativeBtn;
+                      fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DISPLAY_MODAL_ET, cta: cta });    
+  
                     }}
                     testID="secondary"
                   >

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

@@ -34,6 +34,8 @@ 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';
 
 const SignatureET = (props: SignatureInput) => {
   const signatureViewRef = useRef<any>();
@@ -74,13 +76,18 @@ const SignatureET = (props: SignatureInput) => {
               } else {
                 props.navigation.goBack();
               }
+              const cta = 'Back Arrow';
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
+
+  
             }}
             name="arrow-back"
             color="black"
             size={22}
             style={{ paddingRight: 6 }}
           />
-          <Text style={{ fontSize: 16, fontFamily: Fonts.IBMPlexSans_500Medium, lineHeight: 24 }}>{props.title}</Text>
+          <Text style={{ fontSize: 16, fontFamily: Platform.OS === 'android' ? Fonts.IBMPlexSans_500Medium : 'IBMPlexSans-Medium',
+lineHeight: 24 }}>{props.title}</Text>
         </View>
       ),
     });
@@ -191,6 +198,10 @@ const SignatureET = (props: SignatureInput) => {
                   dragRef.current = 0;
                 }
                 signatureViewRef.current?.resetImage();
+                const cta = 'Clear';
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
+  
+    
               }}
             >
               <Text style={styles.clearBtn}>{''}</Text>
@@ -251,13 +262,16 @@ const SignatureET = (props: SignatureInput) => {
             mode={'outlined'}
             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 });    
+
             }}>{getStr(Str.skip)}
           </Button>
           }
           <Button
             labelStyle={{
               color: buttonProceed ? "#ffff" : "#A3AAC2",
-              fontFamily: Fonts.IBMPlexSans_500Medium,
+              fontFamily: Platform.OS === 'android' ? Fonts.IBMPlexSans_500Medium : 'IBMPlexSans-Medium',
               fontSize: 14,
               lineHeight: 20,
               textAlign: 'center',
@@ -265,7 +279,13 @@ const SignatureET = (props: SignatureInput) => {
             }}
             style={[CommonStyles.nextButton, { flex: 1, marginStart: 8, backgroundColor: buttonProceed ? "#5B80F7" : "#E0E3EB" }]}
             mode={'contained'}
-            onPress={async () => signatureViewRef.current?.saveImage()}
+            onPress={async () => {signatureViewRef.current?.saveImage()
+              const cta = 'Proceed';
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SIGNATURE_ET_SCREEN, cta: cta });    
+
+            }
+              
+            }
           >
             Proceed
           </Button>

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

@@ -12,6 +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';
 
 const styles = PaymentStyles;
 
@@ -90,6 +92,10 @@ const DropCashET = (props: DropCashInput) => {
                   ExecutionTaskID.DELIVER_CASH
                 )),
               });
+              const cta = 'Cancel';
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DROP_CASH_ET_SCREEN, cta: cta });    
+
+
             }}
           >
             Cancel
@@ -133,6 +139,9 @@ 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 });    
+
             }}
           >
             Drop Cash

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

@@ -21,6 +21,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';
 
 const SLDropCash = (props: DropCashInput) => {
   const [amountCollected, setAmountCollected] = useState(
@@ -80,6 +82,9 @@ const SLDropCash = (props: DropCashInput) => {
               )
                 setShowBackModal(true);
               else props.navigation.goBack();
+              const cta = 'Back Arrow';
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_DROP_CASH_ET_SCREEN, cta: cta });    
+
             }}
             name="arrow-back"
             color={'black'}
@@ -246,6 +251,9 @@ const SLDropCash = (props: DropCashInput) => {
                       )),
                     });
                   } else setInputError('Please enter valid amount.');
+                  const cta = 'Confirm';
+                  fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_DROP_CASH_ET_SCREEN, cta: cta });    
+    
                 }}
               >
                 Confirm
@@ -271,6 +279,9 @@ const SLDropCash = (props: DropCashInput) => {
                         ExecutionTaskID.DELIVER_CASH
                       )),
                     });
+                    const cta = 'Cancel';
+                    fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SL_DROP_CASH_ET_SCREEN, cta: cta });    
+      
                   }}
                 >
                   Cancel

package/src/components/executiontasks/forms/FormGenerator.tsx

@@ -31,6 +31,8 @@ import { GO_BACK_EVENT_CODE } from '../../../constants/constants';
 import { hasGoBackConnector } from '../../../components/utils';
 import GoBackModal from '../../../components/widgets/GoBackModal';
 import { useFocusEffect } from '@react-navigation/native';
+import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../../analytics/sentry/SentrySdkConstants';
+import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
 
 const customWidgets = {
   datePicker: DateTimeWidget,
@@ -78,6 +80,9 @@ const FormGenerator = (props: FormInputSchema) => {
               )
                 setShowBackModal(true);
               else props.navigation.goBack();
+              const cta = 'Back Arrow';
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.FORM_ET_SCREEN, cta: cta });    
+
             }}
             name="arrow-back"
             color={'black'}
@@ -218,33 +223,45 @@ const FormGenerator = (props: FormInputSchema) => {
           </View>
         </ScrollView>
         <View style={styles.bottomView}>
-          {(props.isSelfLoop == false) && <Button
-            style={[CommonStyles.cancelButton, { marginEnd: 10, flexGrow: 1 }]}
-            labelStyle={CommonStyles.cancelButtonLabel}
-            mode={'outlined'}
-            onPress={() => {
-              if (form.current) {
-                setOnCancel(true);
-                // @ts-ignore
-                form.current.submit();
-              }
-            }}
-          >Cancel
-          </Button>
-          }
-          <Button
-            style={[CommonStyles.nextButton, { marginStart: 10, flexGrow: 1 }]}
-            labelStyle={CommonStyles.nextButtonLabel}
-            mode={'contained'}
-            onPress={() => {
-              if (form.current) {
-                setOnCancel(false);
-                // @ts-ignore
-                form.current.submit();
-              }
-            }}
-          >Proceed
-          </Button>
+          <View>
+            <Button
+              style={[CommonStyles.nextButton, { width: 165, marginStart: 10 }]}
+              labelStyle={CommonStyles.nextButtonLabel}
+              mode={'contained'}
+              onPress={() => {
+                if (form.current) {
+                  setOnCancel(false);
+                  // @ts-ignore
+                  form.current.submit();
+                }
+                const cta = 'Proceed';
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.FORM_ET_SCREEN, cta: cta });    
+  
+              }}
+            >
+              Proceed
+            </Button>
+          </View>
+          <View>
+            {(props.isSelfLoop == false) && <Button
+              style={[CommonStyles.cancelButton, { width: 165, marginEnd: 10 }]}
+              labelStyle={CommonStyles.cancelButtonLabel}
+              mode={'outlined'}
+              onPress={() => {
+                if (form.current) {
+                  setOnCancel(true);
+                  // @ts-ignore
+                  form.current.submit();
+                }
+                const cta = 'Cancel';
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.FORM_ET_SCREEN, cta: cta });    
+  
+              }}
+            >
+              Cancel
+            </Button>
+            }
+          </View>
         </View>
       </KeyboardAvoidingView>
     </Provider>
@@ -269,9 +286,9 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   bottomView: {
-    flexDirection: 'row',
+    flexDirection: 'row-reverse',
     justifyContent: 'space-evenly',
-    backgroundColor: 'white',
     padding: 16,
+    backgroundColor: 'white',
   },
 });

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

@@ -10,6 +10,9 @@ import DateTimePicker, { Event } from '@react-native-community/datetimepicker';
 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';
+
 
 const MODES = {
   DATE: 'date',
@@ -49,7 +52,7 @@ const DateTimeWidget = ({
     color: theme.textColor,
   };
   const onDateChange = (_event: Event, selectedDate?: Date) => {
-    setShow(Platform.OS === 'ios');
+    setShow(false);
     if (selectedDate) {
       const currentDate = selectedDate;
       let dateTimeValue = getValueBasedOnMode(options, currentDate);
@@ -60,7 +63,11 @@ const DateTimeWidget = ({
 
   return (
     <View style={styles.container}>
-      <TouchableOpacity onPress={() => setShow(true)}>
+      <TouchableOpacity onPress={() => {setShow(true)
+                const cta = label;
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.DATE_TIME_WIDGET_SCREEN, cta: cta });    
+  
+      }}>
         <TextInput
           editable={false}
           onTouchStart={() => setShow(true)}
@@ -84,7 +91,7 @@ const DateTimeWidget = ({
           minimumDate={options.mode === 'date' ? new Date() : undefined}
           maximumDate={maxDate}
           is24Hour={false}
-          display={Platform.OS === 'ios' ? 'compact' : 'default'}
+          display={Platform.OS === 'ios' ? 'inline' : 'default'}
           onChange={onDateChange}
           value={date ?? new Date()}
           textColor={'red'}