From 923f2d4422564c1c7bca763391b6aab8a5da8977 Mon Sep 17 00:00:00 2001 From: Aman Chaturvedi Date: Thu, 19 Dec 2024 17:31:41 +0530 Subject: [PATCH] NTP-21010 | telephone address api migration (#1038) --- android/app/build.gradle | 4 +-- package.json | 4 +-- src/action/addressGeolocationAction.ts | 30 +++++++++++++++---- .../allCasesFilters/FiltersContainer.tsx | 2 +- src/screens/addNewNumber/apiHelper.ts | 11 ++++++- src/screens/addNewNumber/index.tsx | 2 ++ .../NewAddressContainer.tsx | 7 +++-- 7 files changed, 46 insertions(+), 14 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 814d3619..a2a75c42 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 = 223 -def VERSION_NAME = "2.16.0" +def VERSION_CODE = 224 +def VERSION_NAME = "2.16.1" android { namespace "com.avapp" diff --git a/package.json b/package.json index 8b817b07..93f0605f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "AV_APP", - "version": "2.16.0", - "buildNumber": "223", + "version": "2.16.1", + "buildNumber": "224", "private": true, "scripts": { "android:dev": "yarn move:dev && react-native run-android", diff --git a/src/action/addressGeolocationAction.ts b/src/action/addressGeolocationAction.ts index ee1a4166..8d79274d 100644 --- a/src/action/addressGeolocationAction.ts +++ b/src/action/addressGeolocationAction.ts @@ -41,9 +41,21 @@ export const getAddressesGeolocation = }; export const addAddress = - (payload: IAddAddressPayload, commonPayload: IAddressGeolocationPayload) => + ( + payload: IAddAddressPayload, + commonPayload: IAddressGeolocationPayload, + caseReferenceId: string, + caseBusinessVertical: string + ) => (dispatch: AppDispatch) => { - const url = getApiUrl(ApiKeys.NEW_ADDRESS); + const url = getApiUrl( + ApiKeys.NEW_ADDRESS, + {}, + { + caseReferenceId, + caseBusinessVertical, + } + ); dispatch(setLoading(true)); return axiosInstance .post(url, { ...payload, ...commonPayload }) @@ -63,15 +75,21 @@ export const addAddress = }; export const getUngroupedAddress = - (loanAccountNumber: string, caseReferenceId: string, caseBusinessVertical: string, includeFeedbacks = false) => + ( + loanAccountNumber: string, + caseReferenceId: string, + caseBusinessVertical: string, + includeFeedbacks = false + ) => (dispatch: AppDispatch) => { dispatch(setUngroupedAddressesLoading({ loanAccountNumber, isLoading: true })); const url = getApiUrl( ApiKeys.GET_UNGROUPED_ADDRESSES, - { }, - { includeFeedbacks, + {}, + { + includeFeedbacks, caseReferenceId: caseReferenceId, - caseBusinessVertical: caseBusinessVertical + caseBusinessVertical: caseBusinessVertical, } ); axiosInstance diff --git a/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx b/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx index b4dbea5b..12d74368 100644 --- a/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx +++ b/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx @@ -110,7 +110,7 @@ const FiltersContainer: React.FC = (props) => { const startCoachMark = async () => { if (onLayoutHandled.current) return; - if (userId) { + if (userId && copilot.totalStepsNumber > 0) { onLayoutHandled.current = true; showCoachMark(CoachMarkFeatures.CASE_STATUS_FILTERS, userId, serverTimestamp, copilot.start); } diff --git a/src/screens/addNewNumber/apiHelper.ts b/src/screens/addNewNumber/apiHelper.ts index b9cc83d1..b8adcb94 100644 --- a/src/screens/addNewNumber/apiHelper.ts +++ b/src/screens/addNewNumber/apiHelper.ts @@ -16,11 +16,20 @@ interface IAddNewNumberApi { } export const addNewNumberApi = ( data: IAddNewNumberApi, + caseReferenceId: string, + caseBusinessVertical: string, afterApiCallback?: GenericFunctionArgs, successCallbackFn?: GenericFunctionArgs ) => { const { tag, source, number, customerReferenceId, caseId } = data; - const url = getApiUrl(ApiKeys.TELEPHONES); + const url = getApiUrl( + ApiKeys.TELEPHONES, + {}, + { + caseReferenceId, + caseBusinessVertical, + } + ); const payload = [ { number, diff --git a/src/screens/addNewNumber/index.tsx b/src/screens/addNewNumber/index.tsx index ca71a759..32e973d9 100644 --- a/src/screens/addNewNumber/index.tsx +++ b/src/screens/addNewNumber/index.tsx @@ -77,6 +77,8 @@ const AddNewNumber: React.FC = (props) => { ...getValues(), caseId, }, + caseId, + caseBusinessVertical, () => { setLoading(false); }, diff --git a/src/screens/addressGeolocation/NewAddressContainer.tsx b/src/screens/addressGeolocation/NewAddressContainer.tsx index 8567022b..f02a3784 100644 --- a/src/screens/addressGeolocation/NewAddressContainer.tsx +++ b/src/screens/addressGeolocation/NewAddressContainer.tsx @@ -2,7 +2,7 @@ import { Dimensions, ScrollView, StyleSheet, Text, View } from 'react-native'; import React, { useEffect } from 'react'; import NavigationHeader from '../../../RN-UI-LIB/src/components/NavigationHeader'; import { goBack, navigateToScreen } from '../../components/utlis/navigationUtlis'; -import { useAppDispatch } from '../../hooks'; +import { useAppDispatch, useAppSelector } from '../../hooks'; import { COLORS } from '../../../RN-UI-LIB/src/styles/colors'; import { GenericStyles } from '../../../RN-UI-LIB/src/styles'; import { Controller, useForm } from 'react-hook-form'; @@ -75,6 +75,9 @@ const NewAddressContainer: React.FC = ({ route: routeParam const [isPinCodeFieldInteracted, setIsPinCodeFieldInteracted] = React.useState(false); const [validFields, setValidFields] = React.useState(initialValidState); const isValid = validFields.lineOne && validFields.lineTwo && validFields.pinCode; + const caseBusinessVertical = useAppSelector( + (state) => state?.allCases?.caseDetails?.[caseId]?.businessVertical + ); const handlePinCodeChange = (pinCode: string, onChange: (...event: any[]) => void) => { @@ -143,7 +146,7 @@ const NewAddressContainer: React.FC = ({ route: routeParam pinCode: getValues('pinCode'), }; - dispatch(addAddress(payload, commonPayload)) + dispatch(addAddress(payload, commonPayload, caseId, caseBusinessVertical)) .then((_) => { toast({ type: 'info',