diff --git a/android/app/build.gradle b/android/app/build.gradle index 66e24c1c..09ada5f8 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 = 217 -def VERSION_NAME = "2.15.3" +def VERSION_CODE = 218 +def VERSION_NAME = "2.15.4" android { namespace "com.avapp" diff --git a/package.json b/package.json index fd2178a0..556a9301 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "AV_APP", - "version": "2.15.3", - "buildNumber": "217", + "version": "2.15.4", + "buildNumber": "218", "private": true, "scripts": { "android:dev": "yarn move:dev && react-native run-android", 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 070bb404..6337588d 100644 --- a/src/screens/allCases/ListItem.tsx +++ b/src/screens/allCases/ListItem.tsx @@ -24,7 +24,7 @@ import { addClickstreamEvent } from '../../services/clickstreamEventService'; import Tag, { TagVariant } from '../../../RN-UI-LIB/src/components/Tag'; import { formatAmount } from '../../../RN-UI-LIB/src/utlis/amount'; import RoundCheckIcon from '../../../RN-UI-LIB/src/Icons/RoundCheckIcon'; -import { getDocumentList } from '../../components/utlis/commonFunctions'; +import { getDocumentList, pluralise } from '../../components/utlis/commonFunctions'; import { toast } from '../../../RN-UI-LIB/src/components/toast'; import { COMPLETED_STATUSES, TABS_KEYS, TAG_CONTAINER_WIDTH, ToastMessages } from './constants'; import { VisitPlanStatus } from '../../reducer/userSlice'; @@ -85,6 +85,7 @@ const ListItem: React.FC = (props) => { totalOverdueAmount, distanceInKm, escalationData, + daysTillDeallocation } = caseListItemDetailObj; const isVisitPlanStatusLocked = useAppSelector( @@ -335,6 +336,12 @@ const ListItem: React.FC = (props) => { {' '}Bucket {dpdBucket} )} + {daysTillDeallocation && is1To30FieldAgent ? ( + + Deallocation in {daysTillDeallocation} day + {pluralise(daysTillDeallocation, '', 's')} + + ) : null} {caseInteractionStatus ? ( {caseInteractionStatus} diff --git a/src/screens/caseDetails/interface.ts b/src/screens/caseDetails/interface.ts index 595a4d7f..bd25fef7 100644 --- a/src/screens/caseDetails/interface.ts +++ b/src/screens/caseDetails/interface.ts @@ -317,6 +317,7 @@ export interface CaseDetail { unpaidDays?: number; addressStringType?: string; escalationData ?: escalationData; + daysTillDeallocation: number; } export interface recentEscalationDetails {