LaconicNetwork/vega-frontend-monorepo
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix(trading): use No trading instead of Trading terminated (#5624)

Browse Source
This commit is contained in:
m.ray 2024-01-16 18:30:42 +02:00 committed by GitHub
parent 0fb4348e9c
commit 6a21862378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/trading/client-pages/markets/closed.spec.tsx
View File

@ -314,7 +314,7 @@ describe('Closed', () => {
}); });
it('display market actions', async () => { it('display market actions', async () => {
// Use market with a succcessor Id as the actions dropdown will optionally // Use market with a successor Id as the actions dropdown will optionally
// show a link to the successor market // show a link to the successor market
const marketsWithSuccessorAndParent = [ const marketsWithSuccessorAndParent = [
{ {

2
apps/trading/e2e/tests/market/test_closed_markets.py
View File

@ -131,7 +131,7 @@ def test_terminated_market_no_settlement_date(page: Page, vega: VegaServiceNull)
row_selector = page.locator( row_selector = page.locator(
'[data-testid="tab-closed-markets"] .ag-center-cols-container .ag-row' '[data-testid="tab-closed-markets"] .ag-center-cols-container .ag-row'
).first ).first
expect(row_selector.locator('[col-id="state"]')).to_have_text("Trading Terminated") expect(row_selector.locator('[col-id="state"]')).to_have_text("No trading")
expect(row_selector.locator('[col-id="settlementDate"]')).to_have_text("Unknown") expect(row_selector.locator('[col-id="settlementDate"]')).to_have_text("Unknown")
# TODO Create test for terminated market with settlement date in future # TODO Create test for terminated market with settlement date in future

4
apps/trading/e2e/tests/market_lifecycle/test_market_lifecycle.py
View File

@ -174,9 +174,9 @@ def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
vega.wait_fn(1) vega.wait_fn(1)
vega.wait_for_total_catchup() vega.wait_for_total_catchup()
# market state should be changed to "Trading Terminated" because of the invalid oracle # market state should be changed to "No trading" because of the invalid oracle
expect(trading_mode).to_have_text("No trading") expect(trading_mode).to_have_text("No trading")
expect(market_state).to_have_text("Trading Terminated") expect(market_state).to_have_text("No trading")
# settle market # settle market
vega.submit_termination_and_settlement_data( vega.submit_termination_and_settlement_data(

3
libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx
View File

@ -329,8 +329,9 @@ export const DealTicket = ({
const marketTradingModeError = validateMarketTradingMode( const marketTradingModeError = validateMarketTradingMode(
marketTradingMode, marketTradingMode,
t('Trading terminated') t('No trading')
); );
if (marketTradingModeError !== true) { if (marketTradingModeError !== true) {
return { return {
message: marketTradingModeError, message: marketTradingModeError,

2
libs/i18n/src/locales/en/deal-ticket.json
View File

@ -116,7 +116,7 @@
"Total fees": "Total fees", "Total fees": "Total fees",
"Total margin available": "Total margin available", "Total margin available": "Total margin available",
"TOTAL_MARGIN_AVAILABLE": "Total margin available = general {{assetSymbol}} balance ({{generalAccountBalance}} {{assetSymbol}}) + margin balance ({{marginAccountBalance}} {{assetSymbol}}) - maintenance level ({{marginMaintenance}} {{assetSymbol}}).", "TOTAL_MARGIN_AVAILABLE": "Total margin available = general {{assetSymbol}} balance ({{generalAccountBalance}} {{assetSymbol}}) + margin balance ({{marginAccountBalance}} {{assetSymbol}}) - maintenance level ({{marginMaintenance}} {{assetSymbol}}).",
"Trading terminated": "Trading terminated", "No trading": "No trading",
"Trailing percent offset cannot be higher than 99.9": "Trailing percent offset cannot be higher than 99.9", "Trailing percent offset cannot be higher than 99.9": "Trailing percent offset cannot be higher than 99.9",
"Trailing percent offset cannot be lower than {{trailingPercentOffsetStep}}": "Trailing percent offset cannot be lower than {{trailingPercentOffsetStep}}", "Trailing percent offset cannot be lower than {{trailingPercentOffsetStep}}": "Trailing percent offset cannot be lower than {{trailingPercentOffsetStep}}",
"Trailing percentage offset": "Trailing percentage offset", "Trailing percentage offset": "Trailing percentage offset",