NTP-14167 | Deallocation days added (#1020)

This commit is contained in:
Aman Singh
2024-11-26 19:03:10 +05:30
committed by GitHub
6 changed files with 23 additions and 10 deletions

View File

@@ -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"

View File

@@ -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",

View File

@@ -183,12 +183,13 @@ const FiltersContainer: React.FC<FilterContainerProps> = (props) => {
}}
>
<Text
style={[filterKey === selectedFilterKey.filterKey && styles.blueText]}
style={[filterKey === selectedFilterKey.filterKey && styles.blueText, GenericStyles.flex80]}
dark
>
{filters[filterGroupKey].filters[filterKey].displayText}
</Text>
{selectedFiltersMap[filterKey] && (
<View style={[GenericStyles.flex20, GenericStyles.alignItemsFlexEnd]}>
<View
style={[
filterKey === selectedFilterKey.filterKey
@@ -200,6 +201,7 @@ const FiltersContainer: React.FC<FilterContainerProps> = (props) => {
style={[
filterKey === selectedFilterKey.filterKey &&
GenericStyles.whiteText,
GenericStyles.lh18
]}
bold
dark
@@ -210,6 +212,7 @@ const FiltersContainer: React.FC<FilterContainerProps> = (props) => {
: 1}
</Text>
</View>
</View>
)}
</TouchableOpacity>
) : null

View File

@@ -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',
},

View File

@@ -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<IListItem> = (props) => {
totalOverdueAmount,
distanceInKm,
escalationData,
daysTillDeallocation
} = caseListItemDetailObj;
const isVisitPlanStatusLocked = useAppSelector(
@@ -335,6 +336,12 @@ const ListItem: React.FC<IListItem> = (props) => {
{' '}Bucket {dpdBucket}
</Text>
)}
{daysTillDeallocation && is1To30FieldAgent ? (
<Text small style={[styles.caseStatusText]} bold>
Deallocation in {daysTillDeallocation} day
{pluralise(daysTillDeallocation, '', 's')}
</Text>
) : null}
{caseInteractionStatus ? (
<Text small style={styles.caseStatusText} bold>
{caseInteractionStatus}

View File

@@ -317,6 +317,7 @@ export interface CaseDetail {
unpaidDays?: number;
addressStringType?: string;
escalationData ?: escalationData;
daysTillDeallocation: number;
}
export interface recentEscalationDetails {