diff --git a/apps/trading/components/market-banner/market-banner.tsx b/apps/trading/components/market-banner/market-banner.tsx index 8d447f619..dbb5f5153 100644 --- a/apps/trading/components/market-banner/market-banner.tsx +++ b/apps/trading/components/market-banner/market-banner.tsx @@ -1,10 +1,6 @@ import compact from 'lodash/compact'; -import { type Proposal, ProposalState, MarketState } from '@vegaprotocol/types'; -import { - ExternalLink, - Intent, - NotificationBanner, -} from '@vegaprotocol/ui-toolkit'; +import { type Proposal, type ProposalState, MarketState } from '@vegaprotocol/types'; +import { Intent, NotificationBanner } from '@vegaprotocol/ui-toolkit'; import { useSuccessorMarket, useMarketState, @@ -12,9 +8,10 @@ import { type Market, } from '@vegaprotocol/markets'; import { useState } from 'react'; -import { Trans } from 'react-i18next'; import { useMarketProposals } from '@vegaprotocol/proposals'; import { MarketSuspendedBanner } from './market-suspended-banner'; +import { MarketUpdateBanner } from './market-update-banner'; +import { MarketUpdateStateBanner } from './market-update-state-banner'; type UpdateMarketBanner = { kind: 'UpdateMarket'; @@ -87,7 +84,7 @@ export const MarketBanner = ({ marketId }: { marketId: string }) => { const { data: marketState } = useMarketState(marketId); const { proposals: openProposals, loading: openLoading } = - useProposalsForMarket(marketId, ProposalState.STATE_OPEN); + useProposalsForMarket(marketId); // eslint-disable-next-line const { data: successorData, loading: successorLoading } = @@ -133,23 +130,11 @@ const NotificationQueue = ({ notifications }: { notifications: Banner[] }) => { switch (n.kind) { case 'UpdateMarket': { - content = ( -

- - View proposals - , - ]} - /> -

- ); + content = ; break; } case 'UpdateMarketState': { - content =

UpdateMarketState

; + content = ; break; } case 'NewMarket': { diff --git a/apps/trading/components/market-banner/market-update-banner.tsx b/apps/trading/components/market-banner/market-update-banner.tsx new file mode 100644 index 000000000..e798c66d1 --- /dev/null +++ b/apps/trading/components/market-banner/market-update-banner.tsx @@ -0,0 +1,24 @@ +import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment'; +import { ExternalLink } from '@vegaprotocol/ui-toolkit'; +import { Trans } from 'react-i18next'; + +export const MarketUpdateBanner = ({ + proposal, +}: { + proposal: { id: string }; +}) => { + const tokenLink = useLinks(DApp.Governance); + const proposalLink = tokenLink(TOKEN_PROPOSAL.replace(':id', proposal.id)); + return ( +

+ + View proposals + , + ]} + /> +

+ ); +}; diff --git a/apps/trading/components/market-banner/market-update-state-banner.tsx b/apps/trading/components/market-banner/market-update-state-banner.tsx new file mode 100644 index 000000000..8e6584cb4 --- /dev/null +++ b/apps/trading/components/market-banner/market-update-state-banner.tsx @@ -0,0 +1,7 @@ +export const MarketUpdateStateBanner = ({ + proposal, +}: { + proposal: { id: string }; +}) => { + return

Market may or may not close with price X at Y time

; +}; diff --git a/libs/i18n/src/locales/en/trading.json b/libs/i18n/src/locales/en/trading.json index 754b47bfb..5c13f8ea1 100644 --- a/libs/i18n/src/locales/en/trading.json +++ b/libs/i18n/src/locales/en/trading.json @@ -28,6 +28,7 @@ "By using the Vega Console, you acknowledge that you have read and understood the <0>Vega Console Disclaimer": "By using the Vega Console, you acknowledge that you have read and understood the <0>Vega Console Disclaimer", "Chart": "Chart", "Change (24h)": "Change (24h)", + "Changes have been proposed for this market. <0>View proposals": "Changes have been proposed for this market. <0>View proposals", "Chart": "Chart", "Chart by <0>TradingView": "Chart by <0>TradingView", "checkOutProposalsAndVote": "Check out the terms of the proposals and vote:",