pepepper/fluxer
1
0
Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-07 19:22:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(app): show active incidents on the reconnecting banner (#3128)

Browse Source
This commit is contained in:
Hampus
2026-10-02 17:27:21 +02:00
committed by GitHub
parent ee74d61f27
commit b54016653b
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fluxer_app/src/features/app/hooks/useConnectionNotice.ts
+14 -13
View File
@@ -60,12 +60,12 @@ export interface ConnectionNoticeShape {
}
export function resolveConnectionNoticeShape(): ConnectionNoticeShape {
if (isClientReconnecting()) {
return {tone: ConnectionNoticeTone.NEUTRAL, hasActions: false};
}
if (StatusPage.scheduledMaintenance != null) {
return {tone: ConnectionNoticeTone.MAINTENANCE, hasActions: true};
}
if (isClientReconnecting()) {
return {tone: ConnectionNoticeTone.NEUTRAL, hasActions: StatusPage.incident != null};
}
return {tone: ConnectionNoticeTone.NEUTRAL, hasActions: true};
}
@@ -103,21 +103,14 @@ export function useConnectionNotice(): ConnectionNotice | null {
if (!forced && !connectionUnavailable) {
return null;
}
if (reconnecting) {
return {
tone: ConnectionNoticeTone.NEUTRAL,
message: i18n._(CONNECTION_LOST_DESCRIPTOR),
action: null,
showSwitchAccount: false,
};
}
const noticeShowsSwitchAccount = showSwitchAccount && !reconnecting;
const maintenance = StatusPage.scheduledMaintenance;
if (maintenance != null) {
return {
tone: ConnectionNoticeTone.MAINTENANCE,
message: maintenance.name,
action: {label: i18n._(VIEW_MAINTENANCE_DETAILS_DESCRIPTOR), url: maintenance.url},
showSwitchAccount,
showSwitchAccount: noticeShowsSwitchAccount,
};
}
const incident = StatusPage.incident;
@@ -126,7 +119,15 @@ export function useConnectionNotice(): ConnectionNotice | null {
tone: ConnectionNoticeTone.NEUTRAL,
message: incident.name,
action: {label: i18n._(VIEW_INCIDENT_DETAILS_DESCRIPTOR), url: incident.url},
showSwitchAccount,
showSwitchAccount: noticeShowsSwitchAccount,
};
}
if (reconnecting) {
return {
tone: ConnectionNoticeTone.NEUTRAL,
message: i18n._(CONNECTION_LOST_DESCRIPTOR),
action: null,
showSwitchAccount: false,
};
}
return {