finish rebasing

Author: atomicptr

src/app.tsx

@@ -26,7 +26,7 @@ import useIsLightMode from "@src/hooks/light-mode";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ErrorBoundary } from "react-error-boundary";
 import SomethingWentWrong from "@src/components/SometingWentWrong";
-import Privacy from "@src/pages/about/Privacy";
+import Privacy from "./pages/about/Privacy";
 
 const DauntlessBuilderApp = () => {
     const isMobile = useIsMobile();
@@ -114,6 +114,11 @@ const DauntlessBuilderApp = () => {
                                             path="/about"
                                         />
 
+                                        <Route
+                                            element={<Privacy />}
+                                            path="/privacy"
+                                        />
+
                                         <Route
                                             element={<Settings />}
                                             path="/settings"

src/components/AdSpace.tsx

@@ -1,9 +1,9 @@
 import { FeaturedVideo } from "@mui/icons-material";
 import { Box, useTheme } from "@mui/material";
-import { useAppSelector } from "@src/hooks/redux";
-import { selectEvents } from "@src/reducers/events/events-slice";
+import { eventsAtom } from "@src/state/events";
 import { adsEnabled } from "@src/utils/env-tools";
 import log from "@src/utils/logger";
+import { useAtomValue } from "jotai";
 import React, { useEffect } from "react";
 
 export enum UnitType {
@@ -19,7 +19,7 @@ interface AdSpaceProps {
 const AdSpace: React.FC<AdSpaceProps> = ({ unitType }) => {
     const theme = useTheme();
 
-    const events = useAppSelector(selectEvents);
+    const events = useAtomValue(eventsAtom);
 
     const selectorName = `db_unit_${unitType.toString()}`;
 

src/components/BuildMenu.tsx

@@ -13,8 +13,8 @@ import {
 } from "@src/state/favorites";
 import { buildIdRegex } from "@src/utils/build-id";
 import { defaultBuildName } from "@src/utils/default-build-name";
-import { useAtomValue, useSetAtom } from "jotai";
 import { adsEnabled } from "@src/utils/env-tools";
+import { useAtomValue, useSetAtom } from "jotai";
 import { useSnackbar } from "notistack";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";

src/components/Layout.tsx

@@ -43,9 +43,9 @@ import { crowdinLink, discordServerUrl, githubUrl, xTwitterUrl } from "@src/cons
 import dauntlessBuilderData from "@src/data/Data";
 import useDevMode from "@src/hooks/dev-mode";
 import useIsMobile from "@src/hooks/is-mobile";
+import useWindowSize from "@src/hooks/window-size";
 import { currentLanguage, getNativeLanguageName, isBetaLanguage, Language } from "@src/i18n";
 import { favoritesView } from "@src/state/favorites";
-import useWindowSize from "@src/hooks/window-size";
 import { adsEnabled } from "@src/utils/env-tools";
 import log from "@src/utils/logger";
 import { useAtomValue } from "jotai";

src/components/TrackingRampSetup.tsx

@@ -1,13 +1,13 @@
 import { UnitType } from "@src/components/AdSpace";
-import { useAppDispatch } from "@src/hooks/redux";
-import { playwireSetupFinished } from "@src/reducers/events/events-slice";
+import { eventsAtom, playwireSetupHasFinished } from "@src/state/events";
 import { adsEnabled } from "@src/utils/env-tools";
 import log from "@src/utils/logger";
+import { useSetAtom } from "jotai";
 import React, { useEffect } from "react";
 import ReactGA from "react-ga4";
 
 const TrackingRampSetup = () => {
-    const dispatch = useAppDispatch();
+    const setEvents = useSetAtom(eventsAtom);
 
     useEffect(() => {
         const ga4Enabled = navigator.doNotTrack !== "1" && DB_GA4_MEASUREMENT_ID !== null;
@@ -61,15 +61,15 @@ const TrackingRampSetup = () => {
                     window.ramp.displayUnits();
                 }
 
-                dispatch(playwireSetupFinished());
+                setEvents(playwireSetupHasFinished());
             });
 
             const rampScript = document.createElement("script");
             rampScript.src = `https://cdn.intergient.com/${DB_PW_PUBLISHER_ID}/${DB_PW_WEBSITE_ID}/ramp.js`;
             rampScript.async = true;
             document.body.appendChild(rampScript);
         }
-    }, [dispatch]);
+    }, [setEvents]);
 
     return null;
 };

src/reducers/events/events-slice.ts

@@ -0,0 +1,11 @@
+import { atom } from "jotai";
+
+export interface EventsState {
+    playwireSetupHasFinished: boolean;
+}
+
+export const eventsAtom = atom<EventsState>({
+    playwireSetupHasFinished: false,
+});
+
+export const playwireSetupHasFinished = () => (state: EventsState) => ({ ...state, playwireSetupHasFinished: true });