From fe868978776cb899ac32a040090f22e02edbca25 Mon Sep 17 00:00:00 2001 From: "aishwarya.srivastava" Date: Wed, 19 Feb 2025 16:54:40 +0530 Subject: [PATCH 1/3] NTP-39327| adding address source for skip tracing --- .../addressGeolocation/AddressItem.tsx | 50 +++++++++++++++++-- .../SkipTracingAddressItem.tsx | 2 + 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/screens/addressGeolocation/AddressItem.tsx b/src/screens/addressGeolocation/AddressItem.tsx index 0b5150dd..1204c537 100644 --- a/src/screens/addressGeolocation/AddressItem.tsx +++ b/src/screens/addressGeolocation/AddressItem.tsx @@ -14,7 +14,10 @@ import { useAppDispatch, useAppSelector } from '../../hooks'; import Tag, { TagVariant } from '../../../RN-UI-LIB/src/components/Tag'; import { CaseAllocationType, TaskTitleUIMapping } from '../allCases/interface'; import { updatePreDefinedCaseFormJourney } from '../../reducer/caseReducer'; -import { getCollectionFeedbackOnAddressPreDefinedJourney, getCollectionFeedbackOnSkipTracingPreDefinedJourney } from '../../components/utlis/addressGeolocationUtils'; +import { + getCollectionFeedbackOnAddressPreDefinedJourney, + getCollectionFeedbackOnSkipTracingPreDefinedJourney, +} from '../../components/utlis/addressGeolocationUtils'; import { _map } from '../../../RN-UI-LIB/src/utlis/common'; import { getTemplateRoute, navigateToScreen } from '../../components/utlis/navigationUtlis'; import { type GenericFunctionArgs } from '../../common/GenericTypes'; @@ -42,6 +45,7 @@ interface IAddressItem { showOpenMap?: boolean; showCopy?: boolean; isSkipTracing?: boolean; + showAddressSource?: boolean; } function AddressItem({ @@ -60,6 +64,7 @@ function AddressItem({ showOpenMap = false, showCopy = true, isSkipTracing = false, + showAddressSource= false, }: IAddressItem) { const { currentGeolocationCoordinates, prefilledAddressScreenTemplate } = useAppSelector( (state) => ({ @@ -243,7 +248,33 @@ function AddressItem({ {sanitizeString(addressItem?.addressText)} - + {showAddressSource ? ( + + + {dayjs(addressItem?.createdAt).format('DD MMM, YYYY')} + + + + {addressItem?.secondarySource} + + + ) : null} {showActionButtons ? ( {showOpenMap ? ( @@ -257,8 +288,7 @@ function AddressItem({ Open map - ) : null - } + ) : null} {showCopy ? ( Copy - ): null} + ) : null} { }); } }; + const showAddressSource = !!(skipTracingAddress?.secondarySource && skipTracingAddress?.createdAt); return ( { showOpenMap={true} showCopy={false} isSkipTracing={true} + showAddressSource={showAddressSource} /> } onExpanded={(isExpanded) => { From 7fd9c698f4fd427ac1e0301141131d486f9b94cf Mon Sep 17 00:00:00 2001 From: "aishwarya.srivastava" Date: Wed, 19 Feb 2025 20:11:02 +0530 Subject: [PATCH 2/3] NTP-39327| removed inline css --- src/screens/addressGeolocation/AddressItem.tsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/screens/addressGeolocation/AddressItem.tsx b/src/screens/addressGeolocation/AddressItem.tsx index 1204c537..b444d5cd 100644 --- a/src/screens/addressGeolocation/AddressItem.tsx +++ b/src/screens/addressGeolocation/AddressItem.tsx @@ -64,7 +64,7 @@ function AddressItem({ showOpenMap = false, showCopy = true, isSkipTracing = false, - showAddressSource= false, + showAddressSource = false, }: IAddressItem) { const { currentGeolocationCoordinates, prefilledAddressScreenTemplate } = useAppSelector( (state) => ({ @@ -255,10 +255,10 @@ function AddressItem({ GenericStyles.mb2, GenericStyles.row, GenericStyles.wrap, - styles.addressSourceContainer, + styles.addressContainer, ]} > - + {dayjs(addressItem?.createdAt).format('DD MMM, YYYY')} - + {addressItem?.secondarySource} @@ -375,7 +375,7 @@ const styles = StyleSheet.create({ color: COLORS.TEXT.BLUE, opacity: 0.5, }, - addressSourceContainer: { + addressContainer: { alignItems: 'center', }, dot: { @@ -385,6 +385,10 @@ const styles = StyleSheet.create({ marginHorizontal: 8, backgroundColor: COLORS.TEXT.LIGHT, }, + addressSource: { + fontSize: 12, + fontWeight: 'bold', + }, }); export default AddressItem; From 2193105f5c997ee97cff3e075de1e362dd45b5ec Mon Sep 17 00:00:00 2001 From: "aishwarya.srivastava" Date: Thu, 20 Feb 2025 19:06:06 +0530 Subject: [PATCH 3/3] NTP-39327 | version-bump --- android/app/build.gradle | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a015a26d..39bb889b 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 = 236 -def VERSION_NAME = "2.17.3" +def VERSION_CODE = 237 +def VERSION_NAME = "2.17.4" android { namespace "com.avapp" diff --git a/package.json b/package.json index 73d93ac3..cd775009 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "AV_APP", - "version": "2.17.3", - "buildNumber": "236", + "version": "2.17.4", + "buildNumber": "237", "private": true, "scripts": { "android:dev": "yarn move:dev && react-native run-android",