linksys · PeterJhongLinksys · Jan 9, 2026 · Jan 5, 2026 · Jan 6, 2026 · Jan 6, 2026
diff --git a/lib/main.dart b/lib/main.dart
@@ -39,7 +39,8 @@ void main() async {
   // TODO Revisit again until Flutter SDK 3.27.x
   // https://github.com/flutter/engine/commit/35af5fe80e0212caff4b34b583232d833b5a2596
   //
-  if (defaultTargetPlatform != TargetPlatform.iOS &&
+  if (!kDebugMode &&
+      defaultTargetPlatform != TargetPlatform.iOS &&
       defaultTargetPlatform != TargetPlatform.android) {
     SemanticsBinding.instance.ensureSemantics();
   }

diff --git a/lib/page/advanced_settings/apps_and_gaming/ports/views/widgets/protocol_utils.dart b/lib/page/advanced_settings/apps_and_gaming/ports/views/widgets/protocol_utils.dart
@@ -23,28 +23,27 @@ Future<String?> showSelectProtocolModal(
   String selected = value;
   return showSimpleAppDialog<String?>(context,
       title: loc(context).channel,
-      content: SingleChildScrollView(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            AppRadioList<String>(
-              selected: value,
-              itemHeight: 56,
-              items: ['TCP', 'UDP', 'Both']
-                  .map((e) => AppRadioListItem(
-                        title: getProtocolTitle(context, e),
-                        value: e,
-                      ))
-                  .toList(),
-              onChanged: (index, selectedType) {
-                if (selectedType != null) {
-                  selected = selectedType;
-                }
-              },
-            ),
-          ],
-        ),
+      scrollable: true,
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          AppRadioList<String>(
+            selected: value,
+            itemHeight: 56,
+            items: ['TCP', 'UDP', 'Both']
+                .map((e) => AppRadioListItem(
+                      title: getProtocolTitle(context, e),
+                      value: e,
+                    ))
+                .toList(),
+            onChanged: (index, selectedType) {
+              if (selectedType != null) {
+                selected = selectedType;
+              }
+            },
+          ),
+        ],
       ),
       actions: [
         AppButton.text(

diff --git a/lib/page/advanced_settings/dmz/views/dmz_settings_view.dart b/lib/page/advanced_settings/dmz/views/dmz_settings_view.dart
@@ -261,29 +261,22 @@ class _DMZSettingsViewState extends ConsumerState<DMZSettingsView> {
                           DMZDestinationType.ip
                       ? Container(
                           constraints: const BoxConstraints(maxWidth: 429),
-                          child: Focus(
-                            onFocusChange: (value) {
-                              if (!value) {
-                                _checkDestinationIPAdress();
-                              }
-                            },
-                            child: AppIpv4TextField(
-                              key: const Key('destinationIP'),
-                              controller: _destinationIPController,
-                              readOnly: SegmentReadOnly(
-                                segment1: subnetMask[0] == '255',
-                                segment2: subnetMask[1] == '255',
-                                segment3: subnetMask[2] == '255',
-                              ),
-                              onChanged: (value) {
-                                ref
-                                    .read(dmzSettingsProvider.notifier)
-                                    .setSettings(state.settings.current
-                                        .copyWith(
-                                            destinationIPAddress: () => value));
-                              },
-                              errorText: _destinationError,
+                          child: AppIpv4TextField(
+                            key: const Key('destinationIP'),
+                            controller: _destinationIPController,
+                            readOnly: SegmentReadOnly(
+                              segment0: subnetMask[0] == '255',
+                              segment1: subnetMask[1] == '255',
+                              segment2: subnetMask[2] == '255',
                             ),
+                            onChanged: (value) {
+                              ref
+                                  .read(dmzSettingsProvider.notifier)
+                                  .setSettings(state.settings.current.copyWith(
+                                      destinationIPAddress: () => value));
+                              _checkDestinationIPAdress();
+                            },
+                            errorText: _destinationError,
                           ),
                         )
                       : null,

diff --git a/lib/page/advanced_settings/firewall/views/ipv6_port_service_list_view.dart b/lib/page/advanced_settings/firewall/views/ipv6_port_service_list_view.dart
@@ -438,6 +438,7 @@ class _Ipv6PortServiceListViewState
 
     // Clear editing state
     _editingRule = null;
+    _sheetStateSetter = null; // Fix: Add button state error
     _clearControllers();
     return true;
   }

diff --git a/lib/page/advanced_settings/internet_settings/widgets/optional_settings_form.dart b/lib/page/advanced_settings/internet_settings/widgets/optional_settings_form.dart
@@ -209,20 +209,39 @@ class _OptionalSettingsFormState extends ConsumerState<OptionalSettingsForm> {
             child: Focus(
               onFocusChange: (hasFocus) {
                 if (!hasFocus) {
+                  final max = _getMaxMtu(ipv4Setting.ipv4ConnectionType);
+                  final min = _getMinMtu(ipv4Setting.ipv4ConnectionType);
+                  if (_mtuSizeController.text.isEmpty ||
+                      (int.parse(_mtuSizeController.text) < min)) {
+                    _mtuSizeController.text = min.toString();
+                    _mtuSizeController.selection = TextSelection.fromPosition(
+                      TextPosition(offset: _mtuSizeController.text.length),
+                    );
+                    notifier.updateMtu(min);
+                    return;
+                  } else if (_mtuSizeController.text.isNotEmpty &&
+                      (int.parse(_mtuSizeController.text) > max)) {
+                    _mtuSizeController.text = max.toString();
+                    _mtuSizeController.selection = TextSelection.fromPosition(
+                      TextPosition(offset: _mtuSizeController.text.length),
+                    );
+                    notifier.updateMtu(max);
+                  }
                   setState(() => _mtuSizeTouched = true);
                 }
               },
               child: AppMinMaxInput(
                 key: ValueKey('mtuManualSizeText_$isMtuAuto'),
-                value: int.tryParse(_mtuSizeController.text),
+                controller: _mtuSizeController,
                 enabled: !isMtuAuto,
                 label: loc(context).size,
-                min: 576,
+                min: _getMinMtu(ipv4Setting.ipv4ConnectionType),
                 max: _getMaxMtu(ipv4Setting.ipv4ConnectionType),
                 errorText: _mtuSizeTouched &&
                         !isMtuAuto &&
                         _isMtuInvalid(
                           _mtuSizeController.text,
+                          _getMinMtu(ipv4Setting.ipv4ConnectionType),
                           _getMaxMtu(ipv4Setting.ipv4ConnectionType),
                         )
                     ? loc(context).invalidInput
@@ -233,7 +252,6 @@ class _OptionalSettingsFormState extends ConsumerState<OptionalSettingsForm> {
                       _mtuSizeTouched = true;
                     });
                   }
-                  _mtuSizeController.text = value?.toString() ?? '';
                   notifier.updateMtu(value ?? 0);
                 },
               ),
@@ -399,9 +417,13 @@ class _OptionalSettingsFormState extends ConsumerState<OptionalSettingsForm> {
     return NetworkUtils.getMaxMtu(wanType);
   }
 
-  bool _isMtuInvalid(String text, int max) {
+  int _getMinMtu(String wanType) {
+    return NetworkUtils.getMinMtu(wanType);
+  }
+
+  bool _isMtuInvalid(String text, int min, int max) {
     final value = int.tryParse(text);
     if (value == null) return true;
-    return value < 576 || value > max;
+    return value < min || value > max;
   }
 }
diff --git a/lib/page/advanced_settings/internet_settings/widgets/wan_forms/bridge_form.dart b/lib/page/advanced_settings/internet_settings/widgets/wan_forms/bridge_form.dart
@@ -49,8 +49,9 @@ class _BridgeFormState extends BaseWanFormState<BridgeForm> {
       children: [
         buildDisplayFields(context), // Display same info as in display mode
         AppGap.md(),
+        AppGap.md(),
         AppStyledText(
-          text: '<b>${loc(context).toLogInLocallyWhileInBridgeMode}</b>',
+          text: loc(context).toLogInLocallyWhileInBridgeMode,
           key: const ValueKey('toLogInLocallyWhileInBridgeMode'),
         ),
         AppGap.sm(),

diff --git a/lib/page/advanced_settings/internet_settings/widgets/wan_forms/ipv6/automatic_ipv6_form.dart b/lib/page/advanced_settings/internet_settings/widgets/wan_forms/ipv6/automatic_ipv6_form.dart
@@ -162,25 +162,33 @@ class _AutomaticIPv6FormState extends BaseIPv6WanFormState<AutomaticIPv6Form> {
         children: [
           Padding(
             padding: inputPadding,
-            child: AppDropdown<IPv6rdTunnelMode>(
-              key: const ValueKey('ipv6TunnelDropdown'),
-              label: loc(context).sixrdTunnel,
-              value: ipv6Setting.ipv6rdTunnelMode ?? IPv6rdTunnelMode.disabled,
-              items: const [
-                IPv6rdTunnelMode.disabled,
-                IPv6rdTunnelMode.automatic,
-                IPv6rdTunnelMode.manual,
-              ],
-              itemAsString: (item) {
-                return getIpv6rdTunnelModeLoc(context, item);
-              },
-              onChanged: widget.isEditing && !ipv6Setting.isIPv6AutomaticEnabled
-                  ? (value) {
-                      if (value == null) return;
-                      notifier.updateIpv6Settings(
-                          ipv6Setting.copyWith(ipv6rdTunnelMode: () => value));
-                    }
-                  : null,
+            child: Opacity(
+              opacity: widget.isEditing && !ipv6Setting.isIPv6AutomaticEnabled
+                  ? 1.0
+                  : 0.5,
+              child: IgnorePointer(
+                ignoring:
+                    !(widget.isEditing && !ipv6Setting.isIPv6AutomaticEnabled),
+                child: AppDropdown<IPv6rdTunnelMode>(
+                  key: const ValueKey('ipv6TunnelDropdown'),
+                  label: loc(context).sixrdTunnel,
+                  value:
+                      ipv6Setting.ipv6rdTunnelMode ?? IPv6rdTunnelMode.disabled,
+                  items: const [
+                    IPv6rdTunnelMode.disabled,
+                    IPv6rdTunnelMode.automatic,
+                    IPv6rdTunnelMode.manual,
+                  ],
+                  itemAsString: (item) {
+                    return getIpv6rdTunnelModeLoc(context, item);
+                  },
+                  onChanged: (value) {
+                    if (value == null) return;
+                    notifier.updateIpv6Settings(
+                        ipv6Setting.copyWith(ipv6rdTunnelMode: () => value));
+                  },
+                ),
+              ),
             ),
           ),
           _manualSixrdTunnel(ipv6Setting, context),

diff --git a/lib/page/advanced_settings/internet_settings/widgets/wan_forms/pppoe_form.dart b/lib/page/advanced_settings/internet_settings/widgets/wan_forms/pppoe_form.dart
@@ -96,6 +96,8 @@ class _PppoeFormState extends BaseWanFormState<PppoeForm> {
     // Fix: Compare against current controller text to avoid cursor reset
     // Only update controller if the new value is actually different from what's currently in the input
     if ((newIpv4Setting.username ?? '') != _usernameController.text) {
+      debugPrint(
+          'PppoeForm: Syncing Username. State=${newIpv4Setting.username}, Ctrl=${_usernameController.text}');
       _usernameController.text = newIpv4Setting.username ?? '';
     }
     if ((newIpv4Setting.password ?? '') != _passwordController.text) {
@@ -105,6 +107,8 @@ class _PppoeFormState extends BaseWanFormState<PppoeForm> {
     final newVlanStr =
         newIpv4Setting.vlanId != null ? '${newIpv4Setting.vlanId}' : '';
     if (newVlanStr != _vlanIdController.text) {
+      debugPrint(
+          'PppoeForm: Syncing VlanId. State=$newVlanStr, Ctrl=${_vlanIdController.text}');
       _vlanIdController.text = newVlanStr;
     }
 
@@ -187,12 +191,12 @@ class _PppoeFormState extends BaseWanFormState<PppoeForm> {
           padding: inputPadding,
           child: AppMinMaxInput(
             key: const ValueKey('pppoeVlanId'),
+            controller: _vlanIdController,
             min: 5,
             max: 4094,
             label: loc(context).vlanIdOptional,
-            value: int.tryParse(_vlanIdController.text),
             onChanged: (value) {
-              _vlanIdController.text = value?.toString() ?? '';
+              // controller is updated by AppMinMaxInput internally
               notifier.updateIpv4Settings(ipv4Setting.copyWith(
                 vlanId: () => value,
               ));

diff --git a/lib/page/advanced_settings/local_network_settings/views/dhcp_reservations_view.dart b/lib/page/advanced_settings/local_network_settings/views/dhcp_reservations_view.dart
@@ -141,10 +141,9 @@ class _DHCPReservationsContentViewState
                             onTap: () {
                               showSimpleAppOkDialog(
                                 context,
-                                content: SingleChildScrollView(
-                                  child: DevicesFilterWidget(
-                                    onlineOnly: true,
-                                  ),
+                                scrollable: true,
+                                content: DevicesFilterWidget(
+                                  onlineOnly: true,
                                 ),
                               );
                             },

diff --git a/lib/page/advanced_settings/local_network_settings/views/dhcp_server_view.dart b/lib/page/advanced_settings/local_network_settings/views/dhcp_server_view.dart
@@ -55,14 +55,32 @@ class _DHCPServerViewState extends ConsumerState<DHCPServerView> {
   }
 
   void _updateControllers(LocalNetworkSettingsState state) {
-    _startIpAddressController.text = state.settings.current.firstIPAddress;
-    _maxUserAllowedController.text = '${state.settings.current.maxUserAllowed}';
-    _clientLeaseTimeController.text =
-        '${state.settings.current.clientLeaseTime}';
-    _dns1Controller.text = state.settings.current.dns1 ?? '';
-    _dns2Controller.text = state.settings.current.dns2 ?? '';
-    _dns3Controller.text = state.settings.current.dns3 ?? '';
-    _winsController.text = state.settings.current.wins ?? '';
+    if (_startIpAddressController.text !=
+        state.settings.current.firstIPAddress) {
+      _startIpAddressController.text = state.settings.current.firstIPAddress;
+    }
+    if (_maxUserAllowedController.text !=
+        '${state.settings.current.maxUserAllowed}') {
+      _maxUserAllowedController.text =
+          '${state.settings.current.maxUserAllowed}';
+    }
+    if (_clientLeaseTimeController.text !=
+        '${state.settings.current.clientLeaseTime}') {
+      _clientLeaseTimeController.text =
+          '${state.settings.current.clientLeaseTime}';
+    }
+    if (_dns1Controller.text != (state.settings.current.dns1 ?? '')) {
+      _dns1Controller.text = state.settings.current.dns1 ?? '';
+    }
+    if (_dns2Controller.text != (state.settings.current.dns2 ?? '')) {
+      _dns2Controller.text = state.settings.current.dns2 ?? '';
+    }
+    if (_dns3Controller.text != (state.settings.current.dns3 ?? '')) {
+      _dns3Controller.text = state.settings.current.dns3 ?? '';
+    }
+    if (_winsController.text != (state.settings.current.wins ?? '')) {
+      _winsController.text = state.settings.current.wins ?? '';
+    }
   }
 
   @override
@@ -144,6 +162,9 @@ class _DHCPServerViewState extends ConsumerState<DHCPServerView> {
           ),
         ),
         AppGap.sm(),
+        Padding(
+            padding: EdgeInsets.symmetric(vertical: AppSpacing.xs),
+            child: AppText.labelLarge(loc(context).maximumNumberOfUsers)),
         Padding(
           padding: inputPadding,
           child: AppTextField(
@@ -163,6 +184,9 @@ class _DHCPServerViewState extends ConsumerState<DHCPServerView> {
         AppGap.xs(),
         _ipAddressRange(state),
         AppGap.xl(),
+        Padding(
+            padding: EdgeInsets.symmetric(vertical: AppSpacing.xs),
+            child: AppText.labelLarge(loc(context).clientLeaseTime)),
         Padding(
           padding: inputPadding,
           child: AppTextField(

diff --git a/lib/page/advanced_settings/static_routing/static_routing_view.dart b/lib/page/advanced_settings/static_routing/static_routing_view.dart
@@ -271,6 +271,7 @@ class _StaticRoutingViewState extends ConsumerState<StaticRoutingView>
     if (shouldInitialize) {
       _editingRule = rule;
       Future.microtask(() {
+        _selectedInterface = RoutingSettingInterface.resolve(rule.interface);
         _isInitializing = true;
         try {
           final state = ref.read(staticRoutingProvider);
@@ -307,13 +308,13 @@ class _StaticRoutingViewState extends ConsumerState<StaticRoutingView>
           _destinationIPController.text = rule.destinationIP;
           _subnetMaskController.text = rule.subnetMask;
           _gatewayController.text = rule.gateway;
-          _selectedInterface = RoutingSettingInterface.resolve(rule.interface);
 
           // Clear errors
           _nameError = null;
           _destIpError = null;
           _subnetError = null;
           _gatewayError = null;
+          _sheetStateSetter?.call(() {});
         } finally {
           _isInitializing = false;
         }

diff --git a/lib/page/components/shortcuts/dialogs.dart b/lib/page/components/shortcuts/dialogs.dart
@@ -161,7 +161,9 @@ Future<T?> showSubmitAppDialog<T>(
           content: SizedBox(
               width: width ?? kDefaultDialogWidth,
               child: switch (isLoading) {
-                true => loadingWidget ?? const AppLoader(),
+                true => loadingWidget ??
+                    const Center(
+                        child: SizedBox(width: 40, child: AppLoader())),
                 false => contentBuilder(context, setState, onSubmit),
               }),
           actions: isLoading

diff --git a/lib/page/components/styled/remote_assistance/remote_assistance_dialog.dart b/lib/page/components/styled/remote_assistance/remote_assistance_dialog.dart
@@ -5,7 +5,7 @@ import 'package:privacy_gui/core/cloud/providers/remote_assistance/remote_client
 import 'package:privacy_gui/core/data/providers/polling_provider.dart';
 import 'package:privacy_gui/localization/localization_hook.dart';
 import 'package:privacy_gui/page/components/customs/timer_countdown_widget.dart';
-import 'package:privacy_gui/page/dashboard/views/components/remote_assistance_animation.dart';
+import 'package:privacy_gui/page/dashboard/views/components/_components.dart';
 import 'package:ui_kit_library/ui_kit.dart';
 import 'package:privacy_gui/core/cloud/model/guardians_remote_assistance.dart';
 import 'package:url_launcher/url_launcher.dart';

diff --git a/lib/page/dashboard/_dashboard.dart b/lib/page/dashboard/_dashboard.dart
@@ -1,2 +1,4 @@
 export 'views/_views.dart';
 export 'providers/_providers.dart';
+export 'models/_models.dart';
+export 'strategies/_strategies.dart';