Merge branch 'master' into subgraph-bean2.2.1

BeanstalkFarms · May 24, 2024 · 2be6f49 · 2be6f49
2 parents b83f07d + 60a0f96
commit 2be6f49
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/projects/sdk/src/defaultSettings.json b/projects/sdk/src/defaultSettings.json
@@ -1,3 +1,3 @@
 {
-  "subgraphUrl": "https://graph.node.bean.money/subgraphs/name/beanstalk-2-1-0"
+  "subgraphUrl": "https://graph.node.bean.money/subgraphs/name/beanstalk-dev"
 }
diff --git a/projects/ui/codegen-individual.yml b/projects/ui/codegen-individual.yml
@@ -5,14 +5,14 @@ overwrite: true
 generates:
   ./src/graph/schema-beanstalk.graphql:
     schema:
-      - https://graph.node.bean.money/subgraphs/name/beanstalk
-    plugins:
-      - "schema-ast"
-  ./src/graph/schema-bean.graphql:
-    schema:
-      - https://graph.node.bean.money/subgraphs/name/bean
+      - https://graph.node.bean.money/subgraphs/name/beanstalk-dev
     plugins:
       - "schema-ast"
+  #./src/graph/schema-bean.graphql:
+  #  schema:
+  #    - https://graph.node.bean.money/subgraphs/name/bean
+  #  plugins:
+  #    - "schema-ast"
   ./src/graph/schema-snapshot1.graphql:
     schema:
       - https://hub.snapshot.org/graphql

diff --git a/projects/ui/src/components/Silo/SiloAssetApyChip.tsx b/projects/ui/src/components/Silo/SiloAssetApyChip.tsx
@@ -53,14 +53,14 @@ const SiloAssetApyChip: FC<SiloAssetApyChipProps> = ({
       title={
         <Row gap={0}>
           {metric === 'bean' && (
-            <Box sx={{ px: 1, py: 0.5, maxWidth: 245 }}>
+            <Box sx={{ px: 1, py: 0.5, maxWidth: 325 }}>
               <Stack gap={0.25}>
                 <Row gap={0.5}>
                   <TokenIcon token={Bean} />
                   Total Beans per Season
                 </Row>
                 <Box display="flex">
-                  <Stack width="33%">
+                  {/* <Stack width="33%">
                     <Typography variant="h4">24H</Typography>
                     <Typography variant="h4">
                       {latestYield
@@ -81,8 +81,8 @@ const SiloAssetApyChip: FC<SiloAssetApyChipProps> = ({
                           )
                         : '0'}
                     </Typography>
-                  </Stack>
-                  <Stack width="33%">
+                        </Stack> */}
+                  <Stack width="100%">
                     <Typography variant="h4">30D</Typography>
                     <Typography variant="h4">
                       {latestYield
@@ -95,7 +95,7 @@ const SiloAssetApyChip: FC<SiloAssetApyChipProps> = ({
                   </Stack>
                 </Box>
                 <Typography variant="bodySmall" color="text.primary">
-                  24-hour/7-day/30-day exponential moving average of Beans
+                  30-day exponential moving average of Beans
                   earned by all Stalkholders per Season.
                 </Typography>
               </Stack>
@@ -142,11 +142,12 @@ const SiloAssetApyChip: FC<SiloAssetApyChipProps> = ({
           '& .MuiChip-label': {
             overflow: 'visible',
           },
+          maxWidth: '120%'
         }}
         label={
           <Typography sx={{ whiteSpace: 'nowrap' }}>
             <Row
-              gap={0.5}
+              gap={0.25}
               flexWrap="nowrap"
               justifyContent="center"
               alignItems="center"
@@ -156,7 +157,7 @@ const SiloAssetApyChip: FC<SiloAssetApyChipProps> = ({
                   <TokenIcon token={tokenProps} /> vAPY:{' '}
                 </>
               )}
-              {metric === 'bean' ? (
+              {/* metric === 'bean' ? (
                 <>
                   <Box
                     display="flex"
@@ -203,7 +204,7 @@ const SiloAssetApyChip: FC<SiloAssetApyChipProps> = ({
                     |
                   </Typography>
                 </>
-              ) : null}
+              ) : null */}
               <Box
                 display="flex"
                 justifyContent="center"

diff --git a/projects/ui/src/components/Silo/Whitelist.tsx b/projects/ui/src/components/Silo/Whitelist.tsx
@@ -129,15 +129,15 @@ const Whitelist: FC<{
                 label={
                   <Row gap={0.5}>
                     <TokenIcon token={BEAN[1]} />
-                    vAPY 24H
-                    <Typography color="white" marginTop={-0.25}>
+                    vAPY 30D
+                    {/* <Typography color="white" marginTop={-0.25}>
                       |
                     </Typography>
                     7D
                     <Typography color="white" marginTop={-0.25}>
                       |
                     </Typography>
-                    30D
+                30D */}
                   </Row>
                 }
                 onClick={undefined}

diff --git a/projects/ui/src/graph/endpoints.ts b/projects/ui/src/graph/endpoints.ts
@@ -19,7 +19,7 @@ export const SUBGRAPH_ENVIRONMENTS: Record<SGEnvironments, SGEnvironment> = {
   [SGEnvironments.BF_PROD]: {
     name: 'Beanstalk Farms / Production',
     subgraphs: {
-      beanstalk: 'https://graph.node.bean.money/subgraphs/name/beanstalk',
+      beanstalk: 'https://graph.node.bean.money/subgraphs/name/beanstalk-dev',
       bean: 'https://graph.node.bean.money/subgraphs/name/bean',
       beanft: 'https://graph.node.bean.money/subgraphs/name/beanft',
     },

diff --git a/projects/ui/src/hooks/beanstalk/useFertilizerYieldData.ts b/projects/ui/src/hooks/beanstalk/useFertilizerYieldData.ts
@@ -14,7 +14,7 @@ export default function useFertilizerYieldData() {
     previousData,
     refetch,
   } = useFertilizerYieldQuery({
-    variables: { season: season.toString() },
+    variables: { season: `${season.toString()}-720` },
     fetchPolicy: 'network-only',
     notifyOnNetworkStatusChange: true,
   });