Use deposit time after hedge

packages/frontend/src/hooks/useCrabPosition/useCrabPosition.ts

@@ -4,7 +4,7 @@ import { useUserCrabTxHistory } from '../useUserCrabTxHistory'
 import { useUserCrabV2TxHistory } from '../useUserCrabV2TxHistory'
 import { CrabStrategyTxType, CrabStrategyV2TxType } from '../../types'
 import { toTokenAmount } from '@utils/calculations'
-import { useAtom, useAtomValue } from 'jotai'
+import { useAtom, useAtomValue, useSetAtom } from 'jotai'
 import { indexAtom } from 'src/state/controller/atoms'
 import useAppCallback from '../useAppCallback'
 import useAppMemo from '../useAppMemo'
@@ -16,6 +16,8 @@ import {
   crabQueuedInEthAtom,
   currentCrabPositionValueInETHAtom,
   currentCrabPositionValueInETHAtomV2,
+  firstDepositBlockAtom,
+  firstDepositTimeAtom,
 } from 'src/state/crab/atoms'
 import BigNumber from 'bignumber.js'
 
@@ -112,6 +114,8 @@ export const useCrabPositionV2 = (user: string) => {
   const currentEthValue = useAtomValue(currentCrabPositionValueInETHAtomV2)
   const [txToSearch, setTxToSearch] = useState<string | undefined>(undefined)
   const currentQueuedCrabEth = useAtomValue(crabQueuedInEthAtom)
+  const setFirstDepositTime = useSetAtom(firstDepositTimeAtom)
+  const setFirstDepositBlock = useSetAtom(firstDepositBlockAtom)
 
   const { loading: txHistoryLoading, data: txHistoryData, startPolling, stopPolling } = useUserCrabV2TxHistory(user)
 
@@ -129,6 +133,8 @@ export const useCrabPositionV2 = (user: string) => {
       return { remainingDepositUsd: BIG_ZERO, remainingDepositEth: BIG_ZERO }
     }
 
+    setFirstDepositTime(Number(txHistoryData[0].timestamp))
+    setFirstDepositBlock(Number(txHistoryData[0].blockNumber))
     const { totalSharesDeposited, totalSharesWithdrawn, totalUSDDeposit, totalETHDeposit } = txHistoryData?.reduce(
       (acc, tx) => {
         if (

packages/frontend/src/queries/squeeth/userCrabV2TxQuery.ts

@@ -20,6 +20,7 @@ export const USER_CRAB_V2_TX_QUERY = gql`
       erc20Token
       erc20Amount
       transaction
+      blockNumber
     }
   }
 `

packages/frontend/src/state/crab/atoms.ts

@@ -82,6 +82,9 @@ export const crabLoadingAtomV2 = atom((get) => {
 export const crabv2StrategyFilterStartDateAtom = atom<Date>(new Date(CRABV2_START_DATE))
 export const crabv2StrategyFilterEndDateAtom = atom<Date>(new Date())
 
+export const firstDepositTimeAtom = atom(0)
+export const firstDepositBlockAtom = atom(0)
+
 export const useCrabPnLV2ChartData = () => {
   const startDate = useAtomValue(crabv2StrategyFilterStartDateAtom)
   const endDate = useAtomValue(crabv2StrategyFilterEndDateAtom)

packages/frontend/src/state/crab/hooks.ts

@@ -42,6 +42,8 @@ import {
   crabTotalSupplyV2Atom,
   totalUsdcQueuedAtom,
   totalCrabQueuedAtom,
+  firstDepositTimeAtom,
+  firstDepositBlockAtom,
 } from './atoms'
 import { addressesAtom } from '../positions/atoms'
 import {
@@ -1232,6 +1234,8 @@ export const useCrabProfitData = () => {
   })
   const crabPosition = useAtomValue(currentCrabPositionValueAtomV2)
   const currentEthPrice = useOnChainETHPrice()
+  const firstDepositTime = useAtomValue(firstDepositTimeAtom)
+  const firstDepositBlock = useAtomValue(firstDepositBlockAtom)
 
   const getVault = useGetVault()
   const { getTwapSafe } = useOracle()
@@ -1272,12 +1276,16 @@ export const useCrabProfitData = () => {
   useEffect(() => {
     if (!loading && data && data.strategy) {
       if ( crabPosition.isGreaterThan(0)) {
-        setData(data.strategy.lastHedgeBlockNumber , data.strategy.lastHedgeTimestamp)
+        if (data.strategy.lastHedgeBlockNumber < firstDepositBlock) {
+          setData(firstDepositBlock , firstDepositTime)
+        } else {
+          setData(data.strategy.lastHedgeBlockNumber , data.strategy.lastHedgeTimestamp)
+        }
       } else {
         setData()
       }
     }
-  }, [loading, data, crabPosition])
+  }, [loading, data, crabPosition, firstDepositBlock, firstDepositTime])
 
   return { profitData, loading }
 }