From 35575d7f8ad70e57007e3f0217ec8d5683418565 Mon Sep 17 00:00:00 2001
From: yashmantri <mantri.ramkishor@navi.com>
Date: Tue, 25 Feb 2025 15:51:38 +0530
Subject: [PATCH 1/2] NTP-38623 | Dialer Bug Fixes

---
 android/app/build.gradle                      |  4 +-
 .../java/com/avapp/callModule/CallModule.java |  4 +-
 buildFlavor/field/buildNumber.txt             |  2 +-
 buildFlavor/field/buildVersion.txt            |  2 +-
 buildFlavor/tele/buildNumber.txt              |  2 +-
 buildFlavor/tele/buildVersion.txt             |  2 +-
 package.json                                  |  4 +-
 src/common/Constants.ts                       |  4 ++
 src/common/DefaultDialerScreen.tsx            | 11 +++--
 src/common/TrackingComponent.tsx              | 40 +++++++++----------
 10 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index b64ac6e5..bb68ecb2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,8 +113,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 
-def VERSION_CODE = 237
-def VERSION_NAME = "2.18.0"
+def VERSION_CODE = 247
+def VERSION_NAME = "2.18.4"
 
 android {
     namespace "com.avapp"
diff --git a/android/app/src/main/java/com/avapp/callModule/CallModule.java b/android/app/src/main/java/com/avapp/callModule/CallModule.java
index cd2b0f10..818e9023 100644
--- a/android/app/src/main/java/com/avapp/callModule/CallModule.java
+++ b/android/app/src/main/java/com/avapp/callModule/CallModule.java
@@ -202,10 +202,10 @@ public class CallModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void startDialerApp() {
         Intent launchIntent = reactContext.getPackageManager().getLaunchIntentForPackage(CALLING_APP_PACKAGE);
-        launchIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         if (launchIntent != null) { 
             Log.d(TAG, "Call initiated successfully.");
+            launchIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             reactContext.startActivity(launchIntent);
         } else {
             Log.e(TAG, "No app found to handle the call.");
diff --git a/buildFlavor/field/buildNumber.txt b/buildFlavor/field/buildNumber.txt
index 06690d5e..34251f6b 100644
--- a/buildFlavor/field/buildNumber.txt
+++ b/buildFlavor/field/buildNumber.txt
@@ -1 +1 @@
-238
\ No newline at end of file
+247
\ No newline at end of file
diff --git a/buildFlavor/field/buildVersion.txt b/buildFlavor/field/buildVersion.txt
index 1c94d3d1..401b70b2 100644
--- a/buildFlavor/field/buildVersion.txt
+++ b/buildFlavor/field/buildVersion.txt
@@ -1 +1 @@
-2.18.1
\ No newline at end of file
+2.18.4
\ No newline at end of file
diff --git a/buildFlavor/tele/buildNumber.txt b/buildFlavor/tele/buildNumber.txt
index 5160788e..4d853162 100644
--- a/buildFlavor/tele/buildNumber.txt
+++ b/buildFlavor/tele/buildNumber.txt
@@ -1 +1 @@
-307
\ No newline at end of file
+308
\ No newline at end of file
diff --git a/buildFlavor/tele/buildVersion.txt b/buildFlavor/tele/buildVersion.txt
index 4bffb298..bf17ceec 100644
--- a/buildFlavor/tele/buildVersion.txt
+++ b/buildFlavor/tele/buildVersion.txt
@@ -1 +1 @@
-100.2.3
\ No newline at end of file
+100.2.4
\ No newline at end of file
diff --git a/package.json b/package.json
index 560dc634..579a53a9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "AV_APP",
-  "version": "2.18.0",
-  "buildNumber": "237",
+  "version": "2.18.4",
+  "buildNumber": "247",
   "private": true,
   "scripts": {
     "android:dev": "yarn move:dev && react-native run-android",
diff --git a/src/common/Constants.ts b/src/common/Constants.ts
index dd0c0685..3e193ef9 100644
--- a/src/common/Constants.ts
+++ b/src/common/Constants.ts
@@ -1484,6 +1484,10 @@ export const CLICKSTREAM_EVENT_NAMES = {
     name: 'FA_CALL_VIA_INHOUSE_DIALER_APP_FAILED',
     description: 'Call via inhouse dialer app failed',
   },
+  FA_DEFAULT_DIALER_BLOCKER_SCREEN_LOADED: {
+    name: 'FA_DEFAULT_DIALER_BLOCKER_SCREEN_LOADED',
+    description: 'Default dialer blocker screen loaded',
+  },
   FA_COSMOS_DEFAULT_DIALER: {
     name: 'FA_COSMOS_DEFAULT_DIALER',
     description: 'Cosmos default dialer',
diff --git a/src/common/DefaultDialerScreen.tsx b/src/common/DefaultDialerScreen.tsx
index 81a407b1..72bd7e9d 100644
--- a/src/common/DefaultDialerScreen.tsx
+++ b/src/common/DefaultDialerScreen.tsx
@@ -6,9 +6,10 @@ import NavigationHeader from '@rn-ui-lib/components/NavigationHeader';
 import Text from '@rn-ui-lib/components/Text';
 import { GenericStyles } from '@rn-ui-lib/styles';
 import Layout from '@screens/layout/Layout';
-import React from 'react';
+import { addClickstreamEvent } from '@services/clickstreamEventService';
+import React, { useEffect } from 'react';
 import { Linking, Pressable, StyleSheet, View } from 'react-native';
-
+import { CLICKSTREAM_EVENT_NAMES } from './Constants';
 
 const DefaultDialerScreen: React.FC = () => {
   const openHelpForm = () => {
@@ -17,6 +18,10 @@ const DefaultDialerScreen: React.FC = () => {
     );
   };
 
+  useEffect(() => {
+    addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_DIALER_APP_BLOCKER_SCREEN_LOADED);
+  }, []);
+
   return (
     <Layout>
       <View style={[GenericStyles.fill]}>
@@ -42,7 +47,7 @@ const DefaultDialerScreen: React.FC = () => {
         <View style={[GenericStyles.elevation10, GenericStyles.p16, GenericStyles.whiteBackground]}>
           <Button
             title="Open Cosmos dialer"
-            onPress={()=>startDialerApp()}
+            onPress={() => startDialerApp()}
             style={GenericStyles.w100}
           />
         </View>
diff --git a/src/common/TrackingComponent.tsx b/src/common/TrackingComponent.tsx
index 6004c897..6e711785 100644
--- a/src/common/TrackingComponent.tsx
+++ b/src/common/TrackingComponent.tsx
@@ -11,9 +11,7 @@ import CosmosForegroundService, {
 } from '../services/foregroundServices/foreground.service';
 import useIsOnline from '../hooks/useIsOnline';
 import { getSyncTime, sendCurrentGeolocationAndBuffer } from '../hooks/capturingApi';
-import {
-  getAppVersion,
-} from '../components/utlis/commonFunctions';
+import { getAppVersion } from '../components/utlis/commonFunctions';
 
 import { setServerTimestamp } from '../reducer/foregroundServiceSlice';
 import { logError } from '../components/utlis/errorUtils';
@@ -21,7 +19,10 @@ import { useAppDispatch, useAppSelector } from '../hooks';
 import { dataSyncService } from '../services/dataSync.service';
 import { DATA_SYNC_TIME_INTERVAL, IS_DATA_SYNC_REQUIRED } from '../constants/config';
 import useIsLocationEnabled from '../hooks/useIsLocationEnabled';
-import { MILLISECONDS_IN_A_MINUTE, MILLISECONDS_IN_A_SECOND } from '../../RN-UI-LIB/src/utlis/common';
+import {
+  MILLISECONDS_IN_A_MINUTE,
+  MILLISECONDS_IN_A_SECOND,
+} from '../../RN-UI-LIB/src/utlis/common';
 import { getConfigData } from '../action/configActions';
 import { AppStates } from '../types/appStates';
 import { StorageKeys } from '../types/storageKeys';
@@ -74,6 +75,7 @@ export enum FOREGROUND_TASKS {
   NEARBY_CASES_GEOLOCATION_CHECK = 'NEARBY_CASES_GEOLOCATION_CHECK',
   COSMOS_SYNC_WITH_LONGHORN = 'COSMOS_SYNC_WITH_LONGHORN',
   WIFI_DETAILS_SYNC = 'WIFI_DETAILS_SYNC',
+  DEFAULT_DIALER_APP = 'DEFAULT_DIALER_APP',
 }
 
 interface ITrackingComponent {
@@ -106,14 +108,14 @@ const TrackingComponent: React.FC<ITrackingComponent> = ({ children }) => {
 
   const resyncFirebase = useResyncFirebase();
 
+  const checkDefaultDialerApp = async () => {
+    const defaultDialer = await getDefaultCallingApp();
+    addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_COSMOS_DEFAULT_DIALER, {
+      defaultDialer,
+    });
+  };
+
   const handleUpdateActivity = async () => {
-    const isDialerEnabled = store?.getState()?.user?.featureFlags?.isCosmosDiallerEnabled;
-    if (isDialerEnabled) {
-      const defaultDialer = await getDefaultCallingApp();
-      addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_COSMOS_DEFAULT_DIALER, {
-        defaultDialer
-      }, true);
-    }
     const foregroundTimestamp = await getItem(StorageKeys.APP_FOREGROUND_TIMESTAMP);
     const backgroundTimestamp = await getItem(StorageKeys.APP_BACKGROUND_TIMESTAMP);
     const stateSetTimestamp = await getItem(StorageKeys.STATE_SET_TIMESTAMP);
@@ -206,14 +208,12 @@ const TrackingComponent: React.FC<ITrackingComponent> = ({ children }) => {
     }
   };
 
-
   const checkPermissions = async () => {
     const permissionsToRequest = await getPermissionsToRequest();
     const allPermissionsGranted = permissionsToRequest?.length === 0;
     return allPermissionsGranted;
   };
 
-
   const appVersion = getAppVersion();
 
   const taskSyncToLonghorn = async () => {
@@ -245,6 +245,12 @@ const TrackingComponent: React.FC<ITrackingComponent> = ({ children }) => {
       delay: ACTIVITY_TIME_WINDOW * MILLISECONDS_IN_A_MINUTE, // 10 minutes
       onLoop: true,
     },
+    {
+      taskId: FOREGROUND_TASKS.DEFAULT_DIALER_APP,
+      task: checkDefaultDialerApp,
+      delay: 5 * MILLISECONDS_IN_A_MINUTE, // 5 minutes
+      onLoop: true,
+    },
     {
       taskId: FOREGROUND_TASKS.DELETE_CACHE,
       task: deleteCache,
@@ -321,18 +327,12 @@ const TrackingComponent: React.FC<ITrackingComponent> = ({ children }) => {
   if (IS_DATA_SYNC_REQUIRED) {
     tasks.push({
       taskId: FOREGROUND_TASKS.DATA_SYNC,
-      delay:
-        isCallingApp()
-          ? 5 * MILLISECONDS_IN_A_MINUTE
-          : DATA_SYNC_TIME_INTERVAL,
+      delay: isCallingApp() ? 5 * MILLISECONDS_IN_A_MINUTE : DATA_SYNC_TIME_INTERVAL,
       task: handleDataSync,
       onLoop: true,
     });
   }
 
-
-
-
   const userActivityUpdateOnBackground = async () => {
     const foregroundTimestamp = await getItem(StorageKeys.APP_FOREGROUND_TIMESTAMP);
     const backgroundTimestamp = await getItem(StorageKeys.APP_BACKGROUND_TIMESTAMP);

From e3e91fd66fc9d177f34f39c23c304f63ce1fbed6 Mon Sep 17 00:00:00 2001
From: yashmantri <mantri.ramkishor@navi.com>
Date: Tue, 25 Feb 2025 15:52:35 +0530
Subject: [PATCH 2/2] NTP-38623 | Dialer Bug Fixes

---
 App.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/App.tsx b/App.tsx
index 7f2a32b2..87bbf834 100644
--- a/App.tsx
+++ b/App.tsx
@@ -97,7 +97,7 @@ function App() {
 
   const askForPermissions = async () => {
     const permissionsToRequest = await getPermissionsToRequest();
-    
+
     if (Platform.OS === 'android') {
       PermissionsAndroid.requestMultiple(permissionsToRequest)
         .then(async (result) => {