Merge branch 'develop'

Author: James Bartnik

apps/sentry-client-desktop/src/features/home/dashboard/NetworkRewardsCard.tsx

@@ -14,15 +14,16 @@ import {ReactComponent as XaiLogo} from "@/svgs/xai-logo.svg";
 import {MdRefresh} from "react-icons/md";
 
 export function NetworkRewardsCard() {
-	const {owners} = useAtomValue(chainStateAtom);
+	const {owners, licensesList} = useAtomValue(chainStateAtom);
 	const {balances, isBalancesLoading, balancesFetchedLast, accruing, kycRequired} = useAtomValue(accruingStateAtom);
 	const {combinedOwners} = useCombinedOwners(owners);
 	const {data: earnedEsxaiBalance} = useGetWalletBalance(combinedOwners);
 	const [currentTime, setCurrentTime] = useState(new Date());
 	const {refresh} = useChainDataRefresh();
+	const keyCount = licensesList.length;
 
-	const [esXaiBalance, setEsXaiBalance] = useState("0");
-	const [accruedEsXaiBalance, setAccruedEsXaiBalance] = useState("0");
+	const [esXaiBalance, setEsXaiBalance] = useState("--");
+	const [accruedEsXaiBalance, setAccruedEsXaiBalance] = useState("--");
 
 	// Calculate the time difference in minutes
 	const calculateTimeDifference = (currentTime: Date, lastUpdateTime: Date) => {
@@ -44,22 +45,22 @@ export function NetworkRewardsCard() {
 
 	// esXAI Balance
 	function getEsxaiBalance() {
-		if (!isBalancesLoading && balancesFetchedLast && earnedEsxaiBalance) {
+		if (earnedEsxaiBalance != null) {
 			if (parseFloat(ethers.formatEther(earnedEsxaiBalance.reduce((acc, item) => acc + item.esXaiBalance, BigInt(0)))).toFixed(6) === "0.000000") {
 				setEsXaiBalance("0")
 			} else {
-				setEsXaiBalance(parseFloat(ethers.formatEther(earnedEsxaiBalance.reduce((acc, item) => acc + item.esXaiBalance, BigInt(0)))).toFixed(6))
+				setEsXaiBalance(parseFloat(ethers.formatEther(earnedEsxaiBalance.reduce((acc, item) => acc + item.esXaiBalance, BigInt(0)))).toFixed(0))
 			}
 		}
 	}
 
 	// Accrued esXAI Balance
 	function getAccruedEsxaiBalance() {
-		if (!isBalancesLoading && balancesFetchedLast && balances) {
+		if (!isBalancesLoading && balancesFetchedLast && balances != null) {
 			if (Number(ethers.formatEther(Object.values(balances).reduce((acc, value) => acc + value.totalAccruedEsXai, BigInt(0)))).toFixed(6) === "0.000000") {
 				setAccruedEsXaiBalance("0")
 			} else {
-				setAccruedEsXaiBalance(Number(ethers.formatEther(Object.values(balances).reduce((acc, value) => acc + value.totalAccruedEsXai, BigInt(0)))).toFixed(6))
+				setAccruedEsXaiBalance(Number(ethers.formatEther(Object.values(balances).reduce((acc, value) => acc + value.totalAccruedEsXai, BigInt(0)))).toFixed(0))
 			}
 		}
 	}
@@ -192,7 +193,7 @@ export function NetworkRewardsCard() {
 					<div className="flex items-center">
 						<div>
 							<p className="text-2xl font-semibold">
-								{owners.length * 7}
+								{keyCount * 7}
 							</p>
 							<p className="text-[12px] text-[#A3A3A3]">
 								times per month (on average)

apps/sentry-client-desktop/src/features/home/dashboard/SentryNodeStatusCard.tsx

@@ -1,7 +1,6 @@
 import {GreenPulse, YellowPulse} from "@/features/keys/StatusPulse";
 import {useOperatorRuntime} from "@/hooks/useOperatorRuntime";
-import {Tooltip} from "@sentry/ui";
-import {AiFillWarning, AiOutlineInfoCircle} from "react-icons/ai";
+import {AiFillWarning} from "react-icons/ai";
 import {Card} from "@/features/home/cards/Card";
 import {FaCircleCheck} from "react-icons/fa6";
 import {useOperator} from "@/features/operator";
@@ -88,15 +87,7 @@ export function SentryNodeStatusCard() {
 			<div className="sticky flex flex-row justify-between items-center py-2 px-4 border-b border-[#F5F5F5] z-10">
 				<div className="flex flex-row items-center gap-1 text-[#A3A3A3] text-[15px]">
 					<h2 className="font-medium">Sentry Node Status</h2>
-					<Tooltip
-						header={"Header"}
-						body={"Body"}
-						position={"start"}
-					>
-						<AiOutlineInfoCircle size={15} color={"#A3A3A3"}/>
-					</Tooltip>
 					<p className="flex items-center ml-2 text-sm text-[#D4D4D4]">
-						{/*Last challenge 24m ago (hard-coded)*/}
 						{timeAgoString}
 					</p>
 				</div>