Skip to content

Pulling refs/heads/staging into test-staging #2540

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
github-actions merged 1 commit into from
Nov 17, 2025
Merged

Pulling refs/heads/staging into test-staging #2540

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
8 changes: 4 additions & 4 deletions components/account/NotificationsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ const CourtCaseReadyToSettleItem = ({
<h3 className="mb-1 text-sm font-semibold text-white/90">
{market?.question}
</h3>
<p className="text-xs text-white/90/75">
<p className="text-xs text-white/90">
This court case can now be settled.
</p>
</div>
Expand Down Expand Up @@ -253,7 +253,7 @@ const CourtCaseReadyForVoteAlertItem = ({
<h3 className="mb-1 text-sm font-semibold text-white/90">
{market?.question}
</h3>
<p className="text-xs text-white/90/75">
<p className="text-xs text-white/90">
You have been drawn as juror for this market and can now vote.
</p>
</div>
Expand Down Expand Up @@ -290,7 +290,7 @@ const CourtCaseReadyForRevealAlertItem = ({
<h3 className="mb-1 text-sm font-semibold text-white/90">
{market?.question}
</h3>
<p className="text-xs text-white/90/75">
<p className="text-xs text-white/90">
You are required to reveal your vote for this court case.
</p>
</div>
Expand Down Expand Up @@ -389,7 +389,7 @@ const RelevantMarketDisputeItem = ({
<h3 className="mb-1 text-sm font-semibold text-white/90">
{alert.market.question}
</h3>
<p className="text-xs text-white/90/75">
<p className="text-xs text-white/90">
A market you're involved in is disputed
</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions components/account/WalletSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const WalletSelect = () => {
{/* Divider */}
{/* <div className="relative mb-6 flex items-center">
<div className="h-px flex-1 bg-white/10"></div>
<span className="px-3 text-xs font-medium text-white/90/60">or</span>
<span className="px-3 text-xs font-medium text-white/90">or</span>
<div className="h-px flex-1 bg-white/10"></div>
</div> */}

Expand All @@ -125,7 +125,7 @@ const WalletSelect = () => {
<div className="text-sm font-semibold text-white/90">
Nova Wallet
</div>
<div className="text-xs text-white/90/60">Mobile wallet</div>
<div className="text-xs text-white/90">Mobile wallet</div>
</div>
</Link>
<div className="rounded-lg border-2 border-white/10 bg-white/10 p-4 backdrop-blur-sm">
Expand Down
10 changes: 5 additions & 5 deletions components/create/editor/ComboEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ const ComboMarketEditor: React.FC = () => {
<div className="mb-1 text-xs font-semibold text-white/90">
Example 1:
</div>
<p className="text-xs leading-relaxed text-white/90/75">
<p className="text-xs leading-relaxed text-white/90">
<strong className="text-blue-300">Assume:</strong>{" "}
"Referendum #1764 passes",{" "}
<strong className="text-blue-300">No</strong> <br />
Expand All @@ -602,7 +602,7 @@ const ComboMarketEditor: React.FC = () => {
<div className="mb-1 text-xs font-semibold text-white/90">
Example 2:
</div>
<p className="text-xs leading-relaxed text-white/90/75">
<p className="text-xs leading-relaxed text-white/90">
<strong className="text-blue-300">Assume:</strong>{" "}
"Lakers win championship",{" "}
<strong className="text-blue-300">Yes</strong> <br />
Expand Down Expand Up @@ -670,7 +670,7 @@ const ComboMarketEditor: React.FC = () => {
</div>
<button
onClick={() => removeMarket(market.marketId)}
className="flex-shrink-0 rounded p-1 text-white/90/60 transition-all hover:bg-white/10 hover:text-white/90 active:scale-95"
className="flex-shrink-0 rounded p-1 text-white/90 transition-all hover:bg-white/10 hover:text-white/90 active:scale-95"
title="Remove market"
>
<AiOutlineClose size={16} />
Expand Down Expand Up @@ -825,7 +825,7 @@ const ComboMarketEditor: React.FC = () => {
<div className="text-sm font-semibold text-white/90">
${spotPrice}
</div>
<div className="text-xxs text-white/90/60">price</div>
<div className="text-xxs text-white/90">price</div>
</div>
<div className="flex items-center gap-1">
<Input
Expand Down Expand Up @@ -882,7 +882,7 @@ const ComboMarketEditor: React.FC = () => {
{form.selectedMarkets[0]?.baseAsset.toLocaleUpperCase() ||
"ZTG"}
</span>
<span className="text-xs text-white/90/60">(min: 200)</span>
<span className="text-xs text-white/90">(min: 200)</span>
</div>
</div>
{errors.liquidityAmount && (
Expand Down
2 changes: 1 addition & 1 deletion components/create/editor/CostCalculator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ const CostDetailsModal = ({
`border-b-2 px-3 pb-2 text-sm font-semibold transition-colors ${
selected
? "border-ztg-green-500 text-white/90"
: "border-transparent text-white/90/60 hover:text-white/90"
: "border-transparent text-white/90 hover:text-white/90"
}`
}
>
Expand Down
12 changes: 6 additions & 6 deletions components/create/editor/EditorCompact.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export const MarketEditorCompact = () => {
!fieldsState.moderation.isValid ||
!fieldsState.liquidity.isValid ||
!fieldsState.answers.isValid))
? "cursor-not-allowed border-white/20 bg-white/5 text-white/90/40"
? "cursor-not-allowed border-white/20 bg-white/5 text-white/90"
: "border-ztg-green-600/80 bg-ztg-green-600/90 text-white/90 shadow-md hover:border-ztg-green-500 hover:bg-ztg-green-600"
}`}
type="button"
Expand Down Expand Up @@ -345,7 +345,7 @@ export const MarketEditorCompact = () => {
<Disclosure.Button className="flex w-full items-center justify-between px-4 py-3 text-left transition-colors hover:bg-white/5">
<span className="text-sm font-semibold text-white/90">
Description{" "}
<span className="font-normal text-white/90/60">
<span className="font-normal text-white/90">
(Optional)
</span>
</span>
Expand Down Expand Up @@ -495,7 +495,7 @@ export const MarketEditorCompact = () => {
)}
{fieldsState.endDate.isValid &&
!fieldsState.reportingPeriod.isTouched && (
<p className="text-xs text-white/90/60">
<p className="text-xs text-white/90">
💡 Tip: Give your oracle enough time to gather
data and report accurately
</p>
Expand Down Expand Up @@ -528,7 +528,7 @@ export const MarketEditorCompact = () => {
)}
{fieldsState.endDate.isValid &&
!fieldsState.disputePeriod.isTouched && (
<p className="text-xs text-white/90/60">
<p className="text-xs text-white/90">
💡 Tip: A dispute period protects against
incorrect outcomes
</p>
Expand Down Expand Up @@ -564,7 +564,7 @@ export const MarketEditorCompact = () => {
</div>
)}
{wallet.realAddress && !form.oracle && (
<p className="text-xs text-white/90/60">
<p className="text-xs text-white/90">
💡 Tip: Click "Use connected" to quickly set your account
as the oracle
</p>
Expand Down Expand Up @@ -1048,7 +1048,7 @@ export const MarketEditorCompact = () => {
<Disclosure.Button className="flex w-full items-center justify-between px-4 py-3 text-left transition-colors hover:bg-white/5">
<span className="text-sm font-semibold text-white/90">
Description{" "}
<span className="font-normal text-white/90/60">
<span className="font-normal text-white/90">
(Click to view)
</span>
</span>
Expand Down
2 changes: 1 addition & 1 deletion components/create/editor/inputs/BlockPeriod.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ const DurationInput = ({
type="number"
className={`w-full border-0 bg-transparent px-4 py-3 text-left text-sm text-white/90 outline-none placeholder:text-white/50 ${
isSelected
? "text-white/90 placeholder:text-white/90/60"
? "text-white/90 placeholder:text-white/90"
: "text-white/90 placeholder:text-white/50"
}`}
value={value?.value}
Expand Down
8 changes: 4 additions & 4 deletions components/create/editor/inputs/LiquidityModeToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const LiquidityModeToggle = ({
<div className="flex items-center gap-2 rounded-lg bg-white/10 px-2 py-1">
<span
className={`text-xs font-medium transition-colors ${
isSimple ? "text-white/90" : "text-white/90/60"
isSimple ? "text-white/90" : "text-white/90"
}`}
>
Simple
Expand All @@ -73,15 +73,15 @@ export const LiquidityModeToggle = ({
/>
<span
className={`text-xs font-medium transition-colors ${
!isSimple ? "text-white/90" : "text-white/90/60"
!isSimple ? "text-white/90" : "text-white/90"
}`}
>
Advanced
</span>
</div>
</div>
{isSimple && (
<p className="text-xs text-white/90/60">
<p className="text-xs text-white/90">
💡 Simple mode automatically distributes liquidity evenly
</p>
)}
Expand All @@ -105,7 +105,7 @@ export const LiquidityModeToggle = ({
currency={currency}
fieldState={fieldsState}
/>
<p className="mt-2 text-xs text-white/90/60">
<p className="mt-2 text-xs text-white/90">
💡 Advanced mode lets you set custom prices and amounts for each
outcome
</p>
Expand Down
6 changes: 3 additions & 3 deletions components/create/editor/inputs/LiquiditySimple.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ export const LiquiditySimple = ({
placeholder={`e.g., ${defaultAmount}`}
/>
{totalValue && totalValue.gt(0) && (
<p className="text-xs text-white/90/60">
<p className="text-xs text-white/90">
≈ ${totalValue.toFixed(2)} USD
</p>
)}
<p className="text-xs text-white/90/60">
<p className="text-xs text-white/90">
💡 This amount will be evenly distributed across all {numOutcomes}{" "}
outcomes
</p>
Expand All @@ -138,7 +138,7 @@ export const LiquiditySimple = ({
isValid={true}
label="% Swap Fee"
/>
<p className="text-xs text-white/90/60">
<p className="text-xs text-white/90">
💡 Fee earned on each trade. 1% is a common default.
</p>
</div>
Expand Down
8 changes: 4 additions & 4 deletions components/create/editor/inputs/LiquidityUnified.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@ export const LiquidityUnified = ({
placeholder="e.g., 1000"
/>
{totalValue && totalValue.gt(0) && (
<p className="text-xs text-white/90/60">
<p className="text-xs text-white/90">
≈ ${totalValue.toFixed(2)} USD
</p>
)}
<p className="text-xs text-white/90/60">
<p className="text-xs text-white/90">
💡 This amount will be evenly distributed across all {numOutcomes}{" "}
outcomes
</p>
Expand All @@ -204,7 +204,7 @@ export const LiquidityUnified = ({
isValid={fieldsState.isValid}
label="% Swap Fee"
/>
<p className="text-xs text-white/90/60">
<p className="text-xs text-white/90">
💡 Fee earned on each trade. 1% is a common default.
</p>
</div>
Expand All @@ -220,7 +220,7 @@ export const LiquidityUnified = ({
<span className="text-sm font-semibold text-white/90">
Fine-tune Distribution
{isCustomized && (
<span className="ml-2 text-xs font-normal text-white/90/60">
<span className="ml-2 text-xs font-normal text-white/90">
(Customized)
</span>
)}
Expand Down
2 changes: 1 addition & 1 deletion components/create/editor/inputs/answers/Categorical.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ const AnswerInput = ({
</div>
)}
<div
className={`absolute right-2 top-[50%] z-10 flex translate-y-[-50%] gap-2 text-white/90/60 transition-opacity duration-300 ${
className={`absolute right-2 top-[50%] z-10 flex translate-y-[-50%] gap-2 text-white/90 transition-opacity duration-300 ${
draggingDisabled && "cursor-not-allowed opacity-25"
}`}
ref={setNodeRef}
Expand Down
2 changes: 1 addition & 1 deletion components/liquidity/PoolFeesSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const PoolFeesSelect = ({
step={0.1}
className={`text-center text-sm font-semibold outline-none ${
inputSelected
? "bg-transparent text-white/90 placeholder:text-white/90/60"
? "bg-transparent text-white/90 placeholder:text-white/90"
: "bg-transparent text-ztg-primary-700 placeholder:text-ztg-primary-400"
}`}
onChange={(e) => handleInputFeeChange(e.target.value)}
Expand Down
2 changes: 1 addition & 1 deletion components/liquidity/PoolSettingsAMM2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const PoolSettingsAmm2: FC<{
<div className="relative inline-block">
<Input
type="number"
className="font-base w-64 rounded-md bg-white/10 py-4 pl-5 pr-28 text-right text-base text-white/90 outline-none backdrop-blur-sm transition-all placeholder:text-white/90/60 focus:bg-white/15"
className="font-base w-64 rounded-md bg-white/10 py-4 pl-5 pr-28 text-right text-base text-white/90 outline-none backdrop-blur-sm transition-all placeholder:text-white/90 focus:bg-white/15"
value={`${parseFloat(baseAssetAmount ?? "0")}`}
onChange={(event) => {
const value = parseFloat(event.target.value);
Expand Down
8 changes: 4 additions & 4 deletions components/markets/ComboMarketHeaderUnified.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ const SourceMarketCard = ({

<ChevronDown
size={16}
className={`flex-shrink-0 text-white/90/60 transition-transform duration-200 sm:hidden ${
className={`flex-shrink-0 text-white/90 transition-transform duration-200 sm:hidden ${
open ? "rotate-180" : ""
}`}
/>
<ChevronDown
size={18}
className={`hidden flex-shrink-0 text-white/90/60 transition-transform duration-200 sm:block ${
className={`hidden flex-shrink-0 text-white/90 transition-transform duration-200 sm:block ${
open ? "rotate-180" : ""
}`}
/>
Expand Down Expand Up @@ -224,7 +224,7 @@ const ComboMarketHeaderUnified: FC<ComboMarketHeaderUnifiedProps> = ({

const liquidity = poolStats?.[0]?.liquidity;
const volume = poolStats?.[0]?.volume
? new Decimal(poolStats[0].volume).div(ZTG).toNumber()
? new Decimal(poolStats[0].volume).div(ZTG).toNumber() * 100
: 0;

const participants = (poolStats?.[0] as any)?.traders;
Expand Down Expand Up @@ -315,7 +315,7 @@ const ComboMarketHeaderUnified: FC<ComboMarketHeaderUnifiedProps> = ({

{/* Arrow indicator */}
<div className="flex h-5 w-5 items-center justify-center self-center rounded-full bg-white/10 shadow-md backdrop-blur-sm">
<span className="text-xs font-medium leading-none text-white/90/60">
<span className="text-xs font-medium leading-none text-white/90">
→
</span>
</div>
Expand Down
4 changes: 2 additions & 2 deletions components/markets/MarketContextActionOutcomeSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ const MarketContextActionOutcomeSelector = ({
type="text"
ref={inputRef}
placeholder="Search Assets"
className="h-[44px] w-full rounded-lg bg-white/10 px-4 text-sm text-white/90 shadow-md backdrop-blur-sm placeholder:text-white/90/60 focus:bg-white/15 focus:shadow-lg"
className="h-[44px] w-full rounded-lg bg-white/10 px-4 text-sm text-white/90 shadow-md backdrop-blur-sm placeholder:text-white/90 focus:bg-white/15 focus:shadow-lg"
value={search ?? ""}
onChange={(event) => {
setSearch(event.target.value);
Expand All @@ -282,7 +282,7 @@ const MarketContextActionOutcomeSelector = ({
type="text"
ref={inputRef}
placeholder="Search outcomes..."
className="h-[40px] w-full rounded-lg bg-white/10 px-3 text-sm text-white/90 backdrop-blur-sm transition-all placeholder:text-white/90/60 focus:bg-white/15 focus:shadow-md focus:ring-2 focus:ring-ztg-green-500/30"
className="h-[40px] w-full rounded-lg bg-white/10 px-3 text-sm text-white/90 backdrop-blur-sm transition-all placeholder:text-white/90 focus:bg-white/15 focus:shadow-md focus:ring-2 focus:ring-ztg-green-500/30"
value={search ?? ""}
onChange={(event) => {
setSearch(event.target.value);
Expand Down
10 changes: 5 additions & 5 deletions components/markets/MarketHistoryModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export const MarketHistoryModal: FC<MarketHistoryModalProps> = ({
<div className="text-sm text-white/90">
{marketStart}
{marketHistory?.start?.blockNumber > 0 && (
<span className="ml-2 text-xs text-white/90/60">
<span className="ml-2 text-xs text-white/90">
Block #{marketHistory.start.blockNumber}
</span>
)}
Expand All @@ -123,7 +123,7 @@ export const MarketHistoryModal: FC<MarketHistoryModalProps> = ({
<div className="text-sm text-white/90">
{marketClosed}
{marketHistory?.end?.blockNumber > 0 && (
<span className="ml-2 text-xs text-white/90/60">
<span className="ml-2 text-xs text-white/90">
Block #{marketHistory.end.blockNumber}
</span>
)}
Expand Down Expand Up @@ -164,7 +164,7 @@ export const MarketHistoryModal: FC<MarketHistoryModalProps> = ({
</span>
</div>
</div>
<div className="text-xs text-white/90/60">
<div className="text-xs text-white/90">
{marketHistory.reported.timestamp &&
new Intl.DateTimeFormat("default", {
dateStyle: "medium",
Expand Down Expand Up @@ -209,7 +209,7 @@ export const MarketHistoryModal: FC<MarketHistoryModalProps> = ({
disputed the reported outcome
</div>
</div>
<div className="text-xs text-white/90/60">
<div className="text-xs text-white/90">
{dispute.timestamp &&
new Intl.DateTimeFormat("default", {
dateStyle: "medium",
Expand Down Expand Up @@ -246,7 +246,7 @@ export const MarketHistoryModal: FC<MarketHistoryModalProps> = ({
</span>
</div>
</div>
<div className="text-xs text-white/90/60">
<div className="text-xs text-white/90">
{marketHistory.resolved.timestamp &&
new Intl.DateTimeFormat("default", {
dateStyle: "medium",
Expand Down
Loading
Loading