From 69a08bdf3e26d933715a6f779fb92d3b345fdc42 Mon Sep 17 00:00:00 2001
From: Aman Chaturvedi <aman.chaturvedi@navi.com>
Date: Wed, 18 Jan 2023 16:39:24 +0530
Subject: [PATCH] Click stream events added  (#62)

Click stream events added
---
 App.tsx                                       |   2 +
 ProtectedRouter.tsx                           |   8 +-
 config/dev/config.js                          |   3 +-
 config/qa/config.js                           |   3 +-
 src/action/authActions.ts                     |   4 +-
 src/action/dataActions.ts                     |   7 +-
 src/common/Constants.ts                       | 102 ++++++++++++++++
 src/common/ErrorBoundary.tsx                  |  10 +-
 src/components/form/Submit.tsx                |   9 +-
 .../form/components/CheckboxGroup.tsx         |   7 +-
 src/components/form/components/Dropdown.tsx   |   7 +-
 .../form/components/ImageUpload.tsx           |   8 +-
 .../form/components/RadioButton.tsx           |   7 +-
 src/components/form/components/Rating.tsx     |   7 +-
 src/components/form/components/TextArea.tsx   |   7 +-
 src/components/form/components/TextInput.tsx  |   7 +-
 src/components/form/index.tsx                 |  65 +++++++---
 .../allCasesFilters/FiltersContainer.tsx      |  44 ++++---
 src/components/utlis/apiHelper.ts             |  33 +++++-
 src/components/utlis/commonFunctions.ts       |  11 +-
 src/constants/Global.ts                       |   4 +-
 src/constants/config.js                       |   3 +-
 src/hooks/janusApi.ts                         |  24 ++++
 src/hooks/useIsOnline.tsx                     |   2 +
 src/hooks/useNativeButton.tsx                 |  47 ++++++++
 src/reducer/allCasesSlice.ts                  |  12 +-
 src/reducer/commonSlice.ts                    |  15 ++-
 src/reducer/userSlice.ts                      |  16 ++-
 src/screens/Profile/index.tsx                 |  18 ++-
 src/screens/allCases/AllCases.tsx             |  19 ++-
 src/screens/allCases/CasesActionButtons.tsx   |   6 +-
 src/screens/allCases/ListItem.tsx             |   3 +
 src/screens/allCases/index.tsx                |   5 +-
 src/screens/caseDetails/CaseDetails.tsx       |  20 +++-
 .../journeyStepper/CallingBottomSheet.tsx     |  31 ++++-
 .../journeyStepper/TaskContent.tsx            |  15 ++-
 .../journeyStepper/TaskStepper.tsx            |   3 +
 src/screens/login/OtpInput.tsx                |  15 ++-
 src/screens/login/index.tsx                   |  14 ++-
 src/screens/todoList/TodoList.tsx             |  11 +-
 src/services/clickstreamEventService.ts       | 112 ++++++++++++++++++
 src/wmDB/const.ts                             |   5 +-
 src/wmDB/dao/ClickStreamEventsDAO.ts          |  94 +++++++++++++++
 src/wmDB/db.ts                                |   3 +-
 src/wmDB/index.ts                             |   3 +-
 src/wmDB/model/ClickstreamEvents.ts           |  17 +++
 src/wmDB/schema.ts                            |  20 +++-
 47 files changed, 796 insertions(+), 92 deletions(-)
 create mode 100644 src/hooks/janusApi.ts
 create mode 100644 src/hooks/useNativeButton.tsx
 create mode 100644 src/services/clickstreamEventService.ts
 create mode 100644 src/wmDB/dao/ClickStreamEventsDAO.ts
 create mode 100644 src/wmDB/model/ClickstreamEvents.ts

diff --git a/App.tsx b/App.tsx
index 62f0c941..08d90bfa 100644
--- a/App.tsx
+++ b/App.tsx
@@ -13,10 +13,12 @@ import ErrorBoundary from './src/common/ErrorBoundary';
 
 import * as Sentry from '@sentry/browser';
 import { SENTRY_DSN } from './src/constants/config';
+import useNativeButtons from './src/hooks/useNativeButton';
 
 Sentry.init({ dsn: SENTRY_DSN });
 
 const App = () => {
+    useNativeButtons();
     return (
         <Provider store={store}>
             <PersistGate
diff --git a/ProtectedRouter.tsx b/ProtectedRouter.tsx
index ef165ab6..015bbbe6 100644
--- a/ProtectedRouter.tsx
+++ b/ProtectedRouter.tsx
@@ -35,17 +35,17 @@ const ProtectedRouter = () => {
 
     const {isLoggedIn, deviceId, sessionDetails} = user;
 
-    // for setting user token in global.ts for api calling's
-    setGlobalUserData(sessionDetails?.sessionToken, deviceId);
     interactionsHandler()
     const dispatch = useAppDispatch();
-
+    
     // Firestore listener hook
     useFirestoreUpdates();
-
+    
     if (!deviceId) {
         getUniqueId().then(id => dispatch(setDeviceId(id)));
     }
+    // for setting user token in global.ts for api calling's
+    setGlobalUserData(sessionDetails?.sessionToken, deviceId, user?.user?.referenceId);
 
     const getScreenFocusListenerObj = ({route}: {route: RouteProp<GenericType>}) => ({
         focus: () => {
diff --git a/config/dev/config.js b/config/dev/config.js
index 39392cd3..9a36e940 100644
--- a/config/dev/config.js
+++ b/config/dev/config.js
@@ -1,2 +1,3 @@
 export const BASE_AV_APP_URL = 'https://dev-longhorn-server.np.navi-tech.in/av';
-export const SENTRY_DSN = 'https://877396e88a2b4f78b911016c64f9121a@glitchtip.cmd.navi-tech.in/155';
\ No newline at end of file
+export const SENTRY_DSN = 'https://877396e88a2b4f78b911016c64f9121a@glitchtip.cmd.navi-tech.in/155';
+export const JANUS_SERVICE_URL = 'https://dev-longhorn-portal.np.navi-tech.in/api/events/json';
\ No newline at end of file
diff --git a/config/qa/config.js b/config/qa/config.js
index d1bc2d33..2dde6720 100644
--- a/config/qa/config.js
+++ b/config/qa/config.js
@@ -1,2 +1,3 @@
 export const BASE_AV_APP_URL = 'https://qa-longhorn-server.np.navi-tech.in/av';
-export const SENTRY_DSN = 'https://877396e88a2b4f78b911016c64f9121a@glitchtip.cmd.navi-tech.in/155';
\ No newline at end of file
+export const SENTRY_DSN = 'https://877396e88a2b4f78b911016c64f9121a@glitchtip.cmd.navi-tech.in/155';
+export const JANUS_SERVICE_URL = 'https://qa-longhorn-portal.np.navi-tech.in/api/events/json';
\ No newline at end of file
diff --git a/src/action/authActions.ts b/src/action/authActions.ts
index 28e02eee..9b0d90b9 100644
--- a/src/action/authActions.ts
+++ b/src/action/authActions.ts
@@ -105,5 +105,7 @@ export const logout = () => (dispatch: AppDispatch) => {
             );
             dispatch(resetCasesData());
         })
-        .catch(err => console.log(err));
+        .catch(err => {
+            console.log(err)
+        });
 };
diff --git a/src/action/dataActions.ts b/src/action/dataActions.ts
index 248d8798..e543ac1c 100644
--- a/src/action/dataActions.ts
+++ b/src/action/dataActions.ts
@@ -18,6 +18,8 @@ import {
 } from '../reducer/allCasesSlice';
 import { ICaseItem } from '../screens/allCases/interface';
 import { AppDispatch } from '../store/store';
+import { addClickstreamEvent } from '../services/clickstreamEventService';
+import { CLICKSTREAM_EVENT_NAMES } from '../common/Constants';
 import { logError } from '../components/utlis/errorUtils';
 
 export const getAllCases =
@@ -67,7 +69,7 @@ export const getSingleCaseDetail =
     };
 
 export const postPinnedList =
-    (pinnedCases: ICaseItem[], updatedCaseList: ICaseItem[]) =>
+    (pinnedCases: ICaseItem[], updatedCaseList: ICaseItem[], type?: string) =>
     (dispatch: AppDispatch) => {
         dispatch(setTodoListOffline(updatedCaseList));
         navigateToScreen('Home');
@@ -79,8 +81,10 @@ export const postPinnedList =
             .post(url + `?pins=${payload}`)
             .then(response => {
                 dispatch(getAllCases());
+                addClickstreamEvent(type === 'REMOVED' ? CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_REMOVE_API_SUCCESS : CLICKSTREAM_EVENT_NAMES.AV_TODO_LIST_SUBMIT_SUCCESS, {todoList: pinnedCases})
             })
             .catch(err => {
+                addClickstreamEvent(type === 'REMOVED' ? CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_REMOVE_API_FAILED : CLICKSTREAM_EVENT_NAMES.AV_TODO_LIST_SUBMIT_FAILED, {todoList: pinnedCases})
                 dispatch(setTodoListOffline(updatedCaseList));
             });
     };
@@ -89,6 +93,7 @@ export const syncCaseDetail = (data: any) => (dispatch: AppDispatch) => {
     const offlineImageIdList = getOfflineImageId(data);
     dispatch(updateCaseDetailAfterApiCall({caseId: data.id}))
     const url = getApiUrl(ApiKeys.FEEDBACK);
+    const apiTime = (new Date()).getTime();
     axiosInstance
         .post(url, {
             id: data.id,
diff --git a/src/common/Constants.ts b/src/common/Constants.ts
index 49e349f6..b408e3b7 100644
--- a/src/common/Constants.ts
+++ b/src/common/Constants.ts
@@ -1,5 +1,8 @@
+import { ApiKeys, API_URLS } from "../components/utlis/apiHelper";
 import { CaseStatuses } from "../screens/allCases/interface";
 
+export const APP_NAME = 'collections-agent-app';
+
 export enum CONDITIONAL_OPERATORS {
     EQUALS = 'EQUALS',
     LESS_THAN_EQUAL_TO = 'LESS_THAN_EQUAL_TO',
@@ -27,6 +30,105 @@ export enum FirestoreUpdateTypes {
     REMOVED = 'removed',
 }
 
+export const ClickstreamAPIToMonitor = {
+    [API_URLS[ApiKeys.GENERATE_OTP]]: 'AV_LOGIN_SCREEN_SEND_OTP_API',
+    [API_URLS[ApiKeys.VERIFY_OTP]]: 'AV_OTP_SCREEN_VERIFY_OTP_API',
+    [API_URLS[ApiKeys.LOGOUT]]: 'AV_PROFILE_PAGE_LOGOUT_API',
+    [API_URLS[ApiKeys.FEEDBACK]]: 'AV_FORM_SUBMIT_API'
+};
+
+export const CLICKSTREAM_EVENT_NAMES = {
+    // GENERIC
+    AV_NATIVE_BACK_PRESSED : {name: 'AV_NATIVE_BACK_PRESSED', description: 'Native back button pressed'},
+    AV_NATIVE_HOME_PRESSED : {name: 'AV_NATIVE_HOME_PRESSED', description: 'Native home button pressed'},
+    AV_APP_FOREGROUND : {name: 'AV_APP_FOREGROUND', description: 'App has come to foreground'},
+    AV_APP_BACKGROUND : {name: 'AV_APP_BACKGROUND', description: 'App went to background'},
+    AV_ERROR_PAGE_LOADED : {name: 'ERROR_PAGE_LOADED', description: 'Error page loaded'},
+
+    // Login screen
+    AV_LOGIN_SCREEN_LOAD: {name:'AV_LOGIN_SCREEN_LOAD', description: 'Login page loaded'},
+    AV_LOGIN_SCREEN_NUMBER_INPUT: {name:'AV_LOGIN_SCREEN_NUMBER_INPUT', description: 'User entered 10 digits'},
+    AV_LOGIN_SCREEN_SEND_OTP_CLICKED: {name:'AV_LOGIN_SCREEN_SEND_OTP_CLICKED', description: 'Send OTP CTA clicked'},
+    AV_LOGIN_SCREEN_SEND_OTP_API_SUCCESS: {name:'AV_LOGIN_SCREEN_SEND_OTP_API_SUCCESS', description: 'Send OTP API successful'},
+    AV_LOGIN_SCREEN_SEND_OTP_API_FAILED: {name:'AV_LOGIN_SCREEN_SEND_OTP_API_FAILED', description: 'Send OTP API failed'},
+
+    // OTP screen
+    AV_OTP_SCREEN_LOAD: {name:'AV_OTP_SCREEN_LOAD', description: 'OTP screen loaded'},
+    AV_OTP_SCREEN_OTP_INPUT: {name:'AV_OTP_SCREEN_OTP_INPUT', description: 'User entered 4 digit OTP'},
+    AV_OTP_SCREEN_VERIFY_OTP_CLICKED: {name:'AV_OTP_SCREEN_VERIFY_OTP_CLICKED', description: 'Verify OTP CTA Clicked'},
+    AV_OTP_SCREEN_BACK_BUTTON_CLICKED: {name:'AV_OTP_SCREEN_BACK_BUTTON_CLICKED', description: 'OTP Screen back CTA clicked'},
+    AV_OTP_SCREEN_VERIFY_OTP_API_SUCCESS: {name:'AV_OTP_SCREEN_VERIFY_OTP_API_SUCCESS', description: 'OTP verify API successful'},
+    AV_OTP_SCREEN_VERIFY_OTP_API_FAILED: {name:'AV_OTP_SCREEN_VERIFY_OTP_API_FAILED', description: 'OTP verify API failed'},
+
+    // Case list
+    AV_CASE_LIST_LOAD : {name: 'AV_CASE_LIST_LOAD', description: 'Cases list loaded'},
+    AV_CASE_LIST_CASE_CLICKED : {name: 'AV_CASE_LIST_CASE_CLICKED', description: 'Case clicked'},
+    AV_CASE_LIST_PULLED_TO_REFRESH : {name: 'AV_CASE_LIST_PULLED_TO_REFRESH', description: 'Case list pulled to refresh'},
+    AV_CASE_LIST_TODO_ITEM_SELECTED : {name: 'AV_CASE_LIST_TODO_ITEM_SELECTED', description: 'Case list todo item selected'},
+    AV_CASE_LIST_TODO_ITEM_UNSELECTED : {name: 'AV_CASE_LIST_TODO_ITEM_UNSELECTED', description: 'Case list todo iten unselected'},
+    AV_CASE_LIST_CASE_SELECTED : {name: 'AV_CASE_LIST_CASE_SELECTED', description: 'Other cases selected'},
+    AV_CASE_LIST_CASE_UNSELECTED : {name: 'AV_CASE_LIST_CASE_UNSELECTED', description: 'Other cases unselected'},
+    AV_CASE_LIST_PROCEED_BUTTON_CLICKED : {name: 'AV_CASE_LIST_PROCEED_BUTTON_CLICKED', description: 'Case list proceed CTA clicked'},
+    AV_CASE_LIST_REMOVE_BUTTON_CLICKED : {name: 'AV_CASE_LIST_REMOVE_BUTTON_CLICKED', description: 'Case list remove CTA clicked'},
+    AV_CASE_LIST_REMOVE_API_SUCCESS : {name: 'AV_CASE_LIST_REMOVE_API_SUCCESS', description: 'Remove todolist API successful'},
+    AV_CASE_LIST_REMOVE_API_FAILED: {name: 'AV_CASE_LIST_REMOVE_API_FAILED', description: 'Remove todolist API failed'},
+    AV_CASE_LIST_FILTER_BUTTON_CLICKED : {name: 'AV_CASE_LIST_FILTER_BUTTON_CLICKED', description: 'Case list filter CTA clicked'},
+    AV_CASE_LIST_SEARCH_QUERY_CHANGED : {name: 'AV_CASE_LIST_SEARCH_QUERY_CHANGED', description: 'Search filter query changed'},
+    AV_CASE_LIST_TAB_CHANGED : {name: 'AV_CASE_LIST_TAB_CHANGED', description: 'Case list tab changed'},
+    AV_CASE_LIST_AGENT_PROFILE_CLICKED  : {name: 'AV_CASE_LIST_AGENT_PROFILE_CLICKED', description: 'Case list agent profile CTA clicked'},
+
+    // TODO LIST 
+    AV_TODO_LIST_LOAD : {name: 'AV_TODO_LIST_LOAD', description: 'Todo list confirmation screen loaded'},
+    AV_TODO_LIST_CASE_DELETED : {name: 'AV_TODO_LIST_CASE_DELETED', description: 'Todo list case deleted'},
+    AV_TODO_LIST_SUBMIT_CLICKED : {name: 'AV_TODO_LIST_SUBMIT_CLICKED', description: 'Submit CTA clicked'},
+    AV_TODO_LIST_SUBMIT_SUCCESS : {name: 'AV_TODO_LIST_SUBMIT_SUCCESS', description: 'Todo list submit API successful'},
+    AV_TODO_LIST_SUBMIT_FAILED : {name: 'AV_TODO_LIST_SUBMIT_FAILED', description: 'Todo list submit API failed'},
+    AV_TODO_LIST_BACK_CLICKED : {name: 'AV_TODO_LIST_BACK_CLICKED', description: 'Back CTA clicked'},
+
+    //Filters
+    AV_FILTERS_PAGE_LOAD : {name: 'AV_FILTERS_PAGE_LOAD', description: 'Filters screen loaded'},
+    AV_FILTERS_TAB_CLICKED : {name: 'AV_FILTERS_TAB_CLICKED', description: 'Filter tab clicked'},
+    AV_FILTERS_OPTIONS_SELECTED : {name: 'AV_FILTERS_OPTIONS_SELECTED', description: 'Filter options selected'},
+    AV_FILTERS_CLOSE_CLICKED : {name: 'AV_FILTERS_CLOSE_CLICKED', description: 'Filters close CTA clicked'},
+    AV_FILTERS_APPLY_CLICKED : {name: 'AV_FILTERS_APPLY_CLICKED', description: 'Filters apply CTA clicked'},
+    AV_FILTERS_CLEAR_CLICKED : {name: 'AV_FILTERS_CLEAR_CLICKED', description: 'Filters clear CTA clicked'},
+    AV_FILTERS_OPTION_SEARCH : {name: 'AV_FILTERS_OPTION_SEARCH', description: 'Filters options search query'},
+
+    //Case Details
+    AV_CASE_DETAILS_PAGE_LOADED : {name: 'AV_CASE_DETAILS_PAGE_LOADED', description: 'Case details page loaded'},
+    AV_CASE_DETAILS_PULL_TO_REFRESH : {name: 'AV_CASE_DETAILS_PULL_TO_REFRESH', description: 'Case details page pulled to refresh'},
+    AV_CASE_DETAILS_CALL_CUSTOMER_CLICKED : {name: 'AV_CASE_DETAILS_CALL_CUSTOMER_CLICKED', description: 'Call customer CTA clicked'},
+    AV_CASE_DETAILS_OPEN_MAPS_CLICKED : {name: 'AV_CASE_DETAILS_OPEN_MAPS_CLICKED', description: 'Open map CTA clicked'},
+    AV_CASE_DETAILS_ADD_FEEDBACK_CLICKED : {name: 'AV_CASE_DETAILS_ADD_FEEDBACK_CLICKED', description: 'Add feedback CTA clicked'},
+
+    //CALLING BOTTOM SHEET
+    AV_CALLING_BOTTOMSHEET_LOADED : {name: 'AV_CALLING_BOTTOMSHEET_LOADED', description: 'Calling bottomsheet loaded'},
+    AV_CALLING_BOTTOMSHEET_CLOSE_CLICKED : {name: 'AV_CALLING_BOTTOMSHEET_CLOSE_CLICKED' , description: 'Close bottomsheet CTA clicked'},
+    AV_CALLING_BOTTOMSHEET_CALL_VIA_PHONE_CLICKED : {name: 'AV_CALLING_BOTTOMSHEET_CALL_VIA_PHONE_CLICKED', description: 'Call via phone CTA clicked'},
+    AV_CALLING_BOTTOMSHEET_CALL_VIA_WHATSAPP_CLICKED : {name: 'AV_CALLING_BOTTOMSHEET_CALL_VIA_WHATSAPP_CLICKED', description: 'Call via whatsapp CTA clicked'},
+    AV_CALLING_BOTTOMSHEET_BEFORE_INTENT_EVENT : {name: 'AV_CALLING_BOTTOMSHEET_BEFORE_INTENT_EVENT' , description: 'Call bottomsheet before intent event'},
+
+    //PROFILE PAGE
+    AV_PROFILE_PAGE_LOADED : {name: 'AV_PROFILE_PAGE_LOADED', description: 'Profile page loaded'},
+    AV_PROFILE_PAGE_LOGOUT_BUTTON_CLICKED : {name: 'AV_PROFILE_PAGE_LOGOUT_BUTTON_CLICKED', description: 'Logout CTA clicked'},
+    AV_PROFILE_PAGE_LOGOUT_CONFIRMATION_OPEN : {name: 'AV_PROFILE_PAGE_LOGOUT_CONFIRMATION_OPEN', description: 'Logout confirmation dialog open'},
+    AV_PROFILE_PAGE_LOGOUT_CONFIRMATION_CLOSED : {name: 'AV_PROFILE_PAGE_LOGOUT_CONFIRMATION_CLOSED', description: 'Logout confirmation dialog closed'},
+    AV_PROFILE_PAGE_LOGOUT_CONFIRMATION_CLICKED : {name:  'AV_PROFILE_PAGE_LOGOUT_CONFIRMATION_CLICKED', description: 'Logout confirmation clicked'},
+    AV_PROFILE_PAGE_LOGOUT_API_SUCCESS  : {name: 'AV_PROFILE_PAGE_LOGOUT_API_SUCCESS', description: 'Logout API successful'},
+    AV_PROFILE_PAGE_LOGOUT_API_FAILED  : {name: 'AV_PROFILE_PAGE_LOGOUT_API_FAILED', description: 'Logout API failed'},
+
+    //FORMS
+    AV_FORM_LOADED : {name: 'AV_FORM_LOADED', description: 'Form loaded'},
+    AV_FORM_CLOSE_CLICKED : {name: 'AV_FORM_CLOSE_CLICKED', description: 'Form close CTA clicked'},
+    AV_FORM_ELEMENT_CHANGED : {name: 'AV_FORM_ELEMENT_CHANGED', description: 'Form element answer changed'},
+    AV_FORM_NEXT_BUTTON_CLICKED : {name: 'AV_FORM_NEXT_BUTTON_CLICKED', description: 'Form next CTA clicked'},
+    AV_FORM_BACK_BUTTON_CLICKED : {name: 'AV_FORM_BACK_BUTTON_CLICKED', description: 'Form back CTA clicked'},
+    AV_FORM_SUMMARY_PAGE_LOADED : {name: 'AV_FORM_SUMMARY_PAGE_LOADED', description: 'Form summary page loaded'},
+    AV_FORM_SUBMIT_BUTTON_CLICKED : {name: 'AV_FORM_SUBMIT_BUTTON_CLICKED', description: 'Form submit journey CTA clicked'},
+    AV_FORM_SUBMIT_API_SUCCESS : {name: 'AV_FORM_SUBMIT_API_SUCCESS', description: 'Form submit API successful'},
+    AV_FORM_SUBMIT_API_FAILED : {name: 'AV_FORM_SUBMIT_API_FAILED', description: 'Form submit API failed'},
+} as Record<string, {name: string, description: string}>;
+
 export enum MimeType {
     'image/jpeg' = 'image/jpeg',
     'image/png' = 'image/png'
diff --git a/src/common/ErrorBoundary.tsx b/src/common/ErrorBoundary.tsx
index 75cda8d7..453e7ade 100644
--- a/src/common/ErrorBoundary.tsx
+++ b/src/common/ErrorBoundary.tsx
@@ -1,7 +1,8 @@
 import React, { Component, ReactNode } from 'react';
 import { logError } from '../components/utlis/errorUtils';
-import { StyleSheet, Text, View } from 'react-native';
-import { COLORS } from '../../RN-UI-LIB/src/styles/colors';
+import { StyleSheet, View } from 'react-native';
+import {addClickstreamEvent} from "../services/clickstreamEventService";
+import {CLICKSTREAM_EVENT_NAMES} from "./Constants";
 import ErrorImage from '../assets/images/Error';
 import Heading from '../../RN-UI-LIB/src/components/Heading';
 
@@ -24,9 +25,12 @@ class ErrorBoundary extends Component<IErrorBoundary, IErrorBoundaryState> {
     this.setState({
       hasError: true
     });
+    addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_ERROR_PAGE_LOADED , {error});
     logError(error);
   }
 
+
+
   render() {
     if (this.state.hasError) {
       return (
@@ -58,4 +62,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default ErrorBoundary;
\ No newline at end of file
+export default ErrorBoundary;
diff --git a/src/components/form/Submit.tsx b/src/components/form/Submit.tsx
index 620d79a8..b5edad9f 100644
--- a/src/components/form/Submit.tsx
+++ b/src/components/form/Submit.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import {
     SafeAreaView,
     ScrollView,
@@ -7,9 +7,10 @@ import {
 } from 'react-native';
 import Text from '../../../RN-UI-LIB/src/components/Text';
 import { GenericStyles, getShadowStyle } from '../../../RN-UI-LIB/src/styles';
+import { CLICKSTREAM_EVENT_NAMES } from '../../common/Constants';
 import { useAppSelector } from '../../hooks';
 import AnswerRender, { IAnswer } from './AnswerRender';
-
+import { addClickstreamEvent } from '../../services/clickstreamEventService';
 
 interface ISubmit {
     caseId: string;
@@ -29,6 +30,10 @@ const Submit: React.FC<ISubmit> = props => {
     const sections = templateData.sections;
     const questions = templateData.questions;
 
+    useEffect(() => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_SUMMARY_PAGE_LOADED, {journeyId: journey})
+    }, [])
+
     return (
         <SafeAreaView>
             <ScrollView>
diff --git a/src/components/form/components/CheckboxGroup.tsx b/src/components/form/components/CheckboxGroup.tsx
index 6dc69c14..238f3f9f 100644
--- a/src/components/form/components/CheckboxGroup.tsx
+++ b/src/components/form/components/CheckboxGroup.tsx
@@ -13,6 +13,8 @@ import { AnswerType } from '../interface';
 import QuestionRenderingEngine from '../QuestionRenderingEngine';
 import ErrorMessage from './ErrorMessage';
 import { _map } from '../../../../RN-UI-LIB/src/utlis/common';
+import { addClickstreamEvent } from '../../../services/clickstreamEventService';
+import { CLICKSTREAM_EVENT_NAMES } from '../../../common/Constants';
 
 interface ICheckBoxGroup {
     questionType: string;
@@ -26,7 +28,7 @@ interface ICheckBoxGroup {
 }
 
 const CheckBoxGroup: React.FC<ICheckBoxGroup> = props => {
-    const {questionId, widgetId, journeyId, caseId, sectionId, error} = props;
+    const {questionId, widgetId, journeyId, caseId, sectionId, error, questionType} = props;
     const template = useAppSelector(state => state.case.templateData)
     const question =
         template.questions[questionId as keyof typeof template.questions];
@@ -65,6 +67,9 @@ const CheckBoxGroup: React.FC<ICheckBoxGroup> = props => {
         onChange: (...event: any[]) => void,
     ) => {
         const values = _map(change, (key) => key);
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_ELEMENT_CHANGED, {
+            caseId, questionType, value: values, questionId, error, sectionId, widgetId
+        })
         onChange({
             answer: values,
             type: AnswerType.array,
diff --git a/src/components/form/components/Dropdown.tsx b/src/components/form/components/Dropdown.tsx
index a09db022..67bb876e 100644
--- a/src/components/form/components/Dropdown.tsx
+++ b/src/components/form/components/Dropdown.tsx
@@ -13,6 +13,8 @@ import QuestionRenderingEngine from '../QuestionRenderingEngine';
 import ErrorMessage from './ErrorMessage';
 import {AnswerType, Options} from '../interface';
 import {useAppSelector} from '../../../hooks';
+import { addClickstreamEvent } from '../../../services/clickstreamEventService';
+import { CLICKSTREAM_EVENT_NAMES } from '../../../common/Constants';
 
 interface IDropDown {
     questionType: string;
@@ -26,7 +28,7 @@ interface IDropDown {
 }
 
 const DropDown: React.FC<IDropDown> = props => {
-    const {questionId, widgetId, journeyId, caseId, sectionId, error} = props;
+    const {questionId, widgetId, journeyId, caseId, sectionId, error, questionType} = props;
     const template = useAppSelector(state => state.case.templateData);
     const question =
         template.questions[questionId as keyof typeof template.questions];
@@ -61,6 +63,9 @@ const DropDown: React.FC<IDropDown> = props => {
         change: string | null,
         onChange: (...event: any[]) => void,
     ) => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_ELEMENT_CHANGED, {
+            caseId, questionType, value: change, questionId, error, sectionId, widgetId
+        })
         onChange({
             answer: change,
             type: AnswerType.option,
diff --git a/src/components/form/components/ImageUpload.tsx b/src/components/form/components/ImageUpload.tsx
index 61cefd6f..cc41e416 100644
--- a/src/components/form/components/ImageUpload.tsx
+++ b/src/components/form/components/ImageUpload.tsx
@@ -20,7 +20,8 @@ import { AnswerType } from '../interface';
 import ErrorMessage from './ErrorMessage';
 import withObservables from '@nozbe/with-observables';
 import OfflineImageDAO from '../../../wmDB/dao/OfflineImageDAO';
-import { PrefixJpegBase64Image } from '../../../common/Constants';
+import { CLICKSTREAM_EVENT_NAMES, PrefixJpegBase64Image } from '../../../common/Constants';
+import { addClickstreamEvent } from '../../../services/clickstreamEventService';
 
 interface IOfflineImage {
     idx: string;
@@ -40,7 +41,7 @@ interface IImageUpload {
 }
 
 const ImageUpload: React.FC<IImageUpload> = props => {
-    const {questionId, error, sectionId, caseId, journeyId, widgetId} = props;
+    const {questionId, error, sectionId, caseId, journeyId, widgetId, questionType} = props;
     const [imageId, setImageId] = useState('');
     const template = useAppSelector(state => state.case.templateData);
     const question =
@@ -67,6 +68,9 @@ const ImageUpload: React.FC<IImageUpload> = props => {
         const data = `${PrefixJpegBase64Image}${clickedImage}`;
         var uniqueId = 'id' + (new Date()).getTime();
         setImageId(uniqueId);
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_ELEMENT_CHANGED, {
+            caseId, questionType, value: uniqueId, questionId, error, sectionId, widgetId
+        })
         onChange({
             answer: uniqueId,
             type: AnswerType.image,
diff --git a/src/components/form/components/RadioButton.tsx b/src/components/form/components/RadioButton.tsx
index 7352ade2..51c37fcc 100644
--- a/src/components/form/components/RadioButton.tsx
+++ b/src/components/form/components/RadioButton.tsx
@@ -15,6 +15,8 @@ import ErrorMessage from './ErrorMessage';
 import {AnswerType} from '../interface';
 import {useAppSelector} from '../../../hooks';
 import Address from './Address';
+import { addClickstreamEvent } from '../../../services/clickstreamEventService';
+import { CLICKSTREAM_EVENT_NAMES } from '../../../common/Constants';
 
 interface IRadioButton {
     questionType: string;
@@ -32,7 +34,7 @@ const AdditionalDetailsComponentMap = {
 };
 
 const RadioButton: React.FC<IRadioButton> = props => {
-    const {questionId, widgetId, journeyId, caseId, sectionId, error} = props;
+    const {questionId, widgetId, journeyId, caseId, sectionId, error, questionType} = props;
     const template = useAppSelector(state => state.case.templateData);
     const question = template.questions[questionId];
     const options = template.options;
@@ -66,6 +68,9 @@ const RadioButton: React.FC<IRadioButton> = props => {
         change: string | null,
         onChange: (...event: any[]) => void,
     ) => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_ELEMENT_CHANGED, {
+            caseId, questionType, value: change, questionId, error, sectionId, widgetId
+        })
         computeNextQuestion(change as keyof typeof options);
         onChange({
             answer: change,
diff --git a/src/components/form/components/Rating.tsx b/src/components/form/components/Rating.tsx
index 568e9f2a..09c891e5 100644
--- a/src/components/form/components/Rating.tsx
+++ b/src/components/form/components/Rating.tsx
@@ -7,6 +7,8 @@ import ErrorMessage from './ErrorMessage';
 import Text from '../../../../RN-UI-LIB/src/components/Text';
 import { AnswerType } from '../interface';
 import { useAppSelector } from '../../../hooks';
+import { addClickstreamEvent } from '../../../services/clickstreamEventService';
+import { CLICKSTREAM_EVENT_NAMES } from '../../../common/Constants';
 interface IRating {
     questionType: string;
     questionId: string;
@@ -19,7 +21,7 @@ interface IRating {
 }
 
 const Rating: React.FC<IRating> = props => {
-    const {questionId, error, sectionId, widgetId} = props;
+    const {questionId, error, sectionId, widgetId, caseId, questionType} = props;
     const template = useAppSelector(state => state.case.templateData);
     const question =
         template.questions[questionId as keyof typeof template.questions];
@@ -28,6 +30,9 @@ const Rating: React.FC<IRating> = props => {
     }
 
     const handleChange = (text : number, onChange : (...event: any[]) => void) => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_ELEMENT_CHANGED, {
+            caseId, questionType, value: text, questionId, error, sectionId, widgetId
+        })
         onChange({
             answer: text,
             type: AnswerType.number
diff --git a/src/components/form/components/TextArea.tsx b/src/components/form/components/TextArea.tsx
index 44139df9..3cb4ee9d 100644
--- a/src/components/form/components/TextArea.tsx
+++ b/src/components/form/components/TextArea.tsx
@@ -8,6 +8,8 @@ import {GenericStyles} from '../../../../RN-UI-LIB/src/styles';
 import ErrorMessage from './ErrorMessage';
 import { AnswerType } from '../interface';
 import { useAppSelector } from '../../../hooks';
+import { addClickstreamEvent } from '../../../services/clickstreamEventService';
+import { CLICKSTREAM_EVENT_NAMES } from '../../../common/Constants';
 
 interface ITextArea {
     questionType: string;
@@ -21,7 +23,7 @@ interface ITextArea {
 }
 
 const TextArea: React.FC<ITextArea> = props => {
-    const {questionId, error, sectionId, widgetId} = props;
+    const {questionId, error, sectionId, widgetId, caseId, questionType} = props;
     const template = useAppSelector(state => state.case.templateData);
     const question =
         template.questions[questionId as keyof typeof template.questions];
@@ -30,6 +32,9 @@ const TextArea: React.FC<ITextArea> = props => {
     }
 
     const handleChange = (text : string, onChange : (...event: any[]) => void) => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_ELEMENT_CHANGED, {
+            caseId, questionType, value: text, questionId, error, sectionId, widgetId
+        })
         onChange({
             answer: text,
             type: AnswerType.text
diff --git a/src/components/form/components/TextInput.tsx b/src/components/form/components/TextInput.tsx
index 396d4dbf..9bee0045 100644
--- a/src/components/form/components/TextInput.tsx
+++ b/src/components/form/components/TextInput.tsx
@@ -8,6 +8,8 @@ import Text from '../../../../RN-UI-LIB/src/components/Text';
 import ErrorMessage from './ErrorMessage';
 import { AnswerType } from '../interface';
 import { useAppSelector } from '../../../hooks';
+import { addClickstreamEvent } from '../../../services/clickstreamEventService';
+import { CLICKSTREAM_EVENT_NAMES } from '../../../common/Constants';
 
 interface ITextInput {
     questionType: string;
@@ -21,7 +23,7 @@ interface ITextInput {
 }
 
 const TextInput: React.FC<ITextInput> = props => {
-    const {questionId, error, sectionId, widgetId} = props;
+    const {questionId, error, sectionId, widgetId, caseId, questionType} = props;
     const template = useAppSelector(state => state.case.templateData);
     const question =
         template.questions[questionId as keyof typeof template.questions];
@@ -30,6 +32,9 @@ const TextInput: React.FC<ITextInput> = props => {
     }
 
     const handleChange = (text : string, onChange : (...event: any[]) => void) => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_ELEMENT_CHANGED, {
+            caseId, questionType, value: text, questionId, error, sectionId, widgetId
+        })
         onChange({
             answer: text,
             type: AnswerType.text
diff --git a/src/components/form/index.tsx b/src/components/form/index.tsx
index f0336d39..e4349242 100644
--- a/src/components/form/index.tsx
+++ b/src/components/form/index.tsx
@@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import {useForm} from 'react-hook-form';
 import {ScrollView, StyleSheet, TouchableHighlight, TouchableOpacity, View} from 'react-native';
 import {SafeAreaView} from 'react-native-safe-area-context';
@@ -29,6 +29,8 @@ import {ConditionType, IDecision, ILeaf} from './interface';
 import RenderQuestion from './RenderQuestion';
 import {TaskTitleUIMapping} from '../../screens/allCases/interface';
 import Submit from './Submit';
+import {addClickstreamEvent} from "../../services/clickstreamEventService";
+import {CLICKSTREAM_EVENT_NAMES} from "../../common/Constants";
 
 const CASE_DETAIL_SCREEN_NAME = 'caseDetail';
 
@@ -50,6 +52,8 @@ const Widget: React.FC<IWidget> = props => {
         previousScreenRoute.name === CASE_DETAIL_SCREEN_NAME,
     );
 
+    useEffect(()=>{},[])
+
     const {name, params} = props.route;
     const {caseId, journey} = params;
     const templateData = useAppSelector(state => state.case.templateData);
@@ -215,6 +219,46 @@ const Widget: React.FC<IWidget> = props => {
         });
     };
 
+    useEffect(() => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_LOADED , {
+            caseId,
+            journeyId: journey,
+            widgetId: name,
+            sections: sections.map(section => ({section , questions: sectionMap[section].questions})),
+        })
+    } , [])
+
+    const handleCloseIconPress = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_CLOSE_CLICKED , {caseId});
+        navigateToScreen('caseDetail', {caseId})
+    }
+
+    const handleSubmitCTA = () => {
+        if(isLeaf) {
+            addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_SUBMIT_BUTTON_CLICKED, {caseId, journeyId: journey,
+                widgetId: name});
+            handleSubmit(handleSubmitJourney, onError)
+        }
+        else{
+            addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_NEXT_BUTTON_CLICKED, {caseId, journeyId: journey,
+                widgetId: name});
+            handleSubmit(onSubmit, onError)
+        }
+    }
+
+    const handleBackButton = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FORM_BACK_BUTTON_CLICKED, {caseId, journeyId: journey,
+            widgetId: name});
+        dispatch(
+            deleteInteraction({
+                caseId,
+                journeyId: journey,
+                widgetId: name,
+            }),
+        );
+        goBack();
+    }
+
     return (
         <SafeAreaView
             style={[GenericStyles.whiteBackground, GenericStyles.fill]}>
@@ -226,7 +270,7 @@ const Widget: React.FC<IWidget> = props => {
                     paddingHorizontal: 16,
                 }}>
                 <View style={[GenericStyles.row]}>
-                    <TouchableHighlight style={styles.iconContainer} underlayColor={COLORS.HIGHLIGHTER.DARK_BUTTON} onPress={() => navigateToScreen('caseDetail', {caseId})}>
+                    <TouchableHighlight style={styles.iconContainer} underlayColor={COLORS.HIGHLIGHTER.DARK_BUTTON} onPress={handleCloseIconPress}>
                         <CloseIcon color={COLORS.BACKGROUND.PRIMARY} />
                     </TouchableHighlight>
                     <View style={GenericStyles.ml10}>
@@ -305,27 +349,14 @@ const Widget: React.FC<IWidget> = props => {
                         style={[styles.autoFlex, styles.mH16]}
                         title={'Back'}
                         testID={"test_back"}
-                            onPress={() => {
-                            dispatch(
-                                deleteInteraction({
-                                    caseId,
-                                    journeyId: journey,
-                                    widgetId: name,
-                                }),
-                            );
-                            goBack();
-                        }}
+                        onPress={handleBackButton}
                         leftIcon={<ArrowSolidIcon size={10} />}
                     />
                 )}
                 <Button
                     style={[styles.autoFlex, styles.mH16]}
                     title={isLeaf ? 'Submit' : 'Next'}
-                    onPress={
-                        isLeaf
-                            ? handleSubmit(handleSubmitJourney, onError)
-                            : handleSubmit(onSubmit, onError)
-                    }
+                    onPress={handleSubmitCTA}
                     rightIcon={
                         !isLeaf && (
                             <ArrowSolidIcon
diff --git a/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx b/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx
index a6eb94d6..bddafca5 100644
--- a/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx
+++ b/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx
@@ -10,6 +10,7 @@ import TextInput from '../../../../../RN-UI-LIB/src/components/TextInput';
 import CheckboxGroup from '../../../../../RN-UI-LIB/src/components/chechbox/CheckboxGroup';
 import {useAppDispatch} from '../../../../hooks';
 import {
+    CLICKSTREAM_EVENT_NAMES,
     CONDITIONAL_OPERATORS,
     FILTER_TYPES,
     SELECTION_TYPES,
@@ -24,6 +25,7 @@ import RadioGroup from '../../../../../RN-UI-LIB/src/components/radio_button/Rad
 import RadioButton from '../../../../../RN-UI-LIB/src/components/radio_button/RadioButton';
 import {Search} from '../../../../../RN-UI-LIB/src/utlis/search';
 import SearchIcon from '../../../../../RN-UI-LIB/src/Icons/SearchIcon';
+import {addClickstreamEvent} from "../../../../services/clickstreamEventService";
 
 interface FilterContainerProps {
     closeFilterModal: () => void;
@@ -156,19 +158,8 @@ const FiltersContainer: React.FC<FilterContainerProps> = props => {
     };
 
     const applyFilter = () => {
-        // dispatch(
-        //     setFilterList(
-        //         casesList.filter(record =>
-        //             evaluateFilterForCases(
-        //                 record,
-        //                 Object.keys(selectedFilters),
-        //                 filters,
-        //                 selectedFilters,
-        //             ),
-        //         ),
-        //     ),
-        // );
         dispatch(setSelectedFilters(selectedFiltersMap));
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FILTERS_APPLY_CLICKED , { selectedFilters : selectedFiltersMap });
         closeFilterModal();
     };
 
@@ -176,6 +167,7 @@ const FiltersContainer: React.FC<FilterContainerProps> = props => {
         setSelectedFiltersMap({});
         Object.keys(selectedFilters).length > 0 &&
             dispatch(setSelectedFilters({}));
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FILTERS_CLEAR_CLICKED);
     };
 
     const Options = React.useMemo(() => {
@@ -242,6 +234,28 @@ const FiltersContainer: React.FC<FilterContainerProps> = props => {
         return <></>;
     }, [selectedFilterKey, selectedFiltersMap, filterSearchString]);
 
+    useEffect(() => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FILTERS_PAGE_LOAD , { filters : filterKeys });
+    },[]);
+
+    useEffect(() => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FILTERS_TAB_CLICKED , { currentFilterTab: selectedFilterKey });
+    },[selectedFilterKey])
+
+    useEffect(() => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FILTERS_OPTIONS_SELECTED , { [selectedFilterKey] : selectedFiltersMap[selectedFilterKey] });
+    },[selectedFiltersMap])
+
+    const handleOnClose = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FILTERS_CLOSE_CLICKED);
+        closeFilterModal();
+    }
+
+    const handleOptionFilterChange = (value: string) => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_FILTERS_OPTION_SEARCH, { query: value });
+        setFilterSearchString(value);
+    }
+
     return (
         <View style={[GenericStyles.fill, {flex: 1}]}>
             <View
@@ -256,7 +270,7 @@ const FiltersContainer: React.FC<FilterContainerProps> = props => {
                 </Heading>
                 <TouchableOpacity
                     activeOpacity={0.7}
-                    onPress={closeFilterModal}>
+                    onPress={handleOnClose}>
                     <Text dark bold style={[styles.blueText]}>
                         Close
                     </Text>
@@ -328,9 +342,7 @@ const FiltersContainer: React.FC<FilterContainerProps> = props => {
                                     LeftComponent={<SearchIcon />}
                                     placeholder="Search..."
                                     defaultValue={filterSearchString}
-                                    onChangeText={value =>
-                                        setFilterSearchString(value)
-                                    }
+                                    onChangeText={handleOptionFilterChange}
                                     testID="test_search"
                                 />
                             </View>
diff --git a/src/components/utlis/apiHelper.ts b/src/components/utlis/apiHelper.ts
index f7c441f0..17a064d2 100644
--- a/src/components/utlis/apiHelper.ts
+++ b/src/components/utlis/apiHelper.ts
@@ -7,6 +7,8 @@ import { GLOBAL } from '../../constants/Global';
 import { _map } from '../../../RN-UI-LIB/src/utlis/common';
 import { BASE_AV_APP_URL } from '../../constants/config';
 import { logError } from './errorUtils';
+import { ClickstreamAPIToMonitor, CLICKSTREAM_EVENT_NAMES } from '../../common/Constants';
+import { addClickstreamEvent } from '../../services/clickstreamEventService';
 
 const MOCK_DIR = '__mocks__';
 
@@ -23,10 +25,11 @@ export enum ApiKeys {
     LOGOUT,
     FEEDBACK,
     FILTERS,
-    IMAGE_SIGNED_URLS,
+    JANUS,
+    IMAGE_SIGNED_URLS
 }
 
-const API_URLS: Record<ApiKeys, string> = {} as Record<ApiKeys, string>;
+export const API_URLS: Record<ApiKeys, string> = {} as Record<ApiKeys, string>;
 API_URLS[ApiKeys.GENERATE_OTP] = '/auth/otp/generate';
 API_URLS[ApiKeys.VERIFY_OTP] = '/auth/otp/verify';
 API_URLS[ApiKeys.ALL_CASES] = '/cases/all-cases';
@@ -35,6 +38,7 @@ API_URLS[ApiKeys.PINNED_CASES] = '/cases/pin';
 API_URLS[ApiKeys.LOGOUT] = '/auth/logout';
 API_URLS[ApiKeys.FEEDBACK] = '/cases/feedback';
 API_URLS[ApiKeys.FILTERS] = '/cases/filters';
+API_URLS[ApiKeys.JANUS] = '/events/json';
 API_URLS[ApiKeys.IMAGE_SIGNED_URLS] = '/cases/get-signed-urls';
 
 const MOCK_API_URLS: Record<ApiKeys, string> = {} as Record<ApiKeys, string>;
@@ -112,13 +116,36 @@ axiosInstance.interceptors.response.use(
             const end = Date.now();
             const milliseconds = end - Number(start);
             response.headers['request-duration'] = String(milliseconds);
+            if(response?.config?.url) {
+                const url = response?.config?.url;
+                if(ClickstreamAPIToMonitor[url]) {
+                    const eventName = ClickstreamAPIToMonitor[url] + '_SUCCESS'
+                    if(CLICKSTREAM_EVENT_NAMES[eventName]) {
+                        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES[eventName], {timeTaken: milliseconds})
+                    }
+                }
+            }
         }
         return response;
     },
     error => {
         logError(error as Error, 'From API Helper');
 
-        const { config, response } = error;
+        const {config, response} = error;
+        if (config?.headers) {
+            const start = response.config.headers['request-start-time'];
+            const end = Date.now();
+            const milliseconds = end - Number(start);
+            if(config?.url) {
+                const url = response?.config?.url;
+                if(ClickstreamAPIToMonitor[url]) {
+                    const eventName = ClickstreamAPIToMonitor[url] + '_FAILED'
+                    if(CLICKSTREAM_EVENT_NAMES[eventName]) {
+                        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES[eventName], {timeTaken: milliseconds, response})
+                    }
+                }
+            }
+        }
         if (
             !config ||
             config.retry <= 1 ||
diff --git a/src/components/utlis/commonFunctions.ts b/src/components/utlis/commonFunctions.ts
index 795421a2..9bd90e68 100644
--- a/src/components/utlis/commonFunctions.ts
+++ b/src/components/utlis/commonFunctions.ts
@@ -1,7 +1,7 @@
 import RNFetchBlob from "rn-fetch-blob";
 import { getPrefixBase64Image, MimeType } from "../../common/Constants";
-
 import { Address } from "../../screens/caseDetails/interface";
+import NetInfo from "@react-native-community/netinfo";
 
 const fs = RNFetchBlob.fs;
 
@@ -18,7 +18,7 @@ export const decideLoadingState = (textData: string): boolean => {
 };
 
 export const getCommunicationAddress = (address: Address) => {
-    if(!address) {
+    if (!address) {
         return '';
     }
     const { houseNumber, lineOne, lineTwo, locality, street, city, state, pinCode } = address;
@@ -44,4 +44,9 @@ export const getBase64FromUrl = async (imagePath: string) => {
     }
     return;
   });
-}
\ No newline at end of file
+}
+
+export const getNetInfo = async () => {
+    const netInfo = await NetInfo.fetch();
+    return netInfo;
+};
diff --git a/src/constants/Global.ts b/src/constants/Global.ts
index c690d545..bb3aa63f 100644
--- a/src/constants/Global.ts
+++ b/src/constants/Global.ts
@@ -1,9 +1,11 @@
 export const GLOBAL = {
     SESSION_TOKEN: '',
     DEVICE_ID: '',
+    AGENT_ID: '',
 };
 
-export const setGlobalUserData = (token?: string, deviceId?: string) => {
+export const setGlobalUserData = (token?: string, deviceId?: string, agentId?: string) => {
     if (token) GLOBAL.SESSION_TOKEN = token;
     if (deviceId) GLOBAL.DEVICE_ID = deviceId;
+    if (agentId) GLOBAL.AGENT_ID = agentId
 };
diff --git a/src/constants/config.js b/src/constants/config.js
index d1bc2d33..5db92d2b 100644
--- a/src/constants/config.js
+++ b/src/constants/config.js
@@ -1,2 +1,3 @@
 export const BASE_AV_APP_URL = 'https://qa-longhorn-server.np.navi-tech.in/av';
-export const SENTRY_DSN = 'https://877396e88a2b4f78b911016c64f9121a@glitchtip.cmd.navi-tech.in/155';
\ No newline at end of file
+export const SENTRY_DSN = 'https://877396e88a2b4f78b911016c64f9121a@glitchtip.cmd.navi-tech.in/155';
+export const JANUS_SERVICE_URL = 'https://dev-longhorn-portal.np.navi-tech.in/api/events/json';
\ No newline at end of file
diff --git a/src/hooks/janusApi.ts b/src/hooks/janusApi.ts
new file mode 100644
index 00000000..8ae51d88
--- /dev/null
+++ b/src/hooks/janusApi.ts
@@ -0,0 +1,24 @@
+import axiosInstance, { ApiKeys, getApiUrl } from "../components/utlis/apiHelper";
+import { updateSingleCase, updateCaseDetailBeforeApiCall } from "../reducer/allCasesSlice";
+import { AppDispatch } from "../store/store";
+import OfflineImageDAO from "../wmDB/dao/OfflineImageDAO";
+
+const useJanusApi = (): {
+    fireClickstreamPayload: (payload: any) => void;
+  } => {
+    const janusServiceUrl = '/events/json';
+
+    const fireClickstreamPayload = (data: any) => (dispatch: AppDispatch) => {
+        const url = getApiUrl(ApiKeys.JANUS);
+        axiosInstance
+            .post(url, {...data})
+            .then(res => {
+                // empty the events list 
+            })
+    }
+  
+    return { fireClickstreamPayload };
+  };
+  
+  export default useJanusApi;
+  
\ No newline at end of file
diff --git a/src/hooks/useIsOnline.tsx b/src/hooks/useIsOnline.tsx
index b553ddcd..19dc697b 100644
--- a/src/hooks/useIsOnline.tsx
+++ b/src/hooks/useIsOnline.tsx
@@ -1,6 +1,7 @@
 import { View, Text } from 'react-native'
 import React from 'react'
 import NetInfo from '@react-native-community/netinfo';
+import { setNetworkStatus } from '../services/clickstreamEventService';
 
 const useIsOnline = () => {
     const [isOnline, setIsOnline] = React.useState(true);
@@ -21,6 +22,7 @@ const useIsOnline = () => {
     });
     
     NetInfo.addEventListener(state => {
+      setNetworkStatus(state);
       if (isOnline !== state.isConnected) {
         setIsOnline(!!state.isConnected && !!state.isInternetReachable);
       }
diff --git a/src/hooks/useNativeButton.tsx b/src/hooks/useNativeButton.tsx
new file mode 100644
index 00000000..249e2b99
--- /dev/null
+++ b/src/hooks/useNativeButton.tsx
@@ -0,0 +1,47 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { BackHandler, AppState, AppStateStatus } from 'react-native';
+import { CLICKSTREAM_EVENT_NAMES } from '../common/Constants';
+import { addClickstreamEvent } from '../services/clickstreamEventService';
+
+const useNativeButtons = () => {
+    const appState = useRef(AppState.currentState);
+
+    const handleBackButton = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_NATIVE_BACK_PRESSED);
+        return false;
+    };
+
+    const handleAppStateChange = (nextAppState: AppStateStatus) => {
+        if (
+            appState.current.match(/inactive|background/) &&
+            nextAppState === 'active'
+        ) {
+            addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_APP_FOREGROUND);
+        }
+        if (
+            appState.current === 'active' &&
+            nextAppState.match(/inactive|background/)
+        ) {
+            addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_APP_BACKGROUND);
+        }
+        appState.current = nextAppState;
+    };
+
+    useEffect(() => {
+        const backHandler = BackHandler.addEventListener(
+            'hardwareBackPress',
+            handleBackButton,
+        );
+        const appStateSubscription = AppState.addEventListener(
+            'change',
+            handleAppStateChange,
+        );
+
+        return () => {
+            backHandler.remove();
+            appStateSubscription.remove();
+        };
+    }, []);
+};
+
+export default useNativeButtons;
diff --git a/src/reducer/allCasesSlice.ts b/src/reducer/allCasesSlice.ts
index a975d40e..ad714d80 100644
--- a/src/reducer/allCasesSlice.ts
+++ b/src/reducer/allCasesSlice.ts
@@ -1,13 +1,15 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { _map } from '../../RN-UI-LIB/src/utlis/common';
 import {
-    FirestoreUpdateTypes
+    CLICKSTREAM_EVENT_NAMES,
+    FirestoreUpdateTypes,
 } from '../common/Constants';
 import { updateRecordsOnCustomerDbFromCaseList } from '../components/utlis/customerDbHelper';
 import { getCurrentScreen, navigateToScreen } from '../components/utlis/navigationUtlis';
 import { CaseUpdates } from '../hooks/useFirestoreUpdates';
 import { CurrentTask, ICaseItem, IFilter } from '../screens/allCases/interface';
 import { CaseDetail } from '../screens/caseDetails/interface';
+import { addClickstreamEvent } from '../services/clickstreamEventService';
 
 export type ICasesMap = { [key: string]: ICaseItem };
 
@@ -106,7 +108,7 @@ const allCasesSlice = createSlice({
                             isApiCalled: false,
                         };
                     }
-                    
+
                     return prev;
                 }, initialValue);
                 console.log(detailsData, "detail data")
@@ -227,7 +229,7 @@ const allCasesSlice = createSlice({
                             if(caseId === id) {
                                 navigateToScreen('Home');
                             }
-                        } 
+                        }
                         if (index !== -1) {
                             state.casesList.splice(index, 1);
                         }
@@ -321,9 +323,11 @@ const allCasesSlice = createSlice({
             const caseId = action.payload.caseReferenceId;
             const isCasePresent = state.intermediateTodoListMap[caseId];
             if (isCasePresent) {
+                addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_CASE_UNSELECTED , {caseId});
                 delete state.intermediateTodoListMap[caseId];
                 state.newlyPinnedCases--;
             } else {
+                addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_CASE_SELECTED , {caseId});
                 state.pinnedRankCount++;
                 state.newlyPinnedCases++;
                 const selectedCase = { ...action.payload };
@@ -365,9 +369,11 @@ const allCasesSlice = createSlice({
             const caseId = action.payload.caseReferenceId;
             const isCasePresent = state.selectedTodoListMap[caseId];
             if (isCasePresent) {
+                addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_TODO_ITEM_UNSELECTED, {caseId})
                 delete state.selectedTodoListMap[caseId];
                 state.selectedTodoListCount--;
             } else {
+                addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_TODO_ITEM_SELECTED , {caseId})
                 state.selectedTodoListCount++;
                 const selectedCase = { ...action.payload };
                 state.selectedTodoListMap[caseId] = selectedCase;
diff --git a/src/reducer/commonSlice.ts b/src/reducer/commonSlice.ts
index 7dc9b47e..fe9dd82e 100644
--- a/src/reducer/commonSlice.ts
+++ b/src/reducer/commonSlice.ts
@@ -1,6 +1,11 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { GLOBAL, setGlobalUserData } from '../constants/Global';
 
+interface IClickstreamEvents {
+    name: string;
+    attributes?: Record<string, any>
+}
+
 export interface User {
     isLoggedIn: boolean;
     deviceId: string;
@@ -9,6 +14,7 @@ export interface User {
 
 export interface CommonState {
     userData: User;
+    clickstreamEvents: IClickstreamEvents[];
 }
 
 const initialState = {
@@ -17,6 +23,7 @@ const initialState = {
         sessionToken: GLOBAL.SESSION_TOKEN || '',
         deviceId: GLOBAL.DEVICE_ID || '',
     } as User,
+    clickstreamEvents: []
 } as CommonState;
 
 export const commonSlice = createSlice({
@@ -32,9 +39,15 @@ export const commonSlice = createSlice({
                 );
             }
         },
+        setClickstreamEvents: (state, action) => {
+            state.clickstreamEvents = [state.clickstreamEvents, ...action.payload];
+        },
+        resetClickstreamEvents: (state) => {
+            state.clickstreamEvents = [];
+        }
     },
 });
 
-export const { setAuthData } = commonSlice.actions;
+export const { setAuthData, setClickstreamEvents, resetClickstreamEvents } = commonSlice.actions;
 
 export default commonSlice.reducer;
diff --git a/src/reducer/userSlice.ts b/src/reducer/userSlice.ts
index 8e13c22c..f4238177 100644
--- a/src/reducer/userSlice.ts
+++ b/src/reducer/userSlice.ts
@@ -24,9 +24,15 @@ export interface IUser {
     user: IUserDetails | null;
 }
 
+interface IClickstreamEvents {
+    name: string;
+    attributes?: Record<string, any>
+}
+
 export interface IUserSlice extends IUser {
     isLoggedIn: boolean;
     deviceId: string;
+    clickstreamEvents: IClickstreamEvents[];
 }
 
 const initialState: IUserSlice = {
@@ -34,6 +40,7 @@ const initialState: IUserSlice = {
     deviceId: '',
     sessionDetails: null,
     user: null,
+    clickstreamEvents: [],
 };
 
 export const userSlice = createSlice({
@@ -46,14 +53,21 @@ export const userSlice = createSlice({
             state.sessionDetails = sessionDetails;
             state.isLoggedIn = isLoggedIn;
             setGlobalUserData(sessionDetails?.sessionToken);
+            setGlobalUserData(user?.referenceId)
         },
         setDeviceId: (state, action) => {
             state.deviceId = action.payload;
             setGlobalUserData('', action.payload);
         },
+        setClickstreamEvents: (state, action) => {
+            state.clickstreamEvents = [state.clickstreamEvents, ...action.payload];
+        },
+        resetClickstreamEvents: (state) => {
+            state.clickstreamEvents = [];
+        }
     },
 });
 
-export const { setAuthData, setDeviceId } = userSlice.actions;
+export const { setAuthData, setDeviceId , setClickstreamEvents , resetClickstreamEvents } = userSlice.actions;
 
 export default userSlice.reducer;
diff --git a/src/screens/Profile/index.tsx b/src/screens/Profile/index.tsx
index c3c6ce78..41a1faa9 100644
--- a/src/screens/Profile/index.tsx
+++ b/src/screens/Profile/index.tsx
@@ -1,8 +1,10 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Alert, StyleSheet, TouchableOpacity, View } from 'react-native';
 import NavigationHeader from '../../../RN-UI-LIB/src/components/NavigationHeader';
 import Text from '../../../RN-UI-LIB/src/components/Text';
 import LogoutIcon from '../../../RN-UI-LIB/src/Icons/LogoutIcon';
+import {addClickstreamEvent} from "../../services/clickstreamEventService";
+import {CLICKSTREAM_EVENT_NAMES} from "../../common/Constants";
 import { GenericStyles } from '../../../RN-UI-LIB/src/styles';
 import { logout } from '../../action/authActions';
 import { goBack } from '../../components/utlis/navigationUtlis';
@@ -12,15 +14,27 @@ import AccountDetails from './AccountDetails';
 const Profile = () => {
     const dispatch = useAppDispatch();
 
+    useEffect(() => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_PROFILE_PAGE_LOADED)
+    } , [])
+
     const handleLogout = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_PROFILE_PAGE_LOGOUT_BUTTON_CLICKED);
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_PROFILE_PAGE_LOGOUT_CONFIRMATION_OPEN);
         Alert.alert('Confirm', 'Are you sure you want to logout? ', [
             {
                 text: 'Cancel',
                 style: 'cancel',
+                onPress: () => {
+                    addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_PROFILE_PAGE_LOGOUT_CONFIRMATION_CLOSED);
+                }
             },
             {
                 text: 'Logout',
-                onPress: () => dispatch(logout()),
+                onPress: () => {
+                    addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_PROFILE_PAGE_LOGOUT_CONFIRMATION_CLICKED);
+                    dispatch(logout());
+                },
                 style: 'destructive',
             },
         ]);
diff --git a/src/screens/allCases/AllCases.tsx b/src/screens/allCases/AllCases.tsx
index 4926073e..e16f390b 100644
--- a/src/screens/allCases/AllCases.tsx
+++ b/src/screens/allCases/AllCases.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, {useEffect, useMemo} from 'react';
 import {
     Modal,
     RefreshControl,
@@ -34,6 +34,8 @@ import { getAllCases } from '../../action/dataActions';
 import { useAppDispatch } from '../../hooks';
 import NoCasesFound from './NoCasesFound';
 import useRefresh from '../../hooks/useRefresh';
+import {addClickstreamEvent} from "../../services/clickstreamEventService";
+import {CLICKSTREAM_EVENT_NAMES} from "../../common/Constants";
 import IconButton from '../../../RN-UI-LIB/src/components/IconButton';
 
 export const Separator = () => <View style={styles.separator} />;
@@ -53,6 +55,10 @@ const AllCases = () => {
     } = useSelector((state: RootState) => state.allCases);
     const dispatch = useAppDispatch();
 
+    useEffect(() => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_LOAD);
+    },[])
+
     const getPendingList = () => {
         const filteredList = casesList.filter(caseItem => {
             const details = caseDetails[caseItem.caseReferenceId];
@@ -152,6 +158,7 @@ const AllCases = () => {
         // const filterList = query.length > 0 ? Search(query , filteredList || [] , { keys: ['customerInfo.name']}).map(filteredListItem => filteredListItem.obj) : filteredList;
         // setFilteredList(filterList);
         dispatch(setSearchQuery(query));
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_SEARCH_QUERY_CHANGED, {query});
     };
     const [showFilterModal, setShowFilterModal] =
         React.useState<boolean>(false);
@@ -180,7 +187,10 @@ const AllCases = () => {
                         {/* <TouchableOpacity
                             style={[styles.filterButton]}
                             activeOpacity={0.7}
-                            onPress={() => setShowFilterModal(prev => !prev)}>
+                            onPress={() => {
+                                addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_FILTER_BUTTON_CLICKED);
+                                setShowFilterModal(prev => !prev)
+                            }}>
                             <FilterIcon />
                             {filterCount > 0 && (
                                 <View style={[styles.filterCount]}>
@@ -227,7 +237,10 @@ const AllCases = () => {
                 refreshControl={
                     <RefreshControl
                         refreshing={refreshing}
-                        onRefresh={onRefresh}
+                        onRefresh={() => {
+                            addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_PULLED_TO_REFRESH);
+                            onRefresh();
+                        }}
                     />
                 }
                 renderItem={row => (
diff --git a/src/screens/allCases/CasesActionButtons.tsx b/src/screens/allCases/CasesActionButtons.tsx
index 7f834440..829186d6 100644
--- a/src/screens/allCases/CasesActionButtons.tsx
+++ b/src/screens/allCases/CasesActionButtons.tsx
@@ -13,6 +13,8 @@ import { RootState } from '../../store/store';
 import { CaseTypes, ICaseItem } from './interface';
 import { useAppDispatch } from '../../hooks';
 import { postPinnedList } from '../../action/dataActions';
+import {addClickstreamEvent} from "../../services/clickstreamEventService";
+import {CLICKSTREAM_EVENT_NAMES} from "../../common/Constants";
 
 interface CaseActionsButtonProps {
     pendingPinnedCasesCount: number;
@@ -29,6 +31,7 @@ export const CasesActionButtons: React.FC<CaseActionsButtonProps> = ({
         casesList,
     } = useSelector((state: RootState) => state.allCases);
     const handleTodoProceedClick = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_PROCEED_BUTTON_CLICKED);
         dispatch(proceedToTodoList());
     };
 
@@ -37,6 +40,7 @@ export const CasesActionButtons: React.FC<CaseActionsButtonProps> = ({
     };
 
     const handleRemovePinnedList = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_REMOVE_BUTTON_CLICKED);
         const updatedPinnedList: ICaseItem[] = [];
         const updatedCaseList: ICaseItem[] = casesList.map(caseItem => {
             const { caseReferenceId, pinRank } = caseItem;
@@ -49,7 +53,7 @@ export const CasesActionButtons: React.FC<CaseActionsButtonProps> = ({
             return caseItem;
         });
         dispatch(resetSelectedTodoList());
-        dispatch(postPinnedList(updatedPinnedList, updatedCaseList));
+        dispatch(postPinnedList(updatedPinnedList, updatedCaseList, 'REMOVED'));
     };
 
     if (!newlyPinnedCases && !selectedTodoListCount) {
diff --git a/src/screens/allCases/ListItem.tsx b/src/screens/allCases/ListItem.tsx
index 941eafca..6e6fe511 100644
--- a/src/screens/allCases/ListItem.tsx
+++ b/src/screens/allCases/ListItem.tsx
@@ -21,6 +21,8 @@ import {
 } from './interface';
 import { COLORS } from '../../../RN-UI-LIB/src/styles/colors';
 import { getCommunicationAddress } from '../../components/utlis/commonFunctions';
+import { CLICKSTREAM_EVENT_NAMES } from '../../common/Constants';
+import { addClickstreamEvent } from '../../services/clickstreamEventService';
 
 interface IListItem {
     caseData: ICaseItem;
@@ -76,6 +78,7 @@ const ListItem: React.FC<IListItem> = props => {
 
     const handleCaseClick = () => {
         navigateToScreen('caseDetail', { caseId });
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_CASE_CLICKED, {caseId})
     };
 
     const caseSelected =
diff --git a/src/screens/allCases/index.tsx b/src/screens/allCases/index.tsx
index 0b378798..3f394c0b 100644
--- a/src/screens/allCases/index.tsx
+++ b/src/screens/allCases/index.tsx
@@ -35,6 +35,8 @@ import { RootState } from '../../store/store';
 import { initCrashlytics } from '../../components/utlis/firebaseUtils';
 import Lottie from '../../../RN-UI-LIB/src/components/lottie/Lottie';
 import Button from '../../../RN-UI-LIB/src/components/Button';
+import {addClickstreamEvent} from "../../services/clickstreamEventService";
+import {CLICKSTREAM_EVENT_NAMES} from "../../common/Constants";
 
 const LogoActions = () => {
     const {newlyPinnedCases, selectedTodoListCount} = useAppSelector(
@@ -74,7 +76,7 @@ const AllCasesMain = () => {
      const userState = useAppSelector(
         (state: RootState) => state.user,
     );
-  
+
     const completed = casesList.filter(caseData => {
         const detail = caseDetails[caseData.caseReferenceId];
         const {caseStatus} = detail;
@@ -110,6 +112,7 @@ const AllCasesMain = () => {
     }, []);
 
     const handleProfileIconPress = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_LIST_AGENT_PROFILE_CLICKED);
         navigateToScreen('Profile');
     };
 
diff --git a/src/screens/caseDetails/CaseDetails.tsx b/src/screens/caseDetails/CaseDetails.tsx
index 0c4d62d3..cc65ab36 100644
--- a/src/screens/caseDetails/CaseDetails.tsx
+++ b/src/screens/caseDetails/CaseDetails.tsx
@@ -25,6 +25,8 @@ import CallingBottomSheet from './journeyStepper/CallingBottomSheet';
 import TaskStepper from './journeyStepper/TaskStepper';
 import TaskLoader from './TaskLoader';
 import UserDetailsSection from './UserDetailsSection';
+import { addClickstreamEvent } from '../../services/clickstreamEventService';
+import { CLICKSTREAM_EVENT_NAMES } from '../../common/Constants';
 
 interface ICaseDetails {
     route: {
@@ -44,6 +46,22 @@ const CaseDetails: React.FC<ICaseDetails> = props => {
     const caseDetail = useAppSelector(
         state => state.allCases.caseDetails[caseId],
     );
+    useEffect(() => {
+        addClickstreamEvent(
+            CLICKSTREAM_EVENT_NAMES.AV_CASE_DETAILS_PAGE_LOADED,
+            {
+                caseId,
+                customerReferenceId:
+                caseDetail?.customerInfo?.customerReferenceId,
+                currentTask: caseDetail?.currentTask?.taskType,
+            },
+        );
+    }, []);
+
+    const handleRefresh = () => {
+        onRefresh();
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_DETAILS_PULL_TO_REFRESH, {caseId});
+    }
     const [showCallingBottomSheet, setShowCallingBottomSheet] =
         React.useState(false);
     const [alreadyAnmimated, setAlreadyAnmimated] =
@@ -106,7 +124,7 @@ const CaseDetails: React.FC<ICaseDetails> = props => {
                 refreshControl={
                     <RefreshControl
                         refreshing={refreshing}
-                        onRefresh={onRefresh}
+                        onRefresh={handleRefresh}
                     />
                 }>
                 <CaseDetailsHeader caseDetail={caseDetail} />
diff --git a/src/screens/caseDetails/journeyStepper/CallingBottomSheet.tsx b/src/screens/caseDetails/journeyStepper/CallingBottomSheet.tsx
index 003156dd..dd2f9cad 100644
--- a/src/screens/caseDetails/journeyStepper/CallingBottomSheet.tsx
+++ b/src/screens/caseDetails/journeyStepper/CallingBottomSheet.tsx
@@ -7,8 +7,10 @@ import {COLORS} from '../../../../RN-UI-LIB/src/styles/colors';
 import IconLabel from '../../../common/IconLabel';
 import CallViaSimIcon from '../../../assets/icons/CalViaSimIcon';
 import WhatsAppIcon from '../../../assets/icons/WhatsAppIcon';
-import React from 'react';
+import React, {useEffect} from 'react';
 import {styles} from './TaskStepper';
+import {addClickstreamEvent} from "../../../services/clickstreamEventService";
+import {CLICKSTREAM_EVENT_NAMES} from "../../../common/Constants";
 
 interface CallingBottomSheetProps {
     selectedPhoneNumber: string;
@@ -22,18 +24,33 @@ const CallingBottomSheet: React.FC<CallingBottomSheetProps> = props => {
         showCallingBottomSheet,
         setShowCallingBottomSheet,
     } = props;
+
+    useEffect(() => {
+        showCallingBottomSheet && addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CALLING_BOTTOMSHEET_LOADED);
+    },[])
+
     const callViaSim = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CALLING_BOTTOMSHEET_CALL_VIA_PHONE_CLICKED , {phoneNumber : selectedPhoneNumber});
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CALLING_BOTTOMSHEET_BEFORE_INTENT_EVENT , {url : `tel:${selectedPhoneNumber}`});
         Linking.openURL(`tel:${selectedPhoneNumber}`);
     };
     const callViaWhatsapp = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CALLING_BOTTOMSHEET_CALL_VIA_WHATSAPP_CLICKED , {phoneNumber : selectedPhoneNumber});
         const phoneNumber = selectedPhoneNumber.startsWith('+91') ?  selectedPhoneNumber : `+91${selectedPhoneNumber}` ;
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CALLING_BOTTOMSHEET_BEFORE_INTENT_EVENT , {url : `wa.me/${phoneNumber}`});
         Linking.openURL(`wa.me/${phoneNumber}`);
     };
     return (
         <BottomSheet
             heightPercentage={30}
             visible={showCallingBottomSheet}
-            setVisible={() => setShowCallingBottomSheet(prev => !prev)}>
+            setVisible={() => {
+                addClickstreamEvent(
+                    CLICKSTREAM_EVENT_NAMES.AV_CALLING_BOTTOMSHEET_CLOSE_CLICKED,
+                    {},
+                );
+                setShowCallingBottomSheet(prev => !prev);
+            }}>
             <View style={[GenericStyles.p16]}>
                 <View
                     style={[
@@ -48,9 +65,13 @@ const CallingBottomSheet: React.FC<CallingBottomSheetProps> = props => {
                     </Heading>
                     <TouchableOpacity
                         activeOpacity={0.7}
-                        onPress={() =>
-                            setShowCallingBottomSheet(prev => !prev)
-                        }>
+                        onPress={() => {
+                            addClickstreamEvent(
+                                CLICKSTREAM_EVENT_NAMES.AV_CALLING_BOTTOMSHEET_CLOSE_CLICKED,
+                                {},
+                            );
+                            setShowCallingBottomSheet(prev => !prev);
+                        }}>
                         <CloseIcon color={COLORS.TEXT.LIGHT} />
                     </TouchableOpacity>
                 </View>
diff --git a/src/screens/caseDetails/journeyStepper/TaskContent.tsx b/src/screens/caseDetails/journeyStepper/TaskContent.tsx
index 0ff740d0..8f02b24c 100644
--- a/src/screens/caseDetails/journeyStepper/TaskContent.tsx
+++ b/src/screens/caseDetails/journeyStepper/TaskContent.tsx
@@ -9,7 +9,8 @@ import { navigateToScreen } from '../../../components/utlis/navigationUtlis';
 import { getCommunicationAddress } from '../../../components/utlis/commonFunctions';
 import { useAppSelector } from '../../../hooks';
 import { _map } from '../../../../RN-UI-LIB/src/utlis/common';
-
+import { addClickstreamEvent } from '../../../services/clickstreamEventService';
+import { CLICKSTREAM_EVENT_NAMES } from '../../../common/Constants';
 
 const TaskContent = ({
     address,
@@ -23,6 +24,10 @@ const TaskContent = ({
     caseId: string;
 }) => {
     const openGeolocation = () => {
+        addClickstreamEvent(
+            CLICKSTREAM_EVENT_NAMES.AV_CASE_DETAILS_OPEN_MAPS_CLICKED,
+            { geolocationUrl, caseId },
+        );
         geolocationUrl && Linking.openURL(geolocationUrl);
     };
     const data = useAppSelector(
@@ -30,6 +35,14 @@ const TaskContent = ({
     );
     const templateData = useAppSelector(state => state.case.templateData)
     const handleAddFeedback = () => {
+        addClickstreamEvent(
+            CLICKSTREAM_EVENT_NAMES.AV_CASE_DETAILS_ADD_FEEDBACK_CLICKED,
+            {
+                journey: taskType,
+                caseId: caseId,
+                widgetId: templateData.journey[taskType].startWidget,
+            },
+        );
         if (data?.visitedWidgets?.length) {
             _map(data.visitedWidgets, visited =>
                 navigateToScreen(visited, {
diff --git a/src/screens/caseDetails/journeyStepper/TaskStepper.tsx b/src/screens/caseDetails/journeyStepper/TaskStepper.tsx
index 8f6e0861..59797547 100644
--- a/src/screens/caseDetails/journeyStepper/TaskStepper.tsx
+++ b/src/screens/caseDetails/journeyStepper/TaskStepper.tsx
@@ -9,6 +9,8 @@ import {
 import { CaseDetail } from '../interface';
 import ClosedStepperRenderer from "./ClosedStepperRenderer";
 import OpenStepperRenderer from "./OpenStepperRenderer";
+import {addClickstreamEvent} from "../../../services/clickstreamEventService";
+import {CLICKSTREAM_EVENT_NAMES} from "../../../common/Constants";
 
 
 
@@ -30,6 +32,7 @@ const TaskStepper: React.FC<ITaskStepper> = props => {
         //     return;
         // }
         // setSelectedPhoneNumber(mobileNumbers[0]);
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_CASE_DETAILS_CALL_CUSTOMER_CLICKED , {caseId: caseDetail?.id, phoneNumber: caseDetail?.customerInfo?.primaryPhoneNumber})
         setShowCallingBottomSheet(true);
     };
 
diff --git a/src/screens/login/OtpInput.tsx b/src/screens/login/OtpInput.tsx
index 8bf60e1a..098d4d4a 100644
--- a/src/screens/login/OtpInput.tsx
+++ b/src/screens/login/OtpInput.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useEffect} from 'react';
 import {Controller, useForm} from 'react-hook-form';
 import {StyleSheet} from 'react-native';
 import {SafeAreaView} from 'react-native-safe-area-context';
@@ -15,6 +15,8 @@ import {useAppDispatch} from '../../hooks';
 import {RootState} from '../../store/store';
 import {navigateToScreen} from '../../components/utlis/navigationUtlis';
 import OtpText from './OtpText';
+import {addClickstreamEvent} from "../../services/clickstreamEventService";
+import {CLICKSTREAM_EVENT_NAMES} from "../../common/Constants";
 
 interface IOtpForm {
     otp: string;
@@ -24,6 +26,7 @@ const OtpInput = () => {
     const {
         handleSubmit,
         control,
+        getValues,
         formState: {errors, isValid},
     } = useForm<IOtpForm>();
 
@@ -31,9 +34,18 @@ const OtpInput = () => {
         (state: RootState) => state.loginInfo,
     );
 
+    useEffect(() => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_OTP_SCREEN_LOAD);
+    } , []);
+
+    useEffect(() => {
+        isValid && addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_OTP_SCREEN_OTP_INPUT , {otp: getValues().otp})
+    },[isValid]);
+
     const dispatch = useAppDispatch();
 
     const handleVerifyOTP = (data: IOtpForm) => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_OTP_SCREEN_VERIFY_OTP_CLICKED)
         const payload: VerifyOTPPayload = {
             otp: data.otp,
             otpToken,
@@ -42,6 +54,7 @@ const OtpInput = () => {
     };
 
     const handleBackClick = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_OTP_SCREEN_BACK_BUTTON_CLICKED)
         navigateToScreen('Login');
     };
 
diff --git a/src/screens/login/index.tsx b/src/screens/login/index.tsx
index 7a944d84..0e4c4238 100644
--- a/src/screens/login/index.tsx
+++ b/src/screens/login/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useEffect} from 'react';
 import {Controller, useForm} from 'react-hook-form';
 import {SafeAreaView} from 'react-native-safe-area-context';
 import {useSelector} from 'react-redux';
@@ -11,6 +11,8 @@ import NaviLogoIcon from '../../../RN-UI-LIB/src/Icons/NaviLogoIcon';
 import {generateOTP, GenerateOTPPayload} from '../../action/authActions';
 import {useAppDispatch} from '../../hooks';
 import {RootState} from '../../store/store';
+import {addClickstreamEvent} from "../../services/clickstreamEventService";
+import {CLICKSTREAM_EVENT_NAMES} from "../../common/Constants";
 import { StyleSheet } from 'react-native';
 
 interface ILoginForm {
@@ -21,15 +23,25 @@ const Login = () => {
     const {
         handleSubmit,
         control,
+        getValues,
         formState: {errors, isValid},
     } = useForm<ILoginForm>();
 
+    useEffect(() => {
+        isValid && addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_LOGIN_SCREEN_NUMBER_INPUT , {phoneNumber : getValues()?.phoneNumber || ''});
+    } , [isValid]);
+
+    useEffect(() => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_LOGIN_SCREEN_LOAD);
+    } , [])
+
     const dispatch = useAppDispatch();
     const {phoneNumber, OTPError, isLoading} = useSelector(
         (state: RootState) => state.loginInfo,
     );
 
     const handleGenerateOTP = (data: GenerateOTPPayload) => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_LOGIN_SCREEN_SEND_OTP_CLICKED)
         dispatch(generateOTP(data));
     };
 
diff --git a/src/screens/todoList/TodoList.tsx b/src/screens/todoList/TodoList.tsx
index 420f4903..a5133b7e 100644
--- a/src/screens/todoList/TodoList.tsx
+++ b/src/screens/todoList/TodoList.tsx
@@ -5,7 +5,7 @@ import {
     ListRenderItemInfo,
     TouchableOpacity,
 } from 'react-native';
-import React, {useMemo} from 'react';
+import React, {useEffect, useMemo} from 'react';
 import {GenericStyles} from '../../../RN-UI-LIB/src/styles';
 import CloseIcon from '../../../RN-UI-LIB/src/Icons/CloseIcon';
 import {COLORS} from '../../../RN-UI-LIB/src/styles/colors';
@@ -25,6 +25,8 @@ import {navigateToScreen} from '../../components/utlis/navigationUtlis';
 import SwipeableContainer from '../../components/SwipeableContainer';
 import {postPinnedList} from '../../action/dataActions';
 import {useAppDispatch} from '../../hooks';
+import { addClickstreamEvent } from '../../services/clickstreamEventService';
+import { CLICKSTREAM_EVENT_NAMES } from '../../common/Constants';
 
 const TodoList = () => {
     const {
@@ -37,6 +39,10 @@ const TodoList = () => {
 
     const dispatch = useAppDispatch();
 
+    useEffect(() => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_TODO_LIST_LOAD, {caseIds: intermediateTodoList});
+    },[])
+
     const handleCreateTodoList = () => {
         const updatedPinnedList: ICaseItem[] = [];
         const updatedCaseList = casesList.map(caseItem => {
@@ -54,14 +60,17 @@ const TodoList = () => {
             (caseA, caseB) => caseA.pinRank - caseB.pinRank,
         );
         dispatch(postPinnedList(sortedPinnedList, updatedCaseList));
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_TODO_LIST_SUBMIT_CLICKED);
     };
 
     const handleCancelTodoList = () => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_TODO_LIST_BACK_CLICKED)
         dispatch(resetTodoList());
         navigateToScreen('Home');
     };
 
     const handleDeletePress = (caseData: ICaseItem) => {
+        addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.AV_TODO_LIST_CASE_DELETED, {caseId: caseData.caseReferenceId})
         dispatch(deleteIntermediateTodoListItem(caseData));
     };
 
diff --git a/src/services/clickstreamEventService.ts b/src/services/clickstreamEventService.ts
new file mode 100644
index 00000000..c430bc80
--- /dev/null
+++ b/src/services/clickstreamEventService.ts
@@ -0,0 +1,112 @@
+import React from 'react';
+import axiosInstance from '../components/utlis/apiHelper';
+import { getNetInfo } from '../components/utlis/commonFunctions';
+import { GLOBAL } from '../constants/Global';
+import ClickStreamEventsDAO, {
+    IClickstreamEvent,
+} from '../wmDB/dao/ClickStreamEventsDAO';
+import {
+    NetInfoCellularGeneration,
+    NetInfoState,
+    NetInfoStateType,
+} from '@react-native-community/netinfo';
+import { APP_NAME } from '../common/Constants';
+import { JANUS_SERVICE_URL } from '../constants/config';
+
+const MAX_BUFFER_SIZE_FOR_API = 10;
+const MAX_BUFFER_SIZE_FOR_DB_WRITE = 20;
+
+let eventsList: IClickstreamEvent[] = [];
+let bufferEventsList: IClickstreamEvent[] = [];
+
+let networkStatus: string = 'offline';
+
+export const setNetworkStatus = (state: NetInfoState) => {
+    const { isConnected, type, details } = state;
+    networkStatus = 'offline';
+    if (!isConnected) {
+        networkStatus = 'offline';
+    }
+    if (type === NetInfoStateType.cellular) {
+        networkStatus = details.cellularGeneration as NetInfoCellularGeneration;
+    } else {
+        networkStatus = type;
+    }
+};
+
+const addEvent = async (networkStatus: string) => {
+    if (eventsList.length > MAX_BUFFER_SIZE_FOR_API) {
+        if (networkStatus !== 'offline') {
+            fireClickstreamEvents();
+        } else if (eventsList.length > MAX_BUFFER_SIZE_FOR_DB_WRITE) {
+            await ClickStreamEventsDAO.addEventsBulk(eventsList);
+            eventsList = [];
+        }
+    }
+};
+
+export const addClickstreamEvent = async (
+    eventDesc: { name: string; description: string },
+    attributes: Record<string, unknown> = {},
+) => {
+    const { DEVICE_ID: deviceId, AGENT_ID: agentId } = GLOBAL;
+    const { name, description } = eventDesc;
+    const eventAttributes = { ...attributes, networkStatus };
+    eventsList.push({
+        event_name: name,
+        description,
+        deviceId,
+        agentId,
+        attributes: eventAttributes,
+        timestamp: new Date().toUTCString(),
+        networkStatus,
+    });
+    addEvent(networkStatus);
+};
+
+const getPayload = (events: IClickstreamEvent[]) => {
+    const { agentId, deviceId } = events[events.length - 1];
+    return {
+        app: { name: APP_NAME },
+        events,
+        metadata: {
+            agentId,
+            deviceId,
+        },
+    };
+};
+
+const fireClickstreamEvents = async () => {
+    const url = JANUS_SERVICE_URL;
+    bufferEventsList = [...eventsList];
+    eventsList = [];
+
+    const clickstreamEventsFromDB = await ClickStreamEventsDAO.getAllEvents();
+
+    const events = clickstreamEventsFromDB
+        .map((item: IClickstreamEvent) => {
+            const {
+                deviceId,
+                agentId,
+                event_name,
+                attributes,
+                timestamp,
+                networkStatus,
+            } = item;
+            return {
+                deviceId,
+                agentId,
+                event_name,
+                attributes,
+                timestamp,
+                networkStatus,
+            };
+        })
+        .concat(bufferEventsList);
+
+    const payload = getPayload(events);
+
+    axiosInstance
+        .post(url, payload, { headers: { donotHandleError: true } })
+        .then(() => ClickStreamEventsDAO.deleteAllEvents());
+};
diff --git a/src/wmDB/const.ts b/src/wmDB/const.ts
index 5a339e43..c13a5125 100644
--- a/src/wmDB/const.ts
+++ b/src/wmDB/const.ts
@@ -1,8 +1,9 @@
 export enum TableName {
     OFFLINE_IMAGES = 'offline_image',
-    CUSTOMER_IMAGE = 'customer_image'
+    CUSTOMER_IMAGE = 'customer_image',
+    CLICKSTREAM_EVENTS = 'clickstream_events'
 };
 
-export const DB_VERSION = 2;
+export const DB_VERSION = 4;
 
 export const DB_NAME = 'AVAPP';
diff --git a/src/wmDB/dao/ClickStreamEventsDAO.ts b/src/wmDB/dao/ClickStreamEventsDAO.ts
new file mode 100644
index 00000000..7a4e333c
--- /dev/null
+++ b/src/wmDB/dao/ClickStreamEventsDAO.ts
@@ -0,0 +1,94 @@
+import { database } from '../db';
+import { Q } from '@nozbe/watermelondb';
+import { TableName } from '../const';
+import { logError } from '../../components/utlis/errorUtils';
+
+const clickStreamEvents = database.get(TableName.CLICKSTREAM_EVENTS);
+
+export interface IClickstreamEvent {
+    event_name: string;
+    description: string;
+    timestamp: string;
+    agentId: string;
+    deviceId: string;
+    attributes?: unknown;
+    networkStatus: string;
+}
+
+export default {
+    observeOfflineImage: () => clickStreamEvents.query().observe(),
+    addEvent: async (
+        event_name: string,
+        timestamp: string,
+        description: string,
+        agentId: string,
+        deviceId: string,
+        attributes: any,
+        networkStatus: string
+    ) => {
+        try {
+            return await database.action(async () => {
+                return await clickStreamEvents.create((event: any) => {
+                    event.event_name = event_name;
+                    event.description = description;
+                    event.timestamp = timestamp;
+                    event.deviceId = deviceId;
+                    event.agentId = agentId;
+                    event.attributes = attributes;
+                    event.networkStatus = networkStatus
+                });
+            });
+        } catch (e) {
+            console.log(e);
+        }
+    },
+    addEventsBulk: async (events: Array<IClickstreamEvent>) => {
+        function prepareInsertion(events: Array<IClickstreamEvent>) {
+            return events.map(clickStreamEvent => {
+                const { event_name, deviceId, attributes, agentId, timestamp, description, networkStatus } =
+                    clickStreamEvent;
+                try {
+                    return clickStreamEvents.prepareCreate((event: any) => {
+                        event.event_name = event_name;
+                        event.description = description;
+                        event.timestamp = timestamp;
+                        event.deviceId = deviceId;
+                        event.agentId = agentId;
+                        event.attributes = attributes;
+                        event.networkStatus = networkStatus
+                    });
+                } catch (e) {
+                    logError(e as Error, 'WM DB');
+                }
+            });
+        }
+        try {
+            return await database.action(async () => {
+                const allRecords = prepareInsertion(events);
+                await database.batch(...allRecords);
+            });
+        } catch (e) {
+            logError(e as Error, 'WM DB');
+        }
+    },
+    getAllEvents: async () => {
+        try {
+            return await database.action(async () => {
+                return await clickStreamEvents.query().fetch();
+            });
+        } catch (e) {
+            console.log(e);
+            return;
+        }
+    },
+    deleteAllEvents: async () => {
+        try {
+            return await database.action(async () => {
+                await clickStreamEvents.query().destroyAllPermanently();
+            });
+        } catch (e) {
+            console.log(e);
+            return;
+        }
+    },
+};
diff --git a/src/wmDB/db.ts b/src/wmDB/db.ts
index 5002a52d..09159d73 100644
--- a/src/wmDB/db.ts
+++ b/src/wmDB/db.ts
@@ -1,6 +1,7 @@
 import { Database } from '@nozbe/watermelondb';
 import SQLiteAdapter from '@nozbe/watermelondb/adapters/sqlite';
 import { DB_NAME } from './const';
+import ClickstreamEvents from './model/ClickstreamEvents';
 import CustomerImage from './model/CustomerImage';
 import OfflineImage from './model/OfflineImage';
 
@@ -13,7 +14,7 @@ const adapter = new SQLiteAdapter({
 
 const database = new Database({
     adapter,
-    modelClasses: [OfflineImage, CustomerImage]
+    modelClasses: [OfflineImage, CustomerImage, ClickstreamEvents]
 });
 
 export { database };
diff --git a/src/wmDB/index.ts b/src/wmDB/index.ts
index 3df53f19..676f39b2 100644
--- a/src/wmDB/index.ts
+++ b/src/wmDB/index.ts
@@ -1,5 +1,6 @@
 import PostDAO from './dao/OfflineImageDAO';
 import CustomerImageDAO from './dao/CustomerImageDAO';
+import ClickstreamDAO from './dao/ClickStreamEventsDAO';
 
 export { database } from './db';
-export { PostDAO, CustomerImageDAO };
+export { PostDAO, CustomerImageDAO, ClickstreamDAO };
diff --git a/src/wmDB/model/ClickstreamEvents.ts b/src/wmDB/model/ClickstreamEvents.ts
new file mode 100644
index 00000000..d22ac410
--- /dev/null
+++ b/src/wmDB/model/ClickstreamEvents.ts
@@ -0,0 +1,17 @@
+import { Model } from '@nozbe/watermelondb';
+import { field, json } from '@nozbe/watermelondb/decorators';
+import { TableName } from '../const';
+
+const sanitizeAttributes = (json: any) => json;
+
+export default class ClickstreamEvents extends Model {
+    static table = TableName.CLICKSTREAM_EVENTS;
+
+    @field('event_name') event_name!: string;
+    @field('description') description!: string;
+    @field('agent_id') agentId!: string;
+    @field('device_id') deviceId!: string;
+    @field('network_status') networkStatus!: string;
+    @field('timestamp') timestamp!: string;
+    @json('attributes', sanitizeAttributes) attributes: any;
+}
diff --git a/src/wmDB/schema.ts b/src/wmDB/schema.ts
index 98e0a99d..ba7c752b 100644
--- a/src/wmDB/schema.ts
+++ b/src/wmDB/schema.ts
@@ -9,7 +9,7 @@ export default appSchema({
             columns: [
                 { name: 'idx', type: 'string' },
                 { name: 'image_data', type: 'string' },
-            ]
+            ],
         }),
         tableSchema({
             name: TableName.CUSTOMER_IMAGE,
@@ -17,7 +17,19 @@ export default appSchema({
                 { name: 'case_id', type: 'string' },
                 { name: 'image_url', type: 'string' },
                 { name: 'image_64', type: 'string' },
-            ]
-        })
+            ],
+        }),
+        tableSchema({
+            name: TableName.CLICKSTREAM_EVENTS,
+            columns: [
+                { name: 'event_name', type: 'string' },
+                { name: 'description', type: 'string'},
+                { name: 'agent_id', type: 'string' },
+                { name: 'device_id', type: 'string' },
+                { name: 'attributes', type: 'string' },
+                { name: 'network_status', type: 'string' },
+                { name: 'timestamp', type: 'string' },
+            ],
+        }),
     ],
-});
\ No newline at end of file
+});