From 4f4893375c730f851b14fceb2c7f69adf932f14e Mon Sep 17 00:00:00 2001
From: Naresh Pratista <2141720057@student.polinema.ac.id>
Date: Wed, 6 Nov 2024 14:02:19 +0700
Subject: [PATCH] refactor: Fix the navigation after user navigate back to the
 level list

---
 .../feedback/screens/feedback_screen.dart        | 16 ++++++++--------
 .../topics/screens/topics_list_screen.dart       |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/features/learning/modules/feedback/screens/feedback_screen.dart b/lib/features/learning/modules/feedback/screens/feedback_screen.dart
index 0c1f76c..090c146 100644
--- a/lib/features/learning/modules/feedback/screens/feedback_screen.dart
+++ b/lib/features/learning/modules/feedback/screens/feedback_screen.dart
@@ -203,15 +203,15 @@ class _FeedbackScreenState extends State<FeedbackScreen> {
                 backgroundColor: Colors.transparent,
                 borderColor: AppColors.blueColor,
                 onPressed: () {
-                  Navigator.pushReplacement(
-                    context,
-                    MaterialPageRoute(
-                      builder: (context) => LevelListScreen(
-                        topicId: widget.topicId,
-                        topicTitle: widget.topicTitle,
+                  Navigator.pushAndRemoveUntil(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) => LevelListScreen(
+                          topicId: widget.topicId,
+                          topicTitle: widget.topicTitle,
+                        ),
                       ),
-                    ),
-                  );
+                      (Route<dynamic> route) => route.isFirst);
                 },
               )
             ],
diff --git a/lib/features/learning/modules/topics/screens/topics_list_screen.dart b/lib/features/learning/modules/topics/screens/topics_list_screen.dart
index 227eef5..f900231 100644
--- a/lib/features/learning/modules/topics/screens/topics_list_screen.dart
+++ b/lib/features/learning/modules/topics/screens/topics_list_screen.dart
@@ -150,7 +150,7 @@ class _TopicsListScreenState extends State<TopicsListScreen> {
                           description: topic.description,
                           isCompleted: topic.isCompleted,
                           onTap: () {
-                            Navigator.pushReplacement(
+                            Navigator.push(
                               context,
                               MaterialPageRoute(
                                 builder: (context) => LevelListScreen(