fix: update liquidity calculations and historical price data fetching

oraidex · Dec 2, 2024 · 34e1fcf · 34e1fcf
1 parent e2fef8c
commit 34e1fcf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/libs/contractSingleton.ts b/src/libs/contractSingleton.ts
@@ -760,7 +760,7 @@ export function simulateIncentiveAprPosition(
 
   // calculate APR for the best, position liquidity is 10% of total liquidity
   let sumMaxIncentivesApr = 0;
-  const positionLiquidity = 10 ** 24;
+  const positionLiquidity = Number(pool.liquidity);
   // const totalPositionLiquidity = (totalLiquidity * 0.5) / 100;
   const tick_spacing = poolKey.fee_tier.tick_spacing;
 
@@ -792,7 +792,7 @@ export function simulateIncentiveAprPosition(
 
   // calculate APR for the worst, position liquidity is 2% of total liquidity
   let sumMinIncentivesApr = 0;
-  const positionLiquidity2 = 10 ** 24;
+  const positionLiquidity2 = Number(pool.liquidity);
 
   const res2 = calculateAmountDelta(
     pool.current_tick_index,

diff --git a/src/pages/Pool-V3/hooks/useCreatePositionForm.ts b/src/pages/Pool-V3/hooks/useCreatePositionForm.ts
@@ -198,6 +198,12 @@ const useCreatePositionForm = (
         time,
         price: close
       }));
+
+      data.push({
+        time: Date.now(),
+        price: currentPrice
+      })
+
       const padding = 0.1;
 
       const prices = data.map((d) => d.price);

diff --git a/src/reducer/poolDetailV3.ts b/src/reducer/poolDetailV3.ts
@@ -66,11 +66,11 @@ const initialState: PoolDetailV3State = {
   tokenY: null,
   isXToY: true,
   historicalRange: '7d',
-  cache7Day: null,
-  cache1Month: null,
-  cache3Month: null,
-  cache1Year: null,
-  historicalChartData: null,
+  cache7Day: [],
+  cache1Month: [],
+  cache3Month: [],
+  cache1Year: [],
+  historicalChartData: [],
   fullRange: false,
   xRange: null,
   yRange: null,
@@ -329,7 +329,7 @@ export const fetchHistoricalPriceData3M = createAsyncThunk(
 export const fetchHistoricalPriceData7D = createAsyncThunk(
   'poolDetailV3/fetchHistoricalPriceData7D',
   async (poolId: string) => {
-    return await getHistoricalPriceDataInHour(poolId, '7d');
+    return await getHistoricalPriceDataInDay(poolId, '7d');
   }
 );
 

diff --git a/src/rest/graphClient.ts b/src/rest/graphClient.ts
@@ -684,7 +684,7 @@ export const getHistoricalPriceDataInDay = async (
       default:
         dayIndex = currentIndex - 7;
     }
-
+    
     // create array of chunkOffset: [dayIndex, dayIndex + CHUNK_QUERY, ...] to current Index
     const length = Math.ceil((currentIndex - dayIndex) / CHUNK_QUERY);
     const chunkOffset = Array.from({ length }, (_, i) => dayIndex + i * CHUNK_QUERY);
@@ -750,6 +750,9 @@ export const getHistoricalPriceDataInDay = async (
       poolId
     };
 
+    // remove the last record and use the latest price
+    res.data.pop();
+
     return res;
   } catch (error) {
     console.log('error getHistoricalPriceData', error);