Merge branch 'main' into feat/migrate-bucket

node-real · May 10, 2024 · 12fe558 · 12fe558
2 parents 861e731 + 5e2c017
commit 12fe558
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 4 deletions.
diff --git a/apps/dcellar-web-ui/CHANGELOG.json b/apps/dcellar-web-ui/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "dcellar-web-ui",
   "entries": [
+    {
+      "version": "1.3.0",
+      "tag": "dcellar-web-ui_v1.3.0",
+      "date": "Fri, 10 May 2024 08:02:26 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Cache pricing data for other landing page"
+          }
+        ]
+      }
+    },
     {
       "version": "1.2.0",
       "tag": "dcellar-web-ui_v1.2.0",

diff --git a/apps/dcellar-web-ui/CHANGELOG.md b/apps/dcellar-web-ui/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - dcellar-web-ui
 
-This log was last generated on Thu, 09 May 2024 06:16:58 GMT and should not be manually modified.
+This log was last generated on Fri, 10 May 2024 08:02:26 GMT and should not be manually modified.
+
+## 1.3.0
+Fri, 10 May 2024 08:02:26 GMT
+
+### Minor changes
+
+- Cache pricing data for other landing page
 
 ## 1.2.0
 Thu, 09 May 2024 06:16:58 GMT

diff --git a/apps/dcellar-web-ui/package.json b/apps/dcellar-web-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dcellar-web-ui",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "private": false,
   "scripts": {
     "dev": "node ./scripts/dev.js -p 3200",

diff --git a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/PricingCard.tsx b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/PricingCard.tsx
@@ -51,10 +51,14 @@ export const PricingCard = ({ storeParams }: PricingCardProps) => {
       .times(storeTime)
       .dp(CRYPTOCURRENCY_DISPLAY_PRECISION)
       .toString();
-    return {
+
+    const fee = {
       storageFee,
       quotaFee,
+      storeParams,
     };
+
+    return ((global as any).__MAINNET_CHAIN_FEE = fee);
   }, [storeParams, unit.size, unit.time]);
 
   return (

diff --git a/apps/dcellar-web-ui/src/pages/api/fee.ts b/apps/dcellar-web-ui/src/pages/api/fee.ts
@@ -0,0 +1,23 @@
+import { NextApiRequest, NextApiResponse } from 'next';
+
+const defaultFee = {
+  storageFee: '0.00004005',
+  quotaFee: '0.00015672',
+  storeParams: {
+    primarySpStorePrice: '0.00828393206',
+    readPrice: '0.05575446448',
+    secondarySpStorePrice: '0.0009940718472',
+    validatorTaxRate: '0.01',
+    minChargeSize: 131072,
+    redundantDataChunkNum: 4,
+    redundantParityChunkNum: 2,
+    reserveTime: '15552000',
+  },
+};
+
+const handler = async (req: NextApiRequest, res: NextApiResponse) => {
+  const fee = (global as any).__MAINNET_CHAIN_FEE || defaultFee;
+  res.json(fee);
+};
+
+export default handler;
diff --git a/apps/dcellar-web-ui/src/pages/pricing-calculator/index.tsx b/apps/dcellar-web-ui/src/pages/pricing-calculator/index.tsx
@@ -2,6 +2,7 @@ import { LandingPage } from '@/components/layout/LandingPage';
 import { PriceCalculator } from '@/modules/pricing-calculator';
 import { wrapper } from '@/store';
 import { ReactElement } from 'react';
+import { setupMainnetStoreFeeParams } from '@/store/slices/global';
 
 export default function PriceCalculatorPage() {
   return <PriceCalculator />;
@@ -11,7 +12,10 @@ PriceCalculatorPage.getLayout = (page: ReactElement) => {
   return <LandingPage page={page} />;
 };
 
-PriceCalculatorPage.getInitialProps = wrapper.getInitialAppProps(() => async () => {
+PriceCalculatorPage.getInitialProps = wrapper.getInitialAppProps((store) => async () => {
+  if (typeof window === 'undefined') {
+    await store.dispatch(setupMainnetStoreFeeParams());
+  }
   return {
     pageProps: {},
   };