From 656b2adc6be27e87777583971bf23f967cba6f6d Mon Sep 17 00:00:00 2001
From: Solomon Emmanuel <soulex04292003@gmail.com>
Date: Fri, 18 Apr 2025 12:45:19 +0100
Subject: [PATCH] fix:balance and hydration error

---
 app/client/app/components/ui/overviewcard.tsx |  2 +-
 app/client/app/components/utils/Connector.tsx |  9 +++--
 app/client/app/components/utils/Provider.tsx  |  1 -
 app/client/app/context/appContext.tsx         | 39 ++++++++++++++-----
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/app/client/app/components/ui/overviewcard.tsx b/app/client/app/components/ui/overviewcard.tsx
index 1f7f2ab0..2a6ab28d 100644
--- a/app/client/app/components/ui/overviewcard.tsx
+++ b/app/client/app/components/ui/overviewcard.tsx
@@ -39,7 +39,7 @@ const Card: React.FC<CardProps> = ({
 
         {value && (
           <div className="flex justify-between items-center mt-2">
-            <p className="text-4xl font-bold">{value}</p>
+            <span className="text-4xl font-bold">{value}</span>
             <div className="w-16 h-16 rounded-full">
               <div className={`w-full rounded-full h-full bg-gradient-to-b ${svgColor?svgColor:'bg-secondary'} flex items-center justify-center`}>
                 <Image
diff --git a/app/client/app/components/utils/Connector.tsx b/app/client/app/components/utils/Connector.tsx
index 2782bdbf..a8bbcdd0 100644
--- a/app/client/app/components/utils/Connector.tsx
+++ b/app/client/app/components/utils/Connector.tsx
@@ -11,10 +11,13 @@ import Button from "../ui/button";
 //   return ` ${addr?.slice(0, 8)}...${addr.slice(addr.length - 8, addr.length)}`;
 // }
 const Connector: React.FC = () => {
-  const {  address, status } = useAppContext();
-  const { data } = useBalance({ address: address as "0x" });
+  const { address, status } = useAppContext();
+  const { data } = useBalance({
+    token: "0x04718f5a0Fc34cC1AF16A1cdee98fFB20C31f5cD61D6Ab07201858f4287c938D",
+    address: address as "0x",
+  });
   const router = useRouter();
- 
+
   console.log(data);
   console.log(status);
   return (
diff --git a/app/client/app/components/utils/Provider.tsx b/app/client/app/components/utils/Provider.tsx
index 9c4a010c..09a74a33 100644
--- a/app/client/app/components/utils/Provider.tsx
+++ b/app/client/app/components/utils/Provider.tsx
@@ -31,7 +31,6 @@ export function StarknetProvider({ children }: { children: React.ReactNode }) {
         },
       }) as StarknetkitConnector,
     ],
-    order: "alphabetical",
   });
 
   return (
diff --git a/app/client/app/context/appContext.tsx b/app/client/app/context/appContext.tsx
index 06e4ae2f..f4ca5951 100644
--- a/app/client/app/context/appContext.tsx
+++ b/app/client/app/context/appContext.tsx
@@ -3,7 +3,12 @@ import { createContext, useContext } from "react";
 import { Toast } from "primereact/toast";
 import { useRef } from "react";
 import { useRouter } from "next/navigation";
-import { useConnect, useDisconnect, useAccount,useBalance } from "@starknet-react/core";
+import {
+  useConnect,
+  useDisconnect,
+  useAccount,
+  useBalance,
+} from "@starknet-react/core";
 import type { Connector } from "@starknet-react/core";
 import DotPulseLoader from "../components/ui/DotPulseLoader";
 
@@ -18,7 +23,7 @@ interface AppContextType {
   address?: string;
   status: string;
   balance?: string | React.ReactNode;
-  contactAddress?:string;
+  contactAddress?: string;
 }
 
 const AppContext = createContext<AppContextType | undefined>(undefined);
@@ -29,10 +34,18 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
   const { connectAsync } = useConnect();
   const { disconnectAsync } = useDisconnect();
   const { address, status } = useAccount();
-  const { data, isLoading } = useBalance({ address: address as "0x" });  
+  const { data, isLoading } = useBalance({
+    token: "0x04718f5a0Fc34cC1AF16A1cdee98fFB20C31f5cD61D6Ab07201858f4287c938D",
+    address: address as "0x",
+  });
+
+  const balance =
+    isLoading || !data ? (
+      <DotPulseLoader />
+    ) : (
+      `${parseFloat(data.formatted).toFixed(2)} STRK`
+    );
 
-  const balance = isLoading || !data ? <DotPulseLoader/> : `${data.value}.${data.decimals} ETH`;
-  
   const showToast = (
     severity: "success" | "error" | "info",
     summary: string,
@@ -56,7 +69,6 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
         } else if (error.message.includes("Connector not found")) {
           errorMessage = `${connector.name} is not installed.`;
         } else {
-      
           errorMessage = "Connection Failed";
         }
       }
@@ -73,15 +85,24 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
         router.push("/");
       }, 1000);
     } catch (error) {
-      console.log(error)
+      console.log(error);
       showToast("error", "Error", "Failed to disconnect wallet");
     }
   };
-  const contactAddress="0x00a74ca9b3f9fb5941b5fc53ea383995b4d8b8ee7b40b323ac1bb260d44f00d2"
+  const contactAddress =
+    "0x00a74ca9b3f9fb5941b5fc53ea383995b4d8b8ee7b40b323ac1bb260d44f00d2";
 
   return (
     <AppContext.Provider
-      value={{ showToast, connectWallet, disconnectWallet, address, status ,balance,contactAddress}}
+      value={{
+        showToast,
+        connectWallet,
+        disconnectWallet,
+        address,
+        status,
+        balance,
+        contactAddress,
+      }}
     >
       <Toast ref={toast} />
       {children}