From 140c1b15237f5482f1aa566ececc597462837a1a Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Fri, 15 Dec 2023 12:29:02 -0800
Subject: [PATCH 01/32] Initial commit

---
 .../src/features/router/AppRoutes.tsx         |   4 +-
 .../features/wallet/routes/ConnectWallet.tsx  |  63 ----------
 .../wallet/routes/SentryKeyRedemption.tsx     | 117 ++++++++++++++++++
 apps/web-connect/src/main.tsx                 |   6 +-
 4 files changed, 124 insertions(+), 66 deletions(-)
 delete mode 100644 apps/web-connect/src/features/wallet/routes/ConnectWallet.tsx
 create mode 100644 apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx

diff --git a/apps/web-connect/src/features/router/AppRoutes.tsx b/apps/web-connect/src/features/router/AppRoutes.tsx
index 604b33875..4a5ce27f2 100644
--- a/apps/web-connect/src/features/router/AppRoutes.tsx
+++ b/apps/web-connect/src/features/router/AppRoutes.tsx
@@ -1,7 +1,6 @@
 import {HashRouter as Router, Navigate, Route, Routes} from 'react-router-dom';
 import {QueryClient, QueryClientProvider} from "react-query";
 import {Checkout} from "../checkout";
-import {ConnectWallet} from "../wallet/routes/ConnectWallet.js";
 import {AssignWallet} from "../wallet/routes/AssignWallet.js";
 import {UnassignWallet} from "@/features/wallet/routes/UnassignWallet";
 import {Header} from "@/features/header/Header";
@@ -9,6 +8,7 @@ import {useEffect, useState} from "react";
 import axios from "axios";
 import {BiLoaderAlt} from "react-icons/bi";
 import {Footer} from "@/features/footer/Footer";
+import {SentryKeyRedemption} from "@/features/wallet/routes/SentryKeyRedemption";
 
 enum IpBanType {
 	INVALID_IP = "INVALID_IP",
@@ -76,9 +76,9 @@ export function AppRoutes() {
 					<Header/>
 					<Routes>
 						<Route path="/" element={<Checkout/>}/>
-						<Route path="/connect-wallet" element={<ConnectWallet/>}/>
 						<Route path="/assign-wallet/:operatorAddress" element={<AssignWallet/>}/>
 						<Route path="/unassign-wallet/:operatorAddress" element={<UnassignWallet/>}/>
+						<Route path="/sentrykeyredemption" element={<SentryKeyRedemption/>}/>
 						<Route path="*" element={<Navigate to="/" replace={true}/>}/>
 					</Routes>
 					<Footer/>
diff --git a/apps/web-connect/src/features/wallet/routes/ConnectWallet.tsx b/apps/web-connect/src/features/wallet/routes/ConnectWallet.tsx
deleted file mode 100644
index c1f0d557b..000000000
--- a/apps/web-connect/src/features/wallet/routes/ConnectWallet.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import {useNavigate} from "react-router-dom";
-import {useAccount} from "wagmi";
-import {FaCircleCheck} from "react-icons/fa6";
-import {XaiBanner} from "@/features/checkout/XaiBanner";
-
-export function ConnectWallet() {
-	const {address} = useAccount()
-	const navigate = useNavigate();
-
-	return (
-		<div>
-			<div className="h-full min-h-[90vh] flex flex-col justify-center items-center">
-				<XaiBanner/>
-
-				{address ? (
-					<div
-						className="flex flex-col justify-center items-center w-[744px] h-[270px] border border-gray-200 bg-white m-4">
-						<div
-							className="flex flex-col justify-center items-center gap-2">
-							<FaCircleCheck color={"#16A34A"} size={32}/>
-							<span className="text-2xl font-semibold mt-2">Wallet successfully connected</span>
-
-							<button
-								onClick={() => alert("Return to Xai")}
-								className="w-[436px] bg-[#F30919] text-white p-4 font-semibold mt-8"
-							>
-								Return to Xai Client
-							</button>
-						</div>
-					</div>
-				) : (
-					<div
-						className="flex flex-col justify-center items-center w-[744px] border border-gray-200 bg-white m-4 p-12">
-						<div className="flex flex-col justify-center items-center gap-4">
-							<p className="text-3xl font-semibold">
-								Connect Wallet
-							</p>
-							<p className="text-lg text-[#525252] max-w-[590px] text-center">
-								This enables viewing purchased Xai Sentry Keys in the Xai Client.
-								<br/>
-								After connecting your wallet, you will redirected back to the client.
-							</p>
-
-							<div className="m-8">
-								<w3m-button/>
-							</div>
-
-							<p className="text-[#525252] mt-2">
-								Don't own any keys?
-								<a
-									onClick={() => navigate("/")}
-									className="text-[#F30919] ml-1 cursor-pointer"
-								>
-									Purchase keys here
-								</a>
-							</p>
-						</div>
-					</div>
-				)}
-			</div>
-		</div>
-	)
-}
diff --git a/apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx b/apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx
new file mode 100644
index 000000000..c2fb2878b
--- /dev/null
+++ b/apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx
@@ -0,0 +1,117 @@
+import {useNavigate, useParams} from "react-router-dom";
+import {useAccount, useContractWrite, useNetwork} from "wagmi";
+import {config, NodeLicenseAbi, RefereeAbi} from "@sentry/core";
+import {XaiBanner} from "@/features/checkout/XaiBanner";
+import {XaiCheckbox} from "@sentry/ui";
+import {KYCTooltip} from "@/features/checkout/KYCTooltip";
+import {useState} from "react";
+
+export function SentryKeyRedemption() {
+	const navigate = useNavigate();
+	const params = useParams<{ operatorAddress: string }>();
+	const {address} = useAccount();
+	const {chain} = useNetwork();
+	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
+	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
+	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
+	const ready = checkboxOne && checkboxTwo && checkboxThree;
+
+	const {isLoading, isSuccess, write, error, data} = useContractWrite({
+		address: config.nodeLicenseAddress as `0x${string}`,
+		abi: NodeLicenseAbi,
+		functionName: "whitelistAmounts",
+		args: [params.operatorAddress, true],
+		onSuccess(data) {
+			window.location = `xai-sentry://assigned-wallet?txHash=${data.hash}` as unknown as Location;
+		},
+		onError(error) {
+			console.warn("Error", error);
+		},
+	});
+
+	function returnToClient() {
+		window.location = `xai-sentry://assigned-wallet?txHash=${data?.hash}` as unknown as Location;
+	}
+
+	return (
+		<div>
+			<div className="h-full min-h-[90vh] flex flex-col justify-center items-center">
+				<XaiBanner/>
+				<div
+					className="flex flex-col justify-center items-center w-[744px] border border-gray-200 bg-white m-4 p-12">
+					<div
+						className="flex flex-col justify-center items-center gap-2 w-full overflow-hidden">
+						<p className="text-3xl font-semibold">
+							Redeem Sentry Keys
+						</p>
+						<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+							Buyer Beware.
+						</p>
+						{error && (
+							<p className="text-center break-words w-full mt-4 text-red-500">
+								{error.message}
+							</p>
+						)}
+						{address ? (
+							<div className="flex flex-col justify-center gap-8 p-6 mt-8">
+								<div className="flex flex-col justify-center gap-2">
+									<XaiCheckbox
+										onClick={() => setCheckboxOne(!checkboxOne)}
+										condition={checkboxOne}
+									>
+										I agree with the
+										<a
+											className="cursor-pointer text-[#F30919]"
+											onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>
+											Sentry Node Agreement
+										</a>
+									</XaiCheckbox>
+
+
+									<XaiCheckbox
+										onClick={() => setCheckboxTwo(!checkboxTwo)}
+										condition={checkboxTwo}
+									>
+										I understand Sentry Node Keys are not transferable
+									</XaiCheckbox>
+
+									<XaiCheckbox
+										onClick={() => setCheckboxThree(!checkboxThree)}
+										condition={checkboxThree}
+									>
+										I understand that I cannot claim rewards until I pass KYC
+										<KYCTooltip
+											width={850}
+										>
+											<p className="text-[#F30919]">(SEE BLOCKED COUNTRIES)</p>
+										</KYCTooltip>
+									</XaiCheckbox>
+								</div>
+
+								<div>
+									<button
+										// onClick={() => onClick()}
+										className={`w-full h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
+										disabled={!ready || chain?.id !== 42_161}
+									>
+										{chain?.id === 42_161 ? "Redeem Keys" : "Please Switch to Arbitrum One"}
+									</button>
+
+									{error && (
+										<p className="text-center break-words w-full mt-4 text-red-500">
+											{error.message}
+										</p>
+									)}
+								</div>
+							</div>
+						) : (
+							<div className="m-8">
+								<w3m-button/>
+							</div>
+						)}
+					</div>
+				</div>
+			</div>
+		</div>
+	)
+}
diff --git a/apps/web-connect/src/main.tsx b/apps/web-connect/src/main.tsx
index cf297ec85..bfcadc9a1 100644
--- a/apps/web-connect/src/main.tsx
+++ b/apps/web-connect/src/main.tsx
@@ -17,7 +17,11 @@ const metadata = {
 	icons: ['https://avatars.githubusercontent.com/u/37784886']
 }
 
-const wagmiConfig = defaultWagmiConfig({chains, projectId, metadata})
+const wagmiConfig = defaultWagmiConfig({
+	chains,
+	projectId,
+	metadata
+})
 
 createWeb3Modal({wagmiConfig, projectId, chains})
 

From 71ff2e8585d9a42a5ba68f19c3883f216ab79294 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Fri, 15 Dec 2023 12:32:17 -0800
Subject: [PATCH 02/32] Cleanup imports

---
 .../wallet/routes/SentryKeyRedemption.tsx     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx b/apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx
index c2fb2878b..3530af39c 100644
--- a/apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx
+++ b/apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx
@@ -1,13 +1,13 @@
-import {useNavigate, useParams} from "react-router-dom";
+import {useParams} from "react-router-dom";
 import {useAccount, useContractWrite, useNetwork} from "wagmi";
-import {config, NodeLicenseAbi, RefereeAbi} from "@sentry/core";
+import {config, NodeLicenseAbi} from "@sentry/core";
 import {XaiBanner} from "@/features/checkout/XaiBanner";
 import {XaiCheckbox} from "@sentry/ui";
 import {KYCTooltip} from "@/features/checkout/KYCTooltip";
 import {useState} from "react";
 
 export function SentryKeyRedemption() {
-	const navigate = useNavigate();
+	// const navigate = useNavigate();
 	const params = useParams<{ operatorAddress: string }>();
 	const {address} = useAccount();
 	const {chain} = useNetwork();
@@ -16,7 +16,8 @@ export function SentryKeyRedemption() {
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
 	const ready = checkboxOne && checkboxTwo && checkboxThree;
 
-	const {isLoading, isSuccess, write, error, data} = useContractWrite({
+	// const {isLoading, isSuccess, write, error, data} = useContractWrite({
+	const {write, error} = useContractWrite({
 		address: config.nodeLicenseAddress as `0x${string}`,
 		abi: NodeLicenseAbi,
 		functionName: "whitelistAmounts",
@@ -29,9 +30,9 @@ export function SentryKeyRedemption() {
 		},
 	});
 
-	function returnToClient() {
-		window.location = `xai-sentry://assigned-wallet?txHash=${data?.hash}` as unknown as Location;
-	}
+	// function returnToClient() {
+	// 	window.location = `xai-sentry://assigned-wallet?txHash=${data?.hash}` as unknown as Location;
+	// }
 
 	return (
 		<div>
@@ -90,11 +91,11 @@ export function SentryKeyRedemption() {
 
 								<div>
 									<button
-										// onClick={() => onClick()}
+										onClick={() => write}
 										className={`w-full h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
 										disabled={!ready || chain?.id !== 42_161}
 									>
-										{chain?.id === 42_161 ? "Redeem Keys" : "Please Switch to Arbitrum One"}
+										{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
 									</button>
 
 									{error && (

From a4ff1abb0b722f517d5a57b95832cfb7e42290e0 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Fri, 15 Dec 2023 13:38:37 -0800
Subject: [PATCH 03/32] Update route name + cleanup

---
 apps/web-connect/src/features/router/AppRoutes.tsx         | 4 ++--
 .../routes/{SentryKeyRedemption.tsx => DropClaim.tsx}      | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename apps/web-connect/src/features/wallet/routes/{SentryKeyRedemption.tsx => DropClaim.tsx} (95%)

diff --git a/apps/web-connect/src/features/router/AppRoutes.tsx b/apps/web-connect/src/features/router/AppRoutes.tsx
index 4a5ce27f2..d6ef83c59 100644
--- a/apps/web-connect/src/features/router/AppRoutes.tsx
+++ b/apps/web-connect/src/features/router/AppRoutes.tsx
@@ -8,7 +8,7 @@ import {useEffect, useState} from "react";
 import axios from "axios";
 import {BiLoaderAlt} from "react-icons/bi";
 import {Footer} from "@/features/footer/Footer";
-import {SentryKeyRedemption} from "@/features/wallet/routes/SentryKeyRedemption";
+import {DropClaim} from "@/features/wallet/routes/DropClaim";
 
 enum IpBanType {
 	INVALID_IP = "INVALID_IP",
@@ -78,7 +78,7 @@ export function AppRoutes() {
 						<Route path="/" element={<Checkout/>}/>
 						<Route path="/assign-wallet/:operatorAddress" element={<AssignWallet/>}/>
 						<Route path="/unassign-wallet/:operatorAddress" element={<UnassignWallet/>}/>
-						<Route path="/sentrykeyredemption" element={<SentryKeyRedemption/>}/>
+						<Route path="/dropclaim" element={<DropClaim/>}/>
 						<Route path="*" element={<Navigate to="/" replace={true}/>}/>
 					</Routes>
 					<Footer/>
diff --git a/apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
similarity index 95%
rename from apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx
rename to apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index 3530af39c..cabf628c6 100644
--- a/apps/web-connect/src/features/wallet/routes/SentryKeyRedemption.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -1,4 +1,3 @@
-import {useParams} from "react-router-dom";
 import {useAccount, useContractWrite, useNetwork} from "wagmi";
 import {config, NodeLicenseAbi} from "@sentry/core";
 import {XaiBanner} from "@/features/checkout/XaiBanner";
@@ -6,9 +5,8 @@ import {XaiCheckbox} from "@sentry/ui";
 import {KYCTooltip} from "@/features/checkout/KYCTooltip";
 import {useState} from "react";
 
-export function SentryKeyRedemption() {
+export function DropClaim() {
 	// const navigate = useNavigate();
-	const params = useParams<{ operatorAddress: string }>();
 	const {address} = useAccount();
 	const {chain} = useNetwork();
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
@@ -21,7 +19,8 @@ export function SentryKeyRedemption() {
 		address: config.nodeLicenseAddress as `0x${string}`,
 		abi: NodeLicenseAbi,
 		functionName: "whitelistAmounts",
-		args: [params.operatorAddress, true],
+		args: [],
+		// args: [params.operatorAddress, true],
 		onSuccess(data) {
 			window.location = `xai-sentry://assigned-wallet?txHash=${data.hash}` as unknown as Location;
 		},

From ff672d4308107c687eee54752c89f74e4a3f8456 Mon Sep 17 00:00:00 2001
From: Christopher Powroznik <christopher@frameonesoftware.com>
Date: Sun, 17 Dec 2023 17:48:32 -0800
Subject: [PATCH 04/32] whitelist implemented

---
 .../operator-control/operator-runtime.ts      | 40 ++++++++++++++++++-
 packages/core/src/operator/operatorRuntime.ts | 17 +++++++-
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/apps/cli/src/commands/operator-control/operator-runtime.ts b/apps/cli/src/commands/operator-control/operator-runtime.ts
index 831bd64b4..3eacb2a3b 100644
--- a/apps/cli/src/commands/operator-control/operator-runtime.ts
+++ b/apps/cli/src/commands/operator-control/operator-runtime.ts
@@ -1,5 +1,5 @@
 import Vorpal from "vorpal";
-import { getSignerFromPrivateKey, operatorRuntime } from "@sentry/core";
+import { getSignerFromPrivateKey, operatorRuntime, listOwnersForOperator } from "@sentry/core";
 
 /**
  * Starts a runtime of the operator.
@@ -17,6 +17,7 @@ export function bootOperator(cli: Vorpal) {
                 message: 'Enter the private key of the operator:',
                 mask: '*'
             };
+
             const { walletKey } = await this.prompt(walletKeyPrompt);
 
             if (!walletKey || walletKey.length < 1) {
@@ -25,10 +26,45 @@ export function bootOperator(cli: Vorpal) {
 
             const { signer } = getSignerFromPrivateKey(walletKey);
 
+            const whitelistPrompt: Vorpal.PromptObject = {
+                type: 'confirm',
+                name: 'useWhitelist',
+                message: 'Do you want to use a whitelist for the operator runtime?',
+                default: false
+            };
+
+            const { useWhitelist } = await this.prompt(whitelistPrompt);
+
+            // If useWhitelist is false, selectedOwners will be undefined
+            let selectedOwners;
+            if (useWhitelist) {
+                
+                const operatorAddress = await signer.getAddress();
+                const owners = await listOwnersForOperator(operatorAddress);
+
+                const ownerPrompt: Vorpal.PromptObject = {
+                    type: 'checkbox',
+                    name: 'selectedOwners',
+                    message: 'Select the owners for the operator to run for:',
+                    choices: [operatorAddress, ...owners]
+                };
+
+                const result = await this.prompt(ownerPrompt);
+                selectedOwners = result.selectedOwners;
+
+                console.log("selectedOwners", selectedOwners);
+
+                if (!selectedOwners || selectedOwners.length < 1) {
+                    throw new Error("No owners selected. Please select at least one owner.")
+                }
+            }
+
+
             stopFunction = await operatorRuntime(
                 signer,
                 undefined,
-                (log) => this.log(log)
+                (log) => this.log(log),
+                selectedOwners,
             );
 
             return new Promise((resolve, reject) => { }); // Keep the command alive
diff --git a/packages/core/src/operator/operatorRuntime.ts b/packages/core/src/operator/operatorRuntime.ts
index 726f23844..8dac34b0f 100644
--- a/packages/core/src/operator/operatorRuntime.ts
+++ b/packages/core/src/operator/operatorRuntime.ts
@@ -24,12 +24,14 @@ export type NodeLicenseStatusMap = Map<bigint, NodeLicenseInformation>;
  * @param {ethers.Signer} signer - The signer.
  * @param {((status: NodeLicenseStatusMap) => void)} [statusCallback] - Optional function to monitor the status of the runtime.
  * @param {((log: string) => void)} [logFunction] - Optional function to log the process.
+ * @param {string[]} [operatorOwners] - Optional array of addresses that should replace "owners" if passed in.
  * @returns {Promise<() => Promise<void>>} The stop function.
  */
 export async function operatorRuntime(
     signer: ethers.Signer,
     statusCallback: (status: NodeLicenseStatusMap) => void = (_) => {},
     logFunction: (log: string) => void = (_) => {},
+    operatorOwners?: string[],
 ): Promise<() => Promise<void>> {
 
     logFunction(`[${new Date().toISOString()}] Booting operator runtime.`);
@@ -57,8 +59,15 @@ export async function operatorRuntime(
 
     // get a list of all the owners that are added to this operator
     logFunction(`[${new Date().toISOString()}] Getting all wallets assigned to the operator.`);
-    const owners = [operatorAddress, ...await retry(async () => await listOwnersForOperator(operatorAddress))];
-    logFunction(`[${new Date().toISOString()}] Received ${owners.length} wallets that are assigned to this operator.`);
+    let owners: string[];
+    if (operatorOwners) {
+        logFunction(`[${new Date().toISOString()}] Operator owners were passed in.`);
+        owners = Array.from(new Set(operatorOwners));
+    } else {
+        logFunction(`[${new Date().toISOString()}] No operator owners were passed in.`);
+        owners = [operatorAddress, ...await retry(async () => await listOwnersForOperator(operatorAddress))];
+    }
+    logFunction(`[${new Date().toISOString()}] Received ${owners.length} wallets to run with this operator. The addresses are: ${owners.join(', ')}`);
 
     // get a list of all the node licenses for each of the owners
     let nodeLicenseIds: bigint[] = [];
@@ -78,6 +87,10 @@ export async function operatorRuntime(
     }
     logFunction(`[${new Date().toISOString()}] Total Sentry Keys fetched: ${nodeLicenseIds.length}.`);
 
+    if (nodeLicenseIds.length === 0) {
+        throw new Error("No Sentry Keys found.");
+    }
+
     // create a mapping of all the timestamps these nodeLicenses were created at, so we can easily check the eligibility later
     logFunction(`[${new Date().toISOString()}] Checking Sentry Key eligibility.`);
     const mintTimestamps: { [nodeLicenseId: string]: bigint } = {};

From c395baa326cebefbb2f159bdc8af253855c1ff76 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Mon, 18 Dec 2023 12:14:20 -0800
Subject: [PATCH 05/32] Implements WhitelistDrawer

---
 .../components/AssignKeysFromNewWallet.tsx    |  7 +-
 .../src/features/drawer/DrawerManager.tsx     |  8 +-
 .../src/features/drawer/WhitelistDrawer.tsx   | 79 +++++++++++++++++++
 .../src/features/home/GetSentryNode.tsx       | 10 ++-
 .../src/features/home/SentryWallet.tsx        |  7 +-
 .../actions-required/AssignedKeysCard.tsx     | 12 +--
 .../src/features/keys/HasKeys.tsx             | 10 ++-
 .../src/features/storage/useStorage.tsx       |  1 +
 .../useListOwnersForOperatorWithCallback.ts   |  3 +-
 .../ui/src/features/buttons/XaiButton.tsx     | 21 +++++
 packages/ui/src/features/buttons/index.ts     |  1 +
 .../ui/src/features/checkbox/XaiCheckbox.tsx  |  5 +-
 packages/ui/src/features/index.ts             |  1 +
 13 files changed, 143 insertions(+), 22 deletions(-)
 create mode 100644 apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
 create mode 100644 packages/ui/src/features/buttons/XaiButton.tsx
 create mode 100644 packages/ui/src/features/buttons/index.ts

diff --git a/apps/sentry-client-desktop/src/components/AssignKeysFromNewWallet.tsx b/apps/sentry-client-desktop/src/components/AssignKeysFromNewWallet.tsx
index 8017f8884..9fd60ed23 100644
--- a/apps/sentry-client-desktop/src/components/AssignKeysFromNewWallet.tsx
+++ b/apps/sentry-client-desktop/src/components/AssignKeysFromNewWallet.tsx
@@ -4,6 +4,7 @@ import {useSetAtom} from "jotai";
 import {AiFillWarning} from "react-icons/ai";
 import {useOperator} from "@/features/operator";
 import {modalStateAtom, ModalView} from "@/features/modal/ModalManager";
+import {XaiButton} from "@sentry/ui";
 
 export function AssignKeysFromNewWallet() {
 	const setDrawerState = useSetAtom(drawerStateAtom);
@@ -25,14 +26,14 @@ export function AssignKeysFromNewWallet() {
 				Add wallets to assign keys to the Sentry
 			</p>
 
-			<button
+			<XaiButton
 				onClick={startAssignment}
 				disabled={isOperatorLoading}
-				className="flex justify-center items-center gap-1 text-[15px] text-white bg-[#F30919] font-semibold mt-2 px-6 py-3"
+				fontSize={"15px"}
 			>
 				Assign keys from new wallet
 				<BiLinkExternal className="w-5 h-5"/>
-			</button>
+			</XaiButton>
 
 			<p className="text-[15px] text-[#525252] mt-2">
 				Don't own any keys?
diff --git a/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx b/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx
index de7879a16..46cec5830 100644
--- a/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx
+++ b/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx
@@ -6,12 +6,14 @@ import {ViewKeysDrawer} from "../home/modals/view-keys/ViewKeysDrawer";
 import {ActionsRequiredNotAccruingDrawer} from "../home/modals/actions-required/ActionsRequiredNotAccruingDrawer";
 import {ExportSentryDrawer} from "../home/modals/ExportSentryDrawer";
 import {ImportSentryDrawer} from "../home/modals/ImportSentryDrawer";
+import {WhitelistDrawer} from "@/features/drawer/WhitelistDrawer";
 
 export enum DrawerView {
 	ActionsRequiredBuy,
 	ActionsRequiredNotAccruing,
 	BuyKeys,
 	ViewKeys,
+	Whitelist,
 	ImportSentry,
 	ExportSentry,
 }
@@ -23,7 +25,7 @@ export function DrawerManager() {
 
 	return (
 		<div
-			className={classNames("sticky w-[28rem] min-w-[28rem] h-screen relative z-10 bg-white border border-gray-200 overflow-y-scroll", {
+			className={classNames("sticky w-[28rem] min-w-[28rem] h-screen z-10 bg-white border border-gray-200 overflow-y-scroll", {
 				"hidden": drawerState === null,
 			})}
 		>
@@ -43,6 +45,10 @@ export function DrawerManager() {
 				<ViewKeysDrawer/>
 			)}
 
+			{drawerState === DrawerView.Whitelist && (
+				<WhitelistDrawer/>
+			)}
+
 			{drawerState === DrawerView.ImportSentry && (
 				<ImportSentryDrawer/>
 			)}
diff --git a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
new file mode 100644
index 000000000..c574a613c
--- /dev/null
+++ b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
@@ -0,0 +1,79 @@
+import {AiOutlineClose} from "react-icons/ai";
+import {useAtomValue, useSetAtom} from "jotai";
+import {drawerStateAtom} from "@/features/drawer/DrawerManager";
+import {chainStateAtom} from "@/hooks/useChainDataWithCallback";
+import {useCombinedOwners} from "@/hooks/useCombinedOwners";
+import {XaiButton, XaiCheckbox} from "@sentry/ui";
+import {useState} from "react";
+import {useStorage} from "@/features/storage";
+
+export function WhitelistDrawer() {
+	const setDrawerState = useSetAtom(drawerStateAtom);
+	const {owners} = useAtomValue(chainStateAtom);
+	const {data, setData} = useStorage();
+	const {combinedOwners} = useCombinedOwners(owners);
+	const [selected, setSelected] = useState<string[]>([]);
+
+	const toggleSelected = (wallet: string) => {
+		setSelected((prevSelected) =>
+			prevSelected.includes(wallet)
+				? prevSelected.filter((item) => item !== wallet)
+				: [...prevSelected, wallet]
+		);
+	};
+
+	const getDropdownItems = () => (
+		<div>
+			{combinedOwners.map((wallet, i) => (
+				<div
+					className="p-2 cursor-pointer hover:bg-gray-100"
+					key={`whitelist-item-${i}`}
+				>
+					<XaiCheckbox
+						onClick={() => toggleSelected(wallet)}
+						condition={selected.includes(wallet)}
+					>
+						{wallet}
+					</XaiCheckbox>
+				</div>
+			))}
+		</div>
+	);
+
+	function handleSubmit() {
+		setData({
+			...data,
+			whitelistedWallets: selected,
+		});
+		setDrawerState(null);
+	}
+
+	return (
+		<div className="relative h-full flex flex-col justify-start items-center">
+			<div
+				className="w-full h-[4rem] min-h-[4rem] flex flex-row justify-between items-center border-b border-gray-200 text-lg font-semibold px-8">
+				<div className="flex flex-row gap-2 items-center">
+					<p>Whitelist Wallet</p>
+				</div>
+				<div className="cursor-pointer z-10" onClick={() => setDrawerState(null)}>
+					<AiOutlineClose/>
+				</div>
+			</div>
+
+			<div className="flex-grow overflow-y-scroll max-h-[calc(100vh-4rem)] px-6 pt-[1rem]">
+				<p className="mb-2">
+					Select wallets that you would like to whitelist to your operator:
+				</p>
+				<div>
+					{getDropdownItems()}
+				</div>
+			</div>
+
+			<div className="flex-shrink-0 h-16 bg-white flex items-center justify-center">
+				<XaiButton onClick={() => handleSubmit()} width="27.25rem">
+					Submit
+				</XaiButton>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/sentry-client-desktop/src/features/home/GetSentryNode.tsx b/apps/sentry-client-desktop/src/features/home/GetSentryNode.tsx
index 7512c51f3..2c9a85937 100644
--- a/apps/sentry-client-desktop/src/features/home/GetSentryNode.tsx
+++ b/apps/sentry-client-desktop/src/features/home/GetSentryNode.tsx
@@ -4,6 +4,7 @@ import {drawerStateAtom, DrawerView} from "../drawer/DrawerManager";
 import {useSetAtom} from "jotai";
 import {AiOutlineInfoCircle} from "react-icons/ai";
 import {GetSentryNodeTooltip} from "@/features/keys/GetSentryNodeTooltip";
+import {XaiButton} from "@sentry/ui";
 // import {useState} from "react";
 
 const body = [
@@ -69,13 +70,14 @@ export function GetSentryNode() {
 					Purchase a key to begin earning esXAI
 				</span>
 				<div className="flex items-center mt-4 gap-[3rem]">
-					<button
-						className={`w-[27.25rem] bg-[#F30919] flex justify-center items-center gap-2 text-lg text-white py-5 font-semibold mt-2`}
+					<XaiButton
 						onClick={() => setDrawerState(DrawerView.BuyKeys)}
+						width={"27.25rem"}
 					>
 						<RiKey2Line className="w-5 h-5"/>
 						Purchase Key
-					</button>
+					</XaiButton>
+
 					<p
 						className="text-xl text-[#F30919] cursor-pointer font-semibold"
 						onClick={() => setDrawerState(DrawerView.ViewKeys)}
@@ -87,7 +89,7 @@ export function GetSentryNode() {
 				{/* <div>
 					<span>{JSON.stringify(message)}</span>
 				</div> */}
-				
+
 				<div className="flex flex-row items-center mt-[4.375rem]">
 					{getBody()}
 				</div>
diff --git a/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx b/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx
index 9dfb576a0..98cf40e3d 100644
--- a/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx
+++ b/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx
@@ -16,7 +16,7 @@ import {useQueryClient} from "react-query";
 import {useBalance} from "@/hooks/useBalance";
 import {ethers} from "ethers";
 import {useOperatorRuntime} from "@/hooks/useOperatorRuntime";
-import {Tooltip} from "@sentry/ui";
+import {Tooltip, XaiButton} from "@sentry/ui";
 import {modalStateAtom, ModalView} from "@/features/modal/ModalManager";
 import {ActionsRequiredPromptHandler} from "@/features/drawer/ActionsRequiredPromptHandler";
 import {SentryWalletHeader} from "@/features/home/SentryWalletHeader";
@@ -381,16 +381,15 @@ export function SentryWallet() {
 										Copy address
 									</button>
 
-									<button
+									<XaiButton
 										onClick={() => {
 											setModalState(ModalView.TransactionInProgress)
 											window.electron.openExternal(`https://sentry.xai.games/#/assign-wallet/${operatorAddress}`)
 										}}
-										className="flex flex-row justify-center items-center gap-2 text-[15px] border border-[#E5E5E5] px-4 py-2"
 									>
 										Assign keys from new wallet
 										<BiLinkExternal className="h-[15px]"/>
-									</button>
+									</XaiButton>
 
 									<button
 										disabled={selectedWallet === null}
diff --git a/apps/sentry-client-desktop/src/features/home/modals/actions-required/AssignedKeysCard.tsx b/apps/sentry-client-desktop/src/features/home/modals/actions-required/AssignedKeysCard.tsx
index 6765bff3a..c31406198 100644
--- a/apps/sentry-client-desktop/src/features/home/modals/actions-required/AssignedKeysCard.tsx
+++ b/apps/sentry-client-desktop/src/features/home/modals/actions-required/AssignedKeysCard.tsx
@@ -1,12 +1,13 @@
 import {IconLabel} from "@/components/IconLabel";
 import {SquareCard} from "@/components/SquareCard";
 import {IoMdCloseCircle} from "react-icons/io";
-import {LuExternalLink} from "react-icons/lu";
 import {AiFillCheckCircle} from "react-icons/ai";
 import {useOperator} from "@/features/operator";
 import {modalStateAtom, ModalView} from "@/features/modal/ModalManager";
 import {useAtomValue, useSetAtom} from "jotai";
 import {accruingStateAtom} from "@/hooks/useAccruingInfo";
+import {BiLinkExternal} from "react-icons/bi";
+import {XaiButton} from "@sentry/ui";
 
 export function AssignedKeysCard() {
 	const setModalState = useSetAtom(modalStateAtom);
@@ -43,13 +44,14 @@ export function AssignedKeysCard() {
 						At least one key must be assigned to accrue esXAI
 					</p>
 
-					<button
+					<XaiButton
 						onClick={onSetKeys}
-						className="w-full flex justify-center items-center gap-1 text-[15px] text-white bg-[#F30919] font-semibold mt-4 px-6 py-2"
+						width={"100%"}
+						fontSize={"15px"}
 					>
 						Assign keys from new wallet
-						<LuExternalLink className="w-5 h-5"/>
-					</button>
+						<BiLinkExternal className="w-5 h-5"/>
+					</XaiButton>
 				</>
 			)}
 		</SquareCard>
diff --git a/apps/sentry-client-desktop/src/features/keys/HasKeys.tsx b/apps/sentry-client-desktop/src/features/keys/HasKeys.tsx
index d5c6f78cc..cd314af55 100644
--- a/apps/sentry-client-desktop/src/features/keys/HasKeys.tsx
+++ b/apps/sentry-client-desktop/src/features/keys/HasKeys.tsx
@@ -23,6 +23,7 @@ import {ethers} from "ethers";
 import {BiLoaderAlt} from "react-icons/bi";
 import {useGetWalletBalance} from "@/hooks/useGetWalletBalance";
 import {useGetSingleWalletBalance} from "@/hooks/useGetSingleWalletBalance";
+import {LuListChecks} from "react-icons/lu";
 
 interface HasKeysProps {
 	combinedOwners: string[],
@@ -46,7 +47,6 @@ export function HasKeys({combinedOwners, combinedLicensesMap, statusMap, isWalle
 	const {data: earnedEsxaiBalance} = useGetWalletBalance(combinedOwners);
 	const {data: singleWalletBalance} = useGetSingleWalletBalance(selectedWallet);
 
-
 	function startAssignment() {
 		if (!isOperatorLoading) {
 			setModalState(ModalView.TransactionInProgress);
@@ -285,6 +285,14 @@ export function HasKeys({combinedOwners, combinedLicensesMap, statusMap, isWalle
 							Add wallet
 						</button>
 
+						<button
+							onClick={() => setDrawerState(DrawerView.Whitelist)}
+							className="flex flex-row justify-center items-center gap-2 text-[15px] border border-[#E5E5E5] px-4 py-2"
+						>
+							<LuListChecks className="h-[15px]"/>
+							Whitelist wallet
+						</button>
+
 						<button
 							disabled={selectedWallet === null}
 							onClick={() => setIsRemoveWalletOpen(true)}
diff --git a/apps/sentry-client-desktop/src/features/storage/useStorage.tsx b/apps/sentry-client-desktop/src/features/storage/useStorage.tsx
index 82aeb6852..16c016a11 100644
--- a/apps/sentry-client-desktop/src/features/storage/useStorage.tsx
+++ b/apps/sentry-client-desktop/src/features/storage/useStorage.tsx
@@ -5,6 +5,7 @@ const dataAtom = atom<IData | undefined>(undefined);
 
 export type IData = Partial<{
 	addedWallets: string[];
+	whitelistedWallets: string[];
 	kycStartedWallets: string[];
 	sentryRunning: boolean;
 }>;
diff --git a/apps/sentry-client-desktop/src/hooks/useListOwnersForOperatorWithCallback.ts b/apps/sentry-client-desktop/src/hooks/useListOwnersForOperatorWithCallback.ts
index 744b12984..ee705ad12 100644
--- a/apps/sentry-client-desktop/src/hooks/useListOwnersForOperatorWithCallback.ts
+++ b/apps/sentry-client-desktop/src/hooks/useListOwnersForOperatorWithCallback.ts
@@ -1,10 +1,11 @@
 import {useEffect, useState} from "react";
 import {listOwnersForOperator} from "@sentry/core";
+import {useStorage} from "@/features/storage";
 
 export function useListOwnersForOperatorWithCallback(operatorAddress: string | undefined, initialLoadingState = false, refresh = 0) {
-
 	const [loading, setLoading] = useState(initialLoadingState);
 	const [owners, setOwners] = useState<string[]>([]);
+	const {data} = useStorage();
 
 	useEffect(() => {
 		setOwners([]);
diff --git a/packages/ui/src/features/buttons/XaiButton.tsx b/packages/ui/src/features/buttons/XaiButton.tsx
new file mode 100644
index 000000000..8ebe5ff47
--- /dev/null
+++ b/packages/ui/src/features/buttons/XaiButton.tsx
@@ -0,0 +1,21 @@
+import {PropsWithChildren} from "react";
+
+interface XaiButtonProps extends PropsWithChildren {
+	onClick: () => void;
+	width?: string;
+	fontSize?: string;
+	disabled?: boolean;
+}
+
+export function XaiButton({onClick, width, disabled, fontSize, children}: XaiButtonProps) {
+	return (
+		<button
+			className={`bg-[#F30919] flex justify-center items-center gap-2 text-lg text-white px-6 py-3 font-semibold mt-2`}
+			style={{width: width, fontSize: fontSize}}
+			onClick={() => onClick()}
+			disabled={disabled}
+		>
+			{children}
+		</button>
+	)
+}
diff --git a/packages/ui/src/features/buttons/index.ts b/packages/ui/src/features/buttons/index.ts
new file mode 100644
index 000000000..b3bc2cc20
--- /dev/null
+++ b/packages/ui/src/features/buttons/index.ts
@@ -0,0 +1 @@
+export * from "./XaiButton";
diff --git a/packages/ui/src/features/checkbox/XaiCheckbox.tsx b/packages/ui/src/features/checkbox/XaiCheckbox.tsx
index 2844d841a..111cbb19b 100644
--- a/packages/ui/src/features/checkbox/XaiCheckbox.tsx
+++ b/packages/ui/src/features/checkbox/XaiCheckbox.tsx
@@ -3,15 +3,14 @@ import {ReactNode} from "react";
 
 interface XaiCheckboxProps {
 	onClick: () => void;
-	condition: string | boolean | number;
+	condition: string | boolean | number | string[];
 	children: ReactNode;
 }
 
 export function XaiCheckbox({onClick, condition, children}: XaiCheckboxProps) {
 	return (
-		<div className="flex flex-row gap-2">
+		<div className="flex flex-row gap-2" onClick={() => onClick()}>
 			<div
-				onClick={() => onClick()}
 				className={`flex justify-center items-center w-5 h-5 cursor-pointer border ${condition ? "border-0" : "border-[#A3A3A3]"} ${condition ? "bg-[#F30919]" : "bg-white"}`}
 			>
 				{condition ? <ImCheckmark color={"white"} size={14}/> : null}
diff --git a/packages/ui/src/features/index.ts b/packages/ui/src/features/index.ts
index 222710233..88c189905 100644
--- a/packages/ui/src/features/index.ts
+++ b/packages/ui/src/features/index.ts
@@ -1,3 +1,4 @@
+export * from "./buttons";
 export * from "./checkbox";
 export * from "./inputs";
 export * from "./tooltip";

From e48a4ca2e09ac00672867f570d0aa80d3e7a0796 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Mon, 18 Dec 2023 14:39:09 -0800
Subject: [PATCH 06/32] Adds additional logic/ui to Whitelist Drawer

---
 .../src/features/drawer/DrawerManager.tsx     |  2 +-
 .../src/features/drawer/WhitelistDrawer.tsx   | 78 ++++++++++++++-----
 .../src/features/home/SentryWallet.tsx        | 27 ++++---
 .../features/home/modals/DisableBodyModal.tsx |  5 ++
 .../src/features/keys/HasKeys.tsx             |  9 ---
 .../src/features/modal/ModalManager.tsx       | 20 ++---
 6 files changed, 94 insertions(+), 47 deletions(-)
 create mode 100644 apps/sentry-client-desktop/src/features/home/modals/DisableBodyModal.tsx

diff --git a/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx b/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx
index 46cec5830..d045f3bbc 100644
--- a/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx
+++ b/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx
@@ -25,7 +25,7 @@ export function DrawerManager() {
 
 	return (
 		<div
-			className={classNames("sticky w-[28rem] min-w-[28rem] h-screen z-10 bg-white border border-gray-200 overflow-y-scroll", {
+			className={classNames("fixed right-0 w-[28rem] min-w-[28rem] h-screen z-10 bg-white border border-gray-200 overflow-y-scroll", {
 				"hidden": drawerState === null,
 			})}
 		>
diff --git a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
index c574a613c..9d79bbbe7 100644
--- a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
+++ b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
@@ -1,18 +1,25 @@
-import {AiOutlineClose} from "react-icons/ai";
 import {useAtomValue, useSetAtom} from "jotai";
 import {drawerStateAtom} from "@/features/drawer/DrawerManager";
 import {chainStateAtom} from "@/hooks/useChainDataWithCallback";
-import {useCombinedOwners} from "@/hooks/useCombinedOwners";
-import {XaiButton, XaiCheckbox} from "@sentry/ui";
-import {useState} from "react";
+import {XaiCheckbox} from "@sentry/ui";
+import {useEffect, useState} from "react";
 import {useStorage} from "@/features/storage";
+import {useOperatorRuntime} from "@/hooks/useOperatorRuntime";
+import {useOperator} from "@/features/operator";
 
 export function WhitelistDrawer() {
 	const setDrawerState = useSetAtom(drawerStateAtom);
 	const {owners} = useAtomValue(chainStateAtom);
 	const {data, setData} = useStorage();
-	const {combinedOwners} = useCombinedOwners(owners);
 	const [selected, setSelected] = useState<string[]>([]);
+	const {sentryRunning, stopRuntime} = useOperatorRuntime();
+	const {publicKey: operatorAddress} = useOperator();
+
+	useEffect(() => {
+		if (data?.whitelistedWallets) {
+			setSelected(data?.whitelistedWallets)
+		}
+	}, []);
 
 	const toggleSelected = (wallet: string) => {
 		setSelected((prevSelected) =>
@@ -24,7 +31,7 @@ export function WhitelistDrawer() {
 
 	const getDropdownItems = () => (
 		<div>
-			{combinedOwners.map((wallet, i) => (
+			{owners.map((wallet, i) => (
 				<div
 					className="p-2 cursor-pointer hover:bg-gray-100"
 					key={`whitelist-item-${i}`}
@@ -46,34 +53,69 @@ export function WhitelistDrawer() {
 			whitelistedWallets: selected,
 		});
 		setDrawerState(null);
+		if (stopRuntime) {
+			void stopRuntime()
+		}
 	}
 
 	return (
 		<div className="relative h-full flex flex-col justify-start items-center">
 			<div
 				className="w-full h-[4rem] min-h-[4rem] flex flex-row justify-between items-center border-b border-gray-200 text-lg font-semibold px-8">
-				<div className="flex flex-row gap-2 items-center">
-					<p>Whitelist Wallet</p>
-				</div>
-				<div className="cursor-pointer z-10" onClick={() => setDrawerState(null)}>
-					<AiOutlineClose/>
-				</div>
+				<p>Allowed Wallet</p>
 			</div>
 
 			<div className="flex-grow overflow-y-scroll max-h-[calc(100vh-4rem)] px-6 pt-[1rem]">
-				<p className="mb-2">
-					Select wallets that you would like to whitelist to your operator:
+				<p className="mb-2 text-[15px]">
+					Below are the wallets assigned to your Sentry Wallet ({operatorAddress}). Select the wallets
+					you'd like to enable.
+				</p>
+				<p className="mb-4 text-[15px]">
+					Note: Gas fees will be covered using your Sentry Wallet funds whenever an enabled wallet is eligible
+					to participate in a challenge.
 				</p>
 				<div>
 					{getDropdownItems()}
 				</div>
 			</div>
 
-			<div className="flex-shrink-0 h-16 bg-white flex items-center justify-center">
-				<XaiButton onClick={() => handleSubmit()} width="27.25rem">
-					Submit
-				</XaiButton>
+			<div className="w-full flex-shrink-0 h-18 bg-white flex flex-col items-center justify-center px-2">
+				<p className="text-[14px]">
+					Applying changes will restart your sentry
+				</p>
+
+				<div className="w-full h-16 flex items-center justify-center gap-1">
+					<button
+						onClick={() => {
+							setDrawerState(null)
+						}}
+						className="w-full h-auto text-[15px] text-[#F30919] border border-[#F30919] px-4 py-3 font-semibold"
+					>
+						Cancel
+					</button>
+
+					{sentryRunning && (
+						<button
+							onClick={() => handleSubmit()}
+							disabled={selected.length <= 0 || !stopRuntime}
+							className={`w-full h-auto bg-[#F30919] text-[15px] border border-[#F30919] text-white px-4 py-3 font-semibold ${selected.length <= 0 || !stopRuntime && "bg-gray-400 border-gray-400 cursor-not-allowed"}`}
+						>
+							{stopRuntime ?
+								<>
+									Apply
+								</>
+								:
+								<>
+									Loading...
+								</>
+							}
+						</button>
+					)}
+				</div>
 			</div>
 		</div>
 	);
 }
+
+
+
diff --git a/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx b/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx
index 98cf40e3d..0ce357076 100644
--- a/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx
+++ b/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx
@@ -16,7 +16,7 @@ import {useQueryClient} from "react-query";
 import {useBalance} from "@/hooks/useBalance";
 import {ethers} from "ethers";
 import {useOperatorRuntime} from "@/hooks/useOperatorRuntime";
-import {Tooltip, XaiButton} from "@sentry/ui";
+import {Tooltip} from "@sentry/ui";
 import {modalStateAtom, ModalView} from "@/features/modal/ModalManager";
 import {ActionsRequiredPromptHandler} from "@/features/drawer/ActionsRequiredPromptHandler";
 import {SentryWalletHeader} from "@/features/home/SentryWalletHeader";
@@ -24,6 +24,7 @@ import {chainStateAtom, useChainDataRefresh} from "@/hooks/useChainDataWithCallb
 import {accruingStateAtom} from "@/hooks/useAccruingInfo";
 import {AssignKeysSentryNotRunning} from "@/components/AssignKeysSentryNotRunning";
 import {GrRefresh} from "react-icons/gr";
+import {LuListChecks} from "react-icons/lu";
 
 // TODO -> replace with dynamic value later
 export const recommendedFundingBalance = ethers.parseEther("0.005");
@@ -32,15 +33,12 @@ export function SentryWallet() {
 	const [drawerState, setDrawerState] = useAtom(drawerStateAtom);
 	const setModalState = useSetAtom(modalStateAtom);
 	const {ownersLoading, owners, licensesLoading, licensesList} = useAtomValue(chainStateAtom);
-
 	const queryClient = useQueryClient();
 	const {hasAssignedKeys} = useAtomValue(accruingStateAtom);
 
-
 	const {isLoading: operatorLoading, publicKey: operatorAddress} = useOperator();
 	const {data: balance} = useBalance(operatorAddress);
 
-	// TODO connect the refresh button on the x keys in y wallets text and query-ify these so we know when it's been cache cleared
 	const loading = operatorLoading || ownersLoading || licensesLoading;
 	const keyCount = licensesList.length;
 
@@ -265,7 +263,9 @@ export function SentryWallet() {
 
 							{sentryRunning ? (
 								<button
-									onClick={stopRuntime}
+									onClick={() => {
+										setDrawerState(DrawerView.Whitelist)
+									}}
 									className={`ml-4 flex flex-row justify-center items-center gap-2 text-[15px] border border-[#E5E5E5] px-4 py-2 ${!stopRuntime && 'cursor-not-allowed'}`}
 									disabled={!stopRuntime}
 								>
@@ -381,15 +381,24 @@ export function SentryWallet() {
 										Copy address
 									</button>
 
-									<XaiButton
+									<button
 										onClick={() => {
 											setModalState(ModalView.TransactionInProgress)
 											window.electron.openExternal(`https://sentry.xai.games/#/assign-wallet/${operatorAddress}`)
 										}}
+										className={`flex flex-row justify-center items-center gap-2 text-[15px] border border-[#E5E5E5] px-4 py-2`}
 									>
-										Assign keys from new wallet
+										Assign wallet
 										<BiLinkExternal className="h-[15px]"/>
-									</XaiButton>
+									</button>
+
+									<button
+										onClick={() => setDrawerState(DrawerView.Whitelist)}
+										className={`flex flex-row justify-center items-center gap-2 text-[15px] border border-[#E5E5E5] px-4 py-2`}
+									>
+										<LuListChecks className="h-[15px]"/>
+										Allowed wallet
+									</button>
 
 									<button
 										disabled={selectedWallet === null}
@@ -399,7 +408,7 @@ export function SentryWallet() {
 										}}
 										className={`flex flex-row justify-center items-center gap-2 text-[15px] border border-[#E5E5E5] ${selectedWallet === null ? 'text-[#D4D4D4] cursor-not-allowed' : ""} px-4 py-2`}
 									>
-										Un-assign this wallet
+										Un-assign wallet
 										<BiLinkExternal className="h-[15px]"/>
 									</button>
 								</div>
diff --git a/apps/sentry-client-desktop/src/features/home/modals/DisableBodyModal.tsx b/apps/sentry-client-desktop/src/features/home/modals/DisableBodyModal.tsx
new file mode 100644
index 000000000..6493a95c9
--- /dev/null
+++ b/apps/sentry-client-desktop/src/features/home/modals/DisableBodyModal.tsx
@@ -0,0 +1,5 @@
+export function DisableBodyModal() {
+	return (
+		<div className="w-screen h-screen top-0 right-0 bottom-0 left-0 m-auto bg-white opacity-75 z-30 cursor-not-allowed"/>
+	)
+}
diff --git a/apps/sentry-client-desktop/src/features/keys/HasKeys.tsx b/apps/sentry-client-desktop/src/features/keys/HasKeys.tsx
index cd314af55..8509e924c 100644
--- a/apps/sentry-client-desktop/src/features/keys/HasKeys.tsx
+++ b/apps/sentry-client-desktop/src/features/keys/HasKeys.tsx
@@ -23,7 +23,6 @@ import {ethers} from "ethers";
 import {BiLoaderAlt} from "react-icons/bi";
 import {useGetWalletBalance} from "@/hooks/useGetWalletBalance";
 import {useGetSingleWalletBalance} from "@/hooks/useGetSingleWalletBalance";
-import {LuListChecks} from "react-icons/lu";
 
 interface HasKeysProps {
 	combinedOwners: string[],
@@ -285,14 +284,6 @@ export function HasKeys({combinedOwners, combinedLicensesMap, statusMap, isWalle
 							Add wallet
 						</button>
 
-						<button
-							onClick={() => setDrawerState(DrawerView.Whitelist)}
-							className="flex flex-row justify-center items-center gap-2 text-[15px] border border-[#E5E5E5] px-4 py-2"
-						>
-							<LuListChecks className="h-[15px]"/>
-							Whitelist wallet
-						</button>
-
 						<button
 							disabled={selectedWallet === null}
 							onClick={() => setIsRemoveWalletOpen(true)}
diff --git a/apps/sentry-client-desktop/src/features/modal/ModalManager.tsx b/apps/sentry-client-desktop/src/features/modal/ModalManager.tsx
index 734be32e4..56b745807 100644
--- a/apps/sentry-client-desktop/src/features/modal/ModalManager.tsx
+++ b/apps/sentry-client-desktop/src/features/modal/ModalManager.tsx
@@ -1,24 +1,23 @@
 import classNames from "classnames";
-import {atom, useAtom, useSetAtom} from "jotai";
-import {ExitAlertModal} from "@/features/home/modals/ExitAlertModal";
+import {atom, useAtom} from "jotai";
 import {useState} from "react";
 import {PurchaseCompleteModal} from "@/features/home/modals/PurchaseCompleteModal";
-import {drawerStateAtom} from "@/features/drawer/DrawerManager";
+import {drawerStateAtom, DrawerView} from "@/features/drawer/DrawerManager";
 import {AssignWalletTransactionInProgressModal} from "@/features/home/modals/AssignWalletTransactionInProgressModal";
 import {useNavigate} from "react-router-dom";
+import {DisableBodyModal} from "@/features/home/modals/DisableBodyModal";
 
 export enum ModalView {
-	Exit,
 	PurchaseSuccessful,
 	TransactionInProgress,
-	RemoveWallet
+	RemoveWallet,
 }
 
 export const modalStateAtom = atom<ModalView | null>(null);
 
 export function ModalManager() {
 	const [modalState, setModalState] = useAtom(modalStateAtom);
-	const setDrawerState = useSetAtom(drawerStateAtom);
+	const [drawerState, setDrawerState] = useAtom(drawerStateAtom);
 	const [purchaseSuccessful, setPurchaseSuccessful] = useState<{ show: boolean, txHash: string }>({show: false, txHash: ""});
 	const navigate = useNavigate();
 
@@ -31,12 +30,9 @@ export function ModalManager() {
 	});
 
 	return (
-		<div className={classNames("w-full h-full fixed z-30", {
+		<div className={classNames("w-full h-full fixed z-10", {
 			"hidden": modalState === null,
 		})}>
-			{modalState === ModalView.Exit && (
-				<ExitAlertModal onSuccess={() => alert("wow")}/>
-			)}
 
 			{modalState === ModalView.PurchaseSuccessful && (
 				<PurchaseCompleteModal
@@ -47,6 +43,10 @@ export function ModalManager() {
 			{modalState === ModalView.TransactionInProgress && (
 				<AssignWalletTransactionInProgressModal/>
 			)}
+
+			{drawerState === DrawerView.Whitelist && (
+				<DisableBodyModal/>
+			)}
 		</div>
 	);
 }

From 9877fed9e87e2a6181e049e11e531048a684154b Mon Sep 17 00:00:00 2001
From: Christopher Powroznik <christopher@frameonesoftware.com>
Date: Mon, 18 Dec 2023 14:57:22 -0800
Subject: [PATCH 07/32] generate revenue report

---
 .../licenses/generate-revenue-report.ts       |  15 ++
 apps/cli/src/index.ts                         |   2 +
 packages/core/package.json                    |   1 +
 .../src/node-license/generateRevenueReport.ts | 187 ++++++++++++++++++
 packages/core/src/node-license/index.ts       |   3 +-
 pnpm-lock.yaml                                |   3 +
 6 files changed, 210 insertions(+), 1 deletion(-)
 create mode 100644 apps/cli/src/commands/licenses/generate-revenue-report.ts
 create mode 100644 packages/core/src/node-license/generateRevenueReport.ts

diff --git a/apps/cli/src/commands/licenses/generate-revenue-report.ts b/apps/cli/src/commands/licenses/generate-revenue-report.ts
new file mode 100644
index 000000000..f0fcbd9de
--- /dev/null
+++ b/apps/cli/src/commands/licenses/generate-revenue-report.ts
@@ -0,0 +1,15 @@
+import Vorpal from "vorpal";
+import { generateRevenueReport as generateRevenueReportCore } from "@sentry/core";
+
+/**
+ * Function to generate the revenue report.
+ * @param cli - Vorpal instance
+ */
+export function generateRevenueReport(cli: Vorpal) {
+    cli
+        .command('generate-revenue-report', 'Generates the revenue report.')
+        .action(async function (this: Vorpal.CommandInstance) {
+            this.log(`Generating revenue report...`);
+            await generateRevenueReportCore();
+        });
+}
diff --git a/apps/cli/src/index.ts b/apps/cli/src/index.ts
index 03c1f8946..cffb1a46a 100644
--- a/apps/cli/src/index.ts
+++ b/apps/cli/src/index.ts
@@ -42,6 +42,7 @@ import { setOrAddPricingTiersCommand } from './commands/licenses/set-or-add-pric
 import { addPromoCode } from './commands/licenses/add-promo-code.js';
 import { removePromoCode } from './commands/licenses/remove-promo-code.js';
 import { eventListener } from './commands/event-listener.js';
+import { generateRevenueReport } from './commands/licenses/generate-revenue-report.js';
 
 const cli = new Vorpal();
 
@@ -89,6 +90,7 @@ setReferralDiscountAndRewardPercentages(cli);
 setRollupAddress(cli);
 toggleAssertionChecking(cli);
 totalSupply(cli);
+generateRevenueReport(cli);
 
 cli
     .delimiter('sentry-node$')
diff --git a/packages/core/package.json b/packages/core/package.json
index ff4caac06..8a2180979 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -16,6 +16,7 @@
   "dependencies": {
     "@noble/curves": "^1.2.0",
     "alchemy-sdk": "^3.1.0",
+    "axios": "^1.6.2",
     "isomorphic-ws": "^5.0.0"
   },
   "devDependencies": {
diff --git a/packages/core/src/node-license/generateRevenueReport.ts b/packages/core/src/node-license/generateRevenueReport.ts
new file mode 100644
index 000000000..d10a45dc7
--- /dev/null
+++ b/packages/core/src/node-license/generateRevenueReport.ts
@@ -0,0 +1,187 @@
+import { ethers } from "ethers";
+import { NodeLicenseAbi, config, getProvider } from "../index.js";
+import axios from "axios";
+
+export async function generateRevenueReport() {
+
+    // Get the provider
+    const provider = getProvider();
+
+    // Create an instance of the NodeLicense contract
+    const nodeLicenseContract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
+
+    // Iterate over all PromoCodeCreated events to get the promo codes
+    const promoCodeCreatedTopic = nodeLicenseContract.getEvent("PromoCodeCreated").getFragment().topicHash;
+    const blockNumber = config.nodeLicenseDeployedBlockNumber;
+    const eventBlockStep = 1000000;
+    const currentBlockNumber = await provider.getBlockNumber();
+    let promoCodes: Array<[string, bigint | undefined]> = [];
+
+    for(let i = blockNumber; i <= currentBlockNumber; i += eventBlockStep) {
+        const promoCodeCreatedLogs = await provider.getLogs({
+            fromBlock: i,
+            toBlock: Math.min(i + eventBlockStep - 1, currentBlockNumber),
+            address: config.nodeLicenseAddress,
+            topics: [promoCodeCreatedTopic],
+        });
+
+        console.log(`Processing blocks from ${i} to ${Math.min(i + eventBlockStep - 1, currentBlockNumber)}. Remaining blocks: ${currentBlockNumber - i}`);
+
+        const newPromoCodes = promoCodeCreatedLogs.map(log => {
+            const mutableLog = { ...log, topics: [...log.topics] };
+            const parsedLog = nodeLicenseContract.interface.parseLog(mutableLog);
+            return parsedLog?.args?.promoCode;
+        }).filter(promoCode => promoCode !== undefined);
+
+        // Add the new promo codes to the array with an undefined value
+        promoCodes = [...promoCodes, ...newPromoCodes.map((promoCode: string) => [promoCode, undefined] as [string, bigint | undefined])];
+    }
+
+    // iterate over all promo codes and get how much they have gotten lifetime
+    for (let i = 0 ; i < promoCodes.length; i++) {
+        const {receivedLifetime} = await nodeLicenseContract.getPromoCode(promoCodes[i][0]);
+        promoCodes[i][1] = receivedLifetime;
+        console.log(promoCodes[i]);
+    }
+
+    const totalPromoCodesValue = promoCodes.reduce((total, promoCode) => {
+        return promoCode[1] ? total + promoCode[1] : total;
+    }, BigInt(0));
+    console.log(`Total value from promo codes: ${totalPromoCodesValue} (${ethers.formatEther(totalPromoCodesValue)} eth)`);
+
+    // get all the transaction hashes where there was a mint event
+    const mintTopic = nodeLicenseContract.getEvent("Transfer").getFragment().topicHash;
+    const zeroAddress = ethers.ZeroAddress;
+    const logBlockStep = 1000000;
+    let transferTransactionHashes: Array<string> = ["0x28ac89393111faee49829f689feed29b5fe483b9790530957dbd5bbb5d909ebb"];
+
+    async function getTransferLogs(fromBlock: number, toBlock: number, logBlockStep: number): Promise<ethers.Log[]> {
+        try {
+            return await provider.getLogs({
+                fromBlock,
+                toBlock: Math.min(fromBlock + logBlockStep - 1, toBlock),
+                address: config.nodeLicenseAddress,
+                topics: [mintTopic],
+            });
+        } catch (error) {
+            if (logBlockStep > 1) {
+                const halfStep = Math.floor(logBlockStep / 2);
+                const firstHalfLogs = await getTransferLogs(fromBlock, toBlock, halfStep);
+                const secondHalfLogs = await getTransferLogs(fromBlock + halfStep, toBlock, halfStep);
+                return [...firstHalfLogs, ...secondHalfLogs];
+            } else {
+                throw error;
+            }
+        }
+    }
+
+    for(let i = blockNumber; i <= currentBlockNumber; i += logBlockStep) {
+        const transferLogs = await getTransferLogs(i, currentBlockNumber, logBlockStep);
+
+        // Parse each log, and only add the logs that came from the zero address
+        const newTransferTransactionHashes = transferLogs
+            .filter(log => {
+                const mutableLog = { ...log, topics: [...log.topics] };
+                const parsedLog = nodeLicenseContract.interface.parseLog(mutableLog);
+                return parsedLog?.args?.from === zeroAddress;
+            })
+            .map(log => log.transactionHash);
+
+        if(newTransferTransactionHashes.length > 0) {
+            console.log(`Found transfers at blocks: ${newTransferTransactionHashes.length} transfers`);
+        }
+
+        // Add the new transaction hashes to the array and remove duplicates
+        transferTransactionHashes = Array.from(new Set([...transferTransactionHashes, ...newTransferTransactionHashes]));
+
+        // Show logs of progress of how many blocks have been queried so far and how many left.
+        console.log(`Processed blocks from ${i} to ${Math.min(i + logBlockStep - 1, currentBlockNumber)}. Remaining blocks: ${currentBlockNumber - i}`);
+    }
+
+    async function traceTransactions(txHashes: string[]) {
+        const promises = txHashes.map(async (txHash) => {
+            let response;
+            while (!response) {
+                try {
+                    response = await axios.post(config.arbitrumOneJsonRpcUrl, {
+                        jsonrpc: '2.0',
+                        id: 1,
+                        method: 'debug_traceTransaction',
+                        params: [txHash, { "tracer": "callTracer" }]
+                    });
+
+                    if (response.data.error) {
+                        console.error(`Error tracing transaction ${txHash}: ${JSON.stringify(response.data.error)}. Retrying in 5 seconds...`);
+                        await new Promise(resolve => setTimeout(resolve, 5000));
+                        response = null;
+                        continue;
+                    }
+
+                    if (!response.data.result) {
+                        console.warn("No result found", response.data);
+                    }
+
+                } catch (error) {
+                    console.error(`Failed to trace transaction ${txHash}. Retrying in 5 seconds...`);
+                    await new Promise(resolve => setTimeout(resolve, 5000));
+                }
+            }
+            return response.data.result;
+        });
+
+        const responses = await Promise.all(promises);
+        return responses;
+    }
+
+    const fundsReceiver = (await nodeLicenseContract.fundsReceiver()).toLowerCase(); // this will stop working if we change this in the future
+
+    /**
+     * Recursively search through calls and find all entries with type: "CALL", to: fundsReceiver, input: "0x".
+     * @param calls - The calls array in each transaction.
+     * @param fundsReceiver - The funds receiver address.
+     * @returns An array of BigInt values.
+     */
+    function findMatchingCalls(calls: any[], fundsReceiver: string): bigint[] {
+        let values: bigint[] = [];
+
+        for (const call of calls) {
+            if (call.type === 'CALL' && call.to.toLowerCase() === fundsReceiver && call.input === '0x') {
+                values.push(BigInt(call.value));
+            }
+
+            if (call.calls) {
+                values = [...values, ...findMatchingCalls(call.calls, fundsReceiver)];
+            }
+        }
+
+        return values;
+    }
+
+    const chunkSize = 50;
+    let allValues: bigint[] = [];
+    let allTransactionHashes: string[] = [];
+
+    for (let i = 0; i < transferTransactionHashes.length; i += chunkSize) {
+        const transactionHashesChunk = transferTransactionHashes.slice(i, i + chunkSize);
+        const traces = await traceTransactions(transactionHashesChunk);
+
+        for (let j = 0; j < transactionHashesChunk.length; j++) {
+
+            if (!traces[j]?.calls) {
+                console.warn(`Transaction ${transactionHashesChunk[j]} has no calls.`, traces[j]);
+                continue;
+            }
+
+            const values = findMatchingCalls(traces[j].calls, fundsReceiver);
+            allValues = [...allValues, ...values];
+            allTransactionHashes.push(transactionHashesChunk[j]);
+        }
+
+        console.log(`Progress: ${i+1}/${transferTransactionHashes.length} chunks processed.`);
+    }
+
+    const totalValue = allValues.reduce((a, b) => a + b, BigInt(0));
+    console.log(`Total value transferred to funds receiver: ${totalValue} (${ethers.formatEther(totalValue)} eth)`);
+
+}
+
diff --git a/packages/core/src/node-license/index.ts b/packages/core/src/node-license/index.ts
index d0453930c..f77e03587 100644
--- a/packages/core/src/node-license/index.ts
+++ b/packages/core/src/node-license/index.ts
@@ -13,4 +13,5 @@ export * from "./setOrAddPricingTiers.js";
 export * from "./getAccruedEsXai.js";
 export * from "./addPromoCode.js";
 export * from "./removePromoCode.js";
-export * from "./getPromoCode.js";
\ No newline at end of file
+export * from "./getPromoCode.js";
+export * from "./generateRevenueReport.js";
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fb9ed10ca..a9e91869d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -368,6 +368,9 @@ importers:
       alchemy-sdk:
         specifier: ^3.1.0
         version: 3.1.0
+      axios:
+        specifier: ^1.6.2
+        version: 1.6.2(debug@4.3.4)
       isomorphic-ws:
         specifier: ^5.0.0
         version: 5.0.0(ws@8.15.1)

From 5f5597a91c9fc11c7c0c7d8fb8606f30a2ec72f7 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Mon, 18 Dec 2023 16:09:08 -0800
Subject: [PATCH 08/32] Updates useOperatorRunetime to run with whitelisted
 wallets

---
 .../src/features/home/SentryWallet.tsx             |  2 +-
 .../src/hooks/useOperatorRuntime.ts                |  3 ++-
 packages/core/src/operator/operatorRuntime.ts      | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx b/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx
index 0ce357076..046e970ff 100644
--- a/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx
+++ b/apps/sentry-client-desktop/src/features/home/SentryWallet.tsx
@@ -397,7 +397,7 @@ export function SentryWallet() {
 										className={`flex flex-row justify-center items-center gap-2 text-[15px] border border-[#E5E5E5] px-4 py-2`}
 									>
 										<LuListChecks className="h-[15px]"/>
-										Allowed wallet
+										Allowed wallets
 									</button>
 
 									<button
diff --git a/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts b/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
index 1c4eb1841..042ecb293 100644
--- a/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
+++ b/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
@@ -16,6 +16,7 @@ export function useOperatorRuntime() {
 	const [runtimeLogs, setRuntimeLogs] = useAtom(runtimeLogsAtom);
 	const [, setRerender] = useState(0);
 	const {data, setData} = useStorage();
+	const whitelistedWallets = data?.whitelistedWallets;
 
 	// start sentry on launch / restart sentry
 	useEffect(() => {
@@ -41,7 +42,7 @@ export function useOperatorRuntime() {
 			setData({...data, sentryRunning: true});
 
 			// @ts-ignore
-			stop = await operatorRuntime(signer, setNodeLicenseStatusMap, writeLog);
+			stop = await operatorRuntime(signer, setNodeLicenseStatusMap, writeLog, whitelistedWallets);
 			setRerender((_number) => _number + 1);
 		}
 	}
diff --git a/packages/core/src/operator/operatorRuntime.ts b/packages/core/src/operator/operatorRuntime.ts
index 8dac34b0f..b7242c4aa 100644
--- a/packages/core/src/operator/operatorRuntime.ts
+++ b/packages/core/src/operator/operatorRuntime.ts
@@ -197,7 +197,7 @@ export async function operatorRuntime(
 
         // check to see if the owner of teh license is KYC'd
         const [{isKycApproved}] = await retry(async () => await checkKycStatus([nodeLicenseStatusMap.get(nodeLicenseId)!.ownerPublicKey]));
-        
+
         if (isKycApproved) {
             logFunction(`[${new Date().toISOString()}] Requesting esXAI reward for challenge '${challengeNumber}'.`);
             nodeLicenseStatusMap.set(nodeLicenseId, {
@@ -261,18 +261,18 @@ export async function operatorRuntime(
             });
             safeStatusCallback();
             logFunction(`[${new Date().toISOString()}] Checking for unclaimed rewards on Sentry Key '${nodeLicenseId}'.`);
-    
+
             await getSubmissionsForChallenges(challengeIds, nodeLicenseId, async (submission, index) => {
-    
+
                 const challengeId = challengeIds[index];
-    
+
                 nodeLicenseStatusMap.set(nodeLicenseId, {
                     ...nodeLicenseStatusMap.get(nodeLicenseId) as NodeLicenseInformation,
                     status: `Checking For Unclaimed Rewards on Challenge '${challengeId}'`,
                 });
                 safeStatusCallback();
                 logFunction(`[${new Date().toISOString()}] Checking for unclaimed rewards on Challenge '${challengeId}'.`);
-    
+
                 // call the process claim and update statuses/logs accoridngly
                 if (submission.submitted && !submission.claimed) {
                     nodeLicenseStatusMap.set(nodeLicenseId, {
@@ -284,7 +284,7 @@ export async function operatorRuntime(
                     await processClaimForChallenge(challengeId, nodeLicenseId);
                 }
             });
-    
+
             nodeLicenseStatusMap.set(nodeLicenseId, {
                 ...nodeLicenseStatusMap.get(nodeLicenseId) as NodeLicenseInformation,
                 status: beforeStatus,
@@ -317,4 +317,4 @@ export async function operatorRuntime(
     }
 
     return stop;
-}
\ No newline at end of file
+}

From 966d0cc6d33b04271144ae78702ebf692da2bbb9 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Tue, 19 Dec 2023 13:25:26 -0800
Subject: [PATCH 09/32] Adds ClaimToken route

---
 .../src/features/checkout/XaiBanner.tsx       |   4 +-
 .../src/features/router/AppRoutes.tsx         |   2 +
 .../src/features/wallet/routes/ClaimToken.tsx | 134 +++++++++++++++
 .../src/features/wallet/routes/DropClaim.tsx  | 154 ++++++++++--------
 4 files changed, 228 insertions(+), 66 deletions(-)
 create mode 100644 apps/web-connect/src/features/wallet/routes/ClaimToken.tsx

diff --git a/apps/web-connect/src/features/checkout/XaiBanner.tsx b/apps/web-connect/src/features/checkout/XaiBanner.tsx
index 66b3cbe31..1a2cecef3 100644
--- a/apps/web-connect/src/features/checkout/XaiBanner.tsx
+++ b/apps/web-connect/src/features/checkout/XaiBanner.tsx
@@ -3,10 +3,10 @@ import {MdVerifiedUser} from "react-icons/md";
 export function XaiBanner() {
 	return (
 		<div className="w-[744px] flex flex-col gap-2 bg-[#DCFCE6] p-6">
-			<p className="flex flex-row gap-1 items-center font-semibold">
+			<div className="flex flex-row gap-1 items-center font-semibold">
 				<MdVerifiedUser size={22} color={"#38A349"}/>You are on the official <p
 				className="text-[#2A803D]">Xai.games</p> website
-			</p>
+			</div>
 			<p className="text-[15px] text-[#15803D]">
 				Purchases from Xai will only ever occur on Xai.games. Check that you are on Xai.games whenever
 				purchasing from Xai.
diff --git a/apps/web-connect/src/features/router/AppRoutes.tsx b/apps/web-connect/src/features/router/AppRoutes.tsx
index d6ef83c59..983a83921 100644
--- a/apps/web-connect/src/features/router/AppRoutes.tsx
+++ b/apps/web-connect/src/features/router/AppRoutes.tsx
@@ -9,6 +9,7 @@ import axios from "axios";
 import {BiLoaderAlt} from "react-icons/bi";
 import {Footer} from "@/features/footer/Footer";
 import {DropClaim} from "@/features/wallet/routes/DropClaim";
+import {ClaimToken} from "@/features/wallet/routes/ClaimToken";
 
 enum IpBanType {
 	INVALID_IP = "INVALID_IP",
@@ -79,6 +80,7 @@ export function AppRoutes() {
 						<Route path="/assign-wallet/:operatorAddress" element={<AssignWallet/>}/>
 						<Route path="/unassign-wallet/:operatorAddress" element={<UnassignWallet/>}/>
 						<Route path="/dropclaim" element={<DropClaim/>}/>
+						<Route path="/claimtoken" element={<ClaimToken/>}/>
 						<Route path="*" element={<Navigate to="/" replace={true}/>}/>
 					</Routes>
 					<Footer/>
diff --git a/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx b/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
new file mode 100644
index 000000000..9f1bcef15
--- /dev/null
+++ b/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
@@ -0,0 +1,134 @@
+import {useAccount, useContractRead, useContractWrite, useNetwork} from "wagmi";
+import {config, NodeLicenseAbi} from "@sentry/core";
+import {XaiBanner} from "@/features/checkout/XaiBanner";
+import {XaiCheckbox} from "@sentry/ui";
+import {KYCTooltip} from "@/features/checkout/KYCTooltip";
+import {useState} from "react";
+
+export function ClaimToken() {
+	const {address} = useAccount();
+	const {chain} = useNetwork();
+
+	const [eligible, setEligible] = useState<boolean>(true);
+
+	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
+	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
+	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
+	const ready = checkboxOne && checkboxTwo && checkboxThree;
+
+	const {data, isLoading} = useContractRead({
+		address: config.nodeLicenseAddress as `0x${string}`,
+		abi: NodeLicenseAbi,
+		functionName: "whitelistAmounts",
+		args: [address],
+	})
+
+	// const {isLoading, isSuccess, write, error, data} = useContractWrite({
+	const {write, error} = useContractWrite({
+		address: config.nodeLicenseAddress as `0x${string}`,
+		abi: NodeLicenseAbi,
+		functionName: "redeemFromWhitelist",
+		onError(error) {
+			console.warn("Error", error);
+		},
+	});
+
+	return (
+		<div>
+			<div className="h-full min-h-[90vh] flex flex-col justify-center items-center">
+				<XaiBanner/>
+				<div
+					className="flex flex-col justify-center items-center w-[744px] border border-gray-200 bg-white m-4 p-12">
+					<div
+						className="flex flex-col justify-center items-center gap-2 w-full overflow-hidden">
+						<p className="text-3xl font-semibold">
+							Claim Xai Tokens
+						</p>
+
+						{!address && (
+							<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+								Connect your wallet to check your eligibility.
+							</p>
+						)}
+
+						{address ? (
+							<>
+								{eligible ? (
+									<>
+										<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+											You are eligible to claim Xai Tokens!
+										</p>
+										<div className="flex flex-col justify-center gap-8 p-6 mt-8">
+											{/*<div className="flex flex-col justify-center gap-2">*/}
+											{/*	<XaiCheckbox*/}
+											{/*		onClick={() => setCheckboxOne(!checkboxOne)}*/}
+											{/*		condition={checkboxOne}*/}
+											{/*	>*/}
+											{/*		I agree with the*/}
+											{/*		<a*/}
+											{/*			className="cursor-pointer text-[#F30919]"*/}
+											{/*			onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>*/}
+											{/*			Sentry Node Agreement*/}
+											{/*		</a>*/}
+											{/*	</XaiCheckbox>*/}
+
+
+											{/*	<XaiCheckbox*/}
+											{/*		onClick={() => setCheckboxTwo(!checkboxTwo)}*/}
+											{/*		condition={checkboxTwo}*/}
+											{/*	>*/}
+											{/*		I understand Sentry Node Keys are not transferable*/}
+											{/*	</XaiCheckbox>*/}
+
+											{/*	<XaiCheckbox*/}
+											{/*		onClick={() => setCheckboxThree(!checkboxThree)}*/}
+											{/*		condition={checkboxThree}*/}
+											{/*	>*/}
+											{/*		I understand that I cannot claim rewards until I pass KYC*/}
+											{/*		<KYCTooltip*/}
+											{/*			width={850}*/}
+											{/*		>*/}
+											{/*			<p className="text-[#F30919]">(SEE BLOCKED COUNTRIES)</p>*/}
+											{/*		</KYCTooltip>*/}
+											{/*	</XaiCheckbox>*/}
+											{/*</div>*/}
+
+											<div className="w-full">
+												<button
+													onClick={() => write}
+													className={`w-[576px] h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
+													disabled={!ready || chain?.id !== 42_161}
+												>
+													{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
+												</button>
+
+												{error && (
+													<p className="text-center break-words w-full mt-4 text-red-500">
+														{error.message}
+													</p>
+												)}
+											</div>
+										</div>
+									</>
+								) : (
+									<>
+									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+										This wallet ({address}) is ineligible to claim any Xai Tokens.
+									</p>
+									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+										You can connect a different wallet to determine if it is eligible.
+									</p>
+									</>
+								)}
+							</>
+						) : (
+							<div className="m-8">
+								<w3m-button/>
+							</div>
+						)}
+					</div>
+				</div>
+			</div>
+		</div>
+	)
+}
diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index cabf628c6..bdbd9eefa 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -1,37 +1,46 @@
-import {useAccount, useContractWrite, useNetwork} from "wagmi";
+import {useAccount, useContractRead, useContractWrite, useNetwork} from "wagmi";
 import {config, NodeLicenseAbi} from "@sentry/core";
 import {XaiBanner} from "@/features/checkout/XaiBanner";
 import {XaiCheckbox} from "@sentry/ui";
 import {KYCTooltip} from "@/features/checkout/KYCTooltip";
-import {useState} from "react";
+import {useEffect, useState} from "react";
 
 export function DropClaim() {
-	// const navigate = useNavigate();
 	const {address} = useAccount();
 	const {chain} = useNetwork();
+
+	const [eligible, setEligible] = useState<boolean>(false);
+	const [keys, setKeys] = useState(15);
+
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
 	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
 	const ready = checkboxOne && checkboxTwo && checkboxThree;
 
+	const {data, isLoading} = useContractRead({
+		address: config.nodeLicenseAddress as `0x${string}`,
+		abi: NodeLicenseAbi,
+		functionName: "whitelistAmounts",
+		args: [address],
+	})
+
 	// const {isLoading, isSuccess, write, error, data} = useContractWrite({
 	const {write, error} = useContractWrite({
 		address: config.nodeLicenseAddress as `0x${string}`,
 		abi: NodeLicenseAbi,
-		functionName: "whitelistAmounts",
-		args: [],
-		// args: [params.operatorAddress, true],
-		onSuccess(data) {
-			window.location = `xai-sentry://assigned-wallet?txHash=${data.hash}` as unknown as Location;
-		},
+		functionName: "redeemFromWhitelist",
 		onError(error) {
 			console.warn("Error", error);
 		},
 	});
 
-	// function returnToClient() {
-	// 	window.location = `xai-sentry://assigned-wallet?txHash=${data?.hash}` as unknown as Location;
-	// }
+	useEffect(() => {
+		if (keys !== 0) {
+			setEligible(true)
+		} else if (keys <= 0) {
+			setEligible(false)
+		}
+	}, [keys]);
 
 	return (
 		<div>
@@ -44,66 +53,83 @@ export function DropClaim() {
 						<p className="text-3xl font-semibold">
 							Redeem Sentry Keys
 						</p>
-						<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-							Buyer Beware.
-						</p>
-						{error && (
-							<p className="text-center break-words w-full mt-4 text-red-500">
-								{error.message}
+
+						{!address && (
+							<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+								Connect your wallet to check your eligibility.
 							</p>
 						)}
+
 						{address ? (
-							<div className="flex flex-col justify-center gap-8 p-6 mt-8">
-								<div className="flex flex-col justify-center gap-2">
-									<XaiCheckbox
-										onClick={() => setCheckboxOne(!checkboxOne)}
-										condition={checkboxOne}
-									>
-										I agree with the
-										<a
-											className="cursor-pointer text-[#F30919]"
-											onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>
-											Sentry Node Agreement
-										</a>
-									</XaiCheckbox>
+							<>
+								{eligible ? (
+									<>
+										<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+											This wallet ({address}) can claim <span className="font-semibold">{keys}</span> {keys === 1 ? "key" : "keys"}.
+										</p>
+										<div className="flex flex-col justify-center gap-8 p-6 mt-8">
+											<div className="flex flex-col justify-center gap-2">
+												<XaiCheckbox
+													onClick={() => setCheckboxOne(!checkboxOne)}
+													condition={checkboxOne}
+												>
+													I agree with the
+													<a
+														className="cursor-pointer text-[#F30919]"
+														onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>
+														Sentry Node Agreement
+													</a>
+												</XaiCheckbox>
 
 
-									<XaiCheckbox
-										onClick={() => setCheckboxTwo(!checkboxTwo)}
-										condition={checkboxTwo}
-									>
-										I understand Sentry Node Keys are not transferable
-									</XaiCheckbox>
+												<XaiCheckbox
+													onClick={() => setCheckboxTwo(!checkboxTwo)}
+													condition={checkboxTwo}
+												>
+													I understand Sentry Node Keys are not transferable
+												</XaiCheckbox>
 
-									<XaiCheckbox
-										onClick={() => setCheckboxThree(!checkboxThree)}
-										condition={checkboxThree}
-									>
-										I understand that I cannot claim rewards until I pass KYC
-										<KYCTooltip
-											width={850}
-										>
-											<p className="text-[#F30919]">(SEE BLOCKED COUNTRIES)</p>
-										</KYCTooltip>
-									</XaiCheckbox>
-								</div>
+												<XaiCheckbox
+													onClick={() => setCheckboxThree(!checkboxThree)}
+													condition={checkboxThree}
+												>
+													I understand that I cannot claim rewards until I pass KYC
+													<KYCTooltip
+														width={850}
+													>
+														<p className="text-[#F30919]">(SEE BLOCKED COUNTRIES)</p>
+													</KYCTooltip>
+												</XaiCheckbox>
+											</div>
 
-								<div>
-									<button
-										onClick={() => write}
-										className={`w-full h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
-										disabled={!ready || chain?.id !== 42_161}
-									>
-										{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
-									</button>
+											<div>
+												<button
+													onClick={() => write}
+													className={`w-[576px] h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
+													disabled={!ready || chain?.id !== 42_161}
+												>
+													{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
+												</button>
 
-									{error && (
-										<p className="text-center break-words w-full mt-4 text-red-500">
-											{error.message}
-										</p>
-									)}
-								</div>
-							</div>
+												{error && (
+													<p className="text-center break-words w-full mt-4 text-red-500">
+														{error.message}
+													</p>
+												)}
+											</div>
+										</div>
+									</>
+								) : (
+									<>
+									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+										This wallet ({address}) is ineligible to claim any Xai Sentry Keys.
+									</p>
+									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+										You can connect a different wallet to determine if it is eligible.
+									</p>
+									</>
+								)}
+							</>
 						) : (
 							<div className="m-8">
 								<w3m-button/>

From 173387630503351add59093b3aa35ef2687927bf Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Tue, 19 Dec 2023 13:56:08 -0800
Subject: [PATCH 10/32] Resolves wrong state on button

---
 .../src/features/drawer/WhitelistDrawer.tsx                | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
index 9d79bbbe7..4077761ec 100644
--- a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
+++ b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
@@ -15,6 +15,8 @@ export function WhitelistDrawer() {
 	const {sentryRunning, stopRuntime} = useOperatorRuntime();
 	const {publicKey: operatorAddress} = useOperator();
 
+	const disableButton = selected.length <= 0 || !stopRuntime;
+
 	useEffect(() => {
 		if (data?.whitelistedWallets) {
 			setSelected(data?.whitelistedWallets)
@@ -48,6 +50,7 @@ export function WhitelistDrawer() {
 	);
 
 	function handleSubmit() {
+		console.log(selected);
 		setData({
 			...data,
 			whitelistedWallets: selected,
@@ -97,8 +100,8 @@ export function WhitelistDrawer() {
 					{sentryRunning && (
 						<button
 							onClick={() => handleSubmit()}
-							disabled={selected.length <= 0 || !stopRuntime}
-							className={`w-full h-auto bg-[#F30919] text-[15px] border border-[#F30919] text-white px-4 py-3 font-semibold ${selected.length <= 0 || !stopRuntime && "bg-gray-400 border-gray-400 cursor-not-allowed"}`}
+							disabled={disableButton}
+							className={`w-full h-auto bg-[#F30919] text-[15px] border border-[#F30919] text-white px-4 py-3 font-semibold ${disableButton ? "bg-gray-400 border-gray-400 cursor-not-allowed" : ""}`}
 						>
 							{stopRuntime ?
 								<>

From 349fff84be5a54057c85083c4fe22e8574d61dad Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Tue, 19 Dec 2023 14:45:50 -0800
Subject: [PATCH 11/32] WIP: whitelistedWallets setData (fragile)

---
 .../src/features/drawer/WhitelistDrawer.tsx   | 19 +++++++++----------
 .../src/features/storage/useStorage.tsx       |  2 +-
 .../useListOwnersForOperatorWithCallback.ts   |  2 --
 .../src/hooks/useOperatorRuntime.ts           |  4 ++--
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
index 4077761ec..ed53393cb 100644
--- a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
+++ b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
@@ -18,16 +18,15 @@ export function WhitelistDrawer() {
 	const disableButton = selected.length <= 0 || !stopRuntime;
 
 	useEffect(() => {
-		if (data?.whitelistedWallets) {
-			setSelected(data?.whitelistedWallets)
+		if (data && data.whitelistedWallets) {
+			setSelected(data.whitelistedWallets);
 		}
 	}, []);
 
 	const toggleSelected = (wallet: string) => {
-		setSelected((prevSelected) =>
-			prevSelected.includes(wallet)
-				? prevSelected.filter((item) => item !== wallet)
-				: [...prevSelected, wallet]
+		setSelected((prevSelected) => prevSelected.includes(wallet)
+			? prevSelected.filter((item) => item !== wallet)
+			: [...prevSelected, wallet]
 		);
 	};
 
@@ -49,15 +48,15 @@ export function WhitelistDrawer() {
 		</div>
 	);
 
-	function handleSubmit() {
-		console.log(selected);
-		setData({
+	async function handleSubmit() {
+		await setData({
 			...data,
 			whitelistedWallets: selected,
 		});
+
 		setDrawerState(null);
 		if (stopRuntime) {
-			void stopRuntime()
+			void stopRuntime();
 		}
 	}
 
diff --git a/apps/sentry-client-desktop/src/features/storage/useStorage.tsx b/apps/sentry-client-desktop/src/features/storage/useStorage.tsx
index 16c016a11..d075926b5 100644
--- a/apps/sentry-client-desktop/src/features/storage/useStorage.tsx
+++ b/apps/sentry-client-desktop/src/features/storage/useStorage.tsx
@@ -12,7 +12,7 @@ export type IData = Partial<{
 
 interface IUseStorageResponse {
 	data?: IData;
-	setData: (data: IData) => void;
+	setData: (data: IData) => Promise<void>;
 	removeData: () => void;
 	loading: boolean;
 	getFilePath: () => Promise<string>;
diff --git a/apps/sentry-client-desktop/src/hooks/useListOwnersForOperatorWithCallback.ts b/apps/sentry-client-desktop/src/hooks/useListOwnersForOperatorWithCallback.ts
index ee705ad12..6a8ddb196 100644
--- a/apps/sentry-client-desktop/src/hooks/useListOwnersForOperatorWithCallback.ts
+++ b/apps/sentry-client-desktop/src/hooks/useListOwnersForOperatorWithCallback.ts
@@ -1,11 +1,9 @@
 import {useEffect, useState} from "react";
 import {listOwnersForOperator} from "@sentry/core";
-import {useStorage} from "@/features/storage";
 
 export function useListOwnersForOperatorWithCallback(operatorAddress: string | undefined, initialLoadingState = false, refresh = 0) {
 	const [loading, setLoading] = useState(initialLoadingState);
 	const [owners, setOwners] = useState<string[]>([]);
-	const {data} = useStorage();
 
 	useEffect(() => {
 		setOwners([]);
diff --git a/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts b/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
index 042ecb293..401507210 100644
--- a/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
+++ b/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
@@ -39,10 +39,10 @@ export function useOperatorRuntime() {
 	async function startRuntime() {
 		if (!sentryRunning && stop === undefined) {
 			setSentryRunning(true);
-			setData({...data, sentryRunning: true});
+			await setData({...data, sentryRunning: true});
 
 			// @ts-ignore
-			stop = await operatorRuntime(signer, setNodeLicenseStatusMap, writeLog, whitelistedWallets);
+			stop = await operatorRuntime(signer, setNodeLicenseStatusMap, writeLog);
 			setRerender((_number) => _number + 1);
 		}
 	}

From 973affe49b48ec3b217648fe2d60284005c8ca8a Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Tue, 19 Dec 2023 14:46:52 -0800
Subject: [PATCH 12/32] Add operator to WhitelistDrawer

---
 .../src/features/drawer/WhitelistDrawer.tsx   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
index ed53393cb..44120c1d7 100644
--- a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
+++ b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
@@ -30,6 +30,25 @@ export function WhitelistDrawer() {
 		);
 	};
 
+	const getOperatorItem = () => {
+		if (operatorAddress) {
+			return (
+				<div>
+					<div
+						className="p-2 cursor-pointer hover:bg-gray-100"
+					>
+						<XaiCheckbox
+							onClick={() => toggleSelected(operatorAddress)}
+							condition={selected.includes(operatorAddress)}
+						>
+							{operatorAddress}
+						</XaiCheckbox>
+					</div>
+				</div>
+			)
+		}
+	}
+
 	const getDropdownItems = () => (
 		<div>
 			{owners.map((wallet, i) => (
@@ -77,6 +96,7 @@ export function WhitelistDrawer() {
 					to participate in a challenge.
 				</p>
 				<div>
+					{getOperatorItem()}
 					{getDropdownItems()}
 				</div>
 			</div>

From 6e01fb691f0566d39fd693354b85ddc87dbeaa2e Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Tue, 19 Dec 2023 15:36:12 -0800
Subject: [PATCH 13/32] WIP: Fetch node license eligibility

---
 .../checkout/hooks/useListClaimableAmount.ts  |  14 ++
 .../src/features/wallet/routes/ClaimToken.tsx |  85 +--------
 .../src/features/wallet/routes/DropClaim.tsx  | 173 +++++++++---------
 packages/core/src/node/index.ts               |   3 +-
 packages/core/src/node/listClaimableAmount.ts |  20 ++
 5 files changed, 130 insertions(+), 165 deletions(-)
 create mode 100644 apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
 create mode 100644 packages/core/src/node/listClaimableAmount.ts

diff --git a/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts b/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
new file mode 100644
index 000000000..6ea9228ad
--- /dev/null
+++ b/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
@@ -0,0 +1,14 @@
+import {useQuery} from "react-query";
+import {listClaimableAmount} from "@sentry/core";
+
+export function useListClaimableAmount(address: string | undefined) {
+	return useQuery({
+		queryKey: ["list-claimable-amount", address],
+		queryFn: async () => {
+			return await listClaimableAmount(address!);
+		},
+		staleTime: Infinity,
+		cacheTime: 2500,
+		enabled: address != undefined && address.length > 0,
+	});
+}
diff --git a/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx b/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
index 9f1bcef15..1623ecd51 100644
--- a/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
+++ b/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
@@ -1,37 +1,10 @@
-import {useAccount, useContractRead, useContractWrite, useNetwork} from "wagmi";
-import {config, NodeLicenseAbi} from "@sentry/core";
+import {useAccount} from "wagmi";
 import {XaiBanner} from "@/features/checkout/XaiBanner";
-import {XaiCheckbox} from "@sentry/ui";
-import {KYCTooltip} from "@/features/checkout/KYCTooltip";
 import {useState} from "react";
 
 export function ClaimToken() {
 	const {address} = useAccount();
-	const {chain} = useNetwork();
-
-	const [eligible, setEligible] = useState<boolean>(true);
-
-	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
-	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
-	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
-	const ready = checkboxOne && checkboxTwo && checkboxThree;
-
-	const {data, isLoading} = useContractRead({
-		address: config.nodeLicenseAddress as `0x${string}`,
-		abi: NodeLicenseAbi,
-		functionName: "whitelistAmounts",
-		args: [address],
-	})
-
-	// const {isLoading, isSuccess, write, error, data} = useContractWrite({
-	const {write, error} = useContractWrite({
-		address: config.nodeLicenseAddress as `0x${string}`,
-		abi: NodeLicenseAbi,
-		functionName: "redeemFromWhitelist",
-		onError(error) {
-			console.warn("Error", error);
-		},
-	});
+	const [eligible, ] = useState<boolean>(true);
 
 	return (
 		<div>
@@ -59,54 +32,14 @@ export function ClaimToken() {
 											You are eligible to claim Xai Tokens!
 										</p>
 										<div className="flex flex-col justify-center gap-8 p-6 mt-8">
-											{/*<div className="flex flex-col justify-center gap-2">*/}
-											{/*	<XaiCheckbox*/}
-											{/*		onClick={() => setCheckboxOne(!checkboxOne)}*/}
-											{/*		condition={checkboxOne}*/}
-											{/*	>*/}
-											{/*		I agree with the*/}
-											{/*		<a*/}
-											{/*			className="cursor-pointer text-[#F30919]"*/}
-											{/*			onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>*/}
-											{/*			Sentry Node Agreement*/}
-											{/*		</a>*/}
-											{/*	</XaiCheckbox>*/}
-
-
-											{/*	<XaiCheckbox*/}
-											{/*		onClick={() => setCheckboxTwo(!checkboxTwo)}*/}
-											{/*		condition={checkboxTwo}*/}
-											{/*	>*/}
-											{/*		I understand Sentry Node Keys are not transferable*/}
-											{/*	</XaiCheckbox>*/}
-
-											{/*	<XaiCheckbox*/}
-											{/*		onClick={() => setCheckboxThree(!checkboxThree)}*/}
-											{/*		condition={checkboxThree}*/}
-											{/*	>*/}
-											{/*		I understand that I cannot claim rewards until I pass KYC*/}
-											{/*		<KYCTooltip*/}
-											{/*			width={850}*/}
-											{/*		>*/}
-											{/*			<p className="text-[#F30919]">(SEE BLOCKED COUNTRIES)</p>*/}
-											{/*		</KYCTooltip>*/}
-											{/*	</XaiCheckbox>*/}
-											{/*</div>*/}
-
 											<div className="w-full">
-												<button
-													onClick={() => write}
-													className={`w-[576px] h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
-													disabled={!ready || chain?.id !== 42_161}
-												>
-													{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
-												</button>
-
-												{error && (
-													<p className="text-center break-words w-full mt-4 text-red-500">
-														{error.message}
-													</p>
-												)}
+												{/*<button*/}
+												{/*	onClick={() => write}*/}
+												{/*	className={`w-[576px] h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}*/}
+												{/*	disabled={!ready || chain?.id !== 42_161}*/}
+												{/*>*/}
+												{/*	{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}*/}
+												{/*</button>*/}
 											</div>
 										</div>
 									</>
diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index bdbd9eefa..735bb8e55 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -1,38 +1,28 @@
-import {useAccount, useContractRead, useContractWrite, useNetwork} from "wagmi";
-import {config, NodeLicenseAbi} from "@sentry/core";
+import {useAccount, useNetwork} from "wagmi";
 import {XaiBanner} from "@/features/checkout/XaiBanner";
 import {XaiCheckbox} from "@sentry/ui";
 import {KYCTooltip} from "@/features/checkout/KYCTooltip";
 import {useEffect, useState} from "react";
+import {useListClaimableAmount} from "@/features/checkout/hooks/useListClaimableAmount";
+import {BiLoaderAlt} from "react-icons/bi";
 
 export function DropClaim() {
 	const {address} = useAccount();
 	const {chain} = useNetwork();
 
 	const [eligible, setEligible] = useState<boolean>(false);
-	const [keys, setKeys] = useState(15);
+	const [keys,] = useState(15);
 
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
 	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
 	const ready = checkboxOne && checkboxTwo && checkboxThree;
 
-	const {data, isLoading} = useContractRead({
-		address: config.nodeLicenseAddress as `0x${string}`,
-		abi: NodeLicenseAbi,
-		functionName: "whitelistAmounts",
-		args: [address],
-	})
+	const {data: claimableAmountData, isLoading: isClaimableAmountLoading} = useListClaimableAmount(address);
 
-	// const {isLoading, isSuccess, write, error, data} = useContractWrite({
-	const {write, error} = useContractWrite({
-		address: config.nodeLicenseAddress as `0x${string}`,
-		abi: NodeLicenseAbi,
-		functionName: "redeemFromWhitelist",
-		onError(error) {
-			console.warn("Error", error);
-		},
-	});
+	if (!isClaimableAmountLoading) {
+		console.log("claimableAmount: ", claimableAmountData);
+	}
 
 	useEffect(() => {
 		if (keys !== 0) {
@@ -54,86 +44,93 @@ export function DropClaim() {
 							Redeem Sentry Keys
 						</p>
 
-						{!address && (
-							<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-								Connect your wallet to check your eligibility.
-							</p>
-						)}
-
-						{address ? (
+						{isClaimableAmountLoading ? (
+							<div className="w-full h-[390px] flex flex-col justify-center items-center gap-2">
+								<BiLoaderAlt className="animate-spin" color={"#A3A3A3"} size={32}/>
+								<p>Loading...</p>
+							</div>
+						) : (
 							<>
-								{eligible ? (
-									<>
-										<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-											This wallet ({address}) can claim <span className="font-semibold">{keys}</span> {keys === 1 ? "key" : "keys"}.
-										</p>
-										<div className="flex flex-col justify-center gap-8 p-6 mt-8">
-											<div className="flex flex-col justify-center gap-2">
-												<XaiCheckbox
-													onClick={() => setCheckboxOne(!checkboxOne)}
-													condition={checkboxOne}
-												>
-													I agree with the
-													<a
-														className="cursor-pointer text-[#F30919]"
-														onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>
-														Sentry Node Agreement
-													</a>
-												</XaiCheckbox>
 
 
-												<XaiCheckbox
-													onClick={() => setCheckboxTwo(!checkboxTwo)}
-													condition={checkboxTwo}
-												>
-													I understand Sentry Node Keys are not transferable
-												</XaiCheckbox>
+								{!address && (
+									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+										Connect your wallet to check your eligibility.
+									</p>
+								)}
+
+								{address ? (
+									<>
+										{eligible ? (
+											<>
+												<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+													This wallet ({address}) can claim <span
+													className="font-semibold">{keys}</span> {keys === 1 ? "key" : "keys"}.
+												</p>
+												<div className="flex flex-col justify-center gap-8 p-6 mt-8">
+													<div className="flex flex-col justify-center gap-2">
+														<XaiCheckbox
+															onClick={() => setCheckboxOne(!checkboxOne)}
+															condition={checkboxOne}
+														>
+															I agree with the
+															<a
+																className="cursor-pointer text-[#F30919]"
+																onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>
+																Sentry Node Agreement
+															</a>
+														</XaiCheckbox>
 
-												<XaiCheckbox
-													onClick={() => setCheckboxThree(!checkboxThree)}
-													condition={checkboxThree}
-												>
-													I understand that I cannot claim rewards until I pass KYC
-													<KYCTooltip
-														width={850}
-													>
-														<p className="text-[#F30919]">(SEE BLOCKED COUNTRIES)</p>
-													</KYCTooltip>
-												</XaiCheckbox>
-											</div>
 
-											<div>
-												<button
-													onClick={() => write}
-													className={`w-[576px] h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
-													disabled={!ready || chain?.id !== 42_161}
-												>
-													{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
-												</button>
+														<XaiCheckbox
+															onClick={() => setCheckboxTwo(!checkboxTwo)}
+															condition={checkboxTwo}
+														>
+															I understand Sentry Node Keys are not transferable
+														</XaiCheckbox>
 
-												{error && (
-													<p className="text-center break-words w-full mt-4 text-red-500">
-														{error.message}
-													</p>
-												)}
-											</div>
-										</div>
+														<XaiCheckbox
+															onClick={() => setCheckboxThree(!checkboxThree)}
+															condition={checkboxThree}
+														>
+															I understand that I cannot claim rewards until I pass KYC
+															<KYCTooltip
+																width={850}
+															>
+																<p className="text-[#F30919]">(SEE BLOCKED
+																	COUNTRIES)</p>
+															</KYCTooltip>
+														</XaiCheckbox>
+													</div>
+
+													<div>
+														<button
+															// onClick={() => write}
+															className={`w-[576px] h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
+															disabled={!ready || chain?.id !== 42_161}
+														>
+															{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
+														</button>
+													</div>
+												</div>
+											</>
+										) : (
+											<>
+												<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+													This wallet ({address}) is ineligible to claim any Xai Sentry Keys.
+												</p>
+												<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+													You can connect a different wallet to determine if it is eligible.
+												</p>
+											</>
+										)}
 									</>
 								) : (
-									<>
-									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-										This wallet ({address}) is ineligible to claim any Xai Sentry Keys.
-									</p>
-									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-										You can connect a different wallet to determine if it is eligible.
-									</p>
-									</>
+									<div className="m-8">
+										<w3m-button/>
+									</div>
 								)}
 							</>
-						) : (
-							<div className="m-8">
-								<w3m-button/>
-							</div>
 						)}
 					</div>
 				</div>
diff --git a/packages/core/src/node/index.ts b/packages/core/src/node/index.ts
index 19e08aedd..53b0d24f4 100644
--- a/packages/core/src/node/index.ts
+++ b/packages/core/src/node/index.ts
@@ -1,4 +1,5 @@
 export * from "./addOperator.js";
 export * from "./removeOperator.js";
 export * from "./listOperators.js";
-export * from "./listOwnersForOperator.js";
\ No newline at end of file
+export * from "./listOwnersForOperator.js";
+export * from "./listClaimableAmount.js";
diff --git a/packages/core/src/node/listClaimableAmount.ts b/packages/core/src/node/listClaimableAmount.ts
new file mode 100644
index 000000000..1f1804172
--- /dev/null
+++ b/packages/core/src/node/listClaimableAmount.ts
@@ -0,0 +1,20 @@
+import {getProvider} from "../utils/index.js";
+import {ethers} from "ethers";
+import {NodeLicenseAbi} from "../abis/index.js";
+import {config} from "../config.js";
+
+export async function listClaimableAmount(
+	address: string,
+): Promise<string[]> {
+
+	// Get the provider
+	const provider = getProvider();
+
+	// Create a contract instance
+	const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
+
+	// Get the number of owners
+	const claimableAmount = await contract.whitelistAmounts(address);
+
+	return claimableAmount;
+}

From 64d0b4d7706298ea76c0d5bff0c4fe37a160c6c9 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Tue, 19 Dec 2023 15:49:33 -0800
Subject: [PATCH 14/32] Adjust logic on DropClaim

---
 .../src/features/wallet/routes/DropClaim.tsx  | 48 ++++++++++---------
 packages/core/src/node/listClaimableAmount.ts |  2 +-
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index 735bb8e55..333190f3f 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -1,18 +1,15 @@
-import {useAccount, useNetwork} from "wagmi";
+import {useAccount, useContractWrite, useNetwork} from "wagmi";
 import {XaiBanner} from "@/features/checkout/XaiBanner";
 import {XaiCheckbox} from "@sentry/ui";
 import {KYCTooltip} from "@/features/checkout/KYCTooltip";
-import {useEffect, useState} from "react";
+import {useState} from "react";
 import {useListClaimableAmount} from "@/features/checkout/hooks/useListClaimableAmount";
 import {BiLoaderAlt} from "react-icons/bi";
+import {config, NodeLicenseAbi} from "@sentry/core";
 
 export function DropClaim() {
 	const {address} = useAccount();
 	const {chain} = useNetwork();
-
-	const [eligible, setEligible] = useState<boolean>(false);
-	const [keys,] = useState(15);
-
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
 	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
@@ -20,17 +17,18 @@ export function DropClaim() {
 
 	const {data: claimableAmountData, isLoading: isClaimableAmountLoading} = useListClaimableAmount(address);
 
-	if (!isClaimableAmountLoading) {
-		console.log("claimableAmount: ", claimableAmountData);
-	}
-
-	useEffect(() => {
-		if (keys !== 0) {
-			setEligible(true)
-		} else if (keys <= 0) {
-			setEligible(false)
-		}
-	}, [keys]);
+	const {isLoading: isRedeemFromWhitelistLoading, write, error, data} = useContractWrite({
+		address: config.nodeLicenseAddress as `0x${string}`,
+		abi: NodeLicenseAbi,
+		functionName: "redeemFromWhitelist",
+		args: [claimableAmountData],
+		onSuccess() {
+			console.log("Success", data);
+		},
+		onError(error) {
+			console.warn("Error", error);
+		},
+	});
 
 	return (
 		<div>
@@ -51,8 +49,6 @@ export function DropClaim() {
 							</div>
 						) : (
 							<>
-
-
 								{!address && (
 									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
 										Connect your wallet to check your eligibility.
@@ -61,11 +57,11 @@ export function DropClaim() {
 
 								{address ? (
 									<>
-										{eligible ? (
+										{claimableAmountData ? (
 											<>
 												<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
 													This wallet ({address}) can claim <span
-													className="font-semibold">{keys}</span> {keys === 1 ? "key" : "keys"}.
+													className="font-semibold">{claimableAmountData}</span> {claimableAmountData === 1 ? "key" : "keys"}.
 												</p>
 												<div className="flex flex-col justify-center gap-8 p-6 mt-8">
 													<div className="flex flex-col justify-center gap-2">
@@ -105,13 +101,19 @@ export function DropClaim() {
 
 													<div>
 														<button
-															// onClick={() => write}
+															onClick={() => write}
 															className={`w-[576px] h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
-															disabled={!ready || chain?.id !== 42_161}
+															disabled={!ready || chain?.id !== 42_161 || isRedeemFromWhitelistLoading}
 														>
 															{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
 														</button>
 													</div>
+
+													{error && (
+														<p className="text-center break-words w-full mt-4 text-red-500">
+															{error.message}
+														</p>
+													)}
 												</div>
 											</>
 										) : (
diff --git a/packages/core/src/node/listClaimableAmount.ts b/packages/core/src/node/listClaimableAmount.ts
index 1f1804172..b2b15ef20 100644
--- a/packages/core/src/node/listClaimableAmount.ts
+++ b/packages/core/src/node/listClaimableAmount.ts
@@ -5,7 +5,7 @@ import {config} from "../config.js";
 
 export async function listClaimableAmount(
 	address: string,
-): Promise<string[]> {
+): Promise<number> {
 
 	// Get the provider
 	const provider = getProvider();

From c7171e764c4af958cd3821c3d0829af49a09f979 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Wed, 20 Dec 2023 14:07:58 -0800
Subject: [PATCH 15/32] WIP: ClaimToken states

---
 .../checkout/hooks/useListClaimableAmount.ts  |  2 +-
 .../src/features/wallet/routes/ClaimToken.tsx | 50 +++++++++++++------
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts b/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
index 6ea9228ad..4b43cf6da 100644
--- a/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
+++ b/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
@@ -8,7 +8,7 @@ export function useListClaimableAmount(address: string | undefined) {
 			return await listClaimableAmount(address!);
 		},
 		staleTime: Infinity,
-		cacheTime: 2500,
+		cacheTime: Infinity,
 		enabled: address != undefined && address.length > 0,
 	});
 }
diff --git a/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx b/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
index 1623ecd51..f0c68a09f 100644
--- a/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
+++ b/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
@@ -1,10 +1,15 @@
-import {useAccount} from "wagmi";
+import {useAccount, useNetwork} from "wagmi";
 import {XaiBanner} from "@/features/checkout/XaiBanner";
 import {useState} from "react";
+import {XaiCheckbox} from "@sentry/ui";
 
 export function ClaimToken() {
 	const {address} = useAccount();
-	const [eligible, ] = useState<boolean>(true);
+	const [eligible,] = useState<boolean>(false);
+	const {chain} = useNetwork();
+
+	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
+	const ready = checkboxOne && chain?.id === 42_161
 
 	return (
 		<div>
@@ -32,25 +37,40 @@ export function ClaimToken() {
 											You are eligible to claim Xai Tokens!
 										</p>
 										<div className="flex flex-col justify-center gap-8 p-6 mt-8">
+
+											<div className="flex flex-col justify-center gap-2">
+												<XaiCheckbox
+													onClick={() => setCheckboxOne(!checkboxOne)}
+													condition={checkboxOne}
+												>
+													I agree with the Xai Airdrop
+													<a
+														className="cursor-pointer text-[#F30919]"
+														onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>
+														Terms and Conditions
+													</a>
+												</XaiCheckbox>
+											</div>
+
 											<div className="w-full">
-												{/*<button*/}
-												{/*	onClick={() => write}*/}
-												{/*	className={`w-[576px] h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}*/}
-												{/*	disabled={!ready || chain?.id !== 42_161}*/}
-												{/*>*/}
-												{/*	{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}*/}
-												{/*</button>*/}
+												<button
+													// onClick={() => write}
+													className={`w-[576px] h-16 ${ready ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
+													disabled={!ready}
+												>
+													{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
+												</button>
 											</div>
 										</div>
 									</>
 								) : (
 									<>
-									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-										This wallet ({address}) is ineligible to claim any Xai Tokens.
-									</p>
-									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-										You can connect a different wallet to determine if it is eligible.
-									</p>
+										<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+											This wallet ({address}) is ineligible to claim any Xai Tokens.
+										</p>
+										<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+											You can connect a different wallet to determine if it is eligible.
+										</p>
 									</>
 								)}
 							</>

From eb4869bce307ba32203e38b6d5bc297df637de22 Mon Sep 17 00:00:00 2001
From: Christopher Powroznik <christopher@frameonesoftware.com>
Date: Wed, 20 Dec 2023 14:29:17 -0800
Subject: [PATCH 16/32] NodeLicense5: phishing victims redeem

---
 .../.openzeppelin/arbitrum-goerli.json        |  574 +++++++-
 .../upgrades/node-license/NodeLicense5.sol    |    2 +-
 .../smart-contracts/hardhat.config.cjs        |    2 +-
 .../smart-contracts/scripts/deploy.mjs        |   51 +-
 packages/core/src/abis/NodeLicenseAbi.ts      | 1231 +++++++++--------
 5 files changed, 1275 insertions(+), 585 deletions(-)

diff --git a/infrastructure/smart-contracts/.openzeppelin/arbitrum-goerli.json b/infrastructure/smart-contracts/.openzeppelin/arbitrum-goerli.json
index e5397d8ee..a126a3b48 100644
--- a/infrastructure/smart-contracts/.openzeppelin/arbitrum-goerli.json
+++ b/infrastructure/smart-contracts/.openzeppelin/arbitrum-goerli.json
@@ -1684,6 +1684,131 @@
       "address": "0x4C64F0E6Fe7b4666c2b7fB2505cb2248Ab15a50a",
       "txHash": "0x94d5ff7723ba64a5d6da52967d39b11fc41045625efeadf16f66fa8865492170",
       "kind": "transparent"
+    },
+    {
+      "address": "0x61E4d0Fece207910391443B0eCEbe8761e19923F",
+      "txHash": "0x32324a45e26d9ead043d8117dacdf8c4449f77584b9f79ff42dff5ebb34e9db3",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x1fc11F59528744FB4C70A3517dB1Aaa7e0FdC2B6",
+      "txHash": "0x12d6fcec4df9a06cf7f947e3ea70397fdeb54a7da3d51f51ee5005a717b4d379",
+      "kind": "transparent"
+    },
+    {
+      "address": "0xa14c94DE917eFcdC26Dc117431Ad2fadad867c7A",
+      "txHash": "0x091b1a71fd044e8ebdc0d643663a41f747ebd7a56fa24f6aefa7ec9a1627c39e",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x89E92C83CdcFf1b457B92852cC65785F9437Be3e",
+      "txHash": "0xcb196e779cd2105a667550ec8e9d0d83ffff71b10f7065ad9a6dbe1109732534",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x372CF9FC9FFAFbC004591054735563838512aDd8",
+      "txHash": "0x32fb81b59f5c37e663d2af9ccfd0afca26a8ab2047e10dd4b9a6112f2ea5fe40",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x9D1782BF9C2A9425aF96e35Ee7deb472f8FD8711",
+      "txHash": "0xa5c379c796271e70c69c443da2c8b054944d39a92a53cb4d4cfda28ac8e0bc2a",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x5300fD1fe5d2193c20d25dcD7814EFCf899d494e",
+      "txHash": "0xe741298d9f566a203a6367fc450414a80ae0b7bb7d8bf7a5882e786413899e1b",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x6527853b4A47aA2c3Ea62529e20F73F5B9d6eC98",
+      "txHash": "0x7f0dbf21c71275ad6e67556e58d59efaff3c1ed73fceacda87855e655dd3e0ca",
+      "kind": "transparent"
+    },
+    {
+      "address": "0xAA93bf2Ad2B4d2352085197C17B0d0D024AfCc1D",
+      "txHash": "0xaa036dd9f34b343353f069c59f4cfb46198abedfe65db0d8f1ec86abea71bb41",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x554a77c5BB3941522c4F8669957C7D81CE108426",
+      "txHash": "0x8e989cbcfe320785a49b2505500e64f8d953c090923c3cd994ac8eb12fac5e67",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x2Cb5E6954da90eC3385B9F23e4A9e2702A7421c0",
+      "txHash": "0xc454192b4dd8bc47096b30248f6808883d85a3ea1d4697b1043eb48c98c1f645",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x334a9613be9F127A6C7365230C7aC85BA17BDEAc",
+      "txHash": "0x12b446a5e78a1fd76df5583acc6d84c8ee6ade811ab5da234c93e782a2c6c900",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x05B40B16A078c7ad4069dE747BdE4c4E5E4775Ab",
+      "txHash": "0x8614bcf1b992bd80551130885dc5ee2896dc6c66755321a97f6e2a5e42d159f7",
+      "kind": "transparent"
+    },
+    {
+      "address": "0xe85D4a84911007Ef7D59f6d67a310CC18DC1eA2c",
+      "txHash": "0x0397f4ba787dc155b1c4610ed7739c332d98ea81a507aeaec6350061ea949fef",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x98053E73692FBF1a9F0d1F171Dac0c396D5cBf2E",
+      "txHash": "0xdfe65af7183c4f55b7e36147b4c9ce73758effac17a6913aa6d39fbff6d47a34",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x554B797811853DC0056b40e5A733033e44b3E129",
+      "txHash": "0x3530daeb896510680a4a18271cc39a4de0d401aee4e80e54fb176a99b154627f",
+      "kind": "transparent"
+    },
+    {
+      "address": "0xFBcB5700A68f27f89383B2193C61c76B281b00dC",
+      "txHash": "0x1ecee68bcc96c37e31dc85bed910255247de3d0404bdf0d19ce8bacbed2b6bd4",
+      "kind": "transparent"
+    },
+    {
+      "address": "0xd92CF6c20dB7cAEB4b43Da3276eB420F86D233f0",
+      "txHash": "0x5377eed934ae60b41f96282cb47b71e71a3d1e78c71c584a05bde6c7c4752a96",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x7582d37f3418f72E1924FE1ED76cf1B6a853c719",
+      "txHash": "0xf02c87e358621a38722f9c7880afb76882946822b1636e767dc4728784e1918f",
+      "kind": "transparent"
+    },
+    {
+      "address": "0xde7F7355059595c019D5e4dE2F51714592623Ccd",
+      "txHash": "0x799245c01a1f80655a9263178d49e7fb171876305735e8879cdb9e39aecad654",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x924263A4d6f6980d9Ddd7679133712f443936ae1",
+      "txHash": "0xd32cc9f8cf8c0fa19cb30d7a9d1d7bcfed749d1f157f27cadf55a9487699417a",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x36dF1Fd598E4BcDb077f8E6E07f3dEd711de09F7",
+      "txHash": "0x5ce52ef7b89e1b25709d42e36e466af1afcc52f8f77fda4f5dca4fabdca1ab50",
+      "kind": "transparent"
+    },
+    {
+      "address": "0xDa7a7F48f0510E06f29598286271f56E0fB9c7d5",
+      "txHash": "0x25e057bf57927e1b290ee72dceea588e6432e830cf2bba157e4e4f02db735049",
+      "kind": "transparent"
+    },
+    {
+      "address": "0x1Aa409347f4B5acE0711Edbd4255c47Dc2AaCBbb",
+      "txHash": "0x33b9f29108d087f2ab194059290ab7cf1bc181b3109e38f07dbff4963185ae7d",
+      "kind": "transparent"
+    },
+    {
+      "address": "0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9",
+      "txHash": "0xc402f04461d53bcf45981ea383a39ef2b210f39f28acdd22b24c903f800d8a7d",
+      "kind": "transparent"
     }
   ],
   "impls": {
@@ -17353,7 +17478,7 @@
             "label": "_tokenIds",
             "offset": 0,
             "slot": "251",
-            "type": "t_struct(Counter)3469_storage",
+            "type": "t_struct(Counter)3728_storage",
             "contract": "NodeLicense",
             "src": "contracts/NodeLicense.sol:13"
           },
@@ -17377,7 +17502,7 @@
             "label": "pricingTiers",
             "offset": 0,
             "slot": "254",
-            "type": "t_array(t_struct(Tier)6334_storage)dyn_storage",
+            "type": "t_array(t_struct(Tier)8326_storage)dyn_storage",
             "contract": "NodeLicense",
             "src": "contracts/NodeLicense.sol:20"
           },
@@ -17417,7 +17542,7 @@
             "label": "_promoCodes",
             "offset": 0,
             "slot": "259",
-            "type": "t_mapping(t_string_memory_ptr,t_struct(PromoCode)6341_storage)",
+            "type": "t_mapping(t_string_memory_ptr,t_struct(PromoCode)8333_storage)",
             "contract": "NodeLicense",
             "src": "contracts/NodeLicense.sol:32"
           },
@@ -17455,7 +17580,7 @@
             "label": "address payable",
             "numberOfBytes": "20"
           },
-          "t_array(t_struct(Tier)6334_storage)dyn_storage": {
+          "t_array(t_struct(Tier)8326_storage)dyn_storage": {
             "label": "struct NodeLicense.Tier[]",
             "numberOfBytes": "32"
           },
@@ -17511,7 +17636,7 @@
             "label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_string_memory_ptr,t_struct(PromoCode)6341_storage)": {
+          "t_mapping(t_string_memory_ptr,t_struct(PromoCode)8333_storage)": {
             "label": "mapping(string => struct NodeLicense.PromoCode)",
             "numberOfBytes": "32"
           },
@@ -17531,7 +17656,7 @@
             "label": "string",
             "numberOfBytes": "32"
           },
-          "t_struct(Counter)3469_storage": {
+          "t_struct(Counter)3728_storage": {
             "label": "struct CountersUpgradeable.Counter",
             "members": [
               {
@@ -17543,7 +17668,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(PromoCode)6341_storage": {
+          "t_struct(PromoCode)8333_storage": {
             "label": "struct NodeLicense.PromoCode",
             "members": [
               {
@@ -17585,7 +17710,7 @@
             ],
             "numberOfBytes": "64"
           },
-          "t_struct(Tier)6334_storage": {
+          "t_struct(Tier)8326_storage": {
             "label": "struct NodeLicense.Tier",
             "members": [
               {
@@ -19282,6 +19407,439 @@
         },
         "namespaces": {}
       }
+    },
+    "3679cf46886a5533c14ddffdf42dd10f4788b6931434bf87af220c63fc52f756": {
+      "address": "0xea9Dc14dB7F40a28A0339D98B03724e0c7235911",
+      "txHash": "0x55b8f06a8ef272742d8cb9337d75a11e9e0e70763d83da6e2fff540671afee29",
+      "layout": {
+        "solcVersion": "0.8.9",
+        "storage": [
+          {
+            "label": "_initialized",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_uint8",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
+            "retypedFrom": "bool"
+          },
+          {
+            "label": "_initializing",
+            "offset": 1,
+            "slot": "0",
+            "type": "t_bool",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ContextUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "51",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ERC165Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41"
+          },
+          {
+            "label": "_name",
+            "offset": 0,
+            "slot": "101",
+            "type": "t_string_storage",
+            "contract": "ERC721Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:25"
+          },
+          {
+            "label": "_symbol",
+            "offset": 0,
+            "slot": "102",
+            "type": "t_string_storage",
+            "contract": "ERC721Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:28"
+          },
+          {
+            "label": "_owners",
+            "offset": 0,
+            "slot": "103",
+            "type": "t_mapping(t_uint256,t_address)",
+            "contract": "ERC721Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:31"
+          },
+          {
+            "label": "_balances",
+            "offset": 0,
+            "slot": "104",
+            "type": "t_mapping(t_address,t_uint256)",
+            "contract": "ERC721Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:34"
+          },
+          {
+            "label": "_tokenApprovals",
+            "offset": 0,
+            "slot": "105",
+            "type": "t_mapping(t_uint256,t_address)",
+            "contract": "ERC721Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:37"
+          },
+          {
+            "label": "_operatorApprovals",
+            "offset": 0,
+            "slot": "106",
+            "type": "t_mapping(t_address,t_mapping(t_address,t_bool))",
+            "contract": "ERC721Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:40"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "107",
+            "type": "t_array(t_uint256)44_storage",
+            "contract": "ERC721Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:477"
+          },
+          {
+            "label": "_ownedTokens",
+            "offset": 0,
+            "slot": "151",
+            "type": "t_mapping(t_address,t_mapping(t_uint256,t_uint256))",
+            "contract": "ERC721EnumerableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol:22"
+          },
+          {
+            "label": "_ownedTokensIndex",
+            "offset": 0,
+            "slot": "152",
+            "type": "t_mapping(t_uint256,t_uint256)",
+            "contract": "ERC721EnumerableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol:25"
+          },
+          {
+            "label": "_allTokens",
+            "offset": 0,
+            "slot": "153",
+            "type": "t_array(t_uint256)dyn_storage",
+            "contract": "ERC721EnumerableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol:28"
+          },
+          {
+            "label": "_allTokensIndex",
+            "offset": 0,
+            "slot": "154",
+            "type": "t_mapping(t_uint256,t_uint256)",
+            "contract": "ERC721EnumerableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol:31"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "155",
+            "type": "t_array(t_uint256)46_storage",
+            "contract": "ERC721EnumerableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol:171"
+          },
+          {
+            "label": "_roles",
+            "offset": 0,
+            "slot": "201",
+            "type": "t_mapping(t_bytes32,t_struct(RoleData)34_storage)",
+            "contract": "AccessControlUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:62"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "202",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "AccessControlUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:260"
+          },
+          {
+            "label": "_tokenIds",
+            "offset": 0,
+            "slot": "251",
+            "type": "t_struct(Counter)2520_storage",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:13"
+          },
+          {
+            "label": "fundsReceiver",
+            "offset": 0,
+            "slot": "252",
+            "type": "t_address_payable",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:15"
+          },
+          {
+            "label": "maxSupply",
+            "offset": 0,
+            "slot": "253",
+            "type": "t_uint256",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:17"
+          },
+          {
+            "label": "pricingTiers",
+            "offset": 0,
+            "slot": "254",
+            "type": "t_array(t_struct(Tier)3910_storage)dyn_storage",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:20"
+          },
+          {
+            "label": "referralDiscountPercentage",
+            "offset": 0,
+            "slot": "255",
+            "type": "t_uint256",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:22"
+          },
+          {
+            "label": "referralRewardPercentage",
+            "offset": 0,
+            "slot": "256",
+            "type": "t_uint256",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:23"
+          },
+          {
+            "label": "claimable",
+            "offset": 0,
+            "slot": "257",
+            "type": "t_bool",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:26"
+          },
+          {
+            "label": "_mintTimestamps",
+            "offset": 0,
+            "slot": "258",
+            "type": "t_mapping(t_uint256,t_uint256)",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:29"
+          },
+          {
+            "label": "_promoCodes",
+            "offset": 0,
+            "slot": "259",
+            "type": "t_mapping(t_string_memory_ptr,t_struct(PromoCode)3917_storage)",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:32"
+          },
+          {
+            "label": "_referralRewards",
+            "offset": 0,
+            "slot": "260",
+            "type": "t_mapping(t_address,t_uint256)",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:35"
+          },
+          {
+            "label": "_averageCost",
+            "offset": 0,
+            "slot": "261",
+            "type": "t_mapping(t_uint256,t_uint256)",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:38"
+          },
+          {
+            "label": "whitelistAmounts",
+            "offset": 0,
+            "slot": "262",
+            "type": "t_mapping(t_address,t_uint16)",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:41"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "263",
+            "type": "t_array(t_uint256)499_storage",
+            "contract": "NodeLicense5",
+            "src": "contracts/upgrades/node-license/NodeLicense5.sol:48"
+          }
+        ],
+        "types": {
+          "t_address": {
+            "label": "address",
+            "numberOfBytes": "20"
+          },
+          "t_address_payable": {
+            "label": "address payable",
+            "numberOfBytes": "20"
+          },
+          "t_array(t_struct(Tier)3910_storage)dyn_storage": {
+            "label": "struct NodeLicense5.Tier[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_uint256)44_storage": {
+            "label": "uint256[44]",
+            "numberOfBytes": "1408"
+          },
+          "t_array(t_uint256)46_storage": {
+            "label": "uint256[46]",
+            "numberOfBytes": "1472"
+          },
+          "t_array(t_uint256)499_storage": {
+            "label": "uint256[499]",
+            "numberOfBytes": "15968"
+          },
+          "t_array(t_uint256)49_storage": {
+            "label": "uint256[49]",
+            "numberOfBytes": "1568"
+          },
+          "t_array(t_uint256)50_storage": {
+            "label": "uint256[50]",
+            "numberOfBytes": "1600"
+          },
+          "t_array(t_uint256)dyn_storage": {
+            "label": "uint256[]",
+            "numberOfBytes": "32"
+          },
+          "t_bool": {
+            "label": "bool",
+            "numberOfBytes": "1"
+          },
+          "t_bytes32": {
+            "label": "bytes32",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_bool)": {
+            "label": "mapping(address => bool)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_mapping(t_address,t_bool))": {
+            "label": "mapping(address => mapping(address => bool))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_mapping(t_uint256,t_uint256))": {
+            "label": "mapping(address => mapping(uint256 => uint256))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_uint16)": {
+            "label": "mapping(address => uint16)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_uint256)": {
+            "label": "mapping(address => uint256)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_bytes32,t_struct(RoleData)34_storage)": {
+            "label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_string_memory_ptr,t_struct(PromoCode)3917_storage)": {
+            "label": "mapping(string => struct NodeLicense5.PromoCode)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_address)": {
+            "label": "mapping(uint256 => address)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_uint256)": {
+            "label": "mapping(uint256 => uint256)",
+            "numberOfBytes": "32"
+          },
+          "t_string_memory_ptr": {
+            "label": "string",
+            "numberOfBytes": "32"
+          },
+          "t_string_storage": {
+            "label": "string",
+            "numberOfBytes": "32"
+          },
+          "t_struct(Counter)2520_storage": {
+            "label": "struct CountersUpgradeable.Counter",
+            "members": [
+              {
+                "label": "_value",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(PromoCode)3917_storage": {
+            "label": "struct NodeLicense5.PromoCode",
+            "members": [
+              {
+                "label": "recipient",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "active",
+                "type": "t_bool",
+                "offset": 20,
+                "slot": "0"
+              },
+              {
+                "label": "receivedLifetime",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          },
+          "t_struct(RoleData)34_storage": {
+            "label": "struct AccessControlUpgradeable.RoleData",
+            "members": [
+              {
+                "label": "members",
+                "type": "t_mapping(t_address,t_bool)",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "adminRole",
+                "type": "t_bytes32",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          },
+          "t_struct(Tier)3910_storage": {
+            "label": "struct NodeLicense5.Tier",
+            "members": [
+              {
+                "label": "price",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "quantity",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          },
+          "t_uint16": {
+            "label": "uint16",
+            "numberOfBytes": "2"
+          },
+          "t_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          },
+          "t_uint8": {
+            "label": "uint8",
+            "numberOfBytes": "1"
+          }
+        },
+        "namespaces": {}
+      }
     }
   }
 }
diff --git a/infrastructure/smart-contracts/contracts/upgrades/node-license/NodeLicense5.sol b/infrastructure/smart-contracts/contracts/upgrades/node-license/NodeLicense5.sol
index 0dcb0ab8f..c64613785 100644
--- a/infrastructure/smart-contracts/contracts/upgrades/node-license/NodeLicense5.sol
+++ b/infrastructure/smart-contracts/contracts/upgrades/node-license/NodeLicense5.sol
@@ -45,7 +45,7 @@ contract NodeLicense5 is ERC721EnumerableUpgradeable, AccessControlUpgradeable {
      * variables without shifting down storage in the inheritance chain.
      * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps
      */
-    uint256[500] private __gap;
+    uint256[499] private __gap;
 
     // Define the pricing tiers
     struct Tier {
diff --git a/infrastructure/smart-contracts/hardhat.config.cjs b/infrastructure/smart-contracts/hardhat.config.cjs
index 7edbf7522..c99b1bfc5 100644
--- a/infrastructure/smart-contracts/hardhat.config.cjs
+++ b/infrastructure/smart-contracts/hardhat.config.cjs
@@ -5,7 +5,7 @@ const dotenv = require("dotenv");
 dotenv.config();
 
 const config = {
-  defaultNetwork: "hardhat",
+  defaultNetwork: "arbitrumGoerli",
   solidity: {
     version: "0.8.9",
     settings: {
diff --git a/infrastructure/smart-contracts/scripts/deploy.mjs b/infrastructure/smart-contracts/scripts/deploy.mjs
index 44a4300b9..9beae5e59 100644
--- a/infrastructure/smart-contracts/scripts/deploy.mjs
+++ b/infrastructure/smart-contracts/scripts/deploy.mjs
@@ -128,7 +128,7 @@ async function main() {
 
   console.log("Deploying NodeLicense...");
   const NodeLicense = await ethers.getContractFactory("NodeLicense");
-  const nodeLicense = await upgrades.deployProxy(NodeLicense, [options.fundsReceiver, options.referralDiscountPercentage, options.referralRewardPercentage], { deployer: deployer });
+  let nodeLicense = await upgrades.deployProxy(NodeLicense, [options.fundsReceiver, options.referralDiscountPercentage, options.referralRewardPercentage], { deployer: deployer });
   const { blockNumber: nodeLicenseDeployedBlockNumber } = await nodeLicense.deploymentTransaction();
   const nodeLicenseAddress = await nodeLicense.getAddress();
 
@@ -198,24 +198,43 @@ async function main() {
   }
 
   // denounce the admin role of the deployer on every contract  
-  await referee.renounceRole(refereeAdminRole, deployerAddress);
-  console.log(`Renounced admin role of ${deployerAddress} on Referee`);
-  await nodeLicense.renounceRole(nodeLicenseAdminRole, deployerAddress);
-  console.log(`Renounced admin role of ${deployerAddress} on NodeLicense`);
-  await esXai.renounceRole(esXaiAdminRole, deployerAddress);
-  console.log(`Renounced admin role of ${deployerAddress} on esXai`);
-  await xai.renounceRole(xaiAdminRole, deployerAddress);
-  console.log(`Renounced admin role of ${deployerAddress} on xai`);
+  // await referee.renounceRole(refereeAdminRole, deployerAddress);
+  // console.log(`Renounced admin role of ${deployerAddress} on Referee`);
+  // await nodeLicense.renounceRole(nodeLicenseAdminRole, deployerAddress);
+  // console.log(`Renounced admin role of ${deployerAddress} on NodeLicense`);
+  // await esXai.renounceRole(esXaiAdminRole, deployerAddress);
+  // console.log(`Renounced admin role of ${deployerAddress} on esXai`);
+  // await xai.renounceRole(xaiAdminRole, deployerAddress);
+  // console.log(`Renounced admin role of ${deployerAddress} on xai`);
 
   // Verify the contracts
-  await Promise.all([
-    safeVerify({ contract: xai }),
-    safeVerify({ contract: referee }),
-    safeVerify({ contract: esXai }),
-    safeVerify({ contract: nodeLicense }),
-    safeVerify({ contract: gasSubsidy }),
-  ]);
+  // await Promise.all([
+  //   safeVerify({ contract: xai }),
+  //   safeVerify({ contract: referee }),
+  //   safeVerify({ contract: esXai }),
+  //   safeVerify({ contract: nodeLicense }),
+  //   safeVerify({ contract: gasSubsidy }),
+  // ]);
   console.log("Contracts verified.");
+
+  // upgrade nodelicense
+  const NodeLicenseUpgrade = await ethers.getContractFactory("NodeLicense5");
+  nodeLicense = await upgrades.upgradeProxy(nodeLicenseAddress , NodeLicenseUpgrade);
+  console.log("Upgraded");
+
+  // update the nodeLicense with the new whitelist values
+  const whitelist = ["0xBAbeCCc528725ab1BFe7EEB6971FD7dbdd65cd85", "0x39085cC8918dED41cA38993Ccd73934AC097e373", "0x6D5060128fa9611b0E371F1Ba1B2Fa6371cd52cb"];
+  const whitelistValues = [251, 251, 251];
+
+  await nodeLicense.updateWhitelistAmounts(whitelist, whitelistValues);
+  console.log("Updated whitelist amounts");
+
+  // await run("verify:verify", {
+  //     address: nodeLicenseAddress,
+  //     constructorArguments: [],
+  // });
+
+
 }
 
 // We recommend this pattern to be able to use async/await everywhere
diff --git a/packages/core/src/abis/NodeLicenseAbi.ts b/packages/core/src/abis/NodeLicenseAbi.ts
index 78fe6a6bb..29355c334 100644
--- a/packages/core/src/abis/NodeLicenseAbi.ts
+++ b/packages/core/src/abis/NodeLicenseAbi.ts
@@ -1,1101 +1,1214 @@
 export const NodeLicenseAbi = [
   {
-    "type": "event",
     "anonymous": false,
-    "name": "Approval",
     "inputs": [
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "owner",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "approved",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "uint256",
+        "indexed": true,
+        "internalType": "uint256",
         "name": "tokenId",
-        "indexed": true
+        "type": "uint256"
       }
-    ]
+    ],
+    "name": "Approval",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "ApprovalForAll",
     "inputs": [
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "owner",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "operator",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "bool",
+        "indexed": false,
+        "internalType": "bool",
         "name": "approved",
-        "indexed": false
+        "type": "bool"
       }
-    ]
+    ],
+    "name": "ApprovalForAll",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "ClaimableChanged",
     "inputs": [
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "admin",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "bool",
+        "indexed": false,
+        "internalType": "bool",
         "name": "newClaimableState",
-        "indexed": false
+        "type": "bool"
       }
-    ]
+    ],
+    "name": "ClaimableChanged",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "FundsReceiverChanged",
     "inputs": [
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "admin",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "address",
+        "indexed": false,
+        "internalType": "address",
         "name": "newFundsReceiver",
-        "indexed": false
+        "type": "address"
       }
-    ]
+    ],
+    "name": "FundsReceiverChanged",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "FundsWithdrawn",
     "inputs": [
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "admin",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256",
         "name": "amount",
-        "indexed": false
+        "type": "uint256"
       }
-    ]
+    ],
+    "name": "FundsWithdrawn",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "Initialized",
     "inputs": [
       {
-        "type": "uint8",
+        "indexed": false,
+        "internalType": "uint8",
         "name": "version",
-        "indexed": false
+        "type": "uint8"
       }
-    ]
+    ],
+    "name": "Initialized",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "PricingTierSetOrAdded",
     "inputs": [
       {
-        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256",
         "name": "index",
-        "indexed": false
+        "type": "uint256"
       },
       {
-        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256",
         "name": "price",
-        "indexed": false
+        "type": "uint256"
       },
       {
-        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256",
         "name": "quantity",
-        "indexed": false
+        "type": "uint256"
       }
-    ]
+    ],
+    "name": "PricingTierSetOrAdded",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "PromoCodeCreated",
     "inputs": [
       {
-        "type": "string",
+        "indexed": false,
+        "internalType": "string",
         "name": "promoCode",
-        "indexed": false
+        "type": "string"
       },
       {
-        "type": "address",
+        "indexed": false,
+        "internalType": "address",
         "name": "recipient",
-        "indexed": false
+        "type": "address"
       }
-    ]
+    ],
+    "name": "PromoCodeCreated",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "PromoCodeRemoved",
     "inputs": [
       {
-        "type": "string",
+        "indexed": false,
+        "internalType": "string",
         "name": "promoCode",
-        "indexed": false
+        "type": "string"
       }
-    ]
+    ],
+    "name": "PromoCodeRemoved",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "ReferralReward",
     "inputs": [
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "buyer",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "referralAddress",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256",
         "name": "amount",
-        "indexed": false
+        "type": "uint256"
       }
-    ]
+    ],
+    "name": "ReferralReward",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "ReferralRewardPercentagesChanged",
     "inputs": [
       {
-        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256",
         "name": "referralDiscountPercentage",
-        "indexed": false
+        "type": "uint256"
       },
       {
-        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256",
         "name": "referralRewardPercentage",
-        "indexed": false
+        "type": "uint256"
       }
-    ]
+    ],
+    "name": "ReferralRewardPercentagesChanged",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "RefundOccurred",
     "inputs": [
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "refundee",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256",
         "name": "amount",
-        "indexed": false
+        "type": "uint256"
       }
-    ]
+    ],
+    "name": "RefundOccurred",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "RewardClaimed",
     "inputs": [
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "claimer",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256",
         "name": "amount",
-        "indexed": false
+        "type": "uint256"
       }
-    ]
+    ],
+    "name": "RewardClaimed",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "RoleAdminChanged",
     "inputs": [
       {
-        "type": "bytes32",
+        "indexed": true,
+        "internalType": "bytes32",
         "name": "role",
-        "indexed": true
+        "type": "bytes32"
       },
       {
-        "type": "bytes32",
+        "indexed": true,
+        "internalType": "bytes32",
         "name": "previousAdminRole",
-        "indexed": true
+        "type": "bytes32"
       },
       {
-        "type": "bytes32",
+        "indexed": true,
+        "internalType": "bytes32",
         "name": "newAdminRole",
-        "indexed": true
+        "type": "bytes32"
       }
-    ]
+    ],
+    "name": "RoleAdminChanged",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "RoleGranted",
     "inputs": [
       {
-        "type": "bytes32",
+        "indexed": true,
+        "internalType": "bytes32",
         "name": "role",
-        "indexed": true
+        "type": "bytes32"
       },
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "account",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "sender",
-        "indexed": true
+        "type": "address"
       }
-    ]
+    ],
+    "name": "RoleGranted",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "RoleRevoked",
     "inputs": [
       {
-        "type": "bytes32",
+        "indexed": true,
+        "internalType": "bytes32",
         "name": "role",
-        "indexed": true
+        "type": "bytes32"
       },
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "account",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "sender",
-        "indexed": true
+        "type": "address"
       }
-    ]
+    ],
+    "name": "RoleRevoked",
+    "type": "event"
   },
   {
-    "type": "event",
     "anonymous": false,
-    "name": "Transfer",
     "inputs": [
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "from",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "address",
+        "indexed": true,
+        "internalType": "address",
         "name": "to",
-        "indexed": true
+        "type": "address"
       },
       {
-        "type": "uint256",
+        "indexed": true,
+        "internalType": "uint256",
         "name": "tokenId",
-        "indexed": true
+        "type": "uint256"
       }
-    ]
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "redeemer",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint16",
+        "name": "newAmount",
+        "type": "uint16"
+      }
+    ],
+    "name": "WhitelistAmountRedeemed",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "redeemer",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint16",
+        "name": "newAmount",
+        "type": "uint16"
+      }
+    ],
+    "name": "WhitelistAmountUpdatedByAdmin",
+    "type": "event"
   },
   {
-    "type": "function",
-    "name": "DEFAULT_ADMIN_ROLE",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [],
+    "name": "DEFAULT_ADMIN_ROLE",
     "outputs": [
       {
-        "type": "bytes32",
-        "name": ""
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "approve",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "address",
-        "name": "to"
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
       {
-        "type": "uint256",
-        "name": "tokenId"
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
       }
     ],
-    "outputs": []
+    "name": "approve",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "balanceOf",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "address",
-        "name": "owner"
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
       }
     ],
+    "name": "balanceOf",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "claimReferralReward",
-    "constant": false,
-    "payable": false,
     "inputs": [],
-    "outputs": []
+    "name": "claimReferralReward",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "claimable",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [],
+    "name": "claimable",
     "outputs": [
       {
-        "type": "bool",
-        "name": ""
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "createPromoCode",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "string",
-        "name": "_promoCode"
+        "internalType": "string",
+        "name": "_promoCode",
+        "type": "string"
       },
       {
-        "type": "address",
-        "name": "_recipient"
+        "internalType": "address",
+        "name": "_recipient",
+        "type": "address"
       }
     ],
-    "outputs": []
+    "name": "createPromoCode",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "fundsReceiver",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [],
+    "name": "fundsReceiver",
     "outputs": [
       {
-        "type": "address",
-        "name": ""
+        "internalType": "address payable",
+        "name": "",
+        "type": "address"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "getApproved",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "tokenId"
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
       }
     ],
+    "name": "getApproved",
     "outputs": [
       {
-        "type": "address",
-        "name": ""
+        "internalType": "address",
+        "name": "",
+        "type": "address"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "getAverageCost",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "_tokenId"
+        "internalType": "uint256",
+        "name": "_tokenId",
+        "type": "uint256"
       }
     ],
+    "name": "getAverageCost",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "getMintTimestamp",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "_tokenId"
+        "internalType": "uint256",
+        "name": "_tokenId",
+        "type": "uint256"
       }
     ],
+    "name": "getMintTimestamp",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "getPricingTier",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "_index"
+        "internalType": "uint256",
+        "name": "_index",
+        "type": "uint256"
       }
     ],
+    "name": "getPricingTier",
     "outputs": [
       {
-        "type": "tuple",
-        "name": "",
         "components": [
           {
-            "type": "uint256",
-            "name": "price"
+            "internalType": "uint256",
+            "name": "price",
+            "type": "uint256"
           },
           {
-            "type": "uint256",
-            "name": "quantity"
+            "internalType": "uint256",
+            "name": "quantity",
+            "type": "uint256"
           }
-        ]
+        ],
+        "internalType": "struct NodeLicense5.Tier",
+        "name": "",
+        "type": "tuple"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "getPricingTiersLength",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [],
+    "name": "getPricingTiersLength",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "getPromoCode",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "string",
-        "name": "_promoCode"
+        "internalType": "string",
+        "name": "_promoCode",
+        "type": "string"
       }
     ],
+    "name": "getPromoCode",
     "outputs": [
       {
-        "type": "tuple",
-        "name": "",
         "components": [
           {
-            "type": "address",
-            "name": "recipient"
+            "internalType": "address",
+            "name": "recipient",
+            "type": "address"
           },
           {
-            "type": "bool",
-            "name": "active"
+            "internalType": "bool",
+            "name": "active",
+            "type": "bool"
           },
           {
-            "type": "uint256",
-            "name": "receivedLifetime"
+            "internalType": "uint256",
+            "name": "receivedLifetime",
+            "type": "uint256"
           }
-        ]
+        ],
+        "internalType": "struct NodeLicense5.PromoCode",
+        "name": "",
+        "type": "tuple"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "getRoleAdmin",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "bytes32",
-        "name": "role"
+        "internalType": "bytes32",
+        "name": "role",
+        "type": "bytes32"
       }
     ],
+    "name": "getRoleAdmin",
     "outputs": [
       {
-        "type": "bytes32",
-        "name": ""
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "grantRole",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "bytes32",
-        "name": "role"
+        "internalType": "bytes32",
+        "name": "role",
+        "type": "bytes32"
       },
       {
-        "type": "address",
-        "name": "account"
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
       }
     ],
-    "outputs": []
+    "name": "grantRole",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "hasRole",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "bytes32",
-        "name": "role"
+        "internalType": "bytes32",
+        "name": "role",
+        "type": "bytes32"
       },
       {
-        "type": "address",
-        "name": "account"
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
       }
     ],
+    "name": "hasRole",
     "outputs": [
       {
-        "type": "bool",
-        "name": ""
-      }
-    ]
-  },
-  {
-    "type": "function",
-    "name": "initialize",
-    "constant": false,
-    "payable": false,
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_fundsReceiver"
-      },
-      {
-        "type": "uint256",
-        "name": "_referralDiscountPercentage"
-      },
-      {
-        "type": "uint256",
-        "name": "_referralRewardPercentage"
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
       }
     ],
-    "outputs": []
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "isApprovedForAll",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "address",
-        "name": "owner"
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
       },
       {
-        "type": "address",
-        "name": "operator"
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
       }
     ],
+    "name": "isApprovedForAll",
     "outputs": [
       {
-        "type": "bool",
-        "name": ""
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "maxSupply",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [],
+    "name": "maxSupply",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "mint",
-    "constant": false,
-    "stateMutability": "payable",
-    "payable": true,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "_amount"
+        "internalType": "uint256",
+        "name": "_amount",
+        "type": "uint256"
       },
       {
-        "type": "string",
-        "name": "_promoCode"
+        "internalType": "string",
+        "name": "_promoCode",
+        "type": "string"
       }
     ],
-    "outputs": []
+    "name": "mint",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "name",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [],
+    "name": "name",
     "outputs": [
       {
-        "type": "string",
-        "name": ""
+        "internalType": "string",
+        "name": "",
+        "type": "string"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "ownerOf",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "tokenId"
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
       }
     ],
+    "name": "ownerOf",
     "outputs": [
       {
-        "type": "address",
-        "name": ""
+        "internalType": "address",
+        "name": "",
+        "type": "address"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "price",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "_amount"
+        "internalType": "uint256",
+        "name": "_amount",
+        "type": "uint256"
       },
       {
-        "type": "string",
-        "name": "_promoCode"
+        "internalType": "string",
+        "name": "_promoCode",
+        "type": "string"
       }
     ],
+    "name": "price",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "redeemFromWhitelist",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "referralDiscountPercentage",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [],
+    "name": "referralDiscountPercentage",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "referralRewardPercentage",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [],
+    "name": "referralRewardPercentage",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "refundNodeLicense",
-    "constant": false,
-    "stateMutability": "payable",
-    "payable": true,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "_tokenId"
+        "internalType": "uint256",
+        "name": "_tokenId",
+        "type": "uint256"
       }
     ],
-    "outputs": []
+    "name": "refundNodeLicense",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "removePromoCode",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "string",
-        "name": "_promoCode"
+        "internalType": "string",
+        "name": "_promoCode",
+        "type": "string"
       }
     ],
-    "outputs": []
+    "name": "removePromoCode",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "renounceRole",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "bytes32",
-        "name": "role"
+        "internalType": "bytes32",
+        "name": "role",
+        "type": "bytes32"
       },
       {
-        "type": "address",
-        "name": "account"
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
       }
     ],
-    "outputs": []
+    "name": "renounceRole",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "revokeRole",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "bytes32",
-        "name": "role"
+        "internalType": "bytes32",
+        "name": "role",
+        "type": "bytes32"
       },
       {
-        "type": "address",
-        "name": "account"
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
       }
     ],
-    "outputs": []
+    "name": "revokeRole",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "safeTransferFrom",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "address",
-        "name": "from"
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
       },
       {
-        "type": "address",
-        "name": "to"
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
       {
-        "type": "uint256",
-        "name": "tokenId"
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
       }
     ],
-    "outputs": []
+    "name": "safeTransferFrom",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "safeTransferFrom",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "address",
-        "name": "from"
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
       },
       {
-        "type": "address",
-        "name": "to"
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
       {
-        "type": "uint256",
-        "name": "tokenId"
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
       },
       {
-        "type": "bytes",
-        "name": "data"
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
       }
     ],
-    "outputs": []
+    "name": "safeTransferFrom",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "setApprovalForAll",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "address",
-        "name": "operator"
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
       },
       {
-        "type": "bool",
-        "name": "approved"
+        "internalType": "bool",
+        "name": "approved",
+        "type": "bool"
       }
     ],
-    "outputs": []
+    "name": "setApprovalForAll",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "setClaimable",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "bool",
-        "name": "_claimable"
+        "internalType": "bool",
+        "name": "_claimable",
+        "type": "bool"
       }
     ],
-    "outputs": []
+    "name": "setClaimable",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "setFundsReceiver",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "address",
-        "name": "_newFundsReceiver"
+        "internalType": "address payable",
+        "name": "_newFundsReceiver",
+        "type": "address"
       }
     ],
-    "outputs": []
+    "name": "setFundsReceiver",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "setOrAddPricingTier",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "_index"
+        "internalType": "uint256",
+        "name": "_index",
+        "type": "uint256"
       },
       {
-        "type": "uint256",
-        "name": "_price"
+        "internalType": "uint256",
+        "name": "_price",
+        "type": "uint256"
       },
       {
-        "type": "uint256",
-        "name": "_quantity"
+        "internalType": "uint256",
+        "name": "_quantity",
+        "type": "uint256"
       }
     ],
-    "outputs": []
+    "name": "setOrAddPricingTier",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "setReferralPercentages",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "_referralDiscountPercentage"
+        "internalType": "uint256",
+        "name": "_referralDiscountPercentage",
+        "type": "uint256"
       },
       {
-        "type": "uint256",
-        "name": "_referralRewardPercentage"
+        "internalType": "uint256",
+        "name": "_referralRewardPercentage",
+        "type": "uint256"
       }
     ],
-    "outputs": []
+    "name": "setReferralPercentages",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "supportsInterface",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "bytes4",
-        "name": "interfaceId"
+        "internalType": "bytes4",
+        "name": "interfaceId",
+        "type": "bytes4"
       }
     ],
+    "name": "supportsInterface",
     "outputs": [
       {
-        "type": "bool",
-        "name": ""
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "symbol",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [],
+    "name": "symbol",
     "outputs": [
       {
-        "type": "string",
-        "name": ""
+        "internalType": "string",
+        "name": "",
+        "type": "string"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "tokenByIndex",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "index"
+        "internalType": "uint256",
+        "name": "index",
+        "type": "uint256"
       }
     ],
+    "name": "tokenByIndex",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "tokenOfOwnerByIndex",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "address",
-        "name": "owner"
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
       },
       {
-        "type": "uint256",
-        "name": "index"
+        "internalType": "uint256",
+        "name": "index",
+        "type": "uint256"
       }
     ],
+    "name": "tokenOfOwnerByIndex",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "tokenURI",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [
       {
-        "type": "uint256",
-        "name": "_tokenId"
+        "internalType": "uint256",
+        "name": "_tokenId",
+        "type": "uint256"
       }
     ],
+    "name": "tokenURI",
     "outputs": [
       {
-        "type": "string",
-        "name": ""
+        "internalType": "string",
+        "name": "",
+        "type": "string"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "totalSupply",
-    "constant": true,
-    "stateMutability": "view",
-    "payable": false,
     "inputs": [],
+    "name": "totalSupply",
     "outputs": [
       {
-        "type": "uint256",
-        "name": ""
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
-    ]
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "transferFrom",
-    "constant": false,
-    "payable": false,
     "inputs": [
       {
-        "type": "address",
-        "name": "from"
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
       },
       {
-        "type": "address",
-        "name": "to"
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
       {
-        "type": "uint256",
-        "name": "tokenId"
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
       }
     ],
-    "outputs": []
+    "name": "transferFrom",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address[]",
+        "name": "_toWhitelist",
+        "type": "address[]"
+      },
+      {
+        "internalType": "uint16[]",
+        "name": "_amounts",
+        "type": "uint16[]"
+      }
+    ],
+    "name": "updateWhitelistAmounts",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "whitelistAmounts",
+    "outputs": [
+      {
+        "internalType": "uint16",
+        "name": "",
+        "type": "uint16"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    "type": "function",
-    "name": "withdrawFunds",
-    "constant": false,
-    "payable": false,
     "inputs": [],
-    "outputs": []
+    "name": "withdrawFunds",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   }
 ];
\ No newline at end of file

From 8e9402d36e6a76e4296691a5003e045eb6f133ff Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Wed, 20 Dec 2023 16:47:55 -0800
Subject: [PATCH 17/32] Implements read/write functionality on DropClaim page

---
 .../checkout/hooks/useListClaimableAmount.ts  |  5 +++-
 .../src/features/wallet/routes/DropClaim.tsx  | 15 ++++++------
 packages/core/src/node/listClaimableAmount.ts | 23 ++++++++-----------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts b/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
index 4b43cf6da..2360a174b 100644
--- a/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
+++ b/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
@@ -5,7 +5,10 @@ export function useListClaimableAmount(address: string | undefined) {
 	return useQuery({
 		queryKey: ["list-claimable-amount", address],
 		queryFn: async () => {
-			return await listClaimableAmount(address!);
+			const claimableAmount = await listClaimableAmount(address!);
+			return {
+				claimableAmount,
+			}
 		},
 		staleTime: Infinity,
 		cacheTime: Infinity,
diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index 333190f3f..dc951708f 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -13,15 +13,14 @@ export function DropClaim() {
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
 	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
-	const ready = checkboxOne && checkboxTwo && checkboxThree;
+	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 42_161;
 
-	const {data: claimableAmountData, isLoading: isClaimableAmountLoading} = useListClaimableAmount(address);
+	const {data: listClaimableAmountData, isLoading: isClaimableAmountLoading} = useListClaimableAmount(address);
 
 	const {isLoading: isRedeemFromWhitelistLoading, write, error, data} = useContractWrite({
 		address: config.nodeLicenseAddress as `0x${string}`,
 		abi: NodeLicenseAbi,
 		functionName: "redeemFromWhitelist",
-		args: [claimableAmountData],
 		onSuccess() {
 			console.log("Success", data);
 		},
@@ -57,11 +56,11 @@ export function DropClaim() {
 
 								{address ? (
 									<>
-										{claimableAmountData ? (
+										{listClaimableAmountData && Number(listClaimableAmountData?.claimableAmount) !== 0 ? (
 											<>
 												<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
 													This wallet ({address}) can claim <span
-													className="font-semibold">{claimableAmountData}</span> {claimableAmountData === 1 ? "key" : "keys"}.
+													className="font-semibold">{BigInt(listClaimableAmountData.claimableAmount).toString()}</span> {Number(listClaimableAmountData.claimableAmount) === 1 ? "key" : "keys"}.
 												</p>
 												<div className="flex flex-col justify-center gap-8 p-6 mt-8">
 													<div className="flex flex-col justify-center gap-2">
@@ -101,9 +100,9 @@ export function DropClaim() {
 
 													<div>
 														<button
-															onClick={() => write}
-															className={`w-[576px] h-16 ${checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161 ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
-															disabled={!ready || chain?.id !== 42_161 || isRedeemFromWhitelistLoading}
+															onClick={() => write()}
+															className={`w-[576px] h-16 ${ready ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
+															disabled={!ready || isRedeemFromWhitelistLoading}
 														>
 															{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
 														</button>
diff --git a/packages/core/src/node/listClaimableAmount.ts b/packages/core/src/node/listClaimableAmount.ts
index b2b15ef20..5bed58295 100644
--- a/packages/core/src/node/listClaimableAmount.ts
+++ b/packages/core/src/node/listClaimableAmount.ts
@@ -3,18 +3,13 @@ import {ethers} from "ethers";
 import {NodeLicenseAbi} from "../abis/index.js";
 import {config} from "../config.js";
 
-export async function listClaimableAmount(
-	address: string,
-): Promise<number> {
-
-	// Get the provider
-	const provider = getProvider();
-
-	// Create a contract instance
-	const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
-
-	// Get the number of owners
-	const claimableAmount = await contract.whitelistAmounts(address);
-
-	return claimableAmount;
+export async function listClaimableAmount(address: string): Promise<bigint> {
+	try {
+		const provider = getProvider();
+		const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
+		return await contract.whitelistAmounts(address);
+	} catch (error) {
+		console.error("Error fetching claimable amount:", error);
+		throw new Error("Error fetching claimable amount.");
+	}
 }

From 41fdafbcfb7060350fb152e4f601894e09465e77 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Thu, 21 Dec 2023 09:18:49 -0800
Subject: [PATCH 18/32] Puts whitelistedWallets back into useOperatorRuntime

---
 .../src/features/home/modals/RemoveWalletModal.tsx            | 2 +-
 apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/sentry-client-desktop/src/features/home/modals/RemoveWalletModal.tsx b/apps/sentry-client-desktop/src/features/home/modals/RemoveWalletModal.tsx
index b53c6e1cd..8ecc65484 100644
--- a/apps/sentry-client-desktop/src/features/home/modals/RemoveWalletModal.tsx
+++ b/apps/sentry-client-desktop/src/features/home/modals/RemoveWalletModal.tsx
@@ -25,7 +25,7 @@ export function RemoveWalletModal({onClose, selectedWallet, isWalletAssignedMap}
 		if (indexToRemove !== -1) {
 			userWallets.splice(indexToRemove, 1);
 		}
-		setData({...data, addedWallets: userWallets});
+		void setData({...data, addedWallets: userWallets});
 		setSuccess(true)
 		setTimeout(() => {
 			// setSuccess(false)
diff --git a/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts b/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
index 401507210..bb46abd36 100644
--- a/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
+++ b/apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
@@ -42,7 +42,7 @@ export function useOperatorRuntime() {
 			await setData({...data, sentryRunning: true});
 
 			// @ts-ignore
-			stop = await operatorRuntime(signer, setNodeLicenseStatusMap, writeLog);
+			stop = await operatorRuntime(signer, setNodeLicenseStatusMap, writeLog, whitelistedWallets);
 			setRerender((_number) => _number + 1);
 		}
 	}
@@ -56,7 +56,7 @@ export function useOperatorRuntime() {
 			await _stop();
 			setNodeLicenseStatusMap(new Map<bigint, NodeLicenseInformation>());
 			setSentryRunning(false);
-			setData({...data, sentryRunning: false});
+			await setData({...data, sentryRunning: false});
 		}
 	}
 

From 4e04a551b4618a46518fc27dfb7e0e4fb4e367fc Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Thu, 21 Dec 2023 09:44:02 -0800
Subject: [PATCH 19/32] Dev build changes

---
 .../checkout/hooks/useListClaimableAmount.ts  |   2 +-
 .../src/features/wallet/routes/DropClaim.tsx  | 221 ++++++++++--------
 packages/core/src/node/listClaimableAmount.ts |   8 +-
 3 files changed, 130 insertions(+), 101 deletions(-)

diff --git a/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts b/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
index 2360a174b..be6395e6b 100644
--- a/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
+++ b/apps/web-connect/src/features/checkout/hooks/useListClaimableAmount.ts
@@ -11,7 +11,7 @@ export function useListClaimableAmount(address: string | undefined) {
 			}
 		},
 		staleTime: Infinity,
-		cacheTime: Infinity,
+		cacheTime: 0,
 		enabled: address != undefined && address.length > 0,
 	});
 }
diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index dc951708f..5d0061c73 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -5,7 +5,8 @@ import {KYCTooltip} from "@/features/checkout/KYCTooltip";
 import {useState} from "react";
 import {useListClaimableAmount} from "@/features/checkout/hooks/useListClaimableAmount";
 import {BiLoaderAlt} from "react-icons/bi";
-import {config, NodeLicenseAbi} from "@sentry/core";
+import {NodeLicenseAbi} from "@sentry/core";
+import {FaCircleCheck} from "react-icons/fa6";
 
 export function DropClaim() {
 	const {address} = useAccount();
@@ -13,17 +14,16 @@ export function DropClaim() {
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
 	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
-	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 42_161;
+	const ready = checkboxOne && checkboxTwo && checkboxThree;
+	// const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 42_161;
 
 	const {data: listClaimableAmountData, isLoading: isClaimableAmountLoading} = useListClaimableAmount(address);
 
-	const {isLoading: isRedeemFromWhitelistLoading, write, error, data} = useContractWrite({
-		address: config.nodeLicenseAddress as `0x${string}`,
+	const {isLoading: isRedeemFromWhitelistLoading, write, error, isSuccess} = useContractWrite({
+		address: "0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9" as `0x${string}`,
+		// address: config.nodeLicenseAddress as `0x${string}`,
 		abi: NodeLicenseAbi,
 		functionName: "redeemFromWhitelist",
-		onSuccess() {
-			console.log("Success", data);
-		},
 		onError(error) {
 			console.warn("Error", error);
 		},
@@ -33,108 +33,133 @@ export function DropClaim() {
 		<div>
 			<div className="h-full min-h-[90vh] flex flex-col justify-center items-center">
 				<XaiBanner/>
-				<div
-					className="flex flex-col justify-center items-center w-[744px] border border-gray-200 bg-white m-4 p-12">
+				{isSuccess ? (
 					<div
-						className="flex flex-col justify-center items-center gap-2 w-full overflow-hidden">
-						<p className="text-3xl font-semibold">
-							Redeem Sentry Keys
+						className="flex flex-col justify-center items-center w-[744px] border border-gray-200 bg-white m-4 p-12">
+						<div className="w-full flex justify-center">
+							<FaCircleCheck color={"#16A34A"} size={32}/>
+						</div>
+
+						<p className="text-3xl font-semibold mt-4">
+							Sentry Keys Redeemed
 						</p>
 
-						{isClaimableAmountLoading ? (
-							<div className="w-full h-[390px] flex flex-col justify-center items-center gap-2">
-								<BiLoaderAlt className="animate-spin" color={"#A3A3A3"} size={32}/>
-								<p>Loading...</p>
-							</div>
-						) : (
-							<>
-								{!address && (
-									<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-										Connect your wallet to check your eligibility.
-									</p>
-								)}
+						<button
+							onClick={() => window.location.reload()}
+							disabled={false}
+							className="w-[436px] max-w-full bg-[#F30919] text-white p-4 font-semibold m-8 disabled:bg-slate-400"
+						>
+							Redeem More Keys
+						</button>
+					</div>
+				) : (
+					<div
+						className="flex flex-col justify-center items-center w-[744px] border border-gray-200 bg-white m-4 p-12">
+						<div
+							className="flex flex-col justify-center items-center gap-2 w-full overflow-hidden">
+							<p className="text-3xl font-semibold">
+								Redeem Sentry Keys
+							</p>
 
-								{address ? (
-									<>
-										{listClaimableAmountData && Number(listClaimableAmountData?.claimableAmount) !== 0 ? (
-											<>
-												<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-													This wallet ({address}) can claim <span
-													className="font-semibold">{BigInt(listClaimableAmountData.claimableAmount).toString()}</span> {Number(listClaimableAmountData.claimableAmount) === 1 ? "key" : "keys"}.
-												</p>
-												<div className="flex flex-col justify-center gap-8 p-6 mt-8">
-													<div className="flex flex-col justify-center gap-2">
-														<XaiCheckbox
-															onClick={() => setCheckboxOne(!checkboxOne)}
-															condition={checkboxOne}
-														>
-															I agree with the
-															<a
-																className="cursor-pointer text-[#F30919]"
-																onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>
-																Sentry Node Agreement
-															</a>
-														</XaiCheckbox>
+							{isClaimableAmountLoading ? (
+								<div className="w-full h-[390px] flex flex-col justify-center items-center gap-2">
+									<BiLoaderAlt className="animate-spin" color={"#A3A3A3"} size={32}/>
+									<p>Loading...</p>
+								</div>
+							) : (
+								<>
+									{!address && (
+										<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+											Connect your wallet to check your eligibility.
+										</p>
+									)}
 
+									{address ? (
+										<>
+											{listClaimableAmountData && Number(listClaimableAmountData?.claimableAmount) !== 0 ? (
+												<>
+													<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+														This wallet ({address}) can claim <span
+														className="font-semibold">{BigInt(listClaimableAmountData.claimableAmount).toString()}</span> {Number(listClaimableAmountData.claimableAmount) === 1 ? "key" : "keys"}.
+													</p>
+													<div className="flex flex-col justify-center gap-8 p-6 mt-8">
+														<div className="flex flex-col justify-center gap-2">
+															<XaiCheckbox
+																onClick={() => setCheckboxOne(!checkboxOne)}
+																condition={checkboxOne}
+															>
+																I agree with the
+																<a
+																	className="cursor-pointer text-[#F30919]"
+																	onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>
+																	Sentry Node Agreement
+																</a>
+															</XaiCheckbox>
 
-														<XaiCheckbox
-															onClick={() => setCheckboxTwo(!checkboxTwo)}
-															condition={checkboxTwo}
-														>
-															I understand Sentry Node Keys are not transferable
-														</XaiCheckbox>
 
-														<XaiCheckbox
-															onClick={() => setCheckboxThree(!checkboxThree)}
-															condition={checkboxThree}
-														>
-															I understand that I cannot claim rewards until I pass KYC
-															<KYCTooltip
-																width={850}
+															<XaiCheckbox
+																onClick={() => setCheckboxTwo(!checkboxTwo)}
+																condition={checkboxTwo}
 															>
-																<p className="text-[#F30919]">(SEE BLOCKED
-																	COUNTRIES)</p>
-															</KYCTooltip>
-														</XaiCheckbox>
-													</div>
+																I understand Sentry Node Keys are not transferable
+															</XaiCheckbox>
 
-													<div>
-														<button
-															onClick={() => write()}
-															className={`w-[576px] h-16 ${ready ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
-															disabled={!ready || isRedeemFromWhitelistLoading}
-														>
-															{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
-														</button>
-													</div>
+															<XaiCheckbox
+																onClick={() => setCheckboxThree(!checkboxThree)}
+																condition={checkboxThree}
+															>
+																I understand that I cannot claim rewards until I pass
+																KYC
+																<KYCTooltip
+																	width={850}
+																>
+																	<p className="text-[#F30919]">(SEE BLOCKED
+																		COUNTRIES)</p>
+																</KYCTooltip>
+															</XaiCheckbox>
+														</div>
 
-													{error && (
-														<p className="text-center break-words w-full mt-4 text-red-500">
-															{error.message}
-														</p>
-													)}
-												</div>
-											</>
-										) : (
-											<>
-												<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-													This wallet ({address}) is ineligible to claim any Xai Sentry Keys.
-												</p>
-												<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-													You can connect a different wallet to determine if it is eligible.
-												</p>
-											</>
-										)}
-									</>
-								) : (
-									<div className="m-8">
-										<w3m-button/>
-									</div>
-								)}
-							</>
-						)}
+														<div>
+															<button
+																onClick={() => write()}
+																className={`w-[576px] h-16 ${ready ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
+																disabled={!ready || isRedeemFromWhitelistLoading}
+															>
+																{chain?.id === 421613 ? "Claim" : "Please Switch to Arbitrum Goerli"}
+																{/*{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}*/}
+															</button>
+														</div>
+
+														{error && (
+															<p className="text-center break-words w-full mt-4 text-red-500">
+																{error.message}
+															</p>
+														)}
+													</div>
+												</>
+											) : (
+												<>
+													<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+														This wallet ({address}) is ineligible to claim any Xai Sentry
+														Keys.
+													</p>
+													<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+														You can connect a different wallet to determine if it is
+														eligible.
+													</p>
+												</>
+											)}
+										</>
+									) : (
+										<div className="m-8">
+											<w3m-button/>
+										</div>
+									)}
+								</>
+							)}
+						</div>
 					</div>
-				</div>
+				)}
 			</div>
 		</div>
 	)
diff --git a/packages/core/src/node/listClaimableAmount.ts b/packages/core/src/node/listClaimableAmount.ts
index 5bed58295..6359837bb 100644
--- a/packages/core/src/node/listClaimableAmount.ts
+++ b/packages/core/src/node/listClaimableAmount.ts
@@ -5,8 +5,12 @@ import {config} from "../config.js";
 
 export async function listClaimableAmount(address: string): Promise<bigint> {
 	try {
-		const provider = getProvider();
-		const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
+		// const provider = getProvider();
+		// const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
+
+		const provider = getProvider("https://icy-thrilling-frog.arbitrum-goerli.quiknode.pro/4d27f3253823ff8ec0afbabc49cbe924bfc9acdb/");
+		const contract = new ethers.Contract("0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9", NodeLicenseAbi, provider);
+
 		return await contract.whitelistAmounts(address);
 	} catch (error) {
 		console.error("Error fetching claimable amount:", error);

From fe98ceb7d8b026398086ee375e7e1ca8680bd0a7 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Thu, 21 Dec 2023 10:27:35 -0800
Subject: [PATCH 20/32] Updates XaiAirdropTerms

---
 .../src/features/header/Header.tsx            |   2 +-
 .../src/features/router/AppRoutes.tsx         |   6 +-
 .../src/features/wallet/routes/ClaimToken.tsx |   5 +-
 .../wallet/routes/TermsAndConditions.tsx      | 336 ++++++++++++++++++
 4 files changed, 345 insertions(+), 4 deletions(-)
 create mode 100644 apps/web-connect/src/features/wallet/routes/TermsAndConditions.tsx

diff --git a/apps/web-connect/src/features/header/Header.tsx b/apps/web-connect/src/features/header/Header.tsx
index ed13f61d3..83029bc55 100644
--- a/apps/web-connect/src/features/header/Header.tsx
+++ b/apps/web-connect/src/features/header/Header.tsx
@@ -5,7 +5,7 @@ export function Header() {
 	const navigate = useNavigate();
 	return (
 		<div>
-			<div className="fixed flex w-full h-[4rem] justify-between items-center py-[0.325rem] px-[0.75rem]">
+			<div className="fixed flex w-full h-[4rem] justify-between items-center bg-white py-[0.325rem] px-[0.75rem]">
 				<div
 					className="w-[4.3rem] ml-2"
 					onClick={() => navigate("/")}
diff --git a/apps/web-connect/src/features/router/AppRoutes.tsx b/apps/web-connect/src/features/router/AppRoutes.tsx
index 983a83921..379a4cdb5 100644
--- a/apps/web-connect/src/features/router/AppRoutes.tsx
+++ b/apps/web-connect/src/features/router/AppRoutes.tsx
@@ -10,6 +10,7 @@ import {BiLoaderAlt} from "react-icons/bi";
 import {Footer} from "@/features/footer/Footer";
 import {DropClaim} from "@/features/wallet/routes/DropClaim";
 import {ClaimToken} from "@/features/wallet/routes/ClaimToken";
+import {TermsAndConditions} from "@/features/wallet/routes/TermsAndConditions";
 
 enum IpBanType {
 	INVALID_IP = "INVALID_IP",
@@ -79,8 +80,9 @@ export function AppRoutes() {
 						<Route path="/" element={<Checkout/>}/>
 						<Route path="/assign-wallet/:operatorAddress" element={<AssignWallet/>}/>
 						<Route path="/unassign-wallet/:operatorAddress" element={<UnassignWallet/>}/>
-						<Route path="/dropclaim" element={<DropClaim/>}/>
-						<Route path="/claimtoken" element={<ClaimToken/>}/>
+						<Route path="/drop-claim" element={<DropClaim/>}/>
+						<Route path="/claim-token" element={<ClaimToken/>}/>
+						<Route path="/xai-airdrop-terms-and-conditions" element={<TermsAndConditions/>}/>
 						<Route path="*" element={<Navigate to="/" replace={true}/>}/>
 					</Routes>
 					<Footer/>
diff --git a/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx b/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
index f0c68a09f..1e1d159e9 100644
--- a/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
+++ b/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
@@ -2,9 +2,12 @@ import {useAccount, useNetwork} from "wagmi";
 import {XaiBanner} from "@/features/checkout/XaiBanner";
 import {useState} from "react";
 import {XaiCheckbox} from "@sentry/ui";
+import {useNavigate} from "react-router-dom";
 
 export function ClaimToken() {
 	const {address} = useAccount();
+	const navigate = useNavigate();
+
 	const [eligible,] = useState<boolean>(false);
 	const {chain} = useNetwork();
 
@@ -46,7 +49,7 @@ export function ClaimToken() {
 													I agree with the Xai Airdrop
 													<a
 														className="cursor-pointer text-[#F30919]"
-														onClick={() => window.open("https://xai.games/sentrynodeagreement/")}>
+														onClick={() => navigate("/xaiairdroptermsandconditions")}>
 														Terms and Conditions
 													</a>
 												</XaiCheckbox>
diff --git a/apps/web-connect/src/features/wallet/routes/TermsAndConditions.tsx b/apps/web-connect/src/features/wallet/routes/TermsAndConditions.tsx
new file mode 100644
index 000000000..b1db25e4f
--- /dev/null
+++ b/apps/web-connect/src/features/wallet/routes/TermsAndConditions.tsx
@@ -0,0 +1,336 @@
+export function TermsAndConditions() {
+	return (
+		<div className="pt-16 px-8">
+			<h2 className="text-center font-semibold text-[24px]"><b>XAI AIRDROP TERMS AND CONDITIONS</b></h2>
+			<p>&nbsp;</p>
+			<p className="text-center">Last Revised: December 26, 2023</p>
+			<p>&nbsp;</p>
+			<p>
+				Please read these Xai Airdrop Terms and Conditions (these “<b>Terms</b>”)
+				carefully before claiming, accessing, or using any XAI cryptographic tokens
+				(“<b>Tokens</b>”) on the Xai network (the “<b>Xai Network</b>”). By claiming, accessing,
+				or using Tokens, you agree that you have read, understand, and accept all
+				of the terms and conditions contained in these Terms by and between you
+				and Xai Company Ltd., a British Virgin Islands business company (the
+				“<b>Company</b>” or “<b>we</b>”). If you do not agree to all of the terms and
+				conditions of these Terms, do not claim, access, or use the Tokens.
+			</p>
+			<p>&nbsp;</p>
+			<p>
+				TOKENS ARE NOT AVAILABLE TO BE CLAIMED, ACCESSED, OR USED BY ANY
+				RESIDENT OF OR ANY PERSON LOCATED OR DOMICILED IN THE UNITED STATES.
+			</p>
+			<p>&nbsp;</p>
+			<p>
+				PLEASE BE AWARE THAT SECTION 6 (DISPUTE RESOLUTION; AGREEMENT TO
+				ARBITRATE) GOVERNS THE RESOLUTION OF DISPUTES BETWEEN YOU AND THE
+				COMPANY. SECTION 6 INCLUDES AN AGREEMENT TO ARBITRATE WHICH
+				REQUIRES, WITH LIMITED EXCEPTIONS, THAT ALL DISPUTES BETWEEN YOU
+				AND US SHALL BE RESOLVED BY BINDING AND FINAL ARBITRATION. SECTION 6
+				ALSO CONTAINS A CLASS ACTION AND JURY TRIAL WAIVER. PLEASE READ
+				SECTION 6 CAREFULLY.
+			</p>
+			<p>&nbsp;</p>
+			<p>THESE TERMS MAY BE AMENDED FROM TIME TO TIME IN ACCORDANCE WITH SECTION 8.3.</p>
+			<p>&nbsp;</p>
+			<h3 className="font-semibold text-[18px]"><b>1. Eligibility Requirements</b></h3>
+			<p>&nbsp;</p>
+			<p>
+				<strong className="pl-8">1.1. <u>General</u>.</strong> To be eligible to claim, access, or use the Tokens, you must
+				satisfy each
+				of the following eligibility requirements:
+			</p>
+			<p>&nbsp;</p>
+			<p className="pl-16">(a) You are at least eighteen (18) years of age, or are the legal age for entering legally binding
+				agreements under applicable law;
+			</p>
+			<p>&nbsp;</p>
+			<p className="pl-16">(b) You are not, nor are you an entity that is, or an entity owned or controlled by any person or
+				entity that is, or conducting any activities itself or on behalf of any person or entity that is:
+				(i) a natural person resident in the United States; (ii) a partnership or corporation organized or
+				incorporated under the laws of the United States; or (iii) otherwise a “U.S. person” as defined in
+				Rule 902(k)(2) of Regulation S under the Securities Act of 1933 (each, a “<b>U.S. Person</b>”);
+			</p>
+			<p>&nbsp;</p>
+			<p className="pl-16">
+				(c) You are not, nor are you an entity that is, or an entity owned or controlled by any person or
+				entity that is, or conducting any activities itself or on behalf of any person or entity that is:
+				the subject of any sanctions administered or enforced by the U.S. Department of the Treasury’s
+				Office of Foreign Assets Control, the U.S. Department of State, or any other governmental authority
+				with jurisdiction over the party; identified on the Denied Persons, Entity, or Unverified Lists of
+				the U.S. Department of Commerce’s Bureau of Industry and Security; or located, organized, or
+				resident in a country or territory that is, or whose government is, the subject of economic
+				sanctions, including, without limitation, Russia, Crimea, Cuba, Iran, North Korea, or Syria (each, a
+				“<b>Restricted Person</b>”); and
+			</p>
+			<p>&nbsp;</p>
+			<p className="pl-16">(d) You are not claiming, accessing, or using Tokens on behalf of a U.S. Person or Restricted
+				Person.
+			</p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>1.2. <u>Identity Verification</u>.</strong> We reserve the right to request that you provide
+				information
+				to us for the purposes of verifying your identity. If we are unable to verify your identity and confirm
+				that you are eligible to claim, access, or use the Tokens, you will not be permitted to claim, access,
+				or use the Tokens. Upon request, you agree to provide us with the information we request for purposes of
+				identity verification and permit us to keep a record of such information. You further represent and
+				agree that all such information is complete and accurate and that you will immediately notify the
+				Company in the event that any information provided to the Company during this process is no longer
+				complete or accurate.</p>
+			<p>&nbsp;</p>
+			<h3 className="font-semibold text-[18px]"><b>2. Claiming Airdrops</b></h3>
+			<p>&nbsp;</p>
+			<p className="pl-8">
+				<strong>2.1. <u>Airdrops</u>.</strong> We may from time to time distribute to Xai Network users the
+				right to claim promotional Tokens as part of an “airdrop” (each, an “<b>Airdrop</b>”). Tokens
+				distributed to users as part of an Airdrop will not automatically accrue to users’ digital wallets. Each
+				user will be required to claim the Airdrop by visiting <a
+				className="text-[#F30919]"
+				href={"https://sentry.xai.games/#/claimtoken"}>https://sentry.xai.games/#/claimtoken</a> and following
+				the instructions provided on the webpage,
+				including paying associated Xai Network and Ethereum network transaction fees.
+			</p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>2.2. <u>Connecting a Digital Wallet</u>.</strong> In order to claim any Tokens granted in the
+				Airdrop,
+				you will need to connect a compatible third-party Ethereum blockchain digital wallet (“<b>Wallet</b>”).
+				You are
+				solely responsible for maintaining the security of your Wallet, including any associated credentials,
+				private key, and seed phrase. The Company does not offer Wallet software or custody Tokens (or any other
+				crypto assets) on behalf of users. Your use of a third-party Wallet is subject to separate terms and
+				conditions established by the Wallet provider.</p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>2.3. <u>Expiration of Airdrops</u>.</strong> Airdrops can be claimed at any time prior to
+				expiration.
+				You will have 180 days from the date that you receive an Airdrop to claim the Tokens earned as part of
+				the Airdrop before the Airdrop expires. You may be required to provide information to the Company for
+				purposes of verifying your identity and confirming your eligibility to claim Airdrops before you will be
+				permitted to claim and take possession of any Tokens.</p>
+			<p>&nbsp;</p>
+			<h3 className="font-semibold text-[18px]"><b>3. Risks</b></h3>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>3.1. You acknowledge that the Tokens and Xai Network incorporate experimental and novel
+				technology and that the use of such technology involves a high degree of risk. For example, there are
+				numerous reasons the Tokens or Xai Network could fail in an unexpected way, resulting in the total and
+				absolute loss of your Tokens. You hereby agree that you assume all risks in connection with your use of
+				the Tokens and Xai Network and expressly waive and release the Company from any and all liability,
+				claims, causes of action, or damages arising out of or in any way relating to you obtaining or using
+				Tokens and Xai Network.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>3.2. You understand and accept the risk of operational challenges related to the Tokens and Xai
+				Network. For example, the Xai Network may experience cyber-attacks, unexpected surges in transaction
+				volume or activity, or other operational or technical difficulties or vulnerabilities that may cause
+				interruptions related to your use of the Tokens or Xai Network. You agree to accept the risk of Tokens
+				or Xai Network failure resulting from unanticipated or heightened technical difficulties or
+				vulnerabilities, including those resulting from cyber-attacks. You agree not to hold the Company
+				accountable for any related losses.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>3.3. You agree that the Company is not responsible for any Tokens or other crypto assets that you
+				receive, transfer, hold, stake, lose, or otherwise use or misuse in connection with the Xai
+				Network.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>3.4. Legal and regulatory requirements applicable to the use of the Tokens may vary from
+				jurisdiction to jurisdiction. You acknowledge and agree that you are solely responsible for evaluating
+				the legality of using the Tokens in your jurisdiction. The Company is not responsible for determining
+				whether or which laws and regulations may apply to you or your use of the Tokens.</strong></p>
+			<p>&nbsp;</p>
+			<h3 className="font-semibold text-[18px]"><b>4. Disclaimer of Warranties; Limitation of Liability</b></h3>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>4.1. EXCEPT AS EXPRESSLY SET FORTH HEREIN, THE TOKENS AND XAI NETWORK ARE ISSUED ON AN “AS-IS”
+				AND “AS AVAILABLE” BASIS AND THE COMPANY DOES NOT MAKE ANY WARRANTIES WITH RESPECT TO SUCH “AS-IS” AND
+				“AS AVAILABLE” BASIS OR OTHERWISE IN CONNECTION WITH THESE TERMS (EXCEPT AS EXPRESSLY PROVIDED HEREIN)
+				AND THE COMPANY HEREBY DISCLAIMS ANY AND ALL EXPRESS, IMPLIED, OR STATUTORY WARRANTIES AND CONDITIONS,
+				INCLUDING ANY WARRANTIES OR CONDITIONS OF NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+				PURPOSE, AVAILABILITY, ERROR-FREE OR UNINTERRUPTED OPERATION, AND ANY WARRANTIES ARISING FROM A COURSE
+				OF DEALING, COURSE OF PERFORMANCE, OR USAGE OF TRADE. TO THE EXTENT THAT THE COMPANY MAY NOT, AS A
+				MATTER OF APPLICABLE LAW, DISCLAIM ANY IMPLIED WARRANTY OR CONDITION, THE SCOPE AND DURATION OF SUCH
+				WARRANTY OR CONDITION SHALL BE APPLIED TO THE MINIMUM EXTENT PERMITTED UNDER SUCH APPLICABLE
+				LAW.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>4.2. IN NO EVENT SHALL THE COMPANY BE LIABLE TO YOU FOR ANY CONSEQUENTIAL, INDIRECT, INCIDENTAL,
+				OR SPECIAL DAMAGES OF ANY TYPE OR NATURE HOWEVER ARISING, INCLUDING, WITHOUT LIMITATION, EXEMPLARY OR
+				PUNITIVE DAMAGES, LOST PROFITS OR REVENUES, OR DIMINUTION IN VALUE, ARISING OUT OF OR RELATING TO THE
+				TOKENS OR THE XAI NETWORK, WHETHER OR NOT THE POSSIBILITY OF SUCH DAMAGES HAS BEEN DISCLOSED TO OR COULD
+				HAVE BEEN REASONABLY FORESEEN BY YOU, REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR
+				OTHERWISE) UPON WHICH THE CLAIM IS BASED. IN ADDITION, UNDER NO CIRCUMSTANCES SHALL THE COMPANY'S
+				AGGREGATE LIABILITY UNDER THESE TERMS EXCEED ONE-HUNDRED U.S. DOLLARS ($100.00).</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>4.3. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR THE LIMITATION OR
+				EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES. ACCORDINGLY, SOME OF THE LIMITATIONS SET
+				FORTH ABOVE MAY NOT APPLY TO YOU. IF YOU ARE DISSATISFIED WITH THE TOKENS, YOUR SOLE AND EXCLUSIVE
+				REMEDY IS TO DISCONTINUE USING THE TOKENS.</strong></p>
+			<p>&nbsp;</p>
+			<h3 className="font-semibold text-[18px]"><b>5. Indemnification</b></h3>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>5.1. You agree, at your own expense, to indemnify, defend, and hold harmless the Company and its
+				partners and affiliates and their respective owners, members, agents, directors, officers, employees,
+				representatives, affiliates, successors, and assigns against any claim, suit, action, or other
+				proceeding from and against any and all claims, damages, liabilities, costs, and expenses, including
+				reasonable attorneys’ and experts’ fees, arising out of or in connection with your breach of these
+				Terms, your violation of any law or regulation, or your use of the Tokens. You agree to pay any and all
+				costs, damages, and expenses, including but not limited to reasonable attorneys’ fees and costs awarded
+				against or otherwise incurred by or in connection with or arising from any such claim, suit, action, or
+				proceeding attributable to any such claim. The Company reserves the right, at its own expense, to assume
+				the exclusive defense and control of any matter otherwise subject to indemnification by you, in which
+				event you will fully cooperate with the Company in asserting any available defense.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>5.2. If you have a dispute with one or more users of the Node Software or other third parties,
+				you release the Company (and its affiliates and service providers, and each of their officers,
+				directors, agents, joint ventures, employees, and representatives) from all claims, demands, and damages
+				(actual and consequential) of every kind and nature arising out of or in any way connected with such
+				disputes.</strong></p>
+			<p>&nbsp;</p>
+			<h3 className="font-semibold text-[18px]"><b>6. Dispute Resolution; Agreement to Arbitrate</b></h3>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.1. All disputes, claims, and controversies, whether based on past, present, or future events,
+				arising out of or relating to statutory or common law claims, the breach, termination, enforcement,
+				interpretation, or validity of any provision of these Terms, and the determination of the scope or
+				applicability of your agreement to arbitrate any dispute, claim, or controversy originating from these
+				Terms, will be determined by binding arbitration in Tortola, the British Virgin Islands pursuant to the
+				BVI IAC Arbitration Rules, before a single arbitrator.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.2. The arbitrator will apply the substantive law of the British Virgin Islands, excluding its
+				conflict or choice of law rules.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.3. Nothing in these Terms will preclude the parties from seeking provisional remedies in aid of
+				arbitration from a court of appropriate jurisdiction.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.4. A party must notify the other party of its intent to commence arbitration prior to
+				commencing arbitration. The notice must specify the date on which the arbitration demand is intended to
+				be filed, which must be at least thirty (30) days after the date of the notice. During this time period,
+				the parties will meet for the purpose of resolving the dispute prior to commencing arbitration.</strong>
+			</p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.5. Subject to Section 6.4, each party may commence arbitration by providing to the BVI
+				International Arbitration Centre and the other party to the dispute a written demand for arbitration,
+				stating the subject of the dispute and the relief requested. 6.4, each party may commence arbitration by
+				providing to the BVI International Arbitration Centre and the other party to the dispute a written
+				demand for arbitration, stating the subject of the dispute and the relief requested.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.6. Subject to the disclaimers and limitations of liability stated in these Terms, the appointed
+				arbitrators may award monetary damages and any other remedies allowed by the laws of the British Virgin
+				Islands (including the BVI IAC Arbitration Rules). In making a determination, the arbitrator will not
+				have the authority to modify any term of these Terms. The arbitrator will deliver a reasoned, written
+				decision with respect to the dispute to each party, who will promptly act in accordance with the
+				arbitrator’s decision. Any award (including interim or final remedies) may be confirmed in or enforced
+				by a state or federal court located in the British Virgin Islands. The decision of the arbitrator will
+				be final and binding on the parties, and will not be subject to appeal or review.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.7. The party initiating the arbitration is responsible for paying the applicable filing fee.
+				Each party will advance one-half of the fees and expenses of the arbitrator, the costs of the attendance
+				of the arbitration reporter at the arbitration hearing and the costs of the arbitration facility. In any
+				arbitration arising out of or relating to these Terms, the arbitrator will award to the prevailing
+				party, if any, the costs and attorneys’ fees reasonably incurred by the prevailing party in connection
+				with those aspects of its claims or defenses on which it prevails, and any opposing awards of costs and
+				legal fees awards will be offset.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.8. The parties will keep confidential the existence of the arbitration, the arbitration
+				proceeding, the hearing and the arbitrator’s decision, except (a) as necessary to prepare for and
+				conduct the arbitration hearing on the merits; (b) in connection with a court application for a
+				preliminary remedy, or confirmation of an arbitrator’s decision or its enforcement; (c) the Company may
+				disclose the arbitrator’s decision in confidential settlement negotiations; (d) each party may disclose
+				as necessary to professional advisors that are subject to a strict duty of confidentiality; and (e) as
+				applicable law otherwise requires. The parties, witnesses and arbitrator will treat as confidential and
+				will not disclose to any third person (other than witnesses or experts) any documentary or other
+				evidence produced in any arbitration, except as applicable so requires or if the evidence was obtained
+				from the public domain or was otherwise obtained independently from the arbitration.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.9. In the case of a conflict between the provisions of this Section 6 and the BVI IAC
+				Arbitration Rules, the provisions of this Section 6 shall prevail.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.10. To the extent permitted by applicable law, any dispute arising out of or relating to these
+				Terms, whether in arbitration or in court, shall be conducted only on an individual basis and not in a
+				class, consolidated or representative action. Notwithstanding any other provision of these Terms or the
+				BVI IAC Arbitration Rules, disputes regarding the interpretation, applicability or enforceability of
+				this class waiver may be resolved only by a court and not by an arbitrator. If this waiver of class or
+				consolidated actions is deemed invalid or unenforceable, neither party is entitled to
+				arbitration.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>6.11. If for any reason a claim or dispute proceeds in court rather than through arbitration,
+				each party knowingly and irrevocably waives any right to trial by jury in any action, proceeding or
+				counterclaim arising out of or relating to these Terms.</strong></p>
+			<p>&nbsp;</p>
+			<h3 className="font-semibold text-[18px]"><b>7. Term; Termination.</b></h3>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>7.1. These Terms are effective beginning when you accept these Terms or first claim, access or
+				use the Tokens and ending when terminated as set forth in Section 7.2.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>7.2. Your right to claim, use and access the Tokens will automatically terminate in the event you
+				fail to comply with any of the terms and conditions of these Terms. Termination will be effective
+				without notice.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>7.3. Upon termination of these Terms, you must immediately cease all use of the Tokens. Sections
+				3, 4, 5, 6, 7 and 8 of these Terms shall survive any such termination.</strong></p>
+			<p>&nbsp;</p>
+
+			<h3 className="font-semibold text-[18px]"><b>8. General Provisions.</b></h3>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.1. <u>Electronic Communications</u>. By purchasing, obtaining, accessing or using the Node
+				Software, you consent to receive electronic communications.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.2 <u>Notices</u>. The Company may provide you with notice and other communications via
+				electronic communications as permitted by Section 8.1. You may provide us with notice by sending an
+				email address to <a className="text-[#F30919]" href="mailto:notices@xai.games">notices@xai.games</a>.
+				All notices will be deemed effective upon dispatch.</strong>
+			</p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.3 <u>Amendments</u>. These Terms may be modified or revised at any time, with or without prior
+				notice to you. The most current version of these Terms will be posted on <a className="text-[#F30919]"
+																							href={"https://sentry.xai.games/#/claimtoken"}>https://sentry.xai.games/#/xai-airdrop-terms-and-conditions</a> (the
+				“<b>Website</b>”) with the “Last Revised” date at the top. Any modifications or revisions will be
+				effective immediately upon posting the modifications or revisions to the Website. You shall be
+				responsible for reviewing and becoming familiar with any modifications or revisions. You waive any right
+				you may have to receive specific notice of such modifications or revisions. Purchasing, obtaining,
+				accessing or using the Node Software constitutes your acceptance of these Terms as modified or revised.
+				If you do not agree to these Terms then in effect, you must immediately discontinue access to, and use
+				of, the Tokens.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.4 <u>Waivers</u>. For a waiver to be deemed effective, a waiver must be in a writing signed by
+				the waiving party. The failure of either party to enforce any provision of these Terms will not
+				constitute a waiver of that party’s rights to subsequently enforce the provision.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.5 <u>Cumulative Rights; Injunctions</u>. The rights and remedies of the parties under these
+				Terms are cumulative, and each party may exercise any of its rights and enforce any of its remedies
+				under these Terms, along with all other rights and remedies available to it at law, in equity or
+				otherwise. Any material breach by a party of these Terms could cause the non-breaching party irreparable
+				harm for which the non-breaching party has no adequate remedies at law. Accordingly, the non-breaching
+				party is entitled to seek specific performance or injunctive relief for any such breach.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.6 <u>Severability</u>. If any provision of these Terms is declared to be invalid, illegal or
+				unenforceable by a court of competent jurisdiction, then the validity, legality and enforceability of
+				the remaining provisions contained herein shall not be affected thereby and the remainder of the
+				provisions of these Terms shall remain valid, legal and enforceable to the fullest extent permitted by
+				law.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.7 <u>Force Majeure</u>. The Company shall have no liability for any failure or delay resulting
+				from any condition beyond our reasonable control, including but not limited to governmental action or
+				acts of terrorism, earthquake, fire, flood, or other acts of God, labor conditions, power failures,
+				equipment failures and Internet or blockchain network disturbances.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.8 <u>Successors and Assigns</u>.You may not transfer or assign these Terms or any rights or
+				obligations hereunder, by operation of law or otherwise and any such attempted assignment shall be void.
+				The Company reserves the right to freely transfer or assign these Terms and the rights and obligations
+				hereunder to any third party at any time without your consent and prior notice to you. If you object to
+				any such transfer or assignment, you may stop using the Node Software.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.9 <u>Relationship of the Parties</u>. Nothing contained in these Terms shall constitute you and
+				the Company as members of any partnership, joint venture, association, syndicate, unincorporated
+				business or similar assignment as a result of or by virtue of the relationship established by these
+				Terms.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.10 <u>Governing Law</u>. These Terms shall be solely and exclusively governed, construed and
+				enforced in accordance with the laws of the British Virgin Islands without giving effect to conflict of
+				law rules or principles that would cause the application of the laws of any other jurisdiction.</strong>
+			</p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.11 <u>Entire Agreement</u>. These Terms constitute the entire agreement and understanding
+				between you and the Company, and supersedes all previous communications, representations or agreements,
+				whether written or oral, with respect to the subject matter hereof.</strong></p>
+			<p>&nbsp;</p>
+			<p className="pl-8"><strong>8.12 <u>No Third-Party Beneficiaries</u>. These Terms are not intended and shall not be construed
+				to create any rights or remedies in any parties other than you and the Company and other Company
+				affiliates, which each shall be a third-party beneficiary of these Terms, and no other person shall
+				assert any rights as a third-party beneficiary hereunder.</strong></p>
+		</div>
+	)
+}

From 87b53ba2b227df6a3eca44170a166c8e7d87adea Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Thu, 21 Dec 2023 11:24:35 -0800
Subject: [PATCH 21/32] Makes Sentry Node Agreement clickable

---
 .../src/features/footer/Footer.tsx            | 88 -------------------
 .../src/features/sidebar/SidebarRoot.tsx      |  6 +-
 2 files changed, 3 insertions(+), 91 deletions(-)
 delete mode 100644 apps/sentry-client-desktop/src/features/footer/Footer.tsx

diff --git a/apps/sentry-client-desktop/src/features/footer/Footer.tsx b/apps/sentry-client-desktop/src/features/footer/Footer.tsx
deleted file mode 100644
index e7867f75c..000000000
--- a/apps/sentry-client-desktop/src/features/footer/Footer.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import {ReactComponent as XaiLogo} from "@/svgs/xai-logo-full.svg";
-import {FaDiscord, FaTelegram} from "react-icons/fa";
-import {SiGitbook} from "react-icons/si";
-import {FaXTwitter} from "react-icons/fa6";
-
-const bodyContent = {
-	socials: [
-		{
-			label: "Discord",
-			link: "https://discord.com/invite/xaigames",
-			icon: <FaDiscord size={24}/>,
-		},
-		{
-			label: "X",
-			link: "https://twitter.com/xai_games",
-			icon: <FaXTwitter size={24}/>,
-			// icon: <XLogo style={{padding: "0.15rem"}}/>,
-		},
-		{
-			label: "Gitbook",
-			link: "https://xai-foundation.gitbook.io/xai-network/xai-blockchain/sentry-node-purchase-and-setup",
-			icon: <SiGitbook size={24}/>,
-		},
-		{
-			label: "Telegram",
-			link: "https://t.me/XaiSentryNodes",
-			icon: <FaTelegram size={24}/>,
-		},
-	],
-};
-
-export function Footer() {
-	function createSocialElement(item: any) {
-		function _onClickHelper() {
-			window.open(item.link, "_blank", "noopener noreferrer");
-		}
-
-		return (
-			<div
-				key={item.label}
-				className="transition-colors duration-300 ease-in-out"
-				onClick={_onClickHelper}
-			>
-				<div className="aspect-w-1 aspect-h-1">
-					<div className="w-full h-full object-contain">
-						{item.icon}
-					</div>
-				</div>
-			</div>
-		);
-	}
-
-	return (
-		<footer className="w-full flex justify-center items-center bg-white py-6">
-			<div className="w-full max-w-[1400px] flex flex-col gap-5 px-[15px]">
-				<div className="flex flex-col gap-1">
-					<div className="w-16">
-						<div className="w-[4.5rem] h-full object-contain">
-							<XaiLogo/>
-						</div>
-					</div>
-				</div>
-
-				<div className="flex flex-col-reverse md:flex-row justify-between items-start md:items-center gap-8">
-					<div className="flex flex-col items-start gap-2 md:flex-row md:items-center">
-						<div>
-							<p>©2023 XAI. All Rights Reserved</p>
-						</div>
-
-						<div className="flex items-center gap-2">
-							<p className="hidden md:inline">|</p>
-							<a
-								className="text-blue-500 cursor-pointer hover:underline"
-								onClick={() => window.open("https://xai.games/sentrynodeagreement/", "_blank", "noopener noreferrer")}
-							>
-								Sentry Node Agreement
-							</a>
-						</div>
-					</div>
-
-					<div className="flex gap-4 cursor-pointer">
-						{bodyContent.socials.map(createSocialElement)}
-					</div>
-				</div>
-			</div>
-		</footer>
-	);
-}
diff --git a/apps/sentry-client-desktop/src/features/sidebar/SidebarRoot.tsx b/apps/sentry-client-desktop/src/features/sidebar/SidebarRoot.tsx
index 052046af0..eaf182cfa 100644
--- a/apps/sentry-client-desktop/src/features/sidebar/SidebarRoot.tsx
+++ b/apps/sentry-client-desktop/src/features/sidebar/SidebarRoot.tsx
@@ -96,11 +96,11 @@ export function Sidebar() {
 
 			<div/>
 
-			<div className="flex flex-col gap-1 text-[12px]">
+			<div className="flex flex-col gap-1 text-[12px] z-10">
 				<p>v{import.meta.env.APP_VERSION}</p>
 				<a
-					className="text-blue-500 cursor-pointer hover:underline"
-					onClick={() => window.open("https://xai.games/sentrynodeagreement/", "_blank", "noopener noreferrer")}
+					className="text-[#F30919] cursor-pointer hover:underline"
+					onClick={() => window.electron.openExternal("https://xai.games/sentrynodeagreement")}
 				>
 					Sentry Node Agreement
 				</a>

From e5908c7970b7aa32cea4acfb5d2cb335f8ef2939 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Thu, 21 Dec 2023 11:42:23 -0800
Subject: [PATCH 22/32] Requires user to be on Arbitrum One to Assign/Unassign
 wallet

---
 .../src/features/wallet/routes/AssignWallet.tsx       | 10 +++++-----
 .../src/features/wallet/routes/DropClaim.tsx          | 11 ++++-------
 .../src/features/wallet/routes/UnassignWallet.tsx     |  8 +++++---
 packages/core/src/node/listClaimableAmount.ts         |  8 ++------
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/apps/web-connect/src/features/wallet/routes/AssignWallet.tsx b/apps/web-connect/src/features/wallet/routes/AssignWallet.tsx
index 644f9cdcc..d8e419bd4 100644
--- a/apps/web-connect/src/features/wallet/routes/AssignWallet.tsx
+++ b/apps/web-connect/src/features/wallet/routes/AssignWallet.tsx
@@ -1,5 +1,5 @@
 import {useNavigate, useParams} from "react-router-dom";
-import {useAccount, useContractWrite} from "wagmi";
+import {useAccount, useContractWrite, useNetwork} from "wagmi";
 import {config, RefereeAbi} from "@sentry/core";
 import {FaCircleCheck} from "react-icons/fa6";
 import {XaiBanner} from "@/features/checkout/XaiBanner";
@@ -8,6 +8,7 @@ export function AssignWallet() {
 	const navigate = useNavigate();
 	const params = useParams<{operatorAddress: string}>();
 	const {address} = useAccount();
+	const {chain} = useNetwork();
 
 	const {isLoading, isSuccess, write, error, data} = useContractWrite({
 		address: config.refereeAddress as `0x${string}`,
@@ -15,8 +16,6 @@ export function AssignWallet() {
 		functionName: "setApprovalForOperator",
 		args: [params.operatorAddress, true],
 		onSuccess(data) {
-			// navigate("xai-sentry://test");
-			// window.open("xai-sentry://test");
 			window.location = `xai-sentry://assigned-wallet?txHash=${data.hash}` as unknown as Location;
 		},
 		onError(error) {
@@ -78,10 +77,11 @@ export function AssignWallet() {
 							{address ? (
 								<button
 									onClick={() => write()}
-									disabled={isLoading || isSuccess}
+									disabled={isLoading || isSuccess || chain?.id !== 42_161}
 									className="w-full bg-[#F30919] text-white p-4 font-semibold m-8 disabled:bg-slate-400"
 								>
-									Assign wallet to Sentry ({getShortenedWallet(address)})
+
+									{chain?.id === 42_161 ? `Assign wallet to Sentry (${getShortenedWallet(address)})` : "Please Switch to Arbitrum One"}
 								</button>
 							) : (
 								<div className="m-8">
diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index 5d0061c73..b106719ba 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -5,7 +5,7 @@ import {KYCTooltip} from "@/features/checkout/KYCTooltip";
 import {useState} from "react";
 import {useListClaimableAmount} from "@/features/checkout/hooks/useListClaimableAmount";
 import {BiLoaderAlt} from "react-icons/bi";
-import {NodeLicenseAbi} from "@sentry/core";
+import {config, NodeLicenseAbi} from "@sentry/core";
 import {FaCircleCheck} from "react-icons/fa6";
 
 export function DropClaim() {
@@ -14,14 +14,12 @@ export function DropClaim() {
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
 	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
-	const ready = checkboxOne && checkboxTwo && checkboxThree;
-	// const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 42_161;
+	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 42_161;
 
 	const {data: listClaimableAmountData, isLoading: isClaimableAmountLoading} = useListClaimableAmount(address);
 
 	const {isLoading: isRedeemFromWhitelistLoading, write, error, isSuccess} = useContractWrite({
-		address: "0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9" as `0x${string}`,
-		// address: config.nodeLicenseAddress as `0x${string}`,
+		address: config.nodeLicenseAddress as `0x${string}`,
 		abi: NodeLicenseAbi,
 		functionName: "redeemFromWhitelist",
 		onError(error) {
@@ -125,8 +123,7 @@ export function DropClaim() {
 																className={`w-[576px] h-16 ${ready ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
 																disabled={!ready || isRedeemFromWhitelistLoading}
 															>
-																{chain?.id === 421613 ? "Claim" : "Please Switch to Arbitrum Goerli"}
-																{/*{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}*/}
+																{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
 															</button>
 														</div>
 
diff --git a/apps/web-connect/src/features/wallet/routes/UnassignWallet.tsx b/apps/web-connect/src/features/wallet/routes/UnassignWallet.tsx
index e39ceb565..dce4144ec 100644
--- a/apps/web-connect/src/features/wallet/routes/UnassignWallet.tsx
+++ b/apps/web-connect/src/features/wallet/routes/UnassignWallet.tsx
@@ -1,5 +1,5 @@
 import {useNavigate, useParams} from "react-router-dom";
-import {useAccount, useContractWrite} from "wagmi";
+import {useAccount, useContractWrite, useNetwork} from "wagmi";
 import {config, RefereeAbi} from "@sentry/core";
 import {FaCircleCheck} from "react-icons/fa6";
 import {XaiBanner} from "@/features/checkout/XaiBanner";
@@ -8,6 +8,7 @@ export function UnassignWallet() {
 	const navigate = useNavigate();
 	const params = useParams<{ operatorAddress: string }>();
 	const {address} = useAccount();
+	const {chain} = useNetwork();
 
 	const {isLoading, isSuccess, write, error, data} = useContractWrite({
 		address: config.refereeAddress as `0x${string}`,
@@ -76,10 +77,11 @@ export function UnassignWallet() {
 							{address ? (
 								<button
 									onClick={() => write()}
-									disabled={isLoading || isSuccess}
+									disabled={isLoading || isSuccess || chain?.id !== 42_161}
 									className="w-full bg-[#F30919] text-white p-4 font-semibold m-8 disabled:bg-slate-400"
 								>
-									Un-assign wallet from Sentry ({getShortenedWallet(address)})
+
+									{chain?.id === 42_161 ? `Un-assign wallet to Sentry (${getShortenedWallet(address)})` : "Please Switch to Arbitrum One"}
 								</button>
 							) : (
 								<div className="m-8">
diff --git a/packages/core/src/node/listClaimableAmount.ts b/packages/core/src/node/listClaimableAmount.ts
index 6359837bb..5bed58295 100644
--- a/packages/core/src/node/listClaimableAmount.ts
+++ b/packages/core/src/node/listClaimableAmount.ts
@@ -5,12 +5,8 @@ import {config} from "../config.js";
 
 export async function listClaimableAmount(address: string): Promise<bigint> {
 	try {
-		// const provider = getProvider();
-		// const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
-
-		const provider = getProvider("https://icy-thrilling-frog.arbitrum-goerli.quiknode.pro/4d27f3253823ff8ec0afbabc49cbe924bfc9acdb/");
-		const contract = new ethers.Contract("0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9", NodeLicenseAbi, provider);
-
+		const provider = getProvider();
+		const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
 		return await contract.whitelistAmounts(address);
 	} catch (error) {
 		console.error("Error fetching claimable amount:", error);

From 074c1ce2c3ae5f30f6dd32d910dbcf38d5bfeab6 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Thu, 21 Dec 2023 12:13:52 -0800
Subject: [PATCH 23/32] Comments out no sentry keys found operatorRuntime
 condition

---
 packages/core/src/operator/operatorRuntime.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/operator/operatorRuntime.ts b/packages/core/src/operator/operatorRuntime.ts
index b7242c4aa..6db3109b4 100644
--- a/packages/core/src/operator/operatorRuntime.ts
+++ b/packages/core/src/operator/operatorRuntime.ts
@@ -87,9 +87,9 @@ export async function operatorRuntime(
     }
     logFunction(`[${new Date().toISOString()}] Total Sentry Keys fetched: ${nodeLicenseIds.length}.`);
 
-    if (nodeLicenseIds.length === 0) {
-        throw new Error("No Sentry Keys found.");
-    }
+    // if (nodeLicenseIds.length === 0) {
+    //     throw new Error("No Sentry Keys found.");
+    // }
 
     // create a mapping of all the timestamps these nodeLicenses were created at, so we can easily check the eligibility later
     logFunction(`[${new Date().toISOString()}] Checking Sentry Key eligibility.`);

From 4bb2b2b0b510061474dc35fc960e4f51737df8ba Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Thu, 21 Dec 2023 12:25:58 -0800
Subject: [PATCH 24/32] Adds labels

---
 .../src/features/drawer/WhitelistDrawer.tsx                     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
index 44120c1d7..efdbe6054 100644
--- a/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
+++ b/apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
@@ -96,7 +96,9 @@ export function WhitelistDrawer() {
 					to participate in a challenge.
 				</p>
 				<div>
+					<p className="text-[12px]">Your Sentry Wallet</p>
 					{getOperatorItem()}
+					<p className="text-[12px]">Assigned Wallets</p>
 					{getDropdownItems()}
 				</div>
 			</div>

From 30e996705444fd3d996bdfb8c0d96e1422c25d74 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Thu, 21 Dec 2023 12:29:24 -0800
Subject: [PATCH 25/32] Update URL redirect

---
 apps/web-connect/src/features/wallet/routes/ClaimToken.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx b/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
index 1e1d159e9..5c7a23f63 100644
--- a/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
+++ b/apps/web-connect/src/features/wallet/routes/ClaimToken.tsx
@@ -49,7 +49,7 @@ export function ClaimToken() {
 													I agree with the Xai Airdrop
 													<a
 														className="cursor-pointer text-[#F30919]"
-														onClick={() => navigate("/xaiairdroptermsandconditions")}>
+														onClick={() => navigate("/xai-airdrop-terms-and-conditions")}>
 														Terms and Conditions
 													</a>
 												</XaiCheckbox>

From a34b162e822bdaafade056c0f6e39fef950c1ff2 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Thu, 21 Dec 2023 12:37:04 -0800
Subject: [PATCH 26/32] Test data back in

---
 .../src/features/wallet/routes/DropClaim.tsx          | 11 +++++++----
 packages/core/src/node/listClaimableAmount.ts         |  8 ++++++--
 packages/ui/src/features/checkbox/XaiCheckbox.tsx     |  3 ++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index b106719ba..909e585f9 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -5,7 +5,7 @@ import {KYCTooltip} from "@/features/checkout/KYCTooltip";
 import {useState} from "react";
 import {useListClaimableAmount} from "@/features/checkout/hooks/useListClaimableAmount";
 import {BiLoaderAlt} from "react-icons/bi";
-import {config, NodeLicenseAbi} from "@sentry/core";
+import {NodeLicenseAbi} from "@sentry/core";
 import {FaCircleCheck} from "react-icons/fa6";
 
 export function DropClaim() {
@@ -14,12 +14,14 @@ export function DropClaim() {
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
 	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
-	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 42_161;
+	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 421613;
+	// const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 42_161;
 
 	const {data: listClaimableAmountData, isLoading: isClaimableAmountLoading} = useListClaimableAmount(address);
 
 	const {isLoading: isRedeemFromWhitelistLoading, write, error, isSuccess} = useContractWrite({
-		address: config.nodeLicenseAddress as `0x${string}`,
+		address: "0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9" as `0x${string}`,
+		// address: config.nodeLicenseAddress as `0x${string}`,
 		abi: NodeLicenseAbi,
 		functionName: "redeemFromWhitelist",
 		onError(error) {
@@ -123,7 +125,8 @@ export function DropClaim() {
 																className={`w-[576px] h-16 ${ready ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
 																disabled={!ready || isRedeemFromWhitelistLoading}
 															>
-																{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
+																{chain?.id === 421613 ? "Claim" : "Please Switch to Arbitrum Goerli"}
+																{/*{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}*/}
 															</button>
 														</div>
 
diff --git a/packages/core/src/node/listClaimableAmount.ts b/packages/core/src/node/listClaimableAmount.ts
index 5bed58295..b025b2819 100644
--- a/packages/core/src/node/listClaimableAmount.ts
+++ b/packages/core/src/node/listClaimableAmount.ts
@@ -5,8 +5,12 @@ import {config} from "../config.js";
 
 export async function listClaimableAmount(address: string): Promise<bigint> {
 	try {
-		const provider = getProvider();
-		const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
+
+		const provider = getProvider("https://icy-thrilling-frog.arbitrum-goerli.quiknode.pro/4d27f3253823ff8ec0afbabc49cbe924bfc9acdb/");
+		const contract = new ethers.Contract("0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9", NodeLicenseAbi, provider);
+//
+// 		const provider = getProvider();
+// 		const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
 		return await contract.whitelistAmounts(address);
 	} catch (error) {
 		console.error("Error fetching claimable amount:", error);
diff --git a/packages/ui/src/features/checkbox/XaiCheckbox.tsx b/packages/ui/src/features/checkbox/XaiCheckbox.tsx
index 111cbb19b..81fd07981 100644
--- a/packages/ui/src/features/checkbox/XaiCheckbox.tsx
+++ b/packages/ui/src/features/checkbox/XaiCheckbox.tsx
@@ -9,8 +9,9 @@ interface XaiCheckboxProps {
 
 export function XaiCheckbox({onClick, condition, children}: XaiCheckboxProps) {
 	return (
-		<div className="flex flex-row gap-2" onClick={() => onClick()}>
+		<div className="flex flex-row gap-2">
 			<div
+				onClick={() => onClick()}
 				className={`flex justify-center items-center w-5 h-5 cursor-pointer border ${condition ? "border-0" : "border-[#A3A3A3]"} ${condition ? "bg-[#F30919]" : "bg-white"}`}
 			>
 				{condition ? <ImCheckmark color={"white"} size={14}/> : null}

From a5dcf2dafb988b86525c4e97be3de23388d14284 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Thu, 21 Dec 2023 13:08:55 -0800
Subject: [PATCH 27/32] Cleanup

---
 .../src/features/drawer/DrawerManager.tsx              |  2 +-
 .../ActionsRequiredNotAccruingDrawer.tsx               | 10 ++++------
 .../src/hooks/useChainDataWithCallback.ts              |  2 --
 .../core/src/node-license/generateRevenueReport.ts     |  4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx b/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx
index d045f3bbc..83bd2a641 100644
--- a/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx
+++ b/apps/sentry-client-desktop/src/features/drawer/DrawerManager.tsx
@@ -25,7 +25,7 @@ export function DrawerManager() {
 
 	return (
 		<div
-			className={classNames("fixed right-0 w-[28rem] min-w-[28rem] h-screen z-10 bg-white border border-gray-200 overflow-y-scroll", {
+			className={classNames("w-[28rem] min-w-[28rem] h-screen z-10 bg-white border border-gray-200 overflow-y-scroll", {
 				"hidden": drawerState === null,
 			})}
 		>
diff --git a/apps/sentry-client-desktop/src/features/home/modals/actions-required/ActionsRequiredNotAccruingDrawer.tsx b/apps/sentry-client-desktop/src/features/home/modals/actions-required/ActionsRequiredNotAccruingDrawer.tsx
index 914102bbe..2bfcb27cb 100644
--- a/apps/sentry-client-desktop/src/features/home/modals/actions-required/ActionsRequiredNotAccruingDrawer.tsx
+++ b/apps/sentry-client-desktop/src/features/home/modals/actions-required/ActionsRequiredNotAccruingDrawer.tsx
@@ -11,12 +11,10 @@ import {KycRequiredCard} from "./KycRequiredCard";
 import {BarStepItem} from "@/components/BarStepItem";
 import {accruingStateAtom} from "@/hooks/useAccruingInfo";
 import {chainStateAtom} from "@/hooks/useChainDataWithCallback";
-import {useCombinedOwners} from "@/hooks/useCombinedOwners";
 
 export function ActionsRequiredNotAccruingDrawer() {
 	const setDrawerState = useSetAtom(drawerStateAtom);
-	const {owners, ownersKycMap, combinedWalletsKycMap} = useAtomValue(chainStateAtom);
-	const {combinedOwners} = useCombinedOwners(owners);
+	const {owners, ownersKycMap} = useAtomValue(chainStateAtom);
 	const {accruing, kycRequired} = useAtomValue(accruingStateAtom);
 
 	return (
@@ -85,15 +83,15 @@ export function ActionsRequiredNotAccruingDrawer() {
 							<AssignedKeysCard/>
 						</BarStepItem>
 
-						{combinedOwners?.map((owner, i) => {
+						{owners?.map((owner, i) => {
 							return (
 								<BarStepItem
 									key={`bar-step-item-${i}`}
-									lastItem={i + 1 === combinedOwners!.length}
+									lastItem={i + 1 === owners!.length}
 								>
 									<KycRequiredCard
 										wallet={owner}
-										status={combinedWalletsKycMap[owner]}
+										status={ownersKycMap[owner]}
 									/>
 								</BarStepItem>
 							);
diff --git a/apps/sentry-client-desktop/src/hooks/useChainDataWithCallback.ts b/apps/sentry-client-desktop/src/hooks/useChainDataWithCallback.ts
index deb4cf221..f63295e42 100644
--- a/apps/sentry-client-desktop/src/hooks/useChainDataWithCallback.ts
+++ b/apps/sentry-client-desktop/src/hooks/useChainDataWithCallback.ts
@@ -53,8 +53,6 @@ export function useChainDataWithCallback() {
 	const {isLoading: ownersKycLoading, statusMap: combinedWalletsKycMap} = useKycStatusesWithCallback(combinedOwners, chainStateRefresh);
 	const {isLoading: licensesLoading, licensesMap: combinedLicensesMap} = useListNodeLicensesWithCallback(combinedOwners, chainStateRefresh);
 
-	console.log(combinedOwners);
-
 	// set default state
 	useEffect(() => {
 		setChainState(defaultChainState);
diff --git a/packages/core/src/node-license/generateRevenueReport.ts b/packages/core/src/node-license/generateRevenueReport.ts
index d10a45dc7..841136b57 100644
--- a/packages/core/src/node-license/generateRevenueReport.ts
+++ b/packages/core/src/node-license/generateRevenueReport.ts
@@ -1,5 +1,5 @@
-import { ethers } from "ethers";
-import { NodeLicenseAbi, config, getProvider } from "../index.js";
+import {ethers} from "ethers";
+import {config, getProvider, NodeLicenseAbi} from "../index.js";
 import axios from "axios";
 
 export async function generateRevenueReport() {

From fe531e1862b7974b4d5f8d9d9df406ef50a7643a Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Fri, 22 Dec 2023 09:32:03 -0800
Subject: [PATCH 28/32] Geo-block US || KYC Whitelisted wallets

---
 .../ActionsRequiredNotAccruingDrawer.tsx      | 111 ++++++++----------
 .../src/features/router/AppRoutes.tsx         |   2 +-
 2 files changed, 52 insertions(+), 61 deletions(-)

diff --git a/apps/sentry-client-desktop/src/features/home/modals/actions-required/ActionsRequiredNotAccruingDrawer.tsx b/apps/sentry-client-desktop/src/features/home/modals/actions-required/ActionsRequiredNotAccruingDrawer.tsx
index 2bfcb27cb..b8cdfa641 100644
--- a/apps/sentry-client-desktop/src/features/home/modals/actions-required/ActionsRequiredNotAccruingDrawer.tsx
+++ b/apps/sentry-client-desktop/src/features/home/modals/actions-required/ActionsRequiredNotAccruingDrawer.tsx
@@ -11,11 +11,13 @@ import {KycRequiredCard} from "./KycRequiredCard";
 import {BarStepItem} from "@/components/BarStepItem";
 import {accruingStateAtom} from "@/hooks/useAccruingInfo";
 import {chainStateAtom} from "@/hooks/useChainDataWithCallback";
+import {useStorage} from "@/features/storage";
 
 export function ActionsRequiredNotAccruingDrawer() {
 	const setDrawerState = useSetAtom(drawerStateAtom);
-	const {owners, ownersKycMap} = useAtomValue(chainStateAtom);
+	const {ownersKycMap} = useAtomValue(chainStateAtom);
 	const {accruing, kycRequired} = useAtomValue(accruingStateAtom);
+	const {data} = useStorage();
 
 	return (
 		<div className="h-full flex flex-col justify-start items-center">
@@ -79,71 +81,60 @@ export function ActionsRequiredNotAccruingDrawer() {
 							<FundsInSentryWalletCard/>
 						</BarStepItem>
 
-						<BarStepItem>
+						<BarStepItem lastItem={true}>
 							<AssignedKeysCard/>
 						</BarStepItem>
 
-						{owners?.map((owner, i) => {
-							return (
-								<BarStepItem
-									key={`bar-step-item-${i}`}
-									lastItem={i + 1 === owners!.length}
-								>
-									<KycRequiredCard
-										wallet={owner}
-										status={ownersKycMap[owner]}
+						<div className="py-5 px-3">
+							{kycRequired ? (
+								<SquareCard>
+									<IconLabel
+										icon={IoMdCloseCircle}
+										color="#F59E28"
+										title="At least one wallet has unclaimable esXAI"
 									/>
-								</BarStepItem>
-							);
-						})}
-					</div>
-				</div>
-
-				{accruing && (
-					<div className="py-5 px-3">
-						{kycRequired ? (
-							<SquareCard>
-								<IconLabel
-									icon={IoMdCloseCircle}
-									color="#F59E28"
-									title="At least one wallet has unclaimable esXAI"
-								/>
-								<p className="text-[15px] text-[#525252] mt-3">
-									You must pass KYC within 180 days of accruing esXAI to claim accrued node rewards.
-									Check back in
-									48 hours if all docs submitted. Check your inbox (including spam) for updates. For
-									KYC issues,
-									contact<a
-									className="text-[#F30919] cursor-pointer"
-									onClick={() => window.electron.openExternal(`https://help.blockpass.org/hc/en-us/requests/new`)}
-								> Blockpass</a>. If not completed, continue submission here.
-								</p>
-							</SquareCard>
-						) : (
-							<SquareCard className="bg-[#DCFCE7]">
-								<IconLabel
-									icon={AiFillCheckCircle}
-									color="#16A34A"
-									title="You can claim esXAI"
-								/>
-								<p className="text-[15px] text-[#15803D] mt-2">
-									You have successfully completed your KYC on all wallets assigned to the Sentry.
-								</p>
-							</SquareCard>
-						)}
-
-						{owners?.map((owner, i) => {
-							return (
-								<BarStepItem key={`bar-step-item-${i}`} lastItem={i + 1 === owners!.length}>
-									<KycRequiredCard
-										wallet={owner}
-										status={ownersKycMap[owner]}
+									<p className="text-[15px] text-[#525252] mt-3">
+										You must pass KYC within 180 days of accruing esXAI to claim accrued node
+										rewards.
+										Check back in
+										48 hours if all docs submitted. Check your inbox (including spam) for updates.
+										For
+										KYC issues,
+										contact<a
+										className="text-[#F30919] cursor-pointer"
+										onClick={() => window.electron.openExternal(`https://help.blockpass.org/hc/en-us/requests/new`)}
+									> Blockpass</a>. If not completed, continue submission here.
+									</p>
+								</SquareCard>
+							) : (
+								<SquareCard className="bg-[#DCFCE7]">
+									<IconLabel
+										icon={AiFillCheckCircle}
+										color="#16A34A"
+										title="You can claim esXAI"
 									/>
-								</BarStepItem>
-							);
-						})}
+									<p className="text-[15px] text-[#15803D] mt-2">
+										You have successfully completed your KYC on all wallets assigned to the Sentry.
+									</p>
+								</SquareCard>
+							)}
+
+							{data?.whitelistedWallets?.map((owner, i) => {
+								return (
+									<BarStepItem
+										key={`bar-step-item-${i}`}
+										lastItem={i + 1 === data?.whitelistedWallets!.length}
+									>
+										<KycRequiredCard
+											wallet={owner}
+											status={ownersKycMap[owner]}
+										/>
+									</BarStepItem>
+								);
+							})}
+						</div>
 					</div>
-				)}
+				</div>
 			</div>
 		</div>
 	);
diff --git a/apps/web-connect/src/features/router/AppRoutes.tsx b/apps/web-connect/src/features/router/AppRoutes.tsx
index 379a4cdb5..5595050c8 100644
--- a/apps/web-connect/src/features/router/AppRoutes.tsx
+++ b/apps/web-connect/src/features/router/AppRoutes.tsx
@@ -48,7 +48,7 @@ export function AppRoutes() {
 				setLoading(false);
 			}
 
-			if (!!invalidIp || !!ofacSanction) {
+			if (!!invalidIp || !!ofacSanction || data.country === "US") {
 				setBlocked(true);
 				setLoading(false);
 			}

From 0d7b6d4ac0e4cbf976f6f8d2c29dd80dbb5226c8 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Fri, 22 Dec 2023 09:38:12 -0800
Subject: [PATCH 29/32] DropClaim adjustments

---
 .../src/features/wallet/routes/AssignWallet.tsx       |  4 ++--
 .../src/features/wallet/routes/DropClaim.tsx          | 11 ++++-------
 .../src/features/wallet/routes/UnassignWallet.tsx     |  4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/apps/web-connect/src/features/wallet/routes/AssignWallet.tsx b/apps/web-connect/src/features/wallet/routes/AssignWallet.tsx
index d8e419bd4..35ae1f21e 100644
--- a/apps/web-connect/src/features/wallet/routes/AssignWallet.tsx
+++ b/apps/web-connect/src/features/wallet/routes/AssignWallet.tsx
@@ -7,7 +7,7 @@ import {XaiBanner} from "@/features/checkout/XaiBanner";
 export function AssignWallet() {
 	const navigate = useNavigate();
 	const params = useParams<{operatorAddress: string}>();
-	const {address} = useAccount();
+	const {isConnected, address} = useAccount();
 	const {chain} = useNetwork();
 
 	const {isLoading, isSuccess, write, error, data} = useContractWrite({
@@ -74,7 +74,7 @@ export function AssignWallet() {
 									{error.message}
 								</p>
 							)}
-							{address ? (
+							{isConnected && address ? (
 								<button
 									onClick={() => write()}
 									disabled={isLoading || isSuccess || chain?.id !== 42_161}
diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index 909e585f9..b106719ba 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -5,7 +5,7 @@ import {KYCTooltip} from "@/features/checkout/KYCTooltip";
 import {useState} from "react";
 import {useListClaimableAmount} from "@/features/checkout/hooks/useListClaimableAmount";
 import {BiLoaderAlt} from "react-icons/bi";
-import {NodeLicenseAbi} from "@sentry/core";
+import {config, NodeLicenseAbi} from "@sentry/core";
 import {FaCircleCheck} from "react-icons/fa6";
 
 export function DropClaim() {
@@ -14,14 +14,12 @@ export function DropClaim() {
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
 	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
-	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 421613;
-	// const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 42_161;
+	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 42_161;
 
 	const {data: listClaimableAmountData, isLoading: isClaimableAmountLoading} = useListClaimableAmount(address);
 
 	const {isLoading: isRedeemFromWhitelistLoading, write, error, isSuccess} = useContractWrite({
-		address: "0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9" as `0x${string}`,
-		// address: config.nodeLicenseAddress as `0x${string}`,
+		address: config.nodeLicenseAddress as `0x${string}`,
 		abi: NodeLicenseAbi,
 		functionName: "redeemFromWhitelist",
 		onError(error) {
@@ -125,8 +123,7 @@ export function DropClaim() {
 																className={`w-[576px] h-16 ${ready ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
 																disabled={!ready || isRedeemFromWhitelistLoading}
 															>
-																{chain?.id === 421613 ? "Claim" : "Please Switch to Arbitrum Goerli"}
-																{/*{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}*/}
+																{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
 															</button>
 														</div>
 
diff --git a/apps/web-connect/src/features/wallet/routes/UnassignWallet.tsx b/apps/web-connect/src/features/wallet/routes/UnassignWallet.tsx
index dce4144ec..af9d8a48e 100644
--- a/apps/web-connect/src/features/wallet/routes/UnassignWallet.tsx
+++ b/apps/web-connect/src/features/wallet/routes/UnassignWallet.tsx
@@ -7,7 +7,7 @@ import {XaiBanner} from "@/features/checkout/XaiBanner";
 export function UnassignWallet() {
 	const navigate = useNavigate();
 	const params = useParams<{ operatorAddress: string }>();
-	const {address} = useAccount();
+	const {isConnected, address} = useAccount();
 	const {chain} = useNetwork();
 
 	const {isLoading, isSuccess, write, error, data} = useContractWrite({
@@ -74,7 +74,7 @@ export function UnassignWallet() {
 									{error.message}
 								</p>
 							)}
-							{address ? (
+							{isConnected && address ? (
 								<button
 									onClick={() => write()}
 									disabled={isLoading || isSuccess || chain?.id !== 42_161}

From 3a21b6cbcd7de2ec970022200b4888fbd7687df5 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Fri, 22 Dec 2023 10:17:39 -0800
Subject: [PATCH 30/32] Adjusts ready logic and adds copy

---
 .../src/features/wallet/routes/DropClaim.tsx    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index b106719ba..5b6141c99 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -14,12 +14,14 @@ export function DropClaim() {
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
 	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
-	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id !== 42_161;
+	// const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161;
+	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id === 421613;
 
 	const {data: listClaimableAmountData, isLoading: isClaimableAmountLoading} = useListClaimableAmount(address);
 
 	const {isLoading: isRedeemFromWhitelistLoading, write, error, isSuccess} = useContractWrite({
-		address: config.nodeLicenseAddress as `0x${string}`,
+		address: "0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9" as `0x${string}`,
+		// address: config.nodeLicenseAddress as `0x${string}`,
 		abi: NodeLicenseAbi,
 		functionName: "redeemFromWhitelist",
 		onError(error) {
@@ -77,8 +79,12 @@ export function DropClaim() {
 											{listClaimableAmountData && Number(listClaimableAmountData?.claimableAmount) !== 0 ? (
 												<>
 													<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
-														This wallet ({address}) can claim <span
-														className="font-semibold">{BigInt(listClaimableAmountData.claimableAmount).toString()}</span> {Number(listClaimableAmountData.claimableAmount) === 1 ? "key" : "keys"}.
+														This wallet ({address}) is eligible to claim <span
+														className="font-semibold">{BigInt(listClaimableAmountData.claimableAmount).toString()}</span> {Number(listClaimableAmountData.claimableAmount) === 1 ? "Key" : "Keys"}.
+													</p>
+													<p className="text-lg text-[#525252] max-w-[590px] text-center mt-2">
+														You will be able to claim up to 50 Keys per transaction until
+														all your eligible Keys are claimed.
 													</p>
 													<div className="flex flex-col justify-center gap-8 p-6 mt-8">
 														<div className="flex flex-col justify-center gap-2">
@@ -123,7 +129,8 @@ export function DropClaim() {
 																className={`w-[576px] h-16 ${ready ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
 																disabled={!ready || isRedeemFromWhitelistLoading}
 															>
-																{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
+																{chain?.id === 421613 ? "Claim" : "Please Switch to Arbitrum Goerli"}
+																{/*{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}*/}
 															</button>
 														</div>
 

From 22c09085f715b5b2bbc80c1d2708e26061d8c010 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Fri, 22 Dec 2023 10:20:51 -0800
Subject: [PATCH 31/32] Removes unused import

---
 apps/web-connect/src/features/wallet/routes/DropClaim.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index 5b6141c99..d482a24f2 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -5,7 +5,7 @@ import {KYCTooltip} from "@/features/checkout/KYCTooltip";
 import {useState} from "react";
 import {useListClaimableAmount} from "@/features/checkout/hooks/useListClaimableAmount";
 import {BiLoaderAlt} from "react-icons/bi";
-import {config, NodeLicenseAbi} from "@sentry/core";
+import {NodeLicenseAbi} from "@sentry/core";
 import {FaCircleCheck} from "react-icons/fa6";
 
 export function DropClaim() {

From c385eacdd5ba49175d73ec51d73a2e5f911ffcc1 Mon Sep 17 00:00:00 2001
From: James Bartnik <james@expopulus.com>
Date: Fri, 22 Dec 2023 10:54:48 -0800
Subject: [PATCH 32/32] Adjusts addresses again

---
 .../src/features/wallet/routes/DropClaim.tsx          | 11 ++++-------
 packages/core/src/node/listClaimableAmount.ts         |  8 ++------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
index d482a24f2..ac1d2545e 100644
--- a/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
+++ b/apps/web-connect/src/features/wallet/routes/DropClaim.tsx
@@ -5,7 +5,7 @@ import {KYCTooltip} from "@/features/checkout/KYCTooltip";
 import {useState} from "react";
 import {useListClaimableAmount} from "@/features/checkout/hooks/useListClaimableAmount";
 import {BiLoaderAlt} from "react-icons/bi";
-import {NodeLicenseAbi} from "@sentry/core";
+import {config, NodeLicenseAbi} from "@sentry/core";
 import {FaCircleCheck} from "react-icons/fa6";
 
 export function DropClaim() {
@@ -14,14 +14,12 @@ export function DropClaim() {
 	const [checkboxOne, setCheckboxOne] = useState<boolean>(false);
 	const [checkboxTwo, setCheckboxTwo] = useState<boolean>(false);
 	const [checkboxThree, setCheckboxThree] = useState<boolean>(false);
-	// const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161;
-	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id === 421613;
+	const ready = checkboxOne && checkboxTwo && checkboxThree && chain?.id === 42_161;
 
 	const {data: listClaimableAmountData, isLoading: isClaimableAmountLoading} = useListClaimableAmount(address);
 
 	const {isLoading: isRedeemFromWhitelistLoading, write, error, isSuccess} = useContractWrite({
-		address: "0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9" as `0x${string}`,
-		// address: config.nodeLicenseAddress as `0x${string}`,
+		address: config.nodeLicenseAddress as `0x${string}`,
 		abi: NodeLicenseAbi,
 		functionName: "redeemFromWhitelist",
 		onError(error) {
@@ -129,8 +127,7 @@ export function DropClaim() {
 																className={`w-[576px] h-16 ${ready ? "bg-[#F30919]" : "bg-gray-400 cursor-default"} text-sm text-white p-2 uppercase font-semibold`}
 																disabled={!ready || isRedeemFromWhitelistLoading}
 															>
-																{chain?.id === 421613 ? "Claim" : "Please Switch to Arbitrum Goerli"}
-																{/*{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}*/}
+																{chain?.id === 42_161 ? "Claim" : "Please Switch to Arbitrum One"}
 															</button>
 														</div>
 
diff --git a/packages/core/src/node/listClaimableAmount.ts b/packages/core/src/node/listClaimableAmount.ts
index b025b2819..5bed58295 100644
--- a/packages/core/src/node/listClaimableAmount.ts
+++ b/packages/core/src/node/listClaimableAmount.ts
@@ -5,12 +5,8 @@ import {config} from "../config.js";
 
 export async function listClaimableAmount(address: string): Promise<bigint> {
 	try {
-
-		const provider = getProvider("https://icy-thrilling-frog.arbitrum-goerli.quiknode.pro/4d27f3253823ff8ec0afbabc49cbe924bfc9acdb/");
-		const contract = new ethers.Contract("0xd8362099000ba0C8A8f0Dd9Ed8413bC8Bc8691B9", NodeLicenseAbi, provider);
-//
-// 		const provider = getProvider();
-// 		const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
+		const provider = getProvider();
+		const contract = new ethers.Contract(config.nodeLicenseAddress, NodeLicenseAbi, provider);
 		return await contract.whitelistAmounts(address);
 	} catch (error) {
 		console.error("Error fetching claimable amount:", error);