Merge remote-tracking branch 'upstream/main' into feat/connect-wallet

src/index.tsx

@@ -21,6 +21,8 @@ import { CatchAllRoutePage } from "pages/catch-all";
 import { SettingsPage } from "pages/settings-page";
 import { register } from "serviceWorker";
 import { IntlProvider } from "intl";
+import { WidgetsPage } from "pages/widgets";
+import { AlertsPage } from "pages/alerts";
 
 export enum StreamState {
   Live = "live",
@@ -70,6 +72,10 @@ const router = createBrowserRouter([
         path: "/settings",
         element: <SettingsPage />,
       },
+      {
+        path: "/widgets",
+        element: <WidgetsPage />,
+      },
       {
         path: "*",
         element: <CatchAllRoutePage />,
@@ -79,6 +85,18 @@ const router = createBrowserRouter([
   {
     path: "/chat/:id",
     element: <ChatPopout />,
+    loader: async () => {
+      await System.Init();
+      return null;
+    },
+  },
+  {
+    path: "/alert/:id/:type",
+    element: <AlertsPage />,
+    loader: async () => {
+      await System.Init();
+      return null;
+    },
   },
 ]);
 const root = ReactDOM.createRoot(document.getElementById("root") as HTMLDivElement);