From c03d18ca26d272536dec848f0008462eabaab90c Mon Sep 17 00:00:00 2001 From: Shri Prakash Bajpai Date: Mon, 11 Mar 2024 21:15:58 +0530 Subject: [PATCH] TP-58452 | Sync issues (#735) --- android/app/build.gradle | 4 ++-- package.json | 4 ++-- src/hooks/useResyncFirebase.ts | 21 ++++++++++++--------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2ac7c6b2..c9d43c1a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -134,8 +134,8 @@ def reactNativeArchitectures() { return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] } -def VERSION_CODE = 131 -def VERSION_NAME = "2.8.2" +def VERSION_CODE = 132 +def VERSION_NAME = "2.8.3" android { ndkVersion rootProject.ext.ndkVersion diff --git a/package.json b/package.json index 51791616..cb789ecb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "AV_APP", - "version": "2.8.2", - "buildNumber": "131", + "version": "2.8.3", + "buildNumber": "132", "private": true, "scripts": { "android:dev": "yarn move:dev && react-native run-android", diff --git a/src/hooks/useResyncFirebase.ts b/src/hooks/useResyncFirebase.ts index 6a0de3a9..532bad01 100644 --- a/src/hooks/useResyncFirebase.ts +++ b/src/hooks/useResyncFirebase.ts @@ -28,12 +28,21 @@ type CasesToFetchPayload = { const useResyncFirebase = () => { const dispatch = useAppDispatch(); + const refId = store?.getState()?.user?.user?.referenceId || ''; + const selectedAgent = store?.getState()?.user?.selectedAgent; + const selectedAgentRefId = store?.getState()?.user?.selectedAgent?.referenceId || ''; + const refIdForLoggedInAndSelectedUser = + selectedAgentRefId === selectedAgentReferenceIDForMyCases ? refId : selectedAgentRefId; const _getCaseDetailsFromApi = (caseId: string) => { const getCaseDetailsFromApiUrl = getApiUrl(ApiKeys.GET_CASE_DETAILS_FROM_API, { caseId: caseId, }); - return axiosInstance.get(getCaseDetailsFromApiUrl); + return axiosInstance.get(getCaseDetailsFromApiUrl, { + params: { + allocatedAgentReferenceId: refIdForLoggedInAndSelectedUser, + }, + }); }; const updateCaseInRedux = ( @@ -74,18 +83,12 @@ const useResyncFirebase = () => { void addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_FIREBASE_RESYNC_STARTED); const getFirestoreInconsistencyUrl = getApiUrl(ApiKeys.FIRESTORE_INCONSISTENCY_INFO); const casesList = store?.getState()?.allCases?.casesList || []; - const refId = store?.getState()?.user?.user?.referenceId || ''; - const selectedAgent = store?.getState()?.user?.selectedAgent; - const selectedAgentRefId = store?.getState()?.user?.selectedAgent?.referenceId || ''; - const casesPath = `allocations/${ - selectedAgentRefId === selectedAgentReferenceIDForMyCases ? refId : selectedAgentRefId - }/cases`; + const casesPath = `allocations/${refIdForLoggedInAndSelectedUser}/cases`; const localCases = getSyncCaseIds(casesList); const casesToFetch: CasesToFetchPayload = await axiosInstance.post( getFirestoreInconsistencyUrl, { - agentId: - selectedAgentRefId === selectedAgentReferenceIDForMyCases ? refId : selectedAgentRefId, + agentId: refIdForLoggedInAndSelectedUser, cases: localCases, } );