Skip to content

[#349] Replace hardcoded $PLOT with RESERVE_LABEL constant #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
realproject7 merged 1 commit into from
Mar 19, 2026
Merged

[#349] Replace hardcoded $PLOT with RESERVE_LABEL constant #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/components/ClaimRoyalties.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useQuery } from "@tanstack/react-query";
import { formatUnits, type Address } from "viem";
import { publicClient } from "../../lib/rpc";
import { mcv2BondAbi, getTokenTVL } from "../../lib/price";
import { MCV2_BOND, IS_TESTNET, EXPLORER_URL, PLOT_TOKEN } from "../../lib/contracts/constants";
import { MCV2_BOND, RESERVE_LABEL, EXPLORER_URL, PLOT_TOKEN } from "../../lib/contracts/constants";

function formatTruncated(value: bigint, decimals: number, digits = 10): string {
const raw = formatUnits(value, decimals);
Expand All @@ -33,8 +33,6 @@ export function ClaimRoyalties({ tokenAddress, plotCount, beneficiary }: ClaimRo

const { writeContractAsync } = useWriteContract();

const reserveLabel = IS_TESTNET ? "WETH" : "$PLOT";

// Fetch unclaimed royalty balance + cumulative claimed
const { data: royaltyInfo } = useQuery({
queryKey: ["royalty-info", tokenAddress, beneficiary],
Expand Down Expand Up @@ -139,18 +137,18 @@ export function ClaimRoyalties({ tokenAddress, plotCount, beneficiary }: ClaimRo
Chain at least 2 plots ({plotCount}/2) {eligible && "\u2713"}
</li>
<li>
Royalties accrue when readers trade your token ({formatTruncated(unclaimed, decimals)} {reserveLabel} unclaimed)
Royalties accrue when readers trade your token ({formatTruncated(unclaimed, decimals)} {RESERVE_LABEL} unclaimed)
</li>
</ul>
</div>
)}
</div>
<span className={`ml-1 font-medium ${unclaimed > BigInt(0) ? "text-accent" : "text-foreground"}`}>
{formatTruncated(unclaimed, decimals)} {reserveLabel}
{formatTruncated(unclaimed, decimals)} {RESERVE_LABEL}
</span>
{totalClaimed > BigInt(0) && (
<span className="text-muted ml-1 text-[10px]">
(claimed: {formatTruncated(totalClaimed, decimals)} {reserveLabel} so far)
(claimed: {formatTruncated(totalClaimed, decimals)} {RESERVE_LABEL} so far)
</span>
)}
<button
Expand Down Expand Up @@ -182,7 +180,7 @@ export function ClaimRoyalties({ tokenAddress, plotCount, beneficiary }: ClaimRo
)}
{txHash && txState === "done" && (
<p className="text-muted mt-1 text-[10px]">
Claimed {formatTruncated(claimedAmount, decimals)} {reserveLabel} —{" "}
Claimed {formatTruncated(claimedAmount, decimals)} {RESERVE_LABEL} —{" "}
tx:{" "}
<a
href={`${EXPLORER_URL}/tx/${txHash}`}
Expand Down
11 changes: 5 additions & 6 deletions src/components/DonateWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { parseUnits, formatUnits } from "viem";
import { publicClient } from "../../lib/rpc";
import { erc20Abi } from "../../lib/price";
import { storyFactoryAbi } from "../../lib/contracts/abi";
import { STORY_FACTORY, PLOT_TOKEN, IS_TESTNET, EXPLORER_URL } from "../../lib/contracts/constants";
import { STORY_FACTORY, PLOT_TOKEN, RESERVE_LABEL, EXPLORER_URL } from "../../lib/contracts/constants";
import { FarcasterAvatar } from "./FarcasterAvatar";

type TxState = "idle" | "approving" | "confirming" | "pending" | "indexing" | "done" | "error";
Expand All @@ -26,7 +26,6 @@ export function DonateWidget({ storylineId, writerAddress }: DonateWidgetProps)

const { writeContractAsync } = useWriteContract();

const reserveLabel = IS_TESTNET ? "WETH" : "$PLOT";
const parsedAmount =
amount && !isNaN(Number(amount)) && Number(amount) > 0
? parseUnits(amount, 18)
Expand Down Expand Up @@ -123,12 +122,12 @@ export function DonateWidget({ storylineId, writerAddress }: DonateWidgetProps)
<section className="border-border mt-8 rounded border px-4 py-4">
<h2 className="text-foreground text-sm font-medium">Donate to Writer</h2>
<p className="text-muted mt-1 text-[10px]">
Tip the author directly with {reserveLabel}
Tip the author directly with {RESERVE_LABEL}
</p>

<div className="mt-3">
<label className="text-muted block text-[10px] uppercase tracking-wider">
Amount ({reserveLabel})
Amount ({RESERVE_LABEL})
</label>
<div className="relative mt-1">
<input
Expand All @@ -155,7 +154,7 @@ export function DonateWidget({ storylineId, writerAddress }: DonateWidgetProps)
</div>
{balance !== undefined && (
<p className="text-muted mt-1 text-[10px]">
Balance: {formatUnits(balance, 18)} {reserveLabel}
Balance: {formatUnits(balance, 18)} {RESERVE_LABEL}
</p>
)}
{insufficientBalance && (
Expand All @@ -167,7 +166,7 @@ export function DonateWidget({ storylineId, writerAddress }: DonateWidgetProps)
<p className="text-muted mt-2 text-xs">
Donating{" "}
<span className="text-foreground">
{formatUnits(parsedAmount, 18)} {reserveLabel}
{formatUnits(parsedAmount, 18)} {RESERVE_LABEL}
</span>{" "}
to {writerAddress ? <FarcasterAvatar address={writerAddress} size={12} linkProfile={false} /> : `story #${storylineId}`}
</p>
Expand Down
9 changes: 4 additions & 5 deletions src/components/PriceChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { useQuery } from "@tanstack/react-query";
import { type Address, formatUnits } from "viem";
import { supabase } from "../../lib/supabase";
import { IS_TESTNET } from "../../lib/contracts/constants";
import { RESERVE_LABEL } from "../../lib/contracts/constants";

const CHART_W = 320;
const CHART_H = 140;
Expand Down Expand Up @@ -36,7 +36,6 @@ function formatPrice(v: number): string {
}

export function PriceChart({ tokenAddress, currentPriceRaw }: PriceChartProps) {
const reserveLabel = IS_TESTNET ? "WETH" : "$PLOT";
const currentPrice = Number(formatUnits(currentPriceRaw, 18));

const { data: tradePoints } = useQuery({
Expand Down Expand Up @@ -81,7 +80,7 @@ export function PriceChart({ tokenAddress, currentPriceRaw }: PriceChartProps) {
<p className="text-muted mt-2 text-[10px]">No trading activity yet</p>
{currentPrice > 0 && (
<p className="text-accent mt-1 text-xs font-medium">
{formatPrice(currentPrice)} {reserveLabel}
{formatPrice(currentPrice)} {RESERVE_LABEL}
</p>
)}
</div>
Expand Down Expand Up @@ -202,9 +201,9 @@ export function PriceChart({ tokenAddress, currentPriceRaw }: PriceChartProps) {
<circle cx={lastX} cy={lastY} r={3} fill="var(--accent)" />
</svg>
<p className="text-muted mt-1 text-[10px]">
Price per token ({reserveLabel})
Price per token ({RESERVE_LABEL})
<span className="text-accent-dim">
{" "}&middot; latest: {formatPrice(points[lastIdx].price)} {reserveLabel}
{" "}&middot; latest: {formatPrice(points[lastIdx].price)} {RESERVE_LABEL}
</span>
</p>
</section>
Expand Down
8 changes: 3 additions & 5 deletions src/components/ReaderPortfolio.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useQuery } from "@tanstack/react-query";
import { formatUnits, type Address } from "viem";
import { publicClient } from "../../lib/rpc";
import { erc20Abi, mcv2BondAbi, get24hPriceChange, getTokenTVL } from "../../lib/price";
import { MCV2_BOND, IS_TESTNET, STORY_FACTORY } from "../../lib/contracts/constants";
import { MCV2_BOND, RESERVE_LABEL, STORY_FACTORY } from "../../lib/contracts/constants";
import { supabase, type Storyline } from "../../lib/supabase";
import Link from "next/link";

Expand All @@ -20,8 +20,6 @@ interface Holding {

export function ReaderPortfolio() {
const { address, isConnected } = useAccount();
const reserveLabel = IS_TESTNET ? "WETH" : "$PLOT";

const { data: holdings, isLoading } = useQuery({
queryKey: ["reader-portfolio", address],
queryFn: async (): Promise<Holding[]> => {
Expand Down Expand Up @@ -127,7 +125,7 @@ export function ReaderPortfolio() {
Total Value
</span>
<span className="text-accent text-sm font-medium">
{formatUnits(totalValue, reserveDecimals)} {reserveLabel}
{formatUnits(totalValue, reserveDecimals)} {RESERVE_LABEL}
</span>
</div>
{bestPick && bestPick.priceChange !== null && (
Expand Down Expand Up @@ -166,7 +164,7 @@ export function ReaderPortfolio() {
</div>
<div className="text-right">
<div className="text-foreground">
{formatUnits(h.value, h.reserveDecimals)} {reserveLabel}
{formatUnits(h.value, h.reserveDecimals)} {RESERVE_LABEL}
</div>
{h.priceChange !== null && (
<div
Expand Down
10 changes: 4 additions & 6 deletions src/components/StoryCardStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
import { useQuery } from "@tanstack/react-query";
import { type Address } from "viem";
import { getTokenTVL, getTokenPrice } from "../../lib/price";
import { IS_TESTNET } from "../../lib/contracts/constants";

const reserveLabel = IS_TESTNET ? "WETH" : "$PLOT";
import { RESERVE_LABEL } from "../../lib/contracts/constants";

function formatCompact(value: string): string {
const num = parseFloat(value);
Expand Down Expand Up @@ -41,8 +39,8 @@ export function StoryCardStats({ tokenAddress }: { tokenAddress: string }) {

return (
<div className="text-muted flex flex-wrap gap-x-3 gap-y-0.5 text-[10px]">
<span>Price: <span className="text-foreground">{price} {reserveLabel}</span></span>
<span>TVL: <span className="text-foreground">{tvl} {reserveLabel}</span></span>
<span>Price: <span className="text-foreground">{price} {RESERVE_LABEL}</span></span>
<span>TVL: <span className="text-foreground">{tvl} {RESERVE_LABEL}</span></span>
</div>
);
}
Expand All @@ -60,6 +58,6 @@ export function StoryCardTVL({ tokenAddress }: { tokenAddress: string }) {
const tvl = tvlData ? formatCompact(tvlData.tvl) : "—";

return (
<span>TVL: <span className="text-foreground">{tvl} {reserveLabel}</span></span>
<span>TVL: <span className="text-foreground">{tvl} {RESERVE_LABEL}</span></span>
);
}
7 changes: 3 additions & 4 deletions src/components/TradingWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useQuery } from "@tanstack/react-query";
import { parseUnits, formatUnits, type Address } from "viem";
import { publicClient } from "../../lib/rpc";
import { mcv2BondAbi, erc20Abi } from "../../lib/price";
import { MCV2_BOND, PLOT_TOKEN, IS_TESTNET, EXPLORER_URL } from "../../lib/contracts/constants";
import { MCV2_BOND, PLOT_TOKEN, RESERVE_LABEL, EXPLORER_URL } from "../../lib/contracts/constants";

type Tab = "buy" | "sell";
type TxState = "idle" | "approving" | "confirming" | "pending" | "done" | "error";
Expand All @@ -32,7 +32,6 @@ export function TradingWidget({ tokenAddress }: { tokenAddress: Address }) {

const { writeContractAsync } = useWriteContract();

const reserveLabel = IS_TESTNET ? "WETH" : "$PLOT";
const parsedAmount =
amount && !isNaN(Number(amount)) && Number(amount) > 0
? parseUnits(amount, 18)
Expand Down Expand Up @@ -242,7 +241,7 @@ export function TradingWidget({ tokenAddress }: { tokenAddress: Address }) {
</div>
{balance !== undefined && (
<p className="text-muted mt-1 text-[10px]">
Balance: {formatUnits(balance, 18)} {tab === "buy" ? reserveLabel : "tokens"}
Balance: {formatUnits(balance, 18)} {tab === "buy" ? RESERVE_LABEL : "tokens"}
</p>
)}
{insufficientBalance && (
Expand All @@ -255,7 +254,7 @@ export function TradingWidget({ tokenAddress }: { tokenAddress: Address }) {
<div className="text-muted mt-2 text-xs">
{tab === "buy" ? "Estimated cost" : "Estimated return"}:{" "}
<span className="text-foreground">
{formatUnits(estimate, 18)} {reserveLabel}
{formatUnits(estimate, 18)} {RESERVE_LABEL}
</span>
<span className="ml-2">(3% slippage tolerance)</span>
</div>
Expand Down
8 changes: 3 additions & 5 deletions src/components/WriterTradingStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useQuery } from "@tanstack/react-query";
import { formatUnits, type Address } from "viem";
import { publicClient } from "../../lib/rpc";
import { mcv2BondAbi, getTokenTVL } from "../../lib/price";
import { MCV2_BOND, IS_TESTNET } from "../../lib/contracts/constants";
import { MCV2_BOND, RESERVE_LABEL } from "../../lib/contracts/constants";
import type { Storyline } from "../../lib/supabase";

interface WriterTradingStatsProps {
Expand All @@ -13,8 +13,6 @@ interface WriterTradingStatsProps {

export function WriterTradingStats({ storyline }: WriterTradingStatsProps) {
const tokenAddress = storyline.token_address as Address;
const reserveLabel = IS_TESTNET ? "WETH" : "$PLOT";

// Fetch token price
const { data: price } = useQuery({
queryKey: ["writer-price", tokenAddress],
Expand Down Expand Up @@ -46,15 +44,15 @@ export function WriterTradingStats({ storyline }: WriterTradingStatsProps) {
Token Price
</span>
<span className="text-foreground">
{price !== undefined && decimals !== undefined ? `${formatUnits(BigInt(price), decimals)} ${reserveLabel}` : "—"}
{price !== undefined && decimals !== undefined ? `${formatUnits(BigInt(price), decimals)} ${RESERVE_LABEL}` : "—"}
</span>
</div>
<div>
<span className="block text-[10px] uppercase tracking-wider">
TVL
</span>
<span className="text-foreground">
{tvlData ? `${tvlData.tvl} ${reserveLabel}` : "—"}
{tvlData ? `${tvlData.tvl} ${RESERVE_LABEL}` : "—"}
</span>
</div>
</div>
Expand Down
Loading