Skip to content

Commit

Permalink
fix: restore settings order (#1527)
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Setch <adam.setch@outlook.com>
  • Loading branch information
setchy authored Sep 16, 2024
1 parent d5616a1 commit 63e1720
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions src/context/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
markRepoNotificationsDone,
} = useNotifications();
getNotificationCount;

useEffect(() => {
restoreSettings();
}, []);
Expand Down Expand Up @@ -266,15 +267,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
await migrateAuthenticatedAccounts();
const existing = loadState();

if (existing.auth) {
setAuth({ ...defaultAuth, ...existing.auth });

// Refresh account data on app start
for (const account of existing.auth.accounts) {
await refreshAccount(account);
}
}

// Restore settings before accounts to ensure filters are available before fetching notifications
if (existing.settings) {
setKeyboardShortcut(existing.settings.keyboardShortcut);
setAlternateIdleIcon(existing.settings.useAlternateIdleIcon);
Expand All @@ -283,6 +276,15 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
zoomPercentageToLevel(existing.settings.zoomPercentage),
);
}

if (existing.auth) {
setAuth({ ...defaultAuth, ...existing.auth });

// Refresh account data on app start
for (const account of existing.auth.accounts) {
await refreshAccount(account);
}
}
}, []);

const fetchNotificationsWithAccounts = useCallback(
Expand Down

0 comments on commit 63e1720

Please sign in to comment.