diff --git a/src/screens/Dashboard/DashBoardScreens.tsx b/src/screens/Dashboard/DashBoardScreens.tsx
index 1b449bcf..6315a7a8 100644
--- a/src/screens/Dashboard/DashBoardScreens.tsx
+++ b/src/screens/Dashboard/DashBoardScreens.tsx
@@ -3,9 +3,9 @@ import React from 'react';
import Dashboard from '.';
import { SCREEN_ANIMATION_DURATION } from '../../common/Constants';
import { useAppSelector } from '../../hooks';
-import CasesList from '../allCases/CasesList';
import { PageRouteEnum } from '../auth/ProtectedRouter';
import CashCollected from '../cashCollected';
+import FilteredCases from '../filteredCases';
const Stack = createNativeStackNavigator();
@@ -31,15 +31,7 @@ function DashBoardScreens() {
}}
/>
- (
-
- )}
- />
+
);
}
diff --git a/src/screens/Dashboard/utils.ts b/src/screens/Dashboard/utils.ts
index 79bd52e0..d85dd45b 100644
--- a/src/screens/Dashboard/utils.ts
+++ b/src/screens/Dashboard/utils.ts
@@ -13,7 +13,7 @@ export const getPerformanceDetailFilter = (item: CurrentAllocationStats, applyFi
return { VISIT_STATUS: { false: true } };
case CurrentAllocationStats.NON_CONTACTABLE:
- return { CONTACTABILITY: { false: true } };
+ return { CONTACTABILITY: { true: true } };
case CurrentAllocationStats.NON_PTP:
return { PTP_STATUS: { false: true } };
diff --git a/src/screens/allCases/CaseItem.tsx b/src/screens/allCases/CaseItem.tsx
index 18103c07..ed2a0d1b 100644
--- a/src/screens/allCases/CaseItem.tsx
+++ b/src/screens/allCases/CaseItem.tsx
@@ -14,6 +14,7 @@ interface ICaseItemProps extends ViewProps {
isCompleted?: boolean;
isTodoItem?: boolean;
shouldBatchAvatar?: boolean;
+ isAgentDashboard?: boolean;
}
const CaseItem: React.FC = ({
@@ -22,6 +23,7 @@ const CaseItem: React.FC = ({
isCompleted = false,
isTodoItem = false,
shouldBatchAvatar = false,
+ isAgentDashboard = false,
...restProps
}) => {
const { ADD_VISIT_PLAN, ATTEMPTED_CASES } = CaseTypes;
@@ -85,6 +87,7 @@ const CaseItem: React.FC = ({
shouldBatchAvatar={shouldBatchAvatar}
isCompleted={isCompleted}
isTodoItem={isTodoItem}
+ isAgentDashboard={isAgentDashboard}
/>
);
diff --git a/src/screens/allCases/CasesList.tsx b/src/screens/allCases/CasesList.tsx
index 0356c228..a02a8b54 100644
--- a/src/screens/allCases/CasesList.tsx
+++ b/src/screens/allCases/CasesList.tsx
@@ -271,6 +271,7 @@ const CasesList: React.FC = ({ casesList = [], isVisitPlan, isAgentD
caseDetailObj={caseItemDetailObj}
shouldBatchAvatar={true}
testID={`case-${type === CaseTypes.TODO ? 'todo' : ''}-${row.index}`}
+ isAgentDashboard={isAgentDashboard}
/>
);
};
diff --git a/src/screens/allCases/ListItem.tsx b/src/screens/allCases/ListItem.tsx
index d31a2afb..a39e8e3c 100644
--- a/src/screens/allCases/ListItem.tsx
+++ b/src/screens/allCases/ListItem.tsx
@@ -39,6 +39,7 @@ interface IListItem {
isTodoItem?: boolean;
isCompleted?: boolean;
shouldBatchAvatar?: boolean;
+ isAgentDashboard?: boolean;
}
const paymentStatusMapping: Record<
@@ -55,7 +56,8 @@ const paymentStatusMapping: Record<
};
const ListItem: React.FC = (props) => {
- const { caseListItemDetailObj, isCompleted, isTodoItem, shouldBatchAvatar } = props;
+ const { caseListItemDetailObj, isCompleted, isTodoItem, shouldBatchAvatar, isAgentDashboard } =
+ props;
const {
id: caseId,
isIntermediateOrSelectedTodoCaseItem,
@@ -79,10 +81,6 @@ const ListItem: React.FC = (props) => {
const dispatch = useAppDispatch();
- if (!isCompleted && caseStatus === CaseStatuses.CLOSED) {
- return null;
- }
-
useEffect(() => {
if (isNewlyAdded) {
setTimeout(() => dispatch(toggleNewlyAddedCase(caseId)), 1000);
@@ -169,6 +167,10 @@ const ListItem: React.FC = (props) => {
]
);
+ if (!isCompleted && caseStatus === CaseStatuses.CLOSED && !isAgentDashboard) {
+ return null;
+ }
+
return (
{
{sanitizeString(customerName)}
- Collected :{' '}
- = totalOverdueAmount ? styles.green : styles.red}>
- {formatAmount(Number(amountCollected.toFixed(2)), false)}
-
+ Collected : {formatAmount(Number(amountCollected?.toFixed(2)), false)}
Current outstanding :{' '}
- {formatAmount(totalOverdueAmount, false)}
+ 0 ? styles.red : styles.overdueAmountColor}>
+ {formatAmount(totalOverdueAmount, false)}
+
@@ -75,9 +74,6 @@ const styles = StyleSheet.create({
overdueAmountColor: {
color: COLORS.TEXT.BLACK,
},
- green: {
- color: COLORS.TEXT.GREEN,
- },
red: {
color: COLORS.TEXT.RED,
},
diff --git a/src/screens/filteredCases/index.tsx b/src/screens/filteredCases/index.tsx
new file mode 100644
index 00000000..77b68fcc
--- /dev/null
+++ b/src/screens/filteredCases/index.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { useAppSelector } from '../../hooks';
+import CasesList from '../allCases/CasesList';
+
+const FilteredCases = () => {
+ const { pendingList, pinnedList, completedList } = useAppSelector((state) => state.allCases);
+
+ return (
+
+ );
+};
+
+export default FilteredCases;