diff --git a/lib/extensions/context_extension.dart b/lib/extensions/context_extension.dart
index a33130cb..8b2a4b23 100644
--- a/lib/extensions/context_extension.dart
+++ b/lib/extensions/context_extension.dart
@@ -7,6 +7,7 @@ import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/new_views/swipe_module/dialoge/confirm_dialog.dart';
 import 'package:test_sa/new_views/swipe_module/dialoge/info_dialog.dart';
 import 'package:test_sa/views/full_screen_image_viewer.dart';
+import 'package:test_sa/views/widgets/dialogs/confirm_dialog.dart';
 
 import '../controllers/providers/settings/setting_provider.dart';
 import '../l10n/app_localizations.dart';
diff --git a/lib/new_views/swipe_module/dialoge/confirm_dialog.dart b/lib/new_views/swipe_module/dialoge/confirm_dialog.dart
index 60db0c03..e7c92bec 100644
--- a/lib/new_views/swipe_module/dialoge/confirm_dialog.dart
+++ b/lib/new_views/swipe_module/dialoge/confirm_dialog.dart
@@ -1,61 +1,61 @@
-import 'package:flutter/material.dart';
-import 'package:test_sa/extensions/int_extensions.dart';
-import 'package:test_sa/extensions/text_extensions.dart';
-import 'package:test_sa/extensions/widget_extensions.dart';
-import 'package:test_sa/new_views/app_style/app_color.dart';
-import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
-
-class ConfirmDialog extends StatelessWidget {
-  final String? title;
-  final String? message;
-  final String? okTitle;
-  final VoidCallback? onTap;
-  final VoidCallback? onCloseTap;
-
-  const ConfirmDialog({Key? key, this.title, this.message, this.okTitle, this.onTap, this.onCloseTap}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Dialog(
-      backgroundColor: AppColor.background(context),
-      shape: const RoundedRectangleBorder(),
-      insetPadding: const EdgeInsets.only(left: 21, right: 21),
-      child: Padding(
-        padding: const EdgeInsets.only(left: 20, right: 20, top: 18, bottom: 28),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Expanded(
-                  child: Text(
-                    title ?? "Confirm",
-                    style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context), height: 35 / 24, letterSpacing: -0.96),
-                  ).paddingOnly(top: 16),
-                ),
-                IconButton(
-                  padding: EdgeInsets.zero,
-                  icon: const Icon(Icons.close),
-                  color: AppColor.iconColor(context),
-                  constraints: const BoxConstraints(),
-                  onPressed: () => onCloseTap ?? Navigator.pop(context),
-                  // onPressed: () => Navigator.pop(context),
-                )
-              ],
-            ),
-            message != null ? message!.heading5(context).custom(color: AppColor.textColor(context)) : const SizedBox(),
-            28.height,
-            AppFilledButton(
-              label: okTitle ?? "OK",
-              onPressed: onTap ?? () => Navigator.pop(context),
-              textColor: Colors.white,
-              //color: Ap.green,
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
+// import 'package:flutter/material.dart';
+// import 'package:test_sa/extensions/int_extensions.dart';
+// import 'package:test_sa/extensions/text_extensions.dart';
+// import 'package:test_sa/extensions/widget_extensions.dart';
+// import 'package:test_sa/new_views/app_style/app_color.dart';
+// import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
+//
+// class ConfirmDialog extends StatelessWidget {
+//   final String? title;
+//   final String? message;
+//   final String? okTitle;
+//   final VoidCallback? onTap;
+//   final VoidCallback? onCloseTap;
+//
+//   const ConfirmDialog({Key? key, this.title, this.message, this.okTitle, this.onTap, this.onCloseTap}) : super(key: key);
+//
+//   @override
+//   Widget build(BuildContext context) {
+//     return Dialog(
+//       backgroundColor: AppColor.background(context),
+//       shape: const RoundedRectangleBorder(),
+//       insetPadding: const EdgeInsets.only(left: 21, right: 21),
+//       child: Padding(
+//         padding: const EdgeInsets.only(left: 20, right: 20, top: 18, bottom: 28),
+//         child: Column(
+//           crossAxisAlignment: CrossAxisAlignment.start,
+//           mainAxisSize: MainAxisSize.min,
+//           children: [
+//             Row(
+//               crossAxisAlignment: CrossAxisAlignment.start,
+//               children: [
+//                 Expanded(
+//                   child: Text(
+//                     title ?? "Confirm",
+//                     style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context), height: 35 / 24, letterSpacing: -0.96),
+//                   ).paddingOnly(top: 16),
+//                 ),
+//                 IconButton(
+//                   padding: EdgeInsets.zero,
+//                   icon: const Icon(Icons.close),
+//                   color: AppColor.iconColor(context),
+//                   constraints: const BoxConstraints(),
+//                   onPressed: () => onCloseTap ?? Navigator.pop(context),
+//                   // onPressed: () => Navigator.pop(context),
+//                 )
+//               ],
+//             ),
+//             message != null ? message!.heading5(context).custom(color: AppColor.textColor(context)) : const SizedBox(),
+//             28.height,
+//             AppFilledButton(
+//               label: okTitle ?? "OK",
+//               onPressed: onTap ?? () => Navigator.pop(context),
+//               textColor: Colors.white,
+//               //color: Ap.green,
+//             ),
+//           ],
+//         ),
+//       ),
+//     );
+//   }
+// }
diff --git a/lib/new_views/swipe_module/utils/swipe_general_utils.dart b/lib/new_views/swipe_module/utils/swipe_general_utils.dart
index ac6c7c0f..9bace21f 100644
--- a/lib/new_views/swipe_module/utils/swipe_general_utils.dart
+++ b/lib/new_views/swipe_module/utils/swipe_general_utils.dart
@@ -29,6 +29,7 @@ import 'package:test_sa/new_views/swipe_module/enums/swipe_type.dart';
 import 'package:test_sa/new_views/swipe_module/models/swipe_model.dart';
 import 'package:test_sa/new_views/swipe_module/swipe_success_view.dart';
 import 'package:test_sa/new_views/swipe_module/utils/location_utils.dart';
+import 'package:test_sa/views/widgets/dialogs/confirm_dialog.dart';
 import 'package:test_sa/views/widgets/item_views/info_header_widget.dart';
 import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
 import 'package:test_sa/views/widgets/qr/scan_qr.dart';
diff --git a/lib/views/widgets/dialogs/confirm_dialog.dart b/lib/views/widgets/dialogs/confirm_dialog.dart
index 6d8ef764..60db0c03 100644
--- a/lib/views/widgets/dialogs/confirm_dialog.dart
+++ b/lib/views/widgets/dialogs/confirm_dialog.dart
@@ -2,21 +2,22 @@ import 'package:flutter/material.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
+import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
 
 class ConfirmDialog extends StatelessWidget {
   final String? title;
-  final String message;
+  final String? message;
   final String? okTitle;
   final VoidCallback? onTap;
   final VoidCallback? onCloseTap;
 
-  const ConfirmDialog({Key? key, this.title, required this.message, this.okTitle, this.onTap, this.onCloseTap}) : super(key: key);
+  const ConfirmDialog({Key? key, this.title, this.message, this.okTitle, this.onTap, this.onCloseTap}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return Dialog(
-      backgroundColor: Colors.white,
+      backgroundColor: AppColor.background(context),
       shape: const RoundedRectangleBorder(),
       insetPadding: const EdgeInsets.only(left: 21, right: 21),
       child: Padding(
@@ -31,21 +32,20 @@ class ConfirmDialog extends StatelessWidget {
                 Expanded(
                   child: Text(
                     title ?? "Confirm",
-                    style: const TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: Colors.black87, height: 35 / 24, letterSpacing: -0.96),
+                    style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context), height: 35 / 24, letterSpacing: -0.96),
                   ).paddingOnly(top: 16),
                 ),
                 IconButton(
                   padding: EdgeInsets.zero,
                   icon: const Icon(Icons.close),
-                  color: Colors.black87,
+                  color: AppColor.iconColor(context),
                   constraints: const BoxConstraints(),
                   onPressed: () => onCloseTap ?? Navigator.pop(context),
                   // onPressed: () => Navigator.pop(context),
                 )
               ],
             ),
-            16.height,
-            message.bodyText(context),
+            message != null ? message!.heading5(context).custom(color: AppColor.textColor(context)) : const SizedBox(),
             28.height,
             AppFilledButton(
               label: okTitle ?? "OK",