From 363dae0f30dfed28bc68b67390d394f44228dc88 Mon Sep 17 00:00:00 2001 From: yashmantri Date: Fri, 3 Nov 2023 18:29:48 +0530 Subject: [PATCH] TP-00000 | HotFix For App Crashes - Chunking Removed --- android/app/build.gradle | 4 +-- package.json | 2 +- .../form/services/geoLocation.service.ts | 2 +- src/hooks/useFirestoreUpdates.ts | 35 +++++++------------ .../feedback/FeedbackDetailItem.tsx | 5 +-- 5 files changed, 20 insertions(+), 28 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index deb1dd55..3d15d6de 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -133,8 +133,8 @@ def reactNativeArchitectures() { return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] } -def VERSION_CODE = 98 -def VERSION_NAME = "2.5.3" +def VERSION_CODE = 99 +def VERSION_NAME = "2.5.4" android { ndkVersion rootProject.ext.ndkVersion diff --git a/package.json b/package.json index 964ccd9b..8c62d4c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "AV_APP", - "version": "2.5.3", + "version": "2.5.4", "private": true, "scripts": { "android:dev": "yarn move:dev && react-native run-android", diff --git a/src/components/form/services/geoLocation.service.ts b/src/components/form/services/geoLocation.service.ts index cec22353..3b580e72 100644 --- a/src/components/form/services/geoLocation.service.ts +++ b/src/components/form/services/geoLocation.service.ts @@ -106,7 +106,7 @@ export class CaptureGeolocation { logError(error as any, 'Unable to get location'); reject(error); }, - { enableHighAccuracy: true, distanceFilter: 10, forceRequestLocation: true } + { enableHighAccuracy: true, distanceFilter: 50, forceRequestLocation: true } ); }); } diff --git a/src/hooks/useFirestoreUpdates.ts b/src/hooks/useFirestoreUpdates.ts index c813e952..17bb9973 100644 --- a/src/hooks/useFirestoreUpdates.ts +++ b/src/hooks/useFirestoreUpdates.ts @@ -4,7 +4,6 @@ import auth from '@react-native-firebase/auth'; import { setFeedbackFilterTemplate } from '@reducers/feedbackFiltersSlice'; import perf from '@react-native-firebase/perf'; import { InteractionManager } from 'react-native'; -import chunks from 'lodash.chunk'; import { type RootState } from '../store/store'; import { useAppDispatch, useAppSelector } from '.'; import { setLoading, updateCaseDetailsFirestore } from '../reducer/allCasesSlice'; @@ -20,9 +19,6 @@ import { setForceUninstallData } from '../reducer/metadataSlice'; import { logError } from '../components/utlis/errorUtils'; import { type GenericFunctionArgs } from '../common/GenericTypes'; - -const CASE_BATCH_SIZE = 5; - export interface CaseUpdates { updateType: string; updatedCaseDetail: CaseDetail; @@ -112,23 +108,18 @@ const useFirestoreUpdates = () => { }); const isInitialLoad = casesList.length === 0; await trace.stop(); - const casesChunks = chunks(caseUpdates, CASE_BATCH_SIZE); - casesChunks.forEach((chunk) => { - InteractionManager.runAfterInteractions(() => { - requestAnimationFrame(()=>{ - InteractionManager.runAfterInteractions(() => { - dispatch( - updateCaseDetailsFirestore({ - caseUpdates: chunk, - isInitialLoad, - isVisitPlanLocked: lockRef?.current?.visitPlanStatus === VisitPlanStatus.LOCKED, - selectedAgent - }) - ); - }); - - }) - + InteractionManager.runAfterInteractions(() => { + requestAnimationFrame(() => { + InteractionManager.runAfterInteractions(() => { + dispatch( + updateCaseDetailsFirestore({ + caseUpdates, + isInitialLoad, + isVisitPlanLocked: lockRef?.current?.visitPlanStatus === VisitPlanStatus.LOCKED, + selectedAgent, + }) + ); + }); }); }); !isInitialLoad && showCaseUpdationToast(newlyAddedCases, deletedCases); @@ -173,7 +164,7 @@ const useFirestoreUpdates = () => { snapshot: FirebaseFirestoreTypes.DocumentSnapshot ) => { const lockData = snapshot.data(); - lockData && dispatch(setLockData(lockData)); + lockData && dispatch(setLockData(lockData)); }; const handleFeedbackFilters = ( diff --git a/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx b/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx index 620163c5..d5678c35 100644 --- a/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx +++ b/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx @@ -164,9 +164,10 @@ const FeedbackDetailItem = ({ ) : null} { + onPress={(e) => { + e.stopPropagation(); throttledSendToWhatsapp.current( feedbackItem, caseDetails,