Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/eth-oracle-spec

Co-authored-by: Matthew Russell <mattrussell36@gmail.com>

.github/workflows/ci-cd-trigger.yml

@@ -5,7 +5,6 @@ on:
     branches:
       - release/*
       - develop
-      - main
   pull_request:
     types:
       - opened
@@ -179,33 +178,10 @@ jobs:
   #   with:
   #     github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
-  check-e2e-needed:
-    runs-on: ubuntu-latest
-    needs: build-sources
-    name: '(CI) check if e2e needed'
-    outputs:
-      run-tests: ${{ steps.check-test.outputs.e2e-needed }}
-    steps:
-      - name: Check branch
-        id: check-test
-        run: |
-          if [[ "${{ github.base_ref }}" == "develop" ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "main" ]]; then 
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push"  &&  "${{ github.ref_name }}" == *"release/"* ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          else
-            echo "e2e-needed=false" >> $GITHUB_OUTPUT
-          fi
-      - name: Print result
-        run: |
-          echo "e2e-needed: ${{ steps.check-test.outputs.e2e-needed }}"
-
   cypress:
-    needs: [build-sources, check-e2e-needed]
+    needs: build-sources
     name: '(CI) cypress'
-    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }}
+    # if: ${{ needs.build-sources.outputs.projects-e2e != '[]' }}
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
     with:

.github/workflows/cypress-run.yml

@@ -21,11 +21,11 @@ jobs:
       - name: Check branch
         id: step
         run: |
-          if [[ "${{ github.base_ref }}" == "main" ]]; then
+          if [ ${{ github.base_ref }} == 'main' ]; then
             echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "develop" && "${{ github.ref_name }}" == "main" ]]; then
+          elif [ ${{ github.base_ref }} == 'develop' ] && [ ${{ github.ref_name }} == 'main' ]; then
             echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == *"release/mainnet"* ]]; then
+          elif [ ${{ github.event_name }} == 'push' ] && [ ${{ contains(github.ref_name, 'release/mainnet') }} ]; then
             echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
           else
             echo "runner=self-hosted-runner" >> $GITHUB_OUTPUT
@@ -85,7 +85,6 @@ jobs:
       - name: Run Vegacapsule network and Vega wallet
         id: setup-vega
         uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-        timeout-minutes: 10
 
       ######
       ## Run some tests

.github/workflows/publish-dist.yml

@@ -63,7 +63,7 @@ jobs:
           echo IS_IPFS_RELEASE=true >> $GITHUB_ENV
 
       - name: Is S3 Release
-        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' && github.ref_name != 'main'}}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' }}
         run: |
           echo IS_S3_RELEASE=true >> $GITHUB_ENV
 
@@ -195,7 +195,7 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true && main' || '' }}
 
       - name: Publish dist as docker image (ghcr - retry)
         uses: docker/build-push-action@v3
@@ -222,7 +222,7 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true && main' || '' }}
 
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3

apps/explorer/src/app/routes/oracles/home/index.tsx

@@ -8,9 +8,7 @@ import { useScrollToLocation } from '../../../hooks/scroll-to-location';
 import filter from 'recursive-key-filter';
 
 const Oracles = () => {
-  const { data, loading, error } = useExplorerOracleSpecsQuery({
-    errorPolicy: 'ignore',
-  });
+  const { data, loading, error } = useExplorerOracleSpecsQuery();
 
   useDocumentTitle(['Oracles']);
   useScrollToLocation();

apps/governance-e2e/.env

@@ -22,7 +22,6 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 NX_SUCCESSOR_MARKETS=true
 NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true
 
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn

apps/governance-e2e/src/fixtures/proposals/asset.json

@@ -0,0 +1,21 @@
+{
+  "rationale": {
+    "title": "Add USDT Coin (USDT)",
+    "description": "Proposal to add USDT Coin (USDT) as an asset"
+  },
+  "terms": {
+    "newAsset": {
+      "changes": {
+        "name": "USDT Coin",
+        "symbol": "USDT",
+        "decimals": "18",
+        "quantum": "1",
+        "erc20": {
+          "contractAddress": "0xb404c51bbc10dcbe948077f18a4b8e553d160084"
+        }
+      }
+    },
+    "closingTimestamp": 1662374250,
+    "enactmentTimestamp": 1662460650
+  }
+}

apps/governance-e2e/src/fixtures/proposals/resume-market-raw.json

@@ -1,16 +0,0 @@
-{
-  "rationale": {
-    "title": "Market resume test",
-    "description": "E2E test for market resume proposal"
-  },
-  "terms": {
-    "updateMarketState": {
-      "changes": {
-        "marketId": "b33bb4157e12355db22e41f277ddd0c10104dec29a4d6960bbcb96d186c40cbd",
-        "updateType": "MARKET_STATE_UPDATE_TYPE_RESUME"
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}

apps/governance-e2e/src/fixtures/proposals/suspend-market-raw.json

@@ -1,16 +0,0 @@
-{
-  "rationale": {
-    "title": "Market suspended test",
-    "description": "E2E test for market suspended proposal"
-  },
-  "terms": {
-    "updateMarketState": {
-      "changes": {
-        "marketId": "",
-        "updateType": "MARKET_STATE_UPDATE_TYPE_SUSPEND"
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}

apps/governance-e2e/src/fixtures/proposals/terminate-market-raw.json

@@ -1,17 +0,0 @@
-{
-  "rationale": {
-    "title": "Market terminate test",
-    "description": "E2E test for market terminate proposal"
-  },
-  "terms": {
-    "updateMarketState": {
-      "changes": {
-        "marketId": "",
-        "updateType": "MARKET_STATE_UPDATE_TYPE_TERMINATE",
-        "price": "100"
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}

apps/governance-e2e/src/fixtures/proposals/update-market-old.json

@@ -0,0 +1,85 @@
+{
+  "instrument": {
+    "code": "Token.24h",
+    "future": {
+      "quoteName": "fBTC",
+      "dataSourceSpecForSettlementData": {
+        "external": {
+          "oracle": {
+            "signers": [
+              {
+                "pubKey": {
+                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                }
+              }
+            ],
+            "filters": [
+              {
+                "key": {
+                  "name": "prices.BTC.value",
+                  "type": "TYPE_INTEGER"
+                },
+                "conditions": [
+                  {
+                    "operator": "OPERATOR_GREATER_THAN",
+                    "value": "0"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      },
+      "dataSourceSpecForTradingTermination": {
+        "external": {
+          "oracle": {
+            "signers": [
+              {
+                "pubKey": {
+                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                }
+              }
+            ],
+            "filters": [
+              {
+                "key": {
+                  "name": "trading.terminated.ETH5",
+                  "type": "TYPE_BOOLEAN"
+                },
+                "conditions": [
+                  {
+                    "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
+                    "value": "1648684800000000000"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      },
+      "dataSourceSpecBinding": {
+        "settlementDataProperty": "prices.BTC.value",
+        "tradingTerminationProperty": "trading.terminated.ETH5"
+      }
+    }
+  },
+  "metadata": ["sector:energy", "sector:food", "source:docs.vega.xyz"],
+  "priceMonitoringParameters": {
+    "triggers": [
+      {
+        "horizon": "43200",
+        "probability": "0.9999999",
+        "auctionExtension": "600"
+      }
+    ]
+  },
+  "logNormal": {
+    "tau": 0.0001140771161,
+    "riskAversionParameter": 0.001,
+    "params": {
+      "mu": 0,
+      "r": 0.016,
+      "sigma": 0.3
+    }
+  }
+}

apps/governance-e2e/src/integration/flow/proposal-details.cy.ts

@@ -60,17 +60,6 @@ describe(
     before('connect wallets and set approval limit', function () {
       cy.visit('/');
       ethereumWalletConnect();
-      cy.createMarket();
-      navigateTo(navigation.proposals);
-      cy.getByTestId('closed-proposals').within(() => {
-        cy.contains('Add Lorem Ipsum market')
-          .parentsUntil(proposalListItem)
-          .last()
-          .within(() => {
-            cy.getByTestId(viewProposalButton).click();
-          });
-      });
-      getProposalInformationFromTable('ID').invoke('text').as('parentMarketId');
     });
 
     beforeEach('visit proposals tab', function () {
@@ -309,6 +298,9 @@ describe(
     });
 
     it('Able to see successor market details with new and updated values', function () {
+      cy.createMarket();
+      cy.reload();
+      waitForSpinner();
       cy.getByTestId('closed-proposals').within(() => {
         cy.contains('Add Lorem Ipsum market')
           .parentsUntil(proposalListItem)
@@ -317,9 +309,14 @@ describe(
             cy.getByTestId(viewProposalButton).click();
           });
       });
-      cy.VegaWalletSubmitProposal(
-        createSuccessorMarketProposalTxBody(this.parentMarketId)
-      );
+      getProposalInformationFromTable('ID')
+        .invoke('text')
+        .as('parentMarketId')
+        .then(() => {
+          cy.VegaWalletSubmitProposal(
+            createSuccessorMarketProposalTxBody(this.parentMarketId)
+          );
+        });
       navigateTo(navigation.proposals);
       cy.reload();
       getProposalFromTitle('Test successor market proposal details').within(
@@ -437,87 +434,5 @@ describe(
         'Minimum Probability Of Trading LP Orders'
       ).should('contain.text', '1e-8');
     });
-
-    it('Able to see suspended market proposal', function () {
-      const proposalPath = 'src/fixtures/proposals/suspend-market-raw.json';
-      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      submitUniqueRawProposal({
-        proposalBody: proposalPath,
-        updateMarketId: this.parentMarketId,
-        enactmentTimestamp: enactmentTimestamp,
-        closingTimestamp: closingTimestamp,
-      });
-      getProposalFromTitle('Market suspended test').within(() => {
-        cy.getByTestId(marketProposalType).should(
-          'have.text',
-          'Suspend market'
-        );
-        cy.getByTestId(viewProposalButton).click();
-      });
-      cy.getByTestId(marketProposalType).should('have.text', 'Suspend market');
-      cy.getByTestId(marketDataToggle).click();
-      cy.getByTestId('proposal-update-market-state').within(() => {
-        getProposalInformationFromTable('Market ID')
-          .invoke('text')
-          .and('eq', this.parentMarketId);
-      });
-    });
-
-    it('Able to see resume market proposal', function () {
-      const proposalPath = 'src/fixtures/proposals/resume-market-raw.json';
-      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      submitUniqueRawProposal({
-        proposalBody: proposalPath,
-        updateMarketId: this.parentMarketId,
-        enactmentTimestamp: enactmentTimestamp,
-        closingTimestamp: closingTimestamp,
-      });
-      getProposalFromTitle('Market resume test').within(() => {
-        cy.getByTestId(marketProposalType).should('have.text', 'Resume market');
-        cy.getByTestId(viewProposalButton).click();
-      });
-      cy.getByTestId(marketProposalType).should('have.text', 'Resume market');
-      cy.getByTestId(marketDataToggle).click();
-      cy.getByTestId('proposal-update-market-state').within(() => {
-        getProposalInformationFromTable('Market ID')
-          .invoke('text')
-          .and('eq', this.parentMarketId);
-      });
-    });
-
-    it('Able to see terminate market proposal', function () {
-      const proposalPath = 'src/fixtures/proposals/terminate-market-raw.json';
-      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      submitUniqueRawProposal({
-        proposalBody: proposalPath,
-        updateMarketId: this.parentMarketId,
-        enactmentTimestamp: enactmentTimestamp,
-        closingTimestamp: closingTimestamp,
-      });
-      getProposalFromTitle('Market terminate test').within(() => {
-        cy.getByTestId(marketProposalType).should(
-          'have.text',
-          'Terminate market'
-        );
-        cy.getByTestId(viewProposalButton).click();
-      });
-      cy.getByTestId(marketProposalType).should(
-        'have.text',
-        'Terminate market'
-      );
-      cy.getByTestId(marketDataToggle).click();
-      cy.getByTestId('proposal-update-market-state').within(() => {
-        getProposalInformationFromTable('Market ID')
-          .invoke('text')
-          .and('eq', this.parentMarketId);
-        getProposalDetailsValue('Termination Price').should(
-          'contain.text',
-          '0.001 fUSDC'
-        );
-      });
-    });
   }
 );

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

@@ -54,7 +54,6 @@ export function submitUniqueRawProposal(proposalFields: {
   proposalBody?: string;
   proposalTitle?: string;
   proposalDescription?: string;
-  updateMarketId?: string;
   closingTimestamp?: number;
   enactmentTimestamp?: number;
   submit?: boolean;
@@ -72,10 +71,6 @@ export function submitUniqueRawProposal(proposalFields: {
     if (proposalFields.proposalDescription) {
       rawProposal.rationale.description = proposalFields.proposalDescription;
     }
-    if (proposalFields.updateMarketId) {
-      rawProposal.terms.updateMarketState.changes.marketId =
-        proposalFields.updateMarketId;
-    }
     if (proposalFields.closingTimestamp) {
       rawProposal.terms.closingTimestamp = proposalFields.closingTimestamp;
     } else if (

apps/governance/.env

@@ -8,7 +8,6 @@ NX_FAIRGROUND=false
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
@@ -35,4 +34,3 @@ NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=false
 NX_UPDATE_MARKET_STATE=false
-NX_GOVERNANCE_TRANSFERS=false

apps/governance/.env.mainnet

@@ -17,7 +17,7 @@ NX_VEGA_REST_URL=https://api.vega.community/api/v2/
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 

apps/governance/.env.stagnet1

@@ -10,7 +10,6 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
@@ -23,4 +22,3 @@ NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
-NX_GOVERNANCE_TRANSFERS=true

apps/governance/.env.testnet

@@ -15,7 +15,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground

apps/governance/src/i18n/translations/dev.json

@@ -888,7 +888,5 @@
   "HowToPropose": "How to make a proposal",
   "HowToProposeRawStep1": "1. Sense check your proposal with the community on the forum:",
   "HowToProposeRawStep2": "2. Use the appropriate proposal template in the docs:",
-  "HowToProposeRawStep3": "3. Submit on-chain below",
-  "proposalTransferDetails": "New governance transfer details",
-  "proposalCancelTransferDetails": "Cancel governance transfer details"
+  "HowToProposeRawStep3": "3. Submit on-chain below"
 }

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx

@@ -7,17 +7,12 @@ import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { truncateMiddle } from '../../../../lib/truncate-middle';
 import { CurrentProposalState } from '../current-proposal-state';
 import { ProposalInfoLabel } from '../proposal-info-label';
-import {
-  useCancelTransferProposalDetails,
-  useNewTransferProposalDetails,
-  useSuccessorMarketProposalDetails,
-} from '@vegaprotocol/proposals';
+import { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';
 import { FLAGS } from '@vegaprotocol/environment';
 import Routes from '../../../routes';
 import { Link } from 'react-router-dom';
 import type { VoteState } from '../vote-details/use-user-vote';
 import { VoteBreakdown } from '../vote-breakdown';
-import { GovernanceTransferKindMapping } from '@vegaprotocol/types';
 
 export const ProposalHeader = ({
   proposal,
@@ -152,20 +147,6 @@ export const ProposalHeader = ({
       );
       break;
     }
-    case 'NewTransfer':
-      proposalType = 'NewTransfer';
-      fallbackTitle = t('NewTransferProposal');
-      details = FLAGS.GOVERNANCE_TRANSFERS ? (
-        <NewTransferSummary proposalId={proposal?.id} />
-      ) : null;
-      break;
-    case 'CancelTransfer':
-      proposalType = 'CancelTransfer';
-      fallbackTitle = t('CancelTransferProposal');
-      details = FLAGS.GOVERNANCE_TRANSFERS ? (
-        <CancelTransferSummary proposalId={proposal?.id} />
-      ) : null;
-      break;
   }
 
   return (
@@ -243,36 +224,3 @@ const SuccessorCode = ({ proposalId }: { proposalId?: string | null }) => {
     </span>
   ) : null;
 };
-
-const NewTransferSummary = ({ proposalId }: { proposalId?: string | null }) => {
-  const { t } = useTranslation();
-  const details = useNewTransferProposalDetails(proposalId);
-
-  if (!details) return null;
-
-  return (
-    <span>
-      {GovernanceTransferKindMapping[details.kind.__typename]}{' '}
-      {t('transfer from')} <Lozenge>{truncateMiddle(details.source)}</Lozenge>{' '}
-      {t('to')} <Lozenge>{truncateMiddle(details.destination)}</Lozenge>
-    </span>
-  );
-};
-
-const CancelTransferSummary = ({
-  proposalId,
-}: {
-  proposalId?: string | null;
-}) => {
-  const { t } = useTranslation();
-  const details = useCancelTransferProposalDetails(proposalId);
-
-  if (!details) return null;
-
-  return (
-    <span>
-      {t('Cancel transfer: ')}{' '}
-      <Lozenge>{truncateMiddle(details.transferId)}</Lozenge>
-    </span>
-  );
-};

apps/governance/src/routes/proposals/components/proposal-transfer/index.ts

@@ -1,2 +0,0 @@
-export * from './proposal-transfer-details';
-export * from './proposal-cancel-transfer-details';

apps/governance/src/routes/proposals/components/proposal-transfer/proposal-cancel-transfer-details.tsx

@@ -1,37 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import { useCancelTransferProposalDetails } from '@vegaprotocol/proposals';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  RoundedWrapper,
-} from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
-
-export const ProposalCancelTransferDetails = ({
-  proposal,
-}: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-}) => {
-  const { t } = useTranslation();
-  const details = useCancelTransferProposalDetails(proposal?.id);
-
-  if (!details) {
-    return null;
-  }
-
-  return (
-    <>
-      <SubHeading title={t('proposalCancelTransferDetails')} />
-      <RoundedWrapper paddingBottom={true}>
-        <KeyValueTable data-testid="proposal-cancel-transfer-details-table">
-          <KeyValueTableRow noBorder={true}>
-            {t('transferId')}
-            {details.transferId}
-          </KeyValueTableRow>
-        </KeyValueTable>
-      </RoundedWrapper>
-    </>
-  );
-};

apps/governance/src/routes/proposals/components/proposal-transfer/proposal-transfer-details.tsx

@@ -1,145 +0,0 @@
-import { useState } from 'react';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import { SubHeading } from '../../../../components/heading';
-import { useTranslation } from 'react-i18next';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  RoundedWrapper,
-  Tooltip,
-} from '@vegaprotocol/ui-toolkit';
-import { useNewTransferProposalDetails } from '@vegaprotocol/proposals';
-import {
-  AccountTypeMapping,
-  DescriptionGovernanceTransferTypeMapping,
-  GovernanceTransferKindMapping,
-  GovernanceTransferTypeMapping,
-} from '@vegaprotocol/types';
-import {
-  addDecimalsFormatNumberQuantum,
-  formatDateWithLocalTimezone,
-} from '@vegaprotocol/utils';
-
-export const ProposalTransferDetails = ({
-  proposal,
-}: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-}) => {
-  const { t } = useTranslation();
-  const [show, setShow] = useState(false);
-
-  const details = useNewTransferProposalDetails(proposal?.id);
-  if (!details) {
-    return null;
-  }
-
-  return (
-    <>
-      <CollapsibleToggle
-        toggleState={show}
-        setToggleState={setShow}
-        dataTestId="proposal-transfer-details"
-      >
-        <SubHeading title={t('proposalTransferDetails')} />
-      </CollapsibleToggle>
-      {show && (
-        <RoundedWrapper paddingBottom={true}>
-          <KeyValueTable data-testid="proposal-transfer-details-table">
-            {/* The source account */}
-            <KeyValueTableRow>
-              {t('Source')}
-              {details.source}
-            </KeyValueTableRow>
-
-            {/* The type of source account */}
-            <KeyValueTableRow>
-              {t('Source Type')}
-              {AccountTypeMapping[details.sourceType]}
-            </KeyValueTableRow>
-
-            {/* The destination account */}
-            <KeyValueTableRow>
-              {t('Destination')}
-              {details.destination}
-            </KeyValueTableRow>
-
-            {/* The type of destination account */}
-            <KeyValueTableRow>
-              {t('Destination Type')}
-              {AccountTypeMapping[details.destinationType]}
-            </KeyValueTableRow>
-
-            {/* The asset to transfer */}
-            <KeyValueTableRow>
-              {t('Asset')}
-              {details.asset.symbol}
-            </KeyValueTableRow>
-
-            {/*The fraction of the balance to be transfer */}
-            <KeyValueTableRow>
-              {t('Fraction Of Balance')}
-              {`${Number(details.fraction_of_balance) * 100}%`}
-            </KeyValueTableRow>
-
-            {/* The maximum amount to be transferred */}
-            <KeyValueTableRow>
-              {t('Amount')}
-              {addDecimalsFormatNumberQuantum(
-                details.amount,
-                details.asset.decimals,
-                details.asset.quantum
-              )}
-            </KeyValueTableRow>
-
-            {/* The type of the governance transfer */}
-            <KeyValueTableRow>
-              {t('Transfer Type')}
-              <Tooltip
-                description={
-                  DescriptionGovernanceTransferTypeMapping[details.transferType]
-                }
-              >
-                <span>
-                  {GovernanceTransferTypeMapping[details.transferType]}
-                </span>
-              </Tooltip>
-            </KeyValueTableRow>
-
-            {/* The type of governance transfer being made, i.e. a one-off or recurring trans */}
-            <KeyValueTableRow>
-              {t('Kind')}
-              {GovernanceTransferKindMapping[details.kind.__typename]}
-            </KeyValueTableRow>
-
-            {details.kind.__typename === 'OneOffGovernanceTransfer' &&
-              details.kind.deliverOn && (
-                <KeyValueTableRow noBorder={true}>
-                  {t('Deliver On')}
-                  {formatDateWithLocalTimezone(
-                    new Date(details.kind.deliverOn)
-                  )}
-                </KeyValueTableRow>
-              )}
-
-            {details.kind.__typename === 'RecurringGovernanceTransfer' && (
-              <>
-                <KeyValueTableRow noBorder={!details.kind.endEpoch}>
-                  {t('Start On')}
-                  <span>{details.kind.startEpoch}</span>
-                </KeyValueTableRow>
-                {details.kind.endEpoch && (
-                  <KeyValueTableRow noBorder={true}>
-                    {t('End on')}
-                    {details.kind.endEpoch}
-                  </KeyValueTableRow>
-                )}
-              </>
-            )}
-          </KeyValueTable>
-        </RoundedWrapper>
-      )}
-    </>
-  );
-};

apps/governance/src/routes/proposals/components/proposal/proposal.tsx

@@ -20,11 +20,6 @@ import { ProposalUpdateMarketState } from '../proposal-update-market-state';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
 import { useVoteSubmit } from '@vegaprotocol/proposals';
 import { useUserVote } from '../vote-details/use-user-vote';
-import {
-  ProposalCancelTransferDetails,
-  ProposalTransferDetails,
-} from '../proposal-transfer';
-import { FLAGS } from '@vegaprotocol/environment';
 
 export interface ProposalProps {
   proposal: ProposalQuery['proposal'];
@@ -104,37 +99,9 @@ export const Proposal = ({
         minVoterBalance =
           networkParams.governance_proposal_freeform_minVoterBalance;
         break;
-      case 'NewTransfer':
-        // TODO: check minVoterBalance for 'NewTransfer'
-        minVoterBalance =
-          networkParams.governance_proposal_freeform_minVoterBalance;
-        break;
-      case 'CancelTransfer':
-        // TODO: check minVoterBalance for 'CancelTransfer'
-        minVoterBalance =
-          networkParams.governance_proposal_freeform_minVoterBalance;
     }
   }
 
-  // Show governance transfer details only if the GOVERNANCE_TRANSFERS flag is on.
-  const governanceTransferDetails = FLAGS.GOVERNANCE_TRANSFERS && (
-    <>
-      {proposal.terms.change.__typename === 'NewTransfer' && (
-        /** Governance New Transfer Details */
-        <div className="mb-4">
-          <ProposalTransferDetails proposal={proposal} />
-        </div>
-      )}
-
-      {proposal.terms.change.__typename === 'CancelTransfer' && (
-        /** Governance Cancel Transfer Details */
-        <div className="mb-4">
-          <ProposalCancelTransferDetails proposal={proposal} />
-        </div>
-      )}
-    </>
-  );
-
   return (
     <section data-testid="proposal">
       <div className="flex items-center gap-1 mb-6">
@@ -220,8 +187,6 @@ export const Proposal = ({
           </div>
         )}
 
-      {governanceTransferDetails}
-
       <div className="mb-10">
         <RoundedWrapper paddingBottom={true}>
           <UserVote

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

@@ -11,8 +11,60 @@ describe('accounts', { tags: '@smoke' }, () => {
     cy.visit('/#/markets/market-0');
   });
 
-  it('should open usage breakdown dialog when clicked on used', () => {
+  it('renders accounts', () => {
+    // 7001-COLL-001
+    // 7001-COLL-002
+    // 7001-COLL-003
+    // 7001-COLL-004
+    // 7001-COLL-005
+    // 7001-COLL-006
+    // 7001-COLL-007
+    // 1003-TRAN-001
+    // 7001-COLL-012
+
+    const tradingAccountRowId = '[row-id="t-0"]';
     cy.getByTestId('Collateral').click();
+
+    cy.getByTestId('tab-accounts').should('be.visible');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="asset.symbol"]')
+      .should('have.text', 'AST0');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="used"]')
+      .should('have.text', '1.01' + '1.00%');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="available"]')
+      .should('have.text', '100.00');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="total"]')
+      .should('have.text', '101.01');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="accounts-actions"]')
+      .should('have.text', '');
+
+    cy.getByTestId('tab-accounts')
+      .get('[col-id="accounts-actions"]')
+      .find('[data-testid="dropdown-menu"]')
+      .eq(1)
+      .click();
+    cy.getByTestId('deposit').should('be.visible');
+    cy.getByTestId('withdraw').should('be.visible');
+    cy.getByTestId('transfer').should('be.visible');
+    cy.getByTestId('breakdown').should('be.visible');
+    cy.getByTestId('Collateral').click({ force: true });
+  });
+
+  it('should open usage breakdown dialog when clicked on used', () => {
     // 7001-COLL-009
     cy.get('[col-id="used"]').contains('1.01').click();
     const headers = ['Market', 'Account type', 'Balance', 'Margin health'];

apps/trading/.env

@@ -12,7 +12,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground

apps/trading/.env.mainnet

@@ -16,7 +16,6 @@ NX_VEGA_CONSOLE_URL=https://console.vega.xyz
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true

apps/trading/.env.stagnet1

@@ -16,7 +16,7 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true

apps/trading/.env.testnet

@@ -17,7 +17,6 @@ NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true

apps/trading/client-pages/closed-market/closed-market.tsx

@@ -1,5 +0,0 @@
-import MarketPage from '../market';
-
-export const ClosedMarketPage = () => {
-  return <MarketPage closed />;
-};

apps/trading/client-pages/closed-market/index.ts

@@ -1 +0,0 @@
-export { ClosedMarketPage as default } from './closed-market';

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

@@ -9,10 +9,9 @@ import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid } from './trade-grid';
 import { TradePanels } from './trade-panels';
 import { useNavigate, useParams } from 'react-router-dom';
-import { Links, Routes } from '../../lib/links';
+import { Links } from '../../lib/links';
 import { ViewType, useSidebar } from '../../components/sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
-import { MarketState } from '@vegaprotocol/types';
 
 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
   return markPrice && decimalPlaces
@@ -57,7 +56,7 @@ const TitleUpdater = ({
   return null;
 };
 
-export const MarketPage = ({ closed }: { closed?: boolean }) => {
+export const MarketPage = () => {
   const { marketId } = useParams();
   const navigate = useNavigate();
   const currentRouteId = useGetCurrentRouteId();
@@ -71,33 +70,16 @@ export const MarketPage = ({ closed }: { closed?: boolean }) => {
   const { data, error, loading } = useMarket(marketId);
 
   useEffect(() => {
-    if (
-      data?.state &&
-      [
-        MarketState.STATE_SETTLED,
-        MarketState.STATE_TRADING_TERMINATED,
-      ].includes(data.state) &&
-      currentRouteId !== Routes.CLOSED_MARKETS &&
-      marketId
-    ) {
-      navigate(Links.CLOSED_MARKETS(marketId));
-    }
-  }, [data?.state, currentRouteId, navigate, marketId]);
-
-  useEffect(() => {
-    if (data?.id && data.id !== lastMarketId && !closed) {
+    if (data?.id && data.id !== lastMarketId) {
       update({ marketId: data.id });
     }
-  }, [update, lastMarketId, data?.id, closed]);
+  }, [update, lastMarketId, data?.id]);
 
   useEffect(() => {
     if (largeScreen && view === undefined) {
-      setViews(
-        { type: closed ? ViewType.Info : ViewType.Order },
-        currentRouteId
-      );
+      setViews({ type: ViewType.Order }, currentRouteId);
     }
-  }, [setViews, view, currentRouteId, largeScreen, closed]);
+  }, [setViews, view, currentRouteId, largeScreen]);
 
   const pinnedAsset = data && getAsset(data);
 

apps/trading/client-pages/market/trade-grid.tsx

@@ -136,7 +136,7 @@ const MainGrid = memo(
                 </Tab>
               ) : null}
               <Tab id="fills" name={t('Fills')}>
-                <TradingViews.fills.component />
+                <TradingViews.fills.component marketId={marketId} />
               </Tab>
               <Tab
                 id="accounts"

apps/trading/client-pages/markets/closed.spec.tsx

@@ -1,4 +1,4 @@
-import { act, render, screen, waitFor, within } from '@testing-library/react';
+import { act, render, screen, within } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { Closed } from './closed';
 import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
@@ -300,11 +300,9 @@ describe('Closed', () => {
       ].includes(m.node.state);
     });
 
-    await waitFor(() => {
-      // check rows length is correct
-      const rows = container.getAllByRole('row');
-      expect(rows).toHaveLength(expectedRows.length);
-    });
+    // check rows length is correct
+    const rows = container.getAllByRole('row');
+    expect(rows).toHaveLength(expectedRows.length);
 
     // check that only included ids are shown
     const cells = screen

apps/trading/client-pages/markets/closed.tsx

@@ -22,8 +22,6 @@ import { SettlementPriceCell } from './settlement-price-cell';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { MarketCodeCell } from './market-code-cell';
 import { MarketActionsDropdown } from './market-table-actions';
-import type { CellClickedEvent } from 'ag-grid-community';
-import { useClosedMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 type SettlementAsset = Pick<
   Asset,
@@ -127,7 +125,6 @@ const ClosedMarketsDataGrid = ({
   rowData: Row[];
   error: Error | undefined;
 }) => {
-  const handleOnSelect = useClosedMarketClickHandler();
   const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);
 
   const colDefs = useMemo(() => {
@@ -284,27 +281,6 @@ const ClosedMarketsDataGrid = ({
       overlayNoRowsTemplate={error ? error.message : t('No markets')}
       components={components}
       rowHeight={45}
-      onCellClicked={({ data, column, event }: CellClickedEvent<Row>) => {
-        if (!data) return;
-
-        // prevent navigating to the market page if any of the below cells are clicked
-        // event.preventDefault or event.stopPropagation dont seem to apply for aggird
-        const colId = column.getColId();
-
-        if (
-          [
-            'settlementDate',
-            'settlementDataOracleId',
-            'settlementAsset',
-            'market-actions',
-          ].includes(colId)
-        ) {
-          return;
-        }
-
-        // @ts-ignore metaKey exists
-        handleOnSelect(data.id, event ? event.metaKey : false);
-      }}
     />
   );
 };

apps/trading/components/fills-container/fills-container.tsx

@@ -9,7 +9,7 @@ import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
-export const FillsContainer = () => {
+export const FillsContainer = ({ marketId }: { marketId?: string }) => {
   const onMarketClick = useMarketClickHandler(true);
   const { pubKey } = useVegaWallet();
 
@@ -31,6 +31,7 @@ export const FillsContainer = () => {
   return (
     <FillsManager
       partyId={pubKey}
+      marketId={marketId}
       onMarketClick={onMarketClick}
       gridProps={gridStoreCallbacks}
     />

apps/trading/components/layouts/layout-with-sidebar.tsx

@@ -23,10 +23,6 @@ export const LayoutWithSidebar = () => {
       <div className="col-span-full">
         <Routes>
           <Route path="markets/:marketId" element={<MarketHeader />} />
-          <Route
-            path="markets/all/closed/:marketId"
-            element={<MarketHeader />}
-          />
           <Route path="liquidity/:marketId" element={<LiquidityHeader />} />
         </Routes>
       </div>

apps/trading/components/market-state/market-state.tsx

@@ -7,8 +7,6 @@ import * as Schema from '@vegaprotocol/types';
 import { HeaderStat } from '../header';
 import { useCallback, useRef, useState } from 'react';
 import * as constants from '../constants';
-import { DocsLinks } from '@vegaprotocol/environment';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 
 export const MarketState = ({ market }: { market: Market | null }) => {
   const [marketState, setMarketState] = useState<Schema.MarketState | null>(
@@ -92,20 +90,5 @@ const getMarketStateTooltip = (state: Schema.MarketState | null) => {
     );
   }
 
-  if (state === Schema.MarketState.STATE_SUSPENDED_VIA_GOVERNANCE) {
-    return (
-      <p>
-        {t(
-          `This market has been suspended via a governance vote and can be resumed or terminated by further votes.`
-        )}
-        {DocsLinks && (
-          <ExternalLink href={DocsLinks.MARKET_LIFECYCLE} className="ml-1">
-            {t('Find out more')}
-          </ExternalLink>
-        )}
-      </p>
-    );
-  }
-
   return undefined;
 };

apps/trading/components/sidebar/sidebar.tsx

@@ -135,21 +135,6 @@ export const Sidebar = () => {
               </>
             }
           />
-          <Route
-            path="markets/all/closed/:marketId"
-            element={
-              <>
-                <AssetSidebarButtons />
-                <SidebarDivider />
-                <SidebarButton
-                  view={ViewType.Info}
-                  icon={VegaIconNames.BREAKDOWN}
-                  tooltip={t('Market specification')}
-                  routeId={currentRouteId}
-                />
-              </>
-            }
-          />
         </Routes>
       </nav>
       <nav className={classNames(navClasses, 'ml-auto lg:mt-auto lg:ml-0')}>

apps/trading/lib/hooks/use-market-click-handler.ts

@@ -20,16 +20,3 @@ export const useMarketLiquidityClickHandler = () => {
     window.open(`/#/liquidity/${selectedId}`, metaKey ? '_blank' : '_self');
   }, []);
 };
-
-export const useClosedMarketClickHandler = (replace = false) => {
-  const navigate = useNavigate();
-
-  return (selectedId: string, metaKey?: boolean) => {
-    const link = Links.CLOSED_MARKETS(selectedId);
-    if (metaKey) {
-      window.open(`/#${link}`, '_blank');
-    } else {
-      navigate(link, { replace });
-    }
-  };
-};

apps/trading/lib/links.ts

@@ -5,7 +5,6 @@ import trimEnd from 'lodash/trimEnd';
 export const Routes = {
   HOME: '/',
   MARKETS: '/markets/all',
-  CLOSED_MARKETS: '/markets/all/closed/:marketId',
   MARKET: '/markets/:marketId',
   LIQUIDITY: '/liquidity/:marketId',
   PORTFOLIO: '/portfolio',
@@ -29,8 +28,6 @@ export const Links: ConsoleLinks = {
   MARKET: (marketId: string) =>
     trimEnd(Routes.MARKET.replace(':marketId', marketId)),
   MARKETS: () => Routes.MARKETS,
-  CLOSED_MARKETS: (marketId: string) =>
-    trimEnd(Routes.CLOSED_MARKETS.replace(':marketId', marketId)),
   PORTFOLIO: () => Routes.PORTFOLIO,
   LIQUIDITY: (marketId: string) =>
     trimEnd(Routes.LIQUIDITY.replace(':marketId', marketId)),

apps/trading/lib/utils/index.ts

@@ -5,7 +5,6 @@ const MARKET_TEMPLATE = [
   MarketState.STATE_ACTIVE,
   MarketState.STATE_SUSPENDED,
   MarketState.STATE_PENDING,
-  MarketState.STATE_SUSPENDED_VIA_GOVERNANCE,
 ];
 
 export const isMarketActive = (state: MarketState) => {

apps/trading/pages/client-router.tsx

@@ -26,7 +26,6 @@ import { FLAGS } from '@vegaprotocol/environment';
 // These must remain dynamically imported as pennant cannot be compiled by nextjs due to ESM
 // Using dynamic imports is a workaround for this until pennant is published as ESM
 const MarketPage = lazy(() => import('../client-pages/market'));
-const ClosedMarketPage = lazy(() => import('../client-pages/closed-market'));
 const Portfolio = lazy(() => import('../client-pages/portfolio'));
 
 const NotFound = () => (
@@ -102,11 +101,6 @@ export const routerConfig: RouteObject[] = compact([
             element: <MarketPage />,
             id: Routes.MARKET,
           },
-          {
-            path: 'all/closed/:marketId',
-            element: <ClosedMarketPage />,
-            id: Routes.CLOSED_MARKETS,
-          },
         ],
       },
       {

libs/accounts/src/lib/accounts-actions-dropdown.spec.tsx

@@ -1,75 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
-import { AccountsActionsDropdown } from './accounts-actions-dropdown';
-import userEvent from '@testing-library/user-event';
-
-describe('AccountsActionsDropdown', () => {
-  let onClickDeposit: jest.Mock;
-  let onClickWithdraw: jest.Mock;
-  let onClickBreakdown: jest.Mock;
-  let onClickTransfer: jest.Mock;
-
-  beforeEach(() => {
-    onClickDeposit = jest.fn();
-    onClickWithdraw = jest.fn();
-    onClickBreakdown = jest.fn();
-    onClickTransfer = jest.fn();
-  });
-
-  it('should render dropdown items correctly', async () => {
-    // 7001-COLL-005
-    // 7001-COLL-006
-    // 1003-TRAN-001
-    render(
-      <AccountsActionsDropdown
-        assetId="testAssetId"
-        assetContractAddress="testAssetContractAddress"
-        onClickDeposit={onClickDeposit}
-        onClickWithdraw={onClickWithdraw}
-        onClickBreakdown={onClickBreakdown}
-        onClickTransfer={onClickTransfer}
-      />
-    );
-
-    await userEvent.click(screen.getByTestId('icon-kebab'));
-
-    expect(screen.getByTestId('deposit')).toHaveTextContent('Deposit');
-    expect(screen.getByTestId('withdraw')).toHaveTextContent('Withdraw');
-    expect(screen.getByTestId('transfer')).toHaveTextContent('Transfer');
-    expect(screen.getByTestId('breakdown')).toHaveTextContent(
-      'View usage breakdown'
-    );
-    expect(screen.getByText('View asset details')).toBeInTheDocument();
-    expect(screen.getByText('Copy asset ID')).toBeInTheDocument();
-    expect(screen.getByText('View on Etherscan')).toBeInTheDocument();
-  });
-
-  it('should call callback functions on click', async () => {
-    render(
-      <AccountsActionsDropdown
-        assetId="testAssetId"
-        assetContractAddress="testAssetContractAddress"
-        onClickDeposit={onClickDeposit}
-        onClickWithdraw={onClickWithdraw}
-        onClickBreakdown={onClickBreakdown}
-        onClickTransfer={onClickTransfer}
-      />
-    );
-
-    await userEvent.click(screen.getByTestId('icon-kebab'));
-    await userEvent.click(screen.getByTestId('deposit'));
-    expect(onClickDeposit).toHaveBeenCalledTimes(1);
-
-    await userEvent.click(screen.getByTestId('icon-kebab'));
-    await userEvent.click(screen.getByTestId('withdraw'));
-    expect(onClickWithdraw).toHaveBeenCalledTimes(1);
-
-    await userEvent.click(screen.getByTestId('icon-kebab'));
-    await userEvent.click(screen.getByTestId('transfer'));
-    expect(onClickTransfer).toHaveBeenCalledTimes(1);
-
-    await userEvent.click(screen.getByTestId('icon-kebab'));
-    await userEvent.click(screen.getByTestId('breakdown'));
-    expect(onClickBreakdown).toHaveBeenCalledTimes(1);
-  });
-});

libs/accounts/src/lib/accounts-table.spec.tsx

@@ -26,13 +26,6 @@ const singleRowData = [singleRow];
 
 describe('AccountsTable', () => {
   it('should render correct columns', async () => {
-    // 7001-COLL-001
-    // 7001-COLL-002
-    // 7001-COLL-003
-    // 7001-COLL-004
-    // 7001-COLL-007
-    // 1003-TRAN-001
-    // 7001-COLL-012
     await act(async () => {
       render(
         <AccountTable

libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx

@@ -264,11 +264,7 @@ export const DealTicket = ({
     orders,
     collateralAvailable:
       marginAccountBalance || generalAccountBalance ? balance : undefined,
-    skip:
-      !normalizedOrder ||
-      (normalizedOrder.type !== Schema.OrderType.TYPE_MARKET &&
-        (!normalizedOrder.price || normalizedOrder.price === '0')) ||
-      normalizedOrder.size === '0',
+    skip: !normalizedOrder,
   });
 
   const assetSymbol = getAsset(market).symbol;

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

@@ -114,20 +114,6 @@ export const TradingModeTooltip = ({
         </section>
       );
     }
-    case Schema.MarketTradingMode.TRADING_MODE_SUSPENDED_VIA_GOVERNANCE: {
-      return (
-        <section data-testid="trading-mode-suspended-via-governance">
-          {t(
-            `This market has been suspended via a governance vote and can be resumed or terminated by further votes.`
-          )}
-          {DocsLinks && (
-            <ExternalLink href={DocsLinks.MARKET_LIFECYCLE} className="ml-1">
-              {t('Find out more')}
-            </ExternalLink>
-          )}
-        </section>
-      );
-    }
     case Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION: {
       switch (trigger) {
         case Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET: {

libs/deal-ticket/src/hooks/use-position-estimate.ts

@@ -30,11 +30,9 @@ export const usePositionEstimate = ({
     fetchPolicy: 'no-cache',
   });
   useEffect(() => {
-    if (skip) {
-      setEstimates(undefined);
-    } else if (data) {
+    if (data) {
       setEstimates(data);
     }
-  }, [data, skip]);
+  }, [data]);
   return estimates;
 };

libs/environment/src/hooks/use-environment.ts

@@ -423,12 +423,6 @@ function compileFeatureFlags(): FeatureFlags {
         process.env['NX_UPDATE_MARKET_STATE']
       ) as string
     ),
-    GOVERNANCE_TRANSFERS: TRUTHY.includes(
-      windowOrDefault(
-        'NX_GOVERNANCE_TRANSFERS',
-        process.env['NX_GOVERNANCE_TRANSFERS']
-      ) as string
-    ),
   };
   const EXPLORER_FLAGS = {
     EXPLORER_ASSETS: TRUTHY.includes(

libs/environment/src/hooks/use-links.ts

@@ -80,7 +80,6 @@ export const DocsLinks = VEGA_DOCS_URL
       LIQUIDITY: `${VEGA_DOCS_URL}/concepts/liquidity/provision`,
       WITHDRAWAL_LIMITS: `${VEGA_DOCS_URL}/concepts/assets/deposits-withdrawals#withdrawal-limits`,
       VALIDATOR_SCORES_REWARDS: `${VEGA_DOCS_URL}/concepts/vega-chain/validator-scores-and-rewards`,
-      MARKET_LIFECYCLE: `${VEGA_DOCS_URL}/concepts/trading-on-vega/market-lifecycle`,
     }
   : undefined;
 

libs/environment/src/types.ts

@@ -25,7 +25,6 @@ export type CosmicElevatorFlags = Pick<
   | 'METAMASK_SNAPS'
   | 'REFERRALS'
   | 'UPDATE_MARKET_STATE'
-  | 'GOVERNANCE_TRANSFERS'
 >;
 export type Configuration = z.infer<typeof tomlConfigSchema>;
 export const CUSTOM_NODE_KEY = 'custom' as const;

libs/environment/src/utils/validate-environment.ts

@@ -80,7 +80,6 @@ const COSMIC_ELEVATOR_FLAGS = {
   METAMASK_SNAPS: z.optional(z.boolean()),
   REFERRALS: z.optional(z.boolean()),
   UPDATE_MARKET_STATE: z.optional(z.boolean()),
-  GOVERNANCE_TRANSFERS: z.optional(z.boolean()),
 };
 
 const EXPLORER_FLAGS = {

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

@@ -9,12 +9,14 @@ import { fillsWithMarketProvider } from './fills-data-provider';
 
 interface FillsManagerProps {
   partyId: string;
+  marketId?: string;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
   gridProps: ReturnType<typeof useDataGridEvents>;
 }
 
 export const FillsManager = ({
   partyId,
+  marketId,
   onMarketClick,
   gridProps,
 }: FillsManagerProps) => {
@@ -22,6 +24,9 @@ export const FillsManager = ({
   const filter: Schema.TradesFilter | Schema.TradesSubscriptionFilter = {
     partyIds: [partyId],
   };
+  if (marketId) {
+    filter.marketIds = [marketId];
+  }
   const { data, error } = useDataProvider({
     dataProvider: fillsWithMarketProvider,
     update: ({ data }) => {

libs/markets/src/lib/markets.mock.ts

@@ -96,7 +96,6 @@ export const createMarketFragment = (
                   filters: [
                     {
                       __typename: 'Filter',
-                      conditions: [],
                       key: {
                         __typename: 'PropertyKey',
                         name: 'settlement-data-property',
@@ -130,7 +129,6 @@ export const createMarketFragment = (
                   filters: [
                     {
                       __typename: 'Filter',
-                      conditions: [],
                       key: {
                         __typename: 'PropertyKey',
                         name: 'settlement-data-property',

libs/proposals/src/lib/proposals-data-provider/Proposals.graphql

@@ -334,36 +334,6 @@ fragment UpdateNetworkParameterFields on UpdateNetworkParameter {
   }
 }
 
-fragment NewTransferFields on NewTransfer {
-  source
-  sourceType
-  destination
-  destinationType
-  asset {
-    id
-    symbol
-    decimals
-    quantum
-  }
-  fraction_of_balance
-  amount
-  transferType
-  kind {
-    __typename
-    ... on OneOffGovernanceTransfer {
-      deliverOn
-    }
-    ... on RecurringGovernanceTransfer {
-      startEpoch
-      endEpoch
-    }
-  }
-}
-
-fragment CancelTransferFields on CancelTransfer {
-  transferId
-}
-
 fragment ProposalListFields on Proposal {
   id
   rationale {

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

@@ -67,29 +67,3 @@ query InstrumentDetails($marketId: ID!) {
     }
   }
 }
-
-query NewTransferDetails($proposalId: ID!) {
-  proposal(id: $proposalId) {
-    id
-    terms {
-      change {
-        ... on NewTransfer {
-          ...NewTransferFields
-        }
-      }
-    }
-  }
-}
-
-query CancelTransferDetails($proposalId: ID!) {
-  proposal(id: $proposalId) {
-    id
-    terms {
-      change {
-        ... on CancelTransfer {
-          ...CancelTransferFields
-        }
-      }
-    }
-  }
-}

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

@@ -1,7 +1,7 @@
 import * as Types from '@vegaprotocol/types';
 
 import { gql } from '@apollo/client';
-import { UpdateNetworkParameterFieldsFragmentDoc, NewTransferFieldsFragmentDoc, CancelTransferFieldsFragmentDoc } from '../../proposals-data-provider/__generated__/Proposals';
+import { UpdateNetworkParameterFieldsFragmentDoc } from '../../proposals-data-provider/__generated__/Proposals';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type ProposalEventFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null };
@@ -41,20 +41,6 @@ export type InstrumentDetailsQueryVariables = Types.Exact<{
 
 export type InstrumentDetailsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', code: string, name: string } } } | null };
 
-export type NewTransferDetailsQueryVariables = Types.Exact<{
-  proposalId: Types.Scalars['ID'];
-}>;
-
-
-export type NewTransferDetailsQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer', source: string, sourceType: Types.AccountType, destination: string, destinationType: Types.AccountType, fraction_of_balance: string, amount: string, transferType: Types.GovernanceTransferType, asset: { __typename?: 'Asset', id: string, symbol: string, decimals: number, quantum: string }, kind: { __typename: 'OneOffGovernanceTransfer', deliverOn?: any | null } | { __typename: 'RecurringGovernanceTransfer', startEpoch: number, endEpoch?: number | null } } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } } | null };
-
-export type CancelTransferDetailsQueryVariables = Types.Exact<{
-  proposalId: Types.Scalars['ID'];
-}>;
-
-
-export type CancelTransferDetailsQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer', transferId: string } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } } | null };
-
 export const ProposalEventFieldsFragmentDoc = gql`
     fragment ProposalEventFields on Proposal {
   id
@@ -260,88 +246,4 @@ export function useInstrumentDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHook
         }
 export type InstrumentDetailsQueryHookResult = ReturnType<typeof useInstrumentDetailsQuery>;
 export type InstrumentDetailsLazyQueryHookResult = ReturnType<typeof useInstrumentDetailsLazyQuery>;
-export type InstrumentDetailsQueryResult = Apollo.QueryResult<InstrumentDetailsQuery, InstrumentDetailsQueryVariables>;
-export const NewTransferDetailsDocument = gql`
-    query NewTransferDetails($proposalId: ID!) {
-  proposal(id: $proposalId) {
-    id
-    terms {
-      change {
-        ... on NewTransfer {
-          ...NewTransferFields
-        }
-      }
-    }
-  }
-}
-    ${NewTransferFieldsFragmentDoc}`;
-
-/**
- * __useNewTransferDetailsQuery__
- *
- * To run a query within a React component, call `useNewTransferDetailsQuery` and pass it any options that fit your needs.
- * When your component renders, `useNewTransferDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useNewTransferDetailsQuery({
- *   variables: {
- *      proposalId: // value for 'proposalId'
- *   },
- * });
- */
-export function useNewTransferDetailsQuery(baseOptions: Apollo.QueryHookOptions<NewTransferDetailsQuery, NewTransferDetailsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<NewTransferDetailsQuery, NewTransferDetailsQueryVariables>(NewTransferDetailsDocument, options);
-      }
-export function useNewTransferDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<NewTransferDetailsQuery, NewTransferDetailsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<NewTransferDetailsQuery, NewTransferDetailsQueryVariables>(NewTransferDetailsDocument, options);
-        }
-export type NewTransferDetailsQueryHookResult = ReturnType<typeof useNewTransferDetailsQuery>;
-export type NewTransferDetailsLazyQueryHookResult = ReturnType<typeof useNewTransferDetailsLazyQuery>;
-export type NewTransferDetailsQueryResult = Apollo.QueryResult<NewTransferDetailsQuery, NewTransferDetailsQueryVariables>;
-export const CancelTransferDetailsDocument = gql`
-    query CancelTransferDetails($proposalId: ID!) {
-  proposal(id: $proposalId) {
-    id
-    terms {
-      change {
-        ... on CancelTransfer {
-          ...CancelTransferFields
-        }
-      }
-    }
-  }
-}
-    ${CancelTransferFieldsFragmentDoc}`;
-
-/**
- * __useCancelTransferDetailsQuery__
- *
- * To run a query within a React component, call `useCancelTransferDetailsQuery` and pass it any options that fit your needs.
- * When your component renders, `useCancelTransferDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useCancelTransferDetailsQuery({
- *   variables: {
- *      proposalId: // value for 'proposalId'
- *   },
- * });
- */
-export function useCancelTransferDetailsQuery(baseOptions: Apollo.QueryHookOptions<CancelTransferDetailsQuery, CancelTransferDetailsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<CancelTransferDetailsQuery, CancelTransferDetailsQueryVariables>(CancelTransferDetailsDocument, options);
-      }
-export function useCancelTransferDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<CancelTransferDetailsQuery, CancelTransferDetailsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<CancelTransferDetailsQuery, CancelTransferDetailsQueryVariables>(CancelTransferDetailsDocument, options);
-        }
-export type CancelTransferDetailsQueryHookResult = ReturnType<typeof useCancelTransferDetailsQuery>;
-export type CancelTransferDetailsLazyQueryHookResult = ReturnType<typeof useCancelTransferDetailsLazyQuery>;
-export type CancelTransferDetailsQueryResult = Apollo.QueryResult<CancelTransferDetailsQuery, CancelTransferDetailsQueryVariables>;
+export type InstrumentDetailsQueryResult = Apollo.QueryResult<InstrumentDetailsQuery, InstrumentDetailsQueryVariables>;

libs/proposals/src/lib/proposals-hooks/index.ts

@@ -4,5 +4,3 @@ export * from './use-proposal-submit';
 export * from './use-update-proposal';
 export * from './use-update-network-paramaters-toasts';
 export * from './use-successor-market-proposal-details';
-export * from './use-new-transfer-proposal-details';
-export * from './use-cancel-transfer-proposal-details';

libs/proposals/src/lib/proposals-hooks/use-cancel-transfer-proposal-details.ts

@@ -1,19 +0,0 @@
-import type { CancelTransferFieldsFragment } from '../proposals-data-provider';
-import { useCancelTransferDetailsQuery } from './__generated__/Proposal';
-
-export const useCancelTransferProposalDetails = (
-  proposalId?: string | null
-) => {
-  const { data } = useCancelTransferDetailsQuery({
-    variables: {
-      proposalId: proposalId || '',
-    },
-    skip: !proposalId || proposalId.length === 0,
-  });
-
-  if (data?.proposal?.terms.change.__typename === 'CancelTransfer') {
-    return data?.proposal?.terms.change as CancelTransferFieldsFragment;
-  }
-
-  return undefined;
-};

libs/proposals/src/lib/proposals-hooks/use-new-transfer-proposal-details.ts

@@ -1,17 +0,0 @@
-import type { NewTransferFieldsFragment } from '../proposals-data-provider';
-import { useNewTransferDetailsQuery } from './__generated__/Proposal';
-
-export const useNewTransferProposalDetails = (proposalId?: string | null) => {
-  const { data } = useNewTransferDetailsQuery({
-    variables: {
-      proposalId: proposalId || '',
-    },
-    skip: !proposalId || proposalId.length === 0,
-  });
-
-  if (data?.proposal?.terms.change.__typename === 'NewTransfer') {
-    return data?.proposal?.terms.change as NewTransferFieldsFragment;
-  }
-
-  return undefined;
-};

libs/types/src/global-types-mappings.ts

@@ -1,9 +1,4 @@
-import type {
-  ConditionOperator,
-  GovernanceTransferKind,
-  GovernanceTransferType,
-  PeggedReference,
-} from './__generated__/types';
+import type { ConditionOperator, PeggedReference } from './__generated__/types';
 import type { AccountType } from './__generated__/types';
 import type {
   AuctionTrigger,
@@ -524,34 +519,6 @@ export const DescriptionTransferTypeMapping: TransferTypeMap = {
   TRANSFER_TYPE_SUCCESSOR_INSURANCE_FRACTION: 'Successor insurance fraction',
 };
 
-/**
- * Governance transfers
- */
-type GovernanceTransferTypeMap = {
-  [T in GovernanceTransferType]: string;
-};
-export const GovernanceTransferTypeMapping: GovernanceTransferTypeMap = {
-  GOVERNANCE_TRANSFER_TYPE_ALL_OR_NOTHING: 'All or nothing',
-  GOVERNANCE_TRANSFER_TYPE_BEST_EFFORT: 'Best effort',
-  GOVERNANCE_TRANSFER_TYPE_UNSPECIFIED: 'Unspecified',
-};
-export const DescriptionGovernanceTransferTypeMapping: GovernanceTransferTypeMap =
-  {
-    GOVERNANCE_TRANSFER_TYPE_ALL_OR_NOTHING:
-      'Transfers the specified amount or does not transfer anything',
-    GOVERNANCE_TRANSFER_TYPE_BEST_EFFORT:
-      'Transfers the specified amount or the max allowable amount if this is less than the specified amount',
-    GOVERNANCE_TRANSFER_TYPE_UNSPECIFIED: 'Default value, always invalid',
-  };
-
-type GovernanceTransferKindMap = {
-  [T in NonNullable<GovernanceTransferKind['__typename']>]: string;
-};
-export const GovernanceTransferKindMapping: GovernanceTransferKindMap = {
-  OneOffGovernanceTransfer: 'One off',
-  RecurringGovernanceTransfer: 'Recurring',
-};
-
 type DispatchMetricLabel = {
   [T in DispatchMetric]: string;
 };

libs/wallet/src/connect-dialog/injected-connector-form.tsx

@@ -131,12 +131,7 @@ const Error = ({
   );
 
   if (error) {
-    if (error.message === InjectedConnectorErrors.USER_REJECTED.message) {
-      title = t('User rejected');
-      text = t('The user rejected the wallet connection');
-    } else if (
-      error.message === InjectedConnectorErrors.INVALID_CHAIN.message
-    ) {
+    if (error.message === InjectedConnectorErrors.INVALID_CHAIN.message) {
       title = t('Wrong network');
       text = t(
         'To complete your wallet connection, set your wallet network in your app to "%s".',

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

@@ -42,7 +42,6 @@ declare global {
 }
 
 export const InjectedConnectorErrors = {
-  USER_REJECTED: new Error('Connection denied'),
   VEGA_UNDEFINED: new Error('window.vega not found'),
   INVALID_CHAIN: new Error('Invalid chain'),
 };

package.json

@@ -71,7 +71,7 @@
     "jsondiffpatch": "^0.4.1",
     "lodash": "^4.17.21",
     "next": "13.3.0",
-    "pennant": "1.13.2",
+    "pennant": "1.12.0",
     "react": "18.2.0",
     "react-copy-to-clipboard": "^5.0.4",
     "react-dom": "18.2.0",

yarn.lock

@@ -20500,10 +20500,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.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.13.2.tgz#8ae0cf23ecee35a7e8baddaa9477e94006581e3b"
-  integrity sha512-gdzTUfuvR3Jse247+++mUdJJcDrExtoxljZ6TjVjnvOD7Y0Cx7yiA47VKzztcw5JmoEHbMoDeX3ySznAjIpi7Q==
+pennant@1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.12.0.tgz#e12707d5f1aac554d81bad060637e608335e0b50"
+  integrity sha512-xosg5erRf+Ke9iORdqyv+SOGcD3uJX1dgf990q1DvHuzz36w2txCZsfnvcXhRO++HYVKS9sU/YLPRLJgolFGtA==
   dependencies:
     "@babel/runtime" "^7.13.10"
     "@d3fc/d3fc-technical-indicator" "^8.0.1"