diff --git a/apps/trading/components/rewards-container/active-rewards.tsx b/apps/trading/components/rewards-container/active-rewards.tsx index 199fa42b4..7c4d3c193 100644 --- a/apps/trading/components/rewards-container/active-rewards.tsx +++ b/apps/trading/components/rewards-container/active-rewards.tsx @@ -309,49 +309,29 @@ export const ActiveRewardCard = ({ ].includes(m.state) ); - const assetInSettledMarket = - allMarkets && - Object.values(allMarkets).some((m: MarketFieldsFragment | null) => { - if (m && getAsset(m).id === dispatchStrategy.dispatchMetricAssetId) { - return ( - m?.state && - [ - MarketState.STATE_TRADING_TERMINATED, - MarketState.STATE_SETTLED, - MarketState.STATE_CANCELLED, - MarketState.STATE_CLOSED, - ].includes(m.state) - ); - } - return false; - }); - if (marketSettled) { return null; } - // Gray out the cards that are related to suspended markets - const suspended = transferNode.markets?.some( + const assetInActiveMarket = + allMarkets && + Object.values(allMarkets).some((m: MarketFieldsFragment | null) => { + if (m && getAsset(m).id === dispatchStrategy.dispatchMetricAssetId) { + return m?.state && MarketState.STATE_ACTIVE === m.state; + } + return false; + }); + + const marketSuspended = transferNode.markets?.some( (m) => m?.state === MarketState.STATE_SUSPENDED || m?.state === MarketState.STATE_SUSPENDED_VIA_GOVERNANCE ); - const assetInSuspendedMarket = - allMarkets && - Object.values(allMarkets).some((m: MarketFieldsFragment | null) => { - if (m && getAsset(m).id === dispatchStrategy.dispatchMetricAssetId) { - return ( - m?.state === MarketState.STATE_SUSPENDED || - m?.state === MarketState.STATE_SUSPENDED_VIA_GOVERNANCE - ); - } - return false; - }); - // Gray out the cards that are related to suspended markets + // Or settlement assets in markets that are not active and eligible for rewards const { gradientClassName, mainClassName } = - suspended || assetInSuspendedMarket || assetInSettledMarket + marketSuspended || !assetInActiveMarket ? { gradientClassName: 'from-vega-cdark-500 to-vega-clight-400', mainClassName: 'from-vega-cdark-400 dark:from-vega-cdark-600 to-20%', @@ -437,12 +417,12 @@ export const ActiveRewardCard = ({ {DispatchMetricLabels[dispatchStrategy.dispatchMetric]} •{' '}