Merge branch 'main' into 902-traefik-image-upgrade

Author: aquarat

components/TokenSupply.tsx

@@ -9,7 +9,7 @@ export const TokenSupply = (props: ISupply) => {
   const classCell =
     "text-sm text-center py-4 lg:min-h-96px border-t border-solid border-color-cell-border";
   return (
-    <div className="md:grid grid-cols-4 mx-auto">
+    <div className="md:grid grid-cols-3 mx-auto">
       <div className={classCell}>
         <h3 className={classTitle}>Locked by governance</h3>
         <strong>
@@ -24,10 +24,6 @@ export const TokenSupply = (props: ISupply) => {
         <h3 className={classTitle}>Locked rewards</h3>
         <strong>{noDecimals(toCurrency(props.lockedRewards))} tokens</strong>
       </div>
-      <div className={classCell}>
-        <h3 className={classTitle}>Time locked</h3>
-        <strong>{noDecimals(toCurrency(props.timeLocked))} tokens</strong>
-      </div>
     </div>
   );
 };

services/supply.ts

@@ -95,10 +95,8 @@ export const Supply = {
       18,
     );
     console.log("Locked Rewards", lockedRewards);
-    const timeLocked = withDecimals(
-      (await supplyContract.getTimelocked()).toString(),
-      18,
-    );
+    // There are no longer any time-locked tokens
+    const timeLocked = withDecimals("0", 18);
     console.log("Time locked", timeLocked);
 
     await prisma.api3Supply.create({