Migrate to UI Kit & Resolve Main Merge Conflicts

[AustinChangLinksys]

User description

Description

This PR completes the migration to the new ui_kit_library and resolves all merge conflicts from the main branch integration.

Key Changes

1. Merge Conflict Resolution

• Resolved complex UI conflicts in ipv6_port_service_list_view.dart, static_routing_view.dart, and dmz_settings_view.dart.
• Correctly integrated ui_kit_library components (e.g., DMZSourceRestrictionUI, StaticRouteEntryUIModel).
• Merged configuration files (.gitignore, pubspec.yaml, di.dart).

2. Test Fixes & Stability

• Fixed 1315/1315 Unit Tests:
  • Resolved 8 DMZSettingsService test failures (mock setup & data builder fixes).
  • Fixed IPv6PortServiceListProvider test (graceful error handling).
  • Fixed PnP and RouterPassword notifier tests.
• Lint Cleanup: Resolved all flutter analyze errors and removed unused imports/dependencies.

3. Refactoring

• Refactored Views to use specific UI models instead of JNAP models.
• Removed obsolete view files (ipv6_port_service_rule_view, etc.).

Verification

• flutter analyze: Passed cleanly.
• sh run_tests.sh: All tests passed.
• UI Kit: Synced with latest main branch of privacyGUI-UI-kit.

---

PR Type

Enhancement, Tests, Bug fix

---

Description

• UI Kit Library Migration: Comprehensive migration from privacygui_widgets to ui_kit_library across multiple views and components, including replacement of StyledAppPageView with UiKitPageView, updated spacing/gap utilities, and icon references

• Test Suite Expansion: Added 973+ lines of WifiSettingsService tests and 824+ lines of WifiBundleNotifier tests with comprehensive coverage for WiFi settings, MLO conflict detection, and device filtering

• Service Layer Refactoring: Delegated WiFi data operations from WifiBundleProvider to new WifiSettingsService, removing complex JNAP transaction logic and improving separation of concerns

• Data Table Component Integration: Replaced custom editable list/table views with new AppDataTable component in static routing view with inline editing capabilities

• Code Organization: Extracted large WiFi channel constants (1300+ lines) to separate channel_constants.dart file for better maintainability

• Merge Conflict Resolution: Resolved complex UI conflicts across multiple views and configuration files from main branch integration

• Test Fixes: Fixed 1315 unit tests including DMZSettingsService, IPv6PortServiceListProvider, PnP, and RouterPassword notifier tests

• Cleanup: Removed obsolete view files and integration tests, resolved all flutter analyze errors

---

Diagram Walkthrough

flowchart LR
  A["privacygui_widgets<br/>Components"] -- "migrate to" --> B["ui_kit_library<br/>Components"]
  C["WifiBundleProvider<br/>Complex Logic"] -- "delegate to" --> D["WifiSettingsService<br/>Service Layer"]
  E["Custom Views<br/>Edit Rules"] -- "replace with" --> F["AppDataTable<br/>Inline Editing"]
  G["channel_data.dart<br/>1300+ lines"] -- "extract to" --> H["channel_constants.dart<br/>Organized Data"]
  I["Test Coverage<br/>Partial"] -- "expand to" --> J["1800+ lines<br/>Comprehensive Tests"]

Loading

File Walkthrough

	Relevant files
Tests	4 files apps_and_gaming_view_test.dart Migrate UI Kit components and refactor test helpers            test/page/advanced_settings/apps_and_gaming/views/localizations/apps_and_gaming_view_test.dart Migrated from privacygui_widgets to ui_kit_library imports for dropdown, tab bar, and icon components Added helper function switchToTab() to manage tab switching with proper animation handling Updated dropdown component references from AppDropdownButton to AppDropdown with adjusted test assertions Replaced icon-based button finders with key-based finders (e.g., find.byIcon(LinksysIcons.add) to find.byKey(const Key('appDataTable_addButton'))) Removed multiple mobile-specific test cases for single port and port range forwarding edit views Updated text field finders from TextFormField to TextField for IP address inputs Added animation enablement flags and improved error icon hover handling for tooltip display +257/-845 wifi_settings_service_test.dart Comprehensive WiFi Settings Service Test Suite                      test/page/wifi_settings/services/wifi_settings_service_test.dart Added comprehensive test suite for WifiSettingsService with 973 lines of test coverage Includes validation tests for WiFi list settings in simple and advanced modes Tests MLO (Multi-Link Operation) conflict detection with various scenarios Tests fetchBundleSettings with full feature support and graceful degradation Tests save operations for advanced settings, WiFi list, and privacy settings Tests device list filtering and MAC address handling +973/-0  vpn_settings_page_test.dart Refactor VPN settings tests with v2 API and documentation test/page/vpn/views/localizations/vpn_settings_page_test.dart Added comprehensive test documentation header with 16 test IDs and descriptions for VPN settings page coverage Refactored all testLocalizations calls to use new testLocalizationsV2 function with improved parameters Added mock stubs for VPN notifier methods (setVPNGateway, setTunneledUser, setVPNUser, setVPNService, setEditingCredentials) Extracted common screens variable to reduce code duplication across all test cases Added goldenFilename parameters to each test for golden file generation +543/-454 wifi_bundle_provider_test.dart Add comprehensive WiFi bundle provider unit tests                test/page/wifi_settings/providers/wifi_bundle_provider_test.dart Created comprehensive test suite for WifiBundleNotifier with 824 lines of test coverage Added mock implementations for WifiSettingsService, dashboard managers, and device managers Implemented tests for fetch/save operations delegating to WifiSettingsService Added setter tests for WiFi properties (SSID, password, security type, mode, channel, broadcast) Included privacy settings tests (MAC filter mode, MAC address selection) Added edge case tests for simple mode, MLO conflicts, and status-only updates +824/-0
Enhancement	4 files instant_verify_view.dart Migrate instant verify view to UI Kit library                        lib/page/instant_verify/views/instant_verify_view.dart Migrated from privacygui_widgets to ui_kit_library for all UI components and icons Replaced StyledAppPageView with UiKitPageView for page layout Refactored topology view to use new AppTopology component with TopologyMenuHelper for node menu handling Replaced custom PDF generation logic with InstantVerifyPdfService for cleaner separation of concerns Updated responsive layout utilities from ResponsiveLayout to AppResponsiveLayout with context extensions Refactored connectivity widget layout with improved visual hierarchy and status indicators Replaced icon references from LinksysIcons to AppIcon.font(AppFontIcons.*) pattern Updated spacing constants from Spacing.* to AppSpacing.* throughout +700/-796 static_ip_form.dart Migrate static IP form to UI Kit library                                  lib/page/advanced_settings/internet_settings/widgets/wan_forms/static_ip_form.dart Migrated from privacygui_widgets gap and spacing imports to ui_kit_library Updated spacing constant references from Spacing.small2 to hardcoded value 8 and AppSpacing.* pattern Improved code formatting with better line breaks for readability in long conditional statements Replaced AppGap.small1() with AppGap.xs() for consistency with new spacing system +50/-22  dashboard_home_view.dart Migrate Dashboard Home View to UI Kit Library                        lib/page/dashboard/views/dashboard_home_view.dart Migrated from StyledAppPageView to UiKitPageView for UI Kit compatibility Updated imports to use ui_kit_library instead of privacygui_widgets Replaced AppBarStyle and StyledBackState with UiKitAppBarStyle and UiKitBackState Updated responsive layout to use AppResponsiveLayout with new builder API Replaced spacing constants with hardcoded values and updated gap utilities Updated progress indicator from AppSpinner to CircularProgressIndicator +55/-55  static_routing_view.dart Migrate static routing view to UI Kit with data table        lib/page/advanced_settings/static_routing/static_routing_view.dart Migrated from StyledAppPageView to UiKitPageView for UI Kit library integration Replaced custom editable list/table views with new AppDataTable component Refactored controller management with private naming convention and listener-based validation Implemented inline editing with AppTableColumn builders instead of separate edit views Simplified interface selection using AppDropdown with RoutingSettingInterface enum Consolidated validation logic into _validateAll() and _isValid() methods Removed responsive layout branching (mobile/desktop) in favor of unified table approach +456/-398
Refactoring	4 files wifi_item.dart Update WiFi item provider imports and exports                        lib/page/wifi_settings/providers/wifi_item.dart Changed import from privacy_gui/core/jnap/models/radio_info.dart to privacy_gui/page/wifi_settings/models/wifi_enums.dart Added export statement for wifi_enums.dart to maintain public API compatibility +3/-207  channel_data.dart Extract Channel Data to Separate Constants File                    lib/page/wifi_settings/providers/channel_data.dart Removed large channelData constant (1300+ lines) from this file Replaced with export statement pointing to new channel_constants.dart file Maintains backward compatibility through re-export +1/-1302 channel_constants.dart New WiFi Channel Constants Data File                                          lib/page/wifi_settings/models/channel_constants.dart New file containing WiFi channel constants for 2.4GHz, 5GHz, and 6GHz bands Includes 1301 lines of channel/frequency/DFS/UNII mapping data Provides comprehensive documentation header explaining data structure Extracted from channel_data.dart for better code organization +1301/-0 wifi_bundle_provider.dart Refactor WiFi bundle provider to delegate to service layer lib/page/wifi_settings/providers/wifi_bundle_provider.dart Extracted WiFi data fetching logic to WifiSettingsService via fetchBundleSettings() delegation Removed complex JNAP transaction building code from notifier, delegating to service layer Simplified _saveWifiList() by delegating to WifiSettingsService.saveWifiListSettings() Delegated advanced and privacy settings save operations to service layer methods Removed helper methods getSimpleModeAvailableSecurityType() and getSimpleModeAvailableSecurityTypeList() (moved to service) Removed checkingMLOSettingsConflicts() implementation, now delegates to service Cleaned up imports, removing unused JNAP action and model imports Added new imports for WifiSettingsService and WifiSettingsMapper +51/-383
Miscellaneous	1 files _views.dart Remove Obsolete IPv6 Port Service Rule View Export              lib/page/advanced_settings/firewall/views/_views.dart Removed export of ipv6_port_service_rule_view.dart (obsolete view file) Kept exports for ipv6_port_service_list_view.dart and firewall_view.dart +1/-1
Additional files	101 files speckit.analyze.md +184/-0  speckit.checklist.md +294/-0  speckit.clarify.md +181/-0  speckit.constitution.md +82/-0    speckit.implement.md +135/-0  speckit.plan.md +89/-0    speckit.specify.md +258/-0  speckit.tasks.md +137/-0  speckit.taskstoissues.md +30/-0    settings.local.json +24/-0    .fvmrc +3/-0      ci.yml +130/-0  .gitmodules +0/-3      .metadata +30/-0    constitution.md +50/-0    check-prerequisites.sh +166/-0  common.sh +156/-0  create-new-feature.sh +297/-0  setup-plan.sh +61/-0    update-agent-context.sh +799/-0  agent-file-template.md +28/-0    checklist-template.md +40/-0    plan-template.md +104/-0  spec-template.md +115/-0  tasks-template.md +251/-0  launch.json +18/-4    .windsurfrules +385/-0  AGENTS.md +8/-1      APPGAP_MAPPING.md +148/-0  CLAUDE.md +169/-0  THEME.md +201/-0  lcov.info +59460/-0 devtools_options.yaml +3/-0      MIGRATION_TEST_RESULTS.md +1103/-0 REMAINING_TESTS_SUMMARY.md +352/-0  SCREENSHOT_TEST_COVERAGE.md +239/-0  SCREEN_SIZE_VERIFICATION_STATUS.md +358/-0  pnp-refactor.md +0/-94    SCREENSHOT_TEST_MASTER_REPORT.md +248/-0  TICKER_MODE_SUMMARY.md +235/-0  screenshot_testing_fix_workflow.md +697/-0  screenshot_testing_guideline.md [link]    screenshot_testing_knowledge_base.md +1295/-0 screenshot_testing_ticker_mode_enhancement.md +454/-0  mock_generation_guide.md +221/-0  add_nodes_actions.dart +0/-5      administration_actions.dart +0/-180  advanced_routing_actions.dart +0/-263  advanced_settings_actions.dart +0/-127  apps_and_gaming_actions.dart +0/-519  base_actions.dart +0/-105  dashboard_home_actions.dart +0/-536  dhcp_reservation_actions.dart +0/-194  dmz_actions.dart +0/-224  external_speed_test_actions.dart +0/-5      firewall_actions.dart +0/-506  incredible_wifi_actions.dart +0/-1058 instant_admin_actions.dart +0/-262  instant_devices_actions.dart +0/-5      instant_privacy_actions.dart +0/-28    instant_safety_actions.dart +0/-71    instant_topology_actions.dart +0/-5      instant_verify_actions.dart +0/-5      internet_settings_actions.dart +0/-1059 local_login_actions.dart +0/-69    local_network_settings_actions.dart +0/-353  menu_actions.dart +0/-213  pnp_setup_actions.dart +0/-89    prepair_pnp_setup_actions.dart +0/-78    recovery_actions.dart +0/-38    reset_password_actions.dart +0/-124  speed_test_actions.dart +0/-51    topbar_actions.dart +0/-41    administration_test.dart +0/-94    advanced_routing_test.dart +0/-137  apps_and_gaming_test.dart +0/-219  integration_test_config.dart +0/-20    dashboard_home_test.dart +0/-106  dhcp_reservations_test.dart +0/-86    dmz_test.dart +0/-78    extensions.dart +0/-7      factory_reset_setup_test.dart +0/-64    firewall_test.dart +0/-197  incredible_wifi_advanced_and_mac_filtering_test.dart +0/-222  incredible_wifi_test.dart +0/-505  instant_admin_test.dart +0/-138  instant_privacy_test.dart +0/-78    instant_safety_test.dart +0/-71    internet_settings_set_1_test.dart +0/-147  internet_settings_set_2_test.dart +0/-187  internet_settings_set_3_test.dart +0/-156  local_network_settings_test.dart +0/-140  menu_test.dart +0/-125  common_actions_mixin.dart +0/-51    prepaired_reset_setup_test.dart +0/-76    recovery_and_login_test.dart +0/-110  check_auto_parent.sh +0/-40    config_loader.sh +0/-184  factory_reset.sh +0/-38    generate_integration_report.sh +0/-178  Additional files not shown

---

[qodo-code-review]

PR Compliance Guide 🔍

Below is a summary of compliance checks for this PR:

Security Compliance
🟢	No security concerns identified No security vulnerabilities detected by AI analysis. Human verification advised for critical code.
Ticket Compliance
⚪	🎫 No ticket provided Create ticket/issue
Codebase Duplication Compliance
⚪	Codebase context is not defined Follow the guide to enable codebase context checks.
Custom Compliance
🟢	Generic: Comprehensive Audit Trails Objective: To create a detailed and reliable record of critical system actions for security analysis and compliance. Status: Passed Learn more about managing compliance generic rules or creating your own custom rules
	Generic: Meaningful Naming and Self-Documenting Code Objective: Ensure all identifiers clearly express their purpose and intent, making code self-documenting Status: Passed Learn more about managing compliance generic rules or creating your own custom rules
	Generic: Secure Error Handling Objective: To prevent the leakage of sensitive system information through error messages while providing sufficient detail for internal debugging. Status: Passed Learn more about managing compliance generic rules or creating your own custom rules
	Generic: Secure Logging Practices Objective: To ensure logs are useful for debugging and auditing without exposing sensitive information like PII, PHI, or cardholder data. Status: Passed Learn more about managing compliance generic rules or creating your own custom rules
	Generic: Security-First Input Validation and Data Handling Objective: Ensure all data inputs are validated, sanitized, and handled securely to prevent vulnerabilities Status: Passed Learn more about managing compliance generic rules or creating your own custom rules
🔴	Generic: Robust Error Handling and Edge Case Management Objective: Ensure comprehensive error handling that provides meaningful context and graceful degradation Status: Silent test failure: The new switchToTab helper silently does nothing when TabBar.controller is null, which can mask failures and make tests pass without actually switching tabs. Referred Code Future<void> switchToTab(WidgetTester tester, int index) async { final tabBarFinder = find.byType(TabBar); expect(tabBarFinder, findsOneWidget); final tabBar = tester.widget<TabBar>(tabBarFinder); final controller = tabBar.controller; if (controller != null) { controller.animateTo(index); await tester.pump(); await tester.pump(const Duration(milliseconds: 300)); await tester.pumpAndSettle(); } } Learn more about managing compliance generic rules or creating your own custom rules
Update

Compliance status legend

🟢 - Fully Compliant
🟡 - Partial Compliant
🔴 - Not Compliant
⚪ - Requires Further Human Verification
🏷️ - Compliance label

[qodo-code-review]

PR Code Suggestions ✨

Explore these optional code suggestions:

Category	Suggestion	Impact
Possible issue	✅ Fix race condition during state initialization Suggestion Impact: The commit removes the post-frame callback (and mounted check) and performs provider initialization immediately in the method body, matching the suggested approach to avoid the initialization race condition. code diff: // Initialize provider - convert to StaticRoutingRuleUIModel - WidgetsBinding.instance.addPostFrameCallback((_) { - if (!mounted) return; - final ruleUIModel = StaticRoutingRuleUIModel( - name: rule.name, - destinationIP: rule.destinationIP, - networkPrefixLength: - NetworkUtils.subnetMaskToPrefixLength(rule.subnetMask), - gateway: rule.gateway.isEmpty ? null : rule.gateway, - interface: rule.interface, - ); - final rulesUIModels = state.current.entries - .map((e) => StaticRoutingRuleUIModel( - name: e.name, - destinationIP: e.destinationIP, - networkPrefixLength: - NetworkUtils.subnetMaskToPrefixLength(e.subnetMask), - gateway: e.gateway.isEmpty ? null : e.gateway, - interface: e.interface, - )) - .toList(); - ref.read(staticRoutingRuleProvider.notifier).init( - rulesUIModels, - ruleUIModel, - state.current.entries.indexOf(rule), - state.status.routerIp, - state.status.subnetMask, - ); - }); + final ruleUIModel = StaticRoutingRuleUIModel( + name: rule.name, + destinationIP: rule.destinationIP, + networkPrefixLength: + NetworkUtils.subnetMaskToPrefixLength(rule.subnetMask), + gateway: rule.gateway.isEmpty ? null : rule.gateway, + interface: rule.interface, + ); + final rulesUIModels = state.current.entries + .map((e) => StaticRoutingRuleUIModel( + name: e.name, + destinationIP: e.destinationIP, + networkPrefixLength: + NetworkUtils.subnetMaskToPrefixLength(e.subnetMask), + gateway: e.gateway.isEmpty ? null : e.gateway, + interface: e.interface, + )) + .toList(); + ref.read(staticRoutingRuleProvider.notifier).init( + rulesUIModels, + ruleUIModel, + state.current.entries.indexOf(rule), + state.status.routerIp, + state.status.subnetMask, + ); Fix a race condition by moving the initialization of staticRoutingRuleProvider out of WidgetsBinding.instance.addPostFrameCallback and into the main body of the _initEditingState method. lib/page/advanced_settings/static_routing/static_routing_view.dart [262-289] // Initialize provider - convert to StaticRoutingRuleUIModel -WidgetsBinding.instance.addPostFrameCallback((_) { - if (!mounted) return; - final ruleUIModel = StaticRoutingRuleUIModel( - name: rule.name, - destinationIP: rule.destinationIP, - networkPrefixLength: - NetworkUtils.subnetMaskToPrefixLength(rule.subnetMask), - gateway: rule.gateway.isEmpty ? null : rule.gateway, - interface: rule.interface, - ); - final rulesUIModels = state.current.entries - .map((e) => StaticRoutingRuleUIModel( - name: e.name, - destinationIP: e.destinationIP, - networkPrefixLength: - NetworkUtils.subnetMaskToPrefixLength(e.subnetMask), - gateway: e.gateway.isEmpty ? null : e.gateway, - interface: e.interface, - )) - .toList(); - ref.read(staticRoutingRuleProvider.notifier).init( - rulesUIModels, - ruleUIModel, - state.current.entries.indexOf(rule), - state.status.routerIp, - state.status.subnetMask, - ); -}); +final ruleUIModel = StaticRoutingRuleUIModel( + name: rule.name, + destinationIP: rule.destinationIP, + networkPrefixLength: + NetworkUtils.subnetMaskToPrefixLength(rule.subnetMask), + gateway: rule.gateway.isEmpty ? null : rule.gateway, + interface: rule.interface, +); +final rulesUIModels = state.current.entries + .map((e) => StaticRoutingRuleUIModel( + name: e.name, + destinationIP: e.destinationIP, + networkPrefixLength: + NetworkUtils.subnetMaskToPrefixLength(e.subnetMask), + gateway: e.gateway.isEmpty ? null : e.gateway, + interface: e.interface, + )) + .toList(); +ref.read(staticRoutingRuleProvider.notifier).init( + rulesUIModels, + ruleUIModel, + state.current.entries.indexOf(rule), + state.status.routerIp, + state.status.subnetMask, + ); [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 9 __ Why: This suggestion correctly identifies and resolves a critical race condition where validation logic could execute before its dependent provider is initialized, preventing potential runtime errors and incorrect behavior.	High
	✅ Fix incorrect test widget finder Suggestion Impact: The commit changed the tunneled user input finder from `find.byKey(ValueKey('tunneledUser'))` to a `find.descendant(...)` finder targeting the nested editable widget, aligning with the suggestion's intent (though it matches `EditableText` rather than `TextFormField`). Additional changes in the diff (mocking `testVPNConnection`) are unrelated to the suggestion. code diff: @@ -325,8 +325,9 @@ final gatewayInputFinder = find.byKey(const ValueKey('gateway')); await tester.enterText(gatewayInputFinder, 'not.a.valid.address'); await tester.pumpAndSettle(); - final tunneledUserInputFinder = - find.byKey(const ValueKey('tunneledUser')); + final tunneledUserInputFinder = find.descendant( + of: find.byKey(const ValueKey('tunneledUser')), + matching: find.byType(EditableText)); await tester.enterText(tunneledUserInputFinder, ''); await tester.pumpAndSettle(); Update the widget finder in the VPN Invalid Gateway Address State test to correctly target the nested TextFormField for user input simulation. test/page/vpn/views/localizations/vpn_settings_page_test.dart [295-336] // Test ID: VPN-INV_GATEWAY testLocalizationsV2( 'VPN Invalid Gateway Address State', (tester, screen) async { final invalidGatewayState = VPNTestState.disconnectedState.copyWith( settings: VPNTestState.defaultState.settings.copyWith( gatewaySettings: VPNTestState.defaultState.settings.gatewaySettings!.copyWith( gatewayAddress: 'invalid.address', ), isEditingCredentials: true, ), ); when(testHelper.mockVPNNotifier.build()) .thenReturn(invalidGatewayState); when(testHelper.mockVPNNotifier.fetch()).thenAnswer((_) async { await Future.delayed(const Duration(seconds: 1)); return invalidGatewayState; }); await testHelper.pumpView( tester, config: LinksysRouteConfig( column: ColumnGrid(column: 12), noNaviRail: true, ), child: const VPNSettingsPage(), locale: screen.locale, ); final gatewayInputFinder = find.byKey(const ValueKey('gateway')); await tester.enterText(gatewayInputFinder, 'not.a.valid.address'); await tester.pumpAndSettle(); - final tunneledUserInputFinder = - find.byKey(const ValueKey('tunneledUser')); + final tunneledUserInputFinder = find.descendant( + of: find.byKey(const ValueKey('tunneledUser')), + matching: find.byType(TextFormField)); await tester.enterText(tunneledUserInputFinder, ''); await tester.pumpAndSettle(); }, screens: screens, goldenFilename: 'VPN-INV_GATEWAY_01_invalid_gateway', helper: testHelper, ); [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 8 __ Why: The suggestion correctly identifies a bug introduced in the PR where a test finder was oversimplified, which would cause the test to fail.	Medium
	✅ Stub VPN connection test call Suggestion Impact: The commit adds a Mockito stub for testHelper.mockVPNNotifier.testVPNConnection() returning VPNTestState.testResultState before tapping the "testAgain" button, matching the intent of the suggestion to avoid test failures. code diff: + when(testHelper.mockVPNNotifier.testVPNConnection()) + .thenAnswer((_) async => VPNTestState.testResultState); final testAgainButtonFinder = find.byKey(const ValueKey('testAgain')); await tester.tap(testAgainButtonFinder); await tester.pumpAndSettle(); Add a mock stub for the testVPNConnection() method in the VPN Test Connection when settings changes test to prevent an error. test/page/vpn/views/localizations/vpn_settings_page_test.dart [420-457] -// Test ID: VPN-RETEST -testLocalizationsV2( - 'VPN Test Connection when settings changes', - (tester, screen) async { - final invalidDNSState = VPNTestState.disconnectedState.copyWith( - settings: VPNTestState.disconnectedState.settings.copyWith( - tunneledUserIP: '1.1.1.1', - isEditingCredentials: false, - ), - ); - when(testHelper.mockVPNNotifier.build()).thenReturn(invalidDNSState); - when(testHelper.mockVPNNotifier.fetch()).thenAnswer((_) async { - await Future.delayed(const Duration(seconds: 1)); - return invalidDNSState.copyWith( - settings: invalidDNSState.settings.copyWith( - tunneledUserIP: '2.2.2.2', - ), - ); - }); +// inside the same testLocalizationsV2 block, before tapping the button: +when(testHelper.mockVPNNotifier.testVPNConnection()) + .thenAnswer((_) async => VPNTestState.testResultState); +final testAgainButtonFinder = find.byKey(const ValueKey('testAgain')); +await tester.tap(testAgainButtonFinder); +await tester.pumpAndSettle(); - await testHelper.pumpView( - tester, - config: LinksysRouteConfig( - column: ColumnGrid(column: 12), - noNaviRail: true, - ), - child: const VPNSettingsPage(), - locale: screen.locale, - ); - - final testAgainButtonFinder = find.byKey(const ValueKey('testAgain')); - await tester.tap(testAgainButtonFinder); - await tester.pumpAndSettle(); - }, - screens: screens, - goldenFilename: 'VPN-RETEST_01_retest', - helper: testHelper, -); - [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 8 __ Why: The suggestion correctly identifies a missing mock stub for a method call, which would cause the test to fail at runtime.	Medium
	Capture sheet state in editors Fix a UI bug by assigning the setSheetState callback to _sheetStateSetter in the editBuilder for all AppTableColumn instances, ensuring validation errors update immediately for all fields. lib/page/advanced_settings/static_routing/static_routing_view.dart [180-191] AppTableColumn<StaticRouteEntryUIModel>( label: loc(context).destinationIPAddress, cellBuilder: (_, rule) => AppText.bodyMedium(rule.destinationIP), editBuilder: (_, rule, setSheetState) { + _sheetStateSetter = setSheetState; return AppTextField( key: const Key('destinationIP'), controller: _destinationIPController, hintText: loc(context).destinationIPAddress, errorText: _destIpError, ); }, ), [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 8 __ Why: This suggestion correctly identifies a UI bug where validation feedback would not update in real-time for most fields and provides a simple fix, significantly improving the user experience during inline editing.	Medium
	Restore test assertions and fix IP In the APPGAM-PRF_FILL_DESK test, uncomment the assertions and change the entered IP address from '15' to a valid one like '192.168.1.100' to properly validate the form's state. test/page/advanced_settings/apps_and_gaming/views/localizations/apps_and_gaming_view_test.dart [928-933] // ... final ipAddressTextFormField = find.descendant( of: ipAddressForm, matching: find.byType(TextField)); - await tester.enterText(ipAddressTextFormField.first, '15'); + await tester.enterText(ipAddressTextFormField.first, '192.168.1.100'); await tester.pumpAndSettle(); - // TODO: Why the portRangeError showing on the screenshot - // expect(find.text('name'), findsOneWidget); - // expect(find.text('20'), findsOneWidget); - // expect(find.text('40'), findsOneWidget); - // expect(find.textContaining('15'), findsOneWidget); + expect(find.text('name'), findsOneWidget); + expect(find.text('20'), findsOneWidget); + expect(find.text('40'), findsOneWidget); + expect(find.text('192.168.1.100'), findsOneWidget); }, // ... [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 7 __ Why: The suggestion correctly identifies that the test assertions are commented out, making the test less effective. Restoring them and using a valid IP address improves test correctness and coverage.	Medium
General	Handle invalid subnet mask parsing Add try-catch error handling around the NetworkUtils.subnetMaskToPrefixLength call to prevent crashes from invalid user input for the subnet mask. lib/page/advanced_settings/static_routing/static_routing_view.dart [389-393] -final prefixLength = - NetworkUtils.subnetMaskToPrefixLength(_subnetMaskController.text); +int prefixLength; +try { + prefixLength = NetworkUtils.subnetMaskToPrefixLength(_subnetMaskController.text); +} catch (_) { + prefixLength = -1; +} _subnetError = ruleNotifier.isValidSubnetMask(prefixLength) ? null : loc(context).invalidSubnetMask; [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 8 __ Why: This suggestion correctly identifies a potential unhandled exception when parsing user input for a subnet mask and proposes a robust try-catch solution, preventing the application from crashing.	Medium
	Improve type safety with a class Replace the List<Map<String, dynamic>> for channelData with a List using a dedicated WifiChannel class to improve type safety and code clarity. lib/page/wifi_settings/models/channel_constants.dart [5-19] -const List<Map<String, dynamic>> channelData = [ - { - 'band': '2.4GHz', - 'channel': 1, - 'frequency': '2.412', - 'dfs': false, - 'unii': [] - }, - { - 'band': '2.4GHz', - 'channel': 2, - 'frequency': '2.417', - 'dfs': false, - 'unii': [] - }, +class WifiChannel { + final String band; + final int channel; + final double frequency; + final bool dfs; + final List<int> unii; + + const WifiChannel({ + required this.band, + required this.channel, + required this.frequency, + required this.dfs, + required this.unii, + }); +} + +const List<WifiChannel> channelData = [ + WifiChannel( + band: '2.4GHz', + channel: 1, + frequency: 2.412, + dfs: false, + unii: [], + ), + WifiChannel( + band: '2.4GHz', + channel: 2, + frequency: 2.417, + dfs: false, + unii: [], + ), ... [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 7 __ Why: The suggestion correctly identifies that using a dedicated class instead of Map<String, dynamic> improves type safety and code quality, which is a significant enhancement for a large, static dataset.	Medium
	Remove redundant spinner on dialogs Remove the redundant doSomethingWithSpinner wrapper from the onTap handlers for the "Ping" and "Traceroute" buttons, as the dialogs they trigger manage their own loading indicators. lib/page/instant_verify/views/instant_verify_view.dart [1044-1058] // ... - onTap: () { - doSomethingWithSpinner( - context, _showPingNetworkModal(context, ref)); + onTap: () async { + await _showPingNetworkModal(context, ref); }, ), AppGap.lg(), _toolCard( context, key: const ValueKey('traceroute'), title: loc(context).traceroute, icon: Icons.route, - onTap: () { - doSomethingWithSpinner(context, _showTracerouteModal(context, ref)); + onTap: () async { + await _showTracerouteModal(context, ref); }, ), // ... [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 6 __ Why: The suggestion correctly identifies a redundant doSomethingWithSpinner wrapper around dialogs that likely manage their own loading state, improving code clarity and preventing potential UI state conflicts.	Low
	Register fake builder fallback In setUpAll, register FakeJNAPTransactionBuilder as the fallback value instead of the real JNAPTransactionBuilder to maintain consistency with fakes used in tests. test/page/wifi_settings/services/wifi_settings_service_test.dart [46-51] setUpAll(() { - registerFallbackValue(JNAPTransactionBuilder(commands: [])); + registerFallbackValue(FakeJNAPTransactionBuilder(commands: [])); registerFallbackValue(JNAPAction.getRadioInfo); registerFallbackValue(FakeLinksysDevice()); registerFallbackValue(CacheLevel.noCache); }); [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 6 __ Why: The suggestion correctly points out an inconsistency in test setup, recommending the use of the defined FakeJNAPTransactionBuilder for the fallback value to ensure type safety and test correctness.	Low
	Assert controller is not null In the switchToTab helper function, add an assertion to ensure the TabController is not null, which will cause tests to fail clearly if the controller is missing. test/page/advanced_settings/apps_and_gaming/views/localizations/apps_and_gaming_view_test.dart [24-37] /// Helper to switch tabs by index using TabController Future<void> switchToTab(WidgetTester tester, int index) async { final tabBarFinder = find.byType(TabBar); expect(tabBarFinder, findsOneWidget); final tabBar = tester.widget<TabBar>(tabBarFinder); final controller = tabBar.controller; - if (controller != null) { - controller.animateTo(index); - await tester.pump(); - await tester.pump(const Duration(milliseconds: 300)); - await tester.pumpAndSettle(); - } + expect(controller, isNotNull, reason: 'TabBar controller should not be null'); + controller!.animateTo(index); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 300)); + await tester.pumpAndSettle(); } [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 5 __ Why: The suggestion correctly points out that silently failing when the controller is null can make tests harder to debug. Adding an assertion improves test robustness.	Low
	Use precise widget count Replace findsWidgets with findsOneWidget in the dropdown item assertions to ensure each item appears exactly once, making the test more precise. test/page/advanced_settings/apps_and_gaming/views/localizations/apps_and_gaming_view_test.dart [240-242] -expect(find.text(testHelper.loc(context).systemDynamic), findsWidgets); -expect(find.text(testHelper.loc(context).systemStatic), findsWidgets); -expect(find.text(testHelper.loc(context).systemCustom), findsWidgets); +expect(find.text(testHelper.loc(context).systemDynamic), findsOneWidget); +expect(find.text(testHelper.loc(context).systemStatic), findsOneWidget); +expect(find.text(testHelper.loc(context).systemCustom), findsOneWidget); [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 4 __ Why: The suggestion correctly proposes using a more precise matcher (findsOneWidget instead of findsWidgets), which makes the test assertion stricter and more reliable.	Low
Update