From 046762d0c886e119cd6c09cefb6ea1467e0f8ebe Mon Sep 17 00:00:00 2001 From: Sara Date: Mon, 21 Oct 2024 16:14:09 -0700 Subject: [PATCH 1/3] Reduce font size of post-decimal text in distribution amount --- src/app/core/components/Icons/Logo.tsx | 33 +++++++++++-------- src/app/core/components/Icons/TokenIcons.tsx | 4 +-- .../components/DistributionOverview.tsx | 12 ++++--- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/app/core/components/Icons/Logo.tsx b/src/app/core/components/Icons/Logo.tsx index 291959d..2c9eff8 100644 --- a/src/app/core/components/Icons/Logo.tsx +++ b/src/app/core/components/Icons/Logo.tsx @@ -1,23 +1,30 @@ -export function LogoSVG() { +export function LogoSVG({ size = "regular" }: { size?: "small" | "regular" }) { return ( - + - - + + diff --git a/src/app/core/components/Icons/TokenIcons.tsx b/src/app/core/components/Icons/TokenIcons.tsx index 4ca20d1..5f5ba19 100644 --- a/src/app/core/components/Icons/TokenIcons.tsx +++ b/src/app/core/components/Icons/TokenIcons.tsx @@ -32,8 +32,8 @@ export function BreadIcon({ size === "small" ? "size-4" : "size-6" )} > -
- +
+
); diff --git a/src/app/governance/components/DistributionOverview.tsx b/src/app/governance/components/DistributionOverview.tsx index c9c05f0..14d5b59 100644 --- a/src/app/governance/components/DistributionOverview.tsx +++ b/src/app/governance/components/DistributionOverview.tsx @@ -104,11 +104,13 @@ export function DistributionOverview({

Amount to Distribute

-
+
{claimableYield ? ( -
-
- +
+
+
+ +
{ formatBalance(claimableYield + yieldIncrement, 4).split( @@ -118,7 +120,7 @@ export function DistributionOverview({
.
-
+
{ formatBalance(claimableYield + yieldIncrement, 4).split( "." From 036310fad754a8206506d00c3796c4f65a12456d Mon Sep 17 00:00:00 2001 From: Sara Date: Fri, 25 Oct 2024 11:14:50 -0700 Subject: [PATCH 2/3] Add DAI APY to Distribution Card --- .../governance/components/DistributionOverview.tsx | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/app/governance/components/DistributionOverview.tsx b/src/app/governance/components/DistributionOverview.tsx index 14d5b59..cf73bad 100644 --- a/src/app/governance/components/DistributionOverview.tsx +++ b/src/app/governance/components/DistributionOverview.tsx @@ -26,6 +26,7 @@ export function DistributionOverview({ }) { const { claimableYield } = useClaimableYield(); const { chain: activeChain } = useNetwork(); + const [dsrAPY, setDsrAPY] = useState(""); const config = activeChain ? getConfig(activeChain.id) : getConfig("DEFAULT"); const [yieldIncrement, setYieldIncrement] = useState(0); @@ -63,6 +64,8 @@ export function DistributionOverview({ const yieldPerDay = (totalSupply * dsr) / 365; const yieldPerHour = yieldPerDay / 24; + setDsrAPY((dsr * 100).toFixed(2)); + return yieldPerHour; } return null; @@ -148,7 +151,16 @@ export function DistributionOverview({
- +
+

+ DAI savings rate (APY) +

+
+ + {dsrAPY + "%"} + +
+

Voting cycle # From 7c6c806f34b4b59d6128341e6fcab0d4eb009b1b Mon Sep 17 00:00:00 2001 From: Sara Date: Fri, 1 Nov 2024 10:50:26 -0700 Subject: [PATCH 3/3] fix bread logo sizing --- src/app/core/components/Icons/Bread.tsx | 32 ++++++++++++++++++++ src/app/core/components/Icons/Logo.tsx | 31 ++++++++----------- src/app/core/components/Icons/TokenIcons.tsx | 4 +-- 3 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 src/app/core/components/Icons/Bread.tsx diff --git a/src/app/core/components/Icons/Bread.tsx b/src/app/core/components/Icons/Bread.tsx new file mode 100644 index 0000000..ab0be6f --- /dev/null +++ b/src/app/core/components/Icons/Bread.tsx @@ -0,0 +1,32 @@ +export function BreadSVG({ size = "regular" }: { size?: "small" | "regular" }) { + return ( + + + + + + + + + + ); +} diff --git a/src/app/core/components/Icons/Logo.tsx b/src/app/core/components/Icons/Logo.tsx index 2c9eff8..bddbff1 100644 --- a/src/app/core/components/Icons/Logo.tsx +++ b/src/app/core/components/Icons/Logo.tsx @@ -1,30 +1,23 @@ export function LogoSVG({ size = "regular" }: { size?: "small" | "regular" }) { return ( - + - - + + diff --git a/src/app/core/components/Icons/TokenIcons.tsx b/src/app/core/components/Icons/TokenIcons.tsx index 5f5ba19..904145e 100644 --- a/src/app/core/components/Icons/TokenIcons.tsx +++ b/src/app/core/components/Icons/TokenIcons.tsx @@ -1,5 +1,5 @@ import Image from "next/image"; -import { LogoSVG } from "./Logo"; +import { BreadSVG } from "./Bread"; import clsx from "clsx"; export function XDAIIcon() { @@ -33,7 +33,7 @@ export function BreadIcon({ )} >

- +
);