chore(trading): remove view as pubkey banner

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

@@ -196,9 +196,9 @@ jobs:
   cypress:
     needs: [build-sources, check-e2e-needed]
     name: '(CI) cypress'
+    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }}
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
-    if: needs.check-e2e-needed.outputs.run-tests == 'true' && (contains(needs.build-sources.outputs.projects, 'governance') || contains(needs.build-sources.outputs.projects, 'explorer'))
     with:
       projects: ${{ needs.build-sources.outputs.projects-e2e }}
       tags: '@smoke'
@@ -287,7 +287,6 @@ jobs:
     steps:
       - run: |
           result="${{ needs.cypress.result }}"
-          echo "Result: $result"
           if [[ $result == "success" || $result == "skipped" ]]; then
             exit 0
           else

.github/workflows/cypress-live-test.yml

@@ -0,0 +1,36 @@
+name: Cypress Console tests -- live environment
+
+# This workflow runs using provided url
+
+on:
+  workflow_dispatch:
+    inputs:
+      url:
+        description: 'Url'
+        required: true
+        type: string
+
+jobs:
+  cypress-run:
+    name: Run Cypress Trading tests -- live environment
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js 20
+        id: Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Run Cypress tests
+        uses: cypress-io/github-action@v4
+        with:
+          browser: chrome
+          record: true
+          project: ./apps/trading-e2e
+          config: baseUrl=${{ github.event.inputs.url }}
+          env: grepTags=@live
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cypress-manual-trigger.yml

@@ -12,6 +12,7 @@ on:
         options:
           - explorer-e2e
           - governance-e2e
+          - trading-e2e
       tags:
         description: 'Test tags to run'
         required: true

.github/workflows/cypress-nightly.yml

@@ -10,5 +10,5 @@ jobs:
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
     with:
-      projects: '["explorer-e2e","governance-e2e"]'
+      projects: '["explorer-e2e","governance-e2e","trading-e2e"]'
       tags: '@smoke @regression @slow'

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

@@ -7,7 +7,6 @@ import {
   navigateTo,
   navigation,
   turnTelemetryOff,
-  setRiskAccepted,
 } from '../../support/common.functions';
 import {
   clickOnValidatorFromList,
@@ -58,7 +57,6 @@ context(
     // 1002-STKE-002, 1002-STKE-032
     before('visit staking tab and connect vega wallet', function () {
       cy.visit('/');
-      setRiskAccepted();
       ethereumWalletConnect();
       cy.connectVegaWallet();
       vegaWalletSetSpecifiedApprovalAmount('1000');

apps/governance-e2e/src/integration/flow/token-association-flow.cy.ts

@@ -5,7 +5,6 @@ import {
   navigateTo,
   navigation,
   turnTelemetryOff,
-  setRiskAccepted,
 } from '../../support/common.functions';
 import {
   stakingPageAssociateTokens,
@@ -58,7 +57,6 @@ context(
         function () {
           cy.clearLocalStorage();
           turnTelemetryOff();
-          setRiskAccepted();
           cy.mockChainId();
           cy.reload();
           waitForSpinner();

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

@@ -79,23 +79,23 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
       });
     });
 
-    it.skip('should have information on active nodes', function () {
+    it('should have information on active nodes', function () {
       cy.getByTestId('node-information')
         .first()
-        .should('contain.text', '2')
+        .should('contain.text', '1')
         .and('contain.text', 'active nodes');
     });
 
-    it.skip('should have information on consensus nodes', function () {
+    it('should have information on consensus nodes', function () {
       cy.getByTestId('node-information')
         .last()
-        .should('contain.text', '2')
+        .should('contain.text', '1')
         .and('contain.text', 'consensus nodes');
     });
 
-    it.skip('should contain link to specific validators', function () {
+    it('should contain link to specific validators', function () {
       cy.getByTestId('validators')
-        .should('have.length', '2')
+        .should('have.length', '1')
         .each(($validator) => {
           cy.wrap($validator).find('a').should('have.attr', 'href');
         });
@@ -153,7 +153,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
               .invoke('text')
               .should('not.eq', currentBlockHeight);
           });
-        cy.getByTestId('subscription-cell').should('be.be.visible');
+        cy.getByTestId('subscription-cell').should('have.text', 'Yes');
       });
       cy.getByTestId('connect').should('be.disabled');
       cy.getByTestId('node-url-custom').click({ force: true });

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

@@ -3,7 +3,6 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import {
   navigation,
-  setRiskAccepted,
   verifyPageHeader,
   verifyTabHighlighted,
 } from '../../support/common.functions';
@@ -188,7 +187,6 @@ context('Validators Page - verify elements on page', function () {
       before('connect wallets and click on validator', function () {
         cy.mockChainId();
         cy.visit('/validators');
-        setRiskAccepted();
         cy.connectVegaWallet();
         clickOnValidatorFromList(0);
       });

apps/governance-e2e/src/integration/view/wallet-vega.cy.ts

@@ -1,8 +1,5 @@
 import { truncateByChars } from '@vegaprotocol/utils';
-import {
-  setRiskAccepted,
-  waitForSpinner,
-} from '../../support/common.functions';
+import { waitForSpinner } from '../../support/common.functions';
 import {
   vegaWalletFaucetAssetsWithoutCheck,
   vegaWalletTeardown,
@@ -14,6 +11,7 @@ const connectButton = 'connect-vega-wallet';
 const getVegaLink = 'link';
 const dialog = '[role="dialog"]:visible';
 const dialogHeader = 'dialog-title';
+const walletDialogHeader = 'wallet-dialog-title';
 const connectorsList = 'connectors-list';
 const dialogCloseBtn = 'dialog-close';
 const accountNo = 'vega-account-truncated';
@@ -36,7 +34,6 @@ context(
   () => {
     before('visit token home page', () => {
       cy.visit('/');
-      setRiskAccepted();
       cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
     });
 
@@ -66,12 +63,17 @@ context(
 
       it('should have Connect Vega header visible', () => {
         cy.get(dialog).within(() => {
-          cy.getByTestId(connectorsList)
+          cy.getByTestId(walletDialogHeader)
             .should('be.visible')
-            .and(
-              'have.text',
-              'Get the Vega WalletGet MetaMask>_Command Line WalletView as public key'
-            );
+            .and('have.text', 'Get a Vega wallet');
+        });
+      });
+
+      it('should have jsonRpc and hosted connection options visible on list', function () {
+        cy.getByTestId(connectorsList).within(() => {
+          cy.getByTestId('connector-jsonRpc')
+            .should('be.visible')
+            .and('have.text', 'Use the Desktop App/CLI');
         });
       });
 
@@ -86,6 +88,7 @@ context(
       before('connect vega wallet', function () {
         cy.mockChainId();
         cy.visit('/');
+        cy.wait('@ChainId');
         cy.connectVegaWallet();
         vegaWalletTeardown();
       });

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

@@ -102,12 +102,6 @@ export function turnTelemetryOff() {
   );
 }
 
-export function setRiskAccepted() {
-  cy.window().then((win) =>
-    win.localStorage.setItem('vega_wallet_risk_accepted', 'true')
-  );
-}
-
 export function dissociateFromSecondWalletKey() {
   const secondWalletKey = Cypress.env('vegaWalletPublicKey2Short');
   cy.getByTestId('vega-in-wallet')

apps/governance/src/app-loader.tsx

@@ -26,9 +26,9 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
   const { token, staking, vesting } = useContracts();
   const setAssociatedBalances = useRefreshAssociatedBalances();
   const [balancesLoaded, setBalancesLoaded] = React.useState(false);
-  const vegaWalletStatus = useEagerConnect();
+  const vegaConnecting = useEagerConnect();
 
-  const loaded = balancesLoaded && vegaWalletStatus !== 'connecting';
+  const loaded = balancesLoaded && !vegaConnecting;
 
   React.useEffect(() => {
     const run = async () => {
@@ -169,5 +169,3 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
   }
   return <Suspense fallback={loading}>{children}</Suspense>;
 };
-
-AppLoader.displayName = 'AppLoader';

apps/governance/src/components/notifications/rewards-moved-notification.tsx

@@ -1,44 +0,0 @@
-import {
-  useLinks,
-  DApp,
-  CONSOLE_REWARDS_PAGE,
-} from '@vegaprotocol/environment';
-import {
-  ExternalLink,
-  Intent,
-  NotificationBanner,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-import { Trans } from 'react-i18next';
-import { useMatch } from 'react-router-dom';
-import Routes from '../../routes/routes';
-import { type ReactNode } from 'react';
-
-const ConsoleRewardsLink = ({ children }: { children: ReactNode }) => {
-  const consoleLink = useLinks(DApp.Console);
-  return (
-    <ExternalLink
-      href={consoleLink(CONSOLE_REWARDS_PAGE)}
-      className="underline inline-flex gap-1 items-center"
-      title="Rewards in Console"
-    >
-      <span>{children}</span>
-      <VegaIcon size={12} name={VegaIconNames.OPEN_EXTERNAL} />
-    </ExternalLink>
-  );
-};
-
-export const RewardsMovedNotification = () => {
-  const onRewardsPage = useMatch(Routes.REWARDS);
-  if (!onRewardsPage) return null;
-
-  return (
-    <NotificationBanner intent={Intent.Warning}>
-      <Trans
-        i18nKey="rewardsMovedNotification"
-        components={[<ConsoleRewardsLink>Console</ConsoleRewardsLink>]}
-      />
-    </NotificationBanner>
-  );
-};

apps/governance/src/components/page-templates/app-layout.tsx

@@ -10,7 +10,6 @@ import {
   ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
-import { RewardsMovedNotification } from '../notifications/rewards-moved-notification';
 
 interface AppLayoutProps {
   children: ReactNode;
@@ -46,10 +45,8 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
 
 const NotificationsContainer = () => {
   const { isReadOnly, pubKey, disconnect } = useVegaWallet();
-
   return (
     <div data-testid="banners">
-      <RewardsMovedNotification />
       <ProtocolUpgradeProposalNotification
         mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
       />

apps/governance/src/contexts/contracts/contracts-provider.tsx

@@ -111,4 +111,3 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
     </ContractsContext.Provider>
   );
 };
-ContractsProvider.displayName = 'ContractsProvider';

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

@@ -288,7 +288,7 @@ describe('Consensus validators table', () => {
 
     expect(
       grid.querySelector('[role="gridcell"][col-id="totalPenalties"]')
-    ).toHaveTextContent('10.07%');
+    ).toHaveTextContent('13.16%');
 
     expect(
       grid.querySelector('[role="gridcell"][col-id="normalisedVotingPower"]')

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

@@ -185,19 +185,15 @@ export const ConsensusValidatorsTable = ({
           const { rawValidatorScore: previousEpochValidatorScore } =
             getLastEpochScoreAndPerformance(previousEpochData, id);
 
-          const overstakingPenalty = calculateOverstakedPenalty(
+          const overstakingPenalty = calculateOverallPenalty(
             id,
             allNodesInPreviousEpoch
           );
-          const totalPenalty = calculateOverallPenalty(
+          const totalPenalty = calculateOverstakedPenalty(
             id,
             allNodesInPreviousEpoch
           );
 
-          const lastEpochDataForNode = allNodesInPreviousEpoch.find(
-            (node) => node.id === id
-          );
-
           return {
             id,
             [ValidatorFields.RANKING_INDEX]: stakedTotalRanking,
@@ -243,12 +239,6 @@ export const ConsensusValidatorsTable = ({
               : undefined,
             [ValidatorFields.MULTISIG_ERROR]:
               multisigStatus?.showMultisigStatusError,
-            [ValidatorFields.MULTISIG_PENALTY]: formatNumberPercentage(
-              new BigNumber(1)
-                .minus(lastEpochDataForNode?.rewardScore?.multisigScore ?? 1)
-                .times(100),
-              2
-            ),
           };
         }
       );
@@ -388,6 +378,7 @@ export const ConsensusValidatorsTable = ({
           headerTooltip: t('StakeDescription').toString(),
           cellRenderer: TotalStakeRenderer,
           width: 120,
+          sort: 'desc',
         },
         {
           field: ValidatorFields.PENDING_STAKE,
@@ -409,7 +400,6 @@ export const ConsensusValidatorsTable = ({
           headerTooltip: t('NormalisedVotingPowerDescription').toString(),
           cellRenderer: VotingPowerRenderer,
           width: 120,
-          sort: 'desc',
         },
         {
           field: ValidatorFields.TOTAL_PENALTIES,

apps/governance/src/routes/staking/home/validator-tables/shared.tsx

@@ -40,7 +40,6 @@ export enum ValidatorFields {
   PENDING_USER_STAKE = 'pendingUserStake',
   USER_STAKE_SHARE = 'userStakeShare',
   MULTISIG_ERROR = 'multisigError',
-  MULTISIG_PENALTY = 'multisigPenalty',
 }
 
 export const addUserDataToValidator = (
@@ -328,7 +327,7 @@ interface TotalPenaltiesRendererProps {
     overstakedAmount: string;
     overstakingPenalty: string;
     totalPenalties: string;
-    multisigPenalty: string;
+    multisigError?: boolean;
   };
 }
 
@@ -347,9 +346,11 @@ export const TotalPenaltiesRenderer = ({
           <div data-testid="overstaked-penalty-tooltip">
             {t('overstakedPenalty')}: {data.overstakingPenalty}
           </div>
-          <div data-testid="multisig-error-tooltip">
-            {t('multisigPenalty')}: {data.multisigPenalty}
-          </div>
+          {data.multisigError && (
+            <div data-testid="multisig-error-tooltip">
+              {t('multisigPenalty')}: 100%
+            </div>
+          )}
         </>
       }
     >

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

@@ -37,6 +37,7 @@ import {
 import type { ReactNode } from 'react';
 import type { StakingNodeFieldsFragment } from '../__generated__/Staking';
 import type { PreviousEpochQuery } from '../__generated__/PreviousEpoch';
+import { getMultisigStatusInfo } from '../../../lib/get-multisig-status-info';
 
 const statuses = {
   [Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_ERSATZ]: 'status-ersatz',
@@ -104,10 +105,9 @@ export const ValidatorTable = ({
     };
   }, [node, previousEpochData?.epoch.validatorsConnection?.edges]);
 
-  const previousNodeData =
-    previousEpochData?.epoch.validatorsConnection?.edges?.find(
-      (e) => e?.node.id === node.id
-    );
+  const multisigStatus = previousEpochData
+    ? getMultisigStatusInfo(previousEpochData)
+    : undefined;
 
   return (
     <>
@@ -293,15 +293,21 @@ export const ValidatorTable = ({
                   data-testid="multisig-penalty"
                   className="flex gap-2 items-baseline"
                 >
+                  {multisigStatus?.zeroScoreNodes.find(
+                    (n) => n.id === node.id
+                  ) ? (
+                    <Tooltip
+                      description={t('multisigPenaltyThisNodeIndicator')}
+                    >
+                      <span className="inline-block w-2 h-2 rounded-full bg-vega-red-500"></span>
+                    </Tooltip>
+                  ) : null}
                   <Tooltip description={t('multisigPenaltyDescription')}>
                     <span>
                       {formatNumberPercentage(
-                        new BigNumber(1)
-                          .minus(
-                            previousNodeData?.node.rewardScore?.multisigScore ??
-                              1
-                          )
-                          .times(100),
+                        BigNumber(
+                          multisigStatus?.showMultisigStatusError ? 100 : 0
+                        ),
                         2
                       )}
                     </span>

apps/trading-e2e/.env

@@ -0,0 +1,41 @@
+NX_ETHEREUM_PROVIDER_URL=http://localhost:8545
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=''
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_VEGA_ENV=CUSTOM
+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
+NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
+NX_VEGA_URL=http://localhost:3008/graphql
+NX_VEGA_WALLET_URL=http://localhost:1789
+NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
+NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+NX_SENTRY_DSN=https://dummy@o999999.ingest.sentry.io/9999999
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+
+
+# Expose some env vars to cypress environment for market setup
+CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
+CYPRESS_ETHEREUM_WALLET_ADDRESS=0xEe7D375bcB50C26d52E1A4a472D8822A2A22d94F
+CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
+CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
+CYPRESS_CONSOLE_URL=https://console.fairground.wtf
+CYPRESS_FAUCET_URL=http://localhost:1790/api/v1/mint
+CYPRESS_ORACLE_PUBKEY=6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61
+CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY=02ecea…342f65
+CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=7f9cf0…c25535
+CYPRESS_VEGA_ENV=CUSTOM
+CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
+CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
+CYPRESS_VEGA_TOKEN_URL=https://governance.fairground.wtf
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
+CYPRESS_VEGA_WALLET_URL=http://localhost:1789
+CYPRESS_VEGA_WALLET_API_TOKEN=
+
+# Cosmic elevator flags (MUST be doubled with CYPRESS_ prefix)
+NX_SUCCESSOR_MARKETS=true
+CYPRESS_NX_SUCCESSOR_MARKETS=true

apps/trading-e2e/.env.capsule

@@ -0,0 +1,33 @@
+NX_ETHEREUM_PROVIDER_URL=http://localhost:8545
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=''
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_VEGA_ENV=CUSTOM
+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
+NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
+NX_VEGA_URL=http://localhost:3008/graphql
+NX_VEGA_WALLET_URL=http://localhost:1789
+NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
+NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+
+
+# Expose some env vars to cypress environment for market setup
+CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
+CYPRESS_ETHEREUM_WALLET_ADDRESS=0xEe7D375bcB50C26d52E1A4a472D8822A2A22d94F
+CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
+CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
+CYPRESS_CONSOLE_URL=https://console.fairground.wtf
+CYPRESS_FAUCET_URL=http://localhost:1790/api/v1/mint
+CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY=02ecea…342f65
+CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=7f9cf0…c25535
+CYPRESS_VEGA_ENV=CUSTOM
+CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
+CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
+CYPRESS_VEGA_TOKEN_URL=https://governance.fairground.wtf
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
+CYPRESS_VEGA_WALLET_URL=http://localhost:1789
+CYPRESS_VEGA_WALLET_API_TOKEN=

apps/trading-e2e/.eslintrc.json

@@ -0,0 +1,19 @@
+{
+  "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {
+        "cypress/unsafe-to-chain-command": 0
+      }
+    },
+    {
+      "files": ["src/plugins/index.js"],
+      "rules": {
+        "@typescript-eslint/no-var-requires": "off",
+        "no-undef": "off"
+      }
+    }
+  ]
+}

apps/trading-e2e/cypress.config.js

@@ -0,0 +1,41 @@
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  reporter: '../../node_modules/cypress-mochawesome-reporter',
+  e2e: {
+    setupNodeEvents(on, config) {
+      require('cypress-mochawesome-reporter/plugin')(on);
+      require('@cypress/grep/src/plugin')(config);
+      return config;
+    },
+    baseUrl: 'http://localhost:4200',
+    fileServerFolder: '.',
+    fixturesFolder: false,
+    specPattern: '**/*.cy.{js,jsx,ts,tsx}',
+    supportFile: './src/support/index.js',
+    video: false,
+    videosFolder: '../../dist/cypress/apps/trading-e2e/videos',
+    videoUploadOnPasses: false,
+    screenshotsFolder: '../../dist/cypress/apps/trading-e2e/screenshots',
+    chromeWebSecurity: false,
+    projectId: 'et4snf',
+    defaultCommandTimeout: 10000,
+    viewportWidth: 1800,
+    viewportHeight: 900,
+    responseTimeout: 50000,
+    requestTimeout: 20000,
+    retries: 1,
+    testIsolation: false,
+    experimentalMemoryManagement: true,
+  },
+  env: {
+    ETHERSCAN_URL: 'https://sepolia.etherscan.io',
+    ETHEREUM_CHAIN_ID: 11155111,
+    TRADING_MODE_LINK:
+      'https://docs.vega.xyz/testnet/concepts/trading-on-vega/trading-modes#auction-type-liquidity-monitoring',
+    grepTags: '@regression @smoke @slow',
+    grepFilterSpecs: true,
+    grepOmitFiltered: true,
+    txTimeout: { timeout: 70000 },
+  },
+});

apps/trading-e2e/declaration.d.ts

@@ -0,0 +1 @@
+declare module '*.scss';

apps/trading-e2e/project.json

@@ -0,0 +1,39 @@
+{
+  "name": "trading-e2e",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "apps/trading-e2e/src",
+  "projectType": "application",
+  "targets": {
+    "e2e": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/trading-e2e/cypress.config.js",
+        "devServerTarget": "trading:serve"
+      },
+      "configurations": {
+        "production": {
+          "devServerTarget": "trading:serve:production"
+        },
+        "live": {
+          "devServerTarget": ""
+        }
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/trading-e2e/**/*.{js,ts}"]
+      }
+    },
+    "build": {
+      "executor": "nx:run-commands",
+      "outputs": [],
+      "options": {
+        "command": "yarn tsc --project ./apps/trading-e2e/"
+      }
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["trading"]
+}

apps/trading-e2e/src/index.d.ts

@@ -0,0 +1,20 @@
+/// <reference types="cypress" />
+
+declare namespace Cypress {
+  // specify additional properties in the TestConfig object
+  // in our case we will add "tags" property
+  interface SuiteConfigOverrides {
+    /**
+     * List of tags for this test
+     * @example a single tag
+     *  it('logs in', { tags: '@smoke' }, () => { ... })
+     * @example multiple tags
+     *  it('works', { tags: ['@smoke', '@slow'] }, () => { ... })
+     */
+    tags?: string | string[];
+  }
+
+  interface Cypress {
+    grep?: (grep?: string, tags?: string, burn?: string) => void;
+  }
+}

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

@@ -0,0 +1,337 @@
+import { connectEthereumWallet } from '../support/ethereum-wallet';
+import { selectAsset } from '../support/helpers';
+
+const amountField = 'input[name="amount"]';
+const txTimeout = Cypress.env('txTimeout');
+const sepoliaUrl = Cypress.env('ETHERSCAN_URL');
+const btcName = 0;
+const vegaName = 4;
+const btcSymbol = 'tBTC';
+const vegaSymbol = 'VEGA';
+const toastContent = 'toast-content';
+const depositsTab = 'Deposits';
+const toastCloseBtn = 'toast-close';
+const completeWithdrawalBtn = 'complete-withdrawal';
+const depositSubmit = 'deposit-submit';
+const approveSubmit = 'approve-submit';
+const dialogContent = 'dialog-content';
+
+// Because the tests are run on a live network to optimize time, the tests are interdependent and must be run in the given order.
+describe('capsule - without MultiSign', { tags: '@slow' }, () => {
+  before(() => {
+    cy.createMarket();
+    cy.get('@markets').then((markets) => {
+      cy.wrap(markets[0]).as('market');
+    });
+    cy.setOnBoardingViewed();
+    cy.visit('/#/portfolio');
+  });
+
+  it('can deposit', function () {
+    cy.visit('/#/portfolio');
+    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
+
+    // 1001-DEPO-001
+    // 1001-DEPO-002
+    // 1001-DEPO-003
+    // 1001-DEPO-005
+    // 1001-DEPO-006
+    // 1001-DEPO-007
+    // 1001-DEPO-008
+    // 1001-DEPO-009
+    // 1001-DEPO-010
+
+    cy.getByTestId(depositsTab).click();
+    cy.getByTestId('deposit-button').click();
+    connectEthereumWallet('Unknown');
+    selectAsset(btcName);
+    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
+
+    cy.getByTestId('approve-default').should(
+      'contain.text',
+      `Before you can make a deposit of your chosen asset, ${btcSymbol}, you need to approve its use in your Ethereum wallet`
+    );
+    cy.getByTestId(approveSubmit).click();
+    cy.getByTestId('approve-pending').should('exist');
+    cy.getByTestId('approve-confirmed').should('exist');
+    cy.get(amountField).focus();
+    cy.get(amountField).clear().type('10');
+    cy.getByTestId(depositSubmit).click();
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      `Transaction confirmedYour transaction has been confirmed.View on EtherscanDeposit 10.00 ${btcSymbol}`,
+      { matchCase: false }
+    );
+    cy.getByTestId(toastCloseBtn).click();
+    cy.getByTestId('Collateral').click();
+
+    cy.highlight('deposit verification');
+
+    cy.get('[col-id="asset.symbol"]', txTimeout).should(
+      'contain.text',
+      btcSymbol
+    );
+    cy.getByTestId(depositsTab).click();
+    cy.get('.ag-cell-value', txTimeout).should('contain.text', btcSymbol);
+    cy.get('[col-id="status"]').should('not.have.text', 'Open', txTimeout);
+
+    cy.get('[col-id="txHash"]')
+      .should('have.length.above', 2)
+      .eq(1)
+      .parent()
+      .within(() => {
+        cy.get('[col-id="asset.symbol"]').should('have.text', btcSymbol);
+        cy.get('[col-id="amount"]').should('have.text', '10.00');
+        cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
+        cy.get('[col-id="status"]').should('have.text', 'Finalized');
+        cy.get('[col-id="txHash"]')
+          .find('a')
+          .should('have.attr', 'href')
+          .and('contain', `${sepoliaUrl}/tx/0x`);
+      });
+  });
+
+  it('can not withdrawal because of no MultiSign', function () {
+    // 1002-WITH-022
+    // 1002-WITH-023
+    // 0003-WTXN-011
+    cy.getByTestId('Withdrawals').click();
+    cy.getByTestId('withdraw-dialog-button').click();
+    selectAsset(btcName);
+    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
+    cy.get(amountField).focus();
+    cy.get(amountField).clear().type('1');
+    cy.getByTestId('submit-withdrawal').click();
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      'Funds unlocked'
+    );
+    // cy.getByTestId(toastCloseBtn).click();
+    cy.highlight('withdrawals verification');
+    cy.getByTestId('toast-complete-withdrawal').last().click();
+
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      'Error occurredcannot estimate gas'
+    );
+    cy.getByTestId(completeWithdrawalBtn).should(
+      'contain.text',
+      'Complete withdrawal'
+    );
+  });
+});
+
+describe('capsule', { tags: '@slow', testIsolation: true }, () => {
+  before(() => {
+    cy.updateCapsuleMultiSig();
+  });
+
+  beforeEach(() => {
+    cy.createMarket();
+    cy.get('@markets').then((markets) => {
+      cy.wrap(markets[0]).as('market');
+    });
+    cy.setOnBoardingViewed();
+    cy.setVegaWallet();
+  });
+
+  it('can withdrawal', function () {
+    // 1002-WITH-0014
+    // 1002-WITH-006
+    // 1002-WITH-009
+    // 1002-WITH-011
+    // 1002-WITH-024
+    // 1002-WITH-012
+    // 1002-WITH-013
+    // 1002-WITH-014
+    // 1002-WITH-015
+    // 1002-WITH-016
+    // 1002-WITH-017
+    // 1002-WITH-019
+    // 1002-WITH-020
+    // 1002-WITH-021
+    const ethWalletAddress = Cypress.env('ETHEREUM_WALLET_ADDRESS');
+
+    cy.visit('/#/portfolio');
+    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
+    cy.getByTestId(toastCloseBtn, txTimeout).click();
+    cy.getByTestId('Withdrawals').click();
+    cy.getByTestId('withdraw-dialog-button').click();
+    connectEthereumWallet('Unknown');
+    selectAsset(btcName);
+    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
+    cy.get(amountField).clear().type('1');
+    cy.getByTestId('submit-withdrawal').click();
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      'Funds unlocked'
+    );
+
+    cy.highlight('withdrawals verification');
+    cy.getByTestId('toast-complete-withdrawal').click();
+
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      'Transaction confirmed'
+    );
+    cy.getByTestId(toastContent, txTimeout)
+      .should('contain.text', 'Funds unlocked')
+      .and('contain.text', 'Your funds have been unlocked for withdrawal.')
+      .and(
+        'contain.text',
+        'View in block explorerYou can save your withdrawal details for extra security.'
+      )
+      .and('contain.text', 'Withdraw 1.00 tBTCComplete withdrawal');
+    cy.getByTestId('toast-withdrawal-details').click();
+    cy.getByTestId(dialogContent)
+      .last()
+      .within(() => {
+        cy.getByTestId('dialog-title').should(
+          'contain.text',
+          'Save withdrawal details'
+        );
+        cy.getByTestId('copy-button').should('be.visible');
+        cy.getByTestId('assetSource_value').should(
+          'have.text',
+          '0xb63D135B0a6854EEb765d69ca36210cC70BECAE0'
+        );
+        cy.getByTestId('amount_value').should('have.text', '100000');
+        cy.getByTestId('nonce_value').invoke('text').should('not.be.empty');
+        cy.getByTestId('signatures_value')
+          .invoke('text')
+          .should('not.be.empty');
+        cy.getByTestId('targetAddress_value').should(
+          'have.text',
+          ethWalletAddress
+        );
+        cy.getByTestId('creation_value').invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId('close-withdrawal-approval-dialog').click();
+
+    cy.get('.ag-center-cols-container')
+      .find('[col-id="status"]')
+      .eq(0, txTimeout)
+      .should('contain.text', 'Completed');
+
+    cy.get('[col-id="txHash"]', txTimeout)
+      .should('have.length.above', 1)
+      .eq(1)
+      .parent()
+      .within(() => {
+        cy.get('[col-id="asset.symbol"]').should('have.text', btcSymbol);
+        cy.get('[col-id="amount"]').should('have.text', '1.00');
+        cy.get('[col-id="details.receiverAddress"]')
+          .find('a')
+          .should('have.attr', 'href')
+          .and('contain', `${sepoliaUrl}/address/`);
+        cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
+        cy.get('[col-id="withdrawnTimestamp"]').should('not.be.empty');
+        cy.get('[col-id="status"]').should('have.text', 'Completed');
+        cy.get('[col-id="txHash"]')
+          .find('a')
+          .should('have.attr', 'href')
+          .and('contain', `${sepoliaUrl}/tx/0x`);
+      });
+
+    cy.getByTestId('withdraw-dialog-button').click({ force: true });
+    // cy.getByTestId('BALANCE_AVAILABLE_value').should('have.text', '6.999');
+  });
+
+  it('approved amount is less than deposit', function () {
+    // 1001-DEPO-006
+    // 1001-DEPO-007
+    cy.visit('/#/portfolio');
+    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
+    cy.getByTestId(toastCloseBtn, txTimeout).click();
+    cy.getByTestId(depositsTab).click();
+    cy.getByTestId('deposit-button').click();
+    connectEthereumWallet('Unknown');
+    selectAsset(btcName);
+    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
+    cy.contains('Deposits of tBTC not approved').should('not.exist');
+    cy.contains('Use maximum').should('be.visible');
+    cy.get(amountField).clear().type('20000000');
+    cy.getByTestId(depositSubmit).should('be.visible');
+    cy.getByTestId(depositSubmit).click();
+    cy.getByTestId('input-error-text').should(
+      'contain.text',
+      `You can't deposit more than you have in your Ethereum wallet`
+    );
+  });
+
+  it('withdraw - delay verification', function () {
+    // 1001-DEPO-024
+    // 1002-WITH-007
+
+    cy.visit('/#/portfolio');
+    cy.get('[data-testid="pathname-/portfolio"]', txTimeout).should('exist');
+    cy.getByTestId(toastCloseBtn, txTimeout).click();
+    cy.getByTestId(depositsTab).click();
+    cy.getByTestId('deposit-button').click();
+    connectEthereumWallet('Unknown');
+    selectAsset(vegaName);
+    cy.getByTestId('approve-submit').click();
+    cy.getByTestId('approve-confirmed').should(
+      'contain.text',
+      'You approved deposits of up to VEGA'
+    );
+    cy.get(amountField).clear().type('10000');
+    cy.getByTestId('deposit-submit').click();
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      `Your transaction has been confirmed.`,
+      { matchCase: false }
+    );
+    cy.getByTestId(toastCloseBtn).click({ multiple: true });
+    cy.getByTestId('Collateral').click();
+
+    cy.highlight('deposit verification');
+
+    cy.get('[col-id="asset.symbol"]', txTimeout).should(
+      'contain.text',
+      vegaSymbol
+    );
+    cy.getByTestId(depositsTab).click();
+    cy.get('.ag-cell-value', txTimeout).should('contain.text', vegaSymbol);
+    cy.get('[col-id="status"]').should('not.have.text', 'Open', txTimeout);
+
+    cy.get('[col-id="txHash"]')
+      .should('have.length.above', 2)
+      .eq(1)
+      .parent()
+      .within(() => {
+        cy.get('[col-id="asset.symbol"]').should('have.text', vegaSymbol);
+        cy.get('[col-id="amount"]').should('have.text', '10,000.00');
+        cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
+        cy.get('[col-id="status"]').should('have.text', 'Finalized');
+        cy.get('[col-id="txHash"]')
+          .find('a')
+          .should('have.attr', 'href')
+          .and('contain', `${sepoliaUrl}/tx/0x`);
+      });
+
+    cy.getByTestId('Withdrawals').click(txTimeout);
+    cy.getByTestId('withdraw-dialog-button').click();
+    selectAsset(1);
+    cy.get(amountField).clear().type('10000');
+    cy.getByTestId('DELAY_TIME_value').should('have.text', '5 days');
+    cy.getByTestId('submit-withdrawal').click();
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      'Your funds have been unlocked'
+    );
+    cy.getByTestId(toastCloseBtn).click();
+    cy.getByTestId(completeWithdrawalBtn).first().should('be.visible').click();
+    cy.getByTestId(toastContent, txTimeout).should('contain.text', 'Delayed');
+    cy.getByTestId('tab-withdrawals').within(() => {
+      cy.get('.ag-center-cols-container')
+        .children()
+        .first()
+        .within(() => {
+          cy.get('[col-id="status"]').contains(
+            /Delayed \(ready in (\d{1,2}:\d{2}:\d{2}:\d{2})\)/
+          );
+        });
+    });
+  });
+});

apps/trading-e2e/src/integration/wallet-eth.cy.ts

@@ -0,0 +1,43 @@
+import { connectEthereumWallet } from '../support/ethereum-wallet';
+
+const connectEthWalletBtn = 'connect-eth-wallet-btn';
+
+describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
+  beforeEach(() => {
+    cy.mockWeb3Provider();
+    // Using portfolio withdrawals tab is it requires Ethereum wallet connection
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setVegaWallet();
+    cy.visit('/#/portfolio');
+    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
+    cy.getByTestId('Withdrawals').click();
+  });
+
+  it('can connect', () => {
+    // 0004-EWAL-001
+
+    cy.getByTestId('Deposits').click();
+    cy.getByTestId('deposit-button').click();
+    cy.getByTestId('connect-eth-wallet-btn').click();
+    cy.getByTestId('web3-connector-list').should('exist');
+    cy.getByTestId('web3-connector-MetaMask').click();
+    cy.getByTestId('web3-connector-list').should('not.exist');
+    cy.getByTestId('tab-deposits').should('not.be.empty');
+  });
+
+  it('able to disconnect eth wallet', () => {
+    // 0004-EWAL-004
+    // 0004-EWAL-005
+    // 0004-EWAL-006
+
+    cy.getByTestId('Deposits').click();
+    cy.getByTestId('deposit-button').click();
+    connectEthereumWallet('MetaMask');
+    cy.getByTestId('ethereum-address').should('have.text', '0xEe7D…d94F');
+    cy.getByTestId('disconnect-ethereum-wallet')
+      .should('have.text', 'Disconnect')
+      .click();
+    cy.getByTestId(connectEthWalletBtn).should('exist');
+  });
+});

apps/trading-e2e/src/support/create-order.ts

@@ -0,0 +1,29 @@
+import { OrderType } from '@vegaprotocol/types';
+import type { OrderSubmission } from '@vegaprotocol/wallet';
+
+const orderSizeField = 'order-size';
+const orderPriceField = 'order-price';
+const orderTIFDropDown = 'order-tif';
+const placeOrderBtn = 'place-order';
+
+export const createOrder = (order: OrderSubmission): void => {
+  cy.log('Placing order', order);
+  const { type, side, size, price, timeInForce, expiresAt } = order;
+
+  cy.getByTestId(
+    `order-type-${type === OrderType.TYPE_LIMIT ? 'Limit' : 'Market'}`
+  ).click();
+  cy.getByTestId(`order-side-${side}`).click();
+  cy.getByTestId(orderSizeField).clear().type(size);
+  if (price) {
+    cy.getByTestId(orderPriceField).clear().type(price);
+  }
+  cy.getByTestId(orderTIFDropDown).select(timeInForce);
+  if (timeInForce === 'TIME_IN_FORCE_GTT') {
+    if (!expiresAt) {
+      throw new Error('Specify expiresAt if using GTT');
+    }
+    cy.getByTestId('date-picker-field').type(expiresAt);
+  }
+  cy.getByTestId(placeOrderBtn).click();
+};

apps/trading-e2e/src/support/deal-ticket.ts

@@ -0,0 +1,18 @@
+import * as Schema from '@vegaprotocol/types';
+
+export const orderSizeField = 'order-size';
+export const orderPriceField = 'order-price';
+export const orderTIFDropDown = 'order-tif';
+export const placeOrderBtn = 'place-order';
+export const toggleShort = 'order-side-SIDE_SELL';
+export const toggleLong = 'order-side-SIDE_BUY';
+export const toggleLimit = 'order-type-Limit';
+export const toggleMarket = 'order-type-Market';
+
+export const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
+  return {
+    code: Schema.OrderTimeInForceCode[value],
+    value,
+    text: Schema.OrderTimeInForceMapping[value],
+  };
+});

apps/trading-e2e/src/support/ethereum-wallet.ts

@@ -0,0 +1,5 @@
+export const connectEthereumWallet = (connectorName: string) => {
+  cy.getByTestId('connect-eth-wallet-btn').should('be.enabled').click();
+  cy.getByTestId('web3-connector-list').should('be.visible');
+  cy.getByTestId(`web3-connector-${connectorName}`).click();
+};

apps/trading-e2e/src/support/helpers.ts

@@ -0,0 +1,11 @@
+export const selectAsset = (assetIndex: number) => {
+  cy.log(`selecting asset: ${assetIndex}`);
+  cy.getByTestId('select-asset').click();
+  cy.get('[data-testid="rich-select-option"]').eq(assetIndex).click();
+
+  // The asset only gets set once the queries (getWithdrawThreshold, getDelay)
+  // against the Ethereum change resolve, we should fix this but for now just force
+  // some wait time
+  // eslint-disable-next-line
+  cy.wait(100);
+};

apps/trading-e2e/src/support/index.js

@@ -0,0 +1,8 @@
+import '@vegaprotocol/cypress';
+import 'cypress-real-events/support';
+import registerCypressGrep from '@cypress/grep';
+import { addMockTradingPage } from './trading';
+import 'cypress-mochawesome-reporter/register';
+
+registerCypressGrep();
+addMockTradingPage();

apps/trading-e2e/src/support/order-update-subscription.ts

@@ -0,0 +1,36 @@
+import type {
+  OrdersUpdateSubscription,
+  OrdersUpdateSubscriptionVariables,
+  OrderUpdateFieldsFragment,
+} from '@vegaprotocol/orders';
+import type { onMessage } from '@vegaprotocol/cypress';
+import type { PartialDeep } from 'type-fest';
+import { orderUpdateSubscription } from '@vegaprotocol/mock';
+
+const sendOrderUpdate: ((data: OrdersUpdateSubscription) => void)[] = [];
+const getOnOrderUpdate = () => {
+  const onOrderUpdate: onMessage<
+    OrdersUpdateSubscription,
+    OrdersUpdateSubscriptionVariables
+  > = (send) => {
+    sendOrderUpdate.push(send);
+  };
+  return onOrderUpdate;
+};
+
+export const getSubscriptionMocks = () => ({
+  OrdersUpdate: getOnOrderUpdate(),
+});
+
+export function updateOrder(
+  override?: PartialDeep<OrderUpdateFieldsFragment>
+): void {
+  const update: OrdersUpdateSubscription = orderUpdateSubscription({
+    // @ts-ignore partial deep check failing
+    orders: [override],
+  });
+  if (!sendOrderUpdate) {
+    throw new Error('OrderSub not called');
+  }
+  sendOrderUpdate.forEach((send) => send(update));
+}

apps/trading-e2e/src/support/order-validation.ts

@@ -0,0 +1,81 @@
+import type {
+  OrderAmendment,
+  OrderAmendmentBody,
+  OrderCancellation,
+  OrderCancellationBody,
+  OrderSubmission,
+  OrderSubmissionBody,
+  Transaction,
+} from '@vegaprotocol/wallet';
+
+export const testOrderSubmission = (
+  order: OrderSubmission,
+  expected?: Partial<OrderSubmission>
+) => {
+  const expectedOrder = {
+    ...order,
+    ...expected,
+  };
+
+  const transaction: OrderSubmissionBody = {
+    orderSubmission: expectedOrder,
+  };
+  vegaWalletTransaction(transaction);
+  verifyToast();
+};
+
+export const testOrderAmendment = (
+  order: OrderAmendment,
+  expected?: Partial<OrderAmendment>
+) => {
+  const expectedOrder = {
+    ...order,
+    ...expected,
+  };
+
+  const transaction: OrderAmendmentBody = {
+    orderAmendment: expectedOrder,
+  };
+  vegaWalletTransaction(transaction);
+  verifyToast();
+};
+
+export const testOrderCancellation = (
+  order: OrderCancellation,
+  expected?: Partial<OrderCancellation>
+) => {
+  const expectedOrder = {
+    ...order,
+    ...expected,
+  };
+
+  const transaction: OrderCancellationBody = {
+    orderCancellation: expectedOrder,
+  };
+  vegaWalletTransaction(transaction);
+  verifyToast();
+};
+
+const vegaWalletTransaction = (transaction: Transaction) => {
+  cy.wait('@VegaWalletTransaction')
+    .its('request')
+    .then((req) => {
+      expect(req.body.params).to.deep.equal({
+        publicKey: Cypress.env('VEGA_PUBLIC_KEY'),
+        sendingMode: 'TYPE_SYNC',
+        transaction,
+      });
+      expect(req.headers.authorization).to.equal(
+        `VWT ${Cypress.env('VEGA_WALLET_API_TOKEN')}`
+      );
+    });
+};
+
+const verifyToast = () => {
+  cy.getByTestId('toast').should('contain.text', 'Awaiting confirmation');
+  cy.getByTestId('toast')
+    .find('a')
+    .invoke('attr', 'href')
+    .should('include', `${Cypress.env('EXPLORER_URL')}/txs/test-tx-hash`);
+  cy.getByTestId('toast-close').click();
+};

apps/trading-e2e/src/support/trading.ts

@@ -0,0 +1,252 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import * as Schema from '@vegaprotocol/types';
+import type { CyHttpMessages } from 'cypress/types/net-stubbing';
+import type { Provider, Status } from '@vegaprotocol/markets';
+import {
+  accountsQuery,
+  assetQuery,
+  assetsQuery,
+  candlesQuery,
+  chartQuery,
+  depositsQuery,
+  estimateFeesQuery,
+  marginsQuery,
+  marketCandlesQuery,
+  marketDataQuery,
+  marketDepthQuery,
+  marketInfoQuery,
+  marketsCandlesQuery,
+  marketsDataQuery,
+  marketsQuery,
+  networkParamsQuery,
+  nodeGuardQuery,
+  ordersQuery,
+  estimatePositionQuery,
+  positionsQuery,
+  proposalListQuery,
+  tradesQuery,
+  withdrawalsQuery,
+  protocolUpgradeProposalsQuery,
+  blockStatisticsQuery,
+  networkParamQuery,
+  liquidityProvisionsQuery,
+  successorMarketQuery,
+  parentMarketIdQuery,
+  successorMarketIdsQuery,
+  successorMarketProposalDetailsQuery,
+  liquidityProvidersQuery,
+} from '@vegaprotocol/mock';
+import type { PartialDeep } from 'type-fest';
+import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
+
+type MarketPageMockData = {
+  state: Schema.MarketState;
+  tradingMode?: Schema.MarketTradingMode;
+  trigger?: Schema.AuctionTrigger;
+};
+
+const ORACLE_PUBKEY = Cypress.env('ORACLE_PUBKEY');
+
+const marketDataOverride = (
+  data: MarketPageMockData
+): PartialDeep<MarketDataQuery> => ({
+  marketsConnection: {
+    edges: [
+      {
+        node: {
+          data: {
+            // @ts-ignore conflict between incoming and outgoing types
+            trigger: data.trigger,
+            // @ts-ignore same as above
+            marketTradingMode: data.tradingMode,
+            marketState: data.state,
+          },
+        },
+      },
+    ],
+  },
+});
+
+const marketsDataOverride = (
+  data: MarketPageMockData
+): PartialDeep<MarketsQuery> => ({
+  marketsConnection: {
+    edges: [
+      {
+        node: {
+          // @ts-ignore conflict between incoming and outgoing types
+          tradingMode: data.tradingMode,
+          state: data.state,
+        },
+      },
+    ],
+  },
+});
+
+const mockTradingPage = (
+  req: CyHttpMessages.IncomingHttpRequest,
+  state: Schema.MarketState = Schema.MarketState.STATE_ACTIVE,
+  tradingMode?: Schema.MarketTradingMode,
+  trigger?: Schema.AuctionTrigger
+) => {
+  aliasGQLQuery(req, 'NodeGuard', nodeGuardQuery());
+  aliasGQLQuery(
+    req,
+    'Markets',
+    marketsQuery(marketsDataOverride({ state, tradingMode, trigger }))
+  );
+  aliasGQLQuery(
+    req,
+    'MarketData',
+    marketDataQuery(marketDataOverride({ state, tradingMode, trigger }))
+  );
+  aliasGQLQuery(req, 'MarketsData', marketsDataQuery());
+  aliasGQLQuery(req, 'MarketsCandles', marketsCandlesQuery());
+  aliasGQLQuery(req, 'MarketCandles', marketCandlesQuery());
+  aliasGQLQuery(req, 'MarketDepth', marketDepthQuery());
+  aliasGQLQuery(req, 'Orders', ordersQuery());
+  aliasGQLQuery(req, 'Accounts', accountsQuery());
+  aliasGQLQuery(req, 'Positions', positionsQuery());
+  aliasGQLQuery(req, 'Margins', marginsQuery());
+  aliasGQLQuery(req, 'Assets', assetsQuery());
+  aliasGQLQuery(req, 'Asset', assetQuery());
+  aliasGQLQuery(
+    req,
+    'MarketInfo',
+    marketInfoQuery({
+      market: {
+        tradableInstrument: {
+          instrument: {
+            product: {
+              __typename: 'Future',
+              dataSourceSpecForSettlementData: {
+                data: {
+                  sourceType: {
+                    sourceType: {
+                      signers: [
+                        {
+                          __typename: 'Signer',
+                          signer: {
+                            __typename: 'PubKey',
+                            key: ORACLE_PUBKEY,
+                          },
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+              dataSourceSpecForTradingTermination: {
+                data: {
+                  sourceType: {
+                    sourceType: {
+                      signers: [
+                        {
+                          __typename: 'Signer',
+                          signer: {
+                            __typename: 'PubKey',
+                            key: ORACLE_PUBKEY,
+                          },
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    })
+  );
+  aliasGQLQuery(req, 'Trades', tradesQuery());
+  aliasGQLQuery(req, 'Chart', chartQuery());
+  aliasGQLQuery(req, 'LiquidityProvisions', liquidityProvisionsQuery());
+  aliasGQLQuery(req, 'LiquidityProviders', liquidityProvidersQuery());
+  aliasGQLQuery(req, 'Candles', candlesQuery());
+  aliasGQLQuery(req, 'Withdrawals', withdrawalsQuery());
+  aliasGQLQuery(req, 'NetworkParams', networkParamsQuery());
+  aliasGQLQuery(req, 'NetworkParam', networkParamQuery);
+  aliasGQLQuery(req, 'EstimateFees', estimateFeesQuery());
+  aliasGQLQuery(req, 'EstimatePosition', estimatePositionQuery());
+  aliasGQLQuery(req, 'ProposalsList', proposalListQuery());
+  aliasGQLQuery(req, 'Deposits', depositsQuery());
+  aliasGQLQuery(
+    req,
+    'ProtocolUpgradeProposals',
+    protocolUpgradeProposalsQuery()
+  );
+  aliasGQLQuery(req, 'BlockStatistics', blockStatisticsQuery());
+  aliasGQLQuery(req, 'SuccessorMarket', successorMarketQuery());
+  aliasGQLQuery(req, 'ParentMarketId', parentMarketIdQuery());
+  aliasGQLQuery(req, 'SuccessorMarketIds', successorMarketIdsQuery());
+  aliasGQLQuery(
+    req,
+    'SuccessorMarketProposalDetails',
+    successorMarketProposalDetailsQuery()
+  );
+};
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Cypress {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface Chainable<Subject> {
+      mockTradingPage(
+        state?: Schema.MarketState,
+        tradingMode?: Schema.MarketTradingMode,
+        trigger?: Schema.AuctionTrigger,
+        oracleStatus?: Status
+      ): void;
+    }
+  }
+}
+
+export const addMockTradingPage = () => {
+  Cypress.Commands.add(
+    'mockTradingPage',
+    (
+      state = Schema.MarketState.STATE_ACTIVE,
+      tradingMode,
+      trigger,
+      oracleStatus
+    ) => {
+      cy.mockChainId();
+      cy.mockGQL((req) => {
+        mockTradingPage(req, state, tradingMode, trigger);
+      });
+
+      const oracle: Provider = {
+        name: 'Another oracle',
+        url: 'https://zombo.com',
+        description_markdown:
+          'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
+        oracle: {
+          status: oracleStatus || 'GOOD',
+          status_reason: '',
+          first_verified: '2022-01-01T00:00:00.000Z',
+          last_verified: '2022-12-31T00:00:00.000Z',
+          type: 'public_key',
+          public_key: ORACLE_PUBKEY,
+        },
+        proofs: [
+          {
+            format: 'signed_message',
+            available: true,
+            type: 'public_key',
+            public_key: ORACLE_PUBKEY,
+            message: 'SOMEHEX',
+          },
+        ],
+        github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/public_key-${ORACLE_PUBKEY}.toml`,
+      };
+      // Prevent request to github, return some dummy content
+      cy.intercept(
+        'GET',
+        /^https:\/\/raw.githubusercontent.com\/vegaprotocol\/well-known/,
+        {
+          body: [oracle],
+        }
+      );
+    }
+  );
+};

apps/trading-e2e/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "sourceMap": false,
+    "outDir": "../../dist/out-tsc",
+    "allowJs": true,
+    "types": ["cypress", "node", "cypress-real-events", "@cypress/grep"],
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": false,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src/**/*.ts", "src/**/*.js", "./declaration.d.ts"]
+}

apps/trading/README.md

@@ -49,4 +49,10 @@ To run the minimal set of unit tests, run the following:
 yarn nx test trading
 ```
 
-To run the UI automation tests please read [e2e/README.md](e2e/README.md)
+To run the UI automation tests with a mocked API, run:
+
+```bash
+yarn nx run trading-e2e:e2e
+```
+
+To run tests with market sim please read [the readme](e2e/README.md).

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

@@ -30,6 +30,8 @@ export const ChartContainer = ({ marketId }: { marketId: string }) => {
     setStudies,
     setStudySizes,
     setOverlays,
+    state,
+    setState,
   } = useChartSettings();
 
   const pennantChart = (
@@ -66,6 +68,10 @@ export const ChartContainer = ({ marketId }: { marketId: string }) => {
           onIntervalChange={(newInterval) => {
             setInterval(fromTradingViewResolution(newInterval));
           }}
+          onAutoSaveNeeded={(data) => {
+            setState(data);
+          }}
+          state={state}
         />
       );
     }

apps/trading/components/chart-container/constants.ts

@@ -6,12 +6,7 @@ export const SUPPORTED_INTERVALS = [
   Interval.INTERVAL_I1M,
   Interval.INTERVAL_I5M,
   Interval.INTERVAL_I15M,
-  Interval.INTERVAL_I30M,
   Interval.INTERVAL_I1H,
-  Interval.INTERVAL_I4H,
   Interval.INTERVAL_I6H,
-  Interval.INTERVAL_I8H,
-  Interval.INTERVAL_I12H,
   Interval.INTERVAL_I1D,
-  Interval.INTERVAL_I7D,
 ] as const;

apps/trading/components/chart-container/use-chart-settings.ts

@@ -9,6 +9,7 @@ type StudySizes = { [S in Study]?: number };
 export type Chartlib = 'pennant' | 'tradingview';
 
 interface StoredSettings {
+  state: object | undefined; // Don't see a better type provided from TradingView type definitions
   chartlib: Chartlib;
   // For interval we use the enum from @vegaprotocol/types, this is to make mapping between different
   // chart types easier and more consistent
@@ -29,6 +30,7 @@ const STUDY_ORDER: Study[] = [
 ];
 
 export const DEFAULT_CHART_SETTINGS = {
+  state: undefined,
   chartlib: 'pennant' as const,
   interval: Interval.INTERVAL_I15M,
   type: ChartType.CANDLE,
@@ -45,6 +47,7 @@ export const useChartSettingsStore = create<
     setStudies: (studies?: Study[]) => void;
     setStudySizes: (sizes: number[]) => void;
     setChartlib: (lib: Chartlib) => void;
+    setState: (state: object) => void;
   }
 >()(
   persist(
@@ -92,6 +95,9 @@ export const useChartSettingsStore = create<
           state.chartlib = lib;
         });
       },
+      setState: (state) => {
+        set({ state });
+      },
     })),
     {
       name: 'vega_candles_chart_store',
@@ -145,5 +151,7 @@ export const useChartSettings = () => {
     setOverlays: settings.setOverlays,
     setStudySizes: settings.setStudySizes,
     setChartlib: settings.setChartlib,
+    state: settings.state,
+    setState: settings.setState,
   };
 };

apps/trading/components/profile-dialog/index.ts

@@ -1 +0,0 @@
-export { ProfileDialog } from './profile-dialog';

apps/trading/components/profile-dialog/profile-dialog.tsx

@@ -1,150 +0,0 @@
-import {
-  Dialog,
-  FormGroup,
-  Input,
-  InputError,
-  Intent,
-  TradingButton,
-} from '@vegaprotocol/ui-toolkit';
-import { useProfileDialogStore } from '../../stores/profile-dialog-store';
-import { useForm } from 'react-hook-form';
-import { useT } from '../../lib/use-t';
-import { useRequired } from '@vegaprotocol/utils';
-import {
-  useSimpleTransaction,
-  type Status,
-  useVegaWallet,
-} from '@vegaprotocol/wallet-react';
-import {
-  usePartyProfilesQuery,
-  type PartyProfilesQuery,
-} from '../vega-wallet-connect-button/__generated__/PartyProfiles';
-
-export const ProfileDialog = () => {
-  const t = useT();
-  const { pubKeys } = useVegaWallet();
-  const { data, refetch } = usePartyProfilesQuery({
-    variables: { partyIds: pubKeys.map((pk) => pk.publicKey) },
-    skip: pubKeys.length <= 0,
-  });
-  const open = useProfileDialogStore((store) => store.open);
-  const pubKey = useProfileDialogStore((store) => store.pubKey);
-  const setOpen = useProfileDialogStore((store) => store.setOpen);
-
-  const { send, status, error, reset } = useSimpleTransaction({
-    onSuccess: () => {
-      refetch();
-    },
-  });
-
-  const profileEdge = data?.partiesProfilesConnection?.edges.find(
-    (e) => e.node.partyId === pubKey
-  );
-
-  const sendTx = (field: FormFields) => {
-    send({
-      updatePartyProfile: {
-        alias: field.alias,
-        metadata: [],
-      },
-    });
-  };
-
-  return (
-    <Dialog
-      open={open}
-      onChange={() => {
-        setOpen(undefined);
-        reset();
-      }}
-      title={t('Edit profile')}
-    >
-      <ProfileForm
-        profile={profileEdge?.node}
-        status={status}
-        error={error}
-        onSubmit={sendTx}
-      />
-    </Dialog>
-  );
-};
-
-interface FormFields {
-  alias: string;
-}
-
-type Profile = NonNullable<
-  PartyProfilesQuery['partiesProfilesConnection']
->['edges'][number]['node'];
-
-const ProfileForm = ({
-  profile,
-  onSubmit,
-  status,
-  error,
-}: {
-  profile: Profile | undefined;
-  onSubmit: (fields: FormFields) => void;
-  status: Status;
-  error: string | undefined;
-}) => {
-  const t = useT();
-  const required = useRequired();
-  const {
-    register,
-    handleSubmit,
-    formState: { errors },
-  } = useForm<FormFields>({
-    defaultValues: {
-      alias: profile?.alias,
-    },
-  });
-
-  const renderButtonText = () => {
-    if (status === 'requested') {
-      return t('Confirm in wallet...');
-    }
-
-    if (status === 'pending') {
-      return t('Confirming transaction...');
-    }
-
-    return t('Submit');
-  };
-
-  const errorMessage = errors.alias?.message || error;
-
-  return (
-    <form onSubmit={handleSubmit(onSubmit)} className="mt-3">
-      <FormGroup label="Alias" labelFor="alias">
-        <Input
-          {...register('alias', {
-            validate: {
-              required,
-            },
-          })}
-        />
-        {errorMessage && (
-          <InputError>
-            <p className="break-words max-w-full first-letter:uppercase">
-              {errorMessage}
-            </p>
-          </InputError>
-        )}
-
-        {status === 'confirmed' && (
-          <p className="mt-2 mb-4 text-sm text-success">
-            {t('Profile updated')}
-          </p>
-        )}
-      </FormGroup>
-      <TradingButton
-        type="submit"
-        intent={Intent.Info}
-        disabled={status === 'requested' || status === 'pending'}
-      >
-        {renderButtonText()}
-      </TradingButton>
-    </form>
-  );
-};

apps/trading/components/vega-wallet-connect-button/PartyProfiles.graphql

@@ -1,14 +0,0 @@
-query PartyProfiles($partyIds: [ID!]) {
-  partiesProfilesConnection(ids: $partyIds) {
-    edges {
-      node {
-        partyId
-        alias
-        metadata {
-          key
-          value
-        }
-      }
-    }
-  }
-}

apps/trading/components/vega-wallet-connect-button/__generated__/PartyProfiles.ts

@@ -1,57 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type PartyProfilesQueryVariables = Types.Exact<{
-  partyIds?: Types.InputMaybe<Array<Types.Scalars['ID']> | Types.Scalars['ID']>;
-}>;
-
-
-export type PartyProfilesQuery = { __typename?: 'Query', partiesProfilesConnection?: { __typename?: 'PartiesProfilesConnection', edges: Array<{ __typename?: 'PartyProfileEdge', node: { __typename?: 'PartyProfile', partyId: string, alias: string, metadata: Array<{ __typename?: 'Metadata', key: string, value: string }> } }> } | null };
-
-
-export const PartyProfilesDocument = gql`
-    query PartyProfiles($partyIds: [ID!]) {
-  partiesProfilesConnection(ids: $partyIds) {
-    edges {
-      node {
-        partyId
-        alias
-        metadata {
-          key
-          value
-        }
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __usePartyProfilesQuery__
- *
- * To run a query within a React component, call `usePartyProfilesQuery` and pass it any options that fit your needs.
- * When your component renders, `usePartyProfilesQuery` 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 } = usePartyProfilesQuery({
- *   variables: {
- *      partyIds: // value for 'partyIds'
- *   },
- * });
- */
-export function usePartyProfilesQuery(baseOptions?: Apollo.QueryHookOptions<PartyProfilesQuery, PartyProfilesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<PartyProfilesQuery, PartyProfilesQueryVariables>(PartyProfilesDocument, options);
-      }
-export function usePartyProfilesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PartyProfilesQuery, PartyProfilesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<PartyProfilesQuery, PartyProfilesQueryVariables>(PartyProfilesDocument, options);
-        }
-export type PartyProfilesQueryHookResult = ReturnType<typeof usePartyProfilesQuery>;
-export type PartyProfilesLazyQueryHookResult = ReturnType<typeof usePartyProfilesLazyQuery>;
-export type PartyProfilesQueryResult = Apollo.QueryResult<PartyProfilesQuery, PartyProfilesQueryVariables>;

apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.spec.tsx

@@ -1,57 +1,21 @@
-import { act, fireEvent, render, screen, within } from '@testing-library/react';
+import { act, fireEvent, render, screen } from '@testing-library/react';
 import { VegaWalletConnectButton } from './vega-wallet-connect-button';
+import { truncateByChars } from '@vegaprotocol/utils';
 import userEvent from '@testing-library/user-event';
 import {
   mockConfig,
   MockedWalletProvider,
 } from '@vegaprotocol/wallet-react/testing';
-import { MockedProvider, type MockedResponse } from '@apollo/react-testing';
-import {
-  PartyProfilesDocument,
-  type PartyProfilesQuery,
-} from './__generated__/PartyProfiles';
 
 jest.mock('../../lib/hooks/use-get-current-route-id', () => ({
   useGetCurrentRouteId: jest.fn().mockReturnValue('current-route-id'),
 }));
 
-const key = { publicKey: '123456__123456', name: 'test' };
-const key2 = { publicKey: 'abcdef__abcdef', name: 'test2' };
-const keys = [key, key2];
-const keyProfile = {
-  __typename: 'PartyProfile' as const,
-  partyId: key.publicKey,
-  alias: `${key.name} alias`,
-  metadata: [],
-};
-
 const renderComponent = (mockOnClick = jest.fn()) => {
-  const partyProfilesMock: MockedResponse<PartyProfilesQuery> = {
-    request: {
-      query: PartyProfilesDocument,
-      variables: { partyIds: keys.map((k) => k.publicKey) },
-    },
-    result: {
-      data: {
-        partiesProfilesConnection: {
-          __typename: 'PartiesProfilesConnection',
-          edges: [
-            {
-              __typename: 'PartyProfileEdge',
-              node: keyProfile,
-            },
-          ],
-        },
-      },
-    },
-  };
-
   return (
-    <MockedProvider mocks={[partyProfilesMock]}>
-      <MockedWalletProvider>
-        <VegaWalletConnectButton onClick={mockOnClick} />
-      </MockedWalletProvider>
-    </MockedProvider>
+    <MockedWalletProvider>
+      <VegaWalletConnectButton onClick={mockOnClick} />
+    </MockedWalletProvider>
   );
 };
 
@@ -79,6 +43,10 @@ describe('VegaWalletConnectButton', () => {
   });
 
   it('should open dropdown and refresh keys when connected', async () => {
+    const key = { publicKey: '123456__123456', name: 'test' };
+    const key2 = { publicKey: 'abcdef__abcdef', name: 'test2' };
+    const keys = [key, key2];
+
     mockConfig.store.setState({
       status: 'connected',
       keys,
@@ -93,22 +61,14 @@ describe('VegaWalletConnectButton', () => {
 
     expect(screen.queryByTestId('connect-vega-wallet')).not.toBeInTheDocument();
     const button = screen.getByTestId('manage-vega-wallet');
-    expect(button).toHaveTextContent(key.name);
+    expect(button).toHaveTextContent(truncateByChars(key.publicKey));
 
     fireEvent.click(button);
 
     expect(await screen.findByRole('menu')).toBeInTheDocument();
-    const menuItems = await screen.findAllByRole('menuitemradio');
-    expect(menuItems).toHaveLength(keys.length);
-
-    expect(within(menuItems[0]).getByTestId('alias')).toHaveTextContent(
-      keyProfile.alias
+    expect(await screen.findAllByRole('menuitemradio')).toHaveLength(
+      keys.length
     );
-
-    expect(within(menuItems[1]).getByTestId('alias')).toHaveTextContent(
-      'No alias'
-    );
-
     expect(refreshKeys).toHaveBeenCalled();
 
     fireEvent.click(screen.getByTestId(`key-${key2.publicKey}`));

apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx

@@ -14,7 +14,6 @@ import {
   TradingDropdownItem,
   TradingDropdownRadioItem,
   TradingDropdownItemIndicator,
-  Tooltip,
 } from '@vegaprotocol/ui-toolkit';
 import { isBrowserWalletInstalled, type Key } from '@vegaprotocol/wallet';
 import { useDialogStore, useVegaWallet } from '@vegaprotocol/wallet-react';
@@ -23,8 +22,6 @@ import classNames from 'classnames';
 import { ViewType, useSidebar } from '../sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { useT } from '../../lib/use-t';
-import { usePartyProfilesQuery } from './__generated__/PartyProfiles';
-import { useProfileDialogStore } from '../../stores/profile-dialog-store';
 
 export const VegaWalletConnectButton = ({
   intent = Intent.None,
@@ -71,10 +68,10 @@ export const VegaWalletConnectButton = ({
               {activeKey ? (
                 <>
                   {activeKey && (
-                    <span className="uppercase">
-                      {activeKey.name ? activeKey.name : t('Unnamed key')}
-                    </span>
+                    <span className="uppercase">{activeKey.name}</span>
                   )}
+                  {' | '}
+                  {truncateByChars(activeKey.publicKey)}
                 </>
               ) : (
                 <>{'Select key'}</>
@@ -91,11 +88,20 @@ export const VegaWalletConnectButton = ({
           onEscapeKeyDown={() => setDropdownOpen(false)}
         >
           <div className="min-w-[340px]" data-testid="keypair-list">
-            <KeypairRadioGroup
-              pubKey={pubKey}
-              pubKeys={pubKeys}
-              onSelect={selectPubKey}
-            />
+            <TradingDropdownRadioGroup
+              value={pubKey || undefined}
+              onValueChange={(value) => {
+                selectPubKey(value);
+              }}
+            >
+              {pubKeys.map((pk) => (
+                <KeypairItem
+                  key={pk.publicKey}
+                  pk={pk}
+                  active={pk.publicKey === pubKey}
+                />
+              ))}
+            </TradingDropdownRadioGroup>
             <TradingDropdownSeparator />
             {!isReadOnly && (
               <TradingDropdownItem
@@ -135,52 +141,28 @@ export const VegaWalletConnectButton = ({
   );
 };
 
-const KeypairRadioGroup = ({
-  pubKey,
-  pubKeys,
-  onSelect,
-}: {
-  pubKey: string | undefined;
-  pubKeys: Key[];
-  onSelect: (pubKey: string) => void;
-}) => {
-  const { data } = usePartyProfilesQuery({
-    variables: { partyIds: pubKeys.map((pk) => pk.publicKey) },
-    skip: pubKeys.length <= 0,
-  });
-
-  return (
-    <TradingDropdownRadioGroup value={pubKey} onValueChange={onSelect}>
-      {pubKeys.map((pk) => {
-        const profile = data?.partiesProfilesConnection?.edges.find(
-          (e) => e.node.partyId === pk.publicKey
-        );
-        return (
-          <KeypairItem key={pk.publicKey} pk={pk} alias={profile?.node.alias} />
-        );
-      })}
-    </TradingDropdownRadioGroup>
-  );
-};
-
-const KeypairItem = ({ pk, alias }: { pk: Key; alias: string | undefined }) => {
+const KeypairItem = ({ pk, active }: { pk: Key; active: boolean }) => {
   const t = useT();
   const [copied, setCopied] = useCopyTimeout();
-  const setOpen = useProfileDialogStore((store) => store.setOpen);
 
   return (
     <TradingDropdownRadioItem value={pk.publicKey}>
-      <div>
-        <div className="flex items-center gap-2">
-          <span>{pk.name ? pk.name : t('Unnamed key')}</span>
+      <div
+        className={classNames('flex-1 mr-2', {
+          'text-default': active,
+          'text-muted': !active,
+        })}
+        data-testid={`key-${pk.publicKey}`}
+      >
+        <span className={classNames('mr-2 uppercase')}>
+          {pk.name}
           {' | '}
-          <span className="font-mono">
-            {truncateByChars(pk.publicKey, 3, 3)}
-          </span>
+          {truncateByChars(pk.publicKey)}
+        </span>
+        <span className="inline-flex items-center gap-1">
           <CopyToClipboard text={pk.publicKey} onCopy={() => setCopied(true)}>
             <button
               data-testid="copy-vega-public-key"
-              className="relative -top-px"
               onClick={(e) => e.stopPropagation()}
             >
               <span className="sr-only">{t('Copy')}</span>
@@ -188,17 +170,7 @@ const KeypairItem = ({ pk, alias }: { pk: Key; alias: string | undefined }) => {
             </button>
           </CopyToClipboard>
           {copied && <span className="text-xs">{t('Copied')}</span>}
-        </div>
-        <div
-          className={classNames('flex-1 mr-2 text-secondary text-sm')}
-          data-testid={`key-${pk.publicKey}`}
-        >
-          <Tooltip description={t('Public facing key alias. Click to edit')}>
-            <button data-testid="alias" onClick={() => setOpen(pk.publicKey)}>
-              {alias ? alias : t('No alias')}
-            </button>
-          </Tooltip>
-        </div>
+        </span>
       </div>
       <TradingDropdownItemIndicator />
     </TradingDropdownRadioItem>

apps/trading/e2e/.env

@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.75.0-preview.2
+VEGA_VERSION=v0.74.6
 LOCAL_SERVER=false

apps/trading/e2e/actions/utils.py

@@ -50,6 +50,8 @@ def truncate_middle(market_id, start=6, end=4):
 def change_keys(page: Page, vega: VegaServiceNull, key_name):
     page.get_by_test_id("manage-vega-wallet").click()
     page.get_by_test_id("key-" + vega.wallet.public_key(key_name)).click()
+    page.click(
+        f'data-testid=key-{vega.wallet.public_key(key_name)} >> .inline-flex')
     page.reload()
 
 

apps/trading/e2e/poetry.lock

@@ -877,13 +877,13 @@ testing = ["filelock"]
 
 [[package]]
 name = "python-dateutil"
-version = "2.9.0.post0"
+version = "2.8.2"
 description = "Extensions to the standard Python datetime module"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
 files = [
-    {file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"},
-    {file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"},
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
 
 [package.dependencies]
@@ -1166,7 +1166,7 @@ profile = ["pytest-profiling", "snakeviz"]
 type = "git"
 url = "https://github.com/vegaprotocol/vega-market-sim.git/"
 reference = "HEAD"
-resolved_reference = "53eed8942acb670783105cb1115bab76710a46dc"
+resolved_reference = "33fec45ce8044ef7f53b625584ce590d174f9057"
 
 [[package]]
 name = "websocket-client"

apps/trading/e2e/tests/market/test_market_info.py

@@ -37,16 +37,19 @@ def validate_info_section(page: Page, fields: [[str, str]]):
     for rowNumber, field in enumerate(fields):
         name, value = field
         expect(
-            page.get_by_test_id("key-value-table-row").nth(rowNumber).locator("dt")
+            page.get_by_test_id(
+                "key-value-table-row").nth(rowNumber).locator("dt")
         ).to_contain_text(name)
         expect(
-            page.get_by_test_id("key-value-table-row").nth(rowNumber).locator("dd")
+            page.get_by_test_id(
+                "key-value-table-row").nth(rowNumber).locator("dd")
         ).to_contain_text(value)
 
 
 def test_market_info_current_fees(page: Page):
     # 6002-MDET-101
-    page.get_by_test_id(market_title_test_id).get_by_text("Current fees").click()
+    page.get_by_test_id(market_title_test_id).get_by_text(
+        "Current fees").click()
     fields = [
         ["Maker Fee", "10%"],
         ["Infrastructure Fee", "0.05%"],
@@ -58,7 +61,8 @@ def test_market_info_current_fees(page: Page):
 
 def test_market_info_market_price(page: Page):
     # 6002-MDET-102
-    page.get_by_test_id(market_title_test_id).get_by_text("Market price").click()
+    page.get_by_test_id(market_title_test_id).get_by_text(
+        "Market price").click()
     fields = [
         ["Mark Price", "107.50"],
         ["Best Bid Price", "101.50"],
@@ -67,25 +71,25 @@ def test_market_info_market_price(page: Page):
     ]
     validate_info_section(page, fields)
 
-#TODO: remove skip once volume is fixed
-""" def test_market_info_market_volume(page: Page):
+
+def test_market_info_market_volume(page: Page):
     # 6002-MDET-103
-    page.get_by_test_id(market_title_test_id).get_by_text("Market volume").click()
+    page.get_by_test_id(market_title_test_id).get_by_text(
+        "Market volume").click()
     fields = [
-        ["24 Hour Volume", "0 (0 )"],
+        ["24 Hour Volume", "-"],
         ["Open Interest", "1"],
         ["Best Bid Volume", "99"],
         ["Best Offer Volume", "99"],
         ["Best Static Bid Volume", "1"],
         ["Best Static Offer Volume", "1"],
     ]
-    validate_info_section(page, fields) """
+    validate_info_section(page, fields)
 
 
 def test_market_info_liquidation_strategy(page: Page):
     page.get_by_test_id(market_title_test_id).get_by_text(
-        "Liquidation strategy"
-    ).click()
+        "Liquidation strategy").click()
     fields = [
         ["Disposal Fraction", "1"],
         ["Disposal Time Step", "1"],
@@ -97,14 +101,16 @@ def test_market_info_liquidation_strategy(page: Page):
 
 def test_market_info_liquidation(page: Page):
     # 6002-MDET-104
-    page.get_by_test_id(market_title_test_id).get_by_text("Liquidations").click()
+    page.get_by_test_id(market_title_test_id).get_by_text(
+        "Liquidations").click()
     fields = [["Insurance Pool Balance", "0.00 tDAI"]]
     validate_info_section(page, fields)
 
 
 def test_market_info_key_details(page: Page, vega: VegaServiceNull):
     # 6002-MDET-201
-    page.get_by_test_id(market_title_test_id).get_by_text("Key details").click()
+    page.get_by_test_id(market_title_test_id).get_by_text(
+        "Key details").click()
     market_id = vega.find_market_id("BTC:DAI_2023")
     short_market_id = market_id[:6] + "…" + market_id[-4:]
     fields = [
@@ -150,7 +156,8 @@ def test_market_info_oracle(page: Page):
 
 def test_market_info_settlement_asset(page: Page, vega: VegaServiceNull):
     # 6002-MDET-206
-    page.get_by_test_id(market_title_test_id).get_by_text("Settlement asset").click()
+    page.get_by_test_id(market_title_test_id).get_by_text(
+        "Settlement asset").click()
     tdai_id = vega.find_asset_id("tDAI")
     tdai_id_short = tdai_id[:6] + "…" + tdai_id[-4:]
     fields = [
@@ -204,7 +211,8 @@ def test_market_info_margin_scaling_factors(page: Page):
 
 def test_market_info_risk_factors(page: Page):
     # 6002-MDET-210
-    page.get_by_test_id(market_title_test_id).get_by_text("Risk factors").click()
+    page.get_by_test_id(market_title_test_id).get_by_text(
+        "Risk factors").click()
     fields = [
         ["Long", "0.05153"],
         ["Short", "0.05422"],
@@ -224,7 +232,8 @@ def test_market_info_price_monitoring_bounds(page: Page):
     expect(page.locator("p.col-span-1").nth(0)).to_contain_text(
         "99.9999% probability price bounds"
     )
-    expect(page.locator("p.col-span-1").nth(1)).to_contain_text("Within 86,400 seconds")
+    expect(page.locator("p.col-span-1").nth(1)
+           ).to_contain_text("Within 86,400 seconds")
     fields = [
         ["Highest Price", "138.66685 BTC"],
         ["Lowest Price", "83.11038 BTC"],
@@ -245,7 +254,7 @@ def test_market_info_liquidity_monitoring_parameters(page: Page):
 
 
 # Liquidity resolves to 3 results
-def test_market_info_liquidity(page: Page):
+def test_market_info_liquidit(page: Page):
     # 6002-MDET-213
     page.get_by_test_id(market_title_test_id).get_by_text(
         "Liquidity", exact=True
@@ -274,14 +283,17 @@ def test_market_info_proposal(page: Page, vega: VegaServiceNull):
     # 6002-MDET-301
     page.get_by_test_id(market_title_test_id).get_by_text("Proposal").click()
     first_link = (
-        page.get_by_test_id("accordion-content").get_by_test_id("external-link").first
+        page.get_by_test_id(
+            "accordion-content").get_by_test_id("external-link").first
     )
     second_link = (
-        page.get_by_test_id("accordion-content").get_by_test_id("external-link").nth(1)
+        page.get_by_test_id(
+            "accordion-content").get_by_test_id("external-link").nth(1)
     )
     expect(first_link).to_have_text("View governance proposal")
     expect(first_link).to_have_attribute(
-        "href", re.compile(rf'(\/proposals\/{vega.find_market_id("BTC:DAI_2023")})')
+        "href", re.compile(
+            rf'(\/proposals\/{vega.find_market_id("BTC:DAI_2023")})')
     )
     expect(second_link).to_have_text("Propose a change to market")
 
@@ -292,10 +304,12 @@ def test_market_info_proposal(page: Page, vega: VegaServiceNull):
 
 
 def test_market_info_succession_line(page: Page, vega: VegaServiceNull):
-    page.get_by_test_id(market_title_test_id).get_by_text("Succession line").click()
+    page.get_by_test_id(market_title_test_id).get_by_text(
+        "Succession line").click()
     market_id = vega.find_market_id("BTC:DAI_2023")
     succession_line = page.get_by_test_id("succession-line-item")
-    expect(succession_line.get_by_test_id("external-link")).to_have_text("BTC:DAI_2023")
+    expect(succession_line.get_by_test_id(
+        "external-link")).to_have_text("BTC:DAI_2023")
     expect(succession_line.get_by_test_id("external-link")).to_have_attribute(
         "href", re.compile(rf"(\/proposals\/{market_id})")
     )

apps/trading/e2e/tests/perpetual_market/test_perpetuals.py

@@ -57,7 +57,7 @@ class TestPerpetuals:
         page.goto(f"/#/markets/{perps_market}")
         page.get_by_test_id("Funding payments").click()
         row = page.locator(row_selector)
-        expect(row.locator(col_amount)).to_have_text("4.45 tDAI")
+        expect(row.locator(col_amount)).to_have_text("9.00 tDAI")
 
     @pytest.mark.usefixtures("risk_accepted", "auth")
     def test_funding_payment_loss(self, perps_market, page: Page, vega):
@@ -65,7 +65,7 @@ class TestPerpetuals:
         change_keys(page, vega, "market_maker")
         page.get_by_test_id("Funding payments").click()
         row = page.locator(row_selector)
-        expect(row.locator(col_amount)).to_have_text("-13.35 tDAI")
+        expect(row.locator(col_amount)).to_have_text("-27.00 tDAI")
 
     @pytest.mark.usefixtures("risk_accepted", "auth")
     def test_funding_header(self, perps_market, page: Page):

apps/trading/e2e/tests/rewards/test_rewards_combo_tier_1.py

@@ -57,16 +57,6 @@ def setup_market_with_reward_program(vega: VegaServiceNull):
     )
 
     next_epoch(vega=vega)
-    vega.recurring_transfer(
-        from_key_name=PARTY_A.name,
-        from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
-        to_account_type=vega_protos.vega.ACCOUNT_TYPE_GLOBAL_REWARD,
-        asset=tDAI_asset_id,
-        amount=100,
-        factor=1.0,
-    )
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
     vega.recurring_transfer(
         from_key_name=PARTY_A.name,
         from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
@@ -181,22 +171,4 @@ def test_reward_history(
     page.get_by_test_id(EARNED_BY_ME_BUTTON).click()
     expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(1)).to_have_text(
         "183.33333"
-    )
-
-def test_staking_reward(
-    page: Page,
-):
-    expect(page.get_by_test_id("active-rewards-card")).to_have_count(2)
-    staking_reward_card = page.get_by_test_id("active-rewards-card").nth(1)
-    expect(staking_reward_card).to_be_visible()
-    expect(staking_reward_card.get_by_test_id("entity-scope")).to_have_text("Individual")
-    expect(staking_reward_card.get_by_test_id("locked-for")).to_have_text("0 epochs")
-    expect(staking_reward_card.get_by_test_id("reward-value")).to_have_text("100.00")
-    expect(staking_reward_card.get_by_test_id("distribution-strategy")).to_have_text("Pro rata")
-    expect(staking_reward_card.get_by_test_id("dispatch-metric-info")).to_have_text(
-        "Staking rewards"
-    )
-    expect(staking_reward_card.get_by_test_id("assessed-over")).to_have_text("1 epoch")
-    expect(staking_reward_card.get_by_test_id("scope")).to_have_text("Individual")
-    expect(staking_reward_card.get_by_test_id("staking-requirement")).to_have_text("1.00")
-    expect(staking_reward_card.get_by_test_id("average-position")).to_have_text("0.00")
+    )

apps/trading/e2e/tests/successor_market/test_succession_line.py

@@ -97,13 +97,10 @@ def test_banners(vega: VegaServiceNull, page: Page):
         settlement_price=100,
         market_id=parent_market_id,
     )
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+
     successor_name = "successor market name"
     propose_successor(vega, parent_market_id, tdai_id, successor_name)
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-    page.reload()
+
     # Check that the banners notifying about the successor proposal and market has been settled are shown
     banner = page.get_by_test_id(market_banner)
     expect(banner).to_be_attached()

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

@@ -299,10 +299,10 @@ def test_leaderboard(competitions_page: Page, setup_teams_and_games):
 
 
 def test_game_card(competitions_page: Page):
-    expect(competitions_page.get_by_test_id("active-rewards-card")).to_have_count(1)
+    expect(competitions_page.get_by_test_id("active-rewards-card")).to_have_count(2)
     game_1 = competitions_page.get_by_test_id("active-rewards-card").first
     expect(game_1).to_be_visible()
-    expect(game_1.get_by_test_id("entity-scope")).to_have_text("Team")
+    expect(game_1.get_by_test_id("entity-scope")).to_have_text("Individual")
     expect(game_1.get_by_test_id("locked-for")).to_have_text("1 epoch")
     expect(game_1.get_by_test_id("reward-value")).to_have_text("100.00")
     expect(game_1.get_by_test_id("reward-asset")).to_have_text("VEGA")
@@ -311,7 +311,7 @@ def test_game_card(competitions_page: Page):
         "Price maker fees paid • tDAI"
     )
     expect(game_1.get_by_test_id("assessed-over")).to_have_text("15 epochs")
-    expect(game_1.get_by_test_id("scope")).to_have_text("All teams")
+    expect(game_1.get_by_test_id("scope")).to_have_text("In team")
     expect(game_1.get_by_test_id("staking-requirement")).to_have_text("0.00")
     expect(game_1.get_by_test_id("average-position")).to_have_text("0.00")
 

apps/trading/lib/hooks/Games.graphql

@@ -25,12 +25,8 @@ fragment GameFields on Game {
   }
 }
 
-query Games($epochFrom: Int, $teamId: ID) {
-  games(
-    epochFrom: $epochFrom
-    teamId: $teamId
-    entityScope: ENTITY_SCOPE_TEAMS
-  ) {
+query Games($epochFrom: Int) {
+  games(epochFrom: $epochFrom, entityScope: ENTITY_SCOPE_TEAMS) {
     edges {
       node {
         ...GameFields

apps/trading/lib/hooks/__generated__/Games.ts

@@ -9,7 +9,6 @@ export type GameFieldsFragment = { __typename?: 'Game', id: string, epoch: numbe
 
 export type GamesQueryVariables = Types.Exact<{
   epochFrom?: Types.InputMaybe<Types.Scalars['Int']>;
-  teamId?: Types.InputMaybe<Types.Scalars['ID']>;
 }>;
 
 
@@ -45,8 +44,8 @@ export const GameFieldsFragmentDoc = gql`
 }
     ${TeamEntityFragmentDoc}`;
 export const GamesDocument = gql`
-    query Games($epochFrom: Int, $teamId: ID) {
-  games(epochFrom: $epochFrom, teamId: $teamId, entityScope: ENTITY_SCOPE_TEAMS) {
+    query Games($epochFrom: Int) {
+  games(epochFrom: $epochFrom, entityScope: ENTITY_SCOPE_TEAMS) {
     edges {
       node {
         ...GameFields
@@ -69,7 +68,6 @@ export const GamesDocument = gql`
  * const { data, loading, error } = useGamesQuery({
  *   variables: {
  *      epochFrom: // value for 'epochFrom'
- *      teamId: // value for 'teamId'
  *   },
  * });
  */

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

@@ -51,7 +51,6 @@ export const useGames = (teamId?: string, epochFrom?: number): GamesData => {
   const { data, loading, error } = useGamesQuery({
     variables: {
       epochFrom: from,
-      teamId: teamId,
     },
     skip: !from,
     fetchPolicy: 'cache-and-network',

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

@@ -194,11 +194,11 @@ describe('isScopedToTeams', () => {
         undefined,
         makeDispatchStrategy(
           EntityScope.ENTITY_SCOPE_INDIVIDUALS,
-          IndividualScope.INDIVIDUAL_SCOPE_IN_TEAM // individual in teams but not a team game
+          IndividualScope.INDIVIDUAL_SCOPE_IN_TEAM // individual in teams
         ),
         'RecurringTransfer'
       ),
-      false,
+      true,
     ],
     [
       makeReward(

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

@@ -14,6 +14,7 @@ import {
   TransferStatus,
   type DispatchStrategy,
   EntityScope,
+  IndividualScope,
   MarketState,
   AccountType,
 } from '@vegaprotocol/types';
@@ -74,11 +75,20 @@ export const isActiveReward = (node: RewardTransfer, currentEpoch: number) => {
 
 /**
  * Checks if given reward (transfer) is scoped to teams.
+ *
+ * A reward is scoped to teams if it's entity scope is set to teams or
+ * if the scope is set to individuals but the individuals are in a team.
  */
 export const isScopedToTeams = (node: EnrichedRewardTransfer) =>
   // scoped to teams
   node.transfer.kind.dispatchStrategy?.entityScope ===
-  EntityScope.ENTITY_SCOPE_TEAMS;
+    EntityScope.ENTITY_SCOPE_TEAMS ||
+  // or to individuals
+  (node.transfer.kind.dispatchStrategy?.entityScope ===
+    EntityScope.ENTITY_SCOPE_INDIVIDUALS &&
+    // but they have to be in a team
+    node.transfer.kind.dispatchStrategy?.individualScope ===
+      IndividualScope.INDIVIDUAL_SCOPE_IN_TEAM);
 
 /** Retrieves rewards (transfers) */
 export const useRewards = ({

apps/trading/pages/dialogs-container.tsx

@@ -8,7 +8,6 @@ import {
 } from '@vegaprotocol/web3';
 import { WelcomeDialog } from '../components/welcome-dialog';
 import { VegaWalletConnectDialog } from '../components/vega-wallet-connect-dialog';
-import { ProfileDialog } from '../components/profile-dialog';
 
 const DialogsContainer = () => {
   const { isOpen, id, trigger, setOpen } = useAssetDetailsDialogStore();
@@ -25,7 +24,6 @@ const DialogsContainer = () => {
       <WelcomeDialog />
       <Web3ConnectUncontrolledDialog />
       <WithdrawalApprovalDialogContainer />
-      <ProfileDialog />
     </>
   );
 };

apps/trading/stores/profile-dialog-store.ts

@@ -1,19 +0,0 @@
-import { create } from 'zustand';
-
-interface ProfileDialogStore {
-  open: boolean;
-  pubKey: string | undefined;
-  setOpen: (pubKey: string | undefined) => void;
-}
-
-export const useProfileDialogStore = create<ProfileDialogStore>((set) => ({
-  open: false,
-  pubKey: undefined,
-  setOpen: (pubKey) => {
-    if (pubKey) {
-      set({ open: true, pubKey });
-    } else {
-      set({ open: false, pubKey: undefined });
-    }
-  },
-}));

libs/assets/src/lib/constants.ts

@@ -62,10 +62,3 @@ export const DENY_LIST: Record<string, string[]> = {
     'fdf0ec118d98393a7702cf72e46fc87ad680b152f64b2aac59e093ac2d688fbb',
   ],
 };
-
-// We need a record of USDT on mainnet as it needs special handling for
-// deposits and approvals due to the contract not conforming exactly
-// to ERC20
-export const USDT_ID = {
-  MAINNET: 'bf1e88d19db4b3ca0d1d5bdb73718a01686b18cf731ca26adedf3c8b83802bba',
-} as const;

libs/candles-chart/src/lib/constants.ts

@@ -6,12 +6,7 @@ export const PENNANT_INTERVAL_MAP = {
   [Interval.INTERVAL_I1M]: PennantInterval.I1M,
   [Interval.INTERVAL_I5M]: PennantInterval.I5M,
   [Interval.INTERVAL_I15M]: PennantInterval.I15M,
-  [Interval.INTERVAL_I30M]: PennantInterval.I30M,
   [Interval.INTERVAL_I1H]: PennantInterval.I1H,
-  [Interval.INTERVAL_I4H]: PennantInterval.I4H,
   [Interval.INTERVAL_I6H]: PennantInterval.I6H,
-  [Interval.INTERVAL_I8H]: PennantInterval.I8H,
-  [Interval.INTERVAL_I12H]: PennantInterval.I12H,
   [Interval.INTERVAL_I1D]: PennantInterval.I1D,
-  [Interval.INTERVAL_I7D]: PennantInterval.I7D,
 } as const;

libs/candles-chart/src/lib/data-source.ts

@@ -34,28 +34,18 @@ const INTERVAL_TO_PENNANT_MAP = {
   [PennantInterval.I1M]: Schema.Interval.INTERVAL_I1M,
   [PennantInterval.I5M]: Schema.Interval.INTERVAL_I5M,
   [PennantInterval.I15M]: Schema.Interval.INTERVAL_I15M,
-  [PennantInterval.I30M]: Schema.Interval.INTERVAL_I30M,
   [PennantInterval.I1H]: Schema.Interval.INTERVAL_I1H,
-  [PennantInterval.I4H]: Schema.Interval.INTERVAL_I4H,
   [PennantInterval.I6H]: Schema.Interval.INTERVAL_I6H,
-  [PennantInterval.I8H]: Schema.Interval.INTERVAL_I8H,
-  [PennantInterval.I12H]: Schema.Interval.INTERVAL_I12H,
   [PennantInterval.I1D]: Schema.Interval.INTERVAL_I1D,
-  [PennantInterval.I7D]: Schema.Interval.INTERVAL_I7D,
 };
 
 const defaultConfig = {
   decimalPlaces: 5,
   supportedIntervals: [
-    PennantInterval.I7D,
     PennantInterval.I1D,
-    PennantInterval.I12H,
-    PennantInterval.I8H,
     PennantInterval.I6H,
-    PennantInterval.I4H,
     PennantInterval.I1H,
     PennantInterval.I15M,
-    PennantInterval.I30M,
     PennantInterval.I5M,
     PennantInterval.I1M,
   ],
@@ -147,15 +137,10 @@ export class VegaDataSource implements DataSource {
           decimalPlaces: this._decimalPlaces,
           positionDecimalPlaces: this._positionDecimalPlaces,
           supportedIntervals: [
-            PennantInterval.I7D,
             PennantInterval.I1D,
-            PennantInterval.I12H,
-            PennantInterval.I8H,
             PennantInterval.I6H,
-            PennantInterval.I4H,
             PennantInterval.I1H,
             PennantInterval.I15M,
-            PennantInterval.I30M,
             PennantInterval.I5M,
             PennantInterval.I1M,
           ],
@@ -270,10 +255,6 @@ const getDuration = (
   multiplier: number
 ): Duration => {
   switch (interval) {
-    case 'I7D':
-      return {
-        days: 7 * multiplier,
-      };
     case 'I1D':
       return {
         days: 1 * multiplier,
@@ -290,30 +271,14 @@ const getDuration = (
       return {
         minutes: 5 * multiplier,
       };
-    case 'I4H':
-      return {
-        hours: 4 * multiplier,
-      };
     case 'I6H':
       return {
         hours: 6 * multiplier,
       };
-    case 'I8H':
-      return {
-        hours: 8 * multiplier,
-      };
-    case 'I12H':
-      return {
-        hours: 12 * multiplier,
-      };
     case 'I15M':
       return {
         minutes: 15 * multiplier,
       };
-    case 'I30M':
-      return {
-        minutes: 30 * multiplier,
-      };
   }
 };
 
@@ -323,24 +288,14 @@ const getDifference = (
   dateRight: Date
 ): number => {
   switch (interval) {
-    case 'I7D':
-      return differenceInDays(dateRight, dateLeft) / 7;
     case 'I1D':
       return differenceInDays(dateRight, dateLeft);
-    case 'I12H':
-      return differenceInHours(dateRight, dateLeft) / 12;
-    case 'I8H':
-      return differenceInHours(dateRight, dateLeft) / 8;
     case 'I6H':
       return differenceInHours(dateRight, dateLeft) / 6;
-    case 'I4H':
-      return differenceInHours(dateRight, dateLeft) / 4;
     case 'I1H':
       return differenceInHours(dateRight, dateLeft);
     case 'I15M':
       return differenceInMinutes(dateRight, dateLeft) / 15;
-    case 'I30M':
-      return differenceInMinutes(dateRight, dateLeft) / 30;
     case 'I5M':
       return differenceInMinutes(dateRight, dateLeft) / 5;
     case 'I1M':

libs/cypress/src/lib/commands/mock-chain-id.ts

@@ -12,7 +12,7 @@ declare global {
   }
 }
 
-const chainId = 'vega-stagnet1-202307191148';
+const chainId = 'test-id';
 
 export function addMockChainId() {
   Cypress.Commands.add('mockChainId', () => {

libs/cypress/src/lib/commands/vega-wallet-connect.ts

@@ -37,12 +37,10 @@ export function addVegaWalletConnect() {
   Cypress.Commands.add('connectVegaWallet', (isMobile) => {
     mockConnectWallet();
     cy.highlight(`Connecting Vega Wallet`);
-    cy.get('[data-testid="splash-loader"]', { timeout: 20000 }).should(
-      'not.exist'
-    );
     const connectVegaWalletButton = `[data-testid=connect-vega-wallet${
       isMobile ? '-mobile' : ''
     }]:visible`;
+
     cy.get(connectVegaWalletButton).then((btn) => {
       if (btn.length === 0) {
         cy.log('could not find the button, perhaps already connected');

libs/cypress/src/lib/mock-rest.ts

@@ -13,8 +13,7 @@ declare global {
 
 const hasMethod = (req: CyHttpMessages.IncomingHttpRequest, method: string) => {
   const { body } = req;
-  const b = JSON.parse(body);
-  return 'method' in b && b.method === method;
+  return 'method' in body && body.method === method;
 };
 
 export function addMockWalletCommand() {
@@ -73,7 +72,7 @@ export const aliasWalletConnectQuery = (
       body: {
         jsonrpc: '2.0',
         result: {
-          chainID: 'vega-fairground-202305051805',
+          chainID: 'test-id',
         },
         id: '1',
       },

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

@@ -73,7 +73,7 @@ export const DealTicketContainer = ({
               market={market}
               marketPrice={marketPrice}
               marketData={marketData}
-              submit={(transaction) => create(transaction)}
+              submit={(orderSubmission) => create({ orderSubmission })}
             />
           )}
         </>

libs/deal-ticket/src/components/deal-ticket/deal-ticket-price-tp-sl.tsx

@@ -1,172 +0,0 @@
-import { Controller, type Control } from 'react-hook-form';
-import type { Market } from '@vegaprotocol/markets';
-import type { OrderFormValues } from '../../hooks/use-form-values';
-import { toDecimal, useValidateAmount } from '@vegaprotocol/utils';
-import {
-  TradingFormGroup,
-  TradingInputError,
-  Tooltip,
-  FormGroup,
-  Input,
-  InputError,
-  Pill,
-} from '@vegaprotocol/ui-toolkit';
-import { useT } from '../../use-t';
-
-export interface DealTicketPriceTakeProfitStopLossProps {
-  control: Control<OrderFormValues>;
-  market: Market;
-  takeProfitError?: string;
-  stopLossError?: string;
-  quoteName?: string;
-}
-
-export const DealTicketPriceTakeProfitStopLoss = ({
-  control,
-  market,
-  takeProfitError,
-  stopLossError,
-  quoteName,
-}: DealTicketPriceTakeProfitStopLossProps) => {
-  const t = useT();
-  const validateAmount = useValidateAmount();
-  const priceStep = toDecimal(market?.decimalPlaces);
-
-  const renderTakeProfitError = () => {
-    if (takeProfitError) {
-      return (
-        <TradingInputError testId="deal-ticket-take-profit-error-message">
-          {takeProfitError}
-        </TradingInputError>
-      );
-    }
-
-    return null;
-  };
-
-  const renderStopLossError = () => {
-    if (stopLossError) {
-      return (
-        <TradingInputError testId="deal-stop-loss-error-message">
-          {stopLossError}
-        </TradingInputError>
-      );
-    }
-
-    return null;
-  };
-
-  return (
-    <div className="mb-2">
-      <div className="flex flex-col gap-2">
-        <div className="flex-1">
-          <TradingFormGroup
-            label={
-              <Tooltip
-                description={<div>{t('The price for take profit.')}</div>}
-              >
-                <span className="text-xs">{t('Take profit')}</span>
-              </Tooltip>
-            }
-            labelFor="input-order-take-profit"
-            className="!mb-1"
-          >
-            <Controller
-              name="takeProfit"
-              control={control}
-              rules={{
-                min: {
-                  value: priceStep,
-                  message: t(
-                    'Take profit price cannot be lower than {{priceStep}}',
-                    {
-                      priceStep,
-                    }
-                  ),
-                },
-                validate: validateAmount(priceStep, 'takeProfit'),
-              }}
-              render={({ field, fieldState }) => (
-                <div className="mb-2">
-                  <FormGroup
-                    labelFor="input-price-take-profit"
-                    label={''}
-                    compact
-                  >
-                    <Input
-                      id="input-price-take-profit"
-                      appendElement={<Pill size="xs">{quoteName}</Pill>}
-                      className="w-full"
-                      type="number"
-                      step={priceStep}
-                      data-testid="order-price-take-profit"
-                      onWheel={(e) => e.currentTarget.blur()}
-                      {...field}
-                    />
-                  </FormGroup>
-                  {fieldState.error && (
-                    <InputError testId="deal-ticket-error-message-price-take-profit">
-                      {fieldState.error.message}
-                    </InputError>
-                  )}
-                </div>
-              )}
-            />
-          </TradingFormGroup>
-        </div>
-        <div className="flex-1">
-          <TradingFormGroup
-            label={
-              <Tooltip description={<div>{t('The price for stop loss.')}</div>}>
-                <span className="text-xs">{t('Stop loss')}</span>
-              </Tooltip>
-            }
-            labelFor="input-order-stop-loss"
-            className="!mb-1"
-          >
-            <Controller
-              name="stopLoss"
-              control={control}
-              rules={{
-                min: {
-                  value: priceStep,
-                  message: t('Price cannot be lower than {{priceStep}}', {
-                    priceStep,
-                  }),
-                },
-                validate: validateAmount(priceStep, 'stopLoss'),
-              }}
-              render={({ field, fieldState }) => (
-                <div className="mb-2">
-                  <FormGroup
-                    labelFor="input-price-stop-loss"
-                    label={''}
-                    compact
-                  >
-                    <Input
-                      id="input-price-stop-loss"
-                      appendElement={<Pill size="xs">{quoteName}</Pill>}
-                      className="w-full"
-                      type="number"
-                      step={priceStep}
-                      data-testid="order-price-stop-loss"
-                      onWheel={(e) => e.currentTarget.blur()}
-                      {...field}
-                    />
-                  </FormGroup>
-                  {fieldState.error && (
-                    <InputError testId="deal-ticket-error-message-price-stop-loss">
-                      {fieldState.error.message}
-                    </InputError>
-                  )}
-                </div>
-              )}
-            />
-          </TradingFormGroup>
-        </div>
-      </div>
-      {renderTakeProfitError()}
-      {renderStopLossError()}
-    </div>
-  );
-};

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

@@ -1003,7 +1003,7 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                 name="oco"
                 label={
                   <Tooltip
-                    description={<span>{t('One cancels the other')}</span>}
+                    description={<span>{t('One cancels another')}</span>}
                   >
                     <>{t('OCO')}</>
                   </Tooltip>

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

@@ -8,12 +8,9 @@ import { ExpirySelector } from './expiry-selector';
 import { SideSelector } from './side-selector';
 import { TimeInForceSelector } from './time-in-force-selector';
 import { TypeSelector } from './type-selector';
+import { type OrderSubmission } from '@vegaprotocol/wallet';
 import { useVegaWallet } from '@vegaprotocol/wallet-react';
-import { type Transaction } from '@vegaprotocol/wallet';
-import {
-  mapFormValuesToOrderSubmission,
-  mapFormValuesToTakeProfitAndStopLoss,
-} from '../../utils/map-form-values-to-submission';
+import { mapFormValuesToOrderSubmission } from '../../utils/map-form-values-to-submission';
 import {
   TradingInput as Input,
   TradingCheckbox as Checkbox,
@@ -80,8 +77,6 @@ import { isNonPersistentOrder } from '../../utils/time-in-force-persistence';
 import { KeyValue } from './key-value';
 import { DocsLinks } from '@vegaprotocol/environment';
 import { useT } from '../../use-t';
-import { DealTicketPriceTakeProfitStopLoss } from './deal-ticket-price-tp-sl';
-import uniqueId from 'lodash/uniqueId';
 
 export const REDUCE_ONLY_TOOLTIP =
   '"Reduce only" will ensure that this order will not increase the size of an open position. When the order is matched, it will only trade enough volume to bring your open volume towards 0 but never change the direction of your position. If applied to a limit order that is not instantly filled, the order will be stopped.';
@@ -91,7 +86,7 @@ export interface DealTicketProps {
   marketData: StaticMarketData;
   marketPrice?: string | null;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
-  submit: (order: Transaction) => void;
+  submit: (order: OrderSubmission) => void;
   onDeposit: (assetId: string) => void;
 }
 
@@ -189,7 +184,6 @@ export const DealTicket = ({
   const rawSize = watch('size');
   const rawPrice = watch('price');
   const iceberg = watch('iceberg');
-  const tpSl = watch('tpSl');
   const peakSize = watch('peakSize');
   const expiresAt = watch('expiresAt');
   const postOnly = watch('postOnly');
@@ -388,28 +382,17 @@ export const DealTicket = ({
       if (lastSubmitTime.current && now - lastSubmitTime.current < 1000) {
         return;
       }
-      if (formValues.tpSl) {
-        const reference = `${pubKey}-${now}-${uniqueId()}`;
-        const batchMarketInstructions = mapFormValuesToTakeProfitAndStopLoss(
-          formValues,
-          market,
-          reference
-        );
-        submit({
-          batchMarketInstructions,
-        });
-      } else {
-        const orderSubmission = mapFormValuesToOrderSubmission(
+      submit(
+        mapFormValuesToOrderSubmission(
           formValues,
           market.id,
           market.decimalPlaces,
           market.positionDecimalPlaces
-        );
-        submit({ orderSubmission });
-      }
+        )
+      );
       lastSubmitTime.current = now;
     },
-    [market, pubKey, submit]
+    [submit, market.decimalPlaces, market.positionDecimalPlaces, market.id]
   );
   useController({
     name: 'type',
@@ -691,63 +674,40 @@ export const DealTicket = ({
           )}
         />
       </div>
-      {
+      {isLimitType && (
         <>
           <div className="flex justify-between gap-2 pb-2">
-            {isLimitType && (
-              <Controller
-                name="iceberg"
-                control={control}
-                render={({ field }) => (
-                  <Tooltip
-                    description={
-                      <p>
-                        {t(
-                          'ICEBERG_TOOLTIP',
-                          'Trade only a fraction of the order size at once. After the peak size of the order has traded, the size is reset. This is repeated until the order is cancelled, expires, or its full volume trades away. For example, an iceberg order with a size of 1000 and a peak size of 100 will effectively be split into 10 orders with a size of 100 each. Note that the full volume of the order is not hidden and is still reflected in the order book.'
-                        )}{' '}
-                        <ExternalLink href={DocsLinks?.ICEBERG_ORDERS}>
-                          {t('Find out more')}
-                        </ExternalLink>{' '}
-                      </p>
-                    }
-                  >
-                    <div>
-                      <Checkbox
-                        name="iceberg"
-                        checked={field.value}
-                        onCheckedChange={field.onChange}
-                        disabled={disableIcebergCheckbox}
-                        label={t('Iceberg')}
-                      />
-                    </div>
-                  </Tooltip>
-                )}
-              />
-            )}
             <Controller
-              name="tpSl"
+              name="iceberg"
               control={control}
               render={({ field }) => (
                 <Tooltip
                   description={
-                    <p>{t('TP_SL_TOOLTIP', 'Take profit / Stop loss')}</p>
+                    <p>
+                      {t(
+                        'ICEBERG_TOOLTIP',
+                        'Trade only a fraction of the order size at once. After the peak size of the order has traded, the size is reset. This is repeated until the order is cancelled, expires, or its full volume trades away. For example, an iceberg order with a size of 1000 and a peak size of 100 will effectively be split into 10 orders with a size of 100 each. Note that the full volume of the order is not hidden and is still reflected in the order book.'
+                      )}{' '}
+                      <ExternalLink href={DocsLinks?.ICEBERG_ORDERS}>
+                        {t('Find out more')}
+                      </ExternalLink>{' '}
+                    </p>
                   }
                 >
                   <div>
                     <Checkbox
-                      name="tpSl"
+                      name="iceberg"
                       checked={field.value}
                       onCheckedChange={field.onChange}
-                      disabled={false}
-                      label={t('TP / SL')}
+                      disabled={disableIcebergCheckbox}
+                      label={t('Iceberg')}
                     />
                   </div>
                 </Tooltip>
               )}
             />
           </div>
-          {isLimitType && iceberg && (
+          {iceberg && (
             <DealTicketSizeIceberg
               market={market}
               peakSizeError={errors.peakSize?.message}
@@ -757,18 +717,8 @@ export const DealTicket = ({
               peakSize={peakSize}
             />
           )}
-          {tpSl && (
-            <DealTicketPriceTakeProfitStopLoss
-              market={market}
-              takeProfitError={errors.takeProfit?.message}
-              stopLossError={errors.stopLoss?.message}
-              control={control}
-              quoteName={quoteName}
-            />
-          )}
         </>
-      }
-
+      )}
       <SummaryMessage
         error={summaryError}
         asset={asset}

libs/deal-ticket/src/hooks/use-form-values.ts

@@ -53,9 +53,6 @@ export type OrderFormValues = {
   iceberg?: boolean;
   peakSize?: string;
   minimumVisibleSize?: string;
-  tpSl?: boolean;
-  takeProfit?: string;
-  stopLoss?: string;
 };
 
 type UpdateOrder = (marketId: string, values: Partial<OrderFormValues>) => void;

libs/deal-ticket/src/utils/map-form-values-to-submission.ts

@@ -10,16 +10,13 @@ import type {
 import * as Schema from '@vegaprotocol/types';
 import { removeDecimal, toNanoSeconds } from '@vegaprotocol/utils';
 import { isPersistentOrder } from './time-in-force-persistence';
-import { type MarketFieldsFragment } from '@vegaprotocol/markets';
 
 export const mapFormValuesToOrderSubmission = (
   order: OrderFormValues,
   marketId: string,
   decimalPlaces: number,
-  positionDecimalPlaces: number,
-  reference?: string
+  positionDecimalPlaces: number
 ): OrderSubmission => ({
-  reference,
   marketId: marketId,
   type: order.type,
   side: order.side,
@@ -84,8 +81,7 @@ export const mapFormValuesToStopOrdersSubmission = (
   data: StopOrderFormValues,
   marketId: string,
   decimalPlaces: number,
-  positionDecimalPlaces: number,
-  reference?: string
+  positionDecimalPlaces: number
 ): StopOrdersSubmission => {
   const submission: StopOrdersSubmission = {};
   const stopOrderSetup: StopOrderSetup = {
@@ -100,8 +96,7 @@ export const mapFormValuesToStopOrdersSubmission = (
       },
       marketId,
       decimalPlaces,
-      positionDecimalPlaces,
-      reference
+      positionDecimalPlaces
     ),
   };
   setTrigger(
@@ -125,8 +120,7 @@ export const mapFormValuesToStopOrdersSubmission = (
         },
         marketId,
         decimalPlaces,
-        positionDecimalPlaces,
-        reference
+        positionDecimalPlaces
       ),
     };
     setTrigger(
@@ -165,125 +159,3 @@ export const mapFormValuesToStopOrdersSubmission = (
 
   return submission;
 };
-
-export const mapFormValuesToTakeProfitAndStopLoss = (
-  formValues: OrderFormValues,
-  market: MarketFieldsFragment,
-  reference: string
-) => {
-  const orderSubmission = mapFormValuesToOrderSubmission(
-    formValues,
-    market.id,
-    market.decimalPlaces,
-    market.positionDecimalPlaces,
-    reference
-  );
-
-  const oppositeSide =
-    formValues.side === Schema.Side.SIDE_BUY
-      ? Schema.Side.SIDE_SELL
-      : Schema.Side.SIDE_BUY;
-  // For direction it needs to be implied
-  //  If position is LONG (BUY)
-  //  TP is SHORT and trigger is RISES ABOVE
-  //  If position is SHORT
-  //  TP is LONG and trigger is FALLS BELOW
-  const takeProfitTriggerDirection =
-    formValues.side === Schema.Side.SIDE_BUY
-      ? Schema.StopOrderTriggerDirection.TRIGGER_DIRECTION_RISES_ABOVE
-      : Schema.StopOrderTriggerDirection.TRIGGER_DIRECTION_FALLS_BELOW;
-  //  For direction it needs to be implied
-  //  If position is LONG (BUY)
-  //  SL is SHORT and trigger is FALLS BELOW
-  //  If position is SHORT
-  //  SL is LONG and trigger is RISES ABOVE
-  const stopLossTriggerDirection =
-    formValues.side === Schema.Side.SIDE_BUY
-      ? Schema.StopOrderTriggerDirection.TRIGGER_DIRECTION_FALLS_BELOW
-      : Schema.StopOrderTriggerDirection.TRIGGER_DIRECTION_RISES_ABOVE;
-
-  const stopOrdersSubmission = [];
-
-  // if there are both take profit and stop loss then the stop order needs to be OCO
-  if (formValues.takeProfit && formValues.stopLoss) {
-    const ocoStopOrderSubmission = mapFormValuesToStopOrdersSubmission(
-      {
-        ...formValues,
-        triggerPrice: formValues.stopLoss,
-        ocoTriggerPrice: formValues.takeProfit,
-        price: formValues.stopLoss,
-        triggerDirection: stopLossTriggerDirection,
-        triggerType: 'price',
-        side: oppositeSide,
-        expire: false,
-        type: Schema.OrderType.TYPE_MARKET,
-        oco: true,
-        ocoPrice: formValues.takeProfit,
-        ocoTriggerType: 'price',
-        ocoType: Schema.OrderType.TYPE_MARKET,
-        ocoSize: formValues.size,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-        ocoTimeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-      },
-      market.id,
-      market.decimalPlaces,
-      market.positionDecimalPlaces,
-      reference
-    );
-    stopOrdersSubmission.push(ocoStopOrderSubmission);
-  } else if (formValues.takeProfit) {
-    const takeProfitStopOrderSubmission = mapFormValuesToStopOrdersSubmission(
-      {
-        ...formValues,
-        price: formValues.takeProfit,
-        triggerDirection: takeProfitTriggerDirection,
-        triggerType: 'price',
-        triggerPrice: formValues.takeProfit,
-        side: oppositeSide,
-        expire: false,
-        ocoTriggerType: 'price',
-        type: Schema.OrderType.TYPE_MARKET,
-        oco: false,
-        ocoType: Schema.OrderType.TYPE_MARKET,
-        ocoSize: formValues.size,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-        ocoTimeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-      },
-      market.id,
-      market.decimalPlaces,
-      market.positionDecimalPlaces,
-      reference
-    );
-    stopOrdersSubmission.push(takeProfitStopOrderSubmission);
-  } else if (formValues.stopLoss) {
-    const stopLossStopOrderSubmission = mapFormValuesToStopOrdersSubmission(
-      {
-        ...formValues,
-        triggerPrice: formValues.stopLoss,
-        price: formValues.stopLoss,
-        triggerDirection: stopLossTriggerDirection,
-        triggerType: 'price',
-        side: oppositeSide,
-        expire: false,
-        type: Schema.OrderType.TYPE_MARKET,
-        oco: false,
-        ocoTriggerType: 'price',
-        ocoType: Schema.OrderType.TYPE_MARKET,
-        ocoSize: formValues.size,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-        ocoTimeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-      },
-      market.id,
-      market.decimalPlaces,
-      market.positionDecimalPlaces,
-      reference
-    );
-    stopOrdersSubmission.push(stopLossStopOrderSubmission);
-  }
-
-  const batchMarketInstructions = {
-    submissions: [orderSubmission],
-    stopOrdersSubmission,
-  };
-  return batchMarketInstructions;
-};

libs/deal-ticket/src/utils/map-form-values-to-submisstion.spec.ts

@@ -1,15 +1,8 @@
-import type {
-  OrderSubmissionBody,
-  StopOrdersSubmission,
-} from '@vegaprotocol/wallet';
-import {
-  mapFormValuesToOrderSubmission,
-  mapFormValuesToTakeProfitAndStopLoss,
-} from './map-form-values-to-submission';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import { mapFormValuesToOrderSubmission } from './map-form-values-to-submission';
 import * as Schema from '@vegaprotocol/types';
 import { OrderTimeInForce, OrderType } from '@vegaprotocol/types';
 import type { OrderFormValues } from '../hooks';
-import { type MarketFieldsFragment } from '@vegaprotocol/markets';
 
 describe('mapFormValuesToOrderSubmission', () => {
   it('sets and formats price only for limit orders', () => {
@@ -193,232 +186,3 @@ describe('mapFormValuesToOrderSubmission', () => {
     }
   );
 });
-
-const mockMarket: MarketFieldsFragment = {
-  __typename: 'Market',
-  id: 'marketId',
-  decimalPlaces: 1,
-  positionDecimalPlaces: 4,
-  state: Schema.MarketState.STATE_ACTIVE,
-  tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-} as MarketFieldsFragment;
-
-const orderFormValues: OrderFormValues = {
-  type: OrderType.TYPE_LIMIT,
-  side: Schema.Side.SIDE_BUY,
-  timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
-  size: '1',
-  price: '66300',
-  postOnly: false,
-  reduceOnly: false,
-  tpSl: true,
-  takeProfit: '70000',
-  stopLoss: '60000',
-};
-
-describe('mapFormValuesToTakeProfitAndStopLoss', () => {
-  it('creates batch market instructions for a normal order created with TP and SL', () => {
-    const result = mapFormValuesToTakeProfitAndStopLoss(
-      orderFormValues,
-      mockMarket,
-      'reference'
-    );
-
-    const expected: {
-      submissions: Schema.OrderSubmission[];
-      stopOrdersSubmission: StopOrdersSubmission[];
-    } = {
-      stopOrdersSubmission: [
-        {
-          fallsBelow: {
-            orderSubmission: {
-              expiresAt: undefined,
-              marketId: 'marketId',
-              postOnly: false,
-              price: undefined,
-              reduceOnly: true,
-              reference: 'reference',
-              side: Schema.Side.SIDE_SELL,
-              size: '10000',
-              timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK,
-              type: OrderType.TYPE_MARKET,
-            },
-            price: '600000',
-          },
-          risesAbove: {
-            orderSubmission: {
-              expiresAt: undefined,
-              marketId: 'marketId',
-              postOnly: false,
-              price: undefined,
-              reduceOnly: true,
-              reference: 'reference',
-              side: Schema.Side.SIDE_SELL,
-              size: '10000',
-              timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK,
-              type: OrderType.TYPE_MARKET,
-            },
-            price: '700000',
-          },
-        },
-      ],
-      submissions: [
-        {
-          expiresAt: undefined,
-          marketId: 'marketId',
-          postOnly: false,
-          price: '663000',
-          reduceOnly: false,
-          reference: 'reference',
-          side: Schema.Side.SIDE_BUY,
-          size: '10000',
-          timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
-          type: OrderType.TYPE_LIMIT,
-        },
-      ],
-    };
-    expect(result).toEqual(expected);
-  });
-
-  it('creates batch market instructions for a normal order created without TP and SL', () => {
-    // Create order form values without TP and SL
-    const orderFormValuesWithoutTPSL = { ...orderFormValues };
-    delete orderFormValuesWithoutTPSL.takeProfit;
-    delete orderFormValuesWithoutTPSL.stopLoss;
-
-    const result = mapFormValuesToTakeProfitAndStopLoss(
-      orderFormValuesWithoutTPSL,
-      mockMarket,
-      'reference'
-    );
-
-    // Expected result when TP and SL are not provided
-    const expected: {
-      submissions: Schema.OrderSubmission[];
-      stopOrdersSubmission: StopOrdersSubmission[];
-    } = {
-      stopOrdersSubmission: [],
-      submissions: [
-        {
-          expiresAt: undefined,
-          marketId: 'marketId',
-          postOnly: false,
-          price: '663000',
-          reduceOnly: false,
-          reference: 'reference',
-          side: Schema.Side.SIDE_BUY,
-          size: '10000',
-          timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
-          type: OrderType.TYPE_LIMIT,
-        },
-      ],
-    };
-    expect(result).toEqual(expected);
-  });
-
-  it('creates batch market instructions for a normal order created with TP only', () => {
-    // Create order form values with TP only
-    const orderFormValuesWithTP = { ...orderFormValues };
-    orderFormValuesWithTP.stopLoss = undefined;
-
-    const result = mapFormValuesToTakeProfitAndStopLoss(
-      orderFormValuesWithTP,
-      mockMarket,
-      'reference'
-    );
-
-    // Expected result when only TP is provided
-    const expected: {
-      submissions: Schema.OrderSubmission[];
-      stopOrdersSubmission: StopOrdersSubmission[];
-    } = {
-      stopOrdersSubmission: [
-        {
-          risesAbove: {
-            orderSubmission: {
-              expiresAt: undefined,
-              marketId: 'marketId',
-              postOnly: false,
-              price: undefined,
-              reduceOnly: true,
-              reference: 'reference',
-              side: Schema.Side.SIDE_SELL,
-              size: '10000',
-              timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK,
-              type: OrderType.TYPE_MARKET,
-            },
-            price: '700000',
-          },
-        },
-      ],
-      submissions: [
-        {
-          expiresAt: undefined,
-          marketId: 'marketId',
-          postOnly: false,
-          price: '663000',
-          reduceOnly: false,
-          reference: 'reference',
-          side: Schema.Side.SIDE_BUY,
-          size: '10000',
-          timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
-          type: OrderType.TYPE_LIMIT,
-        },
-      ],
-    };
-    expect(result).toEqual(expected);
-  });
-
-  it('creates batch market instructions for a normal order created with SL only', () => {
-    // Create order form values with SL only
-    const orderFormValuesWithSL = { ...orderFormValues };
-    orderFormValuesWithSL.takeProfit = undefined;
-
-    const result = mapFormValuesToTakeProfitAndStopLoss(
-      orderFormValuesWithSL,
-      mockMarket,
-      'reference'
-    );
-
-    // Expected result when only SL is provided
-    const expected: {
-      submissions: Schema.OrderSubmission[];
-      stopOrdersSubmission: StopOrdersSubmission[];
-    } = {
-      stopOrdersSubmission: [
-        {
-          fallsBelow: {
-            orderSubmission: {
-              expiresAt: undefined,
-              marketId: 'marketId',
-              postOnly: false,
-              price: undefined,
-              reduceOnly: true,
-              reference: 'reference',
-              side: Schema.Side.SIDE_SELL,
-              size: '10000',
-              timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK,
-              type: OrderType.TYPE_MARKET,
-            },
-            price: '600000',
-          },
-        },
-      ],
-      submissions: [
-        {
-          expiresAt: undefined,
-          marketId: 'marketId',
-          postOnly: false,
-          price: '663000',
-          reduceOnly: false,
-          reference: 'reference',
-          side: Schema.Side.SIDE_BUY,
-          size: '10000',
-          timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
-          type: OrderType.TYPE_LIMIT,
-        },
-      ],
-    };
-    expect(result).toEqual(expected);
-  });
-});

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

@@ -1,9 +1,5 @@
-import { USDT_ID, type Asset } from '@vegaprotocol/assets';
-import {
-  EtherscanLink,
-  Networks,
-  useEnvironment,
-} from '@vegaprotocol/environment';
+import type { Asset } from '@vegaprotocol/assets';
+import { EtherscanLink } from '@vegaprotocol/environment';
 import { Intent, Notification } from '@vegaprotocol/ui-toolkit';
 import {
   formatNumber,
@@ -19,7 +15,7 @@ import { useT } from './use-t';
 interface ApproveNotificationProps {
   isActive: boolean;
   selectedAsset?: Asset;
-  onApprove: (amount?: string) => void;
+  onApprove: () => void;
   approved: boolean;
   balances: DepositBalances | null;
   amount: string;
@@ -37,7 +33,6 @@ export const ApproveNotification = ({
   approveTxId,
   intent = Intent.Warning,
 }: ApproveNotificationProps) => {
-  const { VEGA_ENV } = useEnvironment();
   const t = useT();
   const tx = useEthTransactionStore((state) => {
     return state.transactions.find((t) => t?.id === approveTxId);
@@ -69,45 +64,28 @@ export const ApproveNotification = ({
           text: t('Approve {{assetSymbol}}', {
             assetSymbol: selectedAsset?.symbol,
           }),
-          action: () => onApprove(),
+          action: onApprove,
           dataTestId: 'approve-submit',
         }}
       />
     </div>
   );
-
-  let message = t('Approve again to deposit more than {{allowance}}', {
-    allowance: formatNumber(balances.allowance.toString()),
-  });
-  const buttonProps = {
-    size: 'small' as const,
-    text: t('Approve {{assetSymbol}}', {
-      assetSymbol: selectedAsset?.symbol,
-    }),
-    action: () => onApprove(),
-    dataTestId: 'reapprove-submit',
-  };
-
-  if (VEGA_ENV === Networks.MAINNET && selectedAsset.id === USDT_ID[VEGA_ENV]) {
-    message = t(
-      'USDT approved amount cannot be changed, only revoked. Revoke and reapprove to deposit more than {{allowance}}.',
-      {
-        allowance: formatNumber(balances.allowance.toString()),
-      }
-    );
-    buttonProps.text = t('Revoke {{assetSymbol}} approval', {
-      assetSymbol: selectedAsset?.symbol,
-    });
-    buttonProps.action = () => onApprove('0');
-  }
-
   const reApprovePrompt = (
     <div className="mb-4">
       <Notification
         intent={intent}
         testId="reapprove-default"
-        message={message}
-        buttonProps={buttonProps}
+        message={t('Approve again to deposit more than {{allowance}}', {
+          allowance: formatNumber(balances.allowance.toString()),
+        })}
+        buttonProps={{
+          size: 'small',
+          text: t('Approve {{assetSymbol}}', {
+            assetSymbol: selectedAsset?.symbol,
+          }),
+          action: onApprove,
+          dataTestId: 'reapprove-submit',
+        }}
       />
     </div>
   );

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

@@ -58,7 +58,7 @@ export interface DepositFormProps {
   onSelectAsset: (assetId: string) => void;
   handleAmountChange: (amount: string) => void;
   onDisconnect: () => void;
-  submitApprove: (amount?: string) => void;
+  submitApprove: () => void;
   approveTxId: number | null;
   submitFaucet: () => void;
   faucetTxId: number | null;
@@ -423,8 +423,8 @@ export const DepositForm = ({
         isActive={isActive}
         approveTxId={approveTxId}
         selectedAsset={selectedAsset}
-        onApprove={(amount) => {
-          submitApprove(amount);
+        onApprove={() => {
+          submitApprove();
           setApproveNotificationIntent(Intent.Warning);
         }}
         balances={balances}

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

@@ -35,11 +35,11 @@ export const useSubmitApproval = (
     reset: () => {
       setId(null);
     },
-    perform: (amount?: string) => {
+    perform: () => {
       if (!asset || !config) return;
       const id = createEthTransaction(contract, 'approve', [
         config?.collateral_bridge_contract.address,
-        amount ? amount : MaxUint256.toString(),
+        MaxUint256.toString(),
       ]);
       setId(id);
     },

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

@@ -134,7 +134,6 @@ export const CONSOLE_TRANSFER = '#/portfolio/assets/transfer';
 export const CONSOLE_TRANSFER_ASSET =
   '#/portfolio/assets/transfer?assetId=:assetId';
 export const CONSOLE_MARKET_PAGE = '#/markets/:marketId';
-export const CONSOLE_REWARDS_PAGE = '#/rewards';
 
 // Governance pages
 export const TOKEN_NEW_MARKET_PROPOSAL = '/proposals/propose/new-market';

libs/i18n/src/locales/en/deal-ticket.json

@@ -66,7 +66,7 @@
   "Notional": "Notional",
   "NOTIONAL_SIZE_TOOLTIP_TEXT": "The notional size represents the position size in the settlement asset {{quoteName}} of the futures contract. This is calculated by multiplying the number of contracts by the prices of the contract. For example 10 contracts traded at a price of $50 has a notional size of $500.",
   "OCO": "OCO",
-  "One cancels the other": "One cancels the other",
+  "One cancels another": "One cancels another",
   "Only limit orders are permitted when market is in auction": "Only limit orders are permitted when market is in auction",
   "Only your allocated margin will be used to fund this position, and if the maintenance margin is breached you will be closed out.": "Only your allocated margin will be used to fund this position, and if the maintenance margin is breached you will be closed out.",
   "You have an existing position on this market.": "You have an existing position on this market.",
@@ -135,12 +135,6 @@
   "Total margin available": "Total margin available",
   "TOTAL_MARGIN_AVAILABLE": "Total margin available = general {{assetSymbol}} balance ({{generalAccountBalance}} {{assetSymbol}}) + margin balance ({{marginAccountBalance}} {{assetSymbol}}) + order margin balance ({{orderMarginAccountBalance}} {{assetSymbol}}) - maintenance level ({{marginMaintenance}} {{assetSymbol}}).",
   "No trading": "No trading",
-  "TP / SL": "TP / SL",
-  "TP_SL_TOOLTIP": "Take profit / Stop loss",
-  "Take profit": "Take profit",
-  "Stop loss": "Stop loss",
-  "The price for take profit.": "The price for take profit.",
-  "The price for stop loss.": "The price for stop loss.",
   "Trailing percent offset cannot be higher than 99.9": "Trailing percent offset cannot be higher than 99.9",
   "Trailing percent offset cannot be lower than {{trailingPercentOffsetStep}}": "Trailing percent offset cannot be lower than {{trailingPercentOffsetStep}}",
   "Trailing percentage offset": "Trailing percentage offset",

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

@@ -4,7 +4,6 @@
   "Approval failed": "Approval failed",
   "Approve {{assetSymbol}}": "Approve {{assetSymbol}}",
   "Approve again to deposit more than {{allowance}}": "Approve again to deposit more than {{allowance}}",
-  "USDT approved amount cannot be changed, only revoked. Revoke and reapprove to deposit more than {{allowance}}.": "USDT approved amount cannot be changed, only revoked. Revoke and reapprove to deposit more than {{allowance}}.",
   "Asset": "Asset",
   "Balance available": "Balance available",
   "Before you can make a deposit of your chosen asset, {{assetSymbol}}, you need to approve its use in your Ethereum wallet": "Before you can make a deposit of your chosen asset, {{assetSymbol}}, you need to approve its use in your Ethereum wallet",
@@ -24,7 +23,6 @@
   "Please select": "Please select",
   "Please select an asset": "Please select an asset",
   "Remaining deposit allowance": "Remaining deposit allowance",
-  "Revoke {{assetSymbol}} approval": "Revoke {{assetSymbol}} approval",
   "Select from wallet": "Select from wallet",
   "The {{symbol}} faucet is not available at this time": "The {{symbol}} faucet is not available at this time",
   "The deposit cap is set when you approve an asset for use with this app. To increase this cap, approve {{assetSymbol}} again and choose a higher cap. Check the documentation for your Ethereum wallet app for details.": "The deposit cap is set when you approve an asset for use with this app. To increase this cap, approve {{assetSymbol}} again and choose a higher cap. Check the documentation for your Ethereum wallet app for details.",

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

@@ -971,6 +971,5 @@
   "YourIdentityAnonymous": "Your identity is always anonymous on Vega",
   "yourStake": "Your stake",
   "yourVote": "Your vote",
-  "youVoted": "You voted",
-  "rewardsMovedNotification": "Trading and liquidity rewards have moved. Visit <0>Console</0> to view your rewards."
+  "youVoted": "You voted"
 }

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

@@ -1,6 +1,8 @@
 {
   "{{liquidityPriceRange}} of mid price": "{{liquidityPriceRange}} of mid price",
   "{{probability}} probability price bounds": "{{probability}} probability price bounds",
+  "24 hour change is unavailable at this time. The price change in the last 120 hours is:": "24 hour change is unavailable at this time. The price change in the last 120 hours is:",
+  "24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}": "24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}",
   "A concept derived from traditional markets. It is a calculated value for the ‘current market price’ on a market.": "A concept derived from traditional markets. It is a calculated value for the ‘current market price’ on a market.",
   "A number that will be calculated by an appropriate stochastic risk model, dependent on the type of risk model used and its parameters.": "A number that will be calculated by an appropriate stochastic risk model, dependent on the type of risk model used and its parameters.",
   "A sliding penalty for how much an LP bond is slashed if an LP fails to reach the minimum SLA. This is a network parameter.": "A sliding penalty for how much an LP bond is slashed if an LP fails to reach the minimum SLA. This is a network parameter.",
@@ -49,6 +51,9 @@
   "Market": "Market",
   "Market data": "Market data",
   "Market governance": "Market governance",
+  "Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:": "Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:",
+  "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is:": "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is:",
+  "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}": "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}",
   "Market ID": "Market ID",
   "Market price": "Market price",
   "Market specification": "Market specification",

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

@@ -86,7 +86,6 @@
   "Docs": "Docs",
   "Earn commission & stake rewards": "Earn commission & stake rewards",
   "Earned by me": "Earned by me",
-  "Edit alias": "Edit alias",
   "Eligible teams": "Eligible teams",
   "Enactment date reached and usual auction exit checks pass": "Enactment date reached and usual auction exit checks pass",
   "[empty]": "[empty]",
@@ -143,17 +142,12 @@
   "Hoarder reward multiplier": "Hoarder reward multiplier",
   "How it works": "How it works",
   "I want a code": "I want a code",
-  "INTERVAL_I12H": "12H",
   "INTERVAL_I15M": "15m",
-  "INTERVAL_I1D": "D",
-  "INTERVAL_I1H": "1h",
+  "INTERVAL_I1D": "1D",
+  "INTERVAL_I1H": "1H",
   "INTERVAL_I1M": "1m",
-  "INTERVAL_I30M": "30m",
-  "INTERVAL_I4H": "4H",
   "INTERVAL_I5M": "5m",
-  "INTERVAL_I6H": "6h",
-  "INTERVAL_I8H": "8h",
-  "INTERVAL_I7D": "W",
+  "INTERVAL_I6H": "6H",
   "Improve vega console": "Improve vega console",
   "Inactive": "Inactive",
   "Index Price": "Index Price",
@@ -168,7 +162,6 @@
   "Joined": "Joined",
   "Joined at": "Joined at",
   "Joined epoch": "Joined epoch",
-  "Key name": "Key name",
   "gameCount_one": "Last game result",
   "gameCount_other": "Last {{count}} game results",
   "Learn about providing liquidity": "Learn about providing liquidity",
@@ -201,7 +194,6 @@
   "My liquidity provision": "My liquidity provision",
   "My trading fees": "My trading fees",
   "Name": "Name",
-  "No alias": "No alias",
   "No closed orders": "No closed orders",
   "No data": "No data",
   "No deposits": "No deposits",
@@ -235,7 +227,6 @@
   "Not connected": "Not connected",
   "Number of epochs after distribution to delay vesting of rewards by": "Number of epochs after distribution to delay vesting of rewards by",
   "Number of traders": "Number of traders",
-  "On-change alias": "On-change alias",
   "Open": "Open",
   "Open a position": "Open a position",
   "Open markets": "Open markets",
@@ -258,7 +249,6 @@
   "Portfolio": "Portfolio",
   "Positions": "Positions",
   "Price": "Price",
-  "Profile updated": "Profile updated",
   "Program ends:": "Program ends:",
   "Propose a new market": "Propose a new market",
   "Proposed final price is {{price}} {{assetSymbol}}.": "Proposed final price is {{price}} {{assetSymbol}}.",
@@ -299,7 +289,6 @@
   "Search": "Search",
   "See all markets": "See all markets",
   "Select market": "Select market",
-  "Set party alias": "Set party alias",
   "Settings": "Settings",
   "Settlement asset": "Settlement asset",
   "Settlement date": "Settlement date",
@@ -322,7 +311,6 @@
   "Stop": "Stop",
   "Stop orders": "Stop orders",
   "Streak reward multiplier": "Streak reward multiplier",
-  "Submit": "Submit",
   "Successor of a market": "Successor of a market",
   "Successors to this market have been proposed": "Successors to this market have been proposed",
   "Supplied stake": "Supplied stake",
@@ -383,7 +371,6 @@
   "Staking rewards": "Staking rewards",
   "Unknown": "Unknown",
   "Unknown settlement date": "Unknown settlement date",
-  "Unnamed key": "Unnamed key",
   "Update team": "Update team",
   "URL": "URL",
   "Use a comma separated list to allow only specific public keys to join the team": "Use a comma separated list to allow only specific public keys to join the team",
@@ -420,10 +407,8 @@
   "You will no longer be able to hold a position on this market when it closes in {{duration}}.": "You will no longer be able to hold a position on this market when it closes in {{duration}}.",
   "Your code has been rejected": "Your code has been rejected",
   "Your identity is always anonymous on Vega": "Your identity is always anonymous on Vega",
-  "Your key's private name, can be changed in your wallet": "Your key's private name, can be changed in your wallet",
   "Your referral code": "Your referral code",
   "Your tier": "Your tier",
-  "Your public alias, stored on chain": "Your public alias, stored on chain",
   "checkOutProposalsAndVote": "Check out the terms of the proposals and vote:",
   "checkOutProposalsAndVote_one": "Check out the terms of the proposal and vote:",
   "checkOutProposalsAndVote_other": "Check out the terms of the proposals and vote:",

libs/i18n/src/locales/en/wallet-react.json

@@ -7,7 +7,6 @@
   "Get MetaMask": "Get MetaMask",
   "Get the Vega Wallet": "Get the Vega Wallet",
   "I agree": "I agree",
-  "Once you have added the extension, <0>refresh</0> your browser.": "Once you have added the extension, <0>refresh</0> your browser.",
   "Successfully connected": "Successfully connected",
   "Transaction was not successful": "Transaction was not successful",
   "Wallet rejected transaction": "Wallet rejected transaction"

libs/markets/src/lib/components/last-24h-price-change/last-24h-price-change.tsx

@@ -2,14 +2,16 @@ import { type ReactNode } from 'react';
 import {
   addDecimalsFormatNumber,
   formatNumberPercentage,
+  getDateTimeFormat,
   priceChange,
   priceChangePercentage,
 } from '@vegaprotocol/utils';
-import { signedNumberCssClass } from '@vegaprotocol/datagrid';
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
+import { PriceChangeCell, signedNumberCssClass } from '@vegaprotocol/datagrid';
+import { Tooltip, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { useCandles } from '../../hooks/use-candles';
 import BigNumber from 'bignumber.js';
 import classNames from 'classnames';
+import { useT } from '../../use-t';
 
 interface Props {
   marketId?: string;
@@ -22,6 +24,7 @@ export const Last24hPriceChange = ({
   decimalPlaces,
   fallback,
 }: Props) => {
+  const t = useT();
   const { oneDayCandles, fiveDaysCandles, error } = useCandles({
     marketId,
   });
@@ -32,6 +35,56 @@ export const Last24hPriceChange = ({
     return nonIdeal;
   }
 
+  if (fiveDaysCandles.length < 24) {
+    return (
+      <Tooltip
+        description={
+          <span className="justify-start">
+            {t(
+              'Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:',
+              {
+                start: getDateTimeFormat().format(
+                  new Date(fiveDaysCandles[0].periodStart)
+                ),
+                end: getDateTimeFormat().format(
+                  new Date(
+                    fiveDaysCandles[fiveDaysCandles.length - 1].periodStart
+                  )
+                ),
+              }
+            )}
+            <PriceChangeCell
+              candles={fiveDaysCandles.map((c) => c.close) || []}
+              decimalPlaces={decimalPlaces}
+            />
+          </span>
+        }
+      >
+        <span>{nonIdeal}</span>
+      </Tooltip>
+    );
+  }
+
+  if (oneDayCandles.length < 24) {
+    return (
+      <Tooltip
+        description={
+          <span className="justify-start">
+            {t(
+              '24 hour change is unavailable at this time. The price change in the last 120 hours is:'
+            )}{' '}
+            <PriceChangeCell
+              candles={fiveDaysCandles.map((c) => c.close) || []}
+              decimalPlaces={decimalPlaces}
+            />
+          </span>
+        }
+      >
+        <span>{nonIdeal}</span>
+      </Tooltip>
+    );
+  }
+
   const candles = oneDayCandles?.map((c) => c.close) || [];
   const change = priceChange(candles);
   const changePercentage = priceChangePercentage(candles);

libs/markets/src/lib/components/last-24h-volume/last-24h-volume.tsx

@@ -2,6 +2,7 @@ import { calcCandleVolume, calcCandleVolumePrice } from '../../market-utils';
 import {
   addDecimalsFormatNumber,
   formatNumber,
+  getDateTimeFormat,
   isNumeric,
 } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
@@ -36,6 +37,83 @@ export const Last24hVolume = ({
     return nonIdeal;
   }
 
+  if (fiveDaysCandles.length < 24) {
+    const candleVolume = calcCandleVolume(fiveDaysCandles);
+    const candleVolumePrice = calcCandleVolumePrice(
+      fiveDaysCandles,
+      marketDecimals,
+      positionDecimalPlaces
+    );
+    const candleVolumeValue =
+      candleVolume && isNumeric(positionDecimalPlaces)
+        ? addDecimalsFormatNumber(
+            candleVolume,
+            positionDecimalPlaces,
+            formatDecimals
+          )
+        : '-';
+    return (
+      <Tooltip
+        description={
+          <div>
+            <span className="flex flex-col">
+              {t(
+                'Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}',
+                {
+                  start: getDateTimeFormat().format(
+                    new Date(fiveDaysCandles[0].periodStart)
+                  ),
+                  end: getDateTimeFormat().format(
+                    new Date(
+                      fiveDaysCandles[fiveDaysCandles.length - 1].periodStart
+                    )
+                  ),
+                  candleVolumeValue,
+                  candleVolumePrice,
+                  quoteUnit,
+                }
+              )}
+            </span>
+          </div>
+        }
+      >
+        <span>{nonIdeal}</span>
+      </Tooltip>
+    );
+  }
+
+  if (oneDayCandles.length < 24) {
+    const candleVolume = calcCandleVolume(fiveDaysCandles);
+    const candleVolumePrice = calcCandleVolumePrice(
+      fiveDaysCandles,
+      marketDecimals,
+      positionDecimalPlaces
+    );
+    const candleVolumeValue =
+      candleVolume && isNumeric(positionDecimalPlaces)
+        ? addDecimalsFormatNumber(
+            candleVolume,
+            positionDecimalPlaces,
+            formatDecimals
+          )
+        : '-';
+    return (
+      <Tooltip
+        description={
+          <div>
+            <span className="flex flex-col">
+              {t(
+                '24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of ({{candleVolumePrice}} {{quoteUnit}})',
+                { candleVolumeValue, candleVolumePrice, quoteUnit }
+              )}
+            </span>
+          </div>
+        }
+      >
+        <span>{nonIdeal}</span>
+      </Tooltip>
+    );
+  }
   const candleVolume = oneDayCandles
     ? calcCandleVolume(oneDayCandles)
     : initialValue;

libs/markets/src/lib/hooks/use-candles.ts

@@ -8,7 +8,7 @@ export const useCandles = ({ marketId }: { marketId?: string }) => {
   const fiveDaysAgo = useFiveDaysAgo();
   const yesterday = useYesterday();
   const since = new Date(fiveDaysAgo).toISOString();
-  const { data: fiveDaysCandles, error } = useThrottledDataProvider({
+  const { data, error } = useThrottledDataProvider({
     dataProvider: marketCandlesProvider,
     variables: {
       marketId: marketId || '',
@@ -18,6 +18,13 @@ export const useCandles = ({ marketId }: { marketId?: string }) => {
     skip: !marketId,
   });
 
+  const fiveDaysCandles = data?.filter((c) => {
+    if (c.open === '' || c.close === '' || c.high === '' || c.close === '') {
+      return false;
+    }
+    return true;
+  });
+
   const oneDayCandles = fiveDaysCandles?.filter((candle) =>
     isCandleLessThan24hOld(candle, yesterday)
   );

libs/trading-view/src/lib/constants.ts

@@ -15,14 +15,9 @@ export const TRADINGVIEW_INTERVAL_MAP = {
   [Interval.INTERVAL_I1M]: '1',
   [Interval.INTERVAL_I5M]: '5',
   [Interval.INTERVAL_I15M]: '15',
-  [Interval.INTERVAL_I30M]: '30',
   [Interval.INTERVAL_I1H]: '60',
-  [Interval.INTERVAL_I4H]: '240',
   [Interval.INTERVAL_I6H]: '360',
-  [Interval.INTERVAL_I8H]: '480',
-  [Interval.INTERVAL_I12H]: '720',
   [Interval.INTERVAL_I1D]: '1D',
-  [Interval.INTERVAL_I7D]: '1W',
 } as const;
 
 export type ResolutionRecord = typeof TRADINGVIEW_INTERVAL_MAP;

libs/trading-view/src/lib/trading-view-container.tsx

@@ -1,7 +1,7 @@
 import { useScript } from '@vegaprotocol/react-helpers';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useT } from './use-t';
-import { TradingView } from './trading-view';
+import { TradingView, type OnAutoSaveNeededCallback } from './trading-view';
 import { CHARTING_LIBRARY_FILE, type ResolutionString } from './constants';
 
 export const TradingViewContainer = ({
@@ -10,12 +10,16 @@ export const TradingViewContainer = ({
   marketId,
   interval,
   onIntervalChange,
+  onAutoSaveNeeded,
+  state,
 }: {
   libraryPath: string;
   libraryHash: string;
   marketId: string;
   interval: ResolutionString;
   onIntervalChange: (interval: string) => void;
+  onAutoSaveNeeded: OnAutoSaveNeededCallback;
+  state: object | undefined;
 }) => {
   const t = useT();
   const scriptState = useScript(
@@ -45,6 +49,8 @@ export const TradingViewContainer = ({
       marketId={marketId}
       interval={interval}
       onIntervalChange={onIntervalChange}
+      onAutoSaveNeeded={onAutoSaveNeeded}
+      state={state}
     />
   );
 };

libs/trading-view/src/lib/trading-view.tsx

@@ -25,11 +25,15 @@ export const TradingView = ({
   libraryPath,
   interval,
   onIntervalChange,
+  onAutoSaveNeeded,
+  state,
 }: {
   marketId: string;
   libraryPath: string;
   interval: ResolutionString;
   onIntervalChange: (interval: string) => void;
+  onAutoSaveNeeded: OnAutoSaveNeededCallback;
+  state: object | undefined;
 }) => {
   const { isMobile } = useScreenDimensions();
   const { theme } = useThemeSwitcher();
@@ -104,6 +108,7 @@ export const TradingView = ({
         backgroundColor: overrides['paneProperties.background'],
       },
       auto_save_delay: 1,
+      saved_data: state,
     };
 
     widgetRef.current = new window.TradingView.widget(widgetOptions);
@@ -112,12 +117,25 @@ export const TradingView = ({
       if (!widgetRef.current) return;
 
       const activeChart = widgetRef.current.activeChart();
-      activeChart.createStudy('Volume');
+
+      if (!state) {
+        // If chart has loaded with no state, create a volume study
+        activeChart.createStudy('Volume');
+      }
 
       // Subscribe to interval changes so it can be persisted in chart settings
       activeChart.onIntervalChanged().subscribe(null, onIntervalChange);
     });
+
+    widgetRef.current.subscribe('onAutoSaveNeeded', () => {
+      if (!widgetRef.current) return;
+
+      widgetRef.current.save((newState) => {
+        onAutoSaveNeeded(newState);
+      });
+    });
   }, [
+    state,
     datafeed,
     interval,
     prevTheme,
@@ -127,6 +145,7 @@ export const TradingView = ({
     language,
     libraryPath,
     isMobile,
+    onAutoSaveNeeded,
     onIntervalChange,
   ]);
 

libs/trading-view/src/lib/use-datafeed.ts

@@ -32,14 +32,9 @@ const resolutionMap: Record<string, Interval> = {
   '1': Interval.INTERVAL_I1M,
   '5': Interval.INTERVAL_I5M,
   '15': Interval.INTERVAL_I15M,
-  '30': Interval.INTERVAL_I30M,
   '60': Interval.INTERVAL_I1H,
-  '240': Interval.INTERVAL_I4H,
   '360': Interval.INTERVAL_I6H,
-  '480': Interval.INTERVAL_I8H,
-  '720': Interval.INTERVAL_I12H,
   '1D': Interval.INTERVAL_I1D,
-  '1W': Interval.INTERVAL_I7D,
 } as const;
 
 const supportedResolutions = Object.keys(resolutionMap);

libs/types/src/__generated__/types.ts

@@ -936,8 +936,6 @@ export enum DispatchMetric {
 /** Dispatch strategy for a recurring transfer */
 export type DispatchStrategy = {
   __typename?: 'DispatchStrategy';
-  /** Optional multiplier on taker fees used to cap the rewards a party may receive in an epoch */
-  capRewardFeeMultiple?: Maybe<Scalars['String']>;
   /** Defines the data that will be used to compare markets so as to distribute rewards appropriately */
   dispatchMetric: DispatchMetric;
   /** The asset to use for measuring contribution to the metric */
@@ -2393,8 +2391,6 @@ export type Market = {
   state: MarketState;
   /** Optional: Market ID of the successor to this market if one exists */
   successorMarketID?: Maybe<Scalars['ID']>;
-  /** The market minimum tick size */
-  tickSize: Scalars['String'];
   /** An instance of, or reference to, a tradable instrument. */
   tradableInstrument: TradableInstrument;
   /** @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead */
@@ -2820,8 +2816,6 @@ export type NewMarket = {
   riskParameters: RiskModel;
   /** Successor market configuration. If this proposed market is meant to succeed a given market, then this needs to be set. */
   successorConfiguration?: Maybe<SuccessorConfiguration>;
-  /** The market minimum tick size */
-  tickSize: Scalars['String'];
 };
 
 /** Configuration for a new spot market on Vega */
@@ -2845,8 +2839,6 @@ export type NewSpotMarket = {
   riskParameters?: Maybe<RiskModel>;
   /** Specifies parameters related to liquidity target stake calculation */
   targetStakeParameters: TargetStakeParameters;
-  /** The market minimum tick size */
-  tickSize: Scalars['String'];
 };
 
 export type NewTransfer = {
@@ -7082,8 +7074,6 @@ export type UpdateMarketConfiguration = {
   quadraticSlippageFactor: Scalars['String'];
   /** Updated futures market risk model parameters. */
   riskParameters: UpdateMarketRiskParameters;
-  /** The market minimum tick size */
-  tickSize: Scalars['String'];
 };
 
 export type UpdateMarketLogNormalRiskModel = {
@@ -7181,8 +7171,6 @@ export type UpdateSpotMarketConfiguration = {
   riskParameters: RiskModel;
   /** Specifies parameters related to target stake calculation */
   targetStakeParameters: TargetStakeParameters;
-  /** The market minimum tick size */
-  tickSize: Scalars['String'];
 };
 
 export type UpdateVolumeDiscountProgram = {

libs/ui-toolkit/src/components/input-error/input-error.tsx

@@ -17,8 +17,8 @@ export const InputError = ({
   ...props
 }: InputErrorProps) => {
   const effectiveClassName = classNames(
-    'text-sm block items-center first-letter:capitalize',
-    'mt-2 min-w-0 break-words',
+    'text-sm flex items-center first-letter:uppercase',
+    'mt-2',
     {
       'border-danger': intent === 'danger',
       'border-warning': intent === 'warning',

libs/wallet-react/src/components/connect-dialog/connection-options.tsx

@@ -1,9 +1,4 @@
-import {
-  type ReactNode,
-  type FunctionComponent,
-  forwardRef,
-  useState,
-} from 'react';
+import { type ReactNode, type FunctionComponent, forwardRef } from 'react';
 import {
   ConnectorErrors,
   isBrowserWalletInstalled,
@@ -17,7 +12,6 @@ import { useConnect } from '../../hooks/use-connect';
 import { Links } from '../../constants';
 import { ConnectorIcon } from './connector-icon';
 import { useUserAgent } from '@vegaprotocol/react-helpers';
-import { Trans } from 'react-i18next';
 
 const vegaExtensionsLinks = {
   chrome: Links.chromeExtension,
@@ -35,67 +29,48 @@ export const ConnectionOptions = ({
   onConnect: (id: ConnectorType) => void;
 }) => {
   const t = useT();
-  const { connectors } = useConnect();
   const error = useWallet((store) => store.error);
-  const [isInstalling, setIsInstalling] = useState(false);
+  const { connectors } = useConnect();
 
   return (
     <div className="flex flex-col items-start gap-4">
       <h2 className="text-xl">{t('Connect to Vega')}</h2>
-      {isInstalling ? (
-        <p className="text-warning">
-          <Trans
-            i18nKey="Once you have added the extension, <0>refresh</0> your browser."
-            components={[
-              <button
-                onClick={() => window.location.reload()}
-                className="underline underline-offset-4"
-              />,
-            ]}
-          />
+      <ul
+        className="grid grid-cols-1 sm:grid-cols-2 gap-1 -mx-2"
+        data-testid="connectors-list"
+      >
+        {connectors.map((c) => {
+          const ConnectionOption = ConnectionOptionRecord[c.id];
+          const props = {
+            id: c.id,
+            name: c.name,
+            description: c.description,
+            showDescription: false,
+            onClick: () => onConnect(c.id),
+          };
+
+          if (ConnectionOption) {
+            return (
+              <li key={c.id}>
+                <ConnectionOption {...props} />
+              </li>
+            );
+          }
+
+          return (
+            <li key={c.id}>
+              <ConnectionOptionDefault {...props} />
+            </li>
+          );
+        })}
+      </ul>
+      {error && error.code !== ConnectorErrors.userRejected.code && (
+        <p
+          className="text-danger text-sm first-letter:uppercase"
+          data-testid="connection-error"
+        >
+          {error.message}
         </p>
-      ) : (
-        <>
-          <ul
-            className="grid grid-cols-1 sm:grid-cols-2 gap-1 -mx-2"
-            data-testid="connectors-list"
-          >
-            {connectors.map((c) => {
-              const ConnectionOption = ConnectionOptionRecord[c.id];
-              const props = {
-                id: c.id,
-                name: c.name,
-                description: c.description,
-                showDescription: false,
-                onClick: () => onConnect(c.id),
-                onInstall: () => setIsInstalling(true),
-              };
-
-              if (ConnectionOption) {
-                return (
-                  <li key={c.id}>
-                    <ConnectionOption {...props} />
-                  </li>
-                );
-              }
-
-              return (
-                <li key={c.id}>
-                  <ConnectionOptionDefault {...props} />
-                </li>
-              );
-            })}
-          </ul>
-          {error && error.code !== ConnectorErrors.userRejected.code && (
-            <p
-              className="text-danger text-sm first-letter:uppercase"
-              data-testid="connection-error"
-            >
-              {error.message}
-              {error.data ? `: ${error.data}` : ''}
-            </p>
-          )}
-        </>
       )}
       <a
         href={Links.walletOverview}
@@ -115,7 +90,6 @@ interface ConnectionOptionProps {
   description: string;
   showDescription?: boolean;
   onClick: () => void;
-  onInstall?: () => void;
 }
 
 const CONNECTION_OPTION_CLASSES =
@@ -168,7 +142,6 @@ export const ConnectionOptionInjected = ({
   description,
   showDescription = false,
   onClick,
-  onInstall,
 }: ConnectionOptionProps) => {
   const t = useT();
   const userAgent = useUserAgent();
@@ -185,11 +158,7 @@ export const ConnectionOptionInjected = ({
         </span>
       </ConnectionOptionButtonWithDescription>
     ) : (
-      <ConnectionOptionLinkWithDescription
-        id={id}
-        href={link}
-        onClick={onInstall}
-      >
+      <ConnectionOptionLinkWithDescription id={id} href={link}>
         <span className="flex flex-col justify-start text-left">
           <span className="capitalize leading-5">
             {t('Get the Vega Wallet')}
@@ -214,7 +183,7 @@ export const ConnectionOptionInjected = ({
             {name}
           </ConnectionOptionButton>
         ) : (
-          <ConnectionOptionLink id={id} href={link} onClick={onInstall}>
+          <ConnectionOptionLink id={id} href={link}>
             {t('Get the Vega Wallet')}
           </ConnectionOptionLink>
         )}
@@ -306,9 +275,8 @@ const ConnectionOptionLink = forwardRef<
     children: ReactNode;
     id: ConnectorType;
     href: string;
-    onClick?: () => void;
   }
->(({ children, id, href, onClick }, ref) => {
+>(({ children, id, href }, ref) => {
   return (
     <a
       href={href}
@@ -317,7 +285,6 @@ const ConnectionOptionLink = forwardRef<
       className={CONNECTION_OPTION_CLASSES}
       data-testid={`connector-${id}`}
       ref={ref}
-      onClick={onClick}
     >
       <ConnectorIcon id={id} />
       {children}
@@ -353,10 +320,8 @@ const ConnectionOptionLinkWithDescription = forwardRef<
     children: ReactNode;
     id: ConnectorType;
     href: string;
-
-    onClick?: () => void;
   }
->(({ children, id, href, onClick }, ref) => {
+>(({ children, id, href }, ref) => {
   return (
     <a
       ref={ref}
@@ -364,7 +329,6 @@ const ConnectionOptionLinkWithDescription = forwardRef<
       href={href}
       target="_blank"
       rel="noreferrer"
-      onClick={onClick}
     >
       <span>
         <ConnectorIcon id={id} />

libs/wallet-react/src/hooks/use-eager-connect.ts

@@ -1,20 +1,17 @@
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { useWallet } from './use-wallet';
 import { useConnect } from './use-connect';
 
 export function useEagerConnect() {
   const current = useWallet((store) => store.current);
-  const status = useWallet((store) => store.status);
   const { connect } = useConnect();
+  const [connecting, setConnecting] = useState(true);
 
   useEffect(() => {
     const attemptConnect = async () => {
       // No stored config, or config was malformed or no risk accepted
       if (!current) {
-        return;
-      }
-
-      if (status !== 'disconnected') {
+        setConnecting(false);
         return;
       }
 
@@ -22,13 +19,15 @@ export function useEagerConnect() {
         await connect(current);
       } catch {
         console.warn(`Failed to connect with connector: ${current}`);
+      } finally {
+        setConnecting(false);
       }
     };
 
     if (typeof window !== 'undefined') {
       attemptConnect();
     }
-  }, [status, connect, current]);
+  }, [connect, current, connecting]);
 
-  return status;
+  return connecting;
 }

libs/wallet-react/src/hooks/use-simple-transaction.ts

@@ -33,12 +33,6 @@ export const useSimpleTransaction = (opts?: Options) => {
   const [result, setResult] = useState<Result>();
   const [error, setError] = useState<string>();
 
-  const reset = () => {
-    setStatus('idle');
-    setResult(undefined);
-    setError(undefined);
-  };
-
   const send = async (tx: Transaction) => {
     if (!pubKey) {
       throw new Error('no pubKey');
@@ -65,12 +59,12 @@ export const useSimpleTransaction = (opts?: Options) => {
         if (err.code === ConnectorErrors.userRejected.code) {
           setStatus('idle');
         } else {
-          setError(`${err.message}${err.data ? `: ${err.data}` : ''}`);
+          setError(err.message);
           setStatus('idle');
           opts?.onError?.(err.message);
         }
       } else {
-        const msg = t('Something went wrong');
+        const msg = t('Wallet rejected transaction');
         setError(msg);
         setStatus('idle');
         opts?.onError?.(msg);
@@ -120,6 +114,5 @@ export const useSimpleTransaction = (opts?: Options) => {
     error,
     status,
     send,
-    reset,
   };
 };

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

@@ -7,7 +7,6 @@ import {
   listKeysError,
   noWalletError,
   sendTransactionError,
-  userRejectedError,
 } from '../errors';
 import {
   type TransactionParams,
@@ -15,19 +14,6 @@ import {
   type VegaWalletEvent,
 } from '../types';
 
-interface InjectedError {
-  message: string;
-  code: number;
-  data:
-    | {
-        message: string;
-        code: number;
-      }
-    | string;
-}
-
-const USER_REJECTED_CODE = -4;
-
 export class InjectedConnector implements Connector {
   readonly id = 'injected';
   readonly name = 'Vega Wallet';
@@ -99,55 +85,15 @@ export class InjectedConnector implements Connector {
         sentAt: res.sentAt,
       };
     } catch (err) {
-      if (this.isInjectedError(err)) {
-        if (err.code === USER_REJECTED_CODE) {
-          throw userRejectedError();
-        }
-
-        if (typeof err.data === 'string') {
-          throw sendTransactionError(err.data);
-        } else {
-          throw sendTransactionError(err.data.message);
-        }
-      }
-
       throw sendTransactionError();
     }
   }
 
   on(event: VegaWalletEvent, callback: () => void) {
-    // Check for on/off in case user is on older versions which don't support it
-    // We can remove this check once FF is at the latest version
-    if (
-      typeof window.vega !== 'undefined' &&
-      typeof window.vega.on === 'function'
-    ) {
-      window.vega.on(event, callback);
-    }
+    window.vega.on(event, callback);
   }
 
   off(event: VegaWalletEvent, callback: () => void) {
-    // Check for on/off in case user is on older versions which don't support it
-    // We can remove this check once FF is at the latest version
-    if (
-      typeof window.vega !== 'undefined' &&
-      typeof window.vega.off === 'function'
-    ) {
-      window.vega.off(event, callback);
-    }
-  }
-
-  private isInjectedError(obj: unknown): obj is InjectedError {
-    if (
-      obj !== undefined &&
-      obj !== null &&
-      typeof obj === 'object' &&
-      'code' in obj &&
-      'message' in obj &&
-      'data' in obj
-    ) {
-      return true;
-    }
-    return false;
+    window.vega.off(event, callback);
   }
 }

libs/wallet/src/connectors/json-rpc-connector.ts

@@ -17,8 +17,6 @@ import {
 
 type JsonRpcConnectorConfig = { url: string; token?: string };
 
-const USER_REJECTED_CODE = 3001;
-
 export class JsonRpcConnector implements Connector {
   readonly id = 'jsonRpc';
   readonly name = 'Command Line Wallet';
@@ -29,7 +27,7 @@ export class JsonRpcConnector implements Connector {
   requestId: number = 0;
   store: StoreApi<Store> | undefined;
   pollRef: NodeJS.Timer | undefined;
-  ee: InstanceType<typeof EventEmitter>;
+  ee: EventEmitter;
 
   constructor(config: JsonRpcConnectorConfig) {
     this.url = config.url;
@@ -65,7 +63,7 @@ export class JsonRpcConnector implements Connector {
         const token = response.headers.get('Authorization');
 
         if (!response.ok) {
-          if ('error' in data && data.error.code === USER_REJECTED_CODE) {
+          if ('error' in data && data.error.code === 3001) {
             throw userRejectedError();
           }
           throw connectError('response not ok');
@@ -139,7 +137,7 @@ export class JsonRpcConnector implements Connector {
 
       if (!response.ok) {
         if ('error' in data) {
-          if (data.error.code === USER_REJECTED_CODE) {
+          if (data.error.code === 3001) {
             throw userRejectedError();
           }
 

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

@@ -1,3 +1,4 @@
+import EventEmitter from 'eventemitter3';
 import {
   ConnectorError,
   chainIdError,
@@ -5,13 +6,13 @@ import {
   listKeysError,
   noWalletError,
   sendTransactionError,
-  userRejectedError,
 } from '../errors';
 import { type Transaction } from '../transaction-types';
 import {
   JsonRpcMethod,
   type Connector,
   type TransactionParams,
+  type VegaWalletEvent,
 } from '../types';
 
 enum EthereumMethod {
@@ -42,6 +43,7 @@ declare global {
   type WindowEthereumProvider = {
     isMetaMask: boolean;
     request<T = unknown>(args: RequestArguments): Promise<T>;
+    selectedAddress: string | null;
   };
 
   interface Window {
@@ -50,16 +52,6 @@ declare global {
   }
 }
 
-interface SnapRPCError {
-  code: number;
-  message: string;
-  data?: {
-    originalError: { code: number };
-  };
-}
-
-const USER_REJECTED_CODE = -4;
-
 export class SnapConnector implements Connector {
   readonly id = 'snap';
   readonly name = 'MetaMask Snap';
@@ -69,6 +61,8 @@ export class SnapConnector implements Connector {
   node: string;
   version: string;
   snapId: string;
+  pollRef: NodeJS.Timer | undefined;
+  ee: EventEmitter;
 
   // Note: apps may not know which node is selected on start up so its up
   // to the app to make sure class intances are renewed if the node changes
@@ -76,21 +70,14 @@ export class SnapConnector implements Connector {
     this.node = config.node;
     this.version = config.version;
     this.snapId = config.snapId;
+    this.ee = new EventEmitter();
   }
 
   bindStore() {}
 
   async connectWallet(desiredChainId: string) {
     try {
-      const res = await this.requestSnap();
-
-      if (res[this.snapId].blocked) {
-        throw connectError('snap is blocked');
-      }
-
-      if (!res[this.snapId].enabled) {
-        throw connectError('snap is not enabled');
-      }
+      await this.requestSnap();
 
       const { chainId } = await this.getChainId();
 
@@ -100,6 +87,7 @@ export class SnapConnector implements Connector {
         );
       }
 
+      this.startPoll();
       return { success: true };
     } catch (err) {
       if (err instanceof ConnectorError) {
@@ -110,66 +98,57 @@ export class SnapConnector implements Connector {
     }
   }
 
-  async disconnectWallet() {}
+  async disconnectWallet() {
+    this.stopPoll();
+  }
 
   // deprecated, pass chain on connect
   async getChainId() {
     try {
-      const data = await this.invokeSnap<{ chainID: string }>(
+      const res = await this.invokeSnap<{ chainID: string }>(
         JsonRpcMethod.GetChainId,
         {
           networkEndpoints: [this.node],
         }
       );
-
-      if ('error' in data) {
-        throw chainIdError(data.error.message);
-      }
-
-      return { chainId: data.chainID };
+      return { chainId: res.chainID };
     } catch (err) {
-      if (err instanceof ConnectorError) {
-        throw err;
-      }
-
+      this.stopPoll();
       throw chainIdError();
     }
   }
 
   async listKeys() {
     try {
-      const data = await this.invokeSnap<{
+      const res = await this.invokeSnap<{
         keys: Array<{ publicKey: string; name: string }>;
       }>(JsonRpcMethod.ListKeys);
-
-      if ('error' in data) {
-        throw listKeysError(data.error.message);
-      }
-
-      return data.keys;
+      return res.keys;
     } catch (err) {
-      if (err instanceof ConnectorError) {
-        throw err;
-      }
+      this.stopPoll();
       throw listKeysError();
     }
   }
 
   async isConnected() {
     try {
+      // Check if metamask is unlocked
+      if (!window.ethereum.selectedAddress) {
+        throw noWalletError();
+      }
+
       // If this throws its likely the snap is disabled or has been uninstalled
       await this.listKeys();
       return { connected: true };
     } catch (err) {
+      this.stopPoll();
       return { connected: false };
     }
   }
 
   async sendTransaction(params: TransactionParams) {
     try {
-      // If the transaction is invalid this will throw with SnapRPCError
-      // but if its rejected it will resolve with 'error' in data
-      const data = await this.invokeSnap<{
+      const res = await this.invokeSnap<{
         transactionHash: string;
         transaction: { signature: { value: string } };
         receivedAt: string;
@@ -181,99 +160,115 @@ export class SnapConnector implements Connector {
         networkEndpoints: [this.node],
       });
 
-      if ('error' in data) {
-        if (data.error.code === USER_REJECTED_CODE) {
-          throw userRejectedError();
-        }
-
-        throw sendTransactionError(`${data.error.message}: ${data.error.data}`);
-      }
-
       return {
-        transactionHash: data.transactionHash,
-        signature: data.transaction.signature.value,
-        receivedAt: data.receivedAt,
-        sentAt: data.sentAt,
+        transactionHash: res.transactionHash,
+        signature: res.transaction.signature.value,
+        receivedAt: res.receivedAt,
+        sentAt: res.sentAt,
       };
     } catch (err) {
       if (err instanceof ConnectorError) {
         throw err;
       }
 
-      if (this.isSnapRPCError(err)) {
-        throw sendTransactionError(err.message);
-      }
-
       throw sendTransactionError();
     }
   }
 
-  on() {}
-
-  off() {}
+  on(event: VegaWalletEvent, callback: () => void) {
+    this.ee.on(event, callback);
+  }
 
+  off(event: VegaWalletEvent, callback?: () => void) {
+    this.ee.off(event, callback);
+  }
   ////////////////////////////////////
   // Snap methods
   ////////////////////////////////////
 
+  private startPoll() {
+    // This only event we need to poll for right now is client.disconnect,
+    // if more events get added we will need more logic here
+    this.pollRef = setInterval(async () => {
+      const result = await this.isConnected();
+      if (result.connected) return;
+      this.ee.emit('client.disconnected');
+    }, 2000);
+  }
+
+  private stopPoll() {
+    if (this.pollRef) {
+      clearInterval(this.pollRef);
+    }
+  }
+
   /**
    * Requests permission for a website to communicate with the specified snaps
    * and attempts to install them if they're not already installed.
    * If the installation of any snap fails, returns the error that caused the failure.
    * More informations here: https://docs.metamask.io/snaps/reference/rpc-api/#wallet_requestsnaps
    */
-  private async requestSnap(): Promise<{
-    [snapId: string]: {
-      blocked: boolean;
-      enabled: boolean;
-      id: string;
-      version: string;
-    };
-  }> {
-    return window.ethereum.request({
-      method: EthereumMethod.RequestSnaps,
-      params: {
-        [this.snapId]: {
-          version: this.version,
-        },
+  private async requestSnap() {
+    await this.request(EthereumMethod.RequestSnaps, {
+      [this.snapId]: {
+        version: this.version,
       },
     });
   }
 
+  // TODO: check if this is needed, its used in use-snap-status
+  //
+  //
+  // /**
+  //  * Gets the list of all installed snaps.
+  //  * More information here: https://docs.metamask.io/snaps/reference/rpc-api/#wallet_getsnaps
+  //  */
+  // async getSnap() {
+  //   const snaps = await this.request(EthereumMethod.GetSnaps);
+  //   return Object.values(snaps).find(
+  //     (s) => s.id === this.snapId && s.version === this.version
+  //   );
+  // }
+
   /**
    * Calls a method on the specified snap, always vega in this case
    * should always be npm:@vegaprotocol/snap
    */
   private async invokeSnap<TResult>(
     method: JsonRpcMethod,
-    params: SnapInvocationParams = {}
-  ): Promise<TResult | { error: SnapRPCError }> {
-    // MetaMask in Firefox doesn't like undefined properties or some properties
-    // on __proto__ so we need to strip them out with JSON.strinfify
-    params = JSON.parse(JSON.stringify(params));
-
-    return window.ethereum.request({
-      method: EthereumMethod.InvokeSnap,
-      params: {
-        snapId: this.snapId,
-        request: {
-          method,
-          params,
-        },
+    params?: SnapInvocationParams
+  ): Promise<TResult> {
+    return await this.request(EthereumMethod.InvokeSnap, {
+      snapId: this.snapId,
+      request: {
+        method,
+        params,
       },
     });
   }
 
-  private isSnapRPCError(obj: unknown): obj is SnapRPCError {
-    if (
-      obj !== undefined &&
-      obj !== null &&
-      typeof obj === 'object' &&
-      'code' in obj &&
-      'message' in obj
-    ) {
-      return true;
+  /**
+   * Calls window.ethereum.request with method and params
+   */
+  private async request<TResult>(
+    method: EthereumMethod,
+    params?: object
+  ): Promise<TResult> {
+    if (window.ethereum?.request && window.ethereum?.isMetaMask) {
+      // MetaMask in Firefox doesn't like undefined properties or some properties
+      // on __proto__ so we need to strip them out with JSON.strinfify
+      try {
+        params = JSON.parse(JSON.stringify(params));
+      } catch (err) {
+        throw sendTransactionError();
+      }
+
+      return window.ethereum.request({
+        method,
+        params,
+      });
     }
-    return false;
+
+    throw noWalletError();
   }
 }

libs/wallet/src/errors.ts

@@ -12,7 +12,7 @@ export class ConnectorError extends Error {
 
 export const ConnectorErrors = {
   userRejected: { message: 'user rejected', code: 0 },
-  noConnector: { message: 'not connected', code: 1 },
+  noConnector: { message: 'no connector', code: 1 },
   connect: { message: 'failed to connect', code: 2 },
   disconnect: { message: 'failed to disconnect', code: 3 },
   chainId: { message: 'incorrect chain id', code: 4 },