Skip to content

A local-first personal finance app

ForceReload: update service worker refresh logic (#6162)

Matiss Janis Aboltinsde04af9ff0fa
diff --git a/packages/desktop-client/src/components/settings/Reset.tsx b/packages/desktop-client/src/components/settings/Reset.tsx
index 6f391ad549..2125ee8b05 100644
--- a/packages/desktop-client/src/components/settings/Reset.tsx
+++ b/packages/desktop-client/src/components/settings/Reset.tsx
@@ -96,17 +96,19 @@ export function ForceReload() {
async function onForceReload() {
setReloading(true);
try {
- if (isElectron()) {
- window.location.reload();
- } else {
- if (window.Actual?.applyAppUpdate) {
- await window.Actual.applyAppUpdate();
- } else {
- window.location.reload();
+ if (!isElectron()) {
+ const registration =
+ await window.navigator.serviceWorker.getRegistration('/');
+ if (registration) {
+ await registration.update();
+ if (registration.waiting) {
+ registration.waiting.postMessage({ type: 'SKIP_WAITING' });
+ }
}
}
} catch (error) {
- // If reload fails, fall back to location.reload()
+ // Do nothing
+ } finally {
window.location.reload();
}
}
diff --git a/upcoming-release-notes/6162.md b/upcoming-release-notes/6162.md
new file mode 100644
index 0000000000..ee6db77f20
--- /dev/null
+++ b/upcoming-release-notes/6162.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [MatissJanis]
+---
+
+Force reload: update logic for service worker data refresh