Merge pull request #164 from xai-foundation/develop

Develop
xai-foundation · May 30, 2024 · 4a27ad3 · 4a27ad3
2 parents 13d9d78 + a9b329b
commit 4a27ad3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
@@ -11,7 +11,7 @@ import {AiOutlineInfoCircle} from "react-icons/ai";
 export function WhitelistDrawer() {
 	const setDrawerState = useSetAtom(drawerStateAtom);
 	const {owners, pools} = useAtomValue(chainStateAtom);
-	const {data, setData} = useStorage();
+	const {data} = useStorage();
 	const [selected, setSelected] = useState<string[]>([]);
 	const {sentryRunning, stopRuntime} = useOperatorRuntime();
 	const {publicKey: operatorAddress} = useOperator();
@@ -82,14 +82,14 @@ export function WhitelistDrawer() {
 	);
 
 	async function handleSubmit() {
-		await setData({
-			...data,
-			whitelistedWallets: selected,
-		});
-
 		setDrawerState(null);
+
 		if (stopRuntime) {
-			void stopRuntime();
+			void stopRuntime({
+				...data,
+				sentryRunning: false,
+				whitelistedWallets: selected,
+			});
 		}
 	}
 

diff --git a/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts b/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
@@ -2,7 +2,7 @@ import {Challenge, NodeLicenseInformation, NodeLicenseStatusMap, operatorRuntime
 import {useOperator} from "@/features/operator";
 import {atom, useAtom} from "jotai";
 import {useEffect, useRef, useState} from "react";
-import {useStorage} from "@/features/storage";
+import {IData, useStorage} from "@/features/storage";
 import log from "electron-log";
 import { ethers } from "ethers";
 
@@ -70,7 +70,7 @@ export function useOperatorRuntime() {
 		}
 	}
 
-	async function stopRuntime() {
+	async function stopRuntime(passedData?: IData) {
 		if (sentryRunning && stop !== undefined) {
 			// prevent race conditions from pressing "stop" too fast
 			const _stop = stop;
@@ -79,7 +79,11 @@ export function useOperatorRuntime() {
 			await _stop();
 			setNodeLicenseStatusMap(new Map<bigint, NodeLicenseInformation>());
 			setSentryRunning(false);
-			await setData({...data, sentryRunning: false});
+			if (passedData) {
+				await setData(passedData);
+			} else {
+				await setData({...data, sentryRunning: false});
+			}
 		}
 	}
 

diff --git a/apps/web-connect/src/features/header/Header.tsx b/apps/web-connect/src/features/header/Header.tsx
@@ -1,4 +1,3 @@
-import {useNavigate} from "react-router-dom";
 import {ConnectButton, ExternalLink} from "@sentry/ui";
 import {useWeb3Modal} from "@web3modal/wagmi/react";
 import {useAccount} from "wagmi";
@@ -8,19 +7,18 @@ import MobileNavbar from "@/features/header/MobileNavbar";
 import {useState} from "react";
 
 export function Header() {
-	const navigate = useNavigate();
 	const {open} = useWeb3Modal();
 	const {address} = useAccount()
 	const [isNavbarOpened, setIsNavbarOpened] = useState(false)
 	return (
 		<div className="w-full">
 			<div className="fixed top-0 flex w-full justify-between items-center bg-transparent z-[10]">
-				<div
+				<a
 					className="w-full group md:max-w-[108px] md:min-h-[108px] min-h-[64px] max-w-[64px] flex items-center bg-hornetSting justify-center hover:bg-white duration-200 ease-in cursor-pointer"
-					onClick={() => navigate("/")}
+					href="https://xai.games/"
 				>
 					<XaiLogo className="md:w-[43px] md:h-[38px] w-[26px] h-[23px] fill-white group-hover:fill-hornetSting duration-200 ease-in" />
-				</div>
+				</a>
 				<div className="font-bold text-xl items-center gap-[20px] uppercase text-white hidden md:flex">
 					<ExternalLink
 						content={"DOCS"}