diff --git a/trade.renegade.fi/contexts/Renegade/renegade-context.tsx b/trade.renegade.fi/contexts/Renegade/renegade-context.tsx
index 9a4d4cc8..f310ff20 100644
--- a/trade.renegade.fi/contexts/Renegade/renegade-context.tsx
+++ b/trade.renegade.fi/contexts/Renegade/renegade-context.tsx
@@ -34,9 +34,9 @@ const RenegadeContext = React.createContext<RenegadeContextType | undefined>(
 function RenegadeProvider({ children }: React.PropsWithChildren) {
   // Create balance, order, fee, an account states.
   const [accountId, setAccountId] = React.useState<AccountId>()
-  const [, setBalances] = React.useState<Record<BalanceId, Balance>>({})
+  const [balances, setBalances] = React.useState<Record<BalanceId, Balance>>({})
   const [fees] = React.useState<Record<FeeId, Fee>>({})
-  const [, setOrders] = React.useState<Record<OrderId, Order>>({})
+  const [orders, setOrders] = React.useState<Record<OrderId, Order>>({})
   const [isLocked, setIsLocked] = React.useState<boolean>(false)
 
   // Create task states.
@@ -228,10 +228,12 @@ function RenegadeProvider({ children }: React.PropsWithChildren) {
     <RenegadeContext.Provider
       value={{
         accountId,
+        balances,
         counterparties,
         fees,
         isLocked,
         orderBook,
+        orders,
         refreshAccount,
         setAccount,
         setTask,
diff --git a/trade.renegade.fi/contexts/Renegade/types.ts b/trade.renegade.fi/contexts/Renegade/types.ts
index 0805aaee..80f6fe9f 100644
--- a/trade.renegade.fi/contexts/Renegade/types.ts
+++ b/trade.renegade.fi/contexts/Renegade/types.ts
@@ -1,8 +1,11 @@
 import {
   AccountId,
+  Balance,
+  BalanceId,
   Fee,
   FeeId,
   Keychain,
+  Order,
   OrderId,
   TaskId,
 } from "@renegade-fi/renegade-js"
@@ -27,10 +30,12 @@ export type PeerId = string
 
 export interface RenegadeContextType {
   accountId: AccountId | undefined
+  balances: Record<BalanceId, Balance>
   counterparties: Record<PeerId, Counterparty>
   fees: Record<FeeId, Fee>
   isLocked: boolean
   orderBook: Record<OrderId, CounterpartyOrder>
+  orders: Record<OrderId, Order>
   refreshAccount: (accountId?: AccountId) => void
   setAccount: (oldAccountId?: AccountId, keychain?: Keychain) => Promise<void>
   setTask: (newTaskId?: TaskId, taskType?: TaskType) => void
diff --git a/trade.renegade.fi/hooks/use-balance.ts b/trade.renegade.fi/hooks/use-balance.ts
index 35f6093e..5463d7f9 100644
--- a/trade.renegade.fi/hooks/use-balance.ts
+++ b/trade.renegade.fi/hooks/use-balance.ts
@@ -1,26 +1,25 @@
-import { useEffect, useState } from "react"
 import { useRenegade } from "@/contexts/Renegade/renegade-context"
-import { Balance, BalanceId } from "@renegade-fi/renegade-js"
 
-import { renegade } from "@/app/providers"
 
 export const useBalance = () => {
-  const [balances, setBalances] = useState<Record<BalanceId, Balance>>({})
-  const { accountId } = useRenegade()
+  // const [balances, setBalances] = useState<Record<BalanceId, Balance>>({})
+  // const { accountId } = useRenegade()
 
-  useEffect(() => {
-    if (!accountId) return
-    const interval = setInterval(async () => {
-      const fetchedBalances = await renegade
-        .queryWallet(accountId)
-        .then(() => renegade.getBalances(accountId))
-      setBalances(fetchedBalances)
-    }, 5000)
+  // useEffect(() => {
+  //   if (!accountId) return
+  //   const interval = setInterval(async () => {
+  //     const fetchedBalances = await renegade
+  //       .queryWallet(accountId)
+  //       .then(() => renegade.getBalances(accountId))
+  //     setBalances(fetchedBalances)
+  //   }, 5000)
 
-    return () => {
-      clearInterval(interval)
-    }
-  }, [accountId])
+  //   return () => {
+  //     clearInterval(interval)
+  //   }
+  // }, [accountId])
 
+  // return balances
+  const { balances } = useRenegade()
   return balances
 }
diff --git a/trade.renegade.fi/hooks/use-order.ts b/trade.renegade.fi/hooks/use-order.ts
index bb32ec35..4518f33b 100644
--- a/trade.renegade.fi/hooks/use-order.ts
+++ b/trade.renegade.fi/hooks/use-order.ts
@@ -1,41 +1,39 @@
-import { useEffect, useState } from "react"
 import { useRenegade } from "@/contexts/Renegade/renegade-context"
-import { Order, OrderId } from "@renegade-fi/renegade-js"
 
-import { safeLocalStorageGetItem, safeLocalStorageSetItem } from "@/lib/utils"
-import { renegade } from "@/app/providers"
 
 export const useOrders = () => {
-  const { accountId } = useRenegade()
-  const [orders, setOrders] = useState<Record<OrderId, Order>>({})
-
-  useEffect(() => {
-    if (!accountId) return
-    const interval = setInterval(async () => {
-      const existingOrders = safeLocalStorageGetItem(`orders-${accountId}`)
-      const existingOrdersArray = existingOrders
-        ? existingOrders.split(",")
-        : []
-
-      const fetchedOrders = await renegade
-        .queryWallet(accountId)
-        .then(() => renegade.getOrders(accountId))
-      setOrders(fetchedOrders)
-
-      const uniqueNewOrderIds = Object.keys(fetchedOrders).filter(
-        (orderId) => !existingOrdersArray.includes(orderId)
-      )
-
-      existingOrdersArray.push(...uniqueNewOrderIds)
-      const updatedOrders = existingOrdersArray.join(",")
-
-      safeLocalStorageSetItem(`orders-${accountId}`, updatedOrders)
-    }, 1000)
-
-    return () => {
-      clearInterval(interval)
-    }
-  }, [accountId])
-
+  // const { accountId } = useRenegade()
+  // const [orders, setOrders] = useState<Record<OrderId, Order>>({})
+
+  // useEffect(() => {
+  //   if (!accountId) return
+  //   const interval = setInterval(async () => {
+  //     const existingOrders = safeLocalStorageGetItem(`orders-${accountId}`)
+  //     const existingOrdersArray = existingOrders
+  //       ? existingOrders.split(",")
+  //       : []
+
+  //     const fetchedOrders = await renegade
+  //       .queryWallet(accountId)
+  //       .then(() => renegade.getOrders(accountId))
+  //     setOrders(fetchedOrders)
+
+  //     const uniqueNewOrderIds = Object.keys(fetchedOrders).filter(
+  //       (orderId) => !existingOrdersArray.includes(orderId)
+  //     )
+
+  //     existingOrdersArray.push(...uniqueNewOrderIds)
+  //     const updatedOrders = existingOrdersArray.join(",")
+
+  //     safeLocalStorageSetItem(`orders-${accountId}`, updatedOrders)
+  //   }, 1000)
+
+  //   return () => {
+  //     clearInterval(interval)
+  //   }
+  // }, [accountId])
+
+  // return orders
+  const { orders } = useRenegade()
   return orders
 }