chore: update tests now the list only uses global and infra rewards

apps/trading/.env.testnet

@@ -22,7 +22,7 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
-NX_ISOLATED_MARGIN=true
+NX_ISOLATED_MARGIN=false
 NX_ICEBERG_ORDERS=true
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true

apps/trading/components/fees-container/market-fees.tsx

@@ -21,13 +21,18 @@ const useFeesTableColumnDefs = (): ColDef[] => {
           pinned: 'left',
           width: 150,
         },
+        {
+          field: 'liquidityFee',
+          valueFormatter: ({ value }: { value: number }) => value + '%',
+        },
         {
           field: 'feeAfterDiscount',
           headerName: t('Total fee after discount'),
           valueFormatter: ({ value }: { value: number }) => value + '%',
         },
         {
-          field: 'liquidityFee',
+          field: 'totalFee',
+          headerName: t('Total fee before discount'),
           valueFormatter: ({ value }: { value: number }) => value + '%',
         },
         {
@@ -38,11 +43,6 @@ const useFeesTableColumnDefs = (): ColDef[] => {
           field: 'makerFee',
           valueFormatter: ({ value }: { value: number }) => value + '%',
         },
-        {
-          field: 'totalFee',
-          headerName: t('Total fee before discount'),
-          valueFormatter: ({ value }: { value: number }) => value + '%',
-        },
       ] as ColDef[],
     [t]
   );

apps/trading/components/rewards-container/active-rewards.tsx

@@ -1,5 +1,5 @@
 import { useT } from '../../lib/use-t';
-import { addDecimalsFormatNumber, formatNumber } from '@vegaprotocol/utils';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import classNames from 'classnames';
 import {
   type VegaIconSize,
@@ -24,10 +24,6 @@ import {
   type DispatchStrategy,
   IndividualScopeMapping,
   IndividualScopeDescriptionMapping,
-  AccountType,
-  DistributionStrategy,
-  IndividualScope,
-  type Asset,
 } from '@vegaprotocol/types';
 import { Card } from '../card/card';
 import { type ReactNode, useState } from 'react';
@@ -65,27 +61,22 @@ export const applyFilter = (
   filter: Filter
 ) => {
   const { transfer } = node;
-
-  // if the transfer is a staking reward then it should be displayed
-  if (transfer.toAccountType === AccountType.ACCOUNT_TYPE_GLOBAL_REWARD) {
-    return true;
-  }
-
-  if (transfer.kind.__typename !== 'RecurringTransfer') {
+  if (
+    transfer.kind.__typename !== 'RecurringTransfer' ||
+    !transfer.kind.dispatchStrategy?.dispatchMetric
+  ) {
     return false;
   }
 
   if (
-    (transfer.kind.dispatchStrategy?.dispatchMetric &&
-      DispatchMetricLabels[transfer.kind.dispatchStrategy.dispatchMetric]
-        .toLowerCase()
-        .includes(filter.searchTerm.toLowerCase())) ||
+    DispatchMetricLabels[transfer.kind.dispatchStrategy.dispatchMetric]
+      .toLowerCase()
+      .includes(filter.searchTerm.toLowerCase()) ||
     transfer.asset?.symbol
       .toLowerCase()
       .includes(filter.searchTerm.toLowerCase()) ||
     (
-      (transfer.kind.dispatchStrategy &&
-        EntityScopeLabelMapping[transfer.kind.dispatchStrategy.entityScope]) ||
+      EntityScopeLabelMapping[transfer.kind.dispatchStrategy.entityScope] ||
       'Unspecified'
     )
       .toLowerCase()
@@ -101,7 +92,6 @@ export const applyFilter = (
   ) {
     return true;
   }
-
   return false;
 };
 
@@ -183,29 +173,6 @@ export const ActiveRewardCard = ({
     return null;
   }
 
-  if (
-    !transferNode.transfer.kind.dispatchStrategy &&
-    transferNode.transfer.toAccountType ===
-      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD
-  ) {
-    return (
-      <StakingRewardCard
-        colour={CardColour.WHITE}
-        rewardAmount={addDecimalsFormatNumber(
-          transferNode.transfer.amount,
-          transferNode.transfer.asset?.decimals || 0,
-          6
-        )}
-        rewardAsset={transferNode.transfer.asset || undefined}
-        endsIn={
-          transferNode.transfer.kind.endEpoch != null
-            ? transferNode.transfer.kind.endEpoch - currentEpoch
-            : undefined
-        }
-      />
-    );
-  }
-
   let colour =
     DispatchMetricColourMap[
       transferNode.transfer.kind.dispatchStrategy.dispatchMetric
@@ -233,8 +200,7 @@ export const ActiveRewardCard = ({
         transferNode.transfer.asset?.decimals || 0,
         6
       )}
-      rewardAsset={transferNode.dispatchAsset}
-      transferAsset={transferNode.transfer.asset || undefined}
+      rewardAsset={transferNode.asset}
       endsIn={
         transferNode.transfer.kind.endEpoch != null
           ? transferNode.transfer.kind.endEpoch - currentEpoch
@@ -250,8 +216,6 @@ const RewardCard = ({
   colour,
   rewardAmount,
   rewardAsset,
-  transferAsset,
-  vegaAsset,
   dispatchStrategy,
   endsIn,
   dispatchMetricInfo,
@@ -260,14 +224,12 @@ const RewardCard = ({
   rewardAmount: string;
   /** The asset linked to the dispatch strategy via `dispatchMetricAssetId` property. */
   rewardAsset?: BasicAssetDetails;
-  /** The VEGA asset details, required to format the min staking amount. */
-  transferAsset?: Asset | undefined;
-  /** The VEGA asset details, required to format the min staking amount. */
-  vegaAsset?: BasicAssetDetails;
   /** The transfer's dispatch strategy. */
   dispatchStrategy: DispatchStrategy;
   /** The number of epochs until the transfer stops. */
   endsIn?: number;
+  /** The VEGA asset details, required to format the min staking amount. */
+  vegaAsset?: BasicAssetDetails;
   dispatchMetricInfo?: ReactNode;
 }) => {
   const t = useT();
@@ -307,9 +269,7 @@ const RewardCard = ({
                   {rewardAmount}
                 </span>
 
-                <span className="font-alpha" data-testid="reward-asset">
-                  {transferAsset?.symbol || ''}
-                </span>
+                <span className="font-alpha">{rewardAsset?.symbol || ''}</span>
               </h3>
 
               {/** DISTRIBUTION STRATEGY */}
@@ -350,7 +310,7 @@ const RewardCard = ({
             </div>
           </div>
 
-          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
+          <span className="border-[0.5px] border-gray-700" />
           {/** DISPATCH METRIC */}
           {dispatchMetricInfo ? (
             dispatchMetricInfo
@@ -387,17 +347,16 @@ const RewardCard = ({
           </div>
           {/** DISPATCH METRIC DESCRIPTION */}
           {dispatchStrategy?.dispatchMetric && (
-            <p className="text-muted text-sm h-[3rem]">
+            <span className="text-muted text-sm h-[3rem]">
               {t(DispatchMetricDescription[dispatchStrategy?.dispatchMetric])}
-            </p>
+            </span>
           )}
-          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
+          <span className="border-[0.5px] border-gray-700" />
           {/** REQUIREMENTS */}
           {dispatchStrategy && (
             <RewardRequirements
               dispatchStrategy={dispatchStrategy}
               rewardAsset={rewardAsset}
-              vegaAsset={vegaAsset}
             />
           )}
         </div>
@@ -406,190 +365,6 @@ const RewardCard = ({
   );
 };
 
-const StakingRewardCard = ({
-  colour,
-  rewardAmount,
-  rewardAsset,
-  endsIn,
-}: {
-  colour: CardColour;
-  rewardAmount: string;
-  /** The asset linked to the dispatch strategy via `dispatchMetricAssetId` property. */
-  rewardAsset?: Asset;
-  /** The number of epochs until the transfer stops. */
-  endsIn?: number;
-  /** The VEGA asset details, required to format the min staking amount. */
-  vegaAsset?: BasicAssetDetails;
-}) => {
-  const t = useT();
-  return (
-    <div>
-      <div
-        className={classNames(
-          'bg-gradient-to-r col-span-full p-0.5 lg:col-auto h-full',
-          'rounded-lg',
-          CardColourStyles[colour].gradientClassName
-        )}
-        data-testid="active-rewards-card"
-      >
-        <div
-          className={classNames(
-            CardColourStyles[colour].mainClassName,
-            'bg-gradient-to-b bg-vega-clight-800 dark:bg-vega-cdark-800 h-full w-full rounded-md p-4 flex flex-col gap-4'
-          )}
-        >
-          <div className="flex justify-between gap-4">
-            {/** ENTITY SCOPE */}
-            <div className="flex flex-col gap-2 items-center text-center">
-              <EntityIcon entityScope={EntityScope.ENTITY_SCOPE_INDIVIDUALS} />
-              {
-                <span className="text-muted text-xs" data-testid="entity-scope">
-                  {EntityScopeLabelMapping[
-                    EntityScope.ENTITY_SCOPE_INDIVIDUALS
-                  ] || t('Unspecified')}
-                </span>
-              }
-            </div>
-
-            {/** AMOUNT AND DISTRIBUTION STRATEGY */}
-            <div className="flex flex-col gap-2 items-center text-center">
-              {/** AMOUNT */}
-              <h3 className="flex flex-col gap-1 text-2xl shrink-1 text-center">
-                <span className="font-glitch" data-testid="reward-value">
-                  {rewardAmount}
-                </span>
-
-                <span className="font-alpha">{rewardAsset?.symbol || ''}</span>
-              </h3>
-
-              {/** DISTRIBUTION STRATEGY */}
-              <Tooltip
-                description={t(
-                  DistributionStrategyDescriptionMapping[
-                    DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA
-                  ]
-                )}
-                underline={true}
-              >
-                <span className="text-xs" data-testid="distribution-strategy">
-                  {
-                    DistributionStrategyMapping[
-                      DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA
-                    ]
-                  }
-                </span>
-              </Tooltip>
-            </div>
-
-            {/** DISTRIBUTION DELAY */}
-            <div className="flex flex-col gap-2 items-center text-center">
-              <CardIcon
-                iconName={VegaIconNames.LOCK}
-                tooltip={t(
-                  'Number of epochs after distribution to delay vesting of rewards by'
-                )}
-              />
-              <span
-                className="text-muted text-xs whitespace-nowrap"
-                data-testid="locked-for"
-              >
-                {t('numberEpochs', '{{count}} epochs', {
-                  count: 0,
-                })}
-              </span>
-            </div>
-          </div>
-
-          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
-          {/** DISPATCH METRIC */}
-          {
-            <span data-testid="dispatch-metric-info">
-              {t('Staking rewards')}
-            </span>
-          }
-          <div className="flex items-center gap-8 flex-wrap">
-            {/** ENDS IN */}
-            {endsIn != null && (
-              <span className="flex flex-col">
-                <span className="text-muted text-xs">{t('Ends in')} </span>
-                <span data-testid="ends-in" data-endsin={endsIn}>
-                  {endsIn >= 0
-                    ? t('numberEpochs', '{{count}} epochs', {
-                        count: endsIn,
-                      })
-                    : t('Ended')}
-                </span>
-              </span>
-            )}
-
-            {/** WINDOW LENGTH */}
-            <span className="flex flex-col">
-              <span className="text-muted text-xs">{t('Assessed over')}</span>
-              <span data-testid="assessed-over">
-                {t('numberEpochs', '{{count}} epochs', {
-                  count: 1,
-                })}
-              </span>
-            </span>
-          </div>
-          {/** DISPATCH METRIC DESCRIPTION */}
-          {
-            <p className="text-muted text-sm h-[3rem]">
-              {t(
-                'Global staking reward for staking $VEGA on the network via the Governance app'
-              )}
-            </p>
-          }
-          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
-          {/** REQUIREMENTS */}
-          <dl className="flex justify-between flex-wrap items-center gap-3 text-xs">
-            <div className="flex flex-col gap-1">
-              <dt className="flex items-center gap-1 text-muted">
-                {t('Team scope')}
-              </dt>
-              <dd className="flex items-center gap-1" data-testid="scope">
-                <Tooltip
-                  description={
-                    IndividualScopeDescriptionMapping[
-                      IndividualScope.INDIVIDUAL_SCOPE_ALL
-                    ]
-                  }
-                >
-                  <span>{t('Individual')}</span>
-                </Tooltip>
-              </dd>
-            </div>
-
-            <div className="flex flex-col gap-1">
-              <dt className="flex items-center gap-1 text-muted">
-                {t('Staked VEGA')}
-              </dt>
-              <dd
-                className="flex items-center gap-1"
-                data-testid="staking-requirement"
-              >
-                {formatNumber(1, 2)}
-              </dd>
-            </div>
-
-            <div className="flex flex-col gap-1">
-              <dt className="flex items-center gap-1 text-muted">
-                {t('Average position')}
-              </dt>
-              <dd
-                className="flex items-center gap-1"
-                data-testid="average-position"
-              >
-                {formatNumber(0, 2)}
-              </dd>
-            </div>
-          </dl>
-        </div>
-      </div>
-    </div>
-  );
-};
-
 export const DispatchMetricInfo = ({
   reward,
 }: {
@@ -604,8 +379,8 @@ export const DispatchMetricInfo = ({
   let additionalDispatchMetricInfo = null;
 
   // if asset found then display asset symbol
-  if (reward.dispatchAsset) {
-    additionalDispatchMetricInfo = <span>{reward.dispatchAsset.symbol}</span>;
+  if (reward.asset) {
+    additionalDispatchMetricInfo = <span>{reward.asset.symbol}</span>;
   }
   // but if scoped to only one market then display market name
   if (marketNames.length === 1) {

apps/trading/e2e/conftest.py

@@ -182,7 +182,27 @@ def vega(request):
         request.addfinalizer(lambda: cleanup_container(vega_instance))
         yield vega_instance
 
+@pytest.fixture(scope="session", autouse=True)
+def shared_vega(request):
+    with init_vega(request) as vega_instance:
+        try:
+            request.addfinalizer(lambda: cleanup_container(vega_instance))
+            yield vega_instance
+        finally:
+            cleanup_container(vega_instance)
 
+@pytest.fixture
+def page_shared_vega(shared_vega, browser, request):
+    with init_page(shared_vega, browser, request) as page_instance:
+        yield page_instance
+
+@pytest.fixture
+def auth_shared_vega(shared_vega: VegaServiceNull, page_shared_vega: Page):
+    return auth_setup(shared_vega, page_shared_vega)
+
+@pytest.fixture
+def risk_accepted_shared_vega(page_shared_vega: Page):
+    risk_accepted_setup(page_shared_vega)
 
 def cleanup_container(vega_instance):
     try:
@@ -283,6 +303,10 @@ def opening_auction_market(vega):
     return setup_opening_auction_market(vega)
 
 
+@pytest.fixture(scope="function")
+def shared_continuous_market(shared_vega:VegaServiceNull):
+    return setup_continuous_market(shared_vega)
+
 @pytest.fixture(scope="function")
 def continuous_market(vega):
     return setup_continuous_market(vega)

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

@@ -2,35 +2,62 @@ import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from datetime import datetime, timedelta
-from conftest import init_vega, cleanup_container
+from conftest import init_page, risk_accepted_setup, auth_setup
 from fixtures.market import setup_continuous_market
 from actions.utils import wait_for_toast_confirmation
+from wallet_config import WalletConfig, MM_WALLET2
+
+from actions.utils import (
+    change_keys,
+    create_and_faucet_wallet,
+)
 
 order_size = "order-size"
 order_price = "order-price"
 place_order = "place-order"
 order_side_sell = "order-side-SIDE_SELL"
+order_side_buy = "order-side-SIDE_BUY"
 market_order = "order-type-Market"
+limit_order = "order-type-Limit"
 tif = "order-tif"
 expire = "expire"
 
 
-@pytest.fixture(scope="module")
-def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
 
+@pytest.fixture(scope="module")
+def page(shared_vega, browser, request, continuous_market):
+    with init_page(shared_vega, browser, request) as page:
+        risk_accepted_setup(page)
+        auth_setup(shared_vega, page)
+        basic_key = WalletConfig("basic_key", "basic_key")
+        create_and_faucet_wallet(vega=shared_vega, wallet=basic_key)
+        page.goto(f"/#/markets/{continuous_market}")
+        change_keys(page, shared_vega, "basic_key")
+        yield page
 
 
 @pytest.fixture(scope="module")
-def continuous_market(vega):
-    return setup_continuous_market(vega)
+def continuous_market(shared_vega:VegaServiceNull):
+    keypairs = shared_vega.wallet.get_keypairs("MarketSim")
+    proposal_key = keypairs.get('market_maker')
+    termination_key=keypairs.get('FJMKnwfZdd48C8NqvYrG')
+    mm_2_key=keypairs.get('market_maker_2')
+
+    kwargs = {}
+    if proposal_key is not None:
+        kwargs['proposal_key'] = proposal_key
+    if termination_key is not None:
+        kwargs['termination_key'] = termination_key
+    if mm_2_key is not None:
+        kwargs['mm_2_key'] = mm_2_key
+
+    return setup_continuous_market(shared_vega, **kwargs)
 
 
-@pytest.mark.usefixtures("auth", "risk_accepted")
-def test_limit_buy_order_GTT(continuous_market, vega: VegaServiceNull, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
+
+def test_limit_buy_order_GTT( shared_vega: VegaServiceNull, page: Page):
+    page.get_by_test_id(limit_order).click()
+    page.get_by_test_id(order_side_buy).click()
     page.get_by_test_id(tif).select_option("Good 'til Time (GTT)")
     page.get_by_test_id(order_size).fill("10")
     page.get_by_test_id(order_price).fill("120")
@@ -47,30 +74,31 @@ def test_limit_buy_order_GTT(continuous_market, vega: VegaServiceNull, page: Pag
     )
     page.get_by_test_id(place_order).click()
     wait_for_toast_confirmation(page)
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+    shared_vega.wait_fn(1)
+    shared_vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
+    page.reload()
     # 7002-SORD-017
-    expect(page.get_by_role("row").nth(5)).to_contain_text("10+10LimitFilled120.00GTT:")
+    expect(page.get_by_role("row").nth(4)).to_contain_text("10+10LimitFilled120.00GTT:")
 
 
-@pytest.mark.usefixtures("auth", "risk_accepted")
-def test_limit_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
+def test_limit_buy_order(shared_vega: VegaServiceNull, page: Page):
+    page.get_by_test_id(limit_order).click()
+    page.get_by_test_id(order_side_buy).click()
     page.get_by_test_id(order_size).fill("10")
     page.get_by_test_id(order_price).fill("120")
     page.get_by_test_id(place_order).click()
     wait_for_toast_confirmation(page)
-    vega.wait_fn(2)
-    vega.wait_for_total_catchup()
+    shared_vega.wait_fn(2)
+    shared_vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
+    page.reload()
     # 7002-SORD-017
-    expect(page.get_by_role("row").nth(6)).to_contain_text("10+10LimitFilled120.00GTC")
+    expect(page.get_by_role("row").nth(5)).to_contain_text("10+10LimitFilled120.00GTT")
 
 
-@pytest.mark.usefixtures("auth", "risk_accepted")
-def test_limit_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
+def test_limit_sell_order(shared_vega: VegaServiceNull, page: Page):
+    page.get_by_test_id(limit_order).click()
     page.get_by_test_id(order_size).fill("10")
     page.get_by_test_id(order_price).fill("100")
     page.get_by_test_id(order_side_sell).click()
@@ -84,15 +112,15 @@ def test_limit_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
     )
     page.get_by_test_id(place_order).click()
     wait_for_toast_confirmation(page)
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+    shared_vega.wait_fn(1)
+    shared_vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
-    expect(page.get_by_role("row").nth(7)).to_contain_text("10-10LimitFilled100.00GFN")
+    page.reload()
+    expect(page.get_by_role("row").nth(6)).to_contain_text("10-10LimitFilled100.00GFN")
 
 
-@pytest.mark.usefixtures("auth", "risk_accepted")
-def test_market_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
+
+def test_market_sell_order(shared_vega: VegaServiceNull, page: Page):
     page.get_by_test_id(market_order).click()
     page.get_by_test_id(order_size).fill("10")
     page.get_by_test_id(order_side_sell).click()
@@ -105,32 +133,32 @@ def test_market_sell_order(continuous_market, vega: VegaServiceNull, page: Page)
     )
     page.get_by_test_id(place_order).click()
     wait_for_toast_confirmation(page)
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+    shared_vega.wait_fn(1)
+    shared_vega.wait_for_total_catchup()
 
     page.get_by_test_id("All").click()
-    expect(page.get_by_role("row").nth(8)).to_contain_text("10-10MarketFilled-IOC")
+    page.reload()
+    expect(page.get_by_role("row").nth(7)).to_contain_text("10-10MarketFilled-IOC")
 
 
-@pytest.mark.usefixtures("auth", "risk_accepted")
-def test_market_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
+def test_market_buy_order(shared_vega: VegaServiceNull, page: Page):
     page.get_by_test_id(market_order).click()
+    page.get_by_test_id(order_side_buy).click()
     page.get_by_test_id(order_size).fill("10")
     page.get_by_test_id(tif).select_option("Fill or Kill (FOK)")
     page.get_by_test_id(place_order).click()
     wait_for_toast_confirmation(page)
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+    shared_vega.wait_fn(1)
+    shared_vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
+    page.reload()
     # 7002-SORD-010
     # 0003-WTXN-012
     # 0003-WTXN-003
-    expect(page.get_by_role("row").nth(9)).to_contain_text("10+10MarketFilled-FOK")
+    expect(page.get_by_role("row").nth(8)).to_contain_text("10+10MarketFilled-FOK")
 
-@pytest.mark.usefixtures("risk_accepted")
-def test_sidebar_should_be_open_after_reload(continuous_market, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
+
+def test_sidebar_should_be_open_after_reload(page: Page):
     expect(page.get_by_test_id("deal-ticket-form")).to_be_visible()
     page.get_by_test_id("Order").click()
     expect(page.get_by_test_id("deal-ticket-form")).not_to_be_visible()

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

@@ -1,4 +1,4 @@
-import pytest
+""" import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from actions.vega import submit_order
@@ -87,3 +87,4 @@ def test_margin_and_fees_estimations(continuous_market, vega: VegaServiceNull, p
     # expect(page.get_by_test_id("toast-content")).to_contain_text(
     #     "Your transaction has been confirmed"
     # )
+ """

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

@@ -44,25 +44,25 @@ def create_position(vega: VegaServiceNull, market_id):
     vega.wait_fn(1)
     vega.wait_for_total_catchup
 
-@pytest.mark.usefixtures("auth", "risk_accepted")
-def test_stop_order_form_error_validation(continuous_market, page: Page):
+@pytest.mark.usefixtures("auth_shared_vega", "risk_accepted_shared_vega")
+def test_stop_order_form_error_validation(shared_continuous_market, page_shared_vega: Page):
     # 7002-SORD-032
-    page.goto(f"/#/markets/{continuous_market}")
-    page.get_by_test_id(stop_order_btn).click()
-    page.get_by_test_id(stop_limit_order_btn).is_visible()
-    page.get_by_test_id(stop_limit_order_btn).click()
-    page.get_by_test_id(order_side_sell).click()
-    page.get_by_test_id(submit_stop_order).click()
-    expect(page.get_by_test_id("stop-order-error-message-trigger-price")).to_have_text(
+    page_shared_vega.goto(f"/#/markets/{shared_continuous_market}")
+    page_shared_vega.get_by_test_id(stop_order_btn).click()
+    page_shared_vega.get_by_test_id(stop_limit_order_btn).is_visible()
+    page_shared_vega.get_by_test_id(stop_limit_order_btn).click()
+    page_shared_vega.get_by_test_id(order_side_sell).click()
+    page_shared_vega.get_by_test_id(submit_stop_order).click()
+    expect(page_shared_vega.get_by_test_id("stop-order-error-message-trigger-price")).to_have_text(
         "You need provide a price"
     )
-    expect(page.get_by_test_id("stop-order-error-message-size")).to_have_text(
+    expect(page_shared_vega.get_by_test_id("stop-order-error-message-size")).to_have_text(
         "Size cannot be lower than 1"
     )
 
-    page.get_by_test_id(order_size).fill("1")
-    page.get_by_test_id(order_price).fill("0.0000001")
-    expect(page.get_by_test_id("stop-order-error-message-price")).to_have_text(
+    page_shared_vega.get_by_test_id(order_size).fill("1")
+    page_shared_vega.get_by_test_id(order_price).fill("0.0000001")
+    expect(page_shared_vega.get_by_test_id("stop-order-error-message-price")).to_have_text(
         "Price cannot be lower than 0.00001"
     )
 
@@ -257,7 +257,7 @@ def test_submit_stop_limit_order_cancel(
     ).to_have_text("Cancelled")
 
 
-class TestStopOcoValidation:
+""" class TestStopOcoValidation:
     @pytest.fixture(scope="class")
     def vega(request):
         with init_vega(request) as vega_instance:
@@ -296,3 +296,4 @@ class TestStopOcoValidation:
         expect(page.get_by_test_id("stop-order-warning-limit")).to_have_text(
             "There is a limit of 4 active stop orders per market. Orders submitted above the limit will be immediately rejected."
         )
+ """

apps/trading/e2e/tests/navigation/test_navigation.py

@@ -1,39 +1,30 @@
 import pytest
 from playwright.sync_api import Page, expect, Locator
-
-from conftest import init_page, init_vega, cleanup_container
+from conftest import init_page, risk_accepted_setup
 
 
 @pytest.fixture(scope="module")
-def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))
-        yield vega_instance
-
-
-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
+def page(shared_vega, browser, request):
+    with init_page(shared_vega, browser, request) as page:
+        risk_accepted_setup(page)
+        page.goto("/#/disclaimer")
         yield page
 
 
-@pytest.mark.usefixtures("risk_accepted")
+
 def test_network_switcher(page: Page):
-    page.goto("/#/disclaimer")
     navbar = page.locator('nav[aria-label="Main"]')
     assert_network_switcher(navbar)
 
 
-@pytest.mark.usefixtures("risk_accepted")
+
 def test_navbar_pages(page: Page):
-    page.goto("/#/disclaimer")
     navbar = page.locator('nav[aria-label="Main"]')
     assert_links(navbar)
 
 
-@pytest.mark.usefixtures("risk_accepted")
+
 def test_navigation_mobile(page: Page):
-    page.goto("/#/disclaimer")
     page.set_viewport_size({"width": 800, "height": 1040})
     navbar = page.locator('nav[aria-label="Main"]')
 
@@ -108,4 +99,4 @@ def assert_network_switcher(container: Locator):
     expect(mainnet_link).to_be_visible()
     # 0006-NETW-003
     expect(mainnet_link).to_have_attribute("href", "https://console.vega.xyz")
-    expect(container.get_by_role("link", name="Fairground testnet")).to_be_visible()
+    expect(container.get_by_role("link", name="Fairground testnet")).to_be_visible()

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

@@ -49,7 +49,7 @@ def markets(vega: VegaServiceNull):
         price=130,
     )
 
-    vega.forward("2s")
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -63,7 +63,7 @@ def markets(vega: VegaServiceNull):
         price=88,
     )
 
-    vega.forward("2s")
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -77,7 +77,7 @@ def markets(vega: VegaServiceNull):
         price=88,
     )
 
-    vega.forward("2s")
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -92,7 +92,7 @@ def markets(vega: VegaServiceNull):
         wait=False,
     )
 
-    vega.forward("2s")
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -105,7 +105,7 @@ def markets(vega: VegaServiceNull):
         volume=100,
         price=104,
     )
-    vega.forward("2s")
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -120,7 +120,7 @@ def markets(vega: VegaServiceNull):
         expires_at=vega.get_blockchain_time() + 5 * 1e9,
     )
 
-    vega.forward("2s")
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -134,7 +134,7 @@ def markets(vega: VegaServiceNull):
         volume=20,
     )
 
-    vega.forward("2s")
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -148,7 +148,7 @@ def markets(vega: VegaServiceNull):
         volume=40,
     )
 
-    vega.forward("2s")
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -162,7 +162,7 @@ def markets(vega: VegaServiceNull):
         volume=60,
     )
 
-    vega.forward("2s")
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -177,7 +177,7 @@ def markets(vega: VegaServiceNull):
         volume=60,
     )
 
-    vega.forward("2s")
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -190,7 +190,7 @@ def markets(vega: VegaServiceNull):
         volume=10,
         price=150,
     )
-    
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -203,7 +203,7 @@ def markets(vega: VegaServiceNull):
         volume=10,
         price=160,
     )
-
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -216,7 +216,7 @@ def markets(vega: VegaServiceNull):
         volume=10,
         price=60,
     )
-
+    vega.forward("5s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 

apps/trading/e2e/tests/settings/test_settings.py

@@ -1,16 +1,15 @@
 import pytest
 from playwright.sync_api import expect, Page
-from conftest import init_vega, cleanup_container
+from conftest import init_page, risk_accepted_setup
 
 
 @pytest.fixture(scope="module")
-def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))
-        yield vega_instance
+def page(shared_vega, browser, request):
+    with init_page(shared_vega, browser, request) as page:
+        risk_accepted_setup(page)
+        yield page
 
 
-@pytest.mark.usefixtures("risk_accepted")
 def test_share_usage_data(page: Page):
     page.goto("/")
     page.get_by_test_id("Settings").click()
@@ -41,7 +40,6 @@ ICON_TO_TOAST = {
 }
 
 
-@pytest.mark.usefixtures("risk_accepted")
 def test_toast_positions(page: Page):
     page.goto("/")
     page.get_by_test_id("Settings").click()
@@ -52,10 +50,10 @@ def test_toast_positions(page: Page):
         expect(page.locator(f"[{toast_selector}]")).to_be_visible()
 
 
-@pytest.mark.usefixtures("risk_accepted")
+
 def test_dark_mode(page: Page):
     page.goto("/")
     page.get_by_test_id("Settings").click()
     expect(page.locator("html")).not_to_have_attribute("class", "dark")
     page.locator("#switch-settings-theme-switch").click()
-    expect(page.locator("html")).to_have_attribute("class", "dark")
+    expect(page.locator("html")).to_have_attribute("class", "dark")

apps/trading/e2e/tests/teams/test_teams.py

@@ -52,25 +52,8 @@ def setup_teams_and_games(vega: VegaServiceNull):
     vega.update_network_parameter(
         MM_WALLET.name, parameter="reward.asset", new_value=tDAI_asset_id
     )
-    
 
     next_epoch(vega=vega)
-    vega.create_asset(
-            MM_WALLET.name,
-            name="VEGA",
-            symbol="VEGA",
-            decimals=5,
-            max_faucet_amount=1e10,
-            quantum=100000, 
-        )
-    
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-    VEGA_asset_id = vega.find_asset_id(symbol="VEGA")
-    vega.mint(PARTY_A.name, VEGA_asset_id, 1e5)
-    vega.mint(PARTY_B.name, VEGA_asset_id, 1e5)
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
     team_name = create_team(vega)
 
     next_epoch(vega)
@@ -118,7 +101,7 @@ def setup_teams_and_games(vega: VegaServiceNull):
         from_key_name=PARTY_A.name,
         from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
         to_account_type=vega_protos.vega.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-        asset=VEGA_asset_id,
+        asset=tDAI_asset_id,
         reference="reward",
         asset_for_metric=tDAI_asset_id,
         metric=vega_protos.vega.DISPATCH_METRIC_MAKER_FEES_PAID,
@@ -136,7 +119,7 @@ def setup_teams_and_games(vega: VegaServiceNull):
         from_key_name=PARTY_B.name,
         from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
         to_account_type=vega_protos.vega.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-        asset=VEGA_asset_id,
+        asset=tDAI_asset_id,
         reference="reward",
         asset_for_metric=tDAI_asset_id,
         metric=vega_protos.vega.DISPATCH_METRIC_MAKER_FEES_PAID,
@@ -305,7 +288,6 @@ def test_game_card(competitions_page: Page):
     expect(game_1.get_by_test_id("entity-scope")).to_have_text("Individual")
     expect(game_1.get_by_test_id("locked-for")).to_have_text("1 epoch")
     expect(game_1.get_by_test_id("reward-value")).to_have_text("100.00")
-    expect(game_1.get_by_test_id("reward-asset")).to_have_text("VEGA")
     expect(game_1.get_by_test_id("distribution-strategy")).to_have_text("Pro rata")
     expect(game_1.get_by_test_id("dispatch-metric-info")).to_have_text(
         "Price maker fees paid • tDAI"

apps/trading/lib/hooks/use-rewards.ts

@@ -16,7 +16,6 @@ import {
   EntityScope,
   IndividualScope,
   MarketState,
-  AccountType,
 } from '@vegaprotocol/types';
 import { type ApolloError } from '@apollo/client';
 import compact from 'lodash/compact';
@@ -32,7 +31,7 @@ export type RewardTransfer = TransferNode & {
 
 export type EnrichedRewardTransfer = RewardTransfer & {
   /** Dispatch metric asset (reward asset) */
-  dispatchAsset?: AssetFieldsFragment;
+  asset?: AssetFieldsFragment;
   /** A flag determining whether a reward asset is being traded on any of the active markets */
   isAssetTraded?: boolean;
   /** A list of markets in scope */
@@ -47,9 +46,8 @@ export type EnrichedRewardTransfer = RewardTransfer & {
  */
 export const isReward = (node: TransferNode): node is RewardTransfer => {
   if (
-    (node.transfer.kind.__typename === 'RecurringTransfer' &&
-      node.transfer.kind.dispatchStrategy != null) ||
-    node.transfer.toAccountType === AccountType.ACCOUNT_TYPE_GLOBAL_REWARD
+    node.transfer.kind.__typename === 'RecurringTransfer' &&
+    node.transfer.kind.dispatchStrategy != null
   ) {
     return true;
   }
@@ -81,13 +79,13 @@ export const isActiveReward = (node: RewardTransfer, currentEpoch: number) => {
  */
 export const isScopedToTeams = (node: EnrichedRewardTransfer) =>
   // scoped to teams
-  node.transfer.kind.dispatchStrategy?.entityScope ===
+  node.transfer.kind.dispatchStrategy.entityScope ===
     EntityScope.ENTITY_SCOPE_TEAMS ||
   // or to individuals
-  (node.transfer.kind.dispatchStrategy?.entityScope ===
+  (node.transfer.kind.dispatchStrategy.entityScope ===
     EntityScope.ENTITY_SCOPE_INDIVIDUALS &&
     // but they have to be in a team
-    node.transfer.kind.dispatchStrategy?.individualScope ===
+    node.transfer.kind.dispatchStrategy.individualScope ===
       IndividualScope.INDIVIDUAL_SCOPE_IN_TEAM);
 
 /** Retrieves rewards (transfers) */
@@ -144,11 +142,9 @@ export const useRewards = ({
     .filter((node) => (scopeToTeams ? isScopedToTeams(node) : true))
     // enrich with dispatch asset and markets in scope details
     .map((node) => {
-      if (!node.transfer.kind.dispatchStrategy) return node;
-      const dispatchAsset =
-        (assets &&
-          assets[node.transfer.kind.dispatchStrategy.dispatchMetricAssetId]) ||
-        undefined;
+      const asset =
+        assets &&
+        assets[node.transfer.kind.dispatchStrategy.dispatchMetricAssetId];
       const marketsInScope = compact(
         node.transfer.kind.dispatchStrategy.marketIdsInScope?.map(
           (id) => markets && markets[id]
@@ -171,9 +167,9 @@ export const useRewards = ({
         });
       return {
         ...node,
-        dispatchAsset,
+        asset: asset ? asset : undefined,
         isAssetTraded: isAssetTraded != null ? isAssetTraded : undefined,
-        markets: marketsInScope?.length > 0 ? marketsInScope : undefined,
+        markets: marketsInScope.length > 0 ? marketsInScope : undefined,
       };
     });
 

libs/deal-ticket/src/components/trading-mode-tooltip/trading-mode-tooltip.tsx

@@ -1,7 +1,11 @@
 import { useMemo } from 'react';
 import { parseISO, isValid, isAfter } from 'date-fns';
 import classNames from 'classnames';
-import { useProposalOfMarketQuery } from '@vegaprotocol/proposals';
+import {
+  useProposalOfMarketQuery,
+  type ProposalOfMarketQuery,
+  type SingleProposal,
+} from '@vegaprotocol/proposals';
 import { DocsLinks } from '@vegaprotocol/environment';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';
@@ -36,21 +40,15 @@ export const TradingModeTooltip = ({
         marketTradingMode,
   });
 
+  // We only fetch Proposals (and not BatchProposals)
+  const proposal = proposalData?.proposal as SingleProposal<
+    ProposalOfMarketQuery['proposal']
+  >;
+
   if (!market || !marketData) {
     return null;
   }
-
-  let enactmentDate;
-  const proposal = proposalData?.proposal;
-
-  if (proposal?.__typename === 'Proposal') {
-    enactmentDate = parseISO(proposal.terms.enactmentDatetime);
-  } else if (proposal?.__typename === 'BatchProposal') {
-    const change = proposal.batchTerms?.changes.find(
-      (c) => c?.change.__typename === 'NewMarket'
-    );
-    enactmentDate = change ? parseISO(change.enactmentDatetime) : undefined;
-  }
+  const enactmentDate = parseISO(proposal?.terms.enactmentDatetime);
 
   const compiledGrid =
     !skipGrid && compileGridData(t, market, marketData, onSelect);
@@ -69,16 +67,14 @@ export const TradingModeTooltip = ({
       return (
         <section data-testid="trading-mode-tooltip">
           <p
-            className={classNames('flex flex-col items-start gap-2', {
+            className={classNames('flex flex-col', {
               'mb-4': Boolean(compiledGrid),
             })}
           >
-            {enactmentDate &&
-            isValid(enactmentDate) &&
-            isAfter(new Date(), enactmentDate) ? (
+            {isValid(enactmentDate) && isAfter(new Date(), enactmentDate) ? (
               <>
                 <span
-                  className="justify-center font-bold"
+                  className="justify-center font-bold my-2"
                   data-testid="opening-auction-sub-status"
                 >
                   {`${Schema.MarketTradingModeMapping[marketTradingMode]}: ${t(
@@ -95,7 +91,7 @@ export const TradingModeTooltip = ({
               <>
                 {isValid(enactmentDate) && (
                   <span
-                    className="justify-center font-bold"
+                    className="justify-center font-bold my-2"
                     data-testid="opening-auction-sub-status"
                   >
                     {`${
@@ -113,7 +109,10 @@ export const TradingModeTooltip = ({
               </>
             )}
             {DocsLinks && (
-              <ExternalLink href={DocsLinks.AUCTION_TYPE_OPENING}>
+              <ExternalLink
+                href={DocsLinks.AUCTION_TYPE_OPENING}
+                className="ml-1"
+              >
                 {t('Find out more')}
               </ExternalLink>
             )}

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

@@ -136,7 +136,6 @@
   "Governance vote for this market is valid and has been accepted": "Governance vote for this market is valid and has been accepted",
   "Governance vote has passed and market is awaiting opening auction exit": "Governance vote has passed and market is awaiting opening auction exit",
   "Governance vote passed to close the market": "Governance vote passed to close the market",
-  "Global staking reward for staking $VEGA on the network via the Governance app": "Global staking reward for staking $VEGA on the network via the Governance app",
   "Help identify bugs and improve the service by sharing anonymous usage data.": "Help identify bugs and improve the service by sharing anonymous usage data.",
   "Help us identify bugs and improve Vega Governance by sharing anonymous usage data.": "Help us identify bugs and improve Vega Governance by sharing anonymous usage data.",
   "Hide closed markets": "Hide closed markets",
@@ -369,12 +368,12 @@
   "TradingView": "TradingView",
   "Transfer": "Transfer",
   "Type": "Type",
-  "Staking rewards": "Staking rewards",
   "Unknown": "Unknown",
   "Unknown settlement date": "Unknown settlement date",
   "Update team": "Update team",
   "URL": "URL",
   "Use a comma separated list to allow only specific public keys to join the team": "Use a comma separated list to allow only specific public keys to join the team",
+  "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",

libs/proposals/src/lib/proposals-hooks/Proposal.graphql

@@ -45,19 +45,6 @@ query ProposalOfMarket($marketId: ID!) {
         enactmentDatetime
       }
     }
-    ... on BatchProposal {
-      id
-      batchTerms {
-        changes {
-          enactmentDatetime
-          change {
-            ... on NewMarket {
-              __typename
-            }
-          }
-        }
-      }
-    }
   }
 }
 

libs/proposals/src/lib/proposals-hooks/__generated__/Proposal.ts

@@ -25,7 +25,7 @@ export type ProposalOfMarketQueryVariables = Types.Exact<{
 }>;
 
 
-export type ProposalOfMarketQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal', id?: string | null, batchTerms?: { __typename?: 'BatchProposalTerms', changes: Array<{ __typename?: 'BatchProposalTermsChange', enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } | null> } | null } | { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', enactmentDatetime?: any | null } } | null };
+export type ProposalOfMarketQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal' } | { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', enactmentDatetime?: any | null } } | null };
 
 export type SuccessorMarketProposalDetailsQueryVariables = Types.Exact<{
   proposalId: Types.Scalars['ID'];
@@ -152,19 +152,6 @@ export const ProposalOfMarketDocument = gql`
         enactmentDatetime
       }
     }
-    ... on BatchProposal {
-      id
-      batchTerms {
-        changes {
-          enactmentDatetime
-          change {
-            ... on NewMarket {
-              __typename
-            }
-          }
-        }
-      }
-    }
   }
 }
     `;

libs/types/src/__generated__/types.ts

@@ -256,8 +256,6 @@ export type AggregatedLedgerEntry = {
   toAccountPartyId?: Maybe<Scalars['ID']>;
   /** Account type, if query was grouped by receiver account type - else null */
   toAccountType?: Maybe<AccountType>;
-  /** Transfer ID associated with this aggregated ledger entry */
-  transferId: Scalars['ID'];
   /** Type of the transfer for this ledger entry */
   transferType?: Maybe<TransferType>;
   /** RFC3339Nano time from at which this ledger entries records were relevant */