Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge

lib/modules/cm_module/views/components/history_log_view.dart

@@ -14,7 +14,6 @@ import 'package:test_sa/modules/cm_module/service_request_detail_provider.dart';
 import 'package:test_sa/modules/cm_module/utilities/service_request_utils.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 
-
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
 import 'package:test_sa/views/widgets/requests/request_status.dart';
@@ -41,7 +40,8 @@ class HistoryLogView extends StatelessWidget {
                         endIndent: 10,
                       ),
                     ),
-                    Builder(builder: (cxt) {
+                    SafeArea(
+                      child: Builder(builder: (cxt) {
                         List<Widget> items = [];
                         String lastStatus = "";
                         DateTime? nextDate;
@@ -84,6 +84,7 @@ class HistoryLogView extends StatelessWidget {
                           child: Column(children: items),
                         );
                       }),
+                    ),
                   ],
                 ));
     });
@@ -117,7 +118,6 @@ class HistoryLogView extends StatelessWidget {
               if (object.assetVerificationType?.value == 4 && object.photoVerfication != null) ...[
                 Padding(
                   padding: EdgeInsets.symmetric(vertical: 12.toScreenWidth),
-
                   child: InteractiveViewer(child: Image.network(URLs.getFileUrl(object.photoVerfication ?? '')!, height: 143.toScreenHeight)),
                 ).onPress(() async {
                   Navigator.of(context).push(
@@ -138,7 +138,6 @@ class HistoryLogView extends StatelessWidget {
               ],
               title.bodyText(context).custom(color: AppColor.textColor(context)),
               object.timeDifference.isNotEmpty ? object.timeDifference.tinyFont(context).custom(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120) : const SizedBox(),
-
             ],
           ),
         ),

lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart

@@ -167,7 +167,7 @@ class _SelectionBottomSheetState<T extends Base> extends State<SelectionFullScre
                 }),
           ),
           8.height,
-          if (_selectedValue != null) 16.height,
+          if (_selectedValue != null)
           FooterActionButton.footerContainer(
               context: context,
               child: AppFilledButton(