From 5b3ba2a9f6f4aab29c317d185b5f1ef28acc5932 Mon Sep 17 00:00:00 2001 From: yashmantri Date: Tue, 26 Nov 2024 14:09:16 +0530 Subject: [PATCH] NTP-14167 | Added 1-30 check --- .../allCases/allCasesFilters/FiltersContainer.tsx | 5 ++++- .../screens/allCases/allCasesFilters/styles.ts | 10 ++++++---- src/screens/allCases/ListItem.tsx | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx b/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx index d4322f01..2c5186a0 100644 --- a/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx +++ b/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx @@ -183,12 +183,13 @@ const FiltersContainer: React.FC = (props) => { }} > {filters[filterGroupKey].filters[filterKey].displayText} {selectedFiltersMap[filterKey] && ( + = (props) => { style={[ filterKey === selectedFilterKey.filterKey && GenericStyles.whiteText, + GenericStyles.lh18 ]} bold dark @@ -210,6 +212,7 @@ const FiltersContainer: React.FC = (props) => { : 1} + )} ) : null diff --git a/src/components/screens/allCases/allCasesFilters/styles.ts b/src/components/screens/allCases/allCasesFilters/styles.ts index bc491b24..438c80af 100644 --- a/src/components/screens/allCases/allCasesFilters/styles.ts +++ b/src/components/screens/allCases/allCasesFilters/styles.ts @@ -53,15 +53,17 @@ const styles = StyleSheet.create({ backgroundColor: COLORS.BACKGROUND.SILVER, borderColor: COLORS.BORDER.PRIMARY, borderWidth: 1, - height: PixelRatio.roundToNearestPixel(25), - width: PixelRatio.roundToNearestPixel(25), + height: 20, + width: 20, borderRadius: 20, alignItems: 'center', }, filterCountSelected: { backgroundColor: COLORS.TEXT.BLUE, - height: PixelRatio.roundToNearestPixel(25), - width: PixelRatio.roundToNearestPixel(25), + borderColor: COLORS.BORDER.LIGHT_BLUE, + borderWidth: 1, + height: 20, + width: 20, borderRadius: 20, alignItems: 'center', }, diff --git a/src/screens/allCases/ListItem.tsx b/src/screens/allCases/ListItem.tsx index bc8a6eea..6337588d 100644 --- a/src/screens/allCases/ListItem.tsx +++ b/src/screens/allCases/ListItem.tsx @@ -336,7 +336,7 @@ const ListItem: React.FC = (props) => { {' '}Bucket {dpdBucket} )} - {daysTillDeallocation ? ( + {daysTillDeallocation && is1To30FieldAgent ? ( Deallocation in {daysTillDeallocation} day {pluralise(daysTillDeallocation, '', 's')}