Skip to content

refactor(providers): Decouple cross-page provider dependencies #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AustinChangLinksys merged 2 commits into from
Jan 15, 2026
Merged

refactor(providers): Decouple cross-page provider dependencies #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89c2628
refactor(providers): Decouple cross-page provider dependencies (#551,…
HankYuLinksys Jan 12, 2026
c0186f7
Merge branch 'dev-2.0.0' into hank/refactor-architecture
HankYuLinksys Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions lib/page/dashboard/providers/dashboard_home_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'
import 'package:privacy_gui/core/data/providers/device_manager_provider.dart';
import 'package:privacy_gui/page/dashboard/providers/dashboard_home_state.dart';
import 'package:privacy_gui/page/dashboard/services/dashboard_home_service.dart';
import 'package:privacy_gui/page/health_check/providers/health_check_provider.dart';

final dashboardHomeProvider =
NotifierProvider<DashboardHomeNotifier, DashboardHomeState>(
Expand All @@ -15,8 +14,6 @@ class DashboardHomeNotifier extends Notifier<DashboardHomeState> {
DashboardHomeState build() {
final dashboardManagerState = ref.watch(dashboardManagerProvider);
final deviceManagerState = ref.watch(deviceManagerProvider);
// Watch healthCheckProvider to maintain reactivity (even though we don't use it directly)
ref.watch(healthCheckProvider);

final service = ref.read(dashboardHomeServiceProvider);
return service.buildDashboardHomeState(
Expand Down
10 changes: 4 additions & 6 deletions lib/page/instant_verify/views/instant_verify_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ import 'package:privacy_gui/page/components/shortcuts/dialogs.dart';
import 'package:privacy_gui/page/components/ui_kit_page_view.dart';
import 'package:privacy_gui/page/components/views/arguments_view.dart';
import 'package:flutter/material.dart';
import 'package:privacy_gui/page/dashboard/_dashboard.dart';
import 'package:privacy_gui/page/dashboard/providers/dashboard_home_provider.dart';
import 'package:privacy_gui/page/health_check/_health_check.dart';
import 'package:privacy_gui/page/instant_verify/providers/instant_verify_provider.dart';
import 'package:privacy_gui/page/dashboard/views/components/_components.dart';
Expand Down Expand Up @@ -722,7 +720,7 @@ class _InstantVerifyViewState extends ConsumerState<InstantVerifyView>
}

Widget _portsCard(BuildContext context, WidgetRef ref) {
final state = ref.watch(dashboardHomeProvider);
final state = ref.watch(dashboardManagerProvider);
return AppCard(
key: const ValueKey('portCard'),
padding: EdgeInsets.zero,
Expand All @@ -739,7 +737,7 @@ class _InstantVerifyViewState extends ConsumerState<InstantVerifyView>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
...state.lanPortConnections
...state.lanConnections
.mapIndexed((index, e) => Expanded(
child: PortStatusWidget(
connection: e == 'None' ? null : e,
Expand All @@ -751,9 +749,9 @@ class _InstantVerifyViewState extends ConsumerState<InstantVerifyView>
.toList(),
Expanded(
child: PortStatusWidget(
connection: state.wanPortConnection == 'None'
connection: state.wanConnection == 'None'
? null
: state.wanPortConnection,
: state.wanConnection,
label: loc(context).wan,
isWan: true,
hasLanPorts: true, // Force vertical layout
Expand Down
8 changes: 3 additions & 5 deletions lib/page/wifi_settings/providers/wifi_bundle_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart';
import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart';
import 'package:privacy_gui/core/data/providers/device_manager_provider.dart';
import 'package:privacy_gui/page/dashboard/providers/dashboard_home_provider.dart';
import 'package:privacy_gui/page/instant_privacy/providers/instant_privacy_state.dart';
import 'package:privacy_gui/page/wifi_settings/providers/wifi_advanced_state.dart';
import 'package:privacy_gui/page/wifi_settings/providers/wifi_bundle_state.dart';
Expand Down Expand Up @@ -35,7 +34,6 @@ class WifiBundleNotifier extends Notifier<WifiBundleState>
WifiBundleState build() {
final dashboardManagerState = ref.read(dashboardManagerProvider);
final deviceManagerState = ref.read(deviceManagerProvider);
final homeState = ref.read(dashboardHomeProvider);

// Use service layer to create initial WiFi list settings
// This avoids importing JNAP models directly in the provider
Expand All @@ -55,7 +53,7 @@ class WifiBundleNotifier extends Notifier<WifiBundleState>
);

final initialWifiListStatus = WiFiListStatus(
canDisableMainWiFi: homeState.lanPortConnections.isNotEmpty);
canDisableMainWiFi: dashboardManagerState.lanConnections.isNotEmpty);

const initialAdvancedSettings = WifiAdvancedSettingsState();
final initialPrivacySettings = InstantPrivacySettings.init();
Expand Down Expand Up @@ -84,16 +82,16 @@ class WifiBundleNotifier extends Notifier<WifiBundleState>
@override
Future<(WifiBundleSettings?, WifiBundleStatus?)> performFetch(
{bool forceRemote = false, bool updateStatusOnly = false}) async {
final dashboardManagerState = ref.read(dashboardManagerProvider);
final deviceManagerState = ref.read(deviceManagerProvider);
final homeState = ref.read(dashboardHomeProvider);
final (newSettings, newStatus) =
await ref.read(wifiSettingsServiceProvider).fetchBundleSettings(
serviceHelper: serviceHelper,
forceRemote: forceRemote,
mainWifiDevices: deviceManagerState.mainWifiDevices,
guestWifiDevices: deviceManagerState.guestWifiDevices,
allDevices: deviceManagerState.deviceList,
isLanConnected: homeState.lanPortConnections.isNotEmpty,
isLanConnected: dashboardManagerState.lanConnections.isNotEmpty,
getBandConnectedBy: (device) => ref
.read(deviceManagerProvider.notifier)
.getBandConnectedBy(device),
Expand Down