chore: update tranches

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

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

@@ -530,7 +530,7 @@
     "tranche_end": "2023-04-06T00:00:00.000Z",
     "total_added": "14099",
     "total_removed": "143.78419653368",
-    "locked_amount": "4432.17309438470708546",
+    "locked_amount": "4317.28708968040564483",
     "deposits": [
       {
         "amount": "30",
@@ -3306,7 +3306,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "60012.2994098061907759131",
+    "locked_amount": "59952.3205941027057561402",
     "deposits": [
       {
         "amount": "86666.297",
@@ -3372,7 +3372,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "903.093203093203175",
+    "locked_amount": "899.62336563899075",
     "deposits": [
       {
         "amount": "2500",
@@ -3493,7 +3493,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "15002.9388083735895",
+    "locked_amount": "14978.9139555656195",
     "deposits": [
       {
         "amount": "12500",
@@ -3760,7 +3760,7 @@
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
     "total_removed": "4492.78075095",
-    "locked_amount": "26259.36157151626875",
+    "locked_amount": "26207.02645411294875",
     "deposits": [
       {
         "amount": "7500",
@@ -4036,7 +4036,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "59957.545737631794657195",
+    "locked_amount": "59897.62164505080734094",
     "deposits": [
       {
         "amount": "129999.45",
@@ -4102,7 +4102,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "27397.393404363265956",
+    "locked_amount": "27354.070059614405762",
     "deposits": [
       {
         "amount": "10000",
@@ -4295,7 +4295,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "2380.07102993404385",
+    "locked_amount": "2376.6106988838155",
     "deposits": [
       {
         "amount": "5000",
@@ -4506,7 +4506,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "97499.58",
     "total_removed": "0",
-    "locked_amount": "2034.9686935030549769988",
+    "locked_amount": "1976.1887408628310248306",
     "deposits": [
       {
         "amount": "97499.58",
@@ -4539,7 +4539,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "135173.4239508",
     "total_removed": "98230.390980249184455396",
-    "locked_amount": "2781.4508813301073482881800752",
+    "locked_amount": "2701.108834006406820430108332",
     "deposits": [
       {
         "amount": "135173.4239508",
@@ -4585,7 +4585,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "32499.86",
     "total_removed": "0",
-    "locked_amount": "856.07618732708597453098",
+    "locked_amount": "831.348476326834519302",
     "deposits": [
       {
         "amount": "32499.86",
@@ -4618,7 +4618,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "10833.29",
     "total_removed": "0",
-    "locked_amount": "278.6444918082786955163",
+    "locked_amount": "270.59586182972489332628",
     "deposits": [
       {
         "amount": "10833.29",
@@ -4651,7 +4651,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "22749.93",
     "total_removed": "4720.860935375",
-    "locked_amount": "1041.6353445026172644364",
+    "locked_amount": "1011.5477680137440929101",
     "deposits": [
       {
         "amount": "6500",
@@ -4803,7 +4803,7 @@
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
     "total_removed": "6029.8222644",
-    "locked_amount": "4319.15285451197025",
+    "locked_amount": "4287.751784069981625",
     "deposits": [
       {
         "amount": "7500",
@@ -5199,7 +5199,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "354742.134161907705277922",
+    "locked_amount": "353399.575280201010750956",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -38890,7 +38890,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "700133.348465855088393",
-    "locked_amount": "569616.476842965740083581504",
+    "locked_amount": "567553.33674442327201243239",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -40272,7 +40272,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
     "total_removed": "811190.94573738377022952",
-    "locked_amount": "7319511.0396526062849853116896723115788051",
+    "locked_amount": "7312195.27732943035628880483248801894971615",
     "deposits": [
       {
         "amount": "16249.93",
@@ -46498,7 +46498,7 @@
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
     "total_removed": "5781272.031584311406488996",
-    "locked_amount": "1035880.629997723569255699501954567",
+    "locked_amount": "1029126.764932550789662065977913855",
     "deposits": [
       {
         "amount": "129284.449",
@@ -53930,7 +53930,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
     "total_removed": "3381706.364737906998719578",
-    "locked_amount": "92379.298325811440012225988805963",
+    "locked_amount": "89710.8053915257113869983245366295",
     "deposits": [
       {
         "amount": "552496.6455",
@@ -56058,7 +56058,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
     "total_removed": "38818.1373783577949",
-    "locked_amount": "90258.98682236420185873334500254",
+    "locked_amount": "89932.07048033860228826051293758",
     "deposits": [
       {
         "amount": "3000",

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

@@ -135,7 +135,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
     cy.getByTestId(transferForm).find(submitTransferBtn).click();
     cy.getByTestId(toastContent).should(
       'contain.text',
-      'Transfer completeYour transaction has been confirmed TransferTo 7f9cf0…c255351.00 tBTC'
+      'Transfer completeYour transaction has been confirmed View in block explorerTransferTo 7f9cf0…c255351.00 tBTC'
     );
     cy.getByTestId(toastCloseBtn).click();
   });
@@ -283,7 +283,7 @@ describe('capsule', { tags: '@slow' }, () => {
     });
   });
   // comment because of bug #2695
-  it.skip('can edit order', function () {
+  it('can edit order', function () {
     cy.getByTestId(ordersTab).click();
     cy.getByTestId('edit').first().should('be.visible').click();
     cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
@@ -422,7 +422,11 @@ describe('capsule', { tags: '@slow' }, () => {
     cy.getByTestId(depositSubmit).click();
     cy.getByTestId('input-error-text').should(
       'contain.text',
-      'Amount is above approved amount.Update approve amount'
+      'Amount is above approved amount'
+    );
+    cy.getByTestId('reapprove-default').should(
+      'contain.text',
+      'Approve again to deposit more than'
     );
   });
 
@@ -437,9 +441,11 @@ describe('capsule', { tags: '@slow' }, () => {
     cy.getByTestId('deposit-button').click();
     connectEthereumWallet('Unknown');
     cy.get(assetSelectField, txTimeout).select(vegaName, { force: true });
-    cy.getByTestId('deposit-submit').click();
-    cy.getByTestId('dialog-title').should('contain.text', 'Approve complete');
-    cy.get('[data-testid="Return to deposit"]').click();
+    cy.getByTestId('approve-submit').click();
+    cy.getByTestId('approve-confirmed').should(
+      'contain.text',
+      'You can now make deposits in VEGA, up to a maximum of'
+    );
     cy.get(amountField).clear().type('10000');
     cy.getByTestId('deposit-submit').click();
     cy.getByTestId(toastContent, txTimeout).should(
@@ -447,7 +453,7 @@ describe('capsule', { tags: '@slow' }, () => {
       `Your transaction has been confirmed.`,
       { matchCase: false }
     );
-    cy.getByTestId(toastCloseBtn).click();
+    cy.getByTestId(toastCloseBtn).click({ multiple: true });
     cy.getByTestId('Collateral').click();
 
     cy.highlight('deposit verification');

entrypoint.sh

@@ -35,6 +35,8 @@ do
   fi
 done < $env_vars_file
 
+rm $env_vars_file
+
 echo "}" >> $env_file
 
 # start serving

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

@@ -24,11 +24,7 @@ export const PositionsManager = ({
 }: PositionsManagerProps) => {
   const gridRef = useRef<AgGridReact | null>(null);
   const [dataCount, setDataCount] = useState(0);
-  const { data, error, loading, reload } = usePositionsData(
-    partyId,
-    gridRef,
-    true
-  );
+  const { data, error, loading, reload } = usePositionsData(partyId, gridRef);
   const create = useVegaTransactionStore((store) => store.create);
   const onClose = ({
     marketId,
@@ -72,7 +68,7 @@ export const PositionsManager = ({
   });
   useEffect(() => {
     setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
-  }, [data?.length]);
+  }, [data]);
   const onFilterChanged = useCallback((event: FilterChangedEvent) => {
     setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
   }, []);

libs/positions/src/lib/use-positions-data.tsx

@@ -6,13 +6,13 @@ import { positionsMetricsProvider } from './positions-data-providers';
 import type { PositionsQueryVariables } from './__generated__/Positions';
 import { useDataProvider, updateGridData } from '@vegaprotocol/react-helpers';
 import type { GetRowsParams } from '@vegaprotocol/datagrid';
+import isEqual from 'lodash/isEqual';
 
 export const getRowId = ({ data }: { data: Position }) => data.marketId;
 
 export const usePositionsData = (
   partyId: string,
-  gridRef: RefObject<AgGridReact>,
-  clientSideModel?: boolean
+  gridRef: RefObject<AgGridReact>
 ) => {
   const variables = useMemo<PositionsQueryVariables>(
     () => ({ partyId }),
@@ -21,9 +21,30 @@ export const usePositionsData = (
   const dataRef = useRef<Position[] | null>(null);
   const update = useCallback(
     ({ data }: { data: Position[] | null }) => {
-      return clientSideModel ? false : updateGridData(dataRef, data, gridRef);
+      if (gridRef.current?.api?.getModel().getType() === 'infinite') {
+        return updateGridData(dataRef, data, gridRef);
+      }
+
+      const update: Position[] = [];
+      const add: Position[] = [];
+      data?.forEach((d) => {
+        const rowNode = gridRef.current?.api?.getRowNode(d.marketId);
+        if (rowNode) {
+          if (!isEqual(rowNode.data, d)) {
+            update.push(d);
+          }
+        } else {
+          add.push(d);
+        }
+      });
+      gridRef.current?.api?.applyTransaction({
+        update,
+        add,
+        addIndex: 0,
+      });
+      return true;
     },
-    [gridRef, clientSideModel]
+    [gridRef]
   );
   const { data, error, loading, reload } = useDataProvider({
     dataProvider: positionsMetricsProvider,