Merge pull request #108 from renproject/fix/volume-data-all-time-issue

add periodOption when calculating volume data
renproject · Dec 7, 2022 · eb28c30 · eb28c30
2 parents b9360af + 9508167
commit eb28c30
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/controllers/pages/networkStatsPage/DoughnutChart.tsx b/src/controllers/pages/networkStatsPage/DoughnutChart.tsx
@@ -96,7 +96,6 @@ export const DoughnutChart: React.FC<Props> = ({
         () => getOptions(data, quoteCurrency),
         [data, quoteCurrency],
     );
-    console.log(options);
 
     return (
         <div

diff --git a/src/controllers/pages/networkStatsPage/NetworkStatsPage.tsx b/src/controllers/pages/networkStatsPage/NetworkStatsPage.tsx
@@ -59,6 +59,7 @@ export const NetworkStatsPage = () => {
                   TrackerVolumeType.Locked,
                   quoteCurrency,
                   tokenPrices,
+                  volumePeriod,
               ).difference;
     }, [allVolumeData, tokenPrices, quoteCurrency]);
 

diff --git a/src/controllers/pages/networkStatsPage/VolumeData.tsx b/src/controllers/pages/networkStatsPage/VolumeData.tsx
@@ -118,13 +118,15 @@ export const VolumeStats: React.FC<VolumeStatsProps> = ({
                     trackerChain,
                     quoteCurrency,
                     tokenPrices,
+                    volumePeriod
                 );
             }
             return snapshotDataToAllChainVolumeData(
                 volumeData,
                 trackerType,
                 quoteCurrency,
                 tokenPrices,
+                volumePeriod
             );
         }
         return fallback;

diff --git a/src/lib/graphQL/queries/renVmTracker.ts b/src/lib/graphQL/queries/renVmTracker.ts
@@ -386,6 +386,7 @@ export const snapshotDataToVolumeData = (
     chain: TrackerChain,
     currency: TokenAmountType | Currency,
     tokenPrices: TokenPrices,
+    period: PeriodOption,
 ) => {
     const snapshots = getSnapshots(data);
     const { first, last } = getFirstAndLastSnapshot(snapshots);
@@ -411,7 +412,7 @@ export const snapshotDataToVolumeData = (
         let difference = new BigNumber(0);
         let differenceStandard = new BigNumber(0);
         let differenceQuote = new BigNumber(0);
-        if (lastEntry && firstEntry) {
+        if (lastEntry && firstEntry && period !== PeriodOption.ALL) {
             differenceQuote = new BigNumber(
                 getQuoteAmount(lastEntry, currency, assetsData, tokenPrices),
             ).minus(
@@ -508,6 +509,7 @@ export const snapshotDataToAllChainVolumeData = (
     type: TrackerVolumeType,
     currency: TokenAmountType | Currency,
     tokenPrices: TokenPrices,
+    period: PeriodOption,
 ) => {
     const assetsData = getAssetsData(data);
     let sum = new BigNumber(0);
@@ -519,6 +521,7 @@ export const snapshotDataToAllChainVolumeData = (
             chain,
             currency,
             tokenPrices,
+            period,
         );
         sum = sum.plus(difference);
         records = mergeAmountRecords(assetsData, records, amountRecords);