Fixes

lib/screens/settings/access_settings/add_client_modal.dart

@@ -70,6 +70,11 @@ class _AddClientModalState extends State<AddClientModal> {
     Widget content() {
       return Padding(
         padding: const EdgeInsets.all(24),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Flexible(
+              child: SingleChildScrollView(
                 child: Wrap(
                   children: [
                     Row(
@@ -115,6 +120,10 @@ class _AddClientModalState extends State<AddClientModal> {
                           : AppLocalizations.of(context)!.domain,
                       ),
                     ),
+                  ],
+                ),
+              ),
+            ),
             Padding(
               padding: const EdgeInsets.only(top: 24),
               child: Row(
@@ -144,7 +153,6 @@ class _AddClientModalState extends State<AddClientModal> {
                 ],
               ),
             ),
-            if (Platform.isIOS) const SizedBox(height: 16)
           ],
         ),
       );

lib/screens/settings/dhcp/add_static_lease_modal.dart

@@ -71,7 +71,8 @@ class _AddStaticLeaseModalState extends State<AddStaticLeaseModal> {
       return Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          SingleChildScrollView(
+          Flexible(
+            child: SingleChildScrollView(
               child: Wrap(
                 children: [
                   Padding(
@@ -169,6 +170,7 @@ class _AddStaticLeaseModalState extends State<AddStaticLeaseModal> {
                 ],
               ),
             ),
+          ),
           Padding(
             padding: const EdgeInsets.all(24),
             child: Row(

lib/screens/settings/dhcp/dhcp.dart

@@ -382,6 +382,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
               }),
               dialog: false,
             ),
+            isScrollControlled: true
           );
         }
       });

lib/screens/settings/dhcp/select_interface_modal.dart

@@ -23,7 +23,8 @@ class SelectInterfaceModal extends StatelessWidget {
       return Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          SingleChildScrollView(
+          Flexible(
+            child: SingleChildScrollView(
               child: Wrap(
                 children: [
                   Row(
@@ -178,6 +179,7 @@ class SelectInterfaceModal extends StatelessWidget {
                 ],
               ),
             ),
+          ),
           Padding(
             padding: const EdgeInsets.all(20),
             child: Row(

lib/screens/settings/dns/cache_config.dart

@@ -257,7 +257,8 @@ class _CacheConfigDnsScreenState extends State<CacheConfigDnsScreen> {
                 label: Text(AppLocalizations.of(context)!.clearDnsCache),
               ),
             ],
-          )
+          ),
+          const SizedBox(height: 16)
         ],
       ),
     );

lib/screens/settings/dns/comment_modal.dart

@@ -36,7 +36,8 @@ class _CommentModalState extends State<CommentModal> {
       return Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          SingleChildScrollView(
+          Flexible(
+            child: SingleChildScrollView(
               child: Wrap(
                 children: [
                   Row(
@@ -94,6 +95,7 @@ class _CommentModalState extends State<CommentModal> {
                 ],
               ),
             ),
+          ),
           Padding(
             padding: const EdgeInsets.all(24),
             child: Row(

lib/screens/settings/dns_rewrites/add_dns_rewrite_modal.dart

@@ -56,7 +56,8 @@ class _AddDnsRewriteModalState extends State<AddDnsRewriteModal> {
       return Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          SingleChildScrollView(
+          Flexible(
+            child: SingleChildScrollView(
               child: Wrap(
                 children: [
                   Row(
@@ -126,6 +127,7 @@ class _AddDnsRewriteModalState extends State<AddDnsRewriteModal> {
                 ],
               ),
             ),
+          ),
           Padding(
             padding: const EdgeInsets.all(24),
             child: Row(