build(explorer): update validator testnet be url

The environment file for validator testnet contains an old URL that no longer works. This updates it.

- Update block explorer api url

apps/governance/.env.validator-testnet

@@ -8,4 +8,3 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/governance/src/routes/staking/PreviousEpoch.graphql

@@ -7,10 +7,9 @@ query PreviousEpoch($epochId: ID) {
           id
           rewardScore {
             rawValidatorScore
-            performanceScore
           }
           rankingScore {
-            stakeScore
+            performanceScore
           }
         }
       }

apps/governance/src/routes/staking/__generated__/PreviousEpoch.ts

@@ -8,7 +8,7 @@ export type PreviousEpochQueryVariables = Types.Exact<{
 }>;
 
 
-export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string, performanceScore: string } | null, rankingScore: { __typename?: 'RankingScore', stakeScore: string } } } | null> | null } | null } };
+export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string } | null, rankingScore: { __typename?: 'RankingScore', performanceScore: string } } } | null> | null } | null } };
 
 
 export const PreviousEpochDocument = gql`
@@ -21,10 +21,9 @@ export const PreviousEpochDocument = gql`
           id
           rewardScore {
             rawValidatorScore
-            performanceScore
           }
           rankingScore {
-            stakeScore
+            performanceScore
           }
         }
       }

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.spec.tsx

@@ -81,10 +81,9 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
             id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b4',
             rewardScore: {
               rawValidatorScore: '0.25',
-              performanceScore: '0.9998677767864936',
             },
             rankingScore: {
-              stakeScore: '0.2499583402766206',
+              performanceScore: '0.9998677767864936',
             },
           },
         },
@@ -93,10 +92,9 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
             id: '966438c6bffac737cfb08173ffcb3f393c4692b099ad80cb45a82e2dc0a8cf99',
             rewardScore: {
               rawValidatorScore: '0.3',
-              performanceScore: '1',
             },
             rankingScore: {
-              stakeScore: '0.25',
+              performanceScore: '1',
             },
           },
         },
@@ -105,10 +103,9 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
             id: '12c81b738e8051152e1afe44376ec37bca9216466e6d44cdd772194bad0ada81',
             rewardScore: {
               rawValidatorScore: '0.35',
-              performanceScore: '0.999629748500531',
             },
             rankingScore: {
-              stakeScore: '0.2312',
+              performanceScore: '0.999629748500531',
             },
           },
         },

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx

@@ -10,6 +10,7 @@ import {
   getFormattedPerformanceScore,
   getLastEpochScoreAndPerformance,
   getNormalisedVotingPower,
+  getOverstakedAmount,
   getOverstakingPenalty,
   getPerformancePenalty,
   getTotalPenalties,
@@ -51,6 +52,7 @@ interface CanonisedConsensusNodeProps {
   [ValidatorFields.STAKED_BY_OPERATOR]: string;
   [ValidatorFields.PERFORMANCE_SCORE]: string;
   [ValidatorFields.PERFORMANCE_PENALTY]: string;
+  [ValidatorFields.OVERSTAKED_AMOUNT]: string;
   [ValidatorFields.OVERSTAKING_PENALTY]: string;
   [ValidatorFields.TOTAL_PENALTIES]: string;
   [ValidatorFields.PENDING_STAKE]: string;
@@ -162,11 +164,14 @@ export const ConsensusValidatorsTable = ({
           pendingUserStake,
           userStakeShare,
         }) => {
-          const {
-            rawValidatorScore: previousEpochValidatorScore,
-            performanceScore: previousEpochPerformanceScore,
-            stakeScore: previousEpochStakeScore,
-          } = getLastEpochScoreAndPerformance(previousEpochData, id);
+          const { rawValidatorScore, performanceScore } =
+            getLastEpochScoreAndPerformance(previousEpochData, id);
+
+          const overstakedAmount = getOverstakedAmount(
+            rawValidatorScore,
+            stakedTotal,
+            totalStake
+          );
 
           return {
             id,
@@ -179,7 +184,7 @@ export const ConsensusValidatorsTable = ({
             [ValidatorFields.NORMALISED_VOTING_POWER]:
               getNormalisedVotingPower(votingPower),
             [ValidatorFields.UNNORMALISED_VOTING_POWER]:
-              getUnnormalisedVotingPower(previousEpochValidatorScore),
+              getUnnormalisedVotingPower(rawValidatorScore),
             [ValidatorFields.STAKE_SHARE]: stakedTotalPercentage(stakeScore),
             [ValidatorFields.STAKED_BY_DELEGATES]: formatNumber(
               toBigNum(stakedByDelegates, decimals),
@@ -189,19 +194,18 @@ export const ConsensusValidatorsTable = ({
               toBigNum(stakedByOperator, decimals),
               2
             ),
-            [ValidatorFields.PERFORMANCE_SCORE]: getFormattedPerformanceScore(
-              previousEpochPerformanceScore
-            ).toString(),
-            [ValidatorFields.PERFORMANCE_PENALTY]: getPerformancePenalty(
-              previousEpochPerformanceScore
-            ),
+            [ValidatorFields.PERFORMANCE_SCORE]:
+              getFormattedPerformanceScore(performanceScore).toString(),
+            [ValidatorFields.PERFORMANCE_PENALTY]:
+              getPerformancePenalty(performanceScore),
+            [ValidatorFields.OVERSTAKED_AMOUNT]: overstakedAmount.toString(),
             [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              previousEpochValidatorScore,
-              previousEpochStakeScore
+              overstakedAmount,
+              totalStake
             ),
             [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              previousEpochValidatorScore,
-              previousEpochPerformanceScore,
+              rawValidatorScore,
+              performanceScore,
               stakedTotal,
               totalStake
             ),

apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx

@@ -7,6 +7,7 @@ import { BigNumber } from '../../../../lib/bignumber';
 import {
   getFormattedPerformanceScore,
   getLastEpochScoreAndPerformance,
+  getOverstakedAmount,
   getOverstakingPenalty,
   getPerformancePenalty,
   getTotalPenalties,
@@ -81,21 +82,21 @@ export const StandbyPendingValidatorsTable = ({
           pendingUserStake,
           userStakeShare,
         }) => {
-          const {
-            rawValidatorScore: previousEpochValidatorScore,
-            performanceScore: previousEpochPerformanceScore,
-            stakeScore: previousEpochStakeScore,
-          } = getLastEpochScoreAndPerformance(previousEpochData, id);
+          const { rawValidatorScore, performanceScore } =
+            getLastEpochScoreAndPerformance(previousEpochData, id);
 
+          const overstakedAmount = getOverstakedAmount(
+            rawValidatorScore,
+            stakedTotal,
+            totalStake
+          );
           let individualStakeNeededForPromotion,
             individualStakeNeededForPromotionDescription;
 
-          if (stakeNeededForPromotion && previousEpochPerformanceScore) {
+          if (stakeNeededForPromotion && performanceScore) {
             const stakedTotalBigNum = new BigNumber(stakedTotal);
             const stakeNeededBigNum = new BigNumber(stakeNeededForPromotion);
-            const performanceScoreBigNum = new BigNumber(
-              previousEpochPerformanceScore
-            );
+            const performanceScoreBigNum = new BigNumber(performanceScore);
 
             const calc = stakeNeededBigNum
               .dividedBy(performanceScoreBigNum)
@@ -141,19 +142,18 @@ export const StandbyPendingValidatorsTable = ({
               toBigNum(stakedByOperator, decimals),
               2
             ),
-            [ValidatorFields.PERFORMANCE_SCORE]: getFormattedPerformanceScore(
-              previousEpochPerformanceScore
-            ).toString(),
-            [ValidatorFields.PERFORMANCE_PENALTY]: getPerformancePenalty(
-              previousEpochPerformanceScore
-            ),
+            [ValidatorFields.PERFORMANCE_SCORE]:
+              getFormattedPerformanceScore(performanceScore).toString(),
+            [ValidatorFields.PERFORMANCE_PENALTY]:
+              getPerformancePenalty(performanceScore),
+            [ValidatorFields.OVERSTAKED_AMOUNT]: overstakedAmount.toString(),
             [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              previousEpochValidatorScore,
-              previousEpochStakeScore
+              overstakedAmount,
+              totalStake
             ),
             [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              previousEpochValidatorScore,
-              previousEpochPerformanceScore,
+              rawValidatorScore,
+              performanceScore,
               stakedTotal,
               totalStake
             ),

apps/governance/src/routes/staking/node/validator-table.tsx

@@ -20,6 +20,7 @@ import { SubHeading } from '../../../components/heading';
 import {
   getLastEpochScoreAndPerformance,
   getNormalisedVotingPower,
+  getOverstakedAmount,
   getOverstakingPenalty,
   getPerformancePenalty,
   getTotalPenalties,
@@ -74,9 +75,15 @@ export const ValidatorTable = ({
 
   const stakedOnNode = toBigNum(node.stakedTotal, decimals);
 
-  const { rawValidatorScore, performanceScore, stakeScore } =
+  const { rawValidatorScore, performanceScore } =
     getLastEpochScoreAndPerformance(previousEpochData, node.id);
 
+  const overstakedAmount = getOverstakedAmount(
+    rawValidatorScore,
+    stakedTotal,
+    node.stakedTotal
+  );
+
   const stakePercentage = getStakePercentage(total, stakedOnNode);
 
   const totalPenaltiesAmount = getTotalPenalties(
@@ -238,7 +245,7 @@ export const ValidatorTable = ({
 
               <Tooltip description={t('OverstakedPenaltyDescription')}>
                 <span data-testid="overstaking-penalty">
-                  {getOverstakingPenalty(rawValidatorScore, stakeScore)}
+                  {getOverstakingPenalty(overstakedAmount, node.stakedTotal)}
                 </span>
               </Tooltip>
             </KeyValueTableRow>

apps/governance/src/routes/staking/shared.spec.ts

@@ -4,6 +4,7 @@ import {
   getNormalisedVotingPower,
   getUnnormalisedVotingPower,
   getOverstakingPenalty,
+  getOverstakedAmount,
   getFormattedPerformanceScore,
   getPerformancePenalty,
   getTotalPenalties,
@@ -21,10 +22,9 @@ describe('getLastEpochScoreAndPerformance', () => {
               id: '0x123',
               rewardScore: {
                 rawValidatorScore: '0.25',
-                performanceScore: '0.75',
               },
               rankingScore: {
-                stakeScore: '0.25',
+                performanceScore: '0.75',
               },
             },
           },
@@ -33,10 +33,9 @@ describe('getLastEpochScoreAndPerformance', () => {
               id: '0x234',
               rewardScore: {
                 rawValidatorScore: '0.35',
-                performanceScore: '0.85',
               },
               rankingScore: {
-                stakeScore: '0.25',
+                performanceScore: '0.85',
               },
             },
           },
@@ -51,14 +50,12 @@ describe('getLastEpochScoreAndPerformance', () => {
     ).toEqual({
       rawValidatorScore: '0.25',
       performanceScore: '0.75',
-      stakeScore: '0.25',
     });
     expect(
       getLastEpochScoreAndPerformance(mockPreviousEpochData, '0x234')
     ).toEqual({
       rawValidatorScore: '0.35',
       performanceScore: '0.85',
-      stakeScore: '0.25',
     });
   });
 });
@@ -82,34 +79,40 @@ describe('getUnnormalisedVotingPower', () => {
 });
 
 describe('getOverstakingPenalty', () => {
-  it('returns "0%" when both arguments are null or undefined', () => {
-    expect(getOverstakingPenalty(null, null)).toBe('0%');
-    expect(getOverstakingPenalty(undefined, undefined)).toBe('0%');
-    expect(getOverstakingPenalty(null, undefined)).toBe('0%');
-    expect(getOverstakingPenalty(undefined, null)).toBe('0%');
+  it('should return the overstaking penalty', () => {
+    expect(
+      getOverstakingPenalty(new BigNumber(100), Number(1000).toString())
+    ).toEqual('10.00%');
+    expect(
+      getOverstakingPenalty(new BigNumber(500), Number(2000).toString())
+    ).toEqual('25.00%');
+  });
+});
+
+describe('getOverstakedAmount', () => {
+  it('should return the overstaked amount', () => {
+    expect(
+      // If a validator score is 0, any amount staked on the node is considered overstaked
+      getOverstakedAmount('0', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(20));
+    expect(
+      getOverstakedAmount('0.05', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(15));
+    expect(
+      getOverstakedAmount('0.1', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(10));
+    expect(
+      getOverstakedAmount('0.15', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(5));
+    expect(
+      getOverstakedAmount('0.2', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(0));
   });
 
-  it('returns "0%" when one argument is null or undefined', () => {
-    expect(getOverstakingPenalty('10', null)).toBe('0%');
-    expect(getOverstakingPenalty(null, '20')).toBe('0%');
-    expect(getOverstakingPenalty('10', undefined)).toBe('0%');
-    expect(getOverstakingPenalty(undefined, '20')).toBe('0%');
-  });
-
-  it('returns "0%" when validatorScore or stakeScore is zero', () => {
-    expect(getOverstakingPenalty('0', '20')).toBe('0%');
-    expect(getOverstakingPenalty('10', '0')).toBe('0%');
-  });
-
-  it('returns the correct overstaking penalty', () => {
-    expect(getOverstakingPenalty('0.18', '0.2')).toBe('10.00%');
-    expect(getOverstakingPenalty('0.2', '0.2')).toBe('0.00%');
-    expect(getOverstakingPenalty('0.04', '0.2')).toBe('80.00%');
-  });
-
-  it('handles string numbers with decimals', () => {
-    expect(getOverstakingPenalty('7.5', '15')).toBe('50.00%');
-    expect(getOverstakingPenalty('12.5', '25')).toBe('50.00%');
+  it('should return 0 if the overstaked amount is negative', () => {
+    expect(
+      getOverstakedAmount('0.8', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(0));
   });
 });
 

apps/governance/src/routes/staking/shared.ts

@@ -15,8 +15,7 @@ export const getLastEpochScoreAndPerformance = (
 
   return {
     rawValidatorScore: validator?.rewardScore?.rawValidatorScore,
-    performanceScore: validator?.rewardScore?.performanceScore,
-    stakeScore: validator?.rankingScore?.stakeScore,
+    performanceScore: validator?.rankingScore?.performanceScore,
   };
 };
 
@@ -43,26 +42,31 @@ export const getPerformancePenalty = (performanceScore?: string) =>
     2
   );
 
-export const getOverstakingPenalty = (
+export const getOverstakedAmount = (
   validatorScore: string | null | undefined,
-  stakeScore: string | null | undefined
+  totalStake: string,
+  stakedOnNode: string
 ) => {
-  if (!validatorScore || !stakeScore) {
-    return '0%';
-  }
+  const toReturn = validatorScore
+    ? new BigNumber(stakedOnNode).minus(
+        new BigNumber(validatorScore).times(new BigNumber(totalStake))
+      )
+    : new BigNumber(0);
 
+  return toReturn.isNegative() ? new BigNumber(0) : toReturn;
+};
+
+export const getOverstakingPenalty = (
+  overstakedAmount: BigNumber,
+  stakedOnNode: string
+) => {
   // avoid division by zero
-  if (
-    new BigNumber(validatorScore).isZero() ||
-    new BigNumber(stakeScore).isZero()
-  ) {
-    return '0%';
+  if (new BigNumber(stakedOnNode).isZero() || overstakedAmount.isZero()) {
+    return '0';
   }
 
   return formatNumberPercentage(
-    new BigNumber(1)
-      .minus(new BigNumber(validatorScore).dividedBy(new BigNumber(stakeScore)))
-      .times(100),
+    overstakedAmount.dividedBy(new BigNumber(stakedOnNode)).times(100),
     2
   );
 };

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

@@ -1,5 +1,5 @@
 import * as Schema from '@vegaprotocol/types';
-import { aliasGQLQuery, checkSorting } from '@vegaprotocol/cypress';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { marketsQuery } from '@vegaprotocol/mock';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 
@@ -85,7 +85,6 @@ describe('markets table', { tags: '@smoke' }, () => {
     cy.getByTestId('view-market-list-link')
       .should('have.attr', 'href', '#/markets/all')
       .click();
-
     cy.get('[data-testid="All markets"]').should(
       'have.attr',
       'data-state',
@@ -118,85 +117,6 @@ describe('markets table', { tags: '@smoke' }, () => {
         `${Cypress.env('VEGA_TOKEN_URL')}/proposals/propose/new-market`
       );
   });
-  it('proposed markets tab should be sorted properly', () => {
-    cy.getByTestId('view-market-list-link').click();
-    cy.get('[data-testid="Proposed markets"]').click();
-    const marketColDefault = [
-      'ETHUSD',
-      'LINKUSD',
-      'ETHUSD',
-      'ETHDAI.MF21',
-      'AAPL.MF21',
-      'BTCUSD.MF21',
-      'TSLA.QM21',
-      'AAVEDAI.MF21',
-      'ETHBTC.QM21',
-      'UNIDAI.MF21',
-    ];
-    const marketColAsc = [
-      'AAPL.MF21',
-      'AAVEDAI.MF21',
-      'BTCUSD.MF21',
-      'ETHBTC.QM21',
-      'ETHDAI.MF21',
-      'ETHUSD',
-      'ETHUSD',
-      'LINKUSD',
-      'TSLA.QM21',
-      'UNIDAI.MF21',
-    ];
-    const marketColDesc = [
-      'UNIDAI.MF21',
-      'TSLA.QM21',
-      'LINKUSD',
-      'ETHUSD',
-      'ETHUSD',
-      'ETHDAI.MF21',
-      'ETHBTC.QM21',
-      'BTCUSD.MF21',
-      'AAVEDAI.MF21',
-      'AAPL.MF21',
-    ];
-    checkSorting('market', marketColDefault, marketColAsc, marketColDesc);
-
-    const stateColDefault = [
-      'Open',
-      'Passed',
-      'Waiting for Node Vote',
-      'Open',
-      'Passed',
-      'Open',
-      'Passed',
-      'Open',
-      'Waiting for Node Vote',
-      'Open',
-    ];
-    const stateColAsc = [
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Passed',
-      'Passed',
-      'Passed',
-      'Waiting for Node Vote',
-      'Waiting for Node Vote',
-    ];
-    const stateColDesc = [
-      'Waiting for Node Vote',
-      'Waiting for Node Vote',
-      'Passed',
-      'Passed',
-      'Passed',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-    ];
-    checkSorting('state', stateColDefault, stateColAsc, stateColDesc);
-  });
 
   it('opening auction subsets should be properly displayed', () => {
     cy.mockTradingPage(

apps/trading-e2e/src/integration/trading-deal-ticket-validations.cy.ts

@@ -1,329 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { mockConnectWallet } from '@vegaprotocol/cypress';
-
-const orderSizeField = 'order-size';
-const orderPriceField = 'order-price';
-const orderTIFDropDown = 'order-tif';
-const placeOrderBtn = 'place-order';
-const toggleShort = 'order-side-SIDE_SELL';
-const toggleLong = 'order-side-SIDE_BUY';
-const toggleLimit = 'order-type-TYPE_LIMIT';
-const toggleMarket = 'order-type-TYPE_MARKET';
-
-const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
-  return {
-    code: Schema.OrderTimeInForceCode[value],
-    value,
-    text: Schema.OrderTimeInForceMapping[value],
-  };
-});
-
-describe('time in force default values', () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must have market order set up to IOC by default', function () {
-    // 7002-SORD-031
-    cy.getByTestId(toggleMarket).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'IOC')[0].text
-    );
-  });
-
-  it('must have time in force set to GTC for limit order', function () {
-    // 7002-SORD-031
-    cy.getByTestId(toggleLimit).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'GTC')[0].text
-    );
-  });
-});
-
-describe('deal ticket validation', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must show place order button and connect wallet if wallet is not connected', () => {
-    // 0003-WTXN-001
-    cy.getByTestId('connect-vega-wallet'); // Not connected
-    cy.getByTestId('order-connect-wallet').should('exist');
-    cy.getByTestId(placeOrderBtn).should('exist');
-    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
-  });
-
-  it('must be able to select order direction - long/short', function () {
-    // 7002-SORD-004
-    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
-    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
-  });
-
-  it('must be able to select order type - limit/market', function () {
-    // 7002-SORD-005
-    // 7002-SORD-006
-    // 7002-SORD-007
-    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
-    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
-  });
-
-  it('order connect vega wallet button should connect', () => {
-    mockConnectWallet();
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('101');
-    cy.getByTestId('order-connect-wallet').click();
-    cy.getByTestId('dialog-content').should('be.visible');
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-jsonRpc"]')
-      .click();
-    cy.wait('@walletReq');
-    cy.getByTestId(placeOrderBtn).should('be.visible');
-    cy.getByTestId(toggleLimit).children('input').should('be.checked');
-    cy.getByTestId(orderPriceField).should('have.value', '101');
-  });
-});
-
-describe('deal ticket size validation', { tags: '@smoke' }, function () {
-  beforeEach(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must warn if order size input has too many digits after the decimal place', function () {
-    // 7002-SORD-016
-    cy.getByTestId('order-type-TYPE_MARKET').click();
-    cy.getByTestId(orderSizeField).clear().type('1.234');
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
-    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-size-market').should(
-      'have.text',
-      'Size must be whole numbers for this market'
-    );
-  });
-
-  it('must warn if order size is set to 0', function () {
-    cy.getByTestId('order-type-TYPE_MARKET').click();
-    cy.getByTestId(orderSizeField).clear().type('0');
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
-    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-size-market').should(
-      'have.text',
-      'Size cannot be lower than 1'
-    );
-  });
-});
-
-describe('limit order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleLimit).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('must see the price unit', function () {
-    // 7002-SORD-018
-    cy.getByTestId(orderPriceField)
-      .siblings('label')
-      .should('have.text', 'Price (DAI)');
-  });
-
-  it('must see warning when placing an order with expiry date in past', () => {
-    const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
-    const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('0.1');
-    cy.getByTestId(orderSizeField).clear().type('1');
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-
-    cy.log('choosing yesterday');
-    cy.getByTestId('date-picker-field').type(expiresAtInputValue);
-
-    cy.getByTestId(placeOrderBtn).click();
-
-    cy.getByTestId('dealticket-error-message-expiry').should(
-      'have.text',
-      'The expiry date that you have entered appears to be in the past'
-    );
-  });
-
-  it('must see warning if price has too many digits after decimal place', function () {
-    // 7002-SORD-059
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
-    cy.getByTestId(orderSizeField).clear().type('1');
-    cy.getByTestId(orderPriceField).clear().type('1.123456');
-    cy.getByTestId('dealticket-error-message-price-limit').should(
-      'have.text',
-      'Price accepts up to 5 decimal places'
-    );
-  });
-
-  describe('time in force validations', function () {
-    const validTIF = TIFlist;
-    validTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-025
-      // 7002-SORD-026
-      // 7002-SORD-027
-      // 7002-SORD-028
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-
-    it('selections should be remembered', () => {
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-      cy.getByTestId(toggleMarket).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'IOC')[0].text
-      );
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
-      cy.getByTestId(toggleLimit).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'GTT')[0].text
-      );
-      cy.getByTestId(toggleMarket).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'FOK')[0].text
-      );
-    });
-  });
-});
-
-describe('market order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleMarket).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('must not see the price unit', function () {
-    // 7002-SORD-019
-    cy.getByTestId(orderPriceField).should('not.exist');
-  });
-
-  describe('time in force validations', function () {
-    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-    const invalidTIF = TIFlist.filter(
-      (tif) => !['FOK', 'IOC'].includes(tif.code)
-    );
-
-    validTIF.forEach((tif) => {
-      // 7002-SORD-025
-      // 7002-SORD-026
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-
-    invalidTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-027
-      // 7002-SORD-028
-      it(`must not be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
-      });
-    });
-  });
-});
-
-describe('post and reduce order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleMarket).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-
-  validTIF.forEach((tif) => {
-    // 7002-SORD-025
-    // 7002-SORD-026
-
-    it(`post and reduce order market for ${tif.code}`, function () {
-      cy.getByTestId(orderTIFDropDown).select(tif.value);
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        tif.text
-      );
-      cy.getByTestId('post-only').should('be.disabled');
-      cy.getByTestId('reduce-only').should('be.enabled');
-    });
-  });
-
-  validTIF.forEach((tif) => {
-    it(`post and reduce order limit for ${tif.code}`, function () {
-      cy.getByTestId(toggleLimit).click();
-      cy.getByTestId(orderTIFDropDown).select(tif.value);
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        tif.text
-      );
-      cy.getByTestId('post-only').should('be.disabled');
-      cy.getByTestId('reduce-only').should('be.enabled');
-    });
-  });
-
-  const validTIFLimit = TIFlist.filter((tif) =>
-    ['GFA', 'GFN', 'GTC', 'GTT'].includes(tif.code)
-  );
-
-  validTIFLimit.forEach((tif) => {
-    it(`post and reduce order for limit ${tif.code}`, function () {
-      cy.getByTestId(toggleLimit).click();
-      cy.getByTestId(orderTIFDropDown).select(tif.value);
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        tif.text
-      );
-      cy.getByTestId('post-only').should('be.enabled');
-      cy.getByTestId('reduce-only').should('be.disabled');
-    });
-  });
-});

apps/trading-e2e/src/integration/trading-deal-ticket.cy.ts

@@ -1,5 +1,5 @@
 import * as Schema from '@vegaprotocol/types';
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { aliasGQLQuery, mockConnectWallet } from '@vegaprotocol/cypress';
 import { testOrderSubmission } from '../support/order-validation';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import {
@@ -13,6 +13,8 @@ const orderSizeField = 'order-size';
 const orderPriceField = 'order-price';
 const orderTIFDropDown = 'order-tif';
 const placeOrderBtn = 'place-order';
+const toggleShort = 'order-side-SIDE_SELL';
+const toggleLong = 'order-side-SIDE_BUY';
 const toggleLimit = 'order-type-TYPE_LIMIT';
 const toggleMarket = 'order-type-TYPE_MARKET';
 
@@ -30,6 +32,34 @@ const displayTomorrow = () => {
   return tomorrow.toISOString().substring(0, 16);
 };
 
+describe('time in force default values', () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must have market order set up to IOC by default', function () {
+    // 7002-SORD-031
+    cy.getByTestId(toggleMarket).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'IOC')[0].text
+    );
+  });
+
+  it('must have time in force set to GTC for limit order', function () {
+    // 7002-SORD-031
+    cy.getByTestId(toggleLimit).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'GTC')[0].text
+    );
+  });
+});
+
 describe('must submit order', { tags: '@smoke' }, () => {
   // 7002-SORD-039
   before(() => {
@@ -363,6 +393,227 @@ describe(
   }
 );
 
+describe('deal ticket validation', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must show place order button and connect wallet if wallet is not connected', () => {
+    // 0003-WTXN-001
+    cy.getByTestId('connect-vega-wallet'); // Not connected
+    cy.getByTestId('order-connect-wallet').should('exist');
+    cy.getByTestId(placeOrderBtn).should('exist');
+    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
+  });
+
+  it('must be able to select order direction - long/short', function () {
+    // 7002-SORD-004
+    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
+    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
+  });
+
+  it('must be able to select order type - limit/market', function () {
+    // 7002-SORD-005
+    // 7002-SORD-006
+    // 7002-SORD-007
+    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
+    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
+  });
+
+  it('order connect vega wallet button should connect', () => {
+    mockConnectWallet();
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('101');
+    cy.getByTestId('order-connect-wallet').click();
+    cy.getByTestId('dialog-content').should('be.visible');
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-jsonRpc"]')
+      .click();
+    cy.wait('@walletReq');
+    cy.getByTestId(placeOrderBtn).should('be.visible');
+    cy.getByTestId(toggleLimit).children('input').should('be.checked');
+    cy.getByTestId(orderPriceField).should('have.value', '101');
+  });
+});
+
+describe('deal ticket size validation', { tags: '@smoke' }, function () {
+  beforeEach(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must warn if order size input has too many digits after the decimal place', function () {
+    // 7002-SORD-016
+    cy.getByTestId('order-type-TYPE_MARKET').click();
+    cy.getByTestId(orderSizeField).clear().type('1.234');
+    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-size-market').should(
+      'have.text',
+      'Size must be whole numbers for this market'
+    );
+  });
+
+  it('must warn if order size is set to 0', function () {
+    cy.getByTestId('order-type-TYPE_MARKET').click();
+    cy.getByTestId(orderSizeField).clear().type('0');
+    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-size-market').should(
+      'have.text',
+      'Size cannot be lower than 1'
+    );
+  });
+});
+
+describe('limit order validations', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(toggleLimit).click();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('must see the price unit', function () {
+    // 7002-SORD-018
+    cy.getByTestId(orderPriceField)
+      .siblings('label')
+      .should('have.text', 'Price (DAI)');
+  });
+
+  it('must see warning when placing an order with expiry date in past', () => {
+    const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
+    const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('0.1');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+
+    cy.log('choosing yesterday');
+    cy.getByTestId('date-picker-field').type(expiresAtInputValue);
+
+    cy.getByTestId(placeOrderBtn).click();
+
+    cy.getByTestId('dealticket-error-message-expiry').should(
+      'have.text',
+      'The expiry date that you have entered appears to be in the past'
+    );
+  });
+
+  it('must see warning if price has too many digits after decimal place', function () {
+    // 7002-SORD-059
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(orderPriceField).clear().type('1.123456');
+    cy.getByTestId('dealticket-error-message-price-limit').should(
+      'have.text',
+      'Price accepts up to 5 decimal places'
+    );
+  });
+
+  describe('time in force validations', function () {
+    const validTIF = TIFlist;
+    validTIF.forEach((tif) => {
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-025
+      // 7002-SORD-026
+      // 7002-SORD-027
+      // 7002-SORD-028
+
+      it(`must be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+      });
+    });
+
+    it('selections should be remembered', () => {
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+      cy.getByTestId(toggleMarket).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'IOC')[0].text
+      );
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
+      cy.getByTestId(toggleLimit).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'GTT')[0].text
+      );
+      cy.getByTestId(toggleMarket).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'FOK')[0].text
+      );
+    });
+  });
+});
+
+describe('market order validations', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(toggleMarket).click();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('must not see the price unit', function () {
+    // 7002-SORD-019
+    cy.getByTestId(orderPriceField).should('not.exist');
+  });
+
+  describe('time in force validations', function () {
+    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
+    const invalidTIF = TIFlist.filter(
+      (tif) => !['FOK', 'IOC'].includes(tif.code)
+    );
+
+    validTIF.forEach((tif) => {
+      // 7002-SORD-025
+      // 7002-SORD-026
+
+      it(`must be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+      });
+    });
+
+    invalidTIF.forEach((tif) => {
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-027
+      // 7002-SORD-028
+      it(`must not be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
+      });
+    });
+  });
+});
+
 describe('suspended market validation', { tags: '@regression' }, () => {
   before(() => {
     cy.setVegaWallet();

apps/trading/client-pages/liquidity/liquidity.tsx

@@ -8,7 +8,6 @@ import {
 import { tooltipMapping } from '@vegaprotocol/market-info';
 import {
   addDecimalsFormatNumber,
-  createDocsLinks,
   formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
@@ -24,7 +23,6 @@ import {
   Tabs,
   Link as UiToolkitLink,
   Indicator,
-  ExternalLink,
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { memo, useCallback, useEffect, useRef, useState } from 'react';
@@ -39,7 +37,6 @@ import { Link, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
 
 import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';
-import { useEnvironment } from '@vegaprotocol/environment';
 
 const enum LiquidityTabs {
   Active = 'active',
@@ -147,7 +144,6 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
     market?.tradableInstrument.instrument.product.settlementAsset.decimals || 0;
   const symbol =
     market?.tradableInstrument.instrument.product.settlementAsset.symbol;
-  const { VEGA_DOCS_URL } = useEnvironment();
 
   const { params } = useNetworkParams([
     NetworkParams.market_liquidity_stakeToCcyVolume,
@@ -215,13 +211,6 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
       <HeaderStat heading={t('Market ID')}>
         <div className="break-word">{marketId}</div>
       </HeaderStat>
-      <HeaderStat heading={t('Learn more')}>
-        {VEGA_DOCS_URL && (
-          <ExternalLink href={createDocsLinks(VEGA_DOCS_URL).LIQUIDITY}>
-            {t('Providing liquidity')}
-          </ExternalLink>
-        )}
-      </HeaderStat>
     </Header>
   );
 });

apps/trading/client-pages/portfolio/account-history-container.tsx

@@ -301,7 +301,7 @@ export const AccountHistoryChart = ({
   asset: AssetFieldsFragment;
 }) => {
   const { theme } = useThemeSwitcher();
-  const values: { cols: [string, string]; rows: [Date, number][] } | null =
+  const values: { cols: string[]; rows: [Date, ...number[]][] } | null =
     useMemo(() => {
       if (!data?.balanceChanges.edges.length) {
         return null;

apps/trading/components/liquidity-supplied/liquidity-supplied.tsx

@@ -8,7 +8,6 @@ import type { MarketData } from '@vegaprotocol/market-list';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import {
-  ExternalLink,
   Indicator,
   KeyValueTable,
   KeyValueTableRow,
@@ -19,11 +18,9 @@ import { useCheckLiquidityStatus } from '@vegaprotocol/liquidity';
 import { AuctionTrigger, MarketTradingMode } from '@vegaprotocol/types';
 import {
   addDecimalsFormatNumber,
-  createDocsLinks,
   formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { useEnvironment } from '@vegaprotocol/environment';
 
 interface Props {
   marketId?: string;
@@ -47,8 +44,6 @@ export const MarketLiquiditySupplied = ({
     params.market_liquidity_targetstake_triggering_ratio
   );
 
-  const { VEGA_DOCS_URL } = useEnvironment();
-
   const variables = useMemo(
     () => ({
       marketId: marketId || '',
@@ -131,14 +126,6 @@ export const MarketLiquiditySupplied = ({
       <Link href={`/#/liquidity/${marketId}`} data-testid="view-liquidity-link">
         {t('View liquidity provision table')}
       </Link>
-      {VEGA_DOCS_URL && (
-        <ExternalLink
-          href={createDocsLinks(VEGA_DOCS_URL).LIQUIDITY}
-          className="mt-2"
-        >
-          {t('Learn about providing liquidity')}
-        </ExternalLink>
-      )}
       {showMessage && (
         <p className="mt-4">
           {t(

apps/trading/components/navbar/navbar.tsx

@@ -23,7 +23,6 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 
 import { Links, Routes } from '../../pages/client-router';
-import { createDocsLinks } from '@vegaprotocol/utils';
 
 export const Navbar = ({
   theme = 'system',
@@ -38,7 +37,6 @@ export const Navbar = ({
   const tradingPath = marketId
     ? Links[Routes.MARKET](marketId)
     : Links[Routes.MARKET]();
-
   return (
     <Navigation
       appName="Console"
@@ -91,9 +89,7 @@ export const Navbar = ({
             <NavigationContent>
               <NavigationList>
                 <NavigationItem>
-                  <NavExternalLink
-                    href={createDocsLinks(VEGA_DOCS_URL).NEW_TO_VEGA}
-                  >
+                  <NavExternalLink href={VEGA_DOCS_URL}>
                     {t('Docs')}
                   </NavExternalLink>
                 </NavigationItem>

apps/trading/lib/hooks/use-vega-transaction-toasts.tsx

@@ -39,14 +39,10 @@ import { t } from '@vegaprotocol/i18n';
 import { useAssetsDataProvider } from '@vegaprotocol/assets';
 import { useEthWithdrawApprovalsStore } from '@vegaprotocol/web3';
 import { DApp, EXPLORER_TX, useLinks } from '@vegaprotocol/environment';
-import {
-  getOrderToastIntent,
-  getOrderToastTitle,
-  getRejectionReason,
-  useOrderByIdQuery,
-} from '@vegaprotocol/orders';
+import { getRejectionReason, useOrderByIdQuery } from '@vegaprotocol/orders';
 import { useMarketList } from '@vegaprotocol/market-list';
 import type { Side } from '@vegaprotocol/types';
+import { OrderStatus } from '@vegaprotocol/types';
 import { OrderStatusMapping } from '@vegaprotocol/types';
 import { Size } from '@vegaprotocol/react-helpers';
 
@@ -482,10 +478,12 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {
       getRejectionReason(tx.order) || tx.order.rejectionReason || '';
     return (
       <>
-        <ToastHeading>{getOrderToastTitle(tx.order.status)}</ToastHeading>
-        {rejectionReason ? (
+        <ToastHeading>{t('Order rejected')}</ToastHeading>
+        {rejectionReason || tx.order.rejectionReason ? (
           <p>
-            {t('Your order has been rejected because: %s', [rejectionReason])}
+            {t('Your order has been rejected because: %s', [
+              rejectionReason || tx.order.rejectionReason,
+            ])}
           </p>
         ) : (
           <p>{t('Your order has been rejected.')}</p>
@@ -508,7 +506,7 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {
   if (isOrderSubmissionTransaction(tx.body) && tx.order?.rejectionReason) {
     return (
       <div>
-        <h3 className="font-bold">{getOrderToastTitle(tx.order.status)}</h3>
+        <h3 className="font-bold">{t('Order rejected')}</h3>
         <p>{t('Your order was rejected.')}</p>
         {tx.txHash && (
           <p className="break-all">
@@ -582,7 +580,7 @@ const VegaTxErrorToastContent = ({ tx }: VegaTxToastContentProps) => {
     tx.error instanceof WalletError &&
     walletNoConnectionCodes.includes(tx.error.code);
   if (orderRejection) {
-    label = getOrderToastTitle(tx.order?.status) || t('Order rejected');
+    label = t('Order rejected');
     errorMessage = t('Your order has been rejected because: %s', [
       orderRejection || tx.order?.rejectionReason || ' ',
     ]);
@@ -651,8 +649,13 @@ export const useVegaTransactionToasts = () => {
 
     // Transaction can be successful but the order can be rejected by the network
     const intent =
-      (tx.order && getOrderToastIntent(tx.order.status)) ||
-      intentMap[tx.status];
+      (tx.order &&
+        [OrderStatus.STATUS_REJECTED, OrderStatus.STATUS_STOPPED].includes(
+          tx.order.status
+        )) ||
+      tx.order?.rejectionReason
+        ? Intent.Danger
+        : intentMap[tx.status];
 
     return {
       id: `vega-${tx.id}`,

apps/trading/pages/styles.css

@@ -34,18 +34,6 @@ html [data-theme='dark'] {
   /* sell candles only use stroke as the candle is solid (without border) */
   --pennant-color-sell-stroke: theme('colors.vega.pink.500');
 
-  /* studies */
-  --pennant-color-eldar-ray-bear-power: theme('colors.vega.pink.500');
-  --pennant-color-eldar-ray-bull-power: theme('colors.vega.green.650');
-
-  --pennant-color-macd-divergence-buy: theme('colors.vega.green.650');
-  --pennant-color-macd-divergence-sell: theme('colors.vega.pink.500');
-  --pennant-color-macd-signal: theme('colors.vega.blue.500');
-  --pennant-color-macd-macd: theme('colors.vega.yellow.500');
-
-  --pennant-color-volume-buy: theme('colors.vega.green.650');
-  --pennant-color-volume-sell: theme('colors.vega.pink.500');
-
   /* depth chart */
   --pennant-color-depth-buy-fill: theme('colors.vega.green.650');
   --pennant-color-depth-buy-stroke: theme('colors.vega.green.500');
@@ -62,9 +50,6 @@ html [data-theme='light'] {
   /* sell candles only use stroke as the candle is solid (without border) */
   --pennant-color-sell-stroke: theme('colors.vega.pink.400');
 
-  --pennant-color-volume-buy: theme('colors.vega.green.400');
-  --pennant-color-volume-sell: theme('colors.vega.pink.400');
-
   /* depth chart */
   --pennant-color-depth-buy-fill: theme('colors.vega.green.400');
   --pennant-color-depth-buy-stroke: theme('colors.vega.green.550');

libs/accounts/src/lib/transfer-form.spec.tsx

@@ -1,10 +1,4 @@
-import {
-  act,
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-} from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import BigNumber from 'bignumber.js';
 import { AddressField, TransferFee, TransferForm } from './transfer-form';
 import { AccountType } from '@vegaprotocol/types';
@@ -33,34 +27,6 @@ describe('TransferForm', () => {
     submitTransfer: jest.fn(),
   };
 
-  it('validates a manually entered address', async () => {
-    render(<TransferForm {...props} />);
-    submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(3);
-    const toggle = screen.getByText('Enter manually');
-    fireEvent.click(toggle);
-    // has switched to input
-    expect(toggle).toHaveTextContent('Select from wallet');
-    expect(screen.getByLabelText('Vega key')).toHaveAttribute('type', 'text');
-    fireEvent.change(screen.getByLabelText('Vega key'), {
-      target: { value: 'invalid-address' },
-    });
-    await waitFor(() => {
-      const errors = screen.getAllByTestId('input-error-text');
-      expect(errors[0]).toHaveTextContent('Invalid Vega key');
-    });
-
-    // same pubkey
-    fireEvent.change(screen.getByLabelText('Vega key'), {
-      target: { value: pubKey },
-    });
-
-    await waitFor(() => {
-      const errors = screen.getAllByTestId('input-error-text');
-      expect(errors[0]).toHaveTextContent('Vega key is the same');
-    });
-  });
-
   it('validates fields and submits', async () => {
     render(<TransferForm {...props} />);
 
@@ -96,17 +62,15 @@ describe('TransferForm', () => {
       formatNumber(asset.balance, asset.decimals)
     );
 
-    const amountInput = screen.getByLabelText('Amount');
-
     // Test amount validation
-    fireEvent.change(amountInput, {
+    fireEvent.change(screen.getByLabelText('Amount'), {
       target: { value: '0.00000001' },
     });
     expect(
       await screen.findByText('Value is below minimum')
     ).toBeInTheDocument();
 
-    fireEvent.change(amountInput, {
+    fireEvent.change(screen.getByLabelText('Amount'), {
       target: { value: '9999999' },
     });
     expect(
@@ -114,7 +78,7 @@ describe('TransferForm', () => {
     ).toBeInTheDocument();
 
     // set valid amount
-    fireEvent.change(amountInput, {
+    fireEvent.change(screen.getByLabelText('Amount'), {
       target: { value: amount },
     });
     expect(screen.getByTestId('transfer-fee')).toHaveTextContent(
@@ -136,191 +100,78 @@ describe('TransferForm', () => {
     });
   });
 
-  describe('IncludeFeesCheckbox', () => {
-    it('validates fields and submits when checkbox is checked', async () => {
-      render(<TransferForm {...props} />);
-
-      // check current pubkey not shown
-      const keySelect: HTMLSelectElement = screen.getByLabelText('Vega key');
-      expect(keySelect.children).toHaveLength(2);
-      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual([
-        '',
-        props.pubKeys[1],
-      ]);
-
-      submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(3);
-
-      // Select a pubkey
-      fireEvent.change(screen.getByLabelText('Vega key'), {
-        target: { value: props.pubKeys[1] },
-      });
-
-      // Select asset
-      fireEvent.change(
-        // Bypass RichSelect and target hidden native select
-        // eslint-disable-next-line
-        document.querySelector('select[name="asset"]')!,
-        { target: { value: asset.id } }
-      );
-
-      // assert rich select as updated
-      expect(await screen.findByTestId('select-asset')).toHaveTextContent(
-        asset.name
-      );
-      expect(screen.getByTestId('asset-balance')).toHaveTextContent(
-        formatNumber(asset.balance, asset.decimals)
-      );
-
-      const amountInput = screen.getByLabelText('Amount');
-      const checkbox = screen.getByTestId('include-transfer-fee');
-      expect(checkbox).not.toBeChecked();
-      act(() => {
-        /* fire events that update state */
-        // set valid amount
-        fireEvent.change(amountInput, {
-          target: { value: amount },
-        });
-        // check include fees checkbox
-        fireEvent.click(checkbox);
-      });
-
-      expect(checkbox).toBeChecked();
-      const expectedFee = new BigNumber(amount)
-        .times(props.feeFactor)
-        .toFixed();
-      const expectedAmount = new BigNumber(amount).minus(expectedFee).toFixed();
-      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
-      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(
-        expectedAmount
-      );
-      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(
-        amount
-      );
-
-      submit();
-
-      await waitFor(() => {
-        expect(props.submitTransfer).toHaveBeenCalledTimes(1);
-        expect(props.submitTransfer).toHaveBeenCalledWith({
-          fromAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
-          toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
-          to: props.pubKeys[1],
-          asset: asset.id,
-          amount: removeDecimal(amount, asset.decimals),
-          oneOff: {},
-        });
-      });
+  it('validates a manually entered address', async () => {
+    render(<TransferForm {...props} />);
+    submit();
+    expect(await screen.findAllByText('Required')).toHaveLength(3);
+    const toggle = screen.getByText('Enter manually');
+    fireEvent.click(toggle);
+    // has switched to input
+    expect(toggle).toHaveTextContent('Select from wallet');
+    expect(screen.getByLabelText('Vega key')).toHaveAttribute('type', 'text');
+    fireEvent.change(screen.getByLabelText('Vega key'), {
+      target: { value: 'invalid-address' },
+    });
+    await waitFor(() => {
+      const errors = screen.getAllByTestId('input-error-text');
+      expect(errors[0]).toHaveTextContent('Invalid Vega key');
     });
 
-    it('validates fields when checkbox is not checked', async () => {
-      render(<TransferForm {...props} />);
-
-      // check current pubkey not shown
-      const keySelect: HTMLSelectElement = screen.getByLabelText('Vega key');
-      expect(keySelect.children).toHaveLength(2);
-      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual([
-        '',
-        props.pubKeys[1],
-      ]);
-
-      submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(3);
-
-      // Select a pubkey
-      fireEvent.change(screen.getByLabelText('Vega key'), {
-        target: { value: props.pubKeys[1] },
-      });
-
-      // Select asset
-      fireEvent.change(
-        // Bypass RichSelect and target hidden native select
-        // eslint-disable-next-line
-        document.querySelector('select[name="asset"]')!,
-        { target: { value: asset.id } }
-      );
-
-      // assert rich select as updated
-      expect(await screen.findByTestId('select-asset')).toHaveTextContent(
-        asset.name
-      );
-      expect(screen.getByTestId('asset-balance')).toHaveTextContent(
-        formatNumber(asset.balance, asset.decimals)
-      );
-
-      const amountInput = screen.getByLabelText('Amount');
-      const checkbox = screen.getByTestId('include-transfer-fee');
-      expect(checkbox).not.toBeChecked();
-      act(() => {
-        /* fire events that update state */
-        // set valid amount
-        fireEvent.change(amountInput, {
-          target: { value: amount },
-        });
-      });
-      expect(checkbox).not.toBeChecked();
-      const expectedFee = new BigNumber(amount)
-        .times(props.feeFactor)
-        .toFixed();
-      const total = new BigNumber(amount).plus(expectedFee).toFixed();
-      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
-      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(amount);
-      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
-    });
-  });
-
-  describe('AddressField', () => {
-    const props = {
-      pubKeys: ['pubkey-1', 'pubkey-2'],
-      select: <div>select</div>,
-      input: <div>input</div>,
-      onChange: jest.fn(),
-    };
-
-    it('toggles content and calls onChange', async () => {
-      const mockOnChange = jest.fn();
-      render(<AddressField {...props} onChange={mockOnChange} />);
-
-      // select should be shown as multiple pubkeys provided
-      expect(screen.getByText('select')).toBeInTheDocument();
-      expect(screen.queryByText('input')).not.toBeInTheDocument();
-      fireEvent.click(screen.getByText('Enter manually'));
-      expect(screen.queryByText('select')).not.toBeInTheDocument();
-      expect(screen.getByText('input')).toBeInTheDocument();
-      expect(mockOnChange).toHaveBeenCalledTimes(1);
-      fireEvent.click(screen.getByText('Select from wallet'));
-      expect(screen.getByText('select')).toBeInTheDocument();
-      expect(screen.queryByText('input')).not.toBeInTheDocument();
-      expect(mockOnChange).toHaveBeenCalledTimes(2);
+    // same pubkey
+    fireEvent.change(screen.getByLabelText('Vega key'), {
+      target: { value: pubKey },
     });
 
-    it('Does not provide select option if there is only a single key', () => {
-      render(<AddressField {...props} pubKeys={['single-pubKey']} />);
-      expect(screen.getByText('input')).toBeInTheDocument();
-      expect(screen.queryByText('Select from wallet')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('TransferFee', () => {
-    const props = {
-      amount: '200',
-      feeFactor: '0.001',
-      fee: '0.2',
-      transferAmount: '200',
-      decimals: 8,
-    };
-    it('calculates and renders the transfer fee', () => {
-      render(<TransferFee {...props} />);
-
-      const expected = new BigNumber(props.amount)
-        .times(props.feeFactor)
-        .toFixed();
-      const total = new BigNumber(props.amount).plus(expected).toFixed();
-      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expected);
-      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(
-        props.amount
-      );
-      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
+    await waitFor(() => {
+      const errors = screen.getAllByTestId('input-error-text');
+      expect(errors[0]).toHaveTextContent('Vega key is the same');
     });
   });
 });
+
+describe('AddressField', () => {
+  const props = {
+    pubKeys: ['pubkey-1', 'pubkey-2'],
+    select: <div>select</div>,
+    input: <div>input</div>,
+    onChange: jest.fn(),
+  };
+
+  it('toggles content and calls onChange', async () => {
+    const mockOnChange = jest.fn();
+    render(<AddressField {...props} onChange={mockOnChange} />);
+
+    // select should be shown as multiple pubkeys provided
+    expect(screen.getByText('select')).toBeInTheDocument();
+    expect(screen.queryByText('input')).not.toBeInTheDocument();
+    fireEvent.click(screen.getByText('Enter manually'));
+    expect(screen.queryByText('select')).not.toBeInTheDocument();
+    expect(screen.getByText('input')).toBeInTheDocument();
+    expect(mockOnChange).toHaveBeenCalledTimes(1);
+    fireEvent.click(screen.getByText('Select from wallet'));
+    expect(screen.getByText('select')).toBeInTheDocument();
+    expect(screen.queryByText('input')).not.toBeInTheDocument();
+    expect(mockOnChange).toHaveBeenCalledTimes(2);
+  });
+
+  it('Does not provide select option if there is only a single key', () => {
+    render(<AddressField {...props} pubKeys={['single-pubKey']} />);
+    expect(screen.getByText('input')).toBeInTheDocument();
+    expect(screen.queryByText('Select from wallet')).not.toBeInTheDocument();
+  });
+});
+
+describe('TransferFee', () => {
+  const props = {
+    amount: '200',
+    feeFactor: '0.001',
+  };
+  it('calculates and renders the transfer fee', () => {
+    render(<TransferFee {...props} />);
+
+    const expected = new BigNumber(props.amount)
+      .times(props.feeFactor)
+      .toFixed();
+    expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expected);
+  });
+});

libs/accounts/src/lib/transfer-form.tsx

@@ -16,7 +16,6 @@ import {
   RichSelect,
   Select,
   Tooltip,
-  Checkbox,
 } from '@vegaprotocol/ui-toolkit';
 import type { Transfer } from '@vegaprotocol/wallet';
 import { normalizeTransfer } from '@vegaprotocol/wallet';
@@ -64,26 +63,6 @@ export const TransferForm = ({
   const amount = watch('amount');
   const assetId = watch('asset');
 
-  const [includeFee, setIncludeFee] = useState(false);
-
-  const transferAmount = useMemo(() => {
-    if (!amount) return undefined;
-    if (includeFee && feeFactor) {
-      return new BigNumber(1).minus(feeFactor).times(amount).toString();
-    }
-    return amount;
-  }, [amount, includeFee, feeFactor]);
-
-  const fee = useMemo(() => {
-    if (!transferAmount) return undefined;
-    if (includeFee) {
-      return new BigNumber(amount).minus(transferAmount).toString();
-    }
-    return (
-      feeFactor && new BigNumber(feeFactor).times(transferAmount).toString()
-    );
-  }, [amount, includeFee, transferAmount, feeFactor]);
-
   const asset = useMemo(() => {
     return assets.find((a) => a.id === assetId);
   }, [assets, assetId]);
@@ -93,16 +72,13 @@ export const TransferForm = ({
       if (!asset) {
         throw new Error('Submitted transfer with no asset selected');
       }
-      if (!transferAmount) {
-        throw new Error('Submitted transfer with no amount selected');
-      }
-      const transfer = normalizeTransfer(fields.toAddress, transferAmount, {
+      const transfer = normalizeTransfer(fields.toAddress, fields.amount, {
         id: asset.id,
         decimals: asset.decimals,
       });
       submitTransfer(transfer);
     },
-    [asset, submitTransfer, transferAmount]
+    [asset, submitTransfer]
   );
 
   const min = useMemo(() => {
@@ -237,32 +213,7 @@ export const TransferForm = ({
           <InputError forInput="amount">{errors.amount.message}</InputError>
         )}
       </FormGroup>
-      <div className="mb-4">
-        <Checkbox
-          name="include-transfer-fee"
-          disabled={!transferAmount}
-          label={
-            <Tooltip
-              description={t(
-                `The fee will be taken from the amount you are transferring.`
-              )}
-            >
-              <div>{t('Include transfer fee')}</div>
-            </Tooltip>
-          }
-          checked={includeFee}
-          onCheckedChange={() => setIncludeFee(!includeFee)}
-        />
-      </div>
-      {transferAmount && fee && (
-        <TransferFee
-          amount={transferAmount}
-          transferAmount={transferAmount}
-          feeFactor={feeFactor}
-          fee={fee}
-          decimals={asset?.decimals}
-        />
-      )}
+      <TransferFee amount={amount} feeFactor={feeFactor} />
       <Button type="submit" variant="primary" fill={true}>
         {t('Confirm transfer')}
       </Button>
@@ -272,71 +223,34 @@ export const TransferForm = ({
 
 export const TransferFee = ({
   amount,
-  transferAmount,
   feeFactor,
-  fee,
-  decimals,
 }: {
   amount: string;
-  transferAmount: string;
   feeFactor: string | null;
-  fee?: string;
-  decimals?: number;
 }) => {
-  if (!feeFactor || !amount || !transferAmount || !fee) return null;
+  if (!feeFactor || !amount) return null;
 
-  const totalValue = new BigNumber(transferAmount).plus(fee).toString();
+  // using toFixed without an argument will always return a
+  // number in normal notation without rounding, formatting functions
+  // arent working in a way which won't round the decimal places
+  const value = new BigNumber(amount).times(feeFactor).toFixed();
 
   return (
-    <div className="mb-4 flex flex-col gap-2 text-xs">
-      <div className="flex justify-between gap-1 items-center flex-wrap">
+    <div className="mb-4 flex justify-between items-center gap-4 flex-wrap">
+      <div>
         <Tooltip
           description={t(
-            `The transfer fee is set by the network parameter transfer.fee.factor, currently set to %s`,
-            [feeFactor]
+            `The transfer fee is set by the network parameter transfer.fee.factor, currently set to ${feeFactor}`
           )}
         >
           <div>{t('Transfer fee')}</div>
         </Tooltip>
-
-        <div
-          data-testid="transfer-fee"
-          className="text-neutral-500 dark:text-neutral-300"
-        >
-          {formatNumber(fee, decimals)}
-        </div>
       </div>
-      <div className="flex justify-between gap-1 items-center flex-wrap">
-        <Tooltip
-          description={t(
-            `The total amount to be transferred (without the fee)`
-          )}
-        >
-          <div>{t('Amount to be transferred')}</div>
-        </Tooltip>
-
-        <div
-          data-testid="transfer-amount"
-          className="text-neutral-500 dark:text-neutral-300"
-        >
-          {formatNumber(amount, decimals)}
-        </div>
-      </div>
-      <div className="flex justify-between gap-1 items-center flex-wrap">
-        <Tooltip
-          description={t(
-            `The total amount taken from your account. The amount to be transferred plus the fee.`
-          )}
-        >
-          <div>{t('Total amount (with fee)')}</div>
-        </Tooltip>
-
-        <div
-          data-testid="total-transfer-fee"
-          className="text-neutral-500 dark:text-neutral-300"
-        >
-          {formatNumber(totalValue, decimals)}
-        </div>
+      <div
+        data-testid="transfer-fee"
+        className="text-neutral-500 dark:text-neutral-300"
+      >
+        {value}
       </div>
     </div>
   );

libs/accounts/src/setup-tests.ts

@@ -1,6 +1 @@
 import '@testing-library/jest-dom';
-import ResizeObserver from 'resize-observer-polyfill';
-import { defaultFallbackInView } from 'react-intersection-observer';
-
-defaultFallbackInView(true);
-global.ResizeObserver = ResizeObserver;

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

@@ -1,6 +1,6 @@
 import 'pennant/dist/style.css';
 import {
-  CandlestickChart,
+  Chart,
   ChartType,
   Interval,
   Overlay,
@@ -234,7 +234,7 @@ export const CandlesChartContainer = ({
         </DropdownMenu>
       </div>
       <div className="flex-1">
-        <CandlestickChart
+        <Chart
           dataSource={dataSource}
           options={{
             chartType: chartType,

libs/cypress/src/lib/utils.ts

@@ -52,9 +52,6 @@ export const checkSorting = (
     cy.get(`[col-id="${column}"]`).click();
   });
   checkSortChange(orderTabDesc, column);
-  cy.get('.ag-header-container').within(() => {
-    cy.get(`[col-id="${column}"]`).click();
-  });
 };
 
 const checkSortChange = (tabsArr: string[], column: string) => {

libs/datagrid/src/lib/cells/cumulative-vol-cell.tsx

@@ -1,6 +1,6 @@
 import { memo } from 'react';
 import { BID_COLOR, ASK_COLOR } from './vol-cell';
-import { addDecimalsFixedFormatNumber } from '@vegaprotocol/utils';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { NumericCell } from './numeric-cell';
 
 export interface CumulativeVolProps {
@@ -55,7 +55,7 @@ export const CumulativeVol = memo(
         (
         <NumericCell
           value={Number(indicativeVolume)}
-          valueFormatted={addDecimalsFixedFormatNumber(
+          valueFormatted={addDecimalsFormatNumber(
             indicativeVolume,
             positionDecimalPlaces ?? 0
           )}
@@ -67,7 +67,7 @@ export const CumulativeVol = memo(
         {ask ? (
           <NumericCell
             value={ask}
-            valueFormatted={addDecimalsFixedFormatNumber(
+            valueFormatted={addDecimalsFormatNumber(
               ask,
               positionDecimalPlaces ?? 0
             )}
@@ -77,7 +77,7 @@ export const CumulativeVol = memo(
         {bid ? (
           <NumericCell
             value={ask}
-            valueFormatted={addDecimalsFixedFormatNumber(
+            valueFormatted={addDecimalsFormatNumber(
               bid,
               positionDecimalPlaces ?? 0
             )}

libs/deposits/src/lib/approve-notification.tsx

@@ -174,7 +174,7 @@ const ApprovalTxFeedback = ({
             <>
               <p>
                 {t(
-                  `Your ${selectedAsset?.symbol} approval is being confirmed by the Ethereum network. When this is complete, you can continue your deposit`
+                  `Your ${selectedAsset?.symbol} is being confirmed by the Ethereum network. When this is complete, you can continue your deposit`
                 )}{' '}
               </p>
               {txLink && <p>{txLink}</p>}

libs/deposits/src/lib/deposit-form.spec.tsx

@@ -61,7 +61,6 @@ beforeEach(() => {
     submitDeposit: jest.fn(),
     submitFaucet: jest.fn(),
     onDisconnect: jest.fn(),
-    handleAmountChange: jest.fn(),
     approveTxId: null,
     faucetTxId: null,
     isFaucetable: true,

libs/deposits/src/lib/deposit-form.tsx

@@ -25,9 +25,11 @@ import {
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useWeb3React } from '@web3-react/core';
 import BigNumber from 'bignumber.js';
-import type { ButtonHTMLAttributes, ChangeEvent, ReactNode } from 'react';
-import { useMemo, useState } from 'react';
-import { useWatch, Controller, useForm } from 'react-hook-form';
+import type { ButtonHTMLAttributes, ReactNode } from 'react';
+import { useState } from 'react';
+import { useMemo } from 'react';
+import { useWatch } from 'react-hook-form';
+import { Controller, useForm } from 'react-hook-form';
 import { DepositLimits } from './deposit-limits';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import {
@@ -38,7 +40,6 @@ import {
 import type { DepositBalances } from './use-deposit-balances';
 import { FaucetNotification } from './faucet-notification';
 import { ApproveNotification } from './approve-notification';
-import { usePersistentDeposit } from './use-persistent-deposit';
 
 interface FormFields {
   asset: string;
@@ -52,7 +53,6 @@ export interface DepositFormProps {
   selectedAsset?: Asset;
   balances: DepositBalances | null;
   onSelectAsset: (assetId: string) => void;
-  handleAmountChange: (amount: string) => void;
   onDisconnect: () => void;
   submitApprove: () => void;
   approveTxId: number | null;
@@ -71,7 +71,6 @@ export const DepositForm = ({
   selectedAsset,
   balances,
   onSelectAsset,
-  handleAmountChange,
   onDisconnect,
   submitApprove,
   submitDeposit,
@@ -86,8 +85,6 @@ export const DepositForm = ({
   const { pubKey, pubKeys: _pubKeys } = useVegaWallet();
   const [approveNotificationIntent, setApproveNotificationIntent] =
     useState<Intent>(Intent.Warning);
-  const [persistedDeposit] = usePersistentDeposit(selectedAsset?.id);
-
   const {
     register,
     handleSubmit,
@@ -98,8 +95,7 @@ export const DepositForm = ({
   } = useForm<FormFields>({
     defaultValues: {
       to: pubKey ? pubKey : undefined,
-      asset: selectedAsset?.id,
-      amount: persistedDeposit.amount,
+      asset: selectedAsset?.id || '',
     },
   });
 
@@ -337,9 +333,6 @@ export const DepositForm = ({
                   return maxSafe(balances?.balance || new BigNumber(0))(v);
                 },
               },
-              onChange: (e: ChangeEvent<HTMLInputElement>) => {
-                handleAmountChange(e.target.value || '');
-              },
             })}
           />
           {errors.amount?.message && (
@@ -350,9 +343,10 @@ export const DepositForm = ({
           {selectedAsset && balances && (
             <UseButton
               onClick={() => {
-                const amount = balances.balance.toFixed(selectedAsset.decimals);
-                setValue('amount', amount);
-                handleAmountChange(amount);
+                setValue(
+                  'amount',
+                  balances.balance.toFixed(selectedAsset.decimals)
+                );
                 clearErrors('amount');
               }}
             >

libs/deposits/src/lib/deposit-manager.tsx

@@ -5,7 +5,7 @@ import { prepend0x } from '@vegaprotocol/smart-contracts';
 import sortBy from 'lodash/sortBy';
 import { useSubmitApproval } from './use-submit-approval';
 import { useSubmitFaucet } from './use-submit-faucet';
-import { useCallback, useState } from 'react';
+import { useState } from 'react';
 import { useDepositBalances } from './use-deposit-balances';
 import { useDepositDialog } from './deposit-dialog';
 import type { Asset } from '@vegaprotocol/assets';
@@ -14,7 +14,6 @@ import {
   useBridgeContract,
   useEthereumConfig,
 } from '@vegaprotocol/web3';
-import { usePersistentDeposit } from './use-persistent-deposit';
 
 interface DepositManagerProps {
   assetId?: string;
@@ -29,9 +28,7 @@ export const DepositManager = ({
 }: DepositManagerProps) => {
   const createEthTransaction = useEthTransactionStore((state) => state.create);
   const { config } = useEthereumConfig();
-  const [persistentDeposit, savePersistentDeposit] =
-    usePersistentDeposit(initialAssetId);
-  const [assetId, setAssetId] = useState(persistentDeposit?.assetId);
+  const [assetId, setAssetId] = useState(initialAssetId);
   const asset = assets.find((a) => a.id === assetId);
   const bridgeContract = useBridgeContract();
   const closeDepositDialog = useDepositDialog((state) => state.close);
@@ -68,26 +65,17 @@ export const DepositManager = ({
     closeDepositDialog();
   };
 
-  const onAmountChange = useCallback(
-    (amount: string) => {
-      savePersistentDeposit({ ...persistentDeposit, amount });
-    },
-    [savePersistentDeposit, persistentDeposit]
-  );
-
   return (
     <DepositForm
       selectedAsset={asset}
       onDisconnect={reset}
       onSelectAsset={(id) => {
         setAssetId(id);
-        savePersistentDeposit({ assetId: id });
         // When we change asset, also clear the tracked faucet/approve transactions so
         // we dont render stale UI
         approve.reset();
         faucet.reset();
       }}
-      handleAmountChange={onAmountChange}
       assets={sortBy(assets, 'name')}
       submitApprove={approve.perform}
       submitDeposit={submitDeposit}

libs/deposits/src/lib/use-persistent-deposit.spec.ts

@@ -1,21 +0,0 @@
-import { renderHook, waitFor, act } from '@testing-library/react';
-import { usePersistentDeposit } from './use-persistent-deposit';
-
-describe('usePersistenDeposit', () => {
-  it('should return empty data', () => {
-    const { result } = renderHook(() => usePersistentDeposit());
-    expect(result.current).toEqual([{ assetId: '' }, expect.any(Function)]);
-  });
-  it('should return empty and properly saved data', async () => {
-    const aId = 'test';
-    const retObj = { assetId: 'test', amount: '1.00000' };
-    const { result } = renderHook(() => usePersistentDeposit(aId));
-    expect(result.current).toEqual([{ assetId: 'test' }, expect.any(Function)]);
-    await act(() => {
-      result.current[1](retObj);
-    });
-    await waitFor(() => {
-      expect(result.current[0]).toEqual(retObj);
-    });
-  });
-});

libs/deposits/src/lib/use-persistent-deposit.ts

@@ -1,42 +0,0 @@
-import { useMemo } from 'react';
-import { create } from 'zustand';
-import { persist } from 'zustand/middleware';
-import { immer } from 'zustand/middleware/immer';
-
-const STORAGE_KEY = 'vega_deposit_store';
-interface PersistedDeposit {
-  assetId: string;
-  amount?: string;
-}
-type PersistedDepositData = Record<string, PersistedDeposit>;
-
-const usePersistentDepositStore = create<{
-  deposits: PersistedDepositData;
-  saveValue: (entry: PersistedDeposit) => void;
-  lastVisited?: PersistedDeposit;
-}>()(
-  persist(
-    immer((set) => ({
-      deposits: {},
-      saveValue: (entry) =>
-        set((state) => {
-          const oldValue = state.deposits[entry.assetId] || null;
-          state.deposits[entry.assetId] = { ...oldValue, ...entry };
-          state.lastVisited = { ...oldValue, ...entry };
-          return state;
-        }),
-    })),
-    { name: STORAGE_KEY }
-  )
-);
-
-export const usePersistentDeposit = (
-  assetId?: string
-): [PersistedDeposit, (entry: PersistedDeposit) => void] => {
-  const { deposits, lastVisited, saveValue } = usePersistentDepositStore();
-  const discoveredData = useMemo(() => {
-    return deposits[assetId || ''] || lastVisited || { assetId: assetId || '' };
-  }, [deposits, lastVisited, assetId]);
-
-  return [discoveredData, saveValue];
-};

libs/deposits/src/lib/use-submit-approval.ts

@@ -1,5 +1,4 @@
-import { MaxUint256 } from '@ethersproject/constants';
-import { isAssetTypeERC20 } from '@vegaprotocol/utils';
+import { isAssetTypeERC20, removeDecimal } from '@vegaprotocol/utils';
 import {
   EthTxStatus,
   useEthereumConfig,
@@ -38,9 +37,10 @@ export const useSubmitApproval = (
     },
     perform: () => {
       if (!asset || !config) return;
+      const amount = removeDecimal('1000000', asset.decimals);
       const id = createEthTransaction(contract, 'approve', [
         config?.collateral_bridge_contract.address,
-        MaxUint256.toString(),
+        amount,
       ]);
       setId(id);
     },

libs/market-depth/src/lib/orderbook-manager.tsx

@@ -48,12 +48,12 @@ export const OrderbookManager = ({ marketId }: OrderbookManagerProps) => {
     throttle(() => {
       dataRef.current = {
         ...marketDataRef.current,
-        indicativePrice:
-          marketDataRef.current?.indicativePrice &&
-          getPriceLevel(
-            marketDataRef.current.indicativePrice,
-            resolutionRef.current
-          ),
+        indicativePrice: marketDataRef.current?.indicativePrice
+          ? getPriceLevel(
+              marketDataRef.current.indicativePrice,
+              resolutionRef.current
+            )
+          : undefined,
         midPrice: getMidPrice(
           rawDataRef.current?.depth.sell,
           rawDataRef.current?.depth.buy,
@@ -148,12 +148,13 @@ export const OrderbookManager = ({ marketId }: OrderbookManagerProps) => {
     variables,
   });
 
-  if (!marketDataRef.current && marketData) {
-    marketDataRef.current = marketData;
-  }
+  marketDataRef.current = marketData;
 
   useEffect(() => {
     const throttleRunner = updateOrderbookData.current;
+    if (!marketDataRef.current) {
+      return;
+    }
     if (!data) {
       dataRef.current = { rows: null };
       setOrderbookData(dataRef.current);
@@ -161,9 +162,10 @@ export const OrderbookManager = ({ marketId }: OrderbookManagerProps) => {
     }
     dataRef.current = {
       ...marketDataRef.current,
-      indicativePrice:
-        marketDataRef.current?.indicativePrice &&
-        getPriceLevel(marketDataRef.current.indicativePrice, resolution),
+      indicativePrice: getPriceLevel(
+        marketDataRef.current.indicativePrice,
+        resolution
+      ),
       midPrice: getMidPrice(data.depth.sell, data.depth.buy, resolution),
       rows: compactRows(data.depth.sell, data.depth.buy, resolution),
     };
@@ -173,7 +175,7 @@ export const OrderbookManager = ({ marketId }: OrderbookManagerProps) => {
     return () => {
       throttleRunner.cancel();
     };
-  }, [data, resolution]);
+  }, [data, marketData, resolution]);
 
   useEffect(() => {
     resolutionRef.current = resolution;

libs/market-list/src/lib/components/markets-container/market-list-table.tsx

@@ -11,13 +11,12 @@ import {
   AgGridDynamic as AgGrid,
   PriceFlashCell,
   MarketNameCell,
-  SetFilter,
 } from '@vegaprotocol/datagrid';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import { AgGridColumn } from 'ag-grid-react';
 import type { AgGridReact } from 'ag-grid-react';
 import * as Schema from '@vegaprotocol/types';
-import type { MarketMaybeWithData } from '../../';
+import type { MarketMaybeWithData, MarketFieldsFragment } from '../../';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 
 const { MarketTradingMode, AuctionTrigger } = Schema;
@@ -34,6 +33,7 @@ export const MarketListTable = forwardRef<
   return (
     <AgGrid
       style={{ width: '100%', height: '100%' }}
+      overlayNoRowsTemplate={t('No markets')}
       getRowId={getRowId}
       ref={ref}
       defaultColDef={{
@@ -43,7 +43,7 @@ export const MarketListTable = forwardRef<
         filter: true,
         filterParams: { buttons: ['reset'] },
       }}
-      suppressCellFocus
+      suppressCellFocus={true}
       components={{ PriceFlashCell, MarketNameCell }}
       {...props}
     >
@@ -59,11 +59,11 @@ export const MarketListTable = forwardRef<
       />
       <AgGridColumn
         headerName={t('Trading mode')}
-        field="tradingMode"
+        field="data"
         minWidth={170}
-        valueFormatter={({
+        valueGetter={({
           data,
-        }: VegaValueFormatterParams<MarketMaybeWithData, 'data'>) => {
+        }: VegaValueGetterParams<MarketMaybeWithData, 'data'>) => {
           if (!data?.data) return undefined;
           const { trigger } = data.data;
           const { tradingMode } = data;
@@ -75,22 +75,14 @@ export const MarketListTable = forwardRef<
             - ${Schema.AuctionTriggerMapping[trigger]}`
             : Schema.MarketTradingModeMapping[tradingMode];
         }}
-        filter={SetFilter}
-        filterParams={{
-          set: Schema.MarketTradingModeMapping,
-        }}
       />
       <AgGridColumn
         headerName={t('Status')}
         field="state"
-        valueFormatter={({
+        valueGetter={({
           data,
-        }: VegaValueFormatterParams<MarketMaybeWithData, 'state'>) => {
-          return data?.state ? Schema.MarketStateMapping[data.state] : '-';
-        }}
-        filter={SetFilter}
-        filterParams={{
-          set: Schema.MarketStateMapping,
+        }: VegaValueGetterParams<MarketFieldsFragment, 'state'>) => {
+          return data?.state ? Schema.MarketStateMapping[data?.state] : '-';
         }}
       />
       <AgGridColumn

libs/market-list/src/lib/components/markets-container/markets-container.tsx

@@ -1,6 +1,4 @@
 import type { MouseEvent } from 'react';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import type { AgGridReact } from 'ag-grid-react';
 import { t } from '@vegaprotocol/i18n';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { MarketListTable } from './market-list-table';
@@ -14,24 +12,15 @@ interface MarketsContainerProps {
 }
 
 export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
-  const gridRef = useRef<AgGridReact | null>(null);
-  const [dataCount, setDataCount] = useState(0);
   const { data, error, loading, reload } = useDataProvider({
     dataProvider,
     skipUpdates: true,
     variables: undefined,
   });
-  useEffect(() => {
-    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
-  }, [data]);
-  const onFilterChanged = useCallback(() => {
-    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
-  }, []);
   return (
     <div className="h-full relative">
       <MarketListTable
-        ref={gridRef}
-        rowData={data}
+        rowData={error ? [] : data}
         suppressLoadingOverlay
         suppressNoRowsOverlay
         onCellClicked={(cellEvent: CellClickedEvent) => {
@@ -51,7 +40,6 @@ export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
           );
         }}
         onMarketClick={onSelect}
-        onFilterChanged={onFilterChanged}
       />
       <div className="pointer-events-none absolute inset-0">
         <AsyncRenderer
@@ -59,7 +47,6 @@ export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
           error={error}
           data={data}
           noDataMessage={t('No markets')}
-          noDataCondition={() => !dataCount}
           reload={reload}
         />
       </div>

libs/orders/src/lib/order-hooks/index.ts

@@ -1,5 +1,8 @@
 export * from './__generated__/OrdersSubscription';
 export * from './use-has-active-order';
+export * from './use-order-cancel';
+export * from './use-order-edit';
+export * from './use-order-submit';
 export * from './use-order-update';
 export * from './use-pending-orders-volume';
 export * from './use-order-store';

libs/orders/src/lib/order-hooks/use-order-cancel.spec.tsx

@@ -0,0 +1,138 @@
+import type { MockedResponse } from '@apollo/client/testing';
+import { MockedProvider } from '@apollo/client/testing';
+import { act, renderHook } from '@testing-library/react';
+import type { ReactNode } from 'react';
+import { VegaTxStatus, VegaWalletContext } from '@vegaprotocol/wallet';
+import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
+import { useOrderCancel } from './use-order-cancel';
+import type { OrderSubSubscription } from './';
+import { OrderSubDocument } from './';
+import * as Schema from '@vegaprotocol/types';
+
+const defaultWalletContext = {
+  pubKey: null,
+  pubKeys: [],
+  isReadOnly: false,
+  sendTx: jest.fn().mockReturnValue(Promise.resolve(null)),
+  connect: jest.fn(),
+  disconnect: jest.fn(),
+  selectPubKey: jest.fn(),
+  connector: null,
+};
+
+function setup(context?: Partial<VegaWalletContextShape>) {
+  const mocks: MockedResponse<OrderSubSubscription> = {
+    request: {
+      query: OrderSubDocument,
+      variables: {
+        partyId: context?.pubKey || '',
+      },
+    },
+    result: {
+      data: {
+        orders: [
+          {
+            type: Schema.OrderType.TYPE_LIMIT,
+            id: '9c70716f6c3698ac7bbcddc97176025b985a6bb9a0c4507ec09c9960b3216b62',
+            status: Schema.OrderStatus.STATUS_ACTIVE,
+            rejectionReason: null,
+            createdAt: '2022-07-05T14:25:47.815283706Z',
+            expiresAt: '2022-07-05T14:25:47.815283706Z',
+            size: '10',
+            price: '300000',
+            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+            side: Schema.Side.SIDE_BUY,
+            marketId: 'market-id',
+            __typename: 'OrderUpdate',
+          },
+        ],
+      },
+    },
+  };
+  const filterMocks: MockedResponse<OrderSubSubscription> = {
+    request: {
+      query: OrderSubDocument,
+      variables: {
+        partyId: context?.pubKey || '',
+      },
+    },
+    result: {
+      data: {
+        orders: [
+          {
+            type: Schema.OrderType.TYPE_LIMIT,
+            id: '9c70716f6c3698ac7bbcddc97176025b985a6bb9a0c4507ec09c9960b3216b62',
+            status: Schema.OrderStatus.STATUS_ACTIVE,
+            rejectionReason: null,
+            createdAt: '2022-07-05T14:25:47.815283706Z',
+            expiresAt: '2022-07-05T14:25:47.815283706Z',
+            size: '10',
+            price: '300000',
+            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+            side: Schema.Side.SIDE_BUY,
+            marketId: 'market-id',
+            __typename: 'OrderUpdate',
+          },
+        ],
+      },
+    },
+  };
+
+  const wrapper = ({ children }: { children: ReactNode }) => (
+    <MockedProvider mocks={[mocks, filterMocks]}>
+      <VegaWalletContext.Provider
+        value={{ ...defaultWalletContext, ...context }}
+      >
+        {children}
+      </VegaWalletContext.Provider>
+    </MockedProvider>
+  );
+
+  return renderHook(() => useOrderCancel(), { wrapper });
+}
+
+describe('useOrderCancel', () => {
+  it('has the correct default state', () => {
+    const { result } = setup();
+    expect(typeof result.current.cancel).toEqual('function');
+    expect(typeof result.current.reset).toEqual('function');
+    expect(result.current.transaction.status).toEqual(VegaTxStatus.Default);
+    expect(result.current.transaction.txHash).toEqual(null);
+    expect(result.current.transaction.error).toEqual(null);
+  });
+
+  it('should not sendTx if no keypair', () => {
+    const mockSendTx = jest.fn();
+    const { result } = setup({
+      sendTx: mockSendTx,
+      pubKeys: [],
+      pubKey: null,
+    });
+    act(() => {
+      result.current.cancel({ orderId: 'order-id', marketId: 'market-id' });
+    });
+    expect(mockSendTx).not.toHaveBeenCalled();
+  });
+
+  it('should cancel a correctly formatted order', async () => {
+    const mockSendTx = jest.fn().mockReturnValue(Promise.resolve({}));
+    const pubKeyObj = { publicKey: '0x123', name: 'test key 1' };
+    const { result } = setup({
+      sendTx: mockSendTx,
+      pubKeys: [pubKeyObj],
+      pubKey: pubKeyObj.publicKey,
+    });
+
+    const args = {
+      orderId: 'order-id',
+      marketId: 'market-id',
+    };
+    act(() => {
+      result.current.cancel(args);
+    });
+
+    expect(mockSendTx).toHaveBeenCalledWith(pubKeyObj.publicKey, {
+      orderCancellation: args,
+    });
+  });
+});

libs/orders/src/lib/order-hooks/use-order-cancel.tsx

@@ -0,0 +1,83 @@
+import { useCallback, useState } from 'react';
+import {
+  useVegaWallet,
+  useVegaTransaction,
+  useTransactionResult,
+} from '@vegaprotocol/wallet';
+import type {
+  OrderCancellationBody,
+  TransactionResult,
+} from '@vegaprotocol/wallet';
+import type { OrderSubFieldsFragment } from './';
+import * as Sentry from '@sentry/react';
+import { useOrderUpdate } from './use-order-update';
+
+export const useOrderCancel = () => {
+  const { pubKey } = useVegaWallet();
+
+  const [cancelledOrder, setCancelledOrder] =
+    useState<OrderSubFieldsFragment | null>(null);
+  const [transactionResult, setTransactionResult] =
+    useState<TransactionResult>();
+
+  const {
+    send,
+    transaction,
+    reset: resetTransaction,
+    setComplete,
+    Dialog,
+  } = useVegaTransaction();
+
+  const waitForOrderUpdate = useOrderUpdate(transaction);
+  const waitForTransactionResult = useTransactionResult();
+
+  const reset = useCallback(() => {
+    resetTransaction();
+    setCancelledOrder(null);
+  }, [resetTransaction]);
+
+  const cancel = useCallback(
+    async (orderCancellation: OrderCancellationBody['orderCancellation']) => {
+      if (!pubKey) {
+        return;
+      }
+
+      setCancelledOrder(null);
+
+      try {
+        const res = await send(pubKey, {
+          orderCancellation,
+        });
+        if (orderCancellation.orderId) {
+          const cancelledOrder = await waitForOrderUpdate(
+            orderCancellation.orderId,
+            pubKey
+          );
+          setCancelledOrder(cancelledOrder);
+          setComplete();
+        } else if (res) {
+          const txResult = await waitForTransactionResult(
+            res.transactionHash,
+            pubKey
+          );
+          setTransactionResult(txResult);
+          setComplete();
+        }
+        return res;
+      } catch (e) {
+        Sentry.captureException(e);
+        return;
+      }
+    },
+    [pubKey, send, setComplete, waitForOrderUpdate, waitForTransactionResult]
+  );
+
+  return {
+    transaction,
+    transactionResult,
+    cancelledOrder,
+    Dialog,
+    cancel,
+    reset,
+  };
+};

libs/orders/src/lib/order-hooks/use-order-edit.spec.tsx

@@ -0,0 +1,179 @@
+import { act, renderHook } from '@testing-library/react';
+import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
+import { VegaTxStatus, VegaWalletContext } from '@vegaprotocol/wallet';
+import type { ReactNode } from 'react';
+import { useOrderEdit } from './use-order-edit';
+import type { OrderSubSubscription } from './__generated__/OrdersSubscription';
+import { OrderSubDocument } from './__generated__/OrdersSubscription';
+import type { MockedResponse } from '@apollo/client/testing';
+import { MockedProvider } from '@apollo/client/testing';
+import type { Order } from '../components';
+import { generateOrder } from '../components';
+import * as Schema from '@vegaprotocol/types';
+
+const defaultWalletContext = {
+  pubKey: null,
+  pubKeys: [],
+  isReadOnly: false,
+  sendTx: jest.fn().mockReturnValue(Promise.resolve(null)),
+  connect: jest.fn(),
+  disconnect: jest.fn(),
+  selectPubKey: jest.fn(),
+  connector: null,
+};
+
+function setup(order: Order, context?: Partial<VegaWalletContextShape>) {
+  const mocks: MockedResponse<OrderSubSubscription> = {
+    request: {
+      query: OrderSubDocument,
+      variables: {
+        partyId: context?.pubKey || '',
+      },
+    },
+    result: {
+      data: {
+        orders: [
+          {
+            type: Schema.OrderType.TYPE_LIMIT,
+            id: '9c70716f6c3698ac7bbcddc97176025b985a6bb9a0c4507ec09c9960b3216b62',
+            status: Schema.OrderStatus.STATUS_ACTIVE,
+            rejectionReason: null,
+            createdAt: '2022-07-05T14:25:47.815283706Z',
+            expiresAt: '2022-07-05T14:25:47.815283706Z',
+            size: '10',
+            price: '300000',
+            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+            side: Schema.Side.SIDE_BUY,
+            marketId: 'market-id',
+            __typename: 'OrderUpdate',
+          },
+        ],
+      },
+    },
+  };
+  const filterMocks: MockedResponse<OrderSubSubscription> = {
+    request: {
+      query: OrderSubDocument,
+      variables: {
+        partyId: context?.pubKey || '',
+      },
+    },
+    result: {
+      data: {
+        orders: [
+          {
+            type: Schema.OrderType.TYPE_LIMIT,
+            id: '9c70716f6c3698ac7bbcddc97176025b985a6bb9a0c4507ec09c9960b3216b62',
+            status: Schema.OrderStatus.STATUS_ACTIVE,
+            rejectionReason: null,
+            createdAt: '2022-07-05T14:25:47.815283706Z',
+            expiresAt: '2022-07-05T14:25:47.815283706Z',
+            size: '10',
+            price: '300000',
+            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+            side: Schema.Side.SIDE_BUY,
+            marketId: 'market-id',
+            __typename: 'OrderUpdate',
+          },
+        ],
+      },
+    },
+  };
+
+  const wrapper = ({ children }: { children: ReactNode }) => (
+    <MockedProvider mocks={[mocks, filterMocks]}>
+      <VegaWalletContext.Provider
+        value={{ ...defaultWalletContext, ...context }}
+      >
+        {children}
+      </VegaWalletContext.Provider>
+    </MockedProvider>
+  );
+  return renderHook(() => useOrderEdit(order), { wrapper });
+}
+
+describe('useOrderEdit', () => {
+  it('should edit a correctly formatted order if there is no size', async () => {
+    const mockSendTx = jest.fn().mockReturnValue(Promise.resolve({}));
+    const pubKeyObj = { publicKey: '0x123', name: 'test key 1' };
+    const order = generateOrder({
+      price: '123456789',
+      market: { decimalPlaces: 2 },
+    });
+    const { result } = setup(order, {
+      sendTx: mockSendTx,
+      pubKeys: [pubKeyObj],
+      pubKey: pubKeyObj.publicKey,
+    });
+
+    act(() => {
+      result.current.edit({ price: '1234567.89' });
+    });
+
+    expect(mockSendTx).toHaveBeenCalledWith(pubKeyObj.publicKey, {
+      orderAmendment: {
+        orderId: order.id,
+        // eslint-disable-next-line
+        marketId: order.market!.id,
+        timeInForce: order.timeInForce,
+        price: '123456789', // Decimal removed
+        sizeDelta: 0,
+        expiresAt: undefined,
+      },
+    });
+  });
+
+  it('should edit a correctly formatted order', async () => {
+    const mockSendTx = jest.fn().mockReturnValue(Promise.resolve({}));
+    const pubKeyObj = { publicKey: '0x123', name: 'test key 1' };
+    const order = generateOrder({
+      price: '123456789',
+      market: { decimalPlaces: 2 },
+    });
+    const { result } = setup(order, {
+      sendTx: mockSendTx,
+      pubKeys: [pubKeyObj],
+      pubKey: pubKeyObj.publicKey,
+    });
+
+    act(() => {
+      result.current.edit({ price: '1234567.89', size: '20' });
+    });
+
+    expect(mockSendTx).toHaveBeenCalledWith(pubKeyObj.publicKey, {
+      orderAmendment: {
+        orderId: order.id,
+        // eslint-disable-next-line
+        marketId: order.market!.id,
+        timeInForce: order.timeInForce,
+        price: '123456789', // Decimal removed
+        sizeDelta: 1990,
+        expiresAt: undefined,
+      },
+    });
+  });
+
+  it('has the correct default state', () => {
+    const order = generateOrder();
+    const { result } = setup(order);
+    expect(typeof result.current.edit).toEqual('function');
+    expect(typeof result.current.reset).toEqual('function');
+    expect(result.current.transaction.status).toEqual(VegaTxStatus.Default);
+    expect(result.current.transaction.txHash).toEqual(null);
+    expect(result.current.transaction.error).toEqual(null);
+  });
+
+  it('should not sendTx if no keypair', async () => {
+    const order = generateOrder();
+    const mockSendTx = jest.fn();
+    const { result } = setup(order, {
+      sendTx: mockSendTx,
+      pubKeys: [],
+      pubKey: null,
+    });
+    await act(async () => {
+      result.current.edit(order);
+    });
+    expect(mockSendTx).not.toHaveBeenCalled();
+  });
+});

libs/orders/src/lib/order-hooks/use-order-edit.tsx

@@ -0,0 +1,82 @@
+import { removeDecimal, toNanoSeconds } from '@vegaprotocol/utils';
+import { useState, useCallback } from 'react';
+import { useVegaTransaction, useVegaWallet } from '@vegaprotocol/wallet';
+import type { OrderSubFieldsFragment } from './';
+import * as Sentry from '@sentry/react';
+import type { Order } from '../components';
+import { useOrderUpdate } from './use-order-update';
+import BigNumber from 'bignumber.js';
+
+export interface EditOrderArgs {
+  price: string;
+  size?: string;
+}
+
+export const useOrderEdit = (order: Order | null) => {
+  const { pubKey } = useVegaWallet();
+
+  const [updatedOrder, setUpdatedOrder] =
+    useState<OrderSubFieldsFragment | null>(null);
+
+  const {
+    send,
+    transaction,
+    reset: resetTransaction,
+    setComplete,
+    Dialog,
+  } = useVegaTransaction();
+
+  const waitForOrderUpdate = useOrderUpdate(transaction);
+
+  const reset = useCallback(() => {
+    resetTransaction();
+    setUpdatedOrder(null);
+  }, [resetTransaction]);
+
+  const edit = useCallback(
+    async (args: EditOrderArgs) => {
+      if (!pubKey || !order || !order.market) {
+        return;
+      }
+
+      setUpdatedOrder(null);
+
+      try {
+        await send(pubKey, {
+          orderAmendment: {
+            orderId: order.id,
+            marketId: order.market.id,
+            price: removeDecimal(args.price, order.market.decimalPlaces),
+            timeInForce: order.timeInForce,
+            sizeDelta: args.size
+              ? new BigNumber(
+                  removeDecimal(args.size, order.market.positionDecimalPlaces)
+                )
+                  .minus(order.size)
+                  .toNumber()
+              : 0,
+            expiresAt: order.expiresAt
+              ? toNanoSeconds(order.expiresAt) // Wallet expects timestamp in nanoseconds
+              : undefined,
+          },
+        });
+
+        const updatedOrder = await waitForOrderUpdate(order.id, pubKey);
+        setUpdatedOrder(updatedOrder);
+        setComplete();
+      } catch (e) {
+        Sentry.captureException(e);
+        return;
+      }
+    },
+    [pubKey, send, order, setComplete, waitForOrderUpdate]
+  );
+
+  return {
+    transaction,
+    updatedOrder,
+    Dialog,
+    edit,
+    reset,
+  };
+};

libs/orders/src/lib/order-hooks/use-order-submit.spec.tsx

@@ -0,0 +1,205 @@
+import { act, renderHook } from '@testing-library/react';
+import type { PubKey, VegaWalletContextShape } from '@vegaprotocol/wallet';
+import { VegaTxStatus, VegaWalletContext } from '@vegaprotocol/wallet';
+import * as Schema from '@vegaprotocol/types';
+import type { ReactNode } from 'react';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import { useOrderSubmit } from './use-order-submit';
+import type { OrderSubSubscription } from './';
+import { OrderSubDocument } from './';
+import type { MockedResponse } from '@apollo/client/testing';
+import { MockedProvider } from '@apollo/client/testing';
+
+const marketId = 'market-id';
+
+const defaultWalletContext = {
+  pubKey: null,
+  pubKeys: [],
+  isReadOnly: false,
+  sendTx: jest.fn().mockReturnValue(Promise.resolve(null)),
+  connect: jest.fn(),
+  disconnect: jest.fn(),
+  selectPubKey: jest.fn(),
+  connector: null,
+};
+
+function setup(context?: Partial<VegaWalletContextShape>) {
+  const mocks: MockedResponse<OrderSubSubscription> = {
+    request: {
+      query: OrderSubDocument,
+      variables: {
+        partyId: context?.pubKey || '',
+      },
+    },
+    result: {
+      data: {
+        orders: [
+          {
+            type: Schema.OrderType.TYPE_LIMIT,
+            id: '9c70716f6c3698ac7bbcddc97176025b985a6bb9a0c4507ec09c9960b3216b62',
+            status: Schema.OrderStatus.STATUS_ACTIVE,
+            rejectionReason: null,
+            createdAt: '2022-07-05T14:25:47.815283706Z',
+            expiresAt: '2022-07-05T14:25:47.815283706Z',
+            size: '10',
+            price: '300000',
+            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+            side: Schema.Side.SIDE_BUY,
+            marketId: 'market-id',
+          },
+        ],
+      },
+    },
+  };
+  const filterMocks: MockedResponse<OrderSubSubscription> = {
+    request: {
+      query: OrderSubDocument,
+      variables: {
+        partyId: context?.pubKey || '',
+      },
+    },
+    result: {
+      data: {
+        orders: [
+          {
+            type: Schema.OrderType.TYPE_LIMIT,
+            id: '9c70716f6c3698ac7bbcddc97176025b985a6bb9a0c4507ec09c9960b3216b62',
+            status: Schema.OrderStatus.STATUS_ACTIVE,
+            rejectionReason: null,
+            createdAt: '2022-07-05T14:25:47.815283706Z',
+            expiresAt: '2022-07-05T14:25:47.815283706Z',
+            size: '10',
+            price: '300000',
+            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+            side: Schema.Side.SIDE_BUY,
+            marketId: 'market-id',
+            __typename: 'OrderUpdate',
+          },
+        ],
+      },
+    },
+  };
+
+  const wrapper = ({ children }: { children: ReactNode }) => (
+    <MockedProvider mocks={[mocks, filterMocks]}>
+      <VegaWalletContext.Provider
+        value={{ ...defaultWalletContext, ...context }}
+      >
+        {children}
+      </VegaWalletContext.Provider>
+    </MockedProvider>
+  );
+  return renderHook(() => useOrderSubmit(), { wrapper });
+}
+
+describe('useOrderSubmit', () => {
+  it('should submit a correctly formatted order on GTT', async () => {
+    const mockSendTx = jest.fn().mockReturnValue(Promise.resolve({}));
+    const pubKey = '0x123';
+    const { result } = setup({
+      sendTx: mockSendTx,
+      pubKeys: [{ publicKey: pubKey, name: 'test key 1' }],
+      pubKey,
+    });
+
+    const order = {
+      type: Schema.OrderType.TYPE_LIMIT,
+      size: '10',
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
+      side: Schema.Side.SIDE_BUY,
+      price: '123456789',
+      expiresAt: new Date('2022-01-01').toISOString(),
+    };
+    await act(async () => {
+      result.current.submit({ ...order, marketId });
+    });
+
+    expect(mockSendTx).toHaveBeenCalledWith(pubKey, {
+      orderSubmission: {
+        type: Schema.OrderType.TYPE_LIMIT,
+        marketId,
+        size: '10',
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
+        price: '123456789',
+        expiresAt: new Date('2022-01-01').toISOString(),
+      },
+    });
+  });
+
+  it('should submit a correctly formatted order on GTC', async () => {
+    const mockSendTx = jest.fn().mockReturnValue(Promise.resolve({}));
+    const publicKeyObj: PubKey = {
+      publicKey: '0x123',
+      name: 'test key 1',
+    };
+    const { result } = setup({
+      sendTx: mockSendTx,
+      pubKeys: [publicKeyObj],
+      pubKey: publicKeyObj.publicKey,
+    });
+
+    const order = {
+      type: Schema.OrderType.TYPE_LIMIT,
+      size: '10',
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+      side: Schema.Side.SIDE_BUY,
+      price: '123456789',
+      expiresAt: new Date('2022-01-01').toISOString(),
+    };
+    await act(async () => {
+      result.current.submit({ ...order, marketId });
+    });
+
+    expect(mockSendTx).toHaveBeenCalledWith(publicKeyObj.publicKey, {
+      orderSubmission: {
+        type: Schema.OrderType.TYPE_LIMIT,
+        marketId,
+        size: '10',
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        price: '123456789',
+        expiresAt: new Date('2022-01-01').toISOString(),
+      },
+    });
+  });
+
+  it('has the correct default state', () => {
+    const { result } = setup();
+    expect(typeof result.current.submit).toEqual('function');
+    expect(typeof result.current.reset).toEqual('function');
+    expect(result.current.transaction.status).toEqual(VegaTxStatus.Default);
+    expect(result.current.transaction.txHash).toEqual(null);
+    expect(result.current.transaction.error).toEqual(null);
+  });
+
+  it('should not sendTx if no keypair', async () => {
+    const mockSendTx = jest.fn();
+    const { result } = setup({
+      sendTx: mockSendTx,
+      pubKeys: [],
+      pubKey: null,
+    });
+    await act(async () => {
+      result.current.submit({} as OrderSubmissionBody['orderSubmission']);
+    });
+    expect(mockSendTx).not.toHaveBeenCalled();
+  });
+
+  it('should not sendTx side is not specified', async () => {
+    const mockSendTx = jest.fn();
+    const publicKeyObj: PubKey = {
+      publicKey: '0x123',
+      name: 'test key 1',
+    };
+    const { result } = setup({
+      sendTx: mockSendTx,
+      pubKeys: [publicKeyObj],
+      pubKey: publicKeyObj.publicKey,
+    });
+    await act(async () => {
+      result.current.submit({} as OrderSubmissionBody['orderSubmission']);
+    });
+    expect(mockSendTx).not.toHaveBeenCalled();
+  });
+});

libs/orders/src/lib/order-hooks/use-order-submit.tsx

@@ -0,0 +1,142 @@
+import { useCallback, useState } from 'react';
+import type { ReactNode } from 'react';
+import type { OrderSubFieldsFragment } from './__generated__/OrdersSubscription';
+import {
+  useVegaWallet,
+  useVegaTransaction,
+  determineId,
+} from '@vegaprotocol/wallet';
+import * as Sentry from '@sentry/react';
+import { useOrderUpdate } from './use-order-update';
+import * as Schema from '@vegaprotocol/types';
+import { Icon, Intent } from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+
+export const getOrderDialogTitle = (
+  status?: Schema.OrderStatus
+): string | undefined => {
+  if (!status) {
+    return;
+  }
+
+  switch (status) {
+    case Schema.OrderStatus.STATUS_ACTIVE:
+      return t('Order submitted');
+    case Schema.OrderStatus.STATUS_FILLED:
+      return t('Order filled');
+    case Schema.OrderStatus.STATUS_PARTIALLY_FILLED:
+      return t('Order partially filled');
+    case Schema.OrderStatus.STATUS_PARKED:
+      return t('Order parked');
+    case Schema.OrderStatus.STATUS_STOPPED:
+      return t('Order stopped');
+    case Schema.OrderStatus.STATUS_CANCELLED:
+      return t('Order cancelled');
+    case Schema.OrderStatus.STATUS_EXPIRED:
+      return t('Order expired');
+    case Schema.OrderStatus.STATUS_REJECTED:
+      return t('Order rejected');
+    default:
+      return t('Submission failed');
+  }
+};
+
+export const getOrderDialogIntent = (
+  status?: Schema.OrderStatus
+): Intent | undefined => {
+  if (!status) {
+    return;
+  }
+  switch (status) {
+    case Schema.OrderStatus.STATUS_PARKED:
+    case Schema.OrderStatus.STATUS_EXPIRED:
+    case Schema.OrderStatus.STATUS_PARTIALLY_FILLED:
+      return Intent.Warning;
+    case Schema.OrderStatus.STATUS_REJECTED:
+    case Schema.OrderStatus.STATUS_STOPPED:
+    case Schema.OrderStatus.STATUS_CANCELLED:
+      return Intent.Danger;
+    case Schema.OrderStatus.STATUS_FILLED:
+    case Schema.OrderStatus.STATUS_ACTIVE:
+      return Intent.Success;
+    default:
+      return;
+  }
+};
+
+export const getOrderDialogIcon = (
+  status?: Schema.OrderStatus
+): ReactNode | undefined => {
+  if (!status) {
+    return;
+  }
+
+  switch (status) {
+    case Schema.OrderStatus.STATUS_PARKED:
+    case Schema.OrderStatus.STATUS_EXPIRED:
+      return <Icon name="warning-sign" size={16} />;
+    case Schema.OrderStatus.STATUS_REJECTED:
+    case Schema.OrderStatus.STATUS_STOPPED:
+    case Schema.OrderStatus.STATUS_CANCELLED:
+      return <Icon name="error" size={16} />;
+    default:
+      return;
+  }
+};
+
+export const useOrderSubmit = () => {
+  const { pubKey } = useVegaWallet();
+
+  const {
+    send,
+    transaction,
+    reset: resetTransaction,
+    setComplete,
+    Dialog,
+  } = useVegaTransaction();
+
+  const waitForOrderUpdate = useOrderUpdate(transaction);
+
+  const [finalizedOrder, setFinalizedOrder] =
+    useState<OrderSubFieldsFragment | null>(null);
+
+  const reset = useCallback(() => {
+    resetTransaction();
+    setFinalizedOrder(null);
+  }, [resetTransaction]);
+
+  const submit = useCallback(
+    async (orderSubmission: OrderSubmissionBody['orderSubmission']) => {
+      if (!pubKey || !orderSubmission.side) {
+        return;
+      }
+
+      setFinalizedOrder(null);
+
+      try {
+        const res = await send(pubKey, { orderSubmission });
+
+        if (res) {
+          const orderId = determineId(res.signature);
+          if (orderId) {
+            const order = await waitForOrderUpdate(orderId, pubKey);
+            setFinalizedOrder(order);
+            setComplete();
+          }
+        }
+      } catch (e) {
+        Sentry.captureException(e);
+      }
+    },
+    [pubKey, send, setComplete, waitForOrderUpdate]
+  );
+
+  return {
+    transaction,
+    finalizedOrder,
+    Dialog,
+    submit,
+    reset,
+  };
+};

libs/orders/src/lib/utils.ts

@@ -1,7 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
 import type { OrderSubFieldsFragment } from './order-hooks';
-import { Intent } from '@vegaprotocol/ui-toolkit';
 
 // More detail in https://docs.vega.xyz/mainnet/graphql/enums/order-time-in-force
 export const timeInForceLabel = (tif: string) => {
@@ -39,55 +38,3 @@ export const getRejectionReason = (
         : null;
   }
 };
-
-export const getOrderToastTitle = (
-  status?: Schema.OrderStatus
-): string | undefined => {
-  if (!status) {
-    return;
-  }
-
-  switch (status) {
-    case Schema.OrderStatus.STATUS_ACTIVE:
-      return t('Order submitted');
-    case Schema.OrderStatus.STATUS_FILLED:
-      return t('Order filled');
-    case Schema.OrderStatus.STATUS_PARTIALLY_FILLED:
-      return t('Order partially filled');
-    case Schema.OrderStatus.STATUS_PARKED:
-      return t('Order parked');
-    case Schema.OrderStatus.STATUS_STOPPED:
-      return t('Order stopped');
-    case Schema.OrderStatus.STATUS_CANCELLED:
-      return t('Order cancelled');
-    case Schema.OrderStatus.STATUS_EXPIRED:
-      return t('Order expired');
-    case Schema.OrderStatus.STATUS_REJECTED:
-      return t('Order rejected');
-    default:
-      return t('Submission failed');
-  }
-};
-
-export const getOrderToastIntent = (
-  status?: Schema.OrderStatus
-): Intent | undefined => {
-  if (!status) {
-    return;
-  }
-  switch (status) {
-    case Schema.OrderStatus.STATUS_PARKED:
-    case Schema.OrderStatus.STATUS_EXPIRED:
-    case Schema.OrderStatus.STATUS_PARTIALLY_FILLED:
-      return Intent.Warning;
-    case Schema.OrderStatus.STATUS_REJECTED:
-    case Schema.OrderStatus.STATUS_STOPPED:
-    case Schema.OrderStatus.STATUS_CANCELLED:
-      return Intent.Danger;
-    case Schema.OrderStatus.STATUS_FILLED:
-    case Schema.OrderStatus.STATUS_ACTIVE:
-      return Intent.Success;
-    default:
-      return;
-  }
-};

libs/proposals/src/lib/proposals-list/proposal-list.spec.tsx

@@ -91,6 +91,6 @@ describe('ProposalsList', () => {
     await waitFor(() => {
       expect(container).toBeInTheDocument();
     });
-    expect(screen.getByText('No markets')).toBeInTheDocument();
+    expect(screen.getByText('No Rows To Show')).toBeInTheDocument();
   });
 });

libs/proposals/src/lib/proposals-list/proposals-list.tsx

@@ -1,21 +1,13 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
-import { t } from '@vegaprotocol/i18n';
 import * as Types from '@vegaprotocol/types';
 import { proposalsDataProvider } from '../proposals-data-provider';
+import { useCallback, useRef } from 'react';
 import type { AgGridReact } from 'ag-grid-react';
 import { useColumnDefs } from './use-column-defs';
 import type { ProposalListFieldsFragment } from '../proposals-data-provider/__generated__/Proposals';
 
-// prevent cutting filter windows by auto-height layout
-const CUSTOM_GRID_STYLES = `
-  .ag-layout-auto-height {
-    min-height: 200px !important;
-  }
-`;
-
 export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>
   data.filter((proposal) =>
     [
@@ -27,7 +19,6 @@ export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>
 
 export const ProposalsList = () => {
   const gridRef = useRef<AgGridReact | null>(null);
-  const [dataCount, setDataCount] = useState(0);
   const handleOnGridReady = useCallback(() => {
     gridRef.current?.api?.sizeColumnsToFit();
   }, [gridRef]);
@@ -39,37 +30,22 @@ export const ProposalsList = () => {
   });
   const filteredData = getNewMarketProposals(data || []);
   const { columnDefs, defaultColDef } = useColumnDefs();
-  useEffect(() => {
-    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
-  }, [filteredData]);
-  const onFilterChanged = useCallback(() => {
-    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
-  }, []);
   return (
-    <div className="relative">
+    <AsyncRenderer
+      loading={loading}
+      error={error}
+      data={filteredData}
+      reload={reload}
+    >
       <AgGrid
         ref={gridRef}
-        className="w-full h-full"
         domLayout="autoHeight"
+        className="min-w-full"
         columnDefs={columnDefs}
         rowData={filteredData}
         defaultColDef={defaultColDef}
         onGridReady={handleOnGridReady}
-        suppressLoadingOverlay
-        suppressNoRowsOverlay
-        onFilterChanged={onFilterChanged}
-        customThemeParams={CUSTOM_GRID_STYLES}
       />
-      <div className="pointer-events-none absolute inset-0">
-        <AsyncRenderer
-          loading={loading}
-          error={error}
-          data={filteredData}
-          noDataMessage={t('No markets')}
-          noDataCondition={() => !dataCount}
-          reload={reload}
-        />
-      </div>
-    </div>
+    </AsyncRenderer>
   );
 };

libs/proposals/src/lib/proposals-list/use-column-defs.tsx

@@ -1,7 +1,6 @@
 import { useMemo } from 'react';
 import BigNumber from 'bignumber.js';
 import type { ColDef } from 'ag-grid-community';
-import { DateRangeFilter, SetFilter } from '@vegaprotocol/datagrid';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
@@ -74,10 +73,6 @@ export const useColumnDefs = () => {
           value,
         }: VegaValueFormatterParams<ProposalListFieldsFragment, 'state'>) =>
           value ? ProposalStateMapping[value] : '-',
-        filter: SetFilter,
-        filterParams: {
-          set: ProposalStateMapping,
-        },
       },
       {
         colId: 'voting',
@@ -104,7 +99,6 @@ export const useColumnDefs = () => {
           }
           return '-';
         },
-        filter: false,
       },
       {
         colId: 'closing-date',
@@ -116,7 +110,6 @@ export const useColumnDefs = () => {
           ProposalListFieldsFragment,
           'terms.closingDatetime'
         >) => (value ? getDateTimeFormat().format(new Date(value)) : '-'),
-        filter: DateRangeFilter,
       },
       {
         colId: 'enactment-date',
@@ -128,18 +121,13 @@ export const useColumnDefs = () => {
           ProposalListFieldsFragment,
           'terms.enactmentDatetime'
         >) => (value ? getDateTimeFormat().format(new Date(value)) : '-'),
-        filter: DateRangeFilter,
       },
     ];
   }, [VEGA_TOKEN_URL, requiredMajorityPercentage]);
   const defaultColDef: ColDef = useMemo(() => {
     return {
-      sortable: true,
+      sortable: false,
       cellClass: cellCss,
-      flex: 1,
-      resizable: true,
-      filter: true,
-      filterParams: { buttons: ['reset'] },
     };
   }, []);
   return useMemo(

libs/smart-contracts/src/contracts/claim.ts

@@ -1,7 +1,6 @@
 import { ethers } from 'ethers';
 import { hexlify } from 'ethers/lib/utils';
 import abi from '../abis/claim_abi.json';
-import { calcGasBuffer } from '../utils';
 
 export const UNSPENT_CODE = '0x0000000000000000000000000000000000000000';
 export const SPENT_CODE = '0x0000000000000000000000000000000000000001';
@@ -43,7 +42,7 @@ export class Claim {
    * was performed and mined beforehand
    * @return {Promise<boolean>}
    */
-  public async claim({
+  public claim({
     amount,
     tranche,
     expiry,
@@ -62,20 +61,20 @@ export class Claim {
     r: string;
     s: string;
   }): Promise<ethers.ContractTransaction> {
-    const method = target != null ? 'claim_targeted' : 'claim_untargeted';
-    const args = [
-      { r, s, v },
-      {
-        amount,
-        tranche,
-        expiry,
-      },
-      hexlify(country),
-      target,
-    ].filter(Boolean);
-    const res = await this.contract.estimateGas[method](...args);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract[method](...args, { gasLimit });
+    return this.contract[
+      target != null ? 'claim_targeted' : 'claim_untargeted'
+    ](
+      ...[
+        { r, s, v },
+        {
+          amount,
+          tranche,
+          expiry,
+        },
+        hexlify(country),
+        target,
+      ].filter(Boolean)
+    );
   }
 
   /**

libs/smart-contracts/src/contracts/collateral-bridge.ts

@@ -1,7 +1,6 @@
 import type { BigNumber } from 'ethers';
 import { ethers } from 'ethers';
 import abi from '../abis/erc20_bridge_abi.json';
-import { calcGasBuffer } from '../utils';
 
 export class CollateralBridge {
   public contract: ethers.Contract;
@@ -14,20 +13,8 @@ export class CollateralBridge {
     this.contract = new ethers.Contract(address, abi, signerOrProvider);
   }
 
-  async deposit_asset(
-    assetSource: string,
-    amount: string,
-    vegaPublicKey: string
-  ) {
-    const res = await this.contract.estimateGas.deposit_asset(
-      assetSource,
-      amount,
-      vegaPublicKey
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.deposit_asset(assetSource, amount, vegaPublicKey, {
-      gasLimit,
-    });
+  deposit_asset(assetSource: string, amount: string, vegaPublicKey: string) {
+    return this.contract.deposit_asset(assetSource, amount, vegaPublicKey);
   }
   get_asset_source(vegaAssetId: string) {
     return this.contract.get_asset_source(vegaAssetId);
@@ -50,7 +37,7 @@ export class CollateralBridge {
   default_withdraw_delay() {
     return this.contract.default_withdraw_delay();
   }
-  async list_asset(
+  list_asset(
     address: string,
     vegaAssetId: string,
     lifetimeLimit: string,
@@ -58,7 +45,7 @@ export class CollateralBridge {
     nonce: string,
     signatures: string
   ) {
-    const res = await this.contract.estimateGas.list_asset(
+    return this.contract.list_asset(
       address,
       vegaAssetId,
       lifetimeLimit,
@@ -66,20 +53,8 @@ export class CollateralBridge {
       nonce,
       signatures
     );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.list_asset(
-      address,
-      vegaAssetId,
-      lifetimeLimit,
-      withdraw_threshold,
-      nonce,
-      signatures,
-      {
-        gasLimit,
-      }
-    );
   }
-  async withdraw_asset(
+  withdraw_asset(
     assetSource: string,
     amount: string,
     target: string,
@@ -87,25 +62,13 @@ export class CollateralBridge {
     nonce: string,
     signatures: string
   ) {
-    const res = await this.contract.estimateGas.withdraw_asset(
-      assetSource,
-      amount,
-      target,
-      creation,
-      nonce,
-      signatures
-    );
-    const gasLimit = calcGasBuffer(res);
     return this.contract.withdraw_asset(
       assetSource,
       amount,
       target,
       creation,
       nonce,
-      signatures,
-      {
-        gasLimit,
-      }
+      signatures
     );
   }
 

libs/smart-contracts/src/contracts/multisig-control.ts

@@ -1,6 +1,5 @@
 import { ethers } from 'ethers';
 import abi from '../abis/multisig_abi.json';
-import { calcGasBuffer } from '../utils';
 
 export class MultisigControl {
   public contract: ethers.Contract;
@@ -14,20 +13,12 @@ export class MultisigControl {
     this.address = address;
   }
 
-  async add_signer(newSigner: string, nonce: string, signatures: string) {
-    const res = await this.contract.estimateGas.add_signer(
-      newSigner,
-      nonce,
-      signatures
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.add_signer(newSigner, nonce, signatures, { gasLimit });
+  add_signer(newSigner: string, nonce: string, signatures: string) {
+    return this.contract.add_signer(newSigner, nonce, signatures);
   }
 
-  async burn_nonce(nonce: string, signatures: string) {
-    const res = await this.contract.estimateGas.burn_nonce(nonce, signatures);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.burn_nonce(nonce, signatures, { gasLimit });
+  burn_nonce(nonce: string, signatures: string) {
+    return this.contract.burn_nonce(nonce, signatures);
   }
 
   get_current_threshold() {
@@ -46,43 +37,19 @@ export class MultisigControl {
     return this.contract.is_valid_signer(signerAddress);
   }
 
-  async remove_signer(oldSigner: string, nonce: string, signatures: string) {
-    const res = await this.contract.estimateGas.remove_signer(
-      oldSigner,
-      nonce,
-      signatures
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.remove_signer(oldSigner, nonce, signatures, {
-      gasLimit,
-    });
+  remove_signer(oldSigner: string, nonce: string, signatures: string) {
+    return this.contract.remove_signer(oldSigner, nonce, signatures);
   }
 
-  async set_threshold(newThreshold: string, nonce: string, signatures: string) {
-    const res = await this.contract.estimateGas.set_threshold(
-      newThreshold,
-      nonce,
-      signatures
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.set_threshold(newThreshold, nonce, signatures, {
-      gasLimit,
-    });
+  set_threshold(newThreshold: string, nonce: string, signatures: string) {
+    return this.contract.set_threshold(newThreshold, nonce, signatures);
   }
 
   signers(address: string) {
     return this.contract.signers(address);
   }
 
-  async verify_signatures(nonce: string, message: string, signatures: string) {
-    const res = await this.contract.estimateGas.verify_signatures(
-      nonce,
-      message,
-      signatures
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.verify_signatures(nonce, message, signatures, {
-      gasLimit,
-    });
+  verify_signatures(nonce: string, message: string, signatures: string) {
+    return this.contract.verify_signatures(nonce, message, signatures);
   }
 }

libs/smart-contracts/src/contracts/staking-bridge.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import abi from '../abis/staking_abi.json';
-import { calcGasBuffer, prepend0x } from '../utils';
+import { prepend0x } from '../utils';
 
 export class StakingBridge {
   public contract: ethers.Contract;
@@ -13,41 +13,20 @@ export class StakingBridge {
     this.contract = new ethers.Contract(address, abi, signerOrProvider);
     this.address = address;
   }
-  async stake(amount: string, vegaPublicKey: string) {
-    const key = prepend0x(vegaPublicKey);
-    const res = await this.contract.estimateGas.stake(amount, key);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.stake(amount, key, {
-      gasLimit,
-    });
-  }
 
-  async remove_stake(amount: string, vegaPublicKey: string) {
-    const key = prepend0x(vegaPublicKey);
-    const res = await this.contract.estimateGas.remove_stake(amount, key);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.remove_stake(amount, key, {
-      gasLimit,
-    });
+  stake(amount: string, vegaPublicKey: string) {
+    return this.contract.stake(amount, prepend0x(vegaPublicKey));
   }
-
-  async transfer_stake(
-    amount: string,
-    newAddress: string,
-    vegaPublicKey: string
-  ) {
-    const key = prepend0x(vegaPublicKey);
-    const res = await this.contract.estimateGas.transfer_stake(
+  remove_stake(amount: string, vegaPublicKey: string) {
+    return this.contract.remove_stake(amount, prepend0x(vegaPublicKey));
+  }
+  transfer_stake(amount: string, newAddress: string, vegaPublicKey: string) {
+    return this.contract.transfer_stake(
       amount,
       newAddress,
-      key
+      prepend0x(vegaPublicKey)
     );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.transfer_stake(amount, newAddress, key, {
-      gasLimit,
-    });
   }
-
   staking_token() {
     return this.contract.staking_token();
   }

libs/smart-contracts/src/contracts/token-faucetable.ts

@@ -1,7 +1,6 @@
 import type { BigNumber } from 'ethers';
 import { ethers } from 'ethers';
 import erc20AbiFaucetable from '../abis/erc20_abi_faucet.json';
-import { calcGasBuffer } from '../utils';
 
 export class TokenFaucetable {
   public contract: ethers.Contract;
@@ -28,17 +27,13 @@ export class TokenFaucetable {
   allowance(owner: string, spender: string): Promise<BigNumber> {
     return this.contract.allowance(owner, spender);
   }
-  async approve(spender: string, amount: string) {
-    const res = await this.contract.estimateGas.approve(spender, amount);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.approve(spender, amount, { gasLimit });
+  approve(spender: string, amount: string) {
+    return this.contract.approve(spender, amount);
   }
   decimals(): Promise<number> {
     return this.contract.decimals();
   }
-  async faucet() {
-    const res = await this.contract.estimateGas.faucet();
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.faucet({ gasLimit });
+  faucet() {
+    return this.contract.faucet();
   }
 }

libs/smart-contracts/src/contracts/token-vesting.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import abi from '../abis/vesting_abi.json';
-import { calcGasBuffer, prepend0x } from '../utils';
+import { prepend0x } from '../utils';
 
 export class TokenVesting {
   public contract: ethers.Contract;
@@ -13,21 +13,12 @@ export class TokenVesting {
     this.contract = new ethers.Contract(address, abi, signerOrProvider);
     this.address = address;
   }
-  async stake_tokens(amount: string, vegaPublicKey: string) {
-    const key = prepend0x(vegaPublicKey);
-    const res = await this.contract.estimateGas.stake_tokens(amount, key);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.stake_tokens(amount, key, {
-      gasLimit,
-    });
+
+  stake_tokens(amount: string, vegaPublicKey: string) {
+    return this.contract.stake_tokens(amount, prepend0x(vegaPublicKey));
   }
-  async remove_stake(amount: string, vegaPublicKey: string) {
-    const key = prepend0x(vegaPublicKey);
-    const res = await this.contract.estimateGas.remove_stake(amount, key);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.remove_stake(amount, key, {
-      gasLimit,
-    });
+  remove_stake(amount: string, vegaPublicKey: string) {
+    return this.contract.remove_stake(amount, prepend0x(vegaPublicKey));
   }
   stake_balance(address: string, vegaPublicKey: string) {
     return this.contract.stake_balance(address, prepend0x(vegaPublicKey));
@@ -47,13 +38,7 @@ export class TokenVesting {
   user_total_all_tranches(address: string) {
     return this.contract.user_total_all_tranches(address);
   }
-  async withdraw_from_tranche(trancheId: number) {
-    const res = await this.contract.estimateGas.withdraw_from_tranche(
-      trancheId
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.withdraw_from_tranche(trancheId, {
-      gasLimit,
-    });
+  withdraw_from_tranche(trancheId: number) {
+    return this.contract.withdraw_from_tranche(trancheId);
   }
 }

libs/smart-contracts/src/contracts/token.ts

@@ -1,7 +1,6 @@
 import type { BigNumber } from 'ethers';
 import { ethers } from 'ethers';
 import erc20Abi from '../abis/erc20_abi.json';
-import { calcGasBuffer } from '../utils';
 
 export class Token {
   public contract: ethers.Contract;
@@ -24,15 +23,13 @@ export class Token {
   allowance(owner: string, spender: string): Promise<BigNumber> {
     return this.contract.allowance(owner, spender);
   }
-  async approve(spender: string, amount: string) {
-    const res = await this.contract.estimateGas.approve(spender, amount);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.approve(spender, amount, { gasLimit });
+  approve(spender: string, amount: string) {
+    return this.contract.approve(spender, amount);
   }
   decimals(): Promise<number> {
     return this.contract.decimals();
   }
-  async faucet() {
+  faucet() {
     /* No op */
   }
 }

libs/smart-contracts/src/utils/calc-gas-buffer.ts

@@ -1,5 +0,0 @@
-import type { BigNumber as EthersBigNumber } from 'ethers';
-
-export function calcGasBuffer(value: EthersBigNumber): EthersBigNumber {
-  return value.mul(120).div(100);
-}

libs/smart-contracts/src/utils/index.ts

@@ -1,2 +1 @@
-export * from './calc-gas-buffer';
 export * from './prepend-0x';

libs/utils/src/lib/links.ts

@@ -3,7 +3,6 @@
  */
 
 export const createDocsLinks = (docsUrl: string) => ({
-  NEW_TO_VEGA: `${docsUrl}/concepts/new-to-vega`,
   AUCTION_TYPE_OPENING: `${docsUrl}/concepts/trading-on-vega/trading-modes#auction-type-opening`,
   AUCTION_TYPE_LIQUIDITY_MONITORING: `${docsUrl}/concepts/trading-on-vega/trading-modes#auction-type-liquidity-monitoring`,
   AUCTION_TYPE_PRICE_MONITORING: `${docsUrl}/concepts/trading-on-vega/trading-modes#auction-type-price-monitoring`,
@@ -15,7 +14,6 @@ export const createDocsLinks = (docsUrl: string) => ({
   NODE_OPERATORS: `${docsUrl}/node-operators`,
   LOSS_SOCIALIZATION: `${docsUrl}/concepts/trading-on-vega/market-protections#loss-socialisation`,
   POSITION_RESOLUTION: `${docsUrl}/concepts/trading-on-vega/market-protections#position-resolution`,
-  LIQUIDITY: `${docsUrl}/concepts/liquidity/provision`,
 });
 
 export const ExternalLinks = {

package.json

@@ -43,7 +43,7 @@
     "@web3-react/walletconnect": "^8.0.23-beta.0",
     "ag-grid-community": "^27.0.1",
     "ag-grid-react": "^27.0.1",
-    "allotment": "1.18.1",
+    "allotment": "^1.17.1",
     "alpha-lyrae": "vegaprotocol/alpha-lyrae",
     "apollo": "^2.33.9",
     "apollo-link-timeout": "^4.0.0",
@@ -63,7 +63,7 @@
     "js-sha3": "^0.8.0",
     "lodash": "^4.17.21",
     "next": "12.2.3",
-    "pennant": "1.8.1",
+    "pennant": "1.6.0",
     "react": "18.2.0",
     "react-copy-to-clipboard": "^5.0.4",
     "react-dom": "18.2.0",

yarn.lock

@@ -8153,13 +8153,13 @@ ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-allotment@1.18.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/allotment/-/allotment-1.18.1.tgz#a31b0cb5b301309334dfa352c7704361437058de"
-  integrity sha512-ZhmpHoSvxHyPT5XjzTHeCBjzCMIFn1aGdNAzBCZhj1CcRMp31CaJCi+lfweoOLDbbjJqbFZqUk3xf+p7Mb0x5A==
+allotment@1.17.1, allotment@^1.17.1:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/allotment/-/allotment-1.17.1.tgz#1a87fe911e520e6028df3740d9ba397c48f8e8d7"
+  integrity sha512-3/blHxKZfP441IZRwoOJaaNfDOx9XtvQQaeRYYrn7xjQWF7ZhYZCfR7oNxudwx2ga21tIskvfytbZF2P/ydE3A==
   dependencies:
     classnames "^2.3.0"
-    eventemitter3 "^5.0.0"
+    eventemitter3 "^4.0.0"
     lodash.clamp "^4.0.0"
     lodash.debounce "^4.0.0"
     lodash.isequal "^4.5.0"
@@ -9962,11 +9962,6 @@ chownr@^2.0.0:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
-chroma-js@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.4.2.tgz#dffc214ed0c11fa8eefca2c36651d8e57cbfb2b0"
-  integrity sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A==
-
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -18465,10 +18460,10 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-pennant@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.8.1.tgz#bb5f8fd2ae78e0e53ff43bea565765bf7e47b255"
-  integrity sha512-kUKRLfM8GdE+RSlS45Rz/QMQ6xorbzAqw/ybOVR/2gVO6L3sY16+vrgVSJd89RbR+sI/foWe5buXwFmjwFR7Kg==
+pennant@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.6.0.tgz#9c7d873527defba689439a18f2ff2f9aa5ababea"
+  integrity sha512-0eWZmFNaWMCYHj9C/+KgwFy8sf/dEkR2TilYrkoRgOVgziDFakojHSiNIwFrqYZFXH1HincYwS7PjKFtQkvrRA==
   dependencies:
     "@babel/runtime" "^7.13.10"
     "@d3fc/d3fc-technical-indicator" "^8.0.1"
@@ -18489,8 +18484,7 @@ pennant@1.8.1:
     "@types/react" "^18.0.14"
     "@types/react-dom" "^18.0.5"
     "@types/react-virtualized-auto-sizer" "^1.0.0"
-    allotment "1.18.1"
-    chroma-js "^2.4.2"
+    allotment "1.17.1"
     classnames "^2.2.6"
     d3-array "2.8.0"
     d3-axis "^3.0.0"
@@ -18511,6 +18505,7 @@ pennant@1.8.1:
     lodash "^4.17.20"
     react-virtualized-auto-sizer "^1.0.4"
     sass "^1.49.9"
+    typescript "^4.1.2"
     use-resize-observer "^9.0.0"
 
 performance-now@^2.1.0:
@@ -22309,6 +22304,11 @@ typescript@4.7.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
   integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
 
+typescript@^4.1.2:
+  version "4.9.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
+  integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==
+
 typescript@^4.4.3:
   version "4.8.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"