Merge branch 'master' into Stader-Subgraph

messari · Jun 12, 2024 · 2e85cd1 · 2e85cd1
2 parents 47cef85 + 0153de0
commit 2e85cd1
Show file tree

Hide file tree

Showing 95 changed files with 12,689 additions and 315 deletions.
diff --git a/dashboard/src/common/DashboardVersion.tsx b/dashboard/src/common/DashboardVersion.tsx
@@ -11,7 +11,7 @@ const DashboardTag = styled("div")`
   z-index: 2;
 `;
 
-export const dashboardVersion = "v2.3.0";
+export const dashboardVersion = "v2.4.0";
 
 export const DashboardVersion = () => {
   return <DashboardTag>{dashboardVersion}</DashboardTag>;

diff --git a/dashboard/src/constants.ts b/dashboard/src/constants.ts
@@ -21,8 +21,10 @@ export namespace Versions {
   export const Schema110 = "1.1.0";
   export const Schema120 = "1.2.0";
   export const Schema130 = "1.3.0";
+  export const Schema140 = "1.4.0";
   export const Schema200 = "2.0.0";
   export const Schema201 = "2.0.1";
+  export const Schema210 = "2.1.0";
   export const Schema300 = "3.0.0";
   export const Schema301 = "3.0.1";
   export const Schema302 = "3.0.2";
@@ -45,7 +47,7 @@ export const latestSchemaVersions = (schemaType: string, versionStr: string) =>
       return true;
     }
   } else if (schema === "generic") {
-    if (["2.1.1"].includes(versionStr)) {
+    if (["3.0.0"].includes(versionStr)) {
       return true;
     }
   } else if (schema === "bridge") {
@@ -146,7 +148,7 @@ export interface Schema {
   protocolFields: { [x: string]: string };
   query: string;
   financialsQuery: string;
-  hourlyUsageQuery: string;
+  hourlyUsageQuery?: string;
   dailyUsageQuery: string;
   protocolTableQuery: string;
   poolsQuery: string;

diff --git a/dashboard/src/interfaces/ProtocolDashboard.tsx b/dashboard/src/interfaces/ProtocolDashboard.tsx
@@ -288,12 +288,18 @@ function ProtocolDashboard({ protocolJSON, getData, subgraphEndpoints, decentral
     `,
     { client },
   );
+
+  let placeholderQuery = `query MyQuery {
+    _meta {
+      deployment
+    }
+  }`;
   const [
     getHourlyUsageData,
     { data: hourlyUsageData, loading: hourlyUsageLoading, error: hourlyUsageError, refetch: hourlyUsageRefetch },
   ] = useLazyQuery(
     gql`
-      ${hourlyUsageQuery}
+      ${hourlyUsageQuery ? hourlyUsageQuery : placeholderQuery}
     `,
     { client },
   );
@@ -324,7 +330,7 @@ function ProtocolDashboard({ protocolJSON, getData, subgraphEndpoints, decentral
   );
   const [getOverlayHourlyUsageData, { data: overlayHourlyUsageData }] = useLazyQuery(
     gql`
-      ${overlayHourlyUsageQuery}
+      ${overlayHourlyUsageQuery ? overlayHourlyUsageQuery : placeholderQuery}
     `,
     { client: overlayDeploymentClient },
   );

diff --git a/dashboard/src/queries/generic/poolOverview.ts b/dashboard/src/queries/generic/poolOverview.ts
@@ -6,16 +6,18 @@ export const schema = (version: string): string => {
   versionGroupArr.pop();
   const versionGroup = versionGroupArr.join(".") + ".0";
   switch (versionGroup) {
-    case Versions.Schema120:
-      return schema120();
-    case Versions.Schema130:
-      return schema130();
+    case Versions.Schema140:
+      return schema140();
+    case Versions.Schema210:
+      return schema210();
+    case Versions.Schema300:
+      return schema300();
     default:
-      return schema130();
+      return schema300();
   }
 };
 
-export const schema120 = (): string => {
+export const schema140 = (): string => {
   return `
     query Data($skipAmt: Int!) {
     pools(first: 10, skip: $skipAmt, orderBy:totalValueLockedUSD, orderDirection: desc) {
@@ -30,17 +32,30 @@ export const schema120 = (): string => {
     }`;
 };
 
-export const schema130 = (): string => {
+export const schema210 = (): string => {
   return `
     query Data($skipAmt: Int!) {
       pools(first: 10, skip: $skipAmt, orderBy:totalValueLockedUSD, orderDirection: desc) {
         id
         name
-        
+        symbol
         totalValueLockedUSD
         outputTokenSupply
         stakedOutputTokenAmount
         rewardTokenEmissionsUSD
       }
     }`;
 };
+
+export const schema300 = (): string => {
+  return `
+    query Data($skipAmt: Int!) {
+      pools(first: 10, skip: $skipAmt, orderBy:totalValueLockedUSD, orderDirection: desc) {
+        id
+        name
+        symbol
+        totalValueLockedUSD
+        outputTokenSupply
+      }
+    }`;
+};