Skip to content

Commit 8cba2d6

Browse files
committed
Update TreasuryDistribution component: rename allocation and usage labels, enhance display of mined amounts, and adjust transferred out color.
1 parent 6b4fdb5 commit 8cba2d6

File tree

1 file changed

+18
-30
lines changed

1 file changed

+18
-30
lines changed

app/server-components/Licenses/TreasuryDistribution.tsx

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ export default async function TreasuryDistribution({ license }: Props) {
7878
<div className="col gap-3">
7979
<ListHeader>
8080
<div className="min-w-[100px]">Wallet</div>
81-
<div className="min-w-[100px]">Allocation (%)</div>
82-
<div className="min-w-[220px]">Usage</div>
81+
<div className="min-w-[100px]">% of GND</div>
82+
<div className="min-w-[220px]">Mined/To be mined</div>
8383
<div className="min-w-[120px]">$R1 Balance</div>
8484
<div className="min-w-[120px]">Transferred Out</div>
8585
</ListHeader>
@@ -100,14 +100,25 @@ export default async function TreasuryDistribution({ license }: Props) {
100100

101101
<div className="min-w-[100px]">
102102
<CardItem
103-
label="Allocation"
104-
value={<div className="font-medium">{wallet.percentage}%</div>}
103+
label="% of GND"
104+
value={
105+
<div className="font-medium">
106+
<span className="text-slate-500">{wallet.percentage}%</span> (
107+
{fBI(
108+
(license.totalAssignedAmount *
109+
BigInt(Math.round(wallet.percentage * 100))) /
110+
10000n,
111+
18,
112+
)}
113+
)
114+
</div>
115+
}
105116
/>
106117
</div>
107118

108119
<div className="min-w-[220px]">
109120
<CardItem
110-
label="Usage"
121+
label="Mined/To be mined"
111122
value={
112123
<div>
113124
{fBI(
@@ -118,7 +129,7 @@ export default async function TreasuryDistribution({ license }: Props) {
118129
)}
119130
/
120131
{fBI(
121-
(license.totalAssignedAmount *
132+
((license.totalAssignedAmount - license.totalClaimedAmount) *
122133
BigInt(Math.round(wallet.percentage * 100))) /
123134
10000n,
124135
18,
@@ -142,7 +153,7 @@ export default async function TreasuryDistribution({ license }: Props) {
142153
label="Transferred Out"
143154
value={
144155
wallet.transferredOut ? (
145-
<div className="text-red-600">{fN(wallet.transferredOut)}</div>
156+
<div className="text-orange-600">{fN(wallet.transferredOut)}</div>
146157
) : (
147158
<></>
148159
)
@@ -151,29 +162,6 @@ export default async function TreasuryDistribution({ license }: Props) {
151162
</div>
152163
</div>
153164
</BorderedCard>
154-
155-
{/* <div className="text-slate-500">{wallet.name}</div>
156-
<div className="font-medium text-primary">{wallet.percentage}%</div>
157-
158-
<div className="row gap-2">
159-
<div>
160-
{fBI(
161-
(license.totalClaimedAmount * BigInt(Math.round(wallet.percentage * 100))) / 10000n,
162-
18,
163-
)}
164-
/
165-
{fBI(
166-
(license.totalAssignedAmount * BigInt(Math.round(wallet.percentage * 100))) / 10000n,
167-
18,
168-
)}
169-
</div>
170-
171-
<div className="text-slate-500">(R1 Balance: {fBI(wallet.balance, 18)})</div>
172-
173-
{!!wallet.transferredOut && (
174-
<div className="text-slate-500">(Transferred Out: {fN(wallet.transferredOut)})</div>
175-
)}
176-
</div> */}
177165
</div>
178166
))}
179167
</div>

0 commit comments

Comments
 (0)