Skip to content

Commit b5317da

Browse files
committed
fix: settings router
1 parent 8f98c8a commit b5317da

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

src/background/modules/badge.ts

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,20 @@ export async function refreshActionBadge(enabled: boolean, count: number) {
1212
const getIconPath = (size: number) =>
1313
browser.runtime.getURL(enabled ? `icon-${size}.png` : `icon-gray-${size}.png`);
1414

15-
browser.action.setBadgeBackgroundColor({
16-
color: settings.badge.color,
17-
});
15+
await Promise.allSettled([
16+
browser.action.setBadgeBackgroundColor({
17+
color: settings.badge.color,
18+
}),
1819

19-
browser.action.setBadgeText({
20-
text,
21-
});
20+
browser.action.setBadgeText({
21+
text,
22+
}),
2223

23-
browser.action.setIcon({
24-
path: {
25-
16: getIconPath(16),
26-
32: getIconPath(32),
27-
},
28-
});
24+
browser.action.setIcon({
25+
path: {
26+
16: getIconPath(16),
27+
32: getIconPath(32),
28+
},
29+
}),
30+
]);
2931
}

src/browser/pages/settings.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { createHashRouter, redirect, RouterProvider } from "react-router";
1+
import { createHashRouter, Navigate, RouterProvider } from "react-router";
22

33
import { SettingsProvider } from "../contexts";
44

55
const router = createHashRouter([
66
{
77
index: true,
8-
loader: () => redirect("general"),
8+
element: <Navigate replace to="general" />,
99
},
1010
{
1111
lazy: () => import("../views/settings/Root"),

0 commit comments

Comments
 (0)