diff --git a/src/components/utlis/commonFunctions.ts b/src/components/utlis/commonFunctions.ts index 590eeb39..a985c1c8 100644 --- a/src/components/utlis/commonFunctions.ts +++ b/src/components/utlis/commonFunctions.ts @@ -1,3 +1,5 @@ +import { Address } from "../../screens/caseDetails/interface"; + export const decideLoadingState = (textData: string): boolean => { if (!textData) { return true; @@ -7,3 +9,11 @@ export const decideLoadingState = (textData: string): boolean => { } return false; }; + +export const getCommunicationAddress = (address: Address) => { + if(!address) { + return ''; + } + const { houseNumber, lineOne, lineTwo, locality, street, city, state, pinCode } = address; + return [houseNumber, lineOne, lineTwo, locality, street, city, state, pinCode].filter(element => element).join(', '); +} diff --git a/src/screens/allCases/ListItem.tsx b/src/screens/allCases/ListItem.tsx index 1532f6df..e6c58b9f 100644 --- a/src/screens/allCases/ListItem.tsx +++ b/src/screens/allCases/ListItem.tsx @@ -19,6 +19,7 @@ import { TaskTitleUIMapping, } from './interface'; import { COLORS } from '../../../RN-UI-LIB/src/styles/colors'; +import { getCommunicationAddress } from '../../components/utlis/commonFunctions'; interface IListItem { caseData: ICaseItem; @@ -85,19 +86,8 @@ const ListItem: React.FC = props => { const taskTitle = detail.currentTask?.taskType || detail?.currentTask?.title; - const displayAddress = address - ? address.lineOne + - ' ' + - address.lineTwo + - ' ' + - address.locality + - ' ' + - address.city + - ' ' + - address.pinCode - : poneNumber - ? poneNumber - : ''; + const communicationAddress = getCommunicationAddress(address); + const displayAddress = communicationAddress || poneNumber || ''; // @ts-ignore const caseStatus = displayStatuses[detail.caseStatus] || displayStatuses[detail.caseVerdict]; diff --git a/src/screens/caseDetails/journeyStepper/TaskContent.tsx b/src/screens/caseDetails/journeyStepper/TaskContent.tsx index 92af3f32..a96f11c6 100644 --- a/src/screens/caseDetails/journeyStepper/TaskContent.tsx +++ b/src/screens/caseDetails/journeyStepper/TaskContent.tsx @@ -6,6 +6,7 @@ import React from 'react'; import MapPinIcon from '../../../../RN-UI-LIB/src/Icons/MapPinIcon'; import {TaskTitle} from "../../allCases/interface"; import {navigateToScreen} from "../../../components/utlis/navigationUtlis"; +import { getCommunicationAddress } from '../../../components/utlis/commonFunctions'; const templateData = require('../../../data/RealTemplateData.json'); const TaskContent = ({ @@ -26,7 +27,7 @@ const TaskContent = ({ {address && ( - {`${address.houseNumber}, ${address.lineOne} , ${address.lineTwo} , ${address.locality} , ${address.street} , ${address.city} , ${address.state} - ${address.pincode}`} + {getCommunicationAddress(address)} )}