merged with dev and access_bugs and solved conflicts

lib/pages/common/custom_dialog.dart

@@ -7,6 +7,7 @@ Future<void> showCustomDialog({
   required String message,
   String? title,
   String? iconPath,
+  Widget? widget,
   double? dialogHeight,
   double? iconHeight,
   double? iconWidth,
@@ -54,6 +55,8 @@ Future<void> showCustomDialog({
                   textAlign: TextAlign.center,
                 ),
               ),
+            if(widget!=null)
+            Expanded(child:widget)
             ],
           ),
         ),