chore(orders): update orders filters (#3277)

Co-authored-by: maciek <maciek@vegaprotocol.io>

apps/governance-e2e/src/integration/flow/staking-flow.cy.ts

@@ -25,22 +25,24 @@ import {
   vegaWalletSetSpecifiedApprovalAmount,
   vegaWalletTeardown,
 } from '../../support/wallet-teardown.functions';
-const stakeValidatorListTotalStake = '[col-id="stake"] > div > span';
-const stakeValidatorListTotalShare = '[col-id="stakeShare"] > div > span';
-const stakeValidatorListValidatorStake = '[col-id="stake"] > div > span';
-const stakeRemoveStakeRadioButton = '[data-testid="remove-stake-radio"]';
-const stakeTokenAmountInputBox = '[data-testid="token-amount-input"]';
-const stakeTokenSubmitButton = '[data-testid="token-input-submit-button"]';
-const stakeAddStakeRadioButton = '[data-testid="add-stake-radio"]';
-const stakeMaximumTokens = '[data-testid="token-amount-use-maximum"]';
-const totalStake = '[data-testid="total-stake"]';
-const stakeShare = '[data-testid="stake-percentage"]';
+const stakeValidatorListTotalStake = 'total-stake';
+const stakeValidatorListTotalShare = 'total-stake-share';
+const stakeValidatorListStakePercentage = 'stake-percentage';
+const userStakeBtn = 'my-stake-btn';
+const userStake = 'user-stake';
+const userStakeShare = 'user-stake-share';
+const viewAllValidatorsToggle = 'validators-view-toggle-all';
+const viewStakedByMeToggle = 'validators-view-toggle-myStake';
+const stakeRemoveStakeRadioButton = 'remove-stake-radio';
+const stakeTokenAmountInputBox = 'token-amount-input';
+const stakeTokenSubmitButton = 'token-input-submit-button';
+const stakeAddStakeRadioButton = 'add-stake-radio';
+const stakeMaximumTokens = 'token-amount-use-maximum';
+const vegaWalletAssociatedBalance = 'currency-value';
+const vegaWalletStakedBalances = 'vega-wallet-balance-staked-validators';
+const ethWalletContainer = 'ethereum-wallet';
+const vegaWallet = 'vega-wallet';
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
-const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
-const vegaWalletStakedBalances =
-  '[data-testid="vega-wallet-balance-staked-validators"]';
-const ethWalletContainer = '[data-testid="ethereum-wallet"]';
-const vegaWallet = '[data-testid="vega-wallet"]';
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
 
@@ -91,6 +93,39 @@ context(
         validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
       });
 
+      it('Able to view validators staked by me', function () {
+        ensureSpecifiedUnstakedTokensAreAssociated('4');
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('2');
+        closeStakingDialog();
+        navigateTo(navigation.validators);
+        cy.getByTestId(userStake, epochTimeout)
+          .first()
+          .should('have.text', '2.00');
+        cy.getByTestId('total-stake').first().realHover();
+        cy.getByTestId('staked-by-user-tooltip')
+          .first()
+          .should('have.text', 'Staked by me: 2.00');
+        cy.getByTestId('total-pending-stake').first().realHover();
+        cy.getByTestId('pending-user-stake-tooltip')
+          .first()
+          .should('have.text', 'My pending stake: 0.00');
+        cy.getByTestId(userStakeShare).invoke('text').should('not.be.empty'); // Adjust when #3286 is resolved
+        cy.getByTestId(userStakeBtn).should('exist').click();
+        verifyThisEpochValue(2.0);
+        navigateTo(navigation.validators);
+        cy.getByTestId(viewStakedByMeToggle).click();
+        cy.getByTestId(userStakeBtn).should('have.length', 1);
+        cy.getByTestId(viewAllValidatorsToggle).click();
+        clickOnValidatorFromList(1);
+        stakingValidatorPageAddStake('2');
+        closeStakingDialog();
+        navigateTo(navigation.validators);
+        cy.getByTestId(viewStakedByMeToggle).click();
+        cy.getByTestId(userStakeBtn).should('have.length', 2);
+      });
+
       it('Able to stake against a validator - using vega from vesting contract', function () {
         stakingPageAssociateTokens('3', { type: 'contract' });
         verifyUnstakedBalance(3.0);
@@ -109,14 +144,13 @@ context(
       });
 
       it('Able to stake against a validator - using vega from both wallet and vesting contract', function () {
+        vegaWalletTeardown();
         stakingPageAssociateTokens('3', { type: 'contract' });
         navigateTo(navigation.validators);
         stakingPageAssociateTokens('4', { type: 'wallet' });
         verifyUnstakedBalance(7.0);
         verifyEthWalletTotalAssociatedBalance('3.0');
         verifyEthWalletTotalAssociatedBalance('4.0');
-        verifyEthWalletTotalAssociatedBalance('3.0');
-        verifyEthWalletTotalAssociatedBalance('4.0');
         cy.get('button').contains('Select a validator to nominate').click();
         clickOnValidatorFromList(0);
         stakingValidatorPageAddStake('6');
@@ -136,7 +170,7 @@ context(
         clickOnValidatorFromList(0);
         stakingValidatorPageAddStake('2');
         verifyUnstakedBalance(3.0);
-        cy.get(vegaWalletStakedBalances, txTimeout)
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
           .parent()
           .should('contain', 2.0, txTimeout);
         closeStakingDialog();
@@ -144,36 +178,36 @@ context(
         clickOnValidatorFromList(1);
         stakingValidatorPageAddStake('1');
         verifyUnstakedBalance(2.0);
-        cy.get(vegaWalletStakedBalances, txTimeout)
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
           .should('have.length', 4, txTimeout)
           .eq(0)
           .should('contain', 2.0, txTimeout);
-        cy.get(vegaWalletStakedBalances, txTimeout)
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
           .eq(1)
           .should('contain', 1.0, txTimeout);
         closeStakingDialog();
         navigateTo(navigation.validators);
         cy.get(`[row-id="${0}"]`).within(() => {
-          cy.get(stakeValidatorListTotalStake)
+          cy.getByTestId(stakeValidatorListTotalStake)
             .should('have.text', '2.00')
             .and('be.visible');
-          cy.get(stakeValidatorListTotalShare)
+          cy.getByTestId(stakeValidatorListTotalShare)
             .should('have.text', '66.67%')
             .and('be.visible');
-          cy.get(stakeValidatorListValidatorStake)
+          cy.getByTestId(stakeValidatorListTotalStake)
             .scrollIntoView()
             .should('have.text', '2.00')
             .and('be.visible');
         });
         cy.get(`[row-id="${1}"]`).within(() => {
-          cy.get(stakeValidatorListTotalStake)
+          cy.getByTestId(stakeValidatorListTotalStake)
             .scrollIntoView()
             .should('have.text', '1.00')
             .and('be.visible');
-          cy.get(stakeValidatorListTotalShare)
+          cy.getByTestId(stakeValidatorListTotalShare)
             .should('have.text', '33.33%')
             .and('be.visible');
-          cy.get(stakeValidatorListValidatorStake)
+          cy.getByTestId(stakeValidatorListTotalStake)
             .scrollIntoView()
             .should('have.text', '1.00')
             .and('be.visible');
@@ -203,9 +237,15 @@ context(
           verifyStakedBalance(2.0);
           verifyNextEpochValue(2.0);
           verifyThisEpochValue(2.0);
-          cy.get(totalStake, epochTimeout).should('contain.text', '2');
+          cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
+            'contain.text',
+            '2'
+          );
           waitForBeginningOfEpoch();
-          cy.get(stakeShare).should('have.text', '100%');
+          cy.getByTestId(stakeValidatorListStakePercentage).should(
+            'have.text',
+            '100%'
+          );
           navigateTo(navigation.validators);
           validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
         }
@@ -227,12 +267,16 @@ context(
         verifyUnstakedBalance(3.0);
         verifyNextEpochValue(0.0);
         verifyThisEpochValue(0.0);
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
           'not.exist',
           txTimeout
         );
         navigateTo(navigation.validators);
         validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
+
+        cy.getByTestId(userStakeBtn).should('not.exist');
+        cy.getByTestId(userStake).should('not.exist');
+        cy.getByTestId(userStakeShare).should('not.exist');
       });
 
       it('Unable to remove a stake with a negative value for a validator', function () {
@@ -246,10 +290,10 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         clickOnValidatorFromList(0);
-        cy.get(stakeRemoveStakeRadioButton, txTimeout).click();
-        cy.get(stakeTokenAmountInputBox).type('-0.1');
+        cy.getByTestId(stakeRemoveStakeRadioButton, txTimeout).click();
+        cy.getByTestId(stakeTokenAmountInputBox).type('-0.1');
         cy.contains('Waiting for next epoch to start', epochTimeout);
-        cy.get(stakeTokenSubmitButton)
+        cy.getByTestId(stakeTokenSubmitButton)
           .should('be.disabled', epochTimeout)
           .and('contain', `Remove -0.1 $VEGA tokens at the end of epoch`)
           .and('be.visible');
@@ -266,10 +310,10 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         clickOnValidatorFromList(0);
-        cy.get(stakeRemoveStakeRadioButton).click();
-        cy.get(stakeTokenAmountInputBox).type('4');
+        cy.getByTestId(stakeRemoveStakeRadioButton).click();
+        cy.getByTestId(stakeTokenAmountInputBox).type('4');
         cy.contains('Waiting for next epoch to start', epochTimeout);
-        cy.get(stakeTokenSubmitButton)
+        cy.getByTestId(stakeTokenSubmitButton)
           .should('be.disabled', epochTimeout)
           .and('contain', `Remove 4 $VEGA tokens at the end of epoch`)
           .and('be.visible');
@@ -285,17 +329,17 @@ context(
         verifyStakedBalance(2.0);
         closeStakingDialog();
         stakingPageDisassociateAllTokens();
-        cy.get(ethWalletContainer).within(() => {
+        cy.getByTestId(ethWalletContainer).within(() => {
           cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
         });
         verifyEthWalletTotalAssociatedBalance('0.0');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.getByTestId(vegaWallet).within(() => {
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.00'
           );
         });
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
           'not.exist',
           txTimeout
         );
@@ -313,17 +357,17 @@ context(
         verifyStakedBalance(2.0);
         closeStakingDialog();
         stakingPageDisassociateAllTokens('contract');
-        cy.get(ethWalletContainer).within(() => {
+        cy.getByTestId(ethWalletContainer).within(() => {
           cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
         });
         verifyEthWalletTotalAssociatedBalance('0.0');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.getByTestId(vegaWallet).within(() => {
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.00'
           );
         });
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
           'not.exist',
           txTimeout
         );
@@ -342,8 +386,8 @@ context(
         closeStakingDialog();
         stakingPageDisassociateTokens('1');
         verifyEthWalletTotalAssociatedBalance('2.0');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.getByTestId(vegaWallet).within(() => {
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '2.00'
           );
@@ -409,8 +453,8 @@ context(
         verifyUnstakedBalance(0.0);
         closeStakingDialog();
         stakingPageAssociateTokens('6');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.getByTestId(vegaWallet).within(() => {
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '12.00'
           );
@@ -429,9 +473,12 @@ context(
         verifyUnstakedBalance(1.0);
         closeStakingDialog();
         clickOnValidatorFromList(0);
-        cy.get(stakeAddStakeRadioButton).click();
-        cy.get(stakeMaximumTokens, { timeout: 60000 }).click();
-        cy.get(stakeTokenSubmitButton).should('contain', 'Add 1 $VEGA tokens');
+        cy.getByTestId(stakeAddStakeRadioButton).click();
+        cy.getByTestId(stakeMaximumTokens, { timeout: 60000 }).click();
+        cy.getByTestId(stakeTokenSubmitButton).should(
+          'contain',
+          'Add 1 $VEGA tokens'
+        );
       });
 
       afterEach('Teardown Wallet', function () {

apps/governance-e2e/src/integration/view/pubkey-view.cy.ts

@@ -26,19 +26,19 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
     cy.connectPublicKey(vegaWalletPubKey);
   });
 
-  it('Able to connect public key via wallet', function () {
-    verifyConnectedToPubKey();
-    cy.getByTestId('currency-title', { timeout: 10000 })
-      .should('have.length.at.least', 4)
-      .and('contain.text', 'USDC (fake)');
-  });
-
   it('Able to connect public key using url', function () {
     cy.getByTestId('exit-view').click();
     cy.visit(`/?address=${vegaWalletPubKey}`);
     verifyConnectedToPubKey();
   });
 
+  it('Able to connect public key via wallet and view assets in wallet', function () {
+    verifyConnectedToPubKey();
+    cy.getByTestId('currency-title', { timeout: 10000 })
+      .should('have.length.at.least', 4)
+      .and('contain.text', 'USDC (fake)');
+  });
+
   it('Unable to submit proposal with public key', function () {
     const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;
 

apps/governance-e2e/src/support/wallet-teardown.functions.ts

@@ -73,9 +73,6 @@ export async function vegaWalletTeardown() {
         }
       });
       cy.get(vegaWalletContainer).within(() => {
-        cy.getByTestId('vega-wallet-balance-staked-validators', {
-          timeout: transactionTimeout,
-        }).should('not.exist');
         cy.getByTestId('associated-amount', {
           timeout: transactionTimeout,
         }).contains('0.00', {
@@ -125,6 +122,9 @@ async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
     log: false,
   }).then((vestingAmount) => {
     if (Number(vestingAmount) != 0) {
+      // Wait needed to allow time for ganache to process tx for stakingBridgeContract.remove_stake
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(1000);
       cy.wrap(
         vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
         { timeout: transactionTimeout, log: false }

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx

@@ -21,6 +21,12 @@ export const EpochIndividualRewards = () => {
             first: Number(delegationsPagination),
           }
         : undefined,
+      // we can use the same value for rewardsPagination as delegationsPagination
+      rewardsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
     },
     skip: !pubKey,
   });

apps/governance/src/routes/rewards/home/Rewards.graphql

@@ -21,10 +21,14 @@ fragment DelegationFields on Delegation {
   epoch
 }
 
-query Rewards($partyId: ID!, $delegationsPagination: Pagination) {
+query Rewards(
+  $partyId: ID!
+  $delegationsPagination: Pagination
+  $rewardsPagination: Pagination
+) {
   party(id: $partyId) {
     id
-    rewardsConnection {
+    rewardsConnection(pagination: $rewardsPagination) {
       edges {
         node {
           ...RewardFields

apps/governance/src/routes/rewards/home/__generated__/Rewards.ts

@@ -10,6 +10,7 @@ export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: stri
 export type RewardsQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
   delegationsPagination?: Types.InputMaybe<Types.Pagination>;
+  rewardsPagination?: Types.InputMaybe<Types.Pagination>;
 }>;
 
 
@@ -75,10 +76,10 @@ export const EpochFieldsFragmentDoc = gql`
 }
     `;
 export const RewardsDocument = gql`
-    query Rewards($partyId: ID!, $delegationsPagination: Pagination) {
+    query Rewards($partyId: ID!, $delegationsPagination: Pagination, $rewardsPagination: Pagination) {
   party(id: $partyId) {
     id
-    rewardsConnection {
+    rewardsConnection(pagination: $rewardsPagination) {
       edges {
         node {
           ...RewardFields
@@ -119,6 +120,7 @@ ${DelegationFieldsFragmentDoc}`;
  *   variables: {
  *      partyId: // value for 'partyId'
  *      delegationsPagination: // value for 'delegationsPagination'
+ *      rewardsPagination: // value for 'rewardsPagination'
  *   },
  * });
  */

apps/static/src/assets/mainnet-tranches.json

@@ -530,7 +530,7 @@
     "tranche_end": "2023-04-06T00:00:00.000Z",
     "total_added": "14099",
     "total_removed": "165.10784124668",
-    "locked_amount": "3863.2439127837516484",
+    "locked_amount": "3522.0180029121862637",
     "deposits": [
       {
         "amount": "30",
@@ -3318,7 +3318,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "59715.277169199897517339",
+    "locked_amount": "59537.1325290923758345795",
     "deposits": [
       {
         "amount": "86666.297",
@@ -3384,7 +3384,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "885.91015466015475",
+    "locked_amount": "875.604300213675125",
     "deposits": [
       {
         "amount": "2500",
@@ -3505,7 +3505,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "14883.964875201289",
+    "locked_amount": "14812.6080351751215",
     "deposits": [
       {
         "amount": "12500",
@@ -3771,8 +3771,8 @@
     "tranche_start": "2023-02-01T00:00:00.000Z",
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
-    "total_removed": "4574.865235275",
-    "locked_amount": "26000.1918354818925",
+    "total_removed": "11535.201330975",
+    "locked_amount": "25844.74994244935625",
     "deposits": [
       {
         "amount": "7500",
@@ -3796,6 +3796,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0xe021c767a9587b28a6772b57666d72122e5d869c477596e246a4365ee6b7ce43"
       },
+      {
+        "amount": "6960.3360957",
+        "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
+        "tx": "0x3f63318adc1797232c2578fa0f5eaccd21318427a3c243490817f778678bb6c6"
+      },
       {
         "amount": "92.587476975",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -4040,6 +4045,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "6960.3360957",
+            "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
+            "tranche_id": 34,
+            "tx": "0x3f63318adc1797232c2578fa0f5eaccd21318427a3c243490817f778678bb6c6"
+          },
           {
             "amount": "2275.1131827",
             "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -4048,8 +4059,8 @@
           }
         ],
         "total_tokens": "30000",
-        "withdrawn_tokens": "2275.1131827",
-        "remaining_tokens": "27724.8868173"
+        "withdrawn_tokens": "9235.4492784",
+        "remaining_tokens": "20764.5507216"
       }
     ]
   },
@@ -4059,7 +4070,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "59660.7944924472825704535",
+    "locked_amount": "59482.812386908832397903",
     "deposits": [
       {
         "amount": "129999.45",
@@ -4125,7 +4136,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "27182.851040081174176",
+    "locked_amount": "27054.17524733637532",
     "deposits": [
       {
         "amount": "10000",
@@ -4318,7 +4329,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "2362.93505834601735",
+    "locked_amount": "2352.6574391171995",
     "deposits": [
       {
         "amount": "5000",
@@ -4529,7 +4540,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "97499.58",
     "total_removed": "0",
-    "locked_amount": "1743.88336560594536108964",
+    "locked_amount": "1569.29949985580425701666",
     "deposits": [
       {
         "amount": "97499.58",
@@ -4562,7 +4573,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "135173.4239508",
     "total_removed": "98230.390980249184455396",
-    "locked_amount": "2383.5874918801371561646812876",
+    "locked_amount": "2144.9614880467381205851871136",
     "deposits": [
       {
         "amount": "135173.4239508",
@@ -4608,7 +4619,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "32499.86",
     "total_removed": "0",
-    "locked_amount": "733.62161665551011862912",
+    "locked_amount": "660.17719923653009843764",
     "deposits": [
       {
         "amount": "32499.86",
@@ -4641,7 +4652,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "10833.29",
     "total_removed": "0",
-    "locked_amount": "238.78671732570820440756",
+    "locked_amount": "214.88127214358664987998",
     "deposits": [
       {
         "amount": "10833.29",
@@ -4674,7 +4685,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "22749.93",
     "total_removed": "4720.860935375",
-    "locked_amount": "892.6380814136124106908",
+    "locked_amount": "803.27418813808789614012",
     "deposits": [
       {
         "amount": "6500",
@@ -4826,7 +4837,7 @@
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
     "total_removed": "6111.900993675",
-    "locked_amount": "4163.6510128913445",
+    "locked_amount": "4070.38587707182275",
     "deposits": [
       {
         "amount": "7500",
@@ -5233,7 +5244,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "348093.622641410450169508",
+    "locked_amount": "344106.0535972469579563914",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -38924,7 +38935,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "700133.348465855088393",
-    "locked_amount": "559400.02940181935737278844",
+    "locked_amount": "553272.524105026240391145815",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -40306,7 +40317,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
     "total_removed": "812130.55546472109935452",
-    "locked_amount": "7283284.17298492326254788501911774103514463",
+    "locked_amount": "7261556.43262593709654026047091906912327654",
     "deposits": [
       {
         "amount": "16249.93",
@@ -46542,8 +46553,8 @@
     "tranche_start": "2021-11-05T00:00:00.000Z",
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
-    "total_removed": "5782575.169630789834713996",
-    "locked_amount": "1002436.218000846412796734272837213",
+    "total_removed": "5789694.057941893808930316",
+    "locked_amount": "982377.306834362928705599632004937",
     "deposits": [
       {
         "amount": "129284.449",
@@ -46767,6 +46778,11 @@
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
         "tx": "0x5c9bcf8195dc2bf6d36af74095f45cc5f8289d7239e4205d74f06419b042d648"
       },
+      {
+        "amount": "7118.88831110397421632",
+        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+        "tx": "0xbe429d608aa735a1bea0099ee9806e2b0a293262199fa9881a3672215e68a6c3"
+      },
       {
         "amount": "755.482067130393772",
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -52824,6 +52840,12 @@
             "tranche_id": 3,
             "tx": "0x4eb2ed2540197b432b08d7ed69ab17a69909e2055f645ce8a0922c1a29ffeec8"
           },
+          {
+            "amount": "7118.88831110397421632",
+            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+            "tranche_id": 3,
+            "tx": "0xbe429d608aa735a1bea0099ee9806e2b0a293262199fa9881a3672215e68a6c3"
+          },
           {
             "amount": "80421.5336580481619385",
             "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -53156,8 +53178,8 @@
           }
         ],
         "total_tokens": "1266324.603486",
-        "withdrawn_tokens": "1172599.74123000272362926",
-        "remaining_tokens": "93724.86225599727637074"
+        "withdrawn_tokens": "1179718.62954110669784558",
+        "remaining_tokens": "86605.97394489330215442"
       },
       {
         "address": "0xC5d9221EB9c28A69859264c0A2Fe0d3272228296",
@@ -53986,7 +54008,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
     "total_removed": "3381706.364737906998719578",
-    "locked_amount": "79165.2088757254297160760025198165",
+    "locked_amount": "71239.811758562587976996363562694",
     "deposits": [
       {
         "amount": "552496.6455",
@@ -56114,7 +56136,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
     "total_removed": "38870.3290450237949",
-    "locked_amount": "88640.13232561127483282507204466",
+    "locked_amount": "87669.194085020840174271210350088",
     "deposits": [
       {
         "amount": "3000",

apps/trading-e2e/src/integration/market-info.cy.ts

@@ -39,7 +39,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
   it('market volume displayed', () => {
     cy.getByTestId(marketTitle).contains('Market volume').click();
     validateMarketDataRow(0, '24 Hour Volume', '1');
-    validateMarketDataRow(1, 'Open Interest', '0');
+    validateMarketDataRow(1, 'Open Interest', '-');
     validateMarketDataRow(2, 'Best Bid Volume', '1');
     validateMarketDataRow(3, 'Best Offer Volume', '3');
     validateMarketDataRow(4, 'Best Static Bid Volume', '2');

apps/trading-e2e/src/integration/trading-chart.cy.ts

@@ -0,0 +1,28 @@
+describe('chart', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+  it('config should persist', () => {
+    cy.getByTestId('Chart').click();
+    cy.get('[data-testid="tab-chart"] button').as('control-buttons');
+    cy.get('@control-buttons').each(($button) => {
+      cy.wrap($button).click();
+      cy.get(
+        '[role="menuitemradio"]:first, [role="menuitemcheckbox"]:first'
+      ).click();
+    });
+    cy.getByTestId('Depth').click();
+    cy.getByTestId('Chart').click();
+    cy.get('@control-buttons').each(($button) => {
+      cy.wrap($button).click();
+      cy.get('[role="menuitemradio"]:first, [role="menuitemcheckbox"]:first')
+        .within(($lastMenuItem) => {
+          expect($lastMenuItem.data('state')).to.equal('checked');
+        })
+        .click();
+    });
+  });
+});

apps/trading/.env.mirror

@@ -1,13 +0,0 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
-NX_VEGA_ENV=MIRROR
-NX_VEGA_EXPLORER_URL=https://mainnet-mirror.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
-NX_VEGA_TOKEN_URL=https://mainnet-mirror.token.vega.xyz
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

apps/trading/.env.sandbox

@@ -1,11 +0,0 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.sandbox.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
-NX_VEGA_ENV=SANDBOX
-NX_VEGA_NETWORKS={\"DEVNET\":\"https://dev.token.vega.xyz\",\"STAGNET3\":\"https://stagnet3.token.vega.xyz\",\"STAGNET1\":\"https://stagnet1.token.vega.xyz\",\"TESTNET\":\"https://token.fairground.wtf\",\"MAINNET\":\"https://token.vega.xyz\"}
-NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

libs/candles-chart/src/lib/candles-chart.tsx

@@ -12,9 +12,13 @@ import {
 } from 'pennant';
 import { VegaDataSource } from './data-source';
 import { useApolloClient } from '@apollo/client';
-import { useMemo, useState } from 'react';
+import { useMemo } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
+import {
+  useThemeSwitcher,
+  getValidItem,
+  getValidSubset,
+} from '@vegaprotocol/react-helpers';
 import {
   DropdownMenu,
   DropdownMenuCheckboxItem,
@@ -28,6 +32,54 @@ import {
 import type { IconName } from '@blueprintjs/icons';
 import { IconNames } from '@blueprintjs/icons';
 import { t } from '@vegaprotocol/i18n';
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+import { immer } from 'zustand/middleware/immer';
+
+interface StoredSettings {
+  interval?: Interval;
+  type?: ChartType;
+  overlays?: Overlay[];
+  studies?: Study[];
+}
+
+export const useCandlesChartSettings = create<
+  StoredSettings & {
+    merge: (settings: StoredSettings) => void;
+    setType: (type: ChartType) => void;
+    setInterval: (interval: Interval) => void;
+    setOverlays: (overlays: Overlay[]) => void;
+    setStudies: (studies: Study[]) => void;
+  }
+>()(
+  persist(
+    immer((set) => ({
+      merge: (settings: StoredSettings) =>
+        set((state) => {
+          Object.assign(state, settings);
+        }),
+      setType: (type: ChartType) =>
+        set((state) => {
+          state.type = type;
+        }),
+      setInterval: (interval: Interval) =>
+        set((state) => {
+          state.interval = interval;
+        }),
+      setOverlays: (overlays: Overlay[]) =>
+        set((state) => {
+          state.overlays = overlays;
+        }),
+      setStudies: (studies: Study[]) =>
+        set((state) => {
+          state.studies = studies;
+        }),
+    })),
+    {
+      name: 'console-candles',
+    }
+  )
+);
 
 const chartTypeIcon = new Map<ChartType, IconName>([
   [ChartType.AREA, IconNames.TIMELINE_AREA_CHART],
@@ -47,10 +99,31 @@ export const CandlesChartContainer = ({
   const { pubKey } = useVegaWallet();
   const { theme } = useThemeSwitcher();
 
-  const [interval, setInterval] = useState<Interval>(Interval.I15M);
-  const [chartType, setChartType] = useState<ChartType>(ChartType.CANDLE);
-  const [overlays, setOverlays] = useState<Overlay[]>([]);
-  const [studies, setStudies] = useState<Study[]>([Study.VOLUME]);
+  const settings = useCandlesChartSettings();
+
+  const interval: Interval = getValidItem(
+    settings.interval,
+    Object.values(Interval),
+    Interval.I15M
+  );
+
+  const chartType: ChartType = getValidItem(
+    settings.type,
+    Object.values(ChartType),
+    ChartType.CANDLE
+  );
+
+  const overlays: Overlay[] = getValidSubset(
+    settings.overlays,
+    Object.values(Overlay),
+    []
+  );
+
+  const studies: Study[] = getValidSubset(
+    settings.studies,
+    Object.values(Study),
+    [Study.VOLUME]
+  );
 
   const dataSource = useMemo(() => {
     return new VegaDataSource(client, marketId, pubKey);
@@ -70,7 +143,7 @@ export const CandlesChartContainer = ({
             <DropdownMenuRadioGroup
               value={interval}
               onValueChange={(value) => {
-                setInterval(value as Interval);
+                settings.setInterval(value as Interval);
               }}
             >
               {Object.values(Interval).map((timeInterval) => (
@@ -97,7 +170,7 @@ export const CandlesChartContainer = ({
             <DropdownMenuRadioGroup
               value={chartType}
               onValueChange={(value) => {
-                setChartType(value as ChartType);
+                settings.setType(value as ChartType);
               }}
             >
               {Object.values(ChartType).map((type) => (
@@ -125,7 +198,7 @@ export const CandlesChartContainer = ({
                     ? newOverlays.splice(index, 1)
                     : newOverlays.push(overlay);
 
-                  setOverlays(newOverlays);
+                  settings.setOverlays(newOverlays);
                 }}
               >
                 {overlayLabels[overlay]}
@@ -150,7 +223,7 @@ export const CandlesChartContainer = ({
                     ? newStudies.splice(index, 1)
                     : newStudies.push(study);
 
-                  setStudies(newStudies);
+                  settings.setStudies(newStudies);
                 }}
               >
                 {studyLabels[study]}
@@ -176,8 +249,10 @@ export const CandlesChartContainer = ({
           interval={interval}
           theme={theme}
           onOptionsChanged={(options) => {
-            setOverlays(options.overlays ?? []);
-            setStudies(options.studies ?? []);
+            settings.merge({
+              overlays: options.overlays,
+              studies: options.studies,
+            });
           }}
         />
       </div>

libs/market-info/src/components/market-info/info-key-value-table.tsx

@@ -106,7 +106,7 @@ export const MarketInfoTable = ({
               decimalPlaces={decimalPlaces}
               assetSymbol={assetSymbol}
               asPercentage={asPercentage}
-              unformatted={unformatted || key.toLowerCase().includes('volume')}
+              unformatted={unformatted}
               noBorder={noBorder}
             />
           ))}

libs/market-info/src/components/market-info/market-info-panels.tsx

@@ -96,21 +96,19 @@ export const MarketVolumeInfoPanel = ({
   ...props
 }: MarketInfoWithDataAndCandlesProps & PanelProps) => {
   const last24hourVolume = market.candles && calcCandleVolume(market.candles);
+
+  const dash = (value: string | undefined) =>
+    value && value !== '0' ? value : '-';
+
   return (
     <MarketInfoTable
       data={{
-        '24hourVolume':
-          last24hourVolume && last24hourVolume !== '0'
-            ? addDecimalsFormatNumber(
-                last24hourVolume,
-                market.positionDecimalPlaces
-              )
-            : '-',
-        openInterest: market.data?.openInterest,
-        bestBidVolume: market.data?.bestBidVolume,
-        bestOfferVolume: market.data?.bestOfferVolume,
-        bestStaticBidVolume: market.data?.bestStaticBidVolume,
-        bestStaticOfferVolume: market.data?.bestStaticOfferVolume,
+        '24hourVolume': dash(last24hourVolume),
+        openInterest: dash(market.data?.openInterest),
+        bestBidVolume: dash(market.data?.bestBidVolume),
+        bestOfferVolume: dash(market.data?.bestOfferVolume),
+        bestStaticBidVolume: dash(market.data?.bestStaticBidVolume),
+        bestStaticOfferVolume: dash(market.data?.bestStaticOfferVolume),
       }}
       decimalPlaces={market.positionDecimalPlaces}
       {...props}

libs/orders/src/lib/components/order-data-provider/Orders.graphql

@@ -31,18 +31,11 @@ query OrderById($orderId: ID!) {
 query Orders(
   $partyId: ID!
   $pagination: Pagination
-  $dateRange: DateRange
-  $filter: OrderFilter
-  $marketId: ID
+  $filter: OrderByMarketIdsFilter
 ) {
   party(id: $partyId) {
     id
-    ordersConnection(
-      pagination: $pagination
-      dateRange: $dateRange
-      filter: $filter
-      marketId: $marketId
-    ) {
+    ordersConnection(pagination: $pagination, filter: $filter) {
       edges {
         node {
           ...OrderFields
@@ -79,8 +72,8 @@ fragment OrderUpdateFields on OrderUpdate {
   }
 }
 
-subscription OrdersUpdate($partyId: ID!, $marketId: ID) {
-  orders(partyId: $partyId, marketId: $marketId) {
+subscription OrdersUpdate($partyId: ID!) {
+  orders(filter: { partyIds: [$partyId] }) {
     ...OrderUpdateFields
   }
 }

libs/orders/src/lib/components/order-data-provider/__generated__/Orders.ts

@@ -15,9 +15,7 @@ export type OrderByIdQuery = { __typename?: 'Query', orderByID: { __typename?: '
 export type OrdersQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
   pagination?: Types.InputMaybe<Types.Pagination>;
-  dateRange?: Types.InputMaybe<Types.DateRange>;
-  filter?: Types.InputMaybe<Types.OrderFilter>;
-  marketId?: Types.InputMaybe<Types.Scalars['ID']>;
+  filter?: Types.InputMaybe<Types.OrderByMarketIdsFilter>;
 }>;
 
 
@@ -27,7 +25,6 @@ export type OrderUpdateFieldsFragment = { __typename?: 'OrderUpdate', id: string
 
 export type OrdersUpdateSubscriptionVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
-  marketId?: Types.InputMaybe<Types.Scalars['ID']>;
 }>;
 
 
@@ -115,15 +112,10 @@ export type OrderByIdQueryHookResult = ReturnType<typeof useOrderByIdQuery>;
 export type OrderByIdLazyQueryHookResult = ReturnType<typeof useOrderByIdLazyQuery>;
 export type OrderByIdQueryResult = Apollo.QueryResult<OrderByIdQuery, OrderByIdQueryVariables>;
 export const OrdersDocument = gql`
-    query Orders($partyId: ID!, $pagination: Pagination, $dateRange: DateRange, $filter: OrderFilter, $marketId: ID) {
+    query Orders($partyId: ID!, $pagination: Pagination, $filter: OrderByMarketIdsFilter) {
   party(id: $partyId) {
     id
-    ordersConnection(
-      pagination: $pagination
-      dateRange: $dateRange
-      filter: $filter
-      marketId: $marketId
-    ) {
+    ordersConnection(pagination: $pagination, filter: $filter) {
       edges {
         node {
           ...OrderFields
@@ -155,9 +147,7 @@ export const OrdersDocument = gql`
  *   variables: {
  *      partyId: // value for 'partyId'
  *      pagination: // value for 'pagination'
- *      dateRange: // value for 'dateRange'
  *      filter: // value for 'filter'
- *      marketId: // value for 'marketId'
  *   },
  * });
  */
@@ -173,8 +163,8 @@ export type OrdersQueryHookResult = ReturnType<typeof useOrdersQuery>;
 export type OrdersLazyQueryHookResult = ReturnType<typeof useOrdersLazyQuery>;
 export type OrdersQueryResult = Apollo.QueryResult<OrdersQuery, OrdersQueryVariables>;
 export const OrdersUpdateDocument = gql`
-    subscription OrdersUpdate($partyId: ID!, $marketId: ID) {
-  orders(partyId: $partyId, marketId: $marketId) {
+    subscription OrdersUpdate($partyId: ID!) {
+  orders(filter: {partyIds: [$partyId]}) {
     ...OrderUpdateFields
   }
 }
@@ -193,7 +183,6 @@ export const OrdersUpdateDocument = gql`
  * const { data, loading, error } = useOrdersUpdateSubscription({
  *   variables: {
  *      partyId: // value for 'partyId'
- *      marketId: // value for 'marketId'
  *   },
  * });
  */

libs/orders/src/lib/components/order-data-provider/order-data-provider.spec.ts

@@ -1,6 +1,7 @@
 import { update } from './order-data-provider';
 import type { OrderUpdateFieldsFragment, OrderFieldsFragment } from '../';
 import type { Edge } from '@vegaprotocol/utils';
+
 describe('order data provider', () => {
   it('puts incoming data in proper place', () => {
     const data = [
@@ -110,7 +111,11 @@ describe('order data provider', () => {
 
     const updatedData = update(data, delta, () => null, {
       partyId: '0x123',
-      dateRange: { end: new Date('2022-02-01').toISOString() },
+      filter: {
+        order: {
+          dateRange: { end: new Date('2022-02-01').toISOString() },
+        },
+      },
     });
     expect(
       updatedData?.findIndex((edge) => edge.node.id === delta[0].id)

libs/orders/src/lib/components/order-data-provider/order-data-provider.ts

@@ -35,40 +35,45 @@ const orderMatchFilters = (
     return true;
   }
   if (
-    variables?.filter?.status &&
-    !(order.status && variables.filter.status.includes(order.status))
+    variables?.filter?.order?.status &&
+    !(order.status && variables.filter.order.status.includes(order.status))
   ) {
     return false;
   }
   if (
-    variables?.filter?.types &&
-    !(order.type && variables.filter.types.includes(order.type))
+    variables?.filter?.order?.types &&
+    !(order.type && variables.filter.order.types.includes(order.type))
   ) {
     return false;
   }
   if (
-    variables?.filter?.timeInForce &&
-    !variables.filter.timeInForce.includes(order.timeInForce)
+    variables?.filter?.order?.timeInForce &&
+    !variables.filter.order.timeInForce.includes(order.timeInForce)
   ) {
     return false;
   }
-  if (variables?.filter?.excludeLiquidity && order.liquidityProvisionId) {
+  if (
+    variables?.filter?.order?.excludeLiquidity &&
+    order.liquidityProvisionId
+  ) {
     return false;
   }
   if (
-    variables?.dateRange?.start &&
+    variables?.filter?.order?.dateRange?.start &&
     !(
       (order.updatedAt || order.createdAt) &&
-      variables.dateRange.start < (order.updatedAt || order.createdAt)
+      variables.filter.order.dateRange.start <
+        (order.updatedAt || order.createdAt)
     )
   ) {
     return false;
   }
   if (
-    variables?.dateRange?.end &&
+    variables?.filter?.order?.dateRange?.end &&
     !(
       (order.updatedAt || order.createdAt) &&
-      variables.dateRange.end > (order.updatedAt || order.createdAt)
+      variables.filter.order.dateRange.end >
+        (order.updatedAt || order.createdAt)
     )
   ) {
     return false;
@@ -241,8 +246,10 @@ export const hasActiveOrderProvider = makeDerivedDataProvider<
     (callback, client, variables) =>
       hasActiveOrderProviderInternal(callback, client, {
         filter: {
-          status: [OrderStatus.STATUS_ACTIVE],
-          excludeLiquidity: true,
+          order: {
+            status: [OrderStatus.STATUS_ACTIVE],
+            excludeLiquidity: true,
+          },
         },
         pagination: {
           first: 1,

libs/orders/src/lib/components/order-list-manager/use-order-list-data.ts

@@ -67,24 +67,25 @@ export const useOrderListData = ({
     }
   }, []);
 
-  const variables = useMemo<
-    OrdersQueryVariables & OrdersUpdateSubscriptionVariables
-  >(
-    () => ({
+  const variables = useMemo(() => {
+    // define variable as const to get type safety, using generic with useMemo resulted in lost type safety
+    const allVars: OrdersQueryVariables & OrdersUpdateSubscriptionVariables = {
       partyId,
-      dateRange: filter?.updatedAt?.value,
-      marketId,
       filter: {
-        status: filter?.status?.value,
-        timeInForce: filter?.timeInForce?.value,
-        types: filter?.type?.value,
+        order: {
+          dateRange: filter?.updatedAt?.value,
+          status: filter?.status?.value,
+          timeInForce: filter?.timeInForce?.value,
+          types: filter?.type?.value,
+        },
       },
       pagination: {
         first: 1000,
       },
-    }),
-    [partyId, marketId, filter]
-  );
+    };
+
+    return allVars;
+  }, [partyId, filter]);
 
   const addNewRows = useCallback(() => {
     if (newRows.current === 0) {

libs/orders/src/lib/order-hooks/OrdersSubscription.graphql

@@ -13,7 +13,7 @@ fragment OrderSubFields on OrderUpdate {
 }
 
 subscription OrderSub($partyId: ID!) {
-  orders(partyId: $partyId) {
+  orders(filter: { partyIds: [$partyId] }) {
     ...OrderSubFields
   }
 }

libs/orders/src/lib/order-hooks/__generated__/OrdersSubscription.ts

@@ -29,7 +29,7 @@ export const OrderSubFieldsFragmentDoc = gql`
     `;
 export const OrderSubDocument = gql`
     subscription OrderSub($partyId: ID!) {
-  orders(partyId: $partyId) {
+  orders(filter: {partyIds: [$partyId]}) {
     ...OrderSubFields
   }
 }

libs/orders/src/lib/order-hooks/use-pending-orders-volume.ts

@@ -53,12 +53,14 @@ export const useActiveOrdersVolumeAndMargin = (
     update,
     variables: {
       partyId: partyId || '',
-      marketId,
       filter: {
-        status: [
-          OrderStatus.STATUS_ACTIVE,
-          OrderStatus.STATUS_PARTIALLY_FILLED,
-        ],
+        marketIds: [marketId],
+        order: {
+          status: [
+            OrderStatus.STATUS_ACTIVE,
+            OrderStatus.STATUS_PARTIALLY_FILLED,
+          ],
+        },
       },
     },
     skip: !partyId,

libs/positions/src/lib/positions-data-providers.ts

@@ -353,10 +353,12 @@ export const volumeAndMarginProvider = makeDerivedDataProvider<
       ordersProvider(callback, client, {
         ...variables,
         filter: {
-          status: [
-            OrderStatus.STATUS_ACTIVE,
-            OrderStatus.STATUS_PARTIALLY_FILLED,
-          ],
+          order: {
+            status: [
+              OrderStatus.STATUS_ACTIVE,
+              OrderStatus.STATUS_PARTIALLY_FILLED,
+            ],
+          },
         },
       }),
     (callback, client, variables) =>

libs/positions/src/lib/positions-manager.tsx

@@ -45,11 +45,12 @@ export const PositionsManager = ({
           {
             marketId: marketId,
             type: Schema.OrderType.TYPE_MARKET as const,
-            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK as const,
+            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC as const,
             side: openVolume.startsWith('-')
               ? Schema.Side.SIDE_BUY
               : Schema.Side.SIDE_SELL,
             size: openVolume.replace('-', ''),
+            reduceOnly: true,
           },
         ],
       },

libs/react-helpers/src/lib/index.ts

@@ -2,3 +2,4 @@ export * from './__generated__/ChainId';
 export * from './ag-grid-update';
 export * from './format';
 export * from './grid';
+export * from './validation';

libs/react-helpers/src/lib/validation.ts

@@ -0,0 +1,17 @@
+export const getValidItem = <T>(
+  value: T | null | undefined,
+  set: T[],
+  defaultValue: T
+) =>
+  value !== null && value !== undefined && set.includes(value)
+    ? value
+    : defaultValue;
+
+export const getValidSubset = <T>(
+  value: T[] | null | undefined,
+  set: T[],
+  defaultValue: T[]
+) =>
+  value !== null && value !== undefined
+    ? value.filter((item) => set.includes(item))
+    : defaultValue;

libs/types/src/__generated__/types.ts

@@ -1513,6 +1513,7 @@ export type MarketdepthArgs = {
 
 /** Represents a product & associated parameters that can be traded on Vega, has an associated OrderBook and Trade history */
 export type MarketliquidityProvisionsConnectionArgs = {
+  live?: InputMaybe<Scalars['Boolean']>;
   pagination?: InputMaybe<Pagination>;
   partyId?: InputMaybe<Scalars['ID']>;
 };
@@ -1520,8 +1521,7 @@ export type MarketliquidityProvisionsConnectionArgs = {
 
 /** Represents a product & associated parameters that can be traded on Vega, has an associated OrderBook and Trade history */
 export type MarketordersConnectionArgs = {
-  dateRange?: InputMaybe<DateRange>;
-  filter?: InputMaybe<OrderFilter>;
+  filter?: InputMaybe<OrderByPartyIdsFilter>;
   pagination?: InputMaybe<Pagination>;
 };
 
@@ -2193,8 +2193,12 @@ export type Order = {
   party: Party;
   /** PeggedOrder contains the details about a pegged order */
   peggedOrder?: Maybe<PeggedOrder>;
+  /** Is this a post only order */
+  postOnly?: Maybe<Scalars['Boolean']>;
   /** The worst price the order will trade at (e.g. buy for price or less, sell for price or more) (uint64) */
   price: Scalars['String'];
+  /** Is this a reduce only order */
+  reduceOnly?: Maybe<Scalars['Boolean']>;
   /** The external reference (if available) for the order */
   reference: Scalars['String'];
   /** Why the order was rejected */
@@ -2226,6 +2230,22 @@ export type OrdertradesConnectionArgs = {
   pagination?: InputMaybe<Pagination>;
 };
 
+export type OrderByMarketAndPartyIdsFilter = {
+  marketIds?: InputMaybe<Array<Scalars['ID']>>;
+  order?: InputMaybe<OrderFilter>;
+  partyIds?: InputMaybe<Array<Scalars['ID']>>;
+};
+
+export type OrderByMarketIdsFilter = {
+  marketIds?: InputMaybe<Array<Scalars['ID']>>;
+  order?: InputMaybe<OrderFilter>;
+};
+
+export type OrderByPartyIdsFilter = {
+  order?: InputMaybe<OrderFilter>;
+  partyIds?: InputMaybe<Array<Scalars['ID']>>;
+};
+
 /** Connection type for retrieving cursor-based paginated order information */
 export type OrderConnection = {
   __typename?: 'OrderConnection';
@@ -2256,6 +2276,8 @@ export type OrderEstimate = {
 };
 
 export type OrderFilter = {
+  /** Date range to retrieve orders from/to. Start and end time should be expressed as an integer value of nano-seconds past the Unix epoch */
+  dateRange?: InputMaybe<DateRange>;
   excludeLiquidity?: InputMaybe<Scalars['Boolean']>;
   status?: InputMaybe<Array<OrderStatus>>;
   timeInForce?: InputMaybe<Array<OrderTimeInForce>>;
@@ -2539,6 +2561,7 @@ export type PartydepositsConnectionArgs = {
 
 /** Represents a party on Vega, could be an ethereum wallet address in the future */
 export type PartyliquidityProvisionsConnectionArgs = {
+  live?: InputMaybe<Scalars['Boolean']>;
   marketId?: InputMaybe<Scalars['ID']>;
   pagination?: InputMaybe<Pagination>;
   reference?: InputMaybe<Scalars['String']>;
@@ -2554,9 +2577,7 @@ export type PartymarginsConnectionArgs = {
 
 /** Represents a party on Vega, could be an ethereum wallet address in the future */
 export type PartyordersConnectionArgs = {
-  dateRange?: InputMaybe<DateRange>;
-  filter?: InputMaybe<OrderFilter>;
-  marketId?: InputMaybe<Scalars['ID']>;
+  filter?: InputMaybe<OrderByMarketIdsFilter>;
   pagination?: InputMaybe<Pagination>;
 };
 
@@ -4050,8 +4071,7 @@ export type SubscriptionmarketsDepthUpdateArgs = {
 
 /** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
 export type SubscriptionordersArgs = {
-  marketId?: InputMaybe<Scalars['ID']>;
-  partyId?: InputMaybe<Scalars['ID']>;
+  filter?: InputMaybe<OrderByMarketAndPartyIdsFilter>;
 };
 
 

libs/ui-toolkit/src/components/tabs/tabs.tsx

@@ -1,5 +1,8 @@
 import * as TabsPrimitive from '@radix-ui/react-tabs';
-import { useLocalStorageSnapshot } from '@vegaprotocol/react-helpers';
+import {
+  useLocalStorageSnapshot,
+  getValidItem,
+} from '@vegaprotocol/react-helpers';
 import classNames from 'classnames';
 import type { ReactElement, ReactNode } from 'react';
 import { Children, isValidElement, useState } from 'react';
@@ -93,12 +96,22 @@ export const Tab = ({ children, ...props }: TabProps) => {
 
 export const LocalStoragePersistTabs = ({
   storageKey,
+  children,
   ...props
 }: Omit<TabsProps, 'value' | 'onValueChange'> & { storageKey: string }) => {
   const [value, onValueChange] = useLocalStorageSnapshot(
     `active-tab-${storageKey}`
   );
   return (
-    <Tabs {...props} value={value || undefined} onValueChange={onValueChange} />
+    <Tabs
+      {...props}
+      children={children}
+      value={getValidItem(
+        value,
+        Children.map(children, (child) => child.props.id),
+        undefined
+      )}
+      onValueChange={onValueChange}
+    />
   );
 };

libs/wallet/src/TransactionResult.graphql

@@ -68,7 +68,7 @@ fragment OrderTxUpdateFields on OrderUpdate {
 }
 
 subscription OrderTxUpdate($partyId: ID!) {
-  orders(partyId: $partyId) {
+  orders(filter: { partyIds: [$partyId] }) {
     ...OrderTxUpdateFields
   }
 }

libs/wallet/src/__generated__/TransactionResult.ts

@@ -176,7 +176,7 @@ export type WithdrawalBusEventSubscriptionHookResult = ReturnType<typeof useWith
 export type WithdrawalBusEventSubscriptionResult = Apollo.SubscriptionResult<WithdrawalBusEventSubscription>;
 export const OrderTxUpdateDocument = gql`
     subscription OrderTxUpdate($partyId: ID!) {
-  orders(partyId: $partyId) {
+  orders(filter: {partyIds: [$partyId]}) {
     ...OrderTxUpdateFields
   }
 }

libs/wallet/src/connectors/vega-connector.ts

@@ -45,6 +45,7 @@ export interface OrderSubmission {
   size: string;
   price?: string;
   expiresAt?: string;
+  reduceOnly?: boolean;
 }
 
 export interface OrderCancellation {