fixing conflict

lib/views/notification/widgets/notification_all_tab.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:tm_app/view_models/notification_view_model.dart';
+import 'package:tm_app/views/notification/strings/notification_strings.dart';
 
 import 'notification_card.dart';
 
@@ -12,8 +13,17 @@ class NotificationAllTab extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final viewModel = context.watch<NotificationViewModel>();
-    final notifications =
-        viewModel.allNotificationResponse?.data ?? [];
+
+    if (viewModel.isLoadingAll &&
+        (viewModel.allNotificationResponse?.data?.isEmpty ?? true)) {
+      return const Center(child: CircularProgressIndicator());
+    }
+
+    final notifications = viewModel.allNotificationResponse?.data ?? [];
+
+    if (notifications.isEmpty) {
+      return const Center(child: Text(NotificationStrings.noNotifications));
+    }
 
     return ListView.builder(
       controller: scrollController,
@@ -28,3 +38,4 @@ class NotificationAllTab extends StatelessWidget {
     );
   }
 }
+

lib/views/notification/widgets/notification_important_tab.dart

@@ -13,22 +13,18 @@ class NotificationImportantTab extends StatelessWidget {
   Widget build(BuildContext context) {
     final viewModel = context.watch<NotificationViewModel>();
 
-    if (viewModel.isLoadingImportant) {
+    if (viewModel.isLoadingImportant &&
+        (viewModel.importantNotificationResponse?.data?.isEmpty ?? true)) {
       return const Center(child: CircularProgressIndicator());
     }
 
-    final importantFromApi = viewModel.importantNotificationResponse?.data ?? [];
-
-    final allNotifications = viewModel.allNotificationResponse?.data ?? [];
-
-    final source = importantFromApi.isNotEmpty ? importantFromApi : allNotifications;
-
-    final importantNotifications = source
-        .where((n) => (n.priority ?? '').toLowerCase() == 'important')
-        .toList();
+    final importantNotifications =
+        viewModel.importantNotificationResponse?.data ?? [];
 
     if (importantNotifications.isEmpty) {
-      return const Center(child: Text(NotificationStrings.noImportantNotifications));
+      return const Center(
+        child: Text(NotificationStrings.noImportantNotifications),
+      );
     }
 
     return ListView.builder(
@@ -38,9 +34,7 @@ class NotificationImportantTab extends StatelessWidget {
         final notification = importantNotifications[index];
         return Padding(
           padding: const EdgeInsets.only(bottom: 16.0),
-          child: NotificationCard(
-            notification: notification,
-          ),
+          child: NotificationCard(notification: notification),
         );
       },
     );

lib/views/notification/widgets/notification_unread_tab.dart

@@ -3,7 +3,6 @@ import 'package:provider/provider.dart';
 import 'package:tm_app/core/utils/size_config.dart';
 import 'package:tm_app/view_models/notification_view_model.dart';
 import 'package:tm_app/views/notification/strings/notification_strings.dart';
-
 import 'notification_card.dart';
 
 class NotificationUnreadTab extends StatelessWidget {
@@ -13,16 +12,17 @@ class NotificationUnreadTab extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final viewModel = context.watch<NotificationViewModel>();
-
-    if (viewModel.isLoadingUnread){
+    if (viewModel.isLoadingUnread &&
+        (viewModel.unreadNotificationResponse?.data?.isEmpty ?? true)) {
       return const Center(child: CircularProgressIndicator());
     }
 
-    final notifications =
-        viewModel.unreadNotificationResponse?.data ?? [];
+    final notifications = viewModel.unreadNotificationResponse?.data ?? [];
 
     if (notifications.isEmpty) {
-      return const Center(child: Text(NotificationStrings.noUnreadNotifications,));
+      return const Center(
+        child: Text(NotificationStrings.noUnreadNotifications),
+      );
     }
 
     return ListView.builder(