diff --git a/src/screens/allCases/constants.ts b/src/screens/allCases/constants.ts
index d9475316..819797ee 100644
--- a/src/screens/allCases/constants.ts
+++ b/src/screens/allCases/constants.ts
@@ -2,6 +2,8 @@ import { CaseTypes } from './interface';
 
 export const COMPLETED_STATUSES = ['CLOSED', 'EXPIRED', 'FORCED_CLOSE'];
 
+export const COMPLETED_COLLECTION_STATUSES = ['COMPLETED'];
+
 export const ListHeaderItems = {
     BANNER: {
         type: CaseTypes.BANNER,
diff --git a/src/screens/caseDetails/journeyStepper/OpenStepperRenderer.tsx b/src/screens/caseDetails/journeyStepper/OpenStepperRenderer.tsx
index 502107e7..d5d7a2a9 100644
--- a/src/screens/caseDetails/journeyStepper/OpenStepperRenderer.tsx
+++ b/src/screens/caseDetails/journeyStepper/OpenStepperRenderer.tsx
@@ -38,14 +38,18 @@ const OpenStepperRenderer: React.FC<OpenStepperRendererProps> = ({tasks, context
         <>
             {
                 tasks.map((task, index) => {
-                    if (currentStateMap[task.taskType] === STEPPER_STATE.CURRENT) {
+                    const isLastIndex = index === tasks.length - 1;
+                    const isCurrentTaskActive = currentStateMap[task.taskType] === STEPPER_STATE.CURRENT;
                         return (
-                            <View key={task.taskType} >
+                            <View key={task.taskType}>
                                 <StepperHeader
                                     verdict={verdictMap[task.taskType]}
-                                    currentState={currentStateMap[task.taskType]}
+                                    currentState={
+                                        currentStateMap[task.taskType]
+                                    }
                                     stepNumber={index + 1}
                                     header={TaskTitleUIMapping[task.taskType]}
+                                    isCurrentTaskActive={isCurrentTaskActive}
                                 />
                                 <StepperContent
                                     content={
@@ -56,30 +60,15 @@ const OpenStepperRenderer: React.FC<OpenStepperRendererProps> = ({tasks, context
                                             }
                                             taskType={task.taskType}
                                             caseId={caseReferenceId}
+                                            isCurrentTaskActive={
+                                                isCurrentTaskActive
+                                            }
                                         />
                                     }
-                                    isLastTask={
-                                        index === tasks.length - 1
-                                    }
+                                    isLastTask={isLastIndex}
                                 />
                             </View>
                         );
-                    }
-                    return (
-                        <View key={task.taskType} style={[index > currentTaskIndex && styles.pendingListContainer]}>
-                            <StepperHeader
-                                verdict={verdictMap[task.taskType]}
-                                stepNumber={index + 1}
-                                header={TaskTitleUIMapping[task.taskType]}
-                                currentState={currentStateMap[task.taskType]}
-                            />
-                            <StepperContent
-                                isLastTask={
-                                    index === tasks.length - 1
-                                }
-                            />
-                        </View>
-                    );
                 })
             }
         </>
diff --git a/src/screens/caseDetails/journeyStepper/StepperHeader.tsx b/src/screens/caseDetails/journeyStepper/StepperHeader.tsx
index 9cca87eb..fdc0bdb1 100644
--- a/src/screens/caseDetails/journeyStepper/StepperHeader.tsx
+++ b/src/screens/caseDetails/journeyStepper/StepperHeader.tsx
@@ -20,10 +20,11 @@ interface IStepperHeader {
     header: string;
     currentState: STEPPER_STATE;
     verdict: CONTEXT_TASK_STATUSES;
+    isCurrentTaskActive: boolean;
 }
 
 const StepperHeader: React.FC<IStepperHeader> = props => {
-    const {stepNumber, header, verdict, currentState} = props;
+    const {stepNumber, header, verdict, currentState, isCurrentTaskActive} = props;
 
     switch (currentState) {
         case STEPPER_STATE.CURRENT:
@@ -43,7 +44,7 @@ const StepperHeader: React.FC<IStepperHeader> = props => {
             );
         case STEPPER_STATE.DEFAULT:
             return (
-                <View style={[GenericStyles.row, GenericStyles.alignCenter]}>
+                <View style={[GenericStyles.row, GenericStyles.alignCenter, {opacity: isCurrentTaskActive ? 1 : 0.4}]}>
                     <View style={[GenericStyles.row, styles.stepperDefault]}>
                         <Heading type="h4">{stepNumber}</Heading>
                     </View>
@@ -69,7 +70,7 @@ const StepperHeader: React.FC<IStepperHeader> = props => {
         //     );
         case STEPPER_STATE.SYNCED:
             return (
-                <View style={[GenericStyles.row, GenericStyles.alignCenter ]}>
+                <View style={[GenericStyles.row, GenericStyles.alignCenter, {opacity: isCurrentTaskActive ? 1 : 0.4} ]}>
                     <View style={[GenericStyles.row, styles.stepperSynced]}>
                         {/*<Heading type="h3">{stepNumber}</Heading>*/}
                         <TickIcon color={COLORS.TEXT.BLUE} />
diff --git a/src/screens/caseDetails/journeyStepper/TaskContent.tsx b/src/screens/caseDetails/journeyStepper/TaskContent.tsx
index 0da088fa..d970fc63 100644
--- a/src/screens/caseDetails/journeyStepper/TaskContent.tsx
+++ b/src/screens/caseDetails/journeyStepper/TaskContent.tsx
@@ -17,11 +17,13 @@ const TaskContent = ({
     geolocationUrl,
     taskType,
     caseId,
+    isCurrentTaskActive
 }: {
     address?: any;
     geolocationUrl: string | undefined;
     taskType: TaskTitle;
     caseId: string;
+    isCurrentTaskActive: boolean;
 }) => {
     const openGeolocation = () => {
         addClickstreamEvent(
@@ -60,9 +62,9 @@ const TaskContent = ({
     };
     return (
         <View>
-            {address && <Text>{getCommunicationAddress(address)}</Text>}
-            <View style={[GenericStyles.row, GenericStyles.mt12, GenericStyles.wrap,]}>
-                {!!geolocationUrl && (
+            {address && <Text style={styles.disabled}>{getCommunicationAddress(address)}</Text>}
+            <View style={[GenericStyles.row, GenericStyles.mt12, GenericStyles.wrap]}>
+                {!!geolocationUrl ? (
                     <Button
                         style={styles.geolocationBtn}
                         variant="secondary"
@@ -71,13 +73,15 @@ const TaskContent = ({
                         leftIcon={<MapPinIcon />}
                         testID={"test_open_map"}
                     />
-                )}
-                <Button
-                    title="Add feedback"
-                    onPress={handleAddFeedback}
-                    style={styles.feedbackBtn}
-                    testID={"test_add_feedback"}
-                />
+                ) : null}
+                {isCurrentTaskActive ?
+                    <Button
+                        title="Add feedback"
+                        onPress={handleAddFeedback}
+                        style={styles.feedbackBtn}
+                        testID={"test_add_feedback"}
+                    />
+                : null }
             </View>
         </View>
     );
@@ -91,6 +95,9 @@ const styles = StyleSheet.create({
     feedbackBtn: {
         flexBasis: '50%',
     },
+    disabled: {
+        opacity: 0.4
+    }
 });
 
 export default TaskContent;