07-07-2025 By Sai Srinivas

Pubspec and Safe Area.

lib/screens/commom/transactionDetails.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:generp/Utils/app_colors.dart';
 import 'package:generp/Utils/commonWidgets.dart';
@@ -35,12 +37,14 @@ class _TransactiondetailsState extends State<Transactiondetails> {
     return Consumer<Paymentrequisitionpaymentslistprovider>(
       builder: (context, provider, child) {
         var details = provider.paymentDetails;
-        return Scaffold(
+        return SafeArea(
+          top: false,
+          bottom: Platform.isIOS?false:true,
+          child: Scaffold(
             resizeToAvoidBottomInset: true,
             appBar: appbar(context, "Details"),
             backgroundColor: AppColors.scaffold_bg_color,
-          body: SafeArea(
-            child: Container(
+            body: Container(
               margin: EdgeInsets.symmetric(vertical: 10, horizontal: 10),
               child: SingleChildScrollView(
                 child: Container(

lib/screens/crm/AppointmentDetails.dart

+import 'dart:io';
+
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -26,12 +28,14 @@ Dropdowntheme ddtheme = Dropdowntheme();
         var quotationDetails = provider.appointmentDetails;
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Appointment Details"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: SizedBox(
+              body: SizedBox(
                 child: SingleChildScrollView(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -119,7 +123,6 @@ Dropdowntheme ddtheme = Dropdowntheme();
                   ),
                 ),
               ),
-            ),
               floatingActionButton: Align(
                 alignment: Alignment.bottomCenter,
                 child: InkWell(
@@ -154,6 +157,7 @@ Dropdowntheme ddtheme = Dropdowntheme();
               floatingActionButtonLocation:
               FloatingActionButtonLocation.centerFloat,
             ),
+          ),
         );
       },
     );

lib/screens/crm/FollowUpDetails.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:provider/provider.dart';
@@ -21,12 +23,14 @@ class _FollowUpDetailsState extends State<FollowUpDetails> {
         var followupDetails = provider.followupDetails;
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Followup Details"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: SizedBox(
+              body: SizedBox(
                 child: SingleChildScrollView(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -107,9 +111,9 @@ class _FollowUpDetailsState extends State<FollowUpDetails> {
                   ),
                 ),
               ),
-            ),
 
             ),
+          ),
         );
       },
     );

lib/screens/crm/LeadDetailsByMode.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:generp/Notifiers/crmProvider/crmLeadDetailsProvider.dart';
@@ -101,6 +103,9 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> {
         }
 
         return WillPopScope(
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar2(
@@ -284,6 +289,7 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> {
                 ),
               ),
             ),
+          ),
 
           onWillPop: () {
             return onBackPressed(context);

lib/screens/crm/LeadListByMode.dart

+import 'dart:io';
+
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -85,6 +87,9 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
           onWillPop: () {
             return onBackPressed(context);
           },
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar2(
@@ -106,9 +111,7 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
                 ),
               ),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child:
-                  provider.isLoading
+              body: provider.isLoading
                   ? Center(
                     child: CircularProgressIndicator.adaptive(
                       valueColor: AlwaysStoppedAnimation<Color>(

lib/screens/crm/NearbyOpenLeads.dart

@@ -46,7 +46,7 @@ class _NearbyOpenLeadsState extends State<NearbyOpenLeads> {
         onWillPop: () => onBackPressed(context),
         child: Scaffold(
           resizeToAvoidBottomInset: true,
-          appBar: appbar2(context, "Nearby Leads (Open)",provider.resetAll,SizedBox(width: 0,)),
+          appBar: appbar2(context, "Nearby Leads (Open)",provider.resetAll,sendWidget),
           backgroundColor: AppColors.scaffold_bg_color,
           body: SafeArea(
             child: Container(
@@ -140,67 +140,7 @@ class _NearbyOpenLeadsState extends State<NearbyOpenLeads> {
                                   ),
                                 ),
                                 SizedBox(height: 15),
-                                Align(
-                                  alignment: Alignment.centerLeft,
-                                  child: Text(
-                                    'Status',
 
-                                    style: TextStyle(
-                                      fontSize: 18.0,
-                                      fontWeight: FontWeight.w500,
-                                    ),
-                                  ),
-                                ),
-                                DropdownButtonHideUnderline(
-                                  child: Row(
-                                    children: [
-                                      Expanded(
-                                        child: DropdownButton2<String>(
-                                          isExpanded: true,
-                                          hint: const Row(
-                                            children: [
-                                              Expanded(
-                                                child: Text(
-                                                  'Select Complaint Status',
-                                                  style: TextStyle(
-                                                    fontSize: 14,
-                                                  ),
-                                                  overflow: TextOverflow.ellipsis,
-                                                ),
-                                              ),
-                                            ],
-                                          ),
-                                          items: <String>[
-                                            'Active',
-                                            'Inactive',
-                                            'Suspense',
-                                          ].map(
-                                                  (value) =>
-                                                  DropdownMenuItem<String>(
-                                                    value: value,
-                                                    child: Text(
-                                                      value ?? '',
-                                                      style: const TextStyle(
-                                                        fontSize: 14,
-                                                      ),
-                                                      overflow: TextOverflow.ellipsis,
-                                                    ),
-                                                  )).toList(),
-                                          value: provider.selectedItem,
-                                          onChanged: (String? newValue) {
-                                            setState(() {
-                                              provider.selectedItem = newValue!;
-                                            });
-                                          },
-                                          buttonStyleData: ddtheme.buttonStyleData,
-                                          iconStyleData: ddtheme.iconStyleData,
-                                          menuItemStyleData: ddtheme.menuItemStyleData,
-                                          dropdownStyleData: ddtheme.dropdownStyleData,
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                ),
                                 Row(
                                   children: [
                                     Text(
@@ -222,7 +162,11 @@ class _NearbyOpenLeadsState extends State<NearbyOpenLeads> {
                                 ),
                                 InteractiveSlider(
                                   min: 1.0,
-                                  max: 100.0,
+                                  max: 50.0,
+                                  padding: EdgeInsets.symmetric(horizontal: 0,
+                                  vertical: 0),
+                                  iconSize: 0.0,
+
                                   enabled: true,
 
                                   // backgroundColor: AppColors.app_blue,
@@ -230,32 +174,32 @@ class _NearbyOpenLeadsState extends State<NearbyOpenLeads> {
                                   segmentDividerColor:Color(0xFFF6F6F8),
                                   onChanged: (value) {
                                     provider.currentValue = value;
-                                    provider.debounce(() {
-                                      provider.LoadNearbyOpenLeadsAPI(context);
-                                    }, Duration(milliseconds: 200));
-                                  },
-                                ),
-                                Slider(
-                                  value: provider.currentValue,
-                                  max: 100,
-                                  divisions: 100,
-
-                                  label: provider.currentValue.toStringAsFixed(2),
-                                  inactiveColor: Color(0xFFD7D7D7),
-                                  activeColor: AppColors.cyan_blue,
-                                  onChanged: (value) {
-                                    provider.currentValue = value;
-                                    provider.debounce(() {
-                                      provider.LoadNearbyOpenLeadsAPI(context);
-                                    }, Duration(milliseconds: 200));
+                                    // provider.debounce(() {
+                                    //   provider.LoadNearbyOpenLeadsAPI(context);
+                                    // }, Duration(milliseconds: 200));
                                   },
                                 ),
+                                // Slider(
+                                //   value: provider.currentValue,
+                                //   max: 100,
+                                //   divisions: 100,
+                                //
+                                //   label: provider.currentValue.toStringAsFixed(2),
+                                //   inactiveColor: Color(0xFFD7D7D7),
+                                //   activeColor: AppColors.cyan_blue,
+                                //   onChanged: (value) {
+                                //     provider.currentValue = value;
+                                //     provider.debounce(() {
+                                //       provider.LoadNearbyOpenLeadsAPI(context);
+                                //     }, Duration(milliseconds: 200));
+                                //   },
+                                // ),
                                 SizedBox(height: 30.0),
                                 Container(
                                   child: InkWell(
                                     onTap: () {
                                       provider.debounce(() {
-                                        provider.LoadNearbyOpenLeadsAPI(context);
+                                        provider.LoadNearbyOpenLeadsAPI(context,provider.currentValue);
                                         Navigator.pop(context);
                                       }, Duration(milliseconds: 500));
                                     },

lib/screens/crm/ProspectDetailsByMode.dart

+import 'dart:io';
+
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -166,6 +168,9 @@ class ProspectDetailsByModeState extends State<ProspectDetailsByMode> {
         var leadDetails = provider.accountDetails;
 
         return WillPopScope(
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar2(
@@ -335,6 +340,7 @@ class ProspectDetailsByModeState extends State<ProspectDetailsByMode> {
                 ),
               ),
             ),
+          ),
 
           onWillPop: () {
             return onBackPressed(context);

lib/screens/crm/ProspectListByMode.dart

+import 'dart:io';
+
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -48,6 +50,9 @@ class _ProspectListByModeState extends State<ProspectListByMode> {
           onWillPop: () {
             return onBackPressed(context);
           },
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
                 resizeToAvoidBottomInset: true,
                 appBar: appbar2(
@@ -69,9 +74,7 @@ class _ProspectListByModeState extends State<ProspectListByMode> {
                   ),
                 ),
                 backgroundColor: AppColors.scaffold_bg_color,
-              body: SafeArea(
-                child:
-                provider.isLoading
+                body: provider.isLoading
                     ? Center(
                   child: CircularProgressIndicator.adaptive(
                     valueColor: AlwaysStoppedAnimation<Color>(
@@ -259,7 +262,8 @@ class _ProspectListByModeState extends State<ProspectListByMode> {
                   ),
                 )
                     :
-                Emptywidget(context),)
+                Emptywidget(context)
+            ),
           ),
         );
       },

lib/screens/crm/QuotationDetails.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:generp/screens/crm/generateQuotationScreen.dart';
 import 'package:provider/provider.dart';
@@ -22,12 +24,14 @@ class _QuotationDetailsState extends State<QuotationDetails> {
         var quotationDetails = provider.quotationsDetails;
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Quotation Details"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: SizedBox(
+              body: SizedBox(
                 child: SingleChildScrollView(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -118,7 +122,6 @@ class _QuotationDetailsState extends State<QuotationDetails> {
                   ),
                 ),
               ),
-            ),
               floatingActionButton: Align(
                 alignment: Alignment.bottomCenter,
                 child: InkWell(
@@ -160,6 +163,7 @@ class _QuotationDetailsState extends State<QuotationDetails> {
               floatingActionButtonLocation:
                   FloatingActionButtonLocation.centerFloat,
             ),
+          ),
         );
       },
     );

lib/screens/crm/addProspectLeads.dart

+import 'dart:io';
+
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -42,6 +44,9 @@ class _AddProspectLeadsState extends State<AddProspectLeads> {
             editProvider.resetForm();
             return true;
           },
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               backgroundColor: AppColors.white,
@@ -393,6 +398,7 @@ class _AddProspectLeadsState extends State<AddProspectLeads> {
                 ),
               ),
             ),
+          ),
         );
       },
     );

lib/screens/crm/contactDetails.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/svg.dart';
@@ -23,12 +25,14 @@ class _ContactdetailsState extends State<Contactdetails> {
         var customerDetails = provider.contactDetails;
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Contact Details"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: SizedBox(
+              body: SizedBox(
                 child: SingleChildScrollView(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -181,7 +185,6 @@ class _ContactdetailsState extends State<Contactdetails> {
                   ),
                 ),
               ),
-            ),
               floatingActionButton: Align(
                 alignment: Alignment.bottomCenter,
                 child: InkWell(
@@ -213,6 +216,7 @@ class _ContactdetailsState extends State<Contactdetails> {
               floatingActionButtonLocation:
                   FloatingActionButtonLocation.centerFloat,
             ),
+          ),
         );
       },
     );

lib/screens/crm/crmDashboard.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/svg.dart';
@@ -41,6 +43,9 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
 
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               backgroundColor: AppColors.scaffold_bg_color,
@@ -146,8 +151,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
                   ),
                 ),
               ),
-            body: SafeArea(
-              child: SingleChildScrollView(
+              body: SingleChildScrollView(
                 physics: AlwaysScrollableScrollPhysics(),
                 child: Column(
                   children: [
@@ -495,7 +499,6 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
                   ],
                 ),
               ),
-            ),
               floatingActionButtonLocation:
                   FloatingActionButtonLocation.centerFloat,
               floatingActionButton: InkResponse(
@@ -522,6 +525,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
                 ),
               ),
             ),
+          ),
         );
       },
     );

lib/screens/crm/editAccountDetails.dart

+import 'dart:io';
+
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -44,12 +46,14 @@ class _EditAccountDetailsState extends State<EditAccountDetails> {
       builder: (context, provider, child) {
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Edit Account"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: Container(
+              body: Container(
                 padding: EdgeInsets.symmetric(horizontal: 10,vertical: 10),
                 margin: EdgeInsets.symmetric(horizontal: 10,vertical: 5),
                 decoration: BoxDecoration(
@@ -201,9 +205,9 @@ class _EditAccountDetailsState extends State<EditAccountDetails> {
                   ),
                 ),
               ),
-            ),
 
             ),
+          ),
         );
       },
     );

lib/screens/crm/editProductsList.dart

@@ -395,6 +395,8 @@
 //     );
 //   }
 // }
+import 'dart:io';
+
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -438,6 +440,9 @@ class _EditProductsListState extends State<EditProductsList> {
             editProvider.resetForm();
             return true;
           },
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               backgroundColor: AppColors.scaffold_bg_color,
@@ -645,6 +650,7 @@ class _EditProductsListState extends State<EditProductsList> {
                 ),
               ),
             ),
+          ),
         );
       },
     );

lib/screens/crm/generateQuotationScreen.dart

+import 'dart:io';
+
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -50,6 +52,9 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
             // provider.resetForm();
             return true;
           },
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               backgroundColor: AppColors.scaffold_bg_color,
@@ -533,6 +538,7 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
                 ),
               ),
             ),
+          ),
         );
       },
     );

lib/screens/crm/productDetails.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:generp/screens/crm/editProductsList.dart';
@@ -35,12 +37,14 @@ class _ProductdetailsState extends State<Productdetails> {
         var customerDetails = provider.leadProducts;
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Product Details"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: SizedBox(
+              body: SizedBox(
                 child: SingleChildScrollView(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -114,7 +118,6 @@ class _ProductdetailsState extends State<Productdetails> {
                   ),
                 ),
               ),
-            ),
               floatingActionButton: Align(
                 alignment: Alignment.bottomCenter,
                 child: InkWell(
@@ -149,6 +152,7 @@ class _ProductdetailsState extends State<Productdetails> {
               floatingActionButtonLocation:
               FloatingActionButtonLocation.centerFloat,
             ),
+          ),
         );
       },
     );

lib/screens/crm/prospectContactDetails.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/svg.dart';
@@ -23,12 +25,14 @@ class _ProspectContactDetailsState extends State<ProspectContactDetails> {
         var customerDetails = provider.contactList;
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Contact Details"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: SizedBox(
+              body: SizedBox(
                 child: SingleChildScrollView(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -181,7 +185,6 @@ class _ProspectContactDetailsState extends State<ProspectContactDetails> {
                   ),
                 ),
               ),
-            ),
               floatingActionButton: Align(
                 alignment: Alignment.bottomCenter,
                 child: InkWell(
@@ -213,6 +216,7 @@ class _ProspectContactDetailsState extends State<ProspectContactDetails> {
               floatingActionButtonLocation:
               FloatingActionButtonLocation.centerFloat,
             ),
+          ),
         );
       },
     );

lib/screens/crm/prospectLeadDetails.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:generp/Notifiers/crmProvider/crmProspectDetailsProvider.dart';
 import 'package:generp/screens/crm/LeadDetailsByMode.dart';
@@ -37,12 +39,14 @@ class _ProspectLeadDetailsState extends State<ProspectLeadDetails> {
         var customerDetails = provider.leadList;
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Lead Details"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: SizedBox(
+              body: SizedBox(
                 child: SingleChildScrollView(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -144,7 +148,6 @@ class _ProspectLeadDetailsState extends State<ProspectLeadDetails> {
                   ),
                 ),
               ),
-            ),
               floatingActionButton: Align(
                 alignment: Alignment.bottomCenter,
                 child: InkWell(
@@ -188,6 +191,7 @@ class _ProspectLeadDetailsState extends State<ProspectLeadDetails> {
               floatingActionButtonLocation:
                   FloatingActionButtonLocation.centerFloat,
             ),
+          ),
         );
       },
     );

lib/screens/crm/prospectOrderDetails.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:generp/screens/order/ordersDetailsByModes.dart';
 import 'package:provider/provider.dart';
@@ -34,12 +36,14 @@ class _ProspectOrderDetailsState extends State<ProspectOrderDetails> {
         var customerDetails = provider.ordersList;
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Order Details"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: SizedBox(
+              body: SizedBox(
                 child: SingleChildScrollView(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -166,9 +170,9 @@ class _ProspectOrderDetailsState extends State<ProspectOrderDetails> {
                   ),
                 ),
               ),
-            ),
 
             ),
+          ),
         );
       },
     );

lib/screens/crm/prospectPaymentDetails.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:generp/screens/order/paymentDetailsByMode.dart';
 import 'package:provider/provider.dart';
@@ -35,12 +37,15 @@ class _ProspectPaymentDetailsState extends State<ProspectPaymentDetails> {
         var customerDetails = provider.paymentsList;
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
+
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Payment Details"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: SizedBox(
+              body: SizedBox(
                 child: SingleChildScrollView(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,