funding history table

components/account/AccountStats.tsx

@@ -116,7 +116,7 @@ const AccountStats = ({ hideView }: { hideView: () => void }) => {
           />
         </div>
         <div className="col-span-2 border-b border-th-bkg-3 md:col-span-1">
-          <div className="border-b border-th-bkg-3 px-4 py-4 md:px-6 lg:py-6">
+          <div className="border-b border-th-bkg-3 p-4 md:px-6 lg:py-6">
             <Tooltip
               content={t('account:tooltip-total-funding')}
               maxWidth="20rem"
@@ -147,7 +147,7 @@ const AccountStats = ({ hideView }: { hideView: () => void }) => {
           </div>
         </div>
         <div className="col-span-2 border-b border-th-bkg-3 md:col-span-1">
-          <div className="border-b border-th-bkg-3 px-4 py-4 md:px-6 lg:py-6">
+          <div className="border-b border-th-bkg-3 p-4 md:px-6 lg:py-6">
             <p className="tooltip-underline text-base leading-tight">
               {t('account:lifetime-volume')}
             </p>

components/account/FundingChart.tsx

@@ -1,14 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { useQuery } from '@tanstack/react-query'
 import dayjs from 'dayjs'
-import useMangoAccount from 'hooks/useMangoAccount'
 import { useEffect, useMemo, useState } from 'react'
-import {
-  HourlyFundingChartData,
-  HourlyFundingData,
-  HourlyFundingStatsData,
-} from 'types'
-import { DAILY_MILLISECONDS, MANGO_DATA_API_URL } from 'utils/constants'
+import { HourlyFundingChartData } from 'types'
+import { DAILY_MILLISECONDS } from 'utils/constants'
 import { formatCurrencyValue } from 'utils/numbers'
 import { TooltipProps } from 'recharts/types/component/Tooltip'
 import {
@@ -32,6 +26,7 @@ import ContentBox from '@components/shared/ContentBox'
 import SheenLoader from '@components/shared/SheenLoader'
 import useThemeWrapper from 'hooks/useThemeWrapper'
 import FormatNumericValue from '@components/shared/FormatNumericValue'
+import useAccountHourlyFunding from 'hooks/useAccountHourlyFunding'
 
 type TempDataType = {
   [time: string]: {
@@ -41,55 +36,15 @@ type TempDataType = {
   }
 }
 
-const fetchHourlyFunding = async (mangoAccountPk: string) => {
-  try {
-    const data = await fetch(
-      `${MANGO_DATA_API_URL}/stats/funding-account-hourly?mango-account=${mangoAccountPk}`,
-    )
-    const res = await data.json()
-    if (res) {
-      const entries: HourlyFundingData[] = Object.entries(res)
-
-      const stats: HourlyFundingStatsData[] = entries.map(([key, value]) => {
-        const marketEntries = Object.entries(value)
-        const marketFunding = marketEntries.map(([key, value]) => {
-          return {
-            long_funding: value.long_funding * -1,
-            short_funding: value.short_funding * -1,
-            time: key,
-          }
-        })
-        return { marketFunding, market: key }
-      })
-
-      return stats
-    }
-  } catch (e) {
-    console.log('Failed to fetch account funding history', e)
-  }
-}
-
 const FundingChart = () => {
   const { t } = useTranslation('common')
-  const { mangoAccountAddress } = useMangoAccount()
   const [daysToShow, setDaysToShow] = useState('30')
   const { theme } = useThemeWrapper()
   const {
     data: fundingData,
-    isLoading: loadingFunding,
-    isFetching: fetchingFunding,
+    loading: loadingFunding,
     refetch,
-  } = useQuery(
-    ['hourly-funding', mangoAccountAddress],
-    () => fetchHourlyFunding(mangoAccountAddress),
-    {
-      cacheTime: 1000 * 60 * 10,
-      staleTime: 1000 * 60,
-      retry: 3,
-      refetchOnWindowFocus: false,
-      enabled: !!mangoAccountAddress,
-    },
-  )
+  } = useAccountHourlyFunding()
 
   useEffect(() => {
     refetch()
@@ -219,7 +174,7 @@ const FundingChart = () => {
   return (
     <FadeInFadeOut show={true}>
       <ContentBox hideBorder hidePadding>
-        {loadingFunding || fetchingFunding ? (
+        {loadingFunding ? (
           <SheenLoader className="flex flex-1">
             <div className={`h-[350px] w-full rounded-lg bg-th-bkg-2`} />
           </SheenLoader>