fixes

RegionX-Labs · Sep 19, 2024 · 7c2245c · 7c2245c
1 parent ff8e4cf
commit 7c2245c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 58 deletions.
diff --git a/src/hooks/sale/burnInfo.ts b/src/hooks/sale/burnInfo.ts
@@ -19,7 +19,7 @@ export const useBurnInfo = (network: NetworkType) => {
 
       setCurrentBurn(parseInt(data.sales.nodes[0]?.burn || '0'));
       setPrevBurn(parseInt(data.sales.nodes[1]?.burn || '0'));
-      setTotalBurn(parseInt(data.stats.nodes[0].totalBurn));
+      setTotalBurn(parseInt(data.stats.nodes[0]?.totalBurn) || 0);
       setLoading(false);
     };
     asyncFetchData();

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -156,8 +156,7 @@ const Home = () => {
     },
   ];
 
-  return status !== ContextStatus.LOADED ||
-    apiState !== ApiState.READY ||
+  return apiState !== ApiState.READY ||
     loadingBurnInfo ||
     loadingPurchaseHistory ? (
     <Backdrop open>
@@ -278,7 +277,7 @@ const Home = () => {
           </Button>
         ))}
       </Stack>
-      {status === ContextStatus.LOADED && (
+      {(
         <Card sx={{ padding: '1.5rem' }} data-cy='purchase-history-table'>
           <Stack direction='column' gap='1rem'>
             <Box>

diff --git a/src/pages/purchase.tsx b/src/pages/purchase.tsx
@@ -111,65 +111,45 @@ const Purchase = () => {
         </Box>
         <Balance ctBalance />
       </Box>
-      <Box mt={'.5rem'}>
-        <Banner
-          content={
-            isNewPricing(height, network)
-              ? 'Learn about the new Coretime pricing model: '
-              : 'Learn about the new Coretime pricing model coming to Kusama soon: '
-          }
-          link={{
-            title: 'Agile Coretime Pricing Explained',
-            href: 'https://grillapp.net/12935/agile-coretime-pricing-explained-166522?ref=12935',
-          }}
-          severity='info'
-        />
-      </Box>
       <Box>
-        {status !== ContextStatus.LOADED ? (
-          <Backdrop open data-cy='loading'>
-            <CircularProgress />
-          </Backdrop>
-        ) : (
-          <Box sx={{ display: 'flex', flexDirection: 'column', gap: '0.75rem' }}>
-            <SaleInfoPanel />
-            <Box sx={{ display: 'flex', gap: '1rem' }}>
-              <CoreDetailsPanel saleInfo={saleInfo} />
-              <SalePhaseInfoPanel />
-            </Box>
-
-            <Box
+        <Box sx={{ display: 'flex', flexDirection: 'column', gap: '0.75rem' }}>
+          <SaleInfoPanel />
+          <Box sx={{ display: 'flex', gap: '1rem' }}>
+            <CoreDetailsPanel saleInfo={saleInfo} />
+            <SalePhaseInfoPanel />
+          </Box>
+
+          <Box
+            sx={{
+              display: 'flex',
+              gap: '2rem',
+              justifyContent: 'space-between',
+            }}
+          >
+            <Button
+              size='small'
+              variant='outlined'
               sx={{
-                display: 'flex',
-                gap: '2rem',
-                justifyContent: 'space-between',
+                bgcolor: theme.palette.common.white,
+                padding: '0.5rem 0.75rem',
+                borderRadius: 100,
+                fontSize: '0.75rem',
+                fontWeight: 700,
+                marginLeft: 'auto',
               }}
+              onClick={onManage}
+              data-cy='btn-manage-regions'
             >
-              <Button
-                size='small'
-                variant='outlined'
-                sx={{
-                  bgcolor: theme.palette.common.white,
-                  padding: '0.5rem 0.75rem',
-                  borderRadius: 100,
-                  fontSize: '0.75rem',
-                  fontWeight: 700,
-                  marginLeft: 'auto',
-                }}
-                onClick={onManage}
-                data-cy='btn-manage-regions'
-              >
-                Manage your regions
-              </Button>
-              <ProgressButton
-                onClick={onPurchase}
-                loading={working}
-                label='Purchase Core'
-                data-cy='btn-purchase-core'
-              />
-            </Box>
+              Manage your regions
+            </Button>
+            <ProgressButton
+              onClick={onPurchase}
+              loading={working}
+              label='Purchase Core'
+              data-cy='btn-purchase-core'
+            />
           </Box>
-        )}
+        </Box>
       </Box>
     </Box>
   );