fix(trading): order trading.json

.github/workflows/console-test-run.yml

@@ -19,7 +19,7 @@ jobs:
   create-docker-image:
     name: Create docker image for console-test
     runs-on: ubuntu-22.04
-    timeout-minutes: 20
+    timeout-minutes: 90
     steps:
       #----------------------------------------------
       #       check-out frontend-monorepo
@@ -138,7 +138,7 @@ jobs:
     name: run-tests
     runs-on: 8-cores
     needs: [create-docker-image, console-test-branch]
-    timeout-minutes: 20
+    timeout-minutes: 90
     steps:
       #----------------------------------------------
       #       load docker image
@@ -205,7 +205,7 @@ jobs:
       # run tests
       #----------------------------------------------
       - name: Run tests
-        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v -s --numprocesses 4 --dist loadfile --durations=15
+        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v -s --numprocesses 2 --dist loadfile --durations=90
         working-directory: apps/trading/e2e
       #----------------------------------------------
       # upload traces
@@ -230,28 +230,43 @@ jobs:
       #----------------------------------------------
       #  -----  upload market-sim logs  -----
       #----------------------------------------------
-      - name: Find Directory
-        id: find-dir
+      - name: Prepare and Zip market-sim-logs
+        if: always()
         run: |
-          DIR=$(find /tmp -type d -name "vega-sim-*" -print -quit)
-          if [[ -d "$DIR" ]]; then
-            echo "Found directory: $DIR"
-            echo "DIR=$DIR" >> $GITHUB_ENV
-          else
-            echo "Directory not found."
-            exit 1
+          parent_dir="/tmp/market-sim-logs"
+          echo "Creating parent directory at $parent_dir"
+          mkdir -p "$parent_dir"
+
+          echo "Waiting for vega-sim-* folders to be created..."
+          sleep 10  # Waits 10 seconds to ensure all folders are created
+
+          echo "Before searching for vega-sim-* folders in /tmp..."
+          folders=$(find /tmp -mindepth 1 -type d -name 'vega-sim-*' -print) || echo "Find command failed with exit code $?"
+
+          echo "After searching for vega-sim-* folders in /tmp..."
+
+          if [ -z "$folders" ]; then
+            echo "No vega-sim-* folders found."
+            exit 0
           fi
 
-      - name: Compress Files
-        if: env.DIR
-        run: |
-          tar -czvf ${{ github.workspace }}/market-sim-logs.tar.gz -C "$DIR" .
-          echo "Compressed files at ${{ github.workspace }}/market-sim-logs.tar.gz"
+          echo "Moving vega-sim-* folders to $parent_dir"
+          echo "$folders" | xargs -I {} mv {} "$parent_dir/"
 
-      - name: Upload Compressed market-sim-logs
+          echo "Checking if $parent_dir is not empty..."
+          if [ "$(ls -A $parent_dir)" ]; then
+            echo "Zipping the parent directory..."
+            zip -r market-sim-logs.zip "$parent_dir" && echo "Zip file created successfully."
+          else
+            echo "$parent_dir is empty. No zip file created."
+            exit 0
+          fi
+        shell: /usr/bin/bash -e {0}
+
+      - name: Upload market-sim-logs
         uses: actions/upload-artifact@v3
-        if: env.DIR
+        if: always()
         with:
           name: market-sim-logs
-          path: ${{ github.workspace }}/market-sim-logs.tar.gz
+          path: market-sim-logs.zip
           retention-days: 15

apps/trading/.env.mainnet

@@ -28,3 +28,6 @@ NX_REFERRALS=true
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
+
+NX_CHARTING_LIBRARY_PATH=https://assets.vega.community/trading-view-bundle/v0.0.1/
+NX_CHARTING_LIBRARY_HASH=PDjWaqPFndDp+LCvqbKvntWriaqNzNpZ5i9R/BULzCg=

apps/trading/e2e/.env

@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.73.10
+VEGA_VERSION=v0.74.0-preview.2
 LOCAL_SERVER=false

apps/trading/e2e/.env.develop

@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:develop
-VEGA_VERSION=v0.73.10
-LOCAL_SERVER=false
+VEGA_VERSION=v0.74.0-preview.2
+LOCAL_SERVER=false

apps/trading/e2e/fixtures/market.py

@@ -25,7 +25,7 @@ def setup_simple_market(
 
     vega.mint(
         MM_WALLET.name,
-        asset="VOTE",
+        asset=vega.find_asset_id(symbol="VOTE", enabled=True),
         amount=mint_amount,
     )
 
@@ -207,7 +207,7 @@ def setup_perps_market(
 
     vega.mint(
         MM_WALLET.name,
-        asset="VOTE",
+        asset=vega.find_asset_id(symbol="VOTE", enabled=True),
         amount=mint_amount,
     )
 

apps/trading/e2e/poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
 
 [[package]]
 name = "certifi"
@@ -1160,8 +1160,8 @@ profile = ["pytest-profiling", "snakeviz"]
 [package.source]
 type = "git"
 url = "https://github.com/vegaprotocol/vega-market-sim.git/"
-reference = "fix/genesis_panic"
-resolved_reference = "de30d2d4c7a1b81a830527ca76473e23ef59de12"
+reference = "HEAD"
+resolved_reference = "2aed8c94b25d8fa2e376d3b63ca1f9193d28cdfd"
 
 [[package]]
 name = "websocket-client"
@@ -1342,4 +1342,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.11"
-content-hash = "68ed0de55290a3b929d47eb7f7b031fb7e172261c7bbeb4f554b7c27a4462754"
+content-hash = "39ce8400de7bf060857447281ef27bd78c9b1d9639da063b051e3ae6e7887a67"

apps/trading/e2e/pyproject.toml

@@ -9,7 +9,7 @@ packages = [{include = "trading market-sim e2e"}]
 [tool.poetry.dependencies]
 python = ">=3.9,<3.11"
 psutil = "^5.9.5"
-vega-sim = {git = "https://github.com/vegaprotocol/vega-market-sim.git/", branch = "fix/genesis_panic"}
+vega-sim = {git = "https://github.com/vegaprotocol/vega-market-sim.git/"}
 pytest-playwright = "^0.4.2"
 docker = "^6.1.3"
 pytest-xdist = "^3.3.1"

apps/trading/e2e/tests/deal_ticket/test_basic_submit.py

@@ -47,8 +47,8 @@ def test_limit_buy_order_GTT(continuous_market, vega: VegaServiceNull, page: Pag
     vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
     # 7002-SORD-017
-    expect(page.get_by_role("row").nth(2)).to_contain_text(
-        "BTC:DAI_2023Futr10+10LimitFilled120.00GTT:"
+    expect(page.get_by_role("row").nth(5)).to_contain_text(
+        "10+10LimitFilled120.00GTT:"
     )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
@@ -64,8 +64,8 @@ def test_limit_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
     vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
     # 7002-SORD-017
-    expect(page.get_by_role("row").nth(2)).to_contain_text(
-        "BTC:DAI_2023Futr10+10LimitFilled120.00GTC"
+    expect(page.get_by_role("row").nth(6)).to_contain_text(
+        "10+10LimitFilled120.00GTC"
     )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
@@ -88,8 +88,8 @@ def test_limit_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
-    expect(page.get_by_role("row").nth(2)).to_contain_text(
-        "BTC:DAI_2023Futr10-10LimitFilled100.00GFN"
+    expect(page.get_by_role("row").nth(7)).to_contain_text(
+        "10-10LimitFilled100.00GFN"
     )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
@@ -112,8 +112,8 @@ def test_market_sell_order(continuous_market, vega: VegaServiceNull, page: Page)
     vega.wait_for_total_catchup()
     
     page.get_by_test_id("All").click()
-    expect(page.get_by_role("row").nth(2)).to_contain_text(
-        "BTC:DAI_2023Futr10-10MarketFilled-IOC"
+    expect(page.get_by_role("row").nth(8)).to_contain_text(
+        "10-10MarketFilled-IOC"
     )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
@@ -131,6 +131,6 @@ def test_market_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
     # 7002-SORD-010
     # 0003-WTXN-012
     # 0003-WTXN-003
-    expect(page.get_by_role("row").nth(2)).to_contain_text(
-        "BTC:DAI_2023Futr10+10MarketFilled-FOK"
+    expect(page.get_by_role("row").nth(9)).to_contain_text(
+        "10+10MarketFilled-FOK"
     )

apps/trading/e2e/tests/deal_ticket/test_stop_order.py

@@ -27,7 +27,7 @@ submit_stop_order = "place-order"
 stop_orders_tab = "Stop orders"
 row_table = "row"
 cancel = "cancel"
-market_name_col = '[col-id="market.tradableInstrument.instrument.code"]'
+market_name_col = '[data-testid="market-code"]'
 trigger_col = '[col-id="trigger"]'
 expiresAt_col = '[col-id="expiresAt"]'
 size_col = '[col-id="submission.size"]'

apps/trading/e2e/tests/fees/test_fees.py

@@ -53,7 +53,7 @@ FEE_BREAKDOWN_TOOLTIP = "fee-breakdown-tooltip"
 PINNED_ROW_LOCATOR = ".ag-pinned-left-cols-container .ag-row"
 ROW_LOCATOR = ".ag-center-cols-container .ag-row"
 # Col-Ids:
-COL_INSTRUMENT_CODE = '[col-id="market.tradableInstrument.instrument.code"]'
+COL_INSTRUMENT_CODE = '[data-testid="market-code"]'
 COL_CODE = '[col-id="code"]'
 COL_SIZE = '[col-id="size"]'
 COL_PRICE = '[col-id="price"]'
@@ -563,7 +563,6 @@ def test_fills_taker_discount_program(
     page.goto(f"/#/markets/{market_id}")
     page.get_by_test_id(FILLS).click()
     row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
-    expect(row.locator(COL_INSTRUMENT_CODE)).to_have_text("BTC:DAI_2023Futr")
     expect(row.locator(COL_SIZE)).to_have_text(size)
     expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
     expect(row.locator(COL_PRICE_1)).to_have_text(price_1)
@@ -605,7 +604,6 @@ def test_fills_maker_discount_program(
     change_keys(page, vega_instance, MM_WALLET.name)
     page.get_by_test_id(FILLS).click()
     row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
-    expect(row.locator(COL_INSTRUMENT_CODE)).to_have_text("BTC:DAI_2023Futr")
     expect(row.locator(COL_SIZE)).to_have_text(size)
     expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
     expect(row.locator(COL_PRICE_1)).to_have_text(price_1)

apps/trading/e2e/tests/get_started/test_get_started.py

@@ -77,7 +77,7 @@ class TestGetStarted:
 
         vega.mint(
             MM_WALLET.name,
-            asset="VOTE",
+            asset=vega.find_asset_id(symbol="VOTE", enabled=True),
             amount=mint_amount,
         )
 
@@ -105,6 +105,8 @@ class TestGetStarted:
 
         vega.wait_fn(1)
         vega.wait_for_total_catchup()
+        page.reload()
+
         # Assert step 2 complete
         expect(page.get_by_test_id("icon-tick")).to_have_count(2)
 

apps/trading/e2e/tests/market/test_closed_markets.py

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

apps/trading/e2e/tests/market/test_markets_proposed.py

@@ -56,9 +56,6 @@ def test_renders_markets_correctly(proposed_market, page: Page):
     page.goto(f"/#/markets/all")
     page.click('[data-testid="Proposed markets"]')
     row = page.locator(row_selector)
-    # 6001-MARK-049
-    expect(row.locator(col_market_id)).to_have_text("BTC:DAI_2023")
-
     # 6001-MARK-051
     expect(row.locator('[col-id="asset"]')).to_have_text("tDAI")
 

apps/trading/e2e/tests/market/test_monitoring_auction_price_volatility_market.py

@@ -68,11 +68,11 @@ def setup_market_monitoring_auction(vega: VegaServiceNull, simple_market):
     vega.wait_for_total_catchup()
 
     # add orders that change the price so that it goes beyond the limits of price monitoring
-    submit_order(vega, MM_WALLET.name, simple_market, "SIDE_SELL", 100, 110)
-    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 100, 90)
-    submit_order(vega, MM_WALLET.name, simple_market, "SIDE_SELL", 100, 105)
-    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 100, 95)
-    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 1, 105)
+    submit_order(vega, MM_WALLET.name, simple_market, "SIDE_SELL", 100, 300)
+    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 100, 290)
+    submit_order(vega, MM_WALLET.name, simple_market, "SIDE_SELL", 100, 305)
+    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 100, 295)
+    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 1, 305)
 
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
@@ -89,7 +89,6 @@ def test_market_monitoring_auction_price_volatility_limit_order(
     page.get_by_test_id("order-price").type("110")
     page.get_by_test_id("order-tif").select_option("Fill or Kill (FOK)")
     page.get_by_test_id("place-order").click()
-
     expect(page.get_by_test_id("deal-ticket-error-message-tif")).to_have_text(
         "This market is in auction due to high price volatility. Until the auction ends, you can only place GFA, GTT, or GTC limit orders."
     )
@@ -110,8 +109,8 @@ def test_market_monitoring_auction_price_volatility_limit_order(
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
-    expect(page.get_by_role("row").nth(2)).to_contain_text(
-        "BTC:DAI_2023Futr0+1LimitActive110.00GTC"
+    expect(page.get_by_role("row").nth(4)).to_contain_text(
+        "0+1LimitActive110.00GTC"
     )
 
 
@@ -125,7 +124,6 @@ def test_market_monitoring_auction_price_volatility_market_order(
     page.get_by_test_id("order-size").type("1")
     # 7002-SORD-060
     page.get_by_test_id("place-order").click()
-
     expect(page.get_by_test_id("deal-ticket-error-message-tif")).to_have_text(
         "This market is in auction due to high price volatility. Until the auction ends, you can only place GFA, GTT, or GTC limit orders."
     )

apps/trading/e2e/tests/market_lifecycle/test_market_lifecycle.py

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

apps/trading/e2e/tests/order/test_order_match.py

@@ -65,7 +65,6 @@ def test_limit_order_trade_open_order(
     expect(orderbook_trade).to_be_visible()
 
     expected_open_order = [
-        "BTC:DAI_2023",
         "+1",
         "Limit",
         "Active",
@@ -87,9 +86,6 @@ def test_limit_order_trade_open_position(continuous_market, page: Page):
     secondary_id = "stack-cell-secondary"
 
     position = {
-        "market_code": "BTC:DAI_2023",
-        "settlement_asset": "tDAI",
-        "product_type": "Futr",
         "size": "+1",
         "notional": "107.50",
         "average_entry_price": "107.50",
@@ -107,12 +103,6 @@ def test_limit_order_trade_open_position(continuous_market, page: Page):
     # 7004-POSI-001
     # 7004-POSI-002
 
-    market = table.locator("[col-id='marketCode']")
-    expect(market.get_by_test_id(primary_id)).to_have_text(position["market_code"])
-    expect(market.get_by_test_id(secondary_id)).to_have_text(
-        position["settlement_asset"] + position["product_type"]
-    )
-
     size_and_notional = table.locator("[col-id='openVolume']")
     expect(size_and_notional.get_by_test_id(primary_id)).to_have_text(position["size"])
     expect(size_and_notional.get_by_test_id(secondary_id)).to_have_text(

apps/trading/e2e/tests/order/test_order_status.py

@@ -257,46 +257,63 @@ def test_order_sorted(page: Page):
 
 def test_order_status_active(page: Page):
     # 7002-SORD-041
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
-        "market-2Futr" + "0" + "-10" + "Limit" + "Active" + "150.00" + "GTC"
+    expect(page.locator('[row-index="2"]').first).to_contain_text(
+        "market-2Futr"
+    )
+    expect(page.locator('[row-index="2"]').nth(1)).to_contain_text(
+        "0" + "-10" + "Limit" + "Active" + "150.00" + "GTC"
     )
 
 
 def test_status_expired(page: Page):
     # 7002-SORD-042
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
-        "market-3Futr" + "0" + "-10" + "Limit" + "Expired" + "120.00" + "GTT:"
+    expect(page.locator('[row-index="7"]').first).to_contain_text(
+        "market-3Futr"
+    )
+    expect(page.locator('[row-index="7"]').nth(1)).to_contain_text(
+        "0" + "-10" + "Limit" + "Expired" + "120.00" + "GTT:"
     )
 
 
 def test_order_status_Stopped(page: Page):
     # 7002-SORD-044
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
-        "market-1Futr" + "0" + "-100" + "Limit" + "Stopped" + "130.00" + "IOC"
+    expect(page.locator('[row-index="12"]').first).to_contain_text(
+        "market-1Futr"
+    )
+    expect(page.locator('[row-index="12"]').nth(1)).to_contain_text(
+        "0" + "-100" + "Limit" + "Stopped" + "130.00" + "IOC"
     )
 
 
 def test_order_status_partially_filled(page: Page):
     # 7002-SORD-045
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
-        "market-2Futr" + "99" + "+100" + "Limit" + "Partially Filled" + "104.00" + "IOC"
+    expect(page.locator('[row-index="8"]').first).to_contain_text(
+        "market-2Futr"
+    )
+    expect(page.locator('[row-index="8"]').nth(1)).to_contain_text(
+        "99" + "+100" + "Limit" + "Partially Filled" + "104.00" + "IOC"
     )
 
 
 def test_order_status_filled(page: Page):
     # 7002-SORD-046
     # 7003-MORD-020
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
-        "market-1Futr" + "100" + "-100" + "Limit" + "Filled" + "88.00" + "GTC"
+    expect(page.locator('[row-index="11"]').first).to_contain_text(
+        "market-1Futr"
+    )
+    expect(page.locator('[row-index="11"]').nth(1)).to_contain_text(
+        "100" + "-100" + "Limit" + "Filled" + "88.00" + "GTC"
     )
 
 
 def test_order_status_rejected(page: Page):
     # 7002-SORD-047
     # 7003-MORD-018
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
+    expect(page.locator('[row-index="9"]').first).to_contain_text(
         "market-1Futr"
-        + "0"
+    )
+    expect(page.locator('[row-index="9"]').nth(1)).to_contain_text(
+        "0"
         + "-10,000,000,000"
         + "Limit"
         + "Rejected: Margin check failed"
@@ -308,9 +325,11 @@ def test_order_status_rejected(page: Page):
 def test_order_status_parked(page: Page):
     #  7002-SORD-048
     #  7003-MORD-016
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
+    expect(page.locator('[row-index="3"]').first).to_contain_text(
         "market-5Futr"
-        + "0"
+    )
+    expect(page.locator('[row-index="3"]').nth(1)).to_contain_text(
+        "0"
         + "-60"
         + "Ask + 15.00 Peg limit"
         + "Parked"
@@ -321,9 +340,11 @@ def test_order_status_parked(page: Page):
 
 def test_order_status_pegged_ask(page: Page):
     #  7003-MORD-016
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
+    expect(page.locator('[row-index="4"]').first).to_contain_text(
         "market-4Futr"
-        + "0"
+    )
+    expect(page.locator('[row-index="4"]').nth(1)).to_contain_text(
+        "0"
         + "-60"
         + "Ask + 15.00 Peg limit"
         + "Active"
@@ -334,9 +355,11 @@ def test_order_status_pegged_ask(page: Page):
 
 def test_order_status_pegged_bid(page: Page):
     #  7003-MORD-016
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
+    expect(page.locator('[row-index="5"]').first).to_contain_text(
         "market-4Futr"
-        + "0"
+    )
+    expect(page.locator('[row-index="5"]').nth(1)).to_contain_text(
+        "0"
         + "+40"
         + "Bid - 10.00 Peg limit"
         + "Active"
@@ -347,9 +370,11 @@ def test_order_status_pegged_bid(page: Page):
 
 def test_order_status_pegged_mid(page: Page):
     #  7003-MORD-016
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
+    expect(page.locator('[row-index="6"]').first).to_contain_text(
         "market-4Futr"
-        + "0"
+    )
+    expect(page.locator('[row-index="6"]').nth(1)).to_contain_text(
+        "0"
         + "+20"
         + "Mid - 5.00 Peg limit"
         + "Active"
@@ -372,9 +397,11 @@ def test_order_amend_order(vega: VegaServiceNull, page: Page):
     vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
-
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
-        "market-2Futr" + "0" + "-15" + "Limit" + "Active" + "170.00" + "GTC"
+    expect(page.locator('[row-index="1"]').first).to_contain_text(
+        "market-2Futr"
+    )
+    expect(page.locator('[row-index="1"]').nth(1)).to_contain_text(
+        "0" + "-15" + "Limit" + "Active" + "170.00" + "GTC"
     )
 
 
@@ -389,9 +416,11 @@ def test_order_cancel_single_order(vega: VegaServiceNull, page: Page):
     vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
-
-    expect(page.get_by_test_id(order_tab)).to_contain_text(
-        "market-3Futr" + "0" + "+10" + "Limit" + "Cancelled" + "60.00" + "GTC"
+    expect(page.locator('[row-index="0"]').first).to_contain_text(
+        "market-3Futr"
+    )
+    expect(page.locator('[row-index="0"]').nth(1)).to_contain_text(
+        "0" + "+10" + "Limit" + "Cancelled" + "60.00" + "GTC"
     )
 
 

apps/trading/e2e/tests/positions/test_positions.py

@@ -22,7 +22,7 @@ def test_closed_market_position(vega: VegaServiceNull, page: Page):
     expect(page.locator(".ag-overlay-panel")).to_have_text("No positions")
     page.get_by_test_id("open-transfer").click()
     tab = page.get_by_test_id("tab-positions")
-    table = tab.locator(".ag-center-cols-container")
+    table = tab.locator('[class="ag-body ag-layout-normal"]')
     market = table.locator("[col-id='marketCode']")
     expect(market.get_by_test_id("stack-cell-primary")).to_have_text("BTC:DAI_2023")
     page.get_by_test_id("open-transfer").click()

apps/trading/e2e/tests/trade_history/test_trade_history.py

@@ -73,6 +73,6 @@ def test_limit_order_new_trade_top_of_list(
 def test_price_copied_to_deal_ticket(continuous_market, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id("Trades").click()
-    page.locator("[col-id=price]").last.click()
+    page.locator("[col-id=price]").nth(1).click()
     # 6005-THIS-007
     expect(page.get_by_test_id("order-price")).to_have_value("107.50000")

apps/trading/e2e/tests/wallet/test_wallet.py

@@ -116,7 +116,7 @@ def test_wallet_transaction_rejected(continuous_market, page: Page):
     page.get_by_test_id(order_price).fill("120")
     page.route("**/*", handle_route_connection_rejected)
     page.get_by_test_id(place_order).click()
-    expect(page.get_by_test_id("toast-content")).to_have_text(
+    expect(page.get_by_test_id("toast-content").nth(0)).to_have_text(
         "Error occurredthe user rejected the wallet connection"
     )
 

libs/i18n/src/locales/en/trading.json

@@ -1,25 +1,24 @@
 {
   "(Combined set volume {{runningVolume}} over last {{epochs}} epochs)": "(Combined set volume {{runningVolume}} over last {{epochs}} epochs)",
   "(Created at: {{createdAt}})": "(Created at: {{createdAt}})",
-  "{{amount}} $VEGA staked": "{{amount}} $VEGA staked",
-  "{{assetSymbol}} Reward pot": "{{assetSymbol}} Reward pot",
-  "{{checkedAssets}} Assets": "{{checkedAssets}} Assets",
-  "{{distance}} ago": "{{distance}} ago",
-  "{{instrumentCode}} liquidity provision": "{{instrumentCode}} liquidity provision",
-  "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>": "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>",
+  "(Tier {{tier}} as of last epoch)": "(Tier {{tier}} as of last epoch)",
   "24h vol": "24h vol",
   "24h volume": "24h volume",
+  "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>": "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>",
   "A percentage of commission earned by the referrer": "A percentage of commission earned by the referrer",
   "A successor to this market has been proposed": "A successor to this market has been proposed",
   "About the referral program": "About the referral program",
   "Active": "Active",
+  "Activity Streak": "Activity Streak",
   "All": "All",
   "An unknown error occurred.": "An unknown error occurred.",
   "Anonymous": "Anonymous",
   "Anyone with the referral link can apply it to their key(s) of choice via an on chain transaction": "Anyone with the referral link can apply it to their key(s) of choice via an on chain transaction",
+  "Assessed over": "Assessed over",
   "Asset (1)": "Asset (1)",
   "Assets": "Assets",
   "Available to withdraw this epoch": "Available to withdraw this epoch",
+  "Average position": "Average position",
   "Base commission rate": "Base commission rate",
   "Base rate": "Base rate",
   "Best bid": "Best bid",
@@ -30,9 +29,6 @@
   "Changes have been proposed for this market. <0>View proposals</0>": "Changes have been proposed for this market. <0>View proposals</0>",
   "Chart": "Chart",
   "Chart by <0>TradingView</0>": "Chart by <0>TradingView</0>",
-  "checkOutProposalsAndVote": "Check out the terms of the proposals and vote:",
-  "checkOutProposalsAndVote_one": "Check out the terms of the proposal and vote:",
-  "checkOutProposalsAndVote_other": "Check out the terms of the proposals and vote:",
   "Close": "Close",
   "Close menu": "Close menu",
   "Closed": "Closed",
@@ -55,6 +51,13 @@
   "Countdown": "Countdown",
   "Create a referral code": "Create a referral code",
   "Current tier": "Current tier",
+  "DISCLAIMER_P1": "Vega is a decentralised peer-to-peer protocol that can be used to trade derivatives with cryptoassets. The Vega Protocol is an implementation layer (layer one) protocol made of free, public, open-source or source-available software. Use of the Vega Protocol involves various risks, including but not limited to, losses while digital assets are supplied to the Vega Protocol and losses due to the fluctuation of prices of assets.",
+  "DISCLAIMER_P2": "Before using the Vega Protocol, review the relevant documentation at docs.vega.xyz to make sure that you understand how it works. Conduct your own due diligence and consult your financial advisor before making any investment decisions.",
+  "DISCLAIMER_P3": "As described in the Vega Protocol core license, the Vega Protocol is provided “as is”, at your own risk, and without warranties of any kind. Although Gobalsky Labs Limited developed much of the initial code for the Vega Protocol, it does not provide or control the Vega Protocol, which is run by third parties deploying it on a bespoke blockchain. Upgrades and modifications to the Vega Protocol are managed in a community-driven way by holders of the VEGA governance token.",
+  "DISCLAIMER_P4": "No developer or entity involved in creating the Vega Protocol will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the Vega Protocol, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or legal costs, or loss of profits, cryptoassets, tokens or anything else of value.",
+  "DISCLAIMER_P5": "This website is hosted on a decentralised network, the Interplanetary File System (“IPFS”). The IPFS decentralised web is made up of all the computers (nodes) connected to it. Data is therefore stored on many different computers.",
+  "DISCLAIMER_P6": "The information provided on this website does not constitute investment advice, financial advice, trading advice, or any other sort of advice and you should not treat any of the website's content as such. No party recommends that any cryptoasset should be bought, sold, or held by you via this website. No party ensures the accuracy of information listed on this website or holds any responsibility for any missing or wrong information. You understand that you are using any and all information available here at your own risk.",
+  "DISCLAIMER_P7": "Additionally, just as you can access email protocols such as SMTP through multiple email clients, you can potentially access the Vega Protocol through many web or mobile interfaces. You are responsible for doing your own diligence on those interfaces to understand the associated risks and any fees.",
   "Dark mode": "Dark mode",
   "Date Joined": "Date Joined",
   "Depending on data node retention you may not be able see the full 30 days": "Depending on data node retention you may not be able see the full 30 days",
@@ -64,13 +67,6 @@
   "Depth": "Depth",
   "Description": "Description",
   "Disclaimer": "Disclaimer",
-  "DISCLAIMER_P1": "Vega is a decentralised peer-to-peer protocol that can be used to trade derivatives with cryptoassets. The Vega Protocol is an implementation layer (layer one) protocol made of free, public, open-source or source-available software. Use of the Vega Protocol involves various risks, including but not limited to, losses while digital assets are supplied to the Vega Protocol and losses due to the fluctuation of prices of assets.",
-  "DISCLAIMER_P2": "Before using the Vega Protocol, review the relevant documentation at docs.vega.xyz to make sure that you understand how it works. Conduct your own due diligence and consult your financial advisor before making any investment decisions.",
-  "DISCLAIMER_P3": "As described in the Vega Protocol core license, the Vega Protocol is provided “as is”, at your own risk, and without warranties of any kind. Although Gobalsky Labs Limited developed much of the initial code for the Vega Protocol, it does not provide or control the Vega Protocol, which is run by third parties deploying it on a bespoke blockchain. Upgrades and modifications to the Vega Protocol are managed in a community-driven way by holders of the VEGA governance token.",
-  "DISCLAIMER_P4": "No developer or entity involved in creating the Vega Protocol will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the Vega Protocol, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or legal costs, or loss of profits, cryptoassets, tokens or anything else of value.",
-  "DISCLAIMER_P5": "This website is hosted on a decentralised network, the Interplanetary File System (“IPFS”). The IPFS decentralised web is made up of all the computers (nodes) connected to it. Data is therefore stored on many different computers.",
-  "DISCLAIMER_P6": "The information provided on this website does not constitute investment advice, financial advice, trading advice, or any other sort of advice and you should not treat any of the website's content as such. No party recommends that any cryptoasset should be bought, sold, or held by you via this website. No party ensures the accuracy of information listed on this website or holds any responsibility for any missing or wrong information. You understand that you are using any and all information available here at your own risk.",
-  "DISCLAIMER_P7": "Additionally, just as you can access email protocols such as SMTP through multiple email clients, you can potentially access the Vega Protocol through many web or mobile interfaces. You are responsible for doing your own diligence on those interfaces to understand the associated risks and any fees.",
   "Disconnect": "Disconnect",
   "Discount": "Discount",
   "Discounts are applied automatically during trading based on the key(s) used": "Discounts are applied automatically during trading based on the key(s) used",
@@ -78,12 +74,13 @@
   "Earn commission & stake rewards": "Earn commission & stake rewards",
   "Earned by me": "Earned by me",
   "Enactment date reached and usual auction exit checks pass": "Enactment date reached and usual auction exit checks pass",
+  "Ends in": "Ends in",
+  "Entity scope": "Entity scope",
   "Environment not configured": "Environment not configured",
-  "epochs in referral set": "epochs in referral set",
   "Epochs in set": "Epochs in set",
   "Epochs to next tier": "Epochs to next tier",
-  "Expected {{distance}} ago": "Expected {{distance}} ago",
   "Expected in {{distance}}": "Expected in {{distance}}",
+  "Expected {{distance}} ago": "Expected {{distance}} ago",
   "Experiment for free with virtual assets on <0>Fairground Testnet</0>": "Experiment for free with virtual assets on <0>Fairground Testnet</0>",
   "Expiry": "Expiry",
   "Explore": "Explore",
@@ -97,14 +94,15 @@
   "From epoch": "From epoch",
   "Fully decentralised high performance peer-to-network trading.": "Fully decentralised high performance peer-to-network trading.",
   "Funding": "Funding",
-  "Funding history": "Funding history",
   "Funding Payments": "Funding Payments",
-  "Funding payments": "Funding payments",
   "Funding Rate": "Funding Rate",
+  "Funding history": "Funding history",
+  "Funding payments": "Funding payments",
   "Funding rate": "Funding rate",
   "Futures": "Futures",
   "Generate a referral code to share with your friends and start earning commission.": "Generate a referral code to share with your friends and start earning commission.",
   "Generate code": "Generate code",
+  "Get rewards for providing liquidity. Get rewards for providing liquidity.": "Get rewards for providing liquidity. Get rewards for providing liquidity.",
   "Get started": "Get started",
   "Give Feedback": "Give Feedback",
   "Go back and try again": "Go back and try again",
@@ -119,18 +117,19 @@
   "Hoarder reward multiplier": "Hoarder reward multiplier",
   "How it works": "How it works",
   "I want a code": "I want a code",
+  "INTERVAL_I15M": "15m",
+  "INTERVAL_I1D": "1D",
+  "INTERVAL_I1H": "1H",
+  "INTERVAL_I1M": "1m",
+  "INTERVAL_I5M": "5m",
+  "INTERVAL_I6H": "6H",
   "Improve vega console": "Improve vega console",
   "Inactive": "Inactive",
   "Index Price": "Index Price",
   "Indicators": "Indicators",
+  "Individual": "Individual",
   "Infrastructure": "Infrastructure",
   "Interval: {{interval}}": "Interval: {{interval}}",
-  "INTERVAL_I1M": "1m",
-  "INTERVAL_I5M": "5m",
-  "INTERVAL_I15M": "15m",
-  "INTERVAL_I1H": "1H",
-  "INTERVAL_I6H": "6H",
-  "INTERVAL_I1D": "1D",
   "Invite friends and earn rewards from the trading fees they pay. Stake those rewards to earn multipliers on future rewards.": "Invite friends and earn rewards from the trading fees they pay. Stake those rewards to earn multipliers on future rewards.",
   "Learn about providing liquidity": "Learn about providing liquidity",
   "Learn more": "Learn more",
@@ -154,16 +153,11 @@
   "Metamask Snap <0>quick start</0>": "Metamask Snap <0>quick start</0>",
   "Min. epochs": "Min. epochs",
   "Min. trading volume": "Min. trading volume",
-  "minTradingVolume": "Min. trading volume (last {{count}} epochs)",
-  "minTradingVolume_one": "Min. trading volume (last {{count}} epoch)",
-  "minTradingVolume_other": "Min. trading volume (last {{count}} epochs)",
   "My current volume": "My current volume",
   "My liquidity provision": "My liquidity provision",
   "My trading fees": "My trading fees",
-  "myVolume": "My volume (last {{count}} epochs)",
-  "myVolume_one": "My volume (last {{count}} epoch)",
-  "myVolume_other": "My volume (last {{count}} epochs)",
   "Name": "Name",
+  "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>": "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>",
   "No closed orders": "No closed orders",
   "No data": "No data",
   "No deposits": "No deposits",
@@ -173,7 +167,6 @@
   "No market": "No market",
   "No markets": "No markets",
   "No markets.": "No markets.",
-  "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>": "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>",
   "No open orders": "No open orders",
   "No orders": "No orders",
   "No party accepts any liability for any losses whatsoever.": "No party accepts any liability for any losses whatsoever.",
@@ -181,6 +174,7 @@
   "No referral program active": "No referral program active",
   "No rejected orders": "No rejected orders",
   "No rewards": "No rewards",
+  "No rows": "No rows",
   "No thanks": "No thanks",
   "No third party has access to your funds.": "No third party has access to your funds.",
   "No volume discount program active": "No volume discount program active",
@@ -189,6 +183,7 @@
   "Non-custodial and pseudonymous": "Non-custodial and pseudonymous",
   "None": "None",
   "Not connected": "Not connected",
+  "Number of epochs after distribution to delay vesting of rewards by": "Number of epochs after distribution to delay vesting of rewards by",
   "Number of traders": "Number of traders",
   "Open": "Open",
   "Open a position": "Open a position",
@@ -197,11 +192,9 @@
   "Order": "Order",
   "Orderbook": "Orderbook",
   "Orders": "Orders",
+  "PRNT": "PRNT",
   "Page not found": "Page not found",
   "Parent of a market": "Parent of a market",
-  "pastEpochs": "Past {{count}} epochs",
-  "pastEpochs_one": "Past {{count}} epoch",
-  "pastEpochs_other": "Past {{count}} epochs",
   "Pennant": "Pennant",
   "Perpetuals": "Perpetuals",
   "Please choose another market from the <0>market list</0>": "Please choose another market from the <0>market list</0>",
@@ -209,15 +202,12 @@
   "Portfolio": "Portfolio",
   "Positions": "Positions",
   "Price": "Price",
-  "PRNT": "PRNT",
   "Program ends:": "Program ends:",
   "Propose a new market": "Propose a new market",
   "Proposed final price is {{price}} {{assetSymbol}}.": "Proposed final price is {{price}} {{assetSymbol}}.",
   "Proposed markets": "Proposed markets",
   "Providing liquidity": "Providing liquidity",
   "Purpose built proof of stake blockchain": "Purpose built proof of stake blockchain",
-  "qUSD": "qUSD",
-  "qUSD provides a rough USD equivalent of balances across all assets using the value of \"Quantum\" for that asset": "qUSD provides a rough USD equivalent of balances across all assets using the value of \"Quantum\" for that asset",
   "Read the terms": "Read the terms",
   "Ready to trade": "Ready to trade",
   "Ready to trade with real funds? <0>Switch to Mainnet</0>": "Ready to trade with real funds? <0>Switch to Mainnet</0>",
@@ -225,9 +215,6 @@
   "Referral benefits": "Referral benefits",
   "Referral discount": "Referral discount",
   "Referrals": "Referrals",
-  "referralStatisticsCommission": "Commission earned in <0>qUSD</0> (<1>last {{count}} epochs</1>)",
-  "referralStatisticsCommission_one": "Commission earned in <0>qUSD</0> (<1>last {{count}} epoch</1>)",
-  "referralStatisticsCommission_other": "Commission earned in <0>qUSD</0> (<1>last {{count}} epochs</1>)",
   "Referrer commission": "Referrer commission",
   "Referrer trading discount": "Referrer trading discount",
   "Referrers earn commission based on a percentage of the taker fees their referees pay": "Referrers earn commission based on a percentage of the taker fees their referees pay",
@@ -237,12 +224,12 @@
   "Required for next tier": "Required for next tier",
   "Reset Columns": "Reset Columns",
   "Resources": "Resources",
+  "Reward bonus": "Reward bonus",
+  "Reward {{reward}}x": "Reward {{reward}}x",
   "Rewards": "Rewards",
+  "Rewards funded using the pro-rata strategy should be distributed pro-rata by each entity's reward metric scaled by any active multipliers that party has": " Rewards funded using the pro-rata strategy should be distributed pro-rata by each entity's reward metric scaled by any active multipliers that party has",
   "Rewards history": "Rewards history",
   "Rewards multipliers": "Rewards multipliers",
-  "runningNotionalOverEpochs": "Combined running notional over the {{count}} epochs",
-  "runningNotionalOverEpochs_one": "Combined running notional over the {{count}} epoch",
-  "runningNotionalOverEpochs_other": "Combined running notional over the {{count}} epochs",
   "SCCR": "SCCR",
   "Search": "Search",
   "See all markets": "See all markets",
@@ -261,6 +248,7 @@
   "Spread": "Spread",
   "Stake a minimum of {{minimumStakedTokens}} $VEGA tokens": "Stake a minimum of {{minimumStakedTokens}} $VEGA tokens",
   "Stake some $VEGA now": "Stake some $VEGA now",
+  "Staked VEGA": "Staked VEGA",
   "Staking multiplier": "Staking multiplier",
   "Start trading": "Start trading",
   "Start trading on the worlds most advanced decentralised exchange.": "Start trading on the worlds most advanced decentralised exchange.",
@@ -273,6 +261,7 @@
   "Supplied stake": "Supplied stake",
   "Suspended due to price or liquidity monitoring trigger": "Suspended due to price or liquidity monitoring trigger",
   "Target stake": "Target stake",
+  "Team": "Team",
   "The amount of fees paid to liquidity providers across the whole market during the last epoch {{epoch}}.": "The amount of fees paid to liquidity providers across the whole market during the last epoch {{epoch}}.",
   "The commission is taken from the infrastructure fee, maker fee, and liquidity provider fee, not from the referee": "The commission is taken from the infrastructure fee, maker fee, and liquidity provider fee, not from the referee",
   "The external time weighted average price (TWAP) received from the data source defined in the data sourcing specification.": "The external time weighted average price (TWAP) received from the data source defined in the data sourcing specification.",
@@ -282,42 +271,41 @@
   "The successor market <0>{{instrumentName}}</0> has a 24h trading volume of {{successorVolume}}": "The successor market <0>{{instrumentName}}</0> has a 24h trading volume of {{successorVolume}}",
   "The successor market is <0>{{instrumentName}}</0>": "The successor market is <0>{{instrumentName}}</0>",
   "The transaction could not be sent": "The transaction could not be sent",
+  "This market URL is not available any more.": "This market URL is not available any more.",
   "This market expires in {{duration}}.": "This market expires in {{duration}}.",
   "This market expires when triggered by its oracle, not on a set date.": "This market expires when triggered by its oracle, not on a set date.",
   "This market has been settled": "This market has been settled",
   "This market has been succeeded": "This market has been succeeded",
   "This market has been suspended via a governance vote and can be resumed or terminated by further votes.": "This market has been suspended via a governance vote and can be resumed or terminated by further votes.",
-  "This market URL is not available any more.": "This market URL is not available any more.",
   "This timestamp is user curated metadata and does not drive any on-chain functionality.": "This timestamp is user curated metadata and does not drive any on-chain functionality.",
   "Tier": "Tier",
-  "to": "to",
+  "Tier {{tier}}": "Tier {{tier}}",
+  "Tier {{userTier}}": "Tier {{userTier}}",
   "To protect the network from spam, you must have at least {{requiredFunds}} qUSD of any asset on the network to proceed.": "To protect the network from spam, you must have at least {{requiredFunds}} qUSD of any asset on the network to proceed.",
   "Toast location": "Toast location",
   "Total discount": "Total discount",
   "Total distributed": "Total distributed",
   "Total fee after discount": "Total fee after discount",
   "Total fee before discount": "Total fee before discount",
-  "totalCommission": "Total commission (<0>last {{count}} epochs</0>)",
-  "totalCommission_one": "Total commission (<0>last {{count}} epoch</0>)",
-  "totalCommission_other": "Total commission (<0>last {{count}} epochs</0>)",
   "Trader": "Trader",
   "Trades": "Trades",
   "Trading": "Trading",
-  "TradingView": "TradingView",
   "Trading has been terminated as a result of the product definition": "Trading has been terminated as a result of the product definition",
   "Trading mode": "Trading mode",
   "Trading on market {{name}} may stop on {{date}}. There is an open proposal to close this market.": "Trading on market {{name}} may stop on {{date}}. There is an open proposal to close this market.",
   "Trading on market {{name}} may stop. There are open proposals to close this market": "Trading on market {{name}} may stop. There are open proposals to close this market",
   "Trading on market {{name}} will stop on {{date}}": "Trading on market {{name}} will stop on {{date}}",
+  "TradingView": "TradingView",
   "Transfer": "Transfer",
   "Unknown": "Unknown",
   "Unknown settlement date": "Unknown settlement date",
-  "Vega chart": "Vega chart",
   "Vega Reward pot": "Vega Reward pot",
   "Vega Wallet <0>full featured<0>": "Vega Wallet <0>full featured<0>",
+  "Vega chart": "Vega chart",
   "Vesting": "Vesting",
-  "Vesting {{assetSymbol}}": "Vesting {{assetSymbol}}",
   "Vesting multiplier": "Vesting multiplier",
+  "Vesting {{assetSymbol}}": "Vesting {{assetSymbol}}",
+  "Vesting {{vesting}}x": "Vesting {{vesting}}x",
   "View as party": "View as party",
   "View liquidity provision table": "View liquidity provision table",
   "View on Explorer": "View on Explorer",
@@ -330,9 +318,6 @@
   "Volume (24h)": "Volume (24h)",
   "Volume discount": "Volume discount",
   "Volume to next tier": "Volume to next tier",
-  "volumeLastEpochs": "Volume (last {{count}} epochs)",
-  "volumeLastEpochs_one": "Volume (last {{count}} epoch)",
-  "volumeLastEpochs_other": "Volume (last {{count}} epochs)",
   "Wallet": "Wallet",
   "We're sorry but we don't have an active referral programme currently running. You can propose a new programme <0>here</0>.": "We're sorry but we don't have an active referral programme currently running. You can propose a new programme <0>here</0>.",
   "Welcome to Vega trading!": "Welcome to Vega trading!",
@@ -344,36 +329,51 @@
   "You need a <0>Vega wallet</0> to start trading in this market.": "You need a <0>Vega wallet</0> to start trading in this market.",
   "You need at least {{requiredStake}} VEGA staked to generate a referral code and participate in the referral program.": "You need at least {{requiredStake}} VEGA staked to generate a referral code and participate in the referral program.",
   "You will no longer be able to hold a position on this market when it closes in {{duration}}.": "You will no longer be able to hold a position on this market when it closes in {{duration}}.",
-  "youAreJoiningTheGroup": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.",
-  "youAreJoiningTheGroup_one": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epoch.",
-  "youAreJoiningTheGroup_other": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.",
   "Your code has been rejected": "Your code has been rejected",
   "Your identity is always anonymous on Vega": "Your identity is always anonymous on Vega",
   "Your referral code": "Your referral code",
   "Your tier": "Your tier",
-  "Number of epochs after distribution to delay vesting of rewards by": "Number of epochs after distribution to delay vesting of rewards by",
-  "numberEpochs": "{{count}} epochs",
-  "numberEpochs_other": "{{count}} epochs",
-  "numberEpochs_one": "{{count}} epoch",
-  "epochsStreak": "{{count}} epochs streak",
+  "checkOutProposalsAndVote": "Check out the terms of the proposals and vote:",
+  "checkOutProposalsAndVote_one": "Check out the terms of the proposal and vote:",
+  "checkOutProposalsAndVote_other": "Check out the terms of the proposals and vote:",
   "epochStreak_one": "{{count}} epoch streak",
-  "Get rewards for providing liquidity. Get rewards for providing liquidity.": "Get rewards for providing liquidity. Get rewards for providing liquidity.",
-  "Entity scope": "Entity scope",
-  "Staked VEGA": "Staked VEGA",
-  "Average position": "Average position",
-  "Individual": "Individual",
-  "Rewards funded using the pro-rata strategy should be distributed pro-rata by each entity's reward metric scaled by any active multipliers that party has": " Rewards funded using the pro-rata strategy should be distributed pro-rata by each entity's reward metric scaled by any active multipliers that party has",
-  "Tier {{tier}}": "Tier {{tier}}",
-  "Reward {{reward}}x": "Reward {{reward}}x",
-  "Vesting {{vesting}}x": "Vesting {{vesting}}x",
-  "Tier {{userTier}}": "Tier {{userTier}}",
-  "{{reward}}x": "{{reward}}x",
-  "Reward bonus": "Reward bonus",
-  "Activity Streak": "Activity Streak",
+  "epochs in referral set": "epochs in referral set",
+  "epochsStreak": "{{count}} epochs streak",
+  "minTradingVolume": "Min. trading volume (last {{count}} epochs)",
+  "minTradingVolume_one": "Min. trading volume (last {{count}} epoch)",
+  "minTradingVolume_other": "Min. trading volume (last {{count}} epochs)",
+  "myVolume": "My volume (last {{count}} epochs)",
+  "myVolume_one": "My volume (last {{count}} epoch)",
+  "myVolume_other": "My volume (last {{count}} epochs)",
+  "numberEpochs": "{{count}} epochs",
+  "numberEpochs_one": "{{count}} epoch",
+  "numberEpochs_other": "{{count}} epochs",
+  "pastEpochs": "Past {{count}} epochs",
+  "pastEpochs_one": "Past {{count}} epoch",
+  "pastEpochs_other": "Past {{count}} epochs",
+  "qUSD": "qUSD",
+  "qUSD provides a rough USD equivalent of balances across all assets using the value of \"Quantum\" for that asset": "qUSD provides a rough USD equivalent of balances across all assets using the value of \"Quantum\" for that asset",
+  "referralStatisticsCommission": "Commission earned in <0>qUSD</0> (<1>last {{count}} epochs</1>)",
+  "referralStatisticsCommission_one": "Commission earned in <0>qUSD</0> (<1>last {{count}} epoch</1>)",
+  "referralStatisticsCommission_other": "Commission earned in <0>qUSD</0> (<1>last {{count}} epochs</1>)",
+  "runningNotionalOverEpochs": "Combined running notional over the {{count}} epochs",
+  "runningNotionalOverEpochs_one": "Combined running notional over the {{count}} epoch",
+  "runningNotionalOverEpochs_other": "Combined running notional over the {{count}} epochs",
+  "to": "to",
+  "totalCommission": "Total commission (<0>last {{count}} epochs</0>)",
+  "totalCommission_one": "Total commission (<0>last {{count}} epoch</0>)",
+  "totalCommission_other": "Total commission (<0>last {{count}} epochs</0>)",
   "userActive": "{{active}} trader: {{count}} epochs so far",
-  "(Tier {{tier}} as of last epoch)": "(Tier {{tier}} as of last epoch)",
-  "Team": "Team",
-  "Ends in": "Ends in",
-  "Assessed over": "Assessed over",
-  "No rows": "No rows"
+  "volumeLastEpochs": "Volume (last {{count}} epochs)",
+  "volumeLastEpochs_one": "Volume (last {{count}} epoch)",
+  "volumeLastEpochs_other": "Volume (last {{count}} epochs)",
+  "youAreJoiningTheGroup": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.",
+  "youAreJoiningTheGroup_one": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epoch.",
+  "youAreJoiningTheGroup_other": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.",
+  "{{amount}} $VEGA staked": "{{amount}} $VEGA staked",
+  "{{assetSymbol}} Reward pot": "{{assetSymbol}} Reward pot",
+  "{{checkedAssets}} Assets": "{{checkedAssets}} Assets",
+  "{{distance}} ago": "{{distance}} ago",
+  "{{instrumentCode}} liquidity provision": "{{instrumentCode}} liquidity provision",
+  "{{reward}}x": "{{reward}}x"
 }

libs/ui-toolkit/src/components/slider/leverage-slider.stories.tsx

@@ -0,0 +1,36 @@
+import type { Story, Meta } from '@storybook/react';
+import { LeverageSlider } from './leverage-slider';
+import { useState } from 'react';
+
+export default {
+  component: LeverageSlider,
+  title: 'LeverageSlider',
+} as Meta;
+
+const Template: Story = ({ value: val, min, max, ...args }) => {
+  const [value, setValue] = useState(val);
+
+  const onValueChange = (val: [number]) => {
+    setValue(val);
+  };
+
+  return (
+    <>
+      <LeverageSlider
+        onValueChange={onValueChange}
+        value={value}
+        max={max}
+        {...args}
+      />
+      <div className="mt-10">{value}</div>
+    </>
+  );
+};
+
+export const Default = Template.bind({});
+
+Default.args = {
+  max: 100,
+  step: 0.1,
+  value: [100],
+};

libs/ui-toolkit/src/components/slider/leverage-slider.tsx

@@ -0,0 +1,58 @@
+import * as SliderPrimitive from '@radix-ui/react-slider';
+import type { SliderProps } from '@radix-ui/react-slider';
+import classNames from 'classnames';
+
+export const LeverageSlider = (
+  props: Omit<SliderProps, 'min' | 'max'> & Required<Pick<SliderProps, 'max'>>
+) => {
+  const step = [2, 5, 10, 20, 25].find((step) => props.max / step <= 6);
+  const min = 1;
+  const value = props.value?.[0] || props.defaultValue?.[0];
+  return (
+    <SliderPrimitive.Root
+      {...props}
+      min={min}
+      className="relative flex items-center select-none touch-none h-10 pb-5 w-full"
+    >
+      <SliderPrimitive.Track className=" relative grow h-[4px]">
+        <span className="bg-vega-clight-500 dark:bg-vega-cdark-500 absolute left-2 right-2 top-0 bottom-0"></span>
+        <span className="block absolute top-[-2px] left-[8px] right-[8px]">
+          {step &&
+            new Array(Math.floor(props.max / step) + 1)
+              .fill(null)
+              .map((v, i) => {
+                const labelValue = step * i || 1;
+                const higherThanValue = value && labelValue > value;
+                return (
+                  <span
+                    className="absolute flex flex-col items-center translate-x-[-50%]"
+                    style={{
+                      left: `${
+                        ((labelValue - min) / (props.max - min)) * 100
+                      }%`,
+                    }}
+                  >
+                    <span
+                      className={classNames(
+                        'block w-[8px] h-[8px] border-[4px] rotate-45',
+                        {
+                          'border-black dark:border-white bg-white dark:bg-white':
+                            !higherThanValue,
+                          'border-vega-clight-500 dark:border-vega-cdark-500 bg-vega-clight-500 dark:bg-vega-cdark-500':
+                            higherThanValue,
+                        }
+                      )}
+                    ></span>
+                    <span className="text-sm mt-1">{labelValue}x</span>
+                  </span>
+                );
+              })}
+        </span>
+        <SliderPrimitive.Range className="absolute h-full">
+          <span className="absolute left-2 right-0 h-full bg-black dark:bg-white"></span>
+        </SliderPrimitive.Range>
+      </SliderPrimitive.Track>
+      <SliderPrimitive.Thumb className="block w-[16px] h-[16px] border-[3px] border-black dark:border-white bg-white dark:bg-black rotate-45 focus-visible:outline-0" />
+    </SliderPrimitive.Root>
+  );
+};