diff --git a/gui/app/src/components/onboarding/pages/connect-trackers/ConnectTrackers.tsx b/gui/app/src/components/onboarding/pages/connect-trackers/ConnectTrackers.tsx index 18e9d6649..9fa3666c5 100644 --- a/gui/app/src/components/onboarding/pages/connect-trackers/ConnectTrackers.tsx +++ b/gui/app/src/components/onboarding/pages/connect-trackers/ConnectTrackers.tsx @@ -383,6 +383,31 @@ export function ConnectTrackersPage() { ).length; const allTrackersDone = totalTrackersCount > 0 && connectingCount === 0; + const hasScanResults = + scanStatus === WifiScanStatus.RESULTS || networks.length > 0; + const summaryTitleId = + totalTrackersCount === 0 + ? hasScanResults + ? 'onboarding-connect_tracker-scan_results_title' + : 'onboarding-connect_tracker-waiting_first_title' + : 'onboarding-connect_tracker-connected_trackers'; + const summaryDescId = + totalTrackersCount === 0 + ? hasScanResults + ? 'onboarding-connect_tracker-scan_results_desc' + : 'onboarding-connect_tracker-waiting_first_desc' + : connectingCount > 0 + ? 'onboarding-connect_tracker-setting_up' + : 'onboarding-connect_tracker-all_caught_up'; + const summaryStatusColor = + totalTrackersCount === 0 + ? hasScanResults + ? 'bg-status-warning animate-pulse' + : 'bg-background-40' + : connectingCount > 0 + ? 'bg-status-warning animate-pulse' + : 'bg-status-success'; + applyProgress(0.4); const invalidNetworkProfile = useMemo(() => { @@ -519,29 +544,13 @@ export function ConnectTrackersPage() { 0 - ? 'onboarding-connect_tracker-scan_results_title' - : 'onboarding-connect_tracker-waiting_first_title' - : 'onboarding-connect_tracker-connected_trackers' - } + id={summaryTitleId} vars={{ amount: connectedCount }} /> 0 - ? 'onboarding-connect_tracker-scan_results_desc' - : 'onboarding-connect_tracker-waiting_first_desc' - : connectingCount > 0 - ? 'onboarding-connect_tracker-setting_up' - : 'onboarding-connect_tracker-all_caught_up' - } + id={summaryDescId} vars={{ amount: connectingCount }} /> @@ -550,13 +559,7 @@ export function ConnectTrackersPage() {
0 - ? 'bg-status-warning animate-pulse' - : 'bg-background-40' - : connectingCount > 0 - ? 'bg-status-warning animate-pulse' - : 'bg-status-success' + summaryStatusColor )} /> } @@ -566,8 +569,7 @@ export function ConnectTrackersPage() { provisioningTrackers.length > 0 || scanStatus === WifiScanStatus.SERIAL_INIT || scanStatus === WifiScanStatus.SCANNING || - scanStatus === WifiScanStatus.RESULTS || - networks.length > 0 + hasScanResults } >