Skip to content

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

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 12, 2025
Merged

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

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
36 changes: 13 additions & 23 deletions components/account/AccountButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
<Menu.Button className="w-full md:w-full md:shrink-0">
<div className="relative z-[110] flex h-full w-full min-w-0 cursor-pointer items-center rounded-full md:w-full md:shrink-0">
<div
className={`flex h-full w-full min-w-0 items-center justify-center gap-2 rounded-full border-2 bg-white/10 px-3 py-2 text-white shadow-md backdrop-blur-lg transition-all hover:border-white/30 hover:bg-white/15 hover:shadow-lg md:min-w-0 md:shrink-0 md:gap-2.5 md:px-3 md:py-2 ${
className={`flex h-full w-full min-w-0 items-center justify-center gap-2 rounded-full border-2 bg-white/10 px-3 py-2 text-white/90 shadow-md backdrop-blur-lg transition-all hover:border-white/30 hover:bg-white/15 hover:shadow-lg md:min-w-0 md:shrink-0 md:gap-2.5 md:px-3 md:py-2 ${
open
? "border-ztg-green-500/60 bg-white/15 shadow-lg shadow-ztg-green-500/10 ring-2 ring-ztg-green-500/20"
: "border-white/20"
Expand All @@ -163,7 +163,7 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
</div>
<span
className={`flex min-w-0 flex-1 items-center justify-center overflow-hidden text-center text-sm font-semibold transition-all md:min-w-0 md:whitespace-nowrap md:text-center md:text-sm ${
open ? "text-ztg-green-400" : "text-white"
open ? "text-ztg-green-500" : "text-white/90"
}`}
title={
(() => {
Expand Down Expand Up @@ -199,7 +199,7 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
size={20}
className={`h-5 w-5 transition-all duration-200 md:h-4 md:w-4 ${
open
? "rotate-180 text-ztg-green-400"
? "rotate-180 text-ztg-green-500"
: "text-white/90"
}`}
/>
Expand Down Expand Up @@ -240,7 +240,7 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
Account is acting proxy for:
</label>
<div className="flex items-center gap-1">
<div className="text-sm text-white">
<div className="text-sm text-white/90">
{realAddress &&
shortenAddress(
realAddress,
Expand Down Expand Up @@ -299,12 +299,12 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
{/* Close button for mobile */}
{isMobile && (
<div className="mb-4 flex shrink-0 items-center justify-between border-b-2 border-white/10 px-4 pb-3">
<span className="text-base font-semibold text-white">
<span className="text-base font-semibold text-white/90">
Account
</span>
<button
onClick={close}
className="flex h-11 w-11 touch-manipulation items-center justify-center rounded-lg bg-white/10 text-white transition-all hover:bg-white/20 active:scale-95"
className="flex h-11 w-11 touch-manipulation items-center justify-center rounded-lg bg-white/10 text-white/90 transition-all hover:bg-white/20 active:scale-95"
>
<X size={20} />
</button>
Expand All @@ -326,13 +326,6 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
balance={usdcAssetHubBalance}
className="text-[10px] md:text-xs"
/>
{/* DISABLED: USDC.wh temporarily disabled */}
{/* <BalanceRow
imgPath="/currencies/usdc.svg"
units="USDC.wh"
balance={usdcMoonbeamBalance}
className="text-[10px] md:text-xs"
/> */}
<BalanceRow
imgPath="/currencies/dot.png"
units="DOT"
Expand All @@ -358,7 +351,7 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
</span>
<ArrowRight
size={20}
className="h-5 w-5 text-ztg-green-400 transition-transform group-hover:translate-x-1 md:h-4 md:w-4"
className="h-5 w-5 text-ztg-green-500 transition-transform group-hover:translate-x-1 md:h-4 md:w-4"
/>
</div>
</Link>
Expand Down Expand Up @@ -400,7 +393,7 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
>
<div className="relative">
<Bell
className="text-ztg-green-400 transition-colors"
className="text-ztg-green-500 transition-colors"
size={20}
/>
{hasNotifications && (
Expand All @@ -411,7 +404,7 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
Notifications
</span>
{hasNotifications && (
<span className="flex h-8 w-8 items-center justify-center rounded-full bg-ztg-green-500/20 text-xs font-semibold text-ztg-green-400 md:h-8 md:w-8 md:text-xs">
<span className="flex h-8 w-8 items-center justify-center rounded-full bg-ztg-green-500/20 text-xs font-semibold text-ztg-green-500 md:h-8 md:w-8 md:text-xs">
{alerts.length}
</span>
)}
Expand All @@ -436,7 +429,7 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
}}
>
<User
className="text-ztg-green-400 transition-colors"
className="text-ztg-green-500 transition-colors"
size={20}
/>
<span className="text-sm font-medium md:text-sm">
Expand All @@ -457,7 +450,7 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
}`}
>
<BarChart
className="text-ztg-green-400 transition-colors"
className="text-ztg-green-500 transition-colors"
size={20}
/>
<span className="text-sm font-medium md:text-sm">
Expand All @@ -481,7 +474,7 @@ const AccountMenuContent: FC<AccountMenuContentProps> = ({
}}
>
<Settings
className="text-ztg-green-400 transition-colors"
className="text-ztg-green-500 transition-colors"
size={20}
/>
<span className="text-sm font-medium md:text-sm">
Expand Down Expand Up @@ -530,7 +523,7 @@ const HeaderActionButton: FC<
> = ({ onClick, disabled, children }) => {
return (
<button
className={`flex w-[185px] cursor-pointer items-center justify-center rounded-full border-2 border-white/20 bg-white/10 px-6 font-semibold leading-[40px] text-white shadow-md backdrop-blur-lg transition-all hover:border-white/30 hover:bg-white/15 hover:shadow-lg hover:shadow-ztg-green-500/10 disabled:cursor-default disabled:opacity-30 disabled:hover:border-white/20 disabled:hover:bg-white/10 disabled:hover:shadow-md`}
className={`flex w-[185px] cursor-pointer items-center justify-center rounded-full border-2 border-white/20 bg-white/10 px-6 font-semibold leading-[40px] text-white/90 shadow-md backdrop-blur-lg transition-all hover:border-white/30 hover:bg-white/15 hover:shadow-lg hover:shadow-ztg-green-500/10 disabled:cursor-default disabled:opacity-30 disabled:hover:border-white/20 disabled:hover:bg-white/10 disabled:hover:shadow-md`}
onClick={onClick}
disabled={disabled}
>
Expand Down Expand Up @@ -578,9 +571,6 @@ const AccountButton: FC<{
const { data: usdcAssetHubBalance } = useBalance(activeAccount?.address, {
ForeignAsset: 4,
});
const { data: usdcMoonbeamBalance } = useBalance(activeAccount?.address, {
ForeignAsset: 1,
});

const { data: constants } = useChainConstants();

Expand Down
2 changes: 1 addition & 1 deletion components/account/AccountModalHead.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const AccountModalHead = () => {

return (
<div className="flex flex-row items-center justify-between">
<h3 className="text-lg font-bold text-white">Account</h3>
<h3 className="text-lg font-bold text-white/90">Account</h3>
<button
className="cursor-pointer rounded-md border-2 border-white/10 bg-white/10 px-3 py-1.5 text-xs font-medium text-white/90 backdrop-blur-sm transition-all hover:border-white/20 hover:bg-white/20"
onClick={() => {
Expand Down
48 changes: 24 additions & 24 deletions components/account/NotificationsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,21 +117,21 @@ export const NotificationsPanel = ({
>
{/* Header */}
<div className="mb-6 flex items-center justify-between border-b-2 border-white/10 pb-4">
<h2 className="text-xl font-bold text-white md:text-2xl">
<h2 className="text-xl font-bold text-white/90 md:text-2xl">
Notifications
</h2>
<div className="flex items-center gap-2">
{alerts.length > 0 && (
<button
onClick={clearAll}
className="touch-manipulation rounded-lg bg-white/10 px-3 py-2 text-sm font-medium text-white/90 backdrop-blur-sm transition-all hover:bg-white/20 hover:text-white active:scale-95"
className="touch-manipulation rounded-lg bg-white/10 px-3 py-2 text-sm font-medium text-white/90 backdrop-blur-sm transition-all hover:bg-white/20 hover:text-white/90 active:scale-95"
>
Clear All
</button>
)}
<button
onClick={onClose}
className="flex h-10 w-10 touch-manipulation items-center justify-center rounded-lg bg-white/10 text-white/90 backdrop-blur-sm transition-all hover:bg-white/20 hover:text-white active:scale-95"
className="flex h-10 w-10 touch-manipulation items-center justify-center rounded-lg bg-white/10 text-white/90 backdrop-blur-sm transition-all hover:bg-white/20 hover:text-white/90 active:scale-95"
>
<X size={20} />
</button>
Expand Down Expand Up @@ -208,15 +208,15 @@ const CourtCaseReadyToSettleItem = ({
>
<div className="mb-2">
<div className="inline-flex items-center gap-1.5 rounded-full bg-gradient-to-r from-blue-500/30 to-blue-600/40 px-2.5 py-1 text-xs font-semibold backdrop-blur-sm">
<LuClipboardCheck size={14} className="text-white" />
<span className="text-white">Ready to Settle</span>
<LuClipboardCheck size={14} className="text-white/90" />
<span className="text-white/90">Ready to Settle</span>
</div>
</div>
<div>
<h3 className="mb-1 text-sm font-semibold text-white">
<h3 className="mb-1 text-sm font-semibold text-white/90">
{market?.question}
</h3>
<p className="text-xs text-white/75">
<p className="text-xs text-white/90/75">
This court case can now be settled.
</p>
</div>
Expand Down Expand Up @@ -245,15 +245,15 @@ const CourtCaseReadyForVoteAlertItem = ({
>
<div className="mb-2">
<div className="inline-flex items-center gap-1.5 rounded-full bg-gradient-to-r from-purple-500/30 to-purple-600/40 px-2.5 py-1 text-xs font-semibold backdrop-blur-sm">
<LuVote size={14} className="text-white" />
<span className="text-white">Ready for Vote</span>
<LuVote size={14} className="text-white/90" />
<span className="text-white/90">Ready for Vote</span>
</div>
</div>
<div>
<h3 className="mb-1 text-sm font-semibold text-white">
<h3 className="mb-1 text-sm font-semibold text-white/90">
{market?.question}
</h3>
<p className="text-xs text-white/75">
<p className="text-xs text-white/90/75">
You have been drawn as juror for this market and can now vote.
</p>
</div>
Expand Down Expand Up @@ -282,15 +282,15 @@ const CourtCaseReadyForRevealAlertItem = ({
>
<div className="mb-2">
<div className="inline-flex items-center gap-1.5 rounded-full bg-gradient-to-r from-green-500/30 to-purple-600/40 px-2.5 py-1 text-xs font-semibold backdrop-blur-sm">
<AiOutlineEye size={14} className="text-white" />
<span className="text-white">Ready to Reveal</span>
<AiOutlineEye size={14} className="text-white/90" />
<span className="text-white/90">Ready to Reveal</span>
</div>
</div>
<div>
<h3 className="mb-1 text-sm font-semibold text-white">
<h3 className="mb-1 text-sm font-semibold text-white/90">
{market?.question}
</h3>
<p className="text-xs text-white/75">
<p className="text-xs text-white/90/75">
You are required to reveal your vote for this court case.
</p>
</div>
Expand All @@ -317,12 +317,12 @@ const ReadyToReportMarketAlertItem = ({
>
<div className="mb-2">
<div className="inline-flex items-center gap-1.5 rounded-full bg-gradient-to-r from-yellow-500/30 to-pink-600/40 px-2.5 py-1 text-xs font-semibold backdrop-blur-sm">
<AiOutlineFileAdd size={14} className="text-white" />
<span className="text-white">Submit Report</span>
<AiOutlineFileAdd size={14} className="text-white/90" />
<span className="text-white/90">Submit Report</span>
</div>
</div>
<div>
<h3 className="text-sm font-semibold text-white">
<h3 className="text-sm font-semibold text-white/90">
{alert.market.question}
</h3>
</div>
Expand Down Expand Up @@ -350,12 +350,12 @@ const RedeemableMarketAlertItem = ({
>
<div className="mb-2">
<div className="inline-flex items-center gap-1.5 rounded-full bg-gradient-to-r from-ztg-green-500/30 to-blue-600/40 px-2.5 py-1 text-xs font-semibold backdrop-blur-sm">
<BiMoneyWithdraw size={14} className="text-white" />
<span className="text-white">Redeemable Tokens</span>
<BiMoneyWithdraw size={14} className="text-white/90" />
<span className="text-white/90">Redeemable Tokens</span>
</div>
</div>
<div>
<h3 className="text-sm font-semibold text-white">
<h3 className="text-sm font-semibold text-white/90">
You have {alert.markets.length} redeemable markets
</h3>
</div>
Expand All @@ -382,14 +382,14 @@ const RelevantMarketDisputeItem = ({
>
<div className="mb-2">
<div className="inline-flex items-center gap-1.5 rounded-full bg-gradient-to-r from-red-500/30 to-orange-600/40 px-2.5 py-1 text-xs font-semibold backdrop-blur-sm">
<span className="text-white">Market Dispute</span>
<span className="text-white/90">Market Dispute</span>
</div>
</div>
<div>
<h3 className="mb-1 text-sm font-semibold text-white">
<h3 className="mb-1 text-sm font-semibold text-white/90">
{alert.market.question}
</h3>
<p className="text-xs text-white/75">
<p className="text-xs text-white/90/75">
A market you're involved in is disputed
</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions components/account/OnboardingModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const exchangeList = [
className: "",
title: "Banxa (Fiat)",
icon: (
<span className="rounded bg-green-600 px-2 py-1 text-xs text-white">
<span className="rounded bg-green-600 px-2 py-1 text-xs text-white/90">
NEW
</span>
),
Expand Down Expand Up @@ -140,7 +140,7 @@ const TextSection = ({
)}
{rightButton && (
<button
className={`w-full rounded-[100px] bg-ztg-green-600/80 text-white shadow-sm backdrop-blur-sm transition-all hover:bg-ztg-green-600 hover:shadow-md ${
className={`w-full rounded-[100px] bg-ztg-green-600/80 text-white/90 shadow-sm backdrop-blur-sm transition-all hover:bg-ztg-green-600 hover:shadow-md ${
rightButton.disabled === true ? "cursor-default opacity-50" : ""
}`}
onClick={rightButton.onClick}
Expand Down
8 changes: 4 additions & 4 deletions components/account/WalletSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const WalletSelect = () => {

return (
<div className="flex flex-col">
<h3 className="mb-5 text-lg font-bold text-white">Connect Wallet</h3>
<h3 className="mb-5 text-lg font-bold text-white/90">Connect Wallet</h3>

{/* Social Login Section */}
{/* <div className="mb-6">
Expand All @@ -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/60">or</span>
<span className="px-3 text-xs font-medium text-white/90/60">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/60">Mobile wallet</div>
<div className="text-xs text-white/90/60">Mobile wallet</div>
</div>
</Link>
<div className="rounded-lg border-2 border-white/10 bg-white/10 p-4 backdrop-blur-sm">
Expand All @@ -134,7 +134,7 @@ const WalletSelect = () => {
Quick Start
</span>
</div>
<ol className="space-y-2 text-xs leading-relaxed text-white/80">
<ol className="space-y-2 text-xs leading-relaxed text-white/90">
<li className="flex items-start gap-2">
<span className="mt-0.5 flex h-5 w-5 shrink-0 items-center justify-center rounded-full bg-white/10 text-[10px] font-bold text-white/70">
1
Expand Down
4 changes: 2 additions & 2 deletions components/assets/AssetActionButtons/DisputeButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ const DisputeButton = ({
<Modal open={isOpen} onClose={() => setOpen(false)}>
<ModalPanel size="md" className="bg-ztg-primary-900/85 border-ztg-primary-200/20">
<div className="relative flex-shrink-0 border-b-2 border-white/10 px-6 pt-6 pb-3">
<h2 className="text-center text-lg font-bold text-white md:text-xl">
<h2 className="text-center text-lg font-bold text-white/90 md:text-xl">
Dispute Outcome
</h2>
<button
onClick={() => setOpen(false)}
className="absolute right-4 top-4 flex h-8 w-8 items-center justify-center rounded-lg border-2 border-white/10 bg-white/10 text-white/90 backdrop-blur-sm transition-all hover:bg-white/20 hover:text-white"
className="absolute right-4 top-4 flex h-8 w-8 items-center justify-center rounded-lg border-2 border-white/10 bg-white/10 text-white/90 backdrop-blur-sm transition-all hover:bg-white/20 hover:text-white/90"
aria-label="Close"
>
<MdClose size={20} />
Expand Down
2 changes: 1 addition & 1 deletion components/assets/AssetActionButtons/RedeemButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ const RedeemButtonByValue = ({
{isSuccess ? (
<div className="flex items-center justify-center gap-2 rounded-lg border border-ztg-green-400/40 bg-ztg-green-500/20 px-3 py-1.5 shadow-md backdrop-blur-sm">
<div className="h-2 w-2 rounded-full bg-ztg-green-400"></div>
<span className="text-sm font-semibold text-ztg-green-400">
<span className="text-sm font-semibold text-ztg-green-500">
Redeemed Tokens!
</span>
</div>
Expand Down
Loading
Loading