From 3766415b075779175b8df8c644b083aa6641874a Mon Sep 17 00:00:00 2001 From: robhyrk Date: Tue, 11 Nov 2025 19:36:01 -0500 Subject: [PATCH 1/4] minor style changes, fix min amount summary --- components/account/AccountButton.tsx | 10 ----- components/create/editor/ComboEditor.tsx | 4 +- components/create/editor/CostCalculator.tsx | 37 ++++++++++++++----- components/create/editor/ProgressBar.tsx | 2 +- components/create/editor/Publishing.tsx | 32 ++++++++++++---- .../create/editor/inputs/LiquiditySimple.tsx | 4 +- .../create/editor/inputs/LiquidityUnified.tsx | 4 +- .../liquidity/MarketLiquiditySection.tsx | 2 +- components/markets/MarketHistoryModal.tsx | 2 +- components/markets/MarketTimer.tsx | 6 +-- components/markets/ScalarPriceRange.tsx | 2 +- .../markets/market-card/MarketOrComboCard.tsx | 8 ++-- components/markets/market-card/index.tsx | 11 ++++-- .../markets/market-filter/ClearAllButton.tsx | 2 +- .../markets/market-filter/DropDownSelect.tsx | 2 +- .../market-filter/MarketActiveFilters.tsx | 2 +- .../market-filter/MarketFiltersDropdowns.tsx | 4 ++ .../market-filter/MarketFiltersSort.tsx | 2 +- .../market-filter/MarketTypeToggle.tsx | 2 +- components/markets/market-filter/index.tsx | 20 ++++++---- .../mobile-dialog/FilterDetails.tsx | 2 +- components/portfolio/MarketPositionHeader.tsx | 6 +-- components/portfolio/PortfolioHeader.tsx | 2 +- components/top-bar/index.tsx | 32 +++++++--------- components/ui/QuickNav.tsx | 22 +++++++---- components/ui/TimeFilters.tsx | 2 +- components/ui/TransactionButton.tsx | 4 +- lib/constants/foreign-asset.ts | 28 -------------- lib/constants/market-filter.ts | 4 -- lib/constants/supported-currencies.ts | 8 ---- .../market-creation/constants/currency.ts | 2 - pages/referendum-signal/widget/[refId].tsx | 4 +- 32 files changed, 133 insertions(+), 141 deletions(-) diff --git a/components/account/AccountButton.tsx b/components/account/AccountButton.tsx index 4c5504ff5..42aee1cd8 100644 --- a/components/account/AccountButton.tsx +++ b/components/account/AccountButton.tsx @@ -326,13 +326,6 @@ const AccountMenuContent: FC = ({ balance={usdcAssetHubBalance} className="text-[10px] md:text-xs" /> - {/* DISABLED: USDC.wh temporarily disabled */} - {/* */} { href={`/multi-market/${duplicatePool.poolId}`} target="_blank" rel="noopener noreferrer" - className="font-semibold text-ztg-green-400 underline transition-colors hover:text-ztg-green-300" + className="font-semibold text-ztg-green-400 underline transition-colors hover:text-ztg-green-400" > Combo Pool #{duplicatePool.poolId} @@ -941,7 +941,7 @@ const ComboMarketEditor: React.FC = () => { href={`/multi-market/${duplicatePool.poolId}`} target="_blank" rel="noopener noreferrer" - className="font-semibold text-ztg-green-400 underline transition-colors hover:text-ztg-green-300" + className="font-semibold text-ztg-green-400 underline transition-colors hover:text-ztg-green-400" > Combo Pool #{duplicatePool.poolId} diff --git a/components/create/editor/CostCalculator.tsx b/components/create/editor/CostCalculator.tsx index 822e9820b..4e56fc4a3 100644 --- a/components/create/editor/CostCalculator.tsx +++ b/components/create/editor/CostCalculator.tsx @@ -23,6 +23,7 @@ import { timelineAsBlocks } from "lib/state/market-creation/types/timeline"; import { shortenAddress } from "lib/util"; import momentTz from "moment-timezone"; import dynamic from "next/dynamic"; +import { minBaseLiquidity } from "lib/state/market-creation/constants/currency"; const QuillViewer = dynamic(() => import("components/ui/QuillViewer"), { ssr: false, @@ -100,15 +101,30 @@ export const CostCalculator = ({ ? feeDetails?.amount : new Decimal(0); + // Calculate liquidity cost: use minimum if deploying permissionless market with ZTG + // and amount is below minimum or empty + const liquidityAmount = useMemo(() => { + if ( + editor.form.moderation === "Permissionless" && + editor.form.liquidity?.deploy && + editor.form.currency === "ZTG" + ) { + const enteredAmount = new Decimal(editor.form.liquidity.amount || 0).toNumber(); + const minimum = minBaseLiquidity[editor.form.currency] ?? 0; + // Use minimum if amount is 0, empty, or below minimum + return Math.max(enteredAmount, minimum); + } + return 0; + }, [ + editor.form.moderation, + editor.form.liquidity?.deploy, + editor.form.liquidity?.amount, + editor.form.currency, + ]); + const ztgCost = new Decimal(bondCost ?? 0) .plus(oracleBond ?? 0) - .plus( - editor.form.moderation === "Permissionless" && - editor.form.liquidity?.deploy && - editor.form.currency === "ZTG" - ? new Decimal(editor.form.liquidity.amount || 0).toNumber() - : 0, - ) + .plus(liquidityAmount) .plus(ztgTransactionFee ?? 0); const baseAssetTransactionFee = assetsAreEqual( @@ -218,6 +234,7 @@ export const CostCalculator = ({ oracleBond={oracleBond} feeDetails={feeDetails} ztgCost={ztgCost} + liquidityAmount={liquidityAmount} foreignCurrencyCost={foreignCurrencyCost} foreignCurrencyCostUsd={foreignCurrencyCostUsd} baseCurrency={baseCurrency} @@ -295,7 +312,7 @@ export const CostCalculator = ({ editor.form.currency === "ZTG" && ( )} @@ -362,6 +379,7 @@ const CostDetailsModal = ({ oracleBond, feeDetails, ztgCost, + liquidityAmount, foreignCurrencyCost, foreignCurrencyCostUsd, baseCurrency, @@ -378,6 +396,7 @@ const CostDetailsModal = ({ oracleBond?: number; feeDetails?: any; ztgCost: Decimal; + liquidityAmount: number; foreignCurrencyCost: Decimal | null; foreignCurrencyCostUsd: Decimal | null; baseCurrency: any; @@ -675,7 +694,7 @@ const CostDetailsModal = ({ editor.form.liquidity?.deploy && ( )} diff --git a/components/create/editor/ProgressBar.tsx b/components/create/editor/ProgressBar.tsx index da7fd0e6c..62b8b2723 100644 --- a/components/create/editor/ProgressBar.tsx +++ b/components/create/editor/ProgressBar.tsx @@ -18,7 +18,7 @@ export const ProgressBar = >({
diff --git a/components/create/editor/Publishing.tsx b/components/create/editor/Publishing.tsx index 1e64ddb93..16609b16f 100644 --- a/components/create/editor/Publishing.tsx +++ b/components/create/editor/Publishing.tsx @@ -31,10 +31,11 @@ import { assetsAreEqual } from "lib/util/assets-are-equal"; import { formatNumberCompact } from "lib/util/format-compact"; import { isArray } from "lodash-es"; import { useRouter } from "next/router"; -import { useState } from "react"; +import { useState, useMemo } from "react"; import { LuFileWarning } from "react-icons/lu"; import { RiSendPlaneLine } from "react-icons/ri"; import { GraphQLClient } from "graphql-request"; +import { minBaseLiquidity } from "lib/state/market-creation/constants/currency"; export type PublishingProps = { editor: MarketDraftEditor; @@ -106,15 +107,30 @@ export const Publishing = ({ ? feeDetails?.amount : new Decimal(0); + // Calculate liquidity cost: use minimum if deploying permissionless market with ZTG + // and amount is below minimum or empty + const liquidityAmount = useMemo(() => { + if ( + editor.form.moderation === "Permissionless" && + editor.form.liquidity?.deploy && + editor.form.currency === "ZTG" + ) { + const enteredAmount = new Decimal(editor.form.liquidity.amount || 0).toNumber(); + const minimum = minBaseLiquidity[editor.form.currency] ?? 0; + // Use minimum if amount is 0, empty, or below minimum + return Math.max(enteredAmount, minimum); + } + return 0; + }, [ + editor.form.moderation, + editor.form.liquidity?.deploy, + editor.form.liquidity?.amount, + editor.form.currency, + ]); + const ztgCost = new Decimal(bondCost ?? 0) .plus(oracleBond ?? 0) - .plus( - editor.form.moderation === "Permissionless" && - editor.form.liquidity?.deploy && - editor.form.currency === "ZTG" - ? new Decimal(editor.form.liquidity.amount || 0).toNumber() - : 0, - ) + .plus(liquidityAmount) .plus(ztgTransactionFee ?? 0); const baseCurrencyMetadata = diff --git a/components/create/editor/inputs/LiquiditySimple.tsx b/components/create/editor/inputs/LiquiditySimple.tsx index ac573cbc9..bd7875dff 100644 --- a/components/create/editor/inputs/LiquiditySimple.tsx +++ b/components/create/editor/inputs/LiquiditySimple.tsx @@ -26,9 +26,7 @@ export const LiquiditySimple = ({ const { data: rawAssetPrice } = useAssetUsdPrice(currencyMetadata?.assetId); // Hardcode stablecoins to $1 USD - // DISABLED: USDC.wh temporarily disabled - // const isStablecoin = currency === "USDC.wh"; - const isStablecoin = false; // currency === "USDC.wh"; + const isStablecoin = false; const baseAssetPrice = isStablecoin ? new Decimal(1) : rawAssetPrice diff --git a/components/create/editor/inputs/LiquidityUnified.tsx b/components/create/editor/inputs/LiquidityUnified.tsx index deaeae5a2..dcb73ea6f 100644 --- a/components/create/editor/inputs/LiquidityUnified.tsx +++ b/components/create/editor/inputs/LiquidityUnified.tsx @@ -41,9 +41,7 @@ export const LiquidityUnified = ({ const { data: rawAssetPrice } = useAssetUsdPrice(currencyMetadata?.assetId); // Hardcode stablecoins to $1 USD - // DISABLED: USDC.wh temporarily disabled - // const isStablecoin = currency === "USDC.wh"; - const isStablecoin = false; // currency === "USDC.wh"; + const isStablecoin = false; const baseAssetPrice = isStablecoin ? new Decimal(1) : rawAssetPrice; const numOutcomes = diff --git a/components/liquidity/MarketLiquiditySection.tsx b/components/liquidity/MarketLiquiditySection.tsx index 9aa240454..7530181a7 100644 --- a/components/liquidity/MarketLiquiditySection.tsx +++ b/components/liquidity/MarketLiquiditySection.tsx @@ -182,7 +182,7 @@ const LiquidityHeader = ({ diff --git a/components/markets/MarketHistoryModal.tsx b/components/markets/MarketHistoryModal.tsx index 112825d07..b59cbc55d 100644 --- a/components/markets/MarketHistoryModal.tsx +++ b/components/markets/MarketHistoryModal.tsx @@ -236,7 +236,7 @@ export const MarketHistoryModal: FC = ({
-
+
Resolved
diff --git a/components/markets/MarketTimer.tsx b/components/markets/MarketTimer.tsx index 64f465b0a..d7c106845 100644 --- a/components/markets/MarketTimer.tsx +++ b/components/markets/MarketTimer.tsx @@ -103,17 +103,17 @@ const copy: Record< Trading: { title: "Live", description: "Trading", - color: "bg-gradient-to-r from-ztg-green-500/80 to-ztg-green-600/80", + color: "bg-gradient-to-r from-ztg-primary-300/85 to-ztg-primary-200/95", }, GracePeriod: { title: "Grace Period", description: "Pre-reporting", - color: "bg-gradient-to-r from-ztg-green-500/80 to-ztg-green-600/80", + color: "bg-gradient-to-r from-ztg-primary-300/85 to-ztg-primary-200/95", }, OracleReportingPeriod: { title: "Ended", description: "Oracle pending", - color: "bg-gradient-to-r from-ztg-green-500/80 to-ztg-green-600/80", + color: "bg-gradient-to-r from-ztg-primary-300/85 to-ztg-primary-200/95", }, OpenReportingPeriod: { title: "Oracle Failed", diff --git a/components/markets/ScalarPriceRange.tsx b/components/markets/ScalarPriceRange.tsx index 7292d3665..9c12d1d62 100644 --- a/components/markets/ScalarPriceRange.tsx +++ b/components/markets/ScalarPriceRange.tsx @@ -74,7 +74,7 @@ const ScalarPriceRange = ({ style={{ width: `${averagePosition != null ? averagePosition : 0}px`, }} - className="absolute bottom-0 left-0 h-full bg-gradient-to-r from-ztg-green-500/60 to-ztg-green-400/70 transition-all" + className="absolute bottom-0 left-0 h-full bg-gradient-to-r from-ztg-primary-300/80 to-ztg-primary-200/90 transition-all" >
Prediction: {positionDisplay} diff --git a/components/markets/market-card/MarketOrComboCard.tsx b/components/markets/market-card/MarketOrComboCard.tsx index 76877e341..a53db7850 100644 --- a/components/markets/market-card/MarketOrComboCard.tsx +++ b/components/markets/market-card/MarketOrComboCard.tsx @@ -56,7 +56,7 @@ const ComboMarketRow = ({ > {roleLabel} - + {market.question}
@@ -100,7 +100,7 @@ const ComboMarketRowInline = ({ > {roleLabel} - + {market.question}
@@ -196,7 +196,7 @@ const ComboPoolCard = ({
-
+
{cmsMetadata?.question ?? question}
@@ -208,7 +208,7 @@ const MarketCardPredictionBar = ({
- {liquidity != undefined && baseAsset ? ( + {liquidity != undefined && + baseAsset && + liquidity !== "" && + !isNaN(Number(liquidity)) ? (
diff --git a/components/markets/market-filter/ClearAllButton.tsx b/components/markets/market-filter/ClearAllButton.tsx index ba64bfd28..b2cce4819 100644 --- a/components/markets/market-filter/ClearAllButton.tsx +++ b/components/markets/market-filter/ClearAllButton.tsx @@ -1,7 +1,7 @@ const ClearAllButton = ({ clear }) => { return (
- + View Details →
@@ -100,11 +100,11 @@ const MarketPositionHeader = ({ alt="Currency token logo" className="h-4 w-4 shrink-0 rounded-full" /> -

+

{question}

- + View → diff --git a/components/portfolio/PortfolioHeader.tsx b/components/portfolio/PortfolioHeader.tsx index 781de439f..2aca51294 100644 --- a/components/portfolio/PortfolioHeader.tsx +++ b/components/portfolio/PortfolioHeader.tsx @@ -88,7 +88,7 @@ const PortfolioHeader = (props: PortfolioHeaderProps) => { {isOwned && !hasIdentity && ( ) : ( diff --git a/components/markets/MarketSearch.tsx b/components/markets/MarketSearch.tsx index b4c1c2fcb..bdbd4981b 100644 --- a/components/markets/MarketSearch.tsx +++ b/components/markets/MarketSearch.tsx @@ -138,7 +138,7 @@ const MarketSearch = () => { leaveTo="transform opacity-0 scale-95" show={Boolean(showResults && showSearch && markets)} > -
+
{markets?.length ? ( markets?.map((market, index) => ( diff --git a/components/markets/TradeResult.tsx b/components/markets/TradeResult.tsx index 960b672cf..1af9dae09 100644 --- a/components/markets/TradeResult.tsx +++ b/components/markets/TradeResult.tsx @@ -82,7 +82,7 @@ const TradeResult = ({ diff --git a/components/markets/market-card/MarketOrComboCard.tsx b/components/markets/market-card/MarketOrComboCard.tsx index a53db7850..57fca058d 100644 --- a/components/markets/market-card/MarketOrComboCard.tsx +++ b/components/markets/market-card/MarketOrComboCard.tsx @@ -56,7 +56,7 @@ const ComboMarketRow = ({ > {roleLabel} - + {market.question}
@@ -100,7 +100,7 @@ const ComboMarketRowInline = ({ > {roleLabel} - + {market.question}
diff --git a/components/markets/market-card/index.tsx b/components/markets/market-card/index.tsx index d222af88f..6993bec90 100644 --- a/components/markets/market-card/index.tsx +++ b/components/markets/market-card/index.tsx @@ -131,14 +131,14 @@ export const MarketCard = ({ }} />
-
+
{cmsMetadata?.question ?? question}
{status === "Resolved" && resolvedOutcome ? ( - + Resolved:{" "} {marketType?.categorical diff --git a/components/markets/market-filter/DropDownSelect.tsx b/components/markets/market-filter/DropDownSelect.tsx index 183b4251f..1e844444b 100644 --- a/components/markets/market-filter/DropDownSelect.tsx +++ b/components/markets/market-filter/DropDownSelect.tsx @@ -48,7 +48,7 @@ const Control = ({ children, ...props }: ControlProps) => { (menuIsOpen ? "bg-white/15 text-white" : hasActiveFilters - ? "bg-white/15 text-ztg-green-400 hover:bg-white/20 hover:text-white" + ? "bg-white/15 text-ztg-green-500 hover:bg-white/20 hover:text-white" : "bg-white/15 text-white/90 hover:bg-white/20 hover:text-white") } onClick={onClick} @@ -79,7 +79,7 @@ const Option = ({ children, ...props }: OptionProps) => { className={ "center h-full cursor-pointer rounded-md px-2 py-1.5 transition-all " + (isActive - ? "bg-ztg-green-500/20 text-ztg-green-400" + ? "bg-ztg-green-500/20 text-ztg-green-500" : isFocused ? "bg-white/10 text-white" : "text-white/90 hover:bg-white/10 hover:text-white") @@ -104,7 +104,7 @@ const Option = ({ children, ...props }: OptionProps) => {
{children} diff --git a/components/markets/market-filter/MarketFiltersSort.tsx b/components/markets/market-filter/MarketFiltersSort.tsx index 385bd2067..cb4279a7b 100644 --- a/components/markets/market-filter/MarketFiltersSort.tsx +++ b/components/markets/market-filter/MarketFiltersSort.tsx @@ -70,7 +70,7 @@ const Control = ({ (menuIsOpen ? "bg-white/15 text-white" : selectedOption - ? "bg-white/15 text-ztg-green-400 hover:bg-white/20 hover:text-white" + ? "bg-white/15 text-ztg-green-500 hover:bg-white/20 hover:text-white" : "bg-white/15 text-white/90 hover:bg-white/20 hover:text-white") } onClick={onClick} @@ -124,13 +124,13 @@ const Option = ({ className={ "center h-full cursor-pointer rounded-md px-2 py-1.5 transition-all " + (isSelected - ? "bg-ztg-green-500/20 text-ztg-green-400" + ? "bg-ztg-green-500/20 text-ztg-green-500" : isFocused ? "bg-white/10 text-white" : "text-white/90 hover:bg-white/10 hover:text-white") } > - +
{isSelected && (
@@ -138,7 +138,7 @@ const Option = ({
{isVolumeBased ? "Volume" : children} diff --git a/components/markets/market-filter/MarketTypeToggle.tsx b/components/markets/market-filter/MarketTypeToggle.tsx index a6d4833e7..3896c4796 100644 --- a/components/markets/market-filter/MarketTypeToggle.tsx +++ b/components/markets/market-filter/MarketTypeToggle.tsx @@ -53,7 +53,7 @@ const Control = ({ (menuIsOpen ? "bg-white/15 text-white" : selectedOption - ? "bg-white/15 text-ztg-green-400 hover:bg-white/20 hover:text-white" + ? "bg-white/15 text-ztg-green-500 hover:bg-white/20 hover:text-white" : "bg-white/15 text-white/90 hover:bg-white/20 hover:text-white") } onClick={onClick} @@ -87,13 +87,13 @@ const Option = ({ className={ "center h-full cursor-pointer rounded-md px-2 py-1.5 transition-all " + (isSelected - ? "bg-ztg-green-500/20 text-ztg-green-400" + ? "bg-ztg-green-500/20 text-ztg-green-500" : isFocused ? "bg-white/10 text-white" : "text-white/90 hover:bg-white/10 hover:text-white") } > - +
{isSelected && (
@@ -101,7 +101,7 @@ const Option = ({
{data.label} Market diff --git a/components/markets/market-filter/index.tsx b/components/markets/market-filter/index.tsx index 29a9a89d3..9e4b249e6 100644 --- a/components/markets/market-filter/index.tsx +++ b/components/markets/market-filter/index.tsx @@ -242,7 +242,7 @@ const MarketFilterSelection = ({ > Create Market
@@ -294,7 +294,7 @@ const MarketFilterSelection = ({ >
diff --git a/components/markets/market-filter/mobile-dialog/FilterDetails.tsx b/components/markets/market-filter/mobile-dialog/FilterDetails.tsx index 9fad1382f..02fbfef59 100644 --- a/components/markets/market-filter/mobile-dialog/FilterDetails.tsx +++ b/components/markets/market-filter/mobile-dialog/FilterDetails.tsx @@ -46,7 +46,7 @@ const FilterDetails = ({ back, menu }: FilterDetailsProps) => { return ( <> ); diff --git a/components/portfolio/AccountPoolsTable.tsx b/components/portfolio/AccountPoolsTable.tsx index b1722b1f5..98ebe23a1 100644 --- a/components/portfolio/AccountPoolsTable.tsx +++ b/components/portfolio/AccountPoolsTable.tsx @@ -60,7 +60,7 @@ const AccountPoolsTable = ({ pools, isLoading }: AccountPoolsTableProps) => { question: ( {pool.question} diff --git a/components/portfolio/Breakdown.tsx b/components/portfolio/Breakdown.tsx index 9c5e7ef19..4f76b92b7 100644 --- a/components/portfolio/Breakdown.tsx +++ b/components/portfolio/Breakdown.tsx @@ -139,7 +139,7 @@ export const BreakdownSlot = ({ ? "text-white" : changePercentage < 0 ? "text-red-400" - : "text-ztg-green-400" + : "text-ztg-green-500" }`} > {Math.abs(changePercentage).toFixed(1)}% diff --git a/components/portfolio/MarketPositionHeader.tsx b/components/portfolio/MarketPositionHeader.tsx index 5fedfd880..131bec395 100644 --- a/components/portfolio/MarketPositionHeader.tsx +++ b/components/portfolio/MarketPositionHeader.tsx @@ -51,11 +51,11 @@ const MarketPositionHeader = ({ alt="Currency token logo" className="h-4 w-4 rounded-full" /> - + Multi-Market Position
- + View Details →
@@ -100,11 +100,11 @@ const MarketPositionHeader = ({ alt="Currency token logo" className="h-4 w-4 shrink-0 rounded-full" /> -

+

{question}

- + View → diff --git a/components/portfolio/PortfolioHeader.tsx b/components/portfolio/PortfolioHeader.tsx index 2aca51294..01345703a 100644 --- a/components/portfolio/PortfolioHeader.tsx +++ b/components/portfolio/PortfolioHeader.tsx @@ -72,12 +72,12 @@ const PortfolioHeader = (props: PortfolioHeaderProps) => {
{isOwned && !hasIdentity && ( -
+
Wallet Name
)} {isOwned && hasIdentity && ( -
+
On-Chain Identity
)} @@ -246,7 +246,7 @@ const StatCard = ({ {/* {changePercentage !== 0 && (
{changePercentage > 0 ? "+" : ""} diff --git a/components/portfolio/PortfolioIdentity.tsx b/components/portfolio/PortfolioIdentity.tsx index 3aa3cd906..9d179843e 100644 --- a/components/portfolio/PortfolioIdentity.tsx +++ b/components/portfolio/PortfolioIdentity.tsx @@ -48,12 +48,12 @@ const PortfolioIdentity = ({ address }: { address: string }) => {
{isOwned && !hasIdentity && ( -
+
Wallet Name
)} {isOwned && hasIdentity && ( -
+
On-Chain Identity
)} diff --git a/components/portfolio/TradeHistoryTable.tsx b/components/portfolio/TradeHistoryTable.tsx index 36cbec36b..288878670 100644 --- a/components/portfolio/TradeHistoryTable.tsx +++ b/components/portfolio/TradeHistoryTable.tsx @@ -48,7 +48,7 @@ const TradeHistoryTable = ({ address }: { address: string }) => { question: ( {trade?.question} diff --git a/components/portfolio/TransactionHistoryTable.tsx b/components/portfolio/TransactionHistoryTable.tsx index 1006cc07a..31b7fbf30 100644 --- a/components/portfolio/TransactionHistoryTable.tsx +++ b/components/portfolio/TransactionHistoryTable.tsx @@ -56,7 +56,7 @@ const TransactionHistoryTable = ({ address }: { address: string }) => { question: ( {transaction.question} diff --git a/components/settings/AccountSettingsForm.tsx b/components/settings/AccountSettingsForm.tsx index 9bad24cca..4b1515135 100644 --- a/components/settings/AccountSettingsForm.tsx +++ b/components/settings/AccountSettingsForm.tsx @@ -178,7 +178,7 @@ const AcccountSettingsForm: React.FC = ({
@@ -228,14 +228,14 @@ const MobileAccountView = ({ className="group flex min-h-[48px] cursor-pointer items-center gap-3 rounded-lg bg-white/10 px-4 py-3 text-left transition-all hover:bg-white/20" >
- + {hasNotifications && (
)}
Notifications {hasNotifications && ( - + {alerts.length} )} @@ -252,7 +252,7 @@ const MobileAccountView = ({ }} className="group flex min-h-[48px] cursor-pointer items-center gap-3 rounded-lg bg-white/10 px-4 py-3 text-left transition-all hover:bg-white/20" > - + Select Account )} @@ -261,7 +261,7 @@ const MobileAccountView = ({
Portfolio @@ -277,7 +277,7 @@ const MobileAccountView = ({ className="group flex min-h-[48px] cursor-pointer items-center gap-3 rounded-lg bg-white/10 px-4 py-3 text-left transition-all hover:bg-white/20" > Settings @@ -527,7 +527,7 @@ const TopBar = () => { active ? "bg-white/20" : "" }`} > -
+

@@ -555,7 +555,7 @@ const TopBar = () => { active ? "bg-white/20" : "" }`} > -
+

@@ -581,7 +581,7 @@ const TopBar = () => { active ? "bg-white/20" : "" }`} > -
+

@@ -655,8 +655,8 @@ const TopBar = () => { size={14} className={`shrink-0 transition-colors sm:h-4 sm:w-4 ${ router.pathname === "/markets" && !router.query.status - ? "text-ztg-green-400" - : "text-ztg-green-400/80 group-hover:text-ztg-green-400" + ? "text-ztg-green-500" + : "text-ztg-green-500/80 group-hover:text-ztg-green-500" }`} /> All Markets @@ -675,8 +675,8 @@ const TopBar = () => { className={`shrink-0 transition-colors sm:h-4 sm:w-4 ${ router.query.status === "Active" && router.query.ordering === "Newest" - ? "text-ztg-green-400" - : "text-ztg-green-400/80 group-hover:text-ztg-green-400" + ? "text-ztg-green-500" + : "text-ztg-green-500/80 group-hover:text-ztg-green-500" }`} /> Active @@ -695,8 +695,8 @@ const TopBar = () => { className={`shrink-0 transition-colors sm:h-4 sm:w-4 ${ router.query.status === "Active" && router.query.ordering === "Most Volume" - ? "text-ztg-green-400" - : "text-ztg-green-400/80 group-hover:text-ztg-green-400" + ? "text-ztg-green-500" + : "text-ztg-green-500/80 group-hover:text-ztg-green-500" }`} /> Trending @@ -742,7 +742,7 @@ const TopBar = () => { >
@@ -766,7 +766,7 @@ const TopBar = () => { >
@@ -802,7 +802,7 @@ const TopBar = () => { > Create Market { >
@@ -858,7 +858,7 @@ const TopBar = () => { >
@@ -1034,7 +1034,7 @@ const CreateMarketMenu = ({ onSelect }: { onSelect: () => void }) => { href="/create" className="flex min-h-[48px] items-center gap-3 rounded-lg px-4 py-3 text-white transition-all hover:bg-white/20 md:min-h-0 md:gap-3 md:px-3 md:py-2.5" > -
+
@@ -1049,7 +1049,7 @@ const CreateMarketMenu = ({ onSelect }: { onSelect: () => void }) => { href="/create-combo" className="flex min-h-[48px] items-center gap-3 rounded-lg px-4 py-3 text-white transition-all hover:bg-white/20 md:min-h-0 md:gap-3 md:px-3 md:py-2.5" > -
+
@@ -1095,7 +1095,7 @@ const CategoriesMenuItem = ({ onSelect }: { onSelect: () => void }) => { setCategoriesOpen(!categoriesOpen); }} > -
+

@@ -1178,7 +1178,7 @@ const CreateMarketMenuItem = ({ onSelect }: { onSelect: () => void }) => { setCreateMarketOpen(!createMarketOpen); }} > -
+

diff --git a/components/ui/AddressInput.tsx b/components/ui/AddressInput.tsx index dc4fd0777..4e494925c 100644 --- a/components/ui/AddressInput.tsx +++ b/components/ui/AddressInput.tsx @@ -161,7 +161,7 @@ const Option = ({ children, ...rest }: OptionProps) => { {...rest} className={`mb-2 !flex h-14 w-full !cursor-pointer items-center rounded-md px-4 transition-all last:mb-0 ${ isSelected - ? "bg-ztg-green-500/20 text-ztg-green-400" + ? "bg-ztg-green-500/20 text-ztg-green-500" : isFocused ? "bg-white/15 text-white" : "bg-white/5 text-white/90 hover:bg-white/15 hover:text-white" diff --git a/components/ui/AssetSelect.tsx b/components/ui/AssetSelect.tsx index 14b3779ef..7ac674504 100644 --- a/components/ui/AssetSelect.tsx +++ b/components/ui/AssetSelect.tsx @@ -105,7 +105,7 @@ const Option = (props: OptionProps) => { {...props} className={`mb-1 !flex h-10 w-full !cursor-pointer items-center rounded-md px-3 text-xs font-medium transition-all last:mb-0 ${ isSelected - ? "bg-ztg-green-500/20 text-ztg-green-400" + ? "bg-ztg-green-500/20 text-ztg-green-500" : isFocused ? "bg-white/15 text-white" : "bg-white/10 text-white/90 hover:bg-white/15 hover:text-white" diff --git a/components/ui/Footer.tsx b/components/ui/Footer.tsx index 7c921f93a..d1524213b 100644 --- a/components/ui/Footer.tsx +++ b/components/ui/Footer.tsx @@ -79,7 +79,7 @@ const FooterMenu: FC = ({ title, links, className = "" }) => { href={href} key={`footerMenuLink${idx}`} target="_blank" - className="mb-0.5 transition-colors hover:text-ztg-green-400" + className="mb-0.5 transition-colors hover:text-ztg-green-500" > {text} @@ -137,7 +137,7 @@ const Footer = () => { href={link.href} target={link.external ? "_blank" : undefined} rel={link.external ? "noopener noreferrer" : undefined} - className="text-white/70 transition-colors hover:text-ztg-green-400 hover:underline" + className="text-white/70 transition-colors hover:text-ztg-green-500 hover:underline" > {link.text} diff --git a/components/ui/QuickNav.tsx b/components/ui/QuickNav.tsx index b5280ab46..86725c94f 100644 --- a/components/ui/QuickNav.tsx +++ b/components/ui/QuickNav.tsx @@ -58,10 +58,10 @@ const QuickNav = () => { }`} > {React.cloneElement(item.icon as React.ReactElement, { @@ -84,7 +84,7 @@ const QuickNav = () => { > Create Market = ({

diff --git a/pages/multi-market/[poolid].tsx b/pages/multi-market/[poolid].tsx index 0af4a5fbe..720a7671e 100644 --- a/pages/multi-market/[poolid].tsx +++ b/pages/multi-market/[poolid].tsx @@ -158,8 +158,8 @@ const ComboAssetDetails = ({ {sourceMarkets[0].question}

- Then:{" "} - {market2Outcome},{" "} + Then:{" "} + {market2Outcome},{" "} {sourceMarkets[1].question}
@@ -239,7 +239,7 @@ const CombinatorialTooltip = ({ children }: { children: React.ReactNode }) => { combinations like: "Assuming outcome X happens in Market 1, THEN what happens in Market 2?"

-

+

Example: Assume "Trump wins" → Then "Bitcoin reaches $100k"

@@ -624,7 +624,7 @@ const MobileContextButtons = ({

- Market 2 ("Then" market) has resolved. You can redeem tokens for{" "} + Market 2 ("Then" market) has resolved. You can redeem tokens for{" "} Market 1 ("Assume" market) tokens and use those for trading.

@@ -1165,7 +1165,7 @@ const ComboMarket: NextPage = ({

- Market 2 ("Then" market) has resolved. You can redeem tokens for{" "} + Market 2 ("Then" market) has resolved. You can redeem tokens for{" "} Market 1 ("Assume" market) tokens and use those for trading.

diff --git a/pages/referendum-signal/widget/[refId].tsx b/pages/referendum-signal/widget/[refId].tsx index 7acde564f..62aee17c5 100644 --- a/pages/referendum-signal/widget/[refId].tsx +++ b/pages/referendum-signal/widget/[refId].tsx @@ -129,12 +129,12 @@ const ReferendumSignalWidget = () => {
- Then: + Then: {combinatorial_market.market_2.question} @@ -145,10 +145,10 @@ const ReferendumSignalWidget = () => { {futarchy_signal.recommendation && (
- + Signal
-
+
{futarchy_signal.recommendation}
{futarchy_signal.confidence && ( @@ -275,7 +275,7 @@ const ReferendumSignalWidget = () => { href="https://app.zeitgeist.pm" target="_blank" rel="noopener noreferrer" - className="font-semibold text-ztg-green-400 transition-colors hover:text-ztg-green-400" + className="font-semibold text-ztg-green-500 transition-colors hover:text-ztg-green-500" > Zeitgeist From c49b20560d9f841132c15b135c4f07982cd05c71 Mon Sep 17 00:00:00 2001 From: robhyrk Date: Tue, 11 Nov 2025 20:01:37 -0500 Subject: [PATCH 3/4] fix: text colors --- components/account/AccountButton.tsx | 12 +-- components/account/AccountModalHead.tsx | 2 +- components/account/NotificationsPanel.tsx | 48 ++++----- components/account/OnboardingModal.tsx | 4 +- components/account/WalletSelect.tsx | 8 +- .../AssetActionButtons/DisputeButton.tsx | 4 +- .../AssetActionButtons/ReportButton.tsx | 4 +- .../confirmation/ConfirmationProvider.tsx | 6 +- components/court/CourtCasesTable.tsx | 4 +- components/court/CourtExitButton.tsx | 2 +- components/court/CourtUnstakeButton.tsx | 2 +- components/court/CourtVoteForm.tsx | 14 +-- components/court/JoinCourtAsJurorButton.tsx | 4 +- components/court/ManageDelegationButton.tsx | 4 +- components/court/learn/CourtDocsArticle.tsx | 6 +- components/create/editor/ComboEditor.tsx | 54 +++++----- components/create/editor/CostCalculator.tsx | 72 ++++++------- components/create/editor/EditorCompact.tsx | 102 +++++++++--------- components/create/editor/ProgressBar.tsx | 6 +- components/create/editor/Publishing.tsx | 2 +- components/create/editor/Summary.tsx | 16 +-- .../create/editor/inputs/BlockPeriod.tsx | 18 ++-- components/create/editor/inputs/Category.tsx | 4 +- components/create/editor/inputs/Currency.tsx | 6 +- components/create/editor/inputs/DateTime.tsx | 4 +- components/create/editor/inputs/FeeSelect.tsx | 10 +- .../editor/inputs/LiquidityModeToggle.tsx | 8 +- .../create/editor/inputs/LiquiditySimple.tsx | 16 +-- .../create/editor/inputs/LiquidityUnified.tsx | 16 +-- .../create/editor/inputs/Moderation.tsx | 6 +- components/create/editor/inputs/Oracle.tsx | 6 +- .../create/editor/inputs/TimezoneSelect.tsx | 2 +- .../editor/inputs/answers/Categorical.tsx | 8 +- .../create/editor/inputs/answers/Scalar.tsx | 8 +- .../create/editor/inputs/answers/index.tsx | 20 ++-- components/front-page/HeroBanner.tsx | 4 +- components/front-page/WatchHow.tsx | 2 +- components/hero-slider/HeroControls.tsx | 8 +- components/hero-slider/HeroSlide.tsx | 4 +- components/liquidity/ExitPoolFormAmm2.tsx | 2 +- components/liquidity/JoinPoolFormAmm2.tsx | 4 +- components/liquidity/LiquidityModalAmm2.tsx | 4 +- .../liquidity/MarketLiquiditySection.tsx | 4 +- components/liquidity/PoolFeesSelect.tsx | 4 +- components/liquidity/PoolSettingsAMM2.tsx | 2 +- components/markets/ComboMarketHeader.tsx | 18 ++-- .../markets/ComboMarketHeaderUnified.tsx | 22 ++-- components/markets/DisputeResult.tsx | 2 +- components/markets/MarketAddresses.tsx | 4 +- .../MarketContextActionOutcomeSelector.tsx | 10 +- components/markets/MarketDescription.tsx | 4 +- components/markets/MarketFavoriteToggle.tsx | 2 +- components/markets/MarketHeader.tsx | 2 +- components/markets/MarketHeaderUtils.tsx | 4 +- components/markets/MarketHero.tsx | 2 +- components/markets/MarketHistoryModal.tsx | 26 ++--- components/markets/MarketMetadataBadges.tsx | 14 +-- components/markets/MarketSearch.tsx | 4 +- components/markets/MarketTimer.tsx | 10 +- components/markets/PoolDeployer.tsx | 8 +- components/markets/PromotionCallout.tsx | 2 +- components/markets/ReportResult.tsx | 2 +- components/markets/ScalarPriceRange.tsx | 2 +- components/markets/TradeResult.tsx | 4 +- .../markets/market-card/MarketOrComboCard.tsx | 12 +-- components/markets/market-card/index.tsx | 10 +- .../markets/market-filter/DropDownSelect.tsx | 10 +- .../market-filter/MarketFiltersCheckboxes.tsx | 2 +- .../market-filter/MarketFiltersSort.tsx | 10 +- .../market-filter/MarketTypeToggle.tsx | 10 +- components/markets/market-filter/index.tsx | 4 +- .../mobile-dialog/FilterDetails.tsx | 8 +- .../mobile-dialog/FiltersList.tsx | 18 ++-- .../market-filter/mobile-dialog/index.tsx | 4 +- components/onboarding/DisclaimerModal.tsx | 4 +- components/outcomes/CategoricalDisputeBox.tsx | 6 +- components/outcomes/ScalarDisputeBox.tsx | 4 +- components/outcomes/ScalarReportBox.tsx | 2 +- components/portfolio/AccountPoolsTable.tsx | 4 +- components/portfolio/Breakdown.tsx | 6 +- components/portfolio/CourtRewardsTable.tsx | 2 +- components/portfolio/CurrenciesTable.tsx | 2 +- components/portfolio/EmptyPortfolio.tsx | 6 +- components/portfolio/MarketPositionHeader.tsx | 10 +- components/portfolio/PortfolioHeader.tsx | 14 +-- components/portfolio/PortfolioIdentity.tsx | 10 +- components/portfolio/TradeHistoryTable.tsx | 4 +- .../portfolio/TransactionHistoryTable.tsx | 4 +- components/portfolio/TransferButton.tsx | 6 +- components/portfolio/WithdrawButton.tsx | 6 +- components/settings/AccountSettingsForm.tsx | 8 +- components/settings/SettingsModal.tsx | 8 +- components/top-bar/Alerts.tsx | 2 +- components/top-bar/MenuItem.tsx | 4 +- components/top-bar/MenuLogo.tsx | 2 +- components/top-bar/index.tsx | 92 ++++++++-------- components/trade-form/BuyForm.tsx | 18 ++-- components/trade-form/SellForm.tsx | 14 +-- components/trade-form/TradeTab.tsx | 8 +- components/ui/AddressInput.tsx | 14 +-- components/ui/AssetInput.tsx | 2 +- components/ui/AssetSelect.tsx | 6 +- components/ui/CopyIcon.tsx | 2 +- components/ui/Footer.tsx | 8 +- components/ui/HorizontalScroll.tsx | 4 +- components/ui/InfoPopover.tsx | 2 +- components/ui/Input.tsx | 2 +- components/ui/ModalPanel.tsx | 4 +- components/ui/PercentageChange.tsx | 2 +- components/ui/PrimaryTabsList.tsx | 4 +- components/ui/QuickNav.tsx | 8 +- components/ui/SubTabsList.tsx | 4 +- components/ui/Table.tsx | 16 +-- components/ui/TimeFilters.tsx | 4 +- components/ui/TimeSeriesChart.tsx | 6 +- components/ui/Tooltip.tsx | 2 +- components/ui/TransactionButton.tsx | 2 +- components/ui/inputs.tsx | 2 +- components/web3wallet/index.tsx | 4 +- components/wizard/WizardStepper.tsx | 6 +- pages/404.tsx | 12 +-- pages/api/og/generate.tsx | 2 +- pages/avatar/[address].tsx | 2 +- pages/claim.tsx | 6 +- pages/court/[caseid].tsx | 8 +- pages/court/index.tsx | 8 +- pages/deposit.tsx | 2 +- pages/liquidity/[poolid].tsx | 2 +- pages/markets/[marketid].tsx | 36 +++---- pages/multi-market/[poolid].tsx | 56 +++++----- pages/referendum-signal/widget/[refId].tsx | 26 ++--- pages/search.tsx | 2 +- styles/index.css | 6 +- 133 files changed, 647 insertions(+), 647 deletions(-) diff --git a/components/account/AccountButton.tsx b/components/account/AccountButton.tsx index 9f6aa1297..a7bfc442d 100644 --- a/components/account/AccountButton.tsx +++ b/components/account/AccountButton.tsx @@ -143,7 +143,7 @@ const AccountMenuContent: FC = ({
= ({
{ @@ -240,7 +240,7 @@ const AccountMenuContent: FC = ({ Account is acting proxy for:
-
+
{realAddress && shortenAddress( realAddress, @@ -299,12 +299,12 @@ const AccountMenuContent: FC = ({ {/* Close button for mobile */} {isMobile && (
- + Account @@ -523,7 +523,7 @@ const HeaderActionButton: FC< > = ({ onClick, disabled, children }) => { return ( )} @@ -208,15 +208,15 @@ const CourtCaseReadyToSettleItem = ({ >
- - Ready to Settle + + Ready to Settle
-

+

{market?.question}

-

+

This court case can now be settled.

@@ -245,15 +245,15 @@ const CourtCaseReadyForVoteAlertItem = ({ >
- - Ready for Vote + + Ready for Vote
-

+

{market?.question}

-

+

You have been drawn as juror for this market and can now vote.

@@ -282,15 +282,15 @@ const CourtCaseReadyForRevealAlertItem = ({ >
- - Ready to Reveal + + Ready to Reveal
-

+

{market?.question}

-

+

You are required to reveal your vote for this court case.

@@ -317,12 +317,12 @@ const ReadyToReportMarketAlertItem = ({ >
- - Submit Report + + Submit Report
-

+

{alert.market.question}

@@ -350,12 +350,12 @@ const RedeemableMarketAlertItem = ({ >
- - Redeemable Tokens + + Redeemable Tokens
-

+

You have {alert.markets.length} redeemable markets

@@ -382,14 +382,14 @@ const RelevantMarketDisputeItem = ({ >
- Market Dispute + Market Dispute
-

+

{alert.market.question}

-

+

A market you're involved in is disputed

diff --git a/components/account/OnboardingModal.tsx b/components/account/OnboardingModal.tsx index 68514bab4..ba162b279 100644 --- a/components/account/OnboardingModal.tsx +++ b/components/account/OnboardingModal.tsx @@ -40,7 +40,7 @@ const exchangeList = [ className: "", title: "Banxa (Fiat)", icon: ( - + NEW ), @@ -140,7 +140,7 @@ const TextSection = ({ )} {rightButton && (
-
+
-

Decentralized Court

+

Decentralized Court

Zeitgeist implements a decentralized court to handle disputes that may @@ -37,7 +37,7 @@ export const CourtDocsArticle = ({ Learn More diff --git a/components/create/editor/ComboEditor.tsx b/components/create/editor/ComboEditor.tsx index cd51bac34..755d58188 100644 --- a/components/create/editor/ComboEditor.tsx +++ b/components/create/editor/ComboEditor.tsx @@ -90,10 +90,10 @@ const MarketSelect: React.FC = ({ Option: ({ children, ...props }: any) => (

-
+
{children}
-
+
{props.data.description}
@@ -105,7 +105,7 @@ const MarketSelect: React.FC = ({
), NoOptionsMessage: ({ inputValue }: any) => ( -
+
{inputValue ? "No markets found" : "No active markets available"}
), @@ -194,7 +194,7 @@ const MarketSelect: React.FC = ({ return (
-