Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0

lib/views/pages/user/notifications/notifications_page.dart

@@ -1,16 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/notifications_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
-import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
-import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/pages/user/notifications/notifications_list.dart';
-import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
-import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
+
+import '../../../widgets/loaders/loading_manager.dart';
 
 class NotificationsPage extends StatefulWidget {
   static final String id = "/notifications";
@@ -33,7 +30,7 @@ class _NotificationsPageState extends State<NotificationsPage> with TickerProvid
       appBar: DefaultAppBar(title: context.translation.notifications),
       body: SafeArea(
         child: LoadingManager(
-          isLoading: _notificationsProvider.isLoading,
+          isLoading: (_notificationsProvider.isLoading ?? false) && _notificationsProvider.notifications.isEmpty,
           isFailedLoading: _notificationsProvider.notifications == null,
           stateCode: _notificationsProvider.stateCode,
           onRefresh: () async {