diff --git a/packages/nextjs/components/Footer.tsx b/packages/nextjs/components/Footer.tsx index ae79488..eba4093 100644 --- a/packages/nextjs/components/Footer.tsx +++ b/packages/nextjs/components/Footer.tsx @@ -1,26 +1,26 @@ import React from "react"; -// import { formatEther } from "viem"; +import { formatEther } from "viem"; import { hardhat } from "viem/chains"; -// import { useAccount } from "wagmi"; +import { useAccount } from "wagmi"; import { HeartIcon } from "@heroicons/react/24/outline"; import { SwitchTheme } from "~~/components/SwitchTheme"; import { BuidlGuidlLogo } from "~~/components/assets/BuidlGuidlLogo"; -// import { useScaffoldContractRead } from "~~/hooks/scaffold-eth"; +import { useScaffoldContractRead } from "~~/hooks/scaffold-eth"; import { getTargetNetwork } from "~~/utils/scaffold-eth"; /** * Site footer */ export const Footer = () => { - // const account = useAccount(); + const account = useAccount(); const isLocalNetwork = getTargetNetwork().id === hardhat.id; - // const { data: userGoldBalance } = useScaffoldContractRead({ - // contractName: "GoldToken", - // functionName: "balanceOf", - // args: [account.address], - // }); + const { data: userGoldBalance } = useScaffoldContractRead({ + contractName: "GoldToken", + functionName: "balanceOf", + args: [account.address], + }); return (
@@ -29,9 +29,9 @@ export const Footer = () => {
- {/*
- Your GODL Reserves: {formatEther(userGoldBalance || 0n)} -
*/} +
+ {formatEther(userGoldBalance || 0n)} GODL +
diff --git a/packages/nextjs/components/vaults-of-fortune/Leaderboard.tsx b/packages/nextjs/components/vaults-of-fortune/Leaderboard.tsx index 70edf82..6e106f5 100644 --- a/packages/nextjs/components/vaults-of-fortune/Leaderboard.tsx +++ b/packages/nextjs/components/vaults-of-fortune/Leaderboard.tsx @@ -3,6 +3,7 @@ import { useEffect, useState } from "react"; import { formatEther } from "viem"; import { Address } from "~~/components/scaffold-eth"; import { useScaffoldContractRead, useScaffoldEventHistory, useScaffoldEventSubscriber } from "~~/hooks/scaffold-eth"; +import { formatWithCommas } from "~~/utils/formatWithCommas"; interface IPlayerScores { contestNumber: number | undefined; @@ -155,7 +156,7 @@ export const Leaderboard = () => {
- {score.totalAssets.toFixed(0)} + {formatWithCommas(score.totalAssets.toFixed(0))} ); })} diff --git a/packages/nextjs/components/vaults-of-fortune/Portfolio.tsx b/packages/nextjs/components/vaults-of-fortune/Portfolio.tsx index ee2662b..dfdd68c 100644 --- a/packages/nextjs/components/vaults-of-fortune/Portfolio.tsx +++ b/packages/nextjs/components/vaults-of-fortune/Portfolio.tsx @@ -145,7 +145,7 @@ export const Portfolio = () => { )} */}
-
{formatEther(userGoldBalance || 0n)} GODL
+ {/*
{formatEther(userGoldBalance || 0n)} GODL
*/} ) : (
diff --git a/packages/nextjs/components/vaults-of-fortune/Vaults.tsx b/packages/nextjs/components/vaults-of-fortune/Vaults.tsx index e2eb005..0b79081 100644 --- a/packages/nextjs/components/vaults-of-fortune/Vaults.tsx +++ b/packages/nextjs/components/vaults-of-fortune/Vaults.tsx @@ -3,6 +3,7 @@ import { formatEther, formatUnits, parseEther } from "viem"; import { useAccount } from "wagmi"; import { useScaffoldContractRead } from "~~/hooks/scaffold-eth"; import { IVaultManager, useVaultManager } from "~~/hooks/useVaultManager"; +import { formatWithCommas } from "~~/utils/formatWithCommas"; /** Component to render the vaults * @@ -139,13 +140,13 @@ export const Vaults = () => {

{vault.title}

-
+
{Number(vault.minimumROI) || 0}% {" "} - to {Number(vault.maximumROI) || 0}% + to {Number(vault.maximumROI) || 0}%
@@ -163,14 +164,14 @@ export const Vaults = () => { Assets - {Number(formatUnits(vault.totalAssets || 0n, 18)).toFixed(1)} - {Number(formatUnits(vault.maxWithdraw || 0n, 18)).toFixed(1)} - GLD + {formatWithCommas(Number(formatUnits(vault.totalAssets || 0n, 18)).toFixed(0))} + {formatWithCommas(Number(formatUnits(vault.maxWithdraw || 0n, 18)).toFixed(0))} + GODL Supply - {Number(formatUnits(vault.totalSupply || 0n, 18)).toFixed(1)} - {Number(formatUnits(vault.maxRedeem || 0n, 18)).toFixed(1)} + {formatWithCommas(Number(formatUnits(vault.totalSupply || 0n, 18)).toFixed(0))} + {formatWithCommas(Number(formatUnits(vault.maxRedeem || 0n, 18)).toFixed(0))} Shares diff --git a/packages/nextjs/styles/globals.css b/packages/nextjs/styles/globals.css index e733d05..74ee0f4 100644 --- a/packages/nextjs/styles/globals.css +++ b/packages/nextjs/styles/globals.css @@ -1,4 +1,5 @@ -@import url("https://fonts.googleapis.com/css2?family=Didact+Gothic"); +/* @import url("https://fonts.googleapis.com/css2?family=Didact+Gothic"); */ +@import url("https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&family=Lobster&display=swap"); @import url("https://fonts.cdnfonts.com/css/cubano"); @import "tailwindcss/base"; diff --git a/packages/nextjs/tailwind.config.js b/packages/nextjs/tailwind.config.js index cf27ca2..73c8213 100644 --- a/packages/nextjs/tailwind.config.js +++ b/packages/nextjs/tailwind.config.js @@ -72,7 +72,7 @@ module.exports = { }, theme: { fontFamily: { - sans: ["Didact Gothic", "Tahoma", "Verdana", "sans-serif"], + sans: ["Inter", "Tahoma", "Verdana", "sans-serif"], }, extend: { colors: {