Skip to content
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

fix: restore settings order #1527

Merged
merged 1 commit into from
Sep 16, 2024
Merged

fix: restore settings order #1527

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions src/context/App.tsx
View file
Open in desktop
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