test: move closeWelcomeDialog

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

@@ -98,37 +98,36 @@ jobs:
       # See affected apps
       - name: See affected apps
         run: |
-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
-          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
-
           echo ">>>> debug"
           echo "NX_BASE: ${{ env.NX_BASE }}"
           echo "NX_HEAD: ${{ env.NX_HEAD }}"
-          echo "Affected: ${affected}"
-          echo "Branch slug: ${branch_slug}"
           echo ">>>> eof debug"
 
+          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
+
+          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
           projects_e2e=""
           preview_governance="not deployed"
           preview_trading="not deployed"
           preview_explorer="not deployed"
-          if [[ $affected == *"governance"* ]]; then
-            projects_e2e+='"governance-e2e" '
-            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
-          fi
-          if [[ $affected == *"trading"* ]]; then
-            projects_e2e+='"trading-e2e" '
-            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
-          fi
-          if [[ $affected == *"explorer"* ]]; then
-            projects_e2e+='"explorer-e2e" '
-            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-          fi
           if [[ -z "$projects_e2e" ]]; then
             projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '
             preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
             preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
             preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+          else
+            if [[ $affected == *"governance"* ]]; then
+              projects_e2e+='"governance-e2e" '
+              preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+            fi
+            if [[ $affected == *"trading"* ]]; then
+              projects_e2e+='"trading-e2e" '
+              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+            fi
+            if [[ $affected == *"explorer"* ]]; then
+              projects_e2e+='"explorer-e2e" '
+              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+            fi
           fi
           projects_e2e=${projects_e2e%?}
           projects_e2e=[${projects_e2e// /,}]

apps/explorer/.env.mainnet

@@ -1,7 +1,6 @@
 # App configuration variables
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
-NX_SENTRY_DSN=https://b3a56b03eda842faad731f3ea9dfd1bc@o286262.ingest.sentry.io/6242427
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET

apps/explorer/.env.validator-testnet

@@ -8,7 +8,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 
 NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
-NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
+NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
-NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
+NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz/

apps/governance/.env.devnet

@@ -12,4 +12,3 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

apps/governance/.env.mainnet

@@ -3,10 +3,9 @@ NX_VEGA_ENV=MAINNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
-NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/6684b914570bbfa533ba9324
+NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996

apps/governance/.env.testnet

@@ -13,4 +13,3 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

apps/governance/.env.validator-testnet

@@ -10,4 +10,3 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

apps/governance/src/components/vega-wallet-dialogs/risk-message.tsx

@@ -1,40 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import {
-  ExternalLink,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-import Routes from '../../routes/routes';
-
-export const RiskMessage = () => {
-  return (
-    <>
-      <div className="bg-vega-light-100 dark:bg-vega-dark-100 p-6 mb-6">
-        <ul className="list-[square] ml-4">
-          <li>
-            {t(
-              'You may encounter bugs, loss of functionality or loss of assets using the App.'
-            )}
-          </li>
-          <li>
-            {t(
-              'No party accepts any liability for any losses whatsoever related to its use.'
-            )}
-          </li>
-        </ul>
-      </div>
-      <p className="mb-8">
-        {t(
-          'By using the Vega Governance App, you acknowledge that you have read and understood the'
-        )}{' '}
-        <ExternalLink href={Routes.DISCLAIMER} className="underline">
-          <span className="flex items-center gap-1">
-            <span>{t('Vega Governance Disclaimer')}</span>
-            <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
-          </span>
-        </ExternalLink>
-        .
-      </p>
-    </>
-  );
-};

apps/governance/src/components/vega-wallet-dialogs/vega-wallet-dialogs.tsx

@@ -4,11 +4,9 @@ import {
   useAppState,
 } from '../../contexts/app-state/app-state-context';
 import { Connectors } from '../../lib/vega-connectors';
-import { RiskMessage } from './risk-message';
 
 export const VegaWalletDialogs = () => {
   const { appState, appDispatch } = useAppState();
-
   return (
     <>
       <VegaConnectDialog
@@ -19,7 +17,6 @@ export const VegaWalletDialogs = () => {
             isOpen: open,
           })
         }
-        riskMessage={<RiskMessage />}
       />
 
       <VegaManageDialog

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

@@ -815,11 +815,5 @@
   "NoThanks": "No thanks",
   "ShareData": "Share data",
   "ContinueSharingData": "Continue sharing data",
-  "NodeUnsuitable": "Node: {{url}} is unsuitable",
+  "NodeUnsuitable": "Node: {{url}} is unsuitable"
-  "Disclaimer": "Disclaimer",
-  "disclaimer1": "The Vega Governance App allows the Vega network to arrive at on-chain decisions, where tokenholders can create proposals that other tokenholders can vote to approve or reject.  Vega supports on-chain proposals for creating markets and assets, and changing network parameters, markets and assets. Vega also supports freeform proposals for community suggestions that will not be enacted on-chain.",
-  "disclaimer2": "The Vega Governance App is free, public and open source software.  Software upgrades may contain bugs or security vulnerabilities that might result in loss of functionality.",
-  "disclaimer3": "The Vega Governance App uses data obtained from nodes on the Vega Blockchain. The developers of the Vega Governance App do not operate or run the Vega Blockchain or any other blockchain.",
-  "disclaimer4": "The Vega Governance App is provided “as is”.  The developers of the Vega Governance App make no representations or warranties of any kind, whether express or implied, statutory or otherwise regarding the Vega Governance App.  They disclaim all warranties of merchantability, quality, fitness for purpose.  They disclaim all warranties that the Vega Governance App is free of harmful components or errors.",
-  "disclaimer5": "No developer of the Vega Governance App accepts any responsibility for, or liability to users in connection with their use of the Vega Governance App."
 }

apps/governance/src/routes/disclaimer/index.tsx

@@ -1,21 +0,0 @@
-import type { RouteChildProps } from '..';
-import { useDocumentTitle } from '../../hooks/use-document-title';
-import { Heading } from '../../components/heading';
-import { useTranslation } from 'react-i18next';
-
-const Disclaimer = ({ name }: RouteChildProps) => {
-  useDocumentTitle(name);
-  const { t } = useTranslation();
-  return (
-    <>
-      <Heading title={t('Disclaimer')} />
-      <p className="mb-6 mt-10">{t('disclaimer1')}</p>
-      <p className="mb-6">{t('disclaimer2')}</p>
-      <p className="mb-6">{t('disclaimer3')}</p>
-      <p className="mb-8">{t('disclaimer4')}</p>
-      <p className="mb-8">{t('disclaimer5')}</p>
-    </>
-  );
-};
-
-export default Disclaimer;

apps/governance/src/routes/home/index.tsx

@@ -209,10 +209,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
     [proposalsData]
   );
 
-  const sortedProposals = useMemo(
+  const sortedProposals = useMemo(() => orderByDate(proposals), [proposals]);
-    () => orderByDate(proposals).reverse(),
-    [proposals]
-  );
 
   const protocolUpgradeProposals = useMemo(
     () =>

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

@@ -124,7 +124,7 @@ describe('Proposal header', () => {
       })
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
-      'New asset proposal'
+      'Unknown proposal'
     );
     expect(screen.getByTestId('proposal-type')).toHaveTextContent('New asset');
     expect(screen.getByTestId('proposal-details')).toHaveTextContent(

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

@@ -21,7 +21,6 @@ export const ProposalHeader = ({
 
   let details: ReactNode;
   let proposalType = '';
-  let fallbackTitle = '';
 
   const title = proposal?.rationale.title.trim();
 
@@ -30,7 +29,6 @@ export const ProposalHeader = ({
   switch (change?.__typename) {
     case 'NewMarket': {
       proposalType = 'NewMarket';
-      fallbackTitle = t('NewMarketProposal');
       details = (
         <>
           <span>
@@ -52,7 +50,6 @@ export const ProposalHeader = ({
     }
     case 'UpdateMarket': {
       proposalType = 'UpdateMarket';
-      fallbackTitle = t('UpdateMarketProposal');
       details = (
         <>
           <span>{t('Market change')}:</span>{' '}
@@ -63,7 +60,6 @@ export const ProposalHeader = ({
     }
     case 'NewAsset': {
       proposalType = 'NewAsset';
-      fallbackTitle = t('NewAssetProposal');
       details = (
         <>
           <span>{t('Symbol')}:</span> <Lozenge>{change.symbol}.</Lozenge>{' '}
@@ -85,7 +81,6 @@ export const ProposalHeader = ({
     }
     case 'UpdateNetworkParameter': {
       proposalType = 'NetworkParameter';
-      fallbackTitle = t('NetworkParameterProposal');
       details = (
         <>
           <span>{t('Change')}:</span>{' '}
@@ -100,13 +95,11 @@ export const ProposalHeader = ({
     }
     case 'NewFreeform': {
       proposalType = 'Freeform';
-      fallbackTitle = t('FreeformProposal');
       details = <span />;
       break;
     }
     case 'UpdateAsset': {
       proposalType = 'UpdateAsset';
-      fallbackTitle = t('UpdateAssetProposal');
       details = (
         <>
           <span>{t('AssetID')}:</span>{' '}
@@ -122,14 +115,10 @@ export const ProposalHeader = ({
       <div data-testid="proposal-title">
         {isListItem ? (
           <header>
-            <SubHeading
+            <SubHeading title={titleContent || t('Unknown proposal')} />
-              title={titleContent || fallbackTitle || t('Unknown proposal')}
-            />
           </header>
         ) : (
-          <Heading
+          <Heading title={titleContent || t('Unknown proposal')} />
-            title={titleContent || fallbackTitle || t('Unknown proposal')}
-          />
         )}
       </div>
 

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx

@@ -49,7 +49,6 @@ export const ProposeFreeform = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<FreeformProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -86,13 +85,7 @@ export const ProposeFreeform = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
+  const viewJson = () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx

@@ -89,7 +89,6 @@ export const ProposeNetworkParameter = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<NetworkParameterProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -149,13 +148,7 @@ export const ProposeNetworkParameter = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
+  const viewJson = () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx

@@ -61,7 +61,6 @@ export const ProposeNewAsset = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<NewAssetProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -118,13 +117,7 @@ export const ProposeNewAsset = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
+  const viewJson = () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/new-market/propose-new-market.tsx

@@ -59,7 +59,6 @@ export const ProposeNewMarket = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<NewMarketProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -108,13 +107,7 @@ export const ProposeNewMarket = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
+  const viewJson = () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.tsx

@@ -59,7 +59,6 @@ export const ProposeUpdateAsset = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<UpdateAssetProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -108,13 +107,7 @@ export const ProposeUpdateAsset = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
+  const viewJson = () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx

@@ -106,7 +106,6 @@ export const ProposeUpdateMarket = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<UpdateMarketProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -158,13 +157,7 @@ export const ProposeUpdateMarket = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
+  const viewJson = () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/router-config.tsx

@@ -207,13 +207,6 @@ const LazyWithdrawals = React.lazy(
     )
 );
 
-const LazyDisclaimer = React.lazy(
-  () =>
-    import(
-      /* webpackChunkName: "route-disclaimer", webpackPrefetch: true */ './disclaimer'
-    )
-);
-
 const redirects = [
   {
     path: Routes.VALIDATORS,
@@ -356,10 +349,6 @@ const routerConfig = [
     path: Routes.CONTRACTS,
     element: <LazyContracts name="Contracts" />,
   },
-  {
-    path: Routes.DISCLAIMER,
-    element: <LazyDisclaimer name="Disclaimer" />,
-  },
   {
     path: '*',
     // Not lazy as loaded when a user first hits the site

apps/governance/src/routes/routes.ts

@@ -15,7 +15,6 @@ const Routes = {
   SUPPLY: '/token/tranches',
   ASSOCIATE: '/token/associate',
   DISASSOCIATE: '/token/disassociate',
-  DISCLAIMER: '/disclaimer',
 };
 
 export default Routes;

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

@@ -5,22 +5,12 @@ query PreviousEpoch($epochId: ID) {
       edges {
         node {
           id
-          stakedTotal
           rewardScore {
             rawValidatorScore
             performanceScore
-            multisigScore
-            validatorScore
-            normalisedScore
-            validatorStatus
           }
           rankingScore {
-            status
-            previousStatus
-            rankingScore
             stakeScore
-            performanceScore
-            votingPower
           }
         }
       }

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

@@ -8,7 +8,7 @@ export type PreviousEpochQueryVariables = Types.Exact<{
 }>;
 
 
-export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, stakedTotal: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string, performanceScore: string, multisigScore: string, validatorScore: string, normalisedScore: string, validatorStatus: Types.ValidatorStatus } | null, rankingScore: { __typename?: 'RankingScore', status: Types.ValidatorStatus, previousStatus: Types.ValidatorStatus, rankingScore: string, stakeScore: string, performanceScore: string, votingPower: string } } } | null> | null } | null } };
+export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string, performanceScore: string } | null, rankingScore: { __typename?: 'RankingScore', stakeScore: string } } } | null> | null } | null } };
 
 
 export const PreviousEpochDocument = gql`
@@ -19,22 +19,12 @@ export const PreviousEpochDocument = gql`
       edges {
         node {
           id
-          stakedTotal
           rewardScore {
             rawValidatorScore
             performanceScore
-            multisigScore
-            validatorScore
-            normalisedScore
-            validatorStatus
           }
           rankingScore {
-            status
-            previousStatus
-            rankingScore
             stakeScore
-            performanceScore
-            votingPower
           }
         }
       }

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

@@ -79,72 +79,36 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
         {
           node: {
             id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b4',
-            stakedTotal: '14182454495731682635157',
             rewardScore: {
               rawValidatorScore: '0.25',
               performanceScore: '0.9998677767864936',
-              multisigScore: '',
-              validatorScore: '',
-              normalisedScore: '',
-              validatorStatus:
-                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
             },
             rankingScore: {
               stakeScore: '0.2499583402766206',
-              performanceScore: '0.9998677767864936',
-              status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-              previousStatus:
-                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-              rankingScore: '',
-              votingPower: '',
             },
           },
         },
         {
           node: {
             id: '966438c6bffac737cfb08173ffcb3f393c4692b099ad80cb45a82e2dc0a8cf99',
-            stakedTotal: '9618711883996159534058',
             rewardScore: {
               rawValidatorScore: '0.3',
               performanceScore: '1',
-              multisigScore: '',
-              validatorScore: '0.31067',
-              normalisedScore: '',
-              validatorStatus:
-                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
             },
             rankingScore: {
               stakeScore: '0.25',
-              performanceScore: '0.9998677767864936',
-              status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-              previousStatus:
-                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-              rankingScore: '',
-              votingPower: '',
             },
           },
         },
         {
           node: {
             id: '12c81b738e8051152e1afe44376ec37bca9216466e6d44cdd772194bad0ada81',
-            stakedTotal: '4041343338923442976709',
             rewardScore: {
               rawValidatorScore: '0.35',
               performanceScore: '0.999629748500531',
-              multisigScore: '',
-              validatorScore: '',
-              normalisedScore: '',
-              validatorStatus:
-                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
             },
             rankingScore: {
               stakeScore: '0.2312',
-              performanceScore: '0.9998677767864936',
-              status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-              previousStatus:
-                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-              rankingScore: '',
-              votingPower: '',
             },
           },
         },

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

@@ -7,12 +7,12 @@ import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
-  calculateOverallPenalty,
-  calculateOverstakedPenalty,
-  calculatesPerformancePenalty,
   getFormattedPerformanceScore,
   getLastEpochScoreAndPerformance,
   getNormalisedVotingPower,
+  getOverstakingPenalty,
+  getPerformancePenalty,
+  getTotalPenalties,
   getUnnormalisedVotingPower,
 } from '../../shared';
 import {
@@ -32,7 +32,6 @@ import type { ValidatorsTableProps } from './shared';
 import {
   formatNumber,
   formatNumberPercentage,
-  removePaginationWrapper,
   toBigNum,
 } from '@vegaprotocol/utils';
 import { VALIDATOR_LOGO_MAP } from './logo-map';
@@ -137,10 +136,6 @@ export const ConsensusValidatorsTable = ({
     [totalStake]
   );
 
-  const allNodesInPreviousEpoch = removePaginationWrapper(
-    previousEpochData?.epoch.validatorsConnection?.edges
-  );
-
   const nodes = useMemo(() => {
     if (!data) return [];
     let canonisedNodes = data
@@ -165,7 +160,7 @@ export const ConsensusValidatorsTable = ({
           stakedByDelegates,
           stakedByOperator,
           stakedTotal,
-          rankingScore: { stakeScore, votingPower, performanceScore },
+          rankingScore: { stakeScore, votingPower },
           pendingStake,
           stakedTotalRanking,
           stakedByUser,
@@ -177,8 +172,11 @@ export const ConsensusValidatorsTable = ({
             : avatarUrl
             ? avatarUrl
             : null;
-          const { rawValidatorScore: previousEpochValidatorScore } =
+          const {
-            getLastEpochScoreAndPerformance(previousEpochData, id);
+            rawValidatorScore: previousEpochValidatorScore,
+            performanceScore: previousEpochPerformanceScore,
+            stakeScore: previousEpochStakeScore,
+          } = getLastEpochScoreAndPerformance(previousEpochData, id);
 
           return {
             id,
@@ -201,19 +199,21 @@ export const ConsensusValidatorsTable = ({
               toBigNum(stakedByOperator, decimals),
               2
             ),
-            [ValidatorFields.PERFORMANCE_SCORE]:
+            [ValidatorFields.PERFORMANCE_SCORE]: getFormattedPerformanceScore(
-              getFormattedPerformanceScore(performanceScore).toString(),
+              previousEpochPerformanceScore
-            [ValidatorFields.PERFORMANCE_PENALTY]: formatNumberPercentage(
+            ).toString(),
-              calculatesPerformancePenalty(performanceScore),
+            [ValidatorFields.PERFORMANCE_PENALTY]: getPerformancePenalty(
-              2
+              previousEpochPerformanceScore
             ),
-            [ValidatorFields.OVERSTAKING_PENALTY]: formatNumberPercentage(
+            [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              calculateOverstakedPenalty(id, allNodesInPreviousEpoch),
+              previousEpochValidatorScore,
-              2
+              previousEpochStakeScore
             ),
-            [ValidatorFields.TOTAL_PENALTIES]: formatNumberPercentage(
+            [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              calculateOverallPenalty(id, allNodesInPreviousEpoch),
+              previousEpochValidatorScore,
-              2
+              previousEpochPerformanceScore,
+              stakedTotal,
+              totalStake
             ),
             [ValidatorFields.PENDING_STAKE]: pendingStake,
             [ValidatorFields.STAKED_BY_USER]: stakedByUser
@@ -328,12 +328,12 @@ export const ConsensusValidatorsTable = ({
       ...remaining,
     ];
   }, [
-    allNodesInPreviousEpoch,
     data,
     decimals,
     hideTopThird,
     previousEpochData,
     thirdOfTotalStake,
+    totalStake,
     validatorsView,
   ]);
 

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

@@ -5,14 +5,15 @@ import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
-  calculatesPerformancePenalty,
-  calculateOverallPenalty,
-  calculateOverstakedPenalty,
   getFormattedPerformanceScore,
   getLastEpochScoreAndPerformance,
+  getOverstakingPenalty,
+  getPerformancePenalty,
+  getTotalPenalties,
 } from '../../shared';
 import {
   defaultColDef,
+  StakeNeededForPromotionRenderer,
   stakedTotalPercentage,
   ValidatorFields,
   ValidatorRenderer,
@@ -27,7 +28,6 @@ import type { ValidatorsTableProps } from './shared';
 import {
   formatNumber,
   formatNumberPercentage,
-  removePaginationWrapper,
   toBigNum,
 } from '@vegaprotocol/utils';
 
@@ -52,10 +52,6 @@ export const StandbyPendingValidatorsTable = ({
 
   const gridRef = useRef<AgGridReact | null>(null);
 
-  const allNodesInPreviousEpoch = removePaginationWrapper(
-    previousEpochData?.epoch.validatorsConnection?.edges
-  );
-
   let nodes = useMemo(() => {
     if (!data) return [];
 
@@ -81,15 +77,18 @@ export const StandbyPendingValidatorsTable = ({
           stakedByDelegates,
           stakedByOperator,
           stakedTotal,
-          rankingScore: { stakeScore, performanceScore },
+          rankingScore: { stakeScore },
           pendingStake,
           stakedTotalRanking,
           stakedByUser,
           pendingUserStake,
           userStakeShare,
         }) => {
-          const { performanceScore: previousEpochPerformanceScore } =
+          const {
-            getLastEpochScoreAndPerformance(previousEpochData, id);
+            rawValidatorScore: previousEpochValidatorScore,
+            performanceScore: previousEpochPerformanceScore,
+            stakeScore: previousEpochStakeScore,
+          } = getLastEpochScoreAndPerformance(previousEpochData, id);
 
           let individualStakeNeededForPromotion,
             individualStakeNeededForPromotionDescription;
@@ -145,19 +144,21 @@ export const StandbyPendingValidatorsTable = ({
               toBigNum(stakedByOperator, decimals),
               2
             ),
-            [ValidatorFields.PERFORMANCE_SCORE]:
+            [ValidatorFields.PERFORMANCE_SCORE]: getFormattedPerformanceScore(
-              getFormattedPerformanceScore(performanceScore).toString(),
+              previousEpochPerformanceScore
-            [ValidatorFields.PERFORMANCE_PENALTY]: formatNumberPercentage(
+            ).toString(),
-              calculatesPerformancePenalty(performanceScore),
+            [ValidatorFields.PERFORMANCE_PENALTY]: getPerformancePenalty(
-              2
+              previousEpochPerformanceScore
             ),
-            [ValidatorFields.OVERSTAKING_PENALTY]: formatNumberPercentage(
+            [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              calculateOverstakedPenalty(id, allNodesInPreviousEpoch),
+              previousEpochValidatorScore,
-              2
+              previousEpochStakeScore
             ),
-            [ValidatorFields.TOTAL_PENALTIES]: formatNumberPercentage(
+            [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              calculateOverallPenalty(id, allNodesInPreviousEpoch),
+              previousEpochValidatorScore,
-              2
+              previousEpochPerformanceScore,
+              stakedTotal,
+              totalStake
             ),
             [ValidatorFields.PENDING_STAKE]: pendingStake,
             [ValidatorFields.STAKED_BY_USER]: stakedByUser
@@ -171,13 +172,13 @@ export const StandbyPendingValidatorsTable = ({
         }
       );
   }, [
-    allNodesInPreviousEpoch,
     data,
     decimals,
     previousEpochData,
     stakeNeededForPromotion,
     stakeNeededForPromotionDescription,
     t,
+    totalStake,
   ]);
 
   if (validatorsView === 'myStake') {
@@ -225,21 +226,21 @@ export const StandbyPendingValidatorsTable = ({
           cellRenderer: StakeShareRenderer,
           width: 100,
         },
-        // {
+        {
-        //   field: ValidatorFields.STAKE_NEEDED_FOR_PROMOTION,
+          field: ValidatorFields.STAKE_NEEDED_FOR_PROMOTION,
-        //   headerName: t(ValidatorFields.STAKE_NEEDED_FOR_PROMOTION).toString(),
+          headerName: t(ValidatorFields.STAKE_NEEDED_FOR_PROMOTION).toString(),
-        //   headerTooltip: t(stakeNeededForPromotionDescription, {
+          headerTooltip: t(stakeNeededForPromotionDescription, {
-        //     prefix: t('The'),
+            prefix: t('The'),
-        //   }),
+          }),
-        //   cellRenderer: StakeNeededForPromotionRenderer,
+          cellRenderer: StakeNeededForPromotionRenderer,
-        //   width: 210,
+          width: 210,
-        // },
+        },
         {
           field: ValidatorFields.TOTAL_PENALTIES,
           headerName: t(ValidatorFields.TOTAL_PENALTIES).toString(),
           headerTooltip: t('TotalPenaltiesDescription').toString(),
           cellRenderer: TotalPenaltiesRenderer,
-          width: 120 + 210,
+          width: 120,
         },
       ],
       []

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

@@ -1,15 +1,11 @@
-import { useMemo } from 'react';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   useEnvironment,
   DocsLinks,
   ExternalLinks,
 } from '@vegaprotocol/environment';
-import {
+import { toBigNum } from '@vegaprotocol/utils';
-  formatNumberPercentage,
-  removePaginationWrapper,
-  toBigNum,
-} from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';
 import {
   Link as UTLink,
@@ -28,11 +24,11 @@ import { SubHeading } from '../../../components/heading';
 import {
   getLastEpochScoreAndPerformance,
   getNormalisedVotingPower,
+  getOverstakingPenalty,
+  getPerformancePenalty,
+  getTotalPenalties,
   getUnnormalisedVotingPower,
   getStakePercentage,
-  calculatesPerformancePenalty,
-  calculateOverstakedPenalty,
-  calculateOverallPenalty,
 } from '../shared';
 import type { ReactNode } from 'react';
 import type { StakingNodeFieldsFragment } from '../__generated__/Staking';
@@ -82,27 +78,17 @@ export const ValidatorTable = ({
 
   const stakedOnNode = toBigNum(node.stakedTotal, decimals);
 
-  const { rawValidatorScore } = getLastEpochScoreAndPerformance(
+  const { rawValidatorScore, performanceScore, stakeScore } =
-    previousEpochData,
+    getLastEpochScoreAndPerformance(previousEpochData, node.id);
-    node.id
-  );
 
   const stakePercentage = getStakePercentage(total, stakedOnNode);
 
-  const penalties = useMemo(() => {
+  const totalPenaltiesAmount = getTotalPenalties(
-    const allNodesInPreviousEpoch = removePaginationWrapper(
+    rawValidatorScore,
-      previousEpochData?.epoch.validatorsConnection?.edges
+    performanceScore,
-    );
+    stakedOnNode.toString(),
-    return {
+    total.toString()
-      // current epoch
+  );
-      performance: calculatesPerformancePenalty(
-        node.rankingScore.performanceScore
-      ),
-      // previous epoch
-      overstaked: calculateOverstakedPenalty(node.id, allNodesInPreviousEpoch),
-      overall: calculateOverallPenalty(node.id, allNodesInPreviousEpoch),
-    };
-  }, [node, previousEpochData?.epoch.validatorsConnection?.edges]);
 
   return (
     <>
@@ -256,7 +242,7 @@ export const ValidatorTable = ({
 
               <Tooltip description={t('OverstakedPenaltyDescription')}>
                 <span data-testid="overstaking-penalty">
-                  {formatNumberPercentage(penalties.overstaked, 2)}
+                  {getOverstakingPenalty(rawValidatorScore, stakeScore)}
                 </span>
               </Tooltip>
             </KeyValueTableRow>
@@ -265,7 +251,7 @@ export const ValidatorTable = ({
 
               <Tooltip description={t('PerformancePenaltyDescription')}>
                 <span data-testid="performance-penalty">
-                  {formatNumberPercentage(penalties.performance, 2)}
+                  {getPerformancePenalty(performanceScore)}
                 </span>
               </Tooltip>
             </KeyValueTableRow>
@@ -274,7 +260,7 @@ export const ValidatorTable = ({
                 <strong>{t('TOTAL PENALTIES')}</strong>
               </span>
               <span data-testid="total-penalties">
-                <strong>{formatNumberPercentage(penalties.overall, 2)}</strong>
+                <strong>{totalPenaltiesAmount}</strong>
               </span>
             </KeyValueTableRow>
           </KeyValueTable>

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

@@ -9,7 +9,6 @@ import {
   getTotalPenalties,
   getStakePercentage,
 } from './shared';
-import * as Schema from '@vegaprotocol/types';
 
 describe('getLastEpochScoreAndPerformance', () => {
   const mockPreviousEpochData = {
@@ -20,48 +19,24 @@ describe('getLastEpochScoreAndPerformance', () => {
           {
             node: {
               id: '0x123',
-              stakedTotal: '',
               rewardScore: {
                 rawValidatorScore: '0.25',
                 performanceScore: '0.75',
-                multisigScore: '',
-                validatorScore: '',
-                normalisedScore: '',
-                validatorStatus:
-                  Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
               },
               rankingScore: {
                 stakeScore: '0.25',
-                performanceScore: '0.75',
-                status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-                previousStatus:
-                  Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-                rankingScore: '',
-                votingPower: '',
               },
             },
           },
           {
             node: {
               id: '0x234',
-              stakedTotal: '',
               rewardScore: {
                 rawValidatorScore: '0.35',
                 performanceScore: '0.85',
-                multisigScore: '',
-                validatorScore: '',
-                normalisedScore: '',
-                validatorStatus:
-                  Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
               },
               rankingScore: {
                 stakeScore: '0.25',
-                performanceScore: '0.85',
-                status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-                previousStatus:
-                  Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-                rankingScore: '',
-                votingPower: '',
               },
             },
           },

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

@@ -4,94 +4,6 @@ import {
 } from '@vegaprotocol/utils';
 import type { PreviousEpochQuery } from './__generated__/PreviousEpoch';
 import { BigNumber } from '../../lib/bignumber';
-import type { LastArrayElement } from 'type-fest';
-
-type Node = NonNullable<
-  LastArrayElement<
-    NonNullable<
-      NonNullable<PreviousEpochQuery['epoch']['validatorsConnection']>['edges']
-    >
-  >
->['node'];
-
-/**
- * Calculates theoretical stake score for a given node
- * @param nodeId Id of a node for which a score is calculated
- * @param nodes A collection of all nodes
- * @returns Theoretical stake score for given node based on the staked total
- * of all node of the same type (status)
- */
-const calculateTheoreticalStakeScore = (nodeId: string, nodes: Node[]) => {
-  const node = nodes.find((n) => n.id === nodeId);
-  if (!node) {
-    return new BigNumber(0);
-  }
-  const all = nodes
-    .filter((n) => n.rankingScore.status === node.rankingScore.status)
-    .map((n) => new BigNumber(n.stakedTotal));
-  const sumOfSameType = all.reduce((acc, a) => acc.plus(a), new BigNumber(0));
-  if (sumOfSameType.isZero()) {
-    return new BigNumber(0);
-  }
-  return new BigNumber(node.stakedTotal).dividedBy(sumOfSameType);
-};
-
-/**
- * Calculates overall penalty for a given node
- * @param nodeId Id of a node for which a penalty is calculated
- * @param nodes A collection of all nodes - needed to calculate theoretical stake score
- * @returns %
- */
-export const calculateOverallPenalty = (nodeId: string, nodes: Node[]) => {
-  const node = nodes.find((n) => n.id === nodeId);
-  const tts = calculateTheoreticalStakeScore(nodeId, nodes);
-  if (!node || tts.isZero()) {
-    return new BigNumber(0);
-  }
-  const penalty = new BigNumber(1)
-    .minus(new BigNumber(node.rewardScore?.validatorScore || 0).dividedBy(tts))
-    .times(100);
-  return penalty.isLessThan(0) ? new BigNumber(0) : penalty;
-};
-
-/**
- *  Calculates over-staked penalty for a given node
- * @param nodeId Id of a node for which a penalty is calculated
- * @param nodes A collection of all nodes - needed to calculate theoretical stake score
- * @returns %
- */
-export const calculateOverstakedPenalty = (nodeId: string, nodes: Node[]) => {
-  const node = nodes.find((n) => n.id === nodeId);
-  const tts = calculateTheoreticalStakeScore(nodeId, nodes);
-  if (!node || tts.isZero()) {
-    return new BigNumber(0);
-  }
-  const penalty = new BigNumber(1)
-    .minus(
-      new BigNumber(node.rewardScore?.rawValidatorScore || 0).dividedBy(tts)
-    )
-    .times(100);
-  console.log(
-    nodeId,
-    new BigNumber(node.rewardScore?.rawValidatorScore || 0).toString(),
-    tts.toString(),
-    new BigNumber(node.rewardScore?.rawValidatorScore || 0)
-      .dividedBy(tts)
-      .toString()
-  );
-  return penalty.isLessThan(0) ? new BigNumber(0) : penalty;
-};
-
-/**
- * Calculates performance penalty based on the given performance score.
- * @returns %
- */
-export const calculatesPerformancePenalty = (performanceScore: string) => {
-  const penalty = new BigNumber(1)
-    .minus(new BigNumber(performanceScore))
-    .times(100);
-  return penalty.isLessThan(0) ? new BigNumber(0) : penalty;
-};
 
 export const getLastEpochScoreAndPerformance = (
   previousEpochData: PreviousEpochQuery | undefined,
@@ -103,7 +15,7 @@ export const getLastEpochScoreAndPerformance = (
 
   return {
     rawValidatorScore: validator?.rewardScore?.rawValidatorScore,
-    performanceScore: validator?.rankingScore?.performanceScore,
+    performanceScore: validator?.rewardScore?.performanceScore,
     stakeScore: validator?.rankingScore?.stakeScore,
   };
 };

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

@@ -1,10 +1,5 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import type { DataSourceDefinition } from '@vegaprotocol/types';
+import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
-import {
-  MarketState,
-  MarketStateMapping,
-  PropertyKeyType,
-} from '@vegaprotocol/types';
 import { addDays, subDays } from 'date-fns';
 import {
   chainIdQuery,
@@ -25,25 +20,6 @@ import {
 } from '@vegaprotocol/utils';
 
 describe('Closed markets', { tags: '@smoke' }, () => {
-  const settlementDataProperty = 'settlement-data-property';
-  const settlementDataPropertyKey = {
-    __typename: 'PropertyKey' as const,
-    name: settlementDataProperty,
-    type: PropertyKeyType.TYPE_INTEGER,
-    numberDecimalPlaces: 2,
-  };
-  const settlementDataSourceData: DataSourceDefinition = {
-    sourceType: {
-      sourceType: {
-        filters: [
-          {
-            __typename: 'Filter',
-            key: settlementDataPropertyKey,
-          },
-        ],
-      },
-    },
-  };
   const rowSelector =
     '[data-testid="tab-closed-markets"] .ag-center-cols-container .ag-row';
 
@@ -61,15 +37,11 @@ describe('Closed markets', { tags: '@smoke' }, () => {
     tradableInstrument: {
       instrument: {
         product: {
-          dataSourceSpecBinding: {
-            settlementDataProperty,
-          },
           dataSourceSpecForTradingTermination: {
             id: 'market-1-trading-termination-oracle-id',
           },
           dataSourceSpecForSettlementData: {
             id: 'market-1-settlement-data-oracle-id',
-            data: settlementDataSourceData,
           },
           settlementAsset,
         },
@@ -91,15 +63,6 @@ describe('Closed markets', { tags: '@smoke' }, () => {
             `settlement-expiry-date:${addDays(new Date(), 4).toISOString()}`,
           ],
         },
-        product: {
-          dataSourceSpecBinding: {
-            settlementDataProperty,
-          },
-          dataSourceSpecForSettlementData: {
-            id: 'market-1-settlement-data-oracle-id',
-            data: settlementDataSourceData,
-          },
-        },
       },
     },
   });
@@ -118,15 +81,6 @@ describe('Closed markets', { tags: '@smoke' }, () => {
             `settlement-expiry-date:${subDays(new Date(), 2).toISOString()}`,
           ],
         },
-        product: {
-          dataSourceSpecBinding: {
-            settlementDataProperty,
-          },
-          dataSourceSpecForSettlementData: {
-            id: 'market-1-settlement-data-oracle-id',
-            data: settlementDataSourceData,
-          },
-        },
       },
     },
   });
@@ -347,7 +301,7 @@ describe('Closed markets', { tags: '@smoke' }, () => {
         addDecimalsFormatNumber(
           // @ts-ignore cannot deep un-partial
           specDataConnection.externalData.data.data[0].value,
-          settlementDataPropertyKey.numberDecimalPlaces
+          settledMarket.decimalPlaces
         )
       );
 

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

@@ -1,7 +1,7 @@
 import { mockConnectWallet } from '@vegaprotocol/cypress';
 
 describe('Navbar', { tags: '@smoke' }, () => {
-  beforeEach(() => {
+  before(() => {
     cy.clearAllLocalStorage();
     cy.mockTradingPage();
     cy.mockSubscription();
@@ -47,18 +47,6 @@ describe('Navbar', { tags: '@smoke' }, () => {
           });
       });
     });
-
-    it('Disclaimer should be presented after choosing from menu', () => {
-      cy.get('nav')
-        .find('ul li:contains(Resources)')
-        .contains('Resources')
-        .click();
-      cy.getByTestId('Disclaimer').eq(0).click();
-      cy.location('hash').should('equal', '#/disclaimer');
-      cy.get('p').contains(
-        'Vega is a decentralised peer-to-peer protocol that can be used to trade derivatives with cryptoassets.'
-      );
-    });
   });
 
   describe('mobile view', () => {

apps/trading/.env.devnet

@@ -2,7 +2,6 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz

apps/trading/.env.mainnet

@@ -1,7 +1,6 @@
-NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/af6a2d529a11f8158bc8ca2a
+NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_ENV=MAINNET
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz

apps/trading/.env.stagnet1

@@ -2,7 +2,6 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz

apps/trading/.env.testnet

@@ -2,7 +2,6 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV=TESTNET
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf

apps/trading/.env.validator-testnet

@@ -2,7 +2,6 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz

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

@@ -1,48 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-
-export const Disclaimer = () => {
-  return (
-    <div className="py-16 px-8 flex w-full justify-center">
-      <div className="lg:min-w-[700px] min-w-[300px] max-w-[700px]">
-        <h1 className="text-4xl xl:text-5xl uppercase font-alpha calt">
-          {t('Disclaimer')}
-        </h1>
-        <p className="mb-6 mt-10">
-          {t(
-            'Vega is a decentralised peer-to-peer protocol that can be used to trade derivatives with cryptoassets. The Vega Protocol is an implementation layer (layer one) protocol made of free, public, open-source or source-available software.  Use of the Vega Protocol involves various risks, including but not limited to, losses while digital assets are supplied to the Vega Protocol and losses due to the fluctuation of prices of assets.'
-          )}
-        </p>
-        <p className="mb-6">
-          {t(
-            'Before using the Vega Protocol, review the relevant documentation at docs.vega.xyz to make sure that you understand how it works.  Conduct your own due diligence and consult your financial advisor before making any investment decisions.'
-          )}
-        </p>
-        <p className="mb-6">
-          {t(
-            'As described in the Vega Protocol core license, the Vega Protocol is provided “as is”, at your own risk, and without warranties of any kind.  Although Gobalsky Labs Limited developed much of the initial code for the Vega Protocol, it does not provide or control the Vega Protocol, which is run by third parties deploying it on a bespoke blockchain.  Upgrades and modifications to the Vega Protocol are managed in a community-driven way by holders of the VEGA governance token.'
-          )}
-        </p>
-        <p className="mb-8">
-          {t(
-            'No developer or entity involved in creating the Vega Protocol will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the Vega Protocol, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or legal costs, or loss of profits, cryptoassets, tokens or anything else of value.'
-          )}
-        </p>
-        <p className="mb-8">
-          {t(
-            'This website is hosted on a decentralised network, the Interplanetary File System (“IPFS”).  The IPFS decentralised web is made up of all the computers (nodes) connected to it.  Data is therefore stored on many different computers.'
-          )}
-        </p>
-        <p className="mb-8">
-          {t(
-            "The information provided on this website does not constitute investment advice, financial advice, trading advice, or any other sort of advice and you should not treat any of the website's content as such.  No party recommends that any cryptoasset should be bought, sold, or held by you via this website. No party ensures the accuracy of information listed on this website or holds any responsibility for any missing or wrong information. You understand that you are using any and all information available here at your own risk."
-          )}
-        </p>
-        <p className="mb-8">
-          {t(
-            'Additionally, just as you can access email protocols such as SMTP through multiple email clients, you can potentially access the Vega Protocol through many web or mobile interfaces.  You are responsible for doing your own diligence on those interfaces to understand the associated risks and any fees.'
-          )}
-        </p>
-      </div>
-    </div>
-  );
-};

apps/trading/client-pages/disclaimer/index.ts

@@ -1,3 +0,0 @@
-import { Disclaimer } from './disclaimer';
-
-export default Disclaimer;

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

@@ -247,7 +247,7 @@ const MainGrid = memo(
     const navigate = useNavigate();
     const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'top' });
     const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
-      id: 'middle-1',
+      id: 'middle',
     });
 
     return (
@@ -259,7 +259,27 @@ const MainGrid = memo(
             onChange={handleOnMiddleLayoutChange}
           >
             <ResizableGridPanel
-              preferredSize={sizesMiddle[0] || 330}
+              priority={LayoutPriority.High}
+              minSize={200}
+              preferredSize={sizesMiddle[0] || '50%'}
+            >
+              <TradeGridChild>
+                <Tabs storageKey="console-trade-grid-main-left">
+                  <Tab id="chart" name={t('Chart')}>
+                    <TradingViews.candles.component marketId={marketId} />
+                  </Tab>
+                  <Tab id="depth" name={t('Depth')}>
+                    <TradingViews.depth.component marketId={marketId} />
+                  </Tab>
+                  <Tab id="liquidity" name={t('Liquidity')}>
+                    <TradingViews.liquidity.component marketId={marketId} />
+                  </Tab>
+                </Tabs>
+              </TradeGridChild>
+            </ResizableGridPanel>
+            <ResizableGridPanel
+              priority={LayoutPriority.Low}
+              preferredSize={sizesMiddle[1] || 330}
               minSize={300}
             >
               <TradeGridChild>
@@ -277,24 +297,7 @@ const MainGrid = memo(
               </TradeGridChild>
             </ResizableGridPanel>
             <ResizableGridPanel
-              minSize={200}
+              priority={LayoutPriority.Low}
-              preferredSize={sizesMiddle[1] || '50%'}
-            >
-              <TradeGridChild>
-                <Tabs storageKey="console-trade-grid-main-left">
-                  <Tab id="chart" name={t('Chart')}>
-                    <TradingViews.candles.component marketId={marketId} />
-                  </Tab>
-                  <Tab id="depth" name={t('Depth')}>
-                    <TradingViews.depth.component marketId={marketId} />
-                  </Tab>
-                  <Tab id="liquidity" name={t('Liquidity')}>
-                    <TradingViews.liquidity.component marketId={marketId} />
-                  </Tab>
-                </Tabs>
-              </TradeGridChild>
-            </ResizableGridPanel>
-            <ResizableGridPanel
               preferredSize={sizesMiddle[2] || 430}
               minSize={200}
             >

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

@@ -1,6 +1,6 @@
 import { act, render, screen, within } from '@testing-library/react';
 import { Closed } from './closed';
-import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
+import { MarketStateMapping } from '@vegaprotocol/types';
 import { PositionStatus } from '@vegaprotocol/types';
 import { MarketState } from '@vegaprotocol/types';
 import { subDays } from 'date-fns';
@@ -55,23 +55,6 @@ describe('Closed', () => {
         product: {
           dataSourceSpecForSettlementData: {
             id: settlementDataId,
-            data: {
-              sourceType: {
-                sourceType: {
-                  filters: [
-                    {
-                      __typename: 'Filter',
-                      key: {
-                        __typename: 'PropertyKey',
-                        name: settlementDataProperty,
-                        type: PropertyKeyType.TYPE_INTEGER,
-                        numberDecimalPlaces: 5,
-                      },
-                    },
-                  ],
-                },
-              },
-            },
           },
           dataSourceSpecBinding: {
             settlementDataProperty,

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

@@ -13,10 +13,7 @@ import {
   getMarketExpiryDate,
 } from '@vegaprotocol/utils';
 import { usePositionsQuery } from '@vegaprotocol/positions';
-import type {
+import type { MarketMaybeWithData } from '@vegaprotocol/markets';
-  DataSourceFilterFragment,
-  MarketMaybeWithData,
-} from '@vegaprotocol/markets';
 import {
   MarketTableActions,
   closedMarketsWithDataProvider,
@@ -45,7 +42,6 @@ interface Row {
   markPrice: string | undefined;
   settlementDataOracleId: string;
   settlementDataSpecBinding: string;
-  setlementDataSourceFilter: DataSourceFilterFragment | undefined;
   tradingTerminationOracleId: string;
   settlementAsset: SettlementAsset;
   realisedPNL: string | undefined;
@@ -78,40 +74,28 @@ export const Closed = () => {
       }
     );
 
-    const instrument = market.tradableInstrument.instrument;
-
-    const spec =
-      instrument.product.dataSourceSpecForSettlementData.data.sourceType
-        .__typename === 'DataSourceDefinitionExternal'
-        ? instrument.product.dataSourceSpecForSettlementData.data.sourceType
-            .sourceType
-        : undefined;
-    const filters = spec?.filters || [];
-
-    const settlementDataSpecBinding =
-      instrument.product.dataSourceSpecBinding.settlementDataProperty;
-    const filter = filters?.find((filter) => {
-      return filter.key.name === settlementDataSpecBinding;
-    });
-
     const row: Row = {
       id: market.id,
-      code: instrument.code,
+      code: market.tradableInstrument.instrument.code,
-      name: instrument.name,
+      name: market.tradableInstrument.instrument.name,
       decimalPlaces: market.decimalPlaces,
       state: market.state,
-      metadata: instrument.metadata.tags ?? [],
+      metadata: market.tradableInstrument.instrument.metadata.tags ?? [],
       closeTimestamp: market.marketTimestamps.close,
       bestBidPrice: market.data?.bestBidPrice,
       bestOfferPrice: market.data?.bestOfferPrice,
       markPrice: market.data?.markPrice,
       settlementDataOracleId:
-        instrument.product.dataSourceSpecForSettlementData.id,
+        market.tradableInstrument.instrument.product
-      settlementDataSpecBinding,
+          .dataSourceSpecForSettlementData.id,
-      setlementDataSourceFilter: filter,
+      settlementDataSpecBinding:
+        market.tradableInstrument.instrument.product.dataSourceSpecBinding
+          .settlementDataProperty,
       tradingTerminationOracleId:
-        instrument.product.dataSourceSpecForTradingTermination.id,
+        market.tradableInstrument.instrument.product
-      settlementAsset: instrument.product.settlementAsset,
+          .dataSourceSpecForTradingTermination.id,
+      settlementAsset:
+        market.tradableInstrument.instrument.product.settlementAsset,
       realisedPNL: position?.node.realisedPNL,
     };
 
@@ -254,8 +238,8 @@ const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => {
         }: VegaICellRendererParams<Row, 'settlementDataOracleId'>) => (
           <SettlementPriceCell
             oracleSpecId={value}
+            decimalPlaces={data?.decimalPlaces ?? 0}
             settlementDataSpecBinding={data?.settlementDataSpecBinding}
-            filter={data?.setlementDataSourceFilter}
           />
         ),
       },

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

@@ -12,7 +12,7 @@ export const Proposed = () => {
   const externalLink = tokenLink(TOKEN_NEW_MARKET_PROPOSAL);
   return (
     <>
-      <div className="h-[400px]">
+      <div className="min-h-[200px]">
         <ProposalsList />
       </div>
       <ExternalLink className="py-4 px-[11px] text-sm" href={externalLink}>

apps/trading/client-pages/markets/settlement-price-cell.spec.tsx

@@ -1,17 +1,13 @@
 import { render, screen } from '@testing-library/react';
 import type { Property } from '@vegaprotocol/types';
-import { PropertyKeyType } from '@vegaprotocol/types';
 import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/markets';
 import { OracleSpecDataConnectionDocument } from '@vegaprotocol/markets';
 import type { SettlementPriceCellProps } from './settlement-price-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 
 describe('SettlementPriceCell', () => {
-  const settlementDataSpecBinding = 'settlement-data-spec-binding';
-
   const createMock = (
     id: string,
     property: Property
@@ -44,19 +40,11 @@ describe('SettlementPriceCell', () => {
       },
     };
   };
-  const createProps = (
+  const createProps = (): SettlementPriceCellProps => {
-    filterKey = {
-      name: settlementDataSpecBinding,
-      type: PropertyKeyType.TYPE_INTEGER,
-      numberDecimalPlaces: 2,
-    }
-  ): SettlementPriceCellProps => {
     return {
       oracleSpecId: 'oracle-spec-id',
-      filter: {
+      decimalPlaces: 2,
-        key: filterKey,
+      settlementDataSpecBinding: 'settlement-data-spec-binding',
-      },
-      settlementDataSpecBinding,
     };
   };
   it('renders fetches and renders the settlment data value', async () => {
@@ -77,19 +65,14 @@ describe('SettlementPriceCell', () => {
 
     expect(screen.getByText('-')).toBeInTheDocument();
     const link = await screen.findByRole('link');
-    expect(link).toHaveTextContent(
+    expect(link).toHaveTextContent('12.34');
-      addDecimalsFormatNumber(
-        property.value,
-        props.filter?.key.numberDecimalPlaces || 0
-      )
-    );
     expect(link).toHaveAttribute(
       'href',
       expect.stringContaining(`/oracles/${props.oracleSpecId}`)
     );
   });
 
-  it('renders "Unknown" if no spec value is found', async () => {
+  it('renders "-" if no spec value is found', async () => {
     const props = createProps();
     const property = {
       __typename: 'Property' as const,
@@ -107,7 +90,7 @@ describe('SettlementPriceCell', () => {
 
     expect(screen.getByText('-')).toBeInTheDocument();
     const link = await screen.findByRole('link');
-    expect(link).toHaveTextContent('Unknown');
+    expect(link).toHaveTextContent('-');
     expect(link).toHaveAttribute(
       'href',
       expect.stringContaining(`/oracles/${props.oracleSpecId}`)
@@ -127,33 +110,4 @@ describe('SettlementPriceCell', () => {
     expect(screen.getByText('-')).toBeInTheDocument();
     expect(screen.queryByRole('link')).not.toBeInTheDocument();
   });
-
-  it('does not format value if property key type is not integer', async () => {
-    const props = createProps({
-      name: settlementDataSpecBinding,
-      type: PropertyKeyType.TYPE_TIMESTAMP,
-      numberDecimalPlaces: 2,
-    });
-    const property = {
-      __typename: 'Property' as const,
-      name: props.settlementDataSpecBinding as string,
-      value: '1234',
-    };
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const mock = createMock(props.oracleSpecId!, property);
-
-    render(
-      <MockedProvider mocks={[mock]}>
-        <SettlementPriceCell {...props} />
-      </MockedProvider>
-    );
-
-    expect(screen.getByText('-')).toBeInTheDocument();
-    const link = await screen.findByRole('link');
-    expect(link).toHaveTextContent(property.value);
-    expect(link).toHaveAttribute(
-      'href',
-      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
-    );
-  });
 });

apps/trading/client-pages/markets/settlement-price-cell.tsx

@@ -1,21 +1,19 @@
 import { DApp, EXPLORER_ORACLE, useLinks } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
-import type { DataSourceFilterFragment } from '@vegaprotocol/markets';
 import { useOracleSpecBindingData } from '@vegaprotocol/markets';
-import { PropertyKeyType } from '@vegaprotocol/types';
 import { Link } from '@vegaprotocol/ui-toolkit';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 
 export interface SettlementPriceCellProps {
   oracleSpecId: string | undefined;
+  decimalPlaces: number;
   settlementDataSpecBinding: string | undefined;
-  filter: DataSourceFilterFragment | undefined;
 }
 
 export const SettlementPriceCell = ({
   oracleSpecId,
+  decimalPlaces,
   settlementDataSpecBinding,
-  filter,
 }: SettlementPriceCellProps) => {
   const linkCreator = useLinks(DApp.Explorer);
   const { property, loading } = useOracleSpecBindingData(
@@ -27,32 +25,15 @@ export const SettlementPriceCell = ({
     return <span>-</span>;
   }
 
-  const renderText = () => {
-    if (!property || !filter) {
-      return t('Unknown');
-    }
-
-    if (
-      filter.key.type === PropertyKeyType.TYPE_INTEGER &&
-      filter.key.numberDecimalPlaces !== null &&
-      filter.key.numberDecimalPlaces !== undefined
-    ) {
-      return addDecimalsFormatNumber(
-        property.value,
-        filter.key.numberDecimalPlaces
-      );
-    }
-
-    return property.value;
-  };
-
   return (
     <Link
       href={linkCreator(EXPLORER_ORACLE.replace(':id', oracleSpecId))}
       className="underline font-mono"
       target="_blank"
     >
-      {renderText()}
+      {property
+        ? addDecimalsFormatNumber(property.value, decimalPlaces)
+        : t('-')}
     </Link>
   );
 };

apps/trading/components/navbar/navbar.tsx

@@ -36,8 +36,9 @@ export const Navbar = ({
 }) => {
   const { GITHUB_FEEDBACK_URL } = useEnvironment();
   const tokenLink = useLinks(DApp.Token);
-  const marketId = useGlobalStore((store) => store.marketId);
+  const { marketId } = useGlobalStore((store) => ({
-
+    marketId: store.marketId,
+  }));
   const tradingPath = marketId
     ? Links[Routes.MARKET](marketId)
     : Links[Routes.MARKET]();
@@ -106,14 +107,6 @@ export const Navbar = ({
                     {t('Give Feedback')}
                   </NavExternalLink>
                 </NavigationItem>
-                <NavigationItem>
-                  <NavigationLink
-                    data-testid="Disclaimer"
-                    to={Links[Routes.DISCLAIMER]()}
-                  >
-                    {t('Disclaimer')}
-                  </NavigationLink>
-                </NavigationItem>
               </NavigationList>
             </NavigationContent>
           </NavigationItem>

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

@@ -1,2 +1 @@
 export * from './welcome-dialog';
-export * from './risk-message';

apps/trading/components/welcome-dialog/risk-message.tsx

@@ -1,45 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import {
-  ExternalLink,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-import { Links, Routes } from '../../pages/client-router';
-
-export const RiskMessage = () => {
-  return (
-    <>
-      <div className="bg-vega-light-100 dark:bg-vega-dark-100 p-6 mb-6">
-        <ul className="list-[square] ml-4">
-          <li className="mb-1">
-            {t(
-              'Conduct your own due diligence and consult your financial advisor before making any investment decisions.'
-            )}
-          </li>
-          <li className="mb-1">
-            {t(
-              'You may encounter bugs, loss of functionality or loss of assets.'
-            )}
-          </li>
-          <li>
-            {t('No party accepts any liability for any losses whatsoever.')}
-          </li>
-        </ul>
-      </div>
-      <p className="mb-8">
-        {t(
-          'By using the Vega Console, you acknowledge that you have read and understood the'
-        )}{' '}
-        <ExternalLink
-          href={`/#/${Links[Routes.DISCLAIMER]()}`}
-          className="underline"
-        >
-          <span className="flex items-center gap-1">
-            <span>{t('Vega Console Disclaimer')}</span>
-            <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
-          </span>
-        </ExternalLink>
-      </p>
-    </>
-  );
-};

apps/trading/components/welcome-dialog/risk-notice-dialog.spec.tsx

@@ -47,4 +47,25 @@ describe('Risk notice dialog', () => {
       expect(mockOnClose).toHaveBeenCalled();
     }
   );
+
+  it('displays a risk message for mainnet', () => {
+    const introText = 'Regulation may apply to use of this app';
+    const network = Networks.MAINNET;
+
+    // @ts-ignore ignore mock implementation
+    useEnvironment.mockImplementation(() => ({
+      ...mockEnvDefinitions,
+      VEGA_ENV: network,
+    }));
+
+    render(<RiskNoticeDialog onClose={mockOnClose} network={network} />);
+
+    expect(screen.getByText(introText)).toBeInTheDocument();
+
+    const button = screen.getByRole('button', {
+      name: 'I understand, Continue',
+    });
+    fireEvent.click(button);
+    expect(mockOnClose).toHaveBeenCalled();
+  });
 });

apps/trading/components/welcome-dialog/risk-notice-dialog.tsx

@@ -7,8 +7,8 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { RISK_ACCEPTED_KEY } from '../constants';
 import { TelemetryApproval } from './telemetry-approval';
-import type { Networks } from '@vegaprotocol/environment';
 import {
+  Networks,
   useEnvironment,
   DocsLinks,
   ExternalLinks,
@@ -28,17 +28,29 @@ export const RiskNoticeDialog = ({ onClose, network }: Props) => {
   };
 
   return (
-    <TestnetContent network={network} handleAcceptRisk={handleAcceptRisk} />
+    <>
+      {network === Networks.MAINNET ? (
+        <MainnetContent />
+      ) : (
+        <TestnetContent network={network} />
+      )}
+      <div className="my-4">
+        <TelemetryApproval
+          helpText={t(
+            'Help identify bugs and improve the service by sharing anonymous usage data. You can change this in your settings at any time.'
+          )}
+        />
+      </div>
+      <Button onClick={handleAcceptRisk}>
+        {network === Networks.MAINNET
+          ? t('I understand, Continue')
+          : t('Continue')}
+      </Button>
+    </>
   );
 };
 
-const TestnetContent = ({
+const TestnetContent = ({ network }: { network: Networks }) => {
-  network,
-  handleAcceptRisk,
-}: {
-  network: Networks;
-  handleAcceptRisk: () => void;
-}) => {
   const { GITHUB_FEEDBACK_URL } = useEnvironment();
   return (
     <>
@@ -76,14 +88,29 @@ const TestnetContent = ({
           </li>
         </ul>
       )}
-      <div className="my-4">
+    </>
-        <TelemetryApproval
+  );
-          helpText={t(
+};
-            'Help identify bugs and improve the service by sharing anonymous usage data. You can change this in your settings at any time.'
+
-          )}
+const MainnetContent = () => {
-        />
+  return (
-      </div>
+    <>
-      <Button onClick={handleAcceptRisk}>{t('Continue')}</Button>
+      <h4 className="text-xl mb-2 mt-4">
+        {t('Regulation may apply to use of this app')}
+      </h4>
+      <p className="mb-6">
+        {t(
+          'This decentralised application allows you to connect to and use publicly available blockchain services operated by third parties that may include trading, financial products, or other services that may be subject to legal and regulatory restrictions in your jurisdiction. This application is a front end only and does not hold any funds or provide any products or services. It is available to anyone with an internet connection via IPFS and other methods, and the ability to access it does not imply any right to use any services or that it is legal for you to do so. By using this application you accept that it is your responsibility to ensure that your use of the application and any blockchain services accessed through it is compliant with applicable laws and regulations in your jusrisdiction.'
+        )}
+      </p>
+      <h4 className="text-xl mb-2">
+        {t('Technical and financial risk of loss')}
+      </h4>
+      <p className="mb-8">
+        {t(
+          'The public blockchain services accessible via this decentralised application are operated by third parties and may carry significant risks including the potential loss of all funds that you deposit or hold with these services. Technical risks include the risk of loss in the event of the failure or compromise of the public blockchain infrastructure or smart contracts that provide any services you use. Financial risks include but are not limited to losses due to volatility, excessive leverage, low liquidity, and your own lack of understanding of the services you use. By using this decentralised application you accept that it is your responsibility to ensure that you understand any services you use and the technical and financial risks inherent in your use. Do not risk what you cannot afford to lose.'
+        )}
+      </p>
     </>
   );
 };

apps/trading/components/welcome-dialog/telemetry-approval.tsx

@@ -5,7 +5,7 @@ import { useTelemetryApproval } from '../../lib/hooks/use-telemetry-approval';
 export const TelemetryApproval = ({ helpText }: { helpText: string }) => {
   const [isApproved, setIsApproved] = useTelemetryApproval();
   return (
-    <div className="flex flex-col py-3">
+    <div className="flex flex-col px-2 py-3">
       <div className="mr-4" role="form">
         <Checkbox
           label={<span className="text-lg pl-1">{t('Share usage data')}</span>}

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

@@ -30,24 +30,17 @@ export const WelcomeDialog = () => {
   const shouldDisplayWelcomeDialog = useGlobalStore(
     (store) => store.shouldDisplayWelcomeDialog
   );
-
+  const isRiskDialogNeeded = riskAccepted !== 'true' && !('Cypress' in window);
-  const isRiskDialogNeeded =
-    riskAccepted !== 'true' &&
-    VEGA_ENV !== Networks.MAINNET &&
-    !('Cypress' in window);
-
   const isWelcomeDialogNeeded = pathname === '/' || shouldDisplayWelcomeDialog;
-
   const onCloseDialog = useCallback(() => {
-    update({
+    update({ shouldDisplayWelcomeDialog: isRiskDialogNeeded });
-      shouldDisplayWelcomeDialog: isRiskDialogNeeded,
-    });
   }, [update, isRiskDialogNeeded]);
+
   if (isRiskDialogNeeded) {
     dialogContent = (
       <RiskNoticeDialog onClose={onCloseDialog} network={VEGA_ENV} />
     );
-    title = t('Vega Console');
+    title = VEGA_ENV === Networks.MAINNET ? t('WARNING') : t('Vega Console');
     size = 'medium';
   } else if (isWelcomeDialogNeeded && data?.length === 0) {
     dialogContent = <WelcomeNoticeDialog />;

apps/trading/components/welcome-dialog/welcome-landing-dialog.tsx

@@ -16,8 +16,6 @@ import { Link } from 'react-router-dom';
 import { ProposedMarkets } from './proposed-markets';
 import { Links, Routes } from '../../pages/client-router';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
-import { TelemetryApproval } from './telemetry-approval';
-import { Networks, useEnvironment } from '@vegaprotocol/environment';
 
 export const SelectMarketLandingTable = ({
   markets,
@@ -96,8 +94,6 @@ export const WelcomeLandingDialog = ({
   onClose,
 }: LandingDialogContainerProps) => {
   const { data, loading, error } = useMarketList();
-  const { VEGA_ENV } = useEnvironment();
-  const isMainnet = VEGA_ENV === Networks.MAINNET;
   if (error) {
     return (
       <div className="flex justify-center items-center">
@@ -118,13 +114,6 @@ export const WelcomeLandingDialog = ({
     <>
       <WelcomeDialogHeader />
       <SelectMarketLandingTable markets={data} onClose={onClose} />
-      {isMainnet && (
-        <TelemetryApproval
-          helpText={t(
-            'Help identify bugs and improve the service by sharing anonymous usage data. You can change this in your settings at any time.'
-          )}
-        />
-      )}
     </>
   );
 };

apps/trading/components/welcome-dialog/welcome-notice-dialog.tsx

@@ -10,7 +10,6 @@ import {
   ExternalLinks,
 } from '@vegaprotocol/environment';
 import { ProposedMarkets } from './proposed-markets';
-import { TelemetryApproval } from './telemetry-approval';
 
 export const WelcomeNoticeDialog = () => {
   const { VEGA_ENV } = useEnvironment();
@@ -21,30 +20,30 @@ export const WelcomeNoticeDialog = () => {
     <>
       <h1
         data-testid="welcome-notice-title"
-        className="text-2xl uppercase mb-6 text-center font-alpha calt"
+        className="mb-6 p-4 text-center text-2xl"
       >
         {t('Welcome to Console')}
       </h1>
-      <p className="leading-6 mb-4">
+      <p className="leading-6 mb-7">
         {t(
           'There are no markets to trade on right now. Trading on Vega is now live, but markets need to pass a governance vote before they can be traded on. In the meantime:'
         )}
       </p>
-      <ul className="list-[square] pl-4 mb-4">
+      <ul className="list-[square] pl-7">
         {isMainnet && (
-          <li className="mb-1">
+          <li>
             <ExternalLink target="_blank" href={consoleFairgroundLink()}>
               {t('Try out Console')}
             </ExternalLink>
             {t(' on Fairground, our Testnet')}
           </li>
         )}
-        <li className="mb-1">
+        <li>
           <ExternalLink target="_blank" href={tokenLink(TOKEN_PROPOSALS)}>
             {t('View and vote for proposed markets')}
           </ExternalLink>
         </li>
-        <li className="mb-1">
+        <li>
           <ExternalLink
             target="_blank"
             href={tokenLink(TOKEN_NEW_MARKET_PROPOSAL)}
@@ -52,19 +51,12 @@ export const WelcomeNoticeDialog = () => {
             {t('Propose a market')}
           </ExternalLink>
         </li>
-        <li className="mb-1">
+        <li>
           <ExternalLink target="_blank" href={ExternalLinks.BLOG}>
             {t('Read about the mainnet launch')}
           </ExternalLink>
         </li>
       </ul>
-      {isMainnet && (
-        <TelemetryApproval
-          helpText={t(
-            'Help identify bugs and improve the service by sharing anonymous usage data. You can change this in your settings at any time.'
-          )}
-        />
-      )}
       <ProposedMarkets />
     </>
   );

apps/trading/pages/client-router.tsx

@@ -30,10 +30,6 @@ const LazySettings = dynamic(() => import('../client-pages/settings'), {
   ssr: false,
 });
 
-const LazyDisclaimer = dynamic(() => import('../client-pages/disclaimer'), {
-  ssr: false,
-});
-
 export enum Routes {
   HOME = '/',
   MARKET = '/markets',
@@ -41,7 +37,6 @@ export enum Routes {
   PORTFOLIO = '/portfolio',
   LIQUIDITY = 'liquidity/:marketId',
   SETTINGS = 'settings',
-  DISCLAIMER = 'disclaimer',
 }
 
 type ConsoleLinks = { [r in Routes]: (...args: string[]) => string };
@@ -56,7 +51,6 @@ export const Links: ConsoleLinks = {
       ? trimEnd(`${Routes.LIQUIDITY}/${marketId}`, '/')
       : Routes.LIQUIDITY,
   [Routes.SETTINGS]: () => Routes.SETTINGS,
-  [Routes.DISCLAIMER]: () => Routes.DISCLAIMER,
 };
 
 const routerConfig: RouteObject[] = [
@@ -103,10 +97,6 @@ const routerConfig: RouteObject[] = [
     path: Routes.SETTINGS,
     element: <LazySettings />,
   },
-  {
-    path: Routes.DISCLAIMER,
-    element: <LazyDisclaimer />,
-  },
   {
     path: '*',
     element: (

apps/trading/pages/dialogs-container.tsx

@@ -12,16 +12,13 @@ import {
 } from '@vegaprotocol/web3';
 import { WelcomeDialog } from '../components/welcome-dialog';
 import { TransferDialog } from '@vegaprotocol/accounts';
-import { RiskMessage } from '../components/welcome-dialog';
 
 const DialogsContainer = () => {
   const { isOpen, id, trigger, setOpen } = useAssetDetailsDialogStore();
+
   return (
     <>
-      <VegaConnectDialog
+      <VegaConnectDialog connectors={Connectors} />
-        connectors={Connectors}
-        riskMessage={<RiskMessage />}
-      />
       <AssetDetailsDialog
         assetId={id}
         trigger={trigger || null}

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

@@ -60,7 +60,6 @@ export function addVegaWalletConnect() {
 export function addSetVegaWallet() {
   Cypress.Commands.add('setVegaWallet', () => {
     cy.window().then((win) => {
-      win.localStorage.setItem('vega_risk_accepted', 'true');
       win.localStorage.setItem(
         'vega_wallet_config',
         JSON.stringify({

libs/markets/src/lib/OracleMarketsSpec.graphql

@@ -31,6 +31,27 @@ fragment OracleMarketSpecFields on Market {
   }
 }
 
+fragment DataSourceSpec on DataSourceDefinition {
+  sourceType {
+    ... on DataSourceDefinitionExternal {
+      sourceType {
+        ... on DataSourceSpecConfiguration {
+          signers {
+            signer {
+              ... on PubKey {
+                key
+              }
+              ... on ETHAddress {
+                address
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 query OracleMarketsSpec {
   marketsConnection {
     edges {

libs/markets/src/lib/__generated__/OracleMarketsSpec.ts

@@ -1,16 +1,39 @@
 import * as Types from '@vegaprotocol/types';
 
 import { gql } from '@apollo/client';
-import { DataSourceSpecFragmentDoc } from './markets';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type OracleMarketSpecFieldsFragment = { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } } };
+export type OracleMarketSpecFieldsFragment = { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } } };
+
+export type DataSourceSpecFragment = { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } };
 
 export type OracleMarketsSpecQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type OracleMarketsSpecQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } } } }> } | null };
+export type OracleMarketsSpecQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } } } }> } | null };
 
+export const DataSourceSpecFragmentDoc = gql`
+    fragment DataSourceSpec on DataSourceDefinition {
+  sourceType {
+    ... on DataSourceDefinitionExternal {
+      sourceType {
+        ... on DataSourceSpecConfiguration {
+          signers {
+            signer {
+              ... on PubKey {
+                key
+              }
+              ... on ETHAddress {
+                address
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+    `;
 export const OracleMarketSpecFieldsFragmentDoc = gql`
     fragment OracleMarketSpecFields on Market {
   id

libs/markets/src/lib/__generated__/markets.ts

@@ -1,53 +1,16 @@
 import * as Types from '@vegaprotocol/types';
 
 import { gql } from '@apollo/client';
+import { DataSourceSpecFragmentDoc } from './OracleMarketsSpec';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type DataSourceFilterFragment = { __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } };
+export type MarketFieldsFragment = { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } };
-
-export type DataSourceSpecFragment = { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } };
-
-export type MarketFieldsFragment = { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } };
 
 export type MarketsQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type MarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } } }> } | null };
+export type MarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } } }> } | null };
 
-export const DataSourceFilterFragmentDoc = gql`
-    fragment DataSourceFilter on Filter {
-  key {
-    name
-    type
-    numberDecimalPlaces
-  }
-}
-    `;
-export const DataSourceSpecFragmentDoc = gql`
-    fragment DataSourceSpec on DataSourceDefinition {
-  sourceType {
-    ... on DataSourceDefinitionExternal {
-      sourceType {
-        ... on DataSourceSpecConfiguration {
-          signers {
-            signer {
-              ... on PubKey {
-                key
-              }
-              ... on ETHAddress {
-                address
-              }
-            }
-          }
-          filters {
-            ...DataSourceFilter
-          }
-        }
-      }
-    }
-  }
-}
-    ${DataSourceFilterFragmentDoc}`;
 export const MarketFieldsFragmentDoc = gql`
     fragment MarketFields on Market {
   id

libs/markets/src/lib/hooks/use-market-oracle.ts

@@ -4,7 +4,7 @@ import { useMarket } from '../markets-provider';
 
 import { useMemo } from 'react';
 import type { Provider } from '../oracle-schema';
-import type { DataSourceSpecFragment } from '../__generated__';
+import type { DataSourceSpecFragment } from '../__generated__/OracleMarketsSpec';
 
 export const getMatchingOracleProvider = (
   dataSourceSpec: DataSourceSpecFragment,

libs/markets/src/lib/markets.graphql

@@ -1,11 +1,3 @@
-fragment DataSourceFilter on Filter {
-  key {
-    name
-    type
-    numberDecimalPlaces
-  }
-}
-
 fragment DataSourceSpec on DataSourceDefinition {
   sourceType {
     ... on DataSourceDefinitionExternal {
@@ -21,9 +13,6 @@ fragment DataSourceSpec on DataSourceDefinition {
               }
             }
           }
-          filters {
-            ...DataSourceFilter
-          }
         }
       }
     }

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

@@ -80,17 +80,6 @@ export const createMarketFragment = (
                       },
                     },
                   ],
-                  filters: [
-                    {
-                      __typename: 'Filter',
-                      key: {
-                        __typename: 'PropertyKey',
-                        name: 'settlement-data-property',
-                        type: Schema.PropertyKeyType.TYPE_TIMESTAMP,
-                        numberDecimalPlaces: null,
-                      },
-                    },
-                  ],
                 },
               },
             },
@@ -113,17 +102,6 @@ export const createMarketFragment = (
                       },
                     },
                   ],
-                  filters: [
-                    {
-                      __typename: 'Filter',
-                      key: {
-                        __typename: 'PropertyKey',
-                        name: 'settlement-data-property',
-                        type: Schema.PropertyKeyType.TYPE_INTEGER,
-                        numberDecimalPlaces: 2,
-                      },
-                    },
-                  ],
                 },
               },
             },

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

@@ -5,74 +5,57 @@ import {
   waitFor,
   getAllByRole,
 } from '@testing-library/react';
-import merge from 'lodash/merge';
-import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { ProposalsList } from './proposals-list';
+import type { ProposalListFieldsFragment } from '../../lib/proposals-data-provider';
 import * as Types from '@vegaprotocol/types';
-import { createProposalListFieldsFragment } from '../../lib/proposals-data-provider/proposals.mock';
+
-import type { ProposalsListQuery } from '../../lib';
+const votesMock = {
-import { ProposalsListDocument } from '../../lib';
+  yes: {
-import type { PartialDeep } from 'type-fest';
+    totalTokens: '5000',
+  },
+  no: {
+    totalTokens: '2000',
+  },
+};
+let marketsProposalMock: ProposalListFieldsFragment[] | null = [
+  {
+    id: 'id-1',
+    state: Types.ProposalState.STATE_OPEN,
+    votes: { ...votesMock },
+  },
+  {
+    id: 'id-2',
+    state: Types.ProposalState.STATE_PASSED,
+    votes: { ...votesMock },
+  },
+  {
+    id: 'id-3',
+    state: Types.ProposalState.STATE_WAITING_FOR_NODE_VOTE,
+    votes: { ...votesMock },
+  },
+] as ProposalListFieldsFragment[];
+
+const useDataProvider = () => {
+  return {
+    data: marketsProposalMock,
+    loading: false,
+    error: false,
+  };
+};
+jest.mock('@vegaprotocol/data-provider', () => ({
+  ...jest.requireActual('@vegaprotocol/data-provider'),
+  useDataProvider: jest.fn(() => useDataProvider()),
+}));
 
 describe('ProposalsList', () => {
-  const createProposalsMock = (override?: PartialDeep<ProposalsListQuery>) => {
+  beforeEach(() => {
-    const defaultProposalEdges = [
+    jest.clearAllMocks();
-      {
+  });
-        __typename: 'ProposalEdge' as const,
-        node: createProposalListFieldsFragment({
-          id: 'id-1',
-          state: Types.ProposalState.STATE_OPEN,
-        }),
-      },
-      {
-        __typename: 'ProposalEdge' as const,
-        node: createProposalListFieldsFragment({
-          id: 'id-2',
-          state: Types.ProposalState.STATE_PASSED,
-        }),
-      },
-      {
-        __typename: 'ProposalEdge' as const,
-        node: createProposalListFieldsFragment({
-          id: 'id-3',
-          state: Types.ProposalState.STATE_WAITING_FOR_NODE_VOTE,
-        }),
-      },
-    ];
-    const data = merge(
-      {
-        proposalsConnection: {
-          __typename: 'ProposalsConnection' as const,
-          edges: defaultProposalEdges,
-        },
-      },
-      override
-    );
-
-    const mock: MockedResponse<ProposalsListQuery> = {
-      request: {
-        query: ProposalsListDocument,
-        variables: {
-          proposalType: Types.ProposalType.TYPE_NEW_MARKET,
-        },
-      },
-      result: {
-        data,
-      },
-    };
-
-    return mock;
-  };
 
   it('should be properly rendered', async () => {
-    const mock = createProposalsMock();
     await act(() => {
-      render(
+      render(<ProposalsList />, { wrapper: MockedProvider });
-        <MockedProvider mocks={[mock]}>
-          <ProposalsList />
-        </MockedProvider>
-      );
     });
     const container = document.querySelector('.ag-center-cols-container');
     await waitFor(() => {
@@ -82,25 +65,15 @@ describe('ProposalsList', () => {
   });
 
   it('some of states should be filtered out', async () => {
-    const mock = createProposalsMock({
+    marketsProposalMock = [
-      proposalsConnection: {
+      {
-        edges: [
+        ...(marketsProposalMock as ProposalListFieldsFragment[])[0],
-          {
+        state: Types.ProposalState.STATE_ENACTED,
-            __typename: 'ProposalEdge',
-            node: createProposalListFieldsFragment({
-              id: 'id-1',
-              state: Types.ProposalState.STATE_ENACTED,
-            }),
-          },
-        ],
       },
-    });
+      ...(marketsProposalMock as ProposalListFieldsFragment[]).slice(1),
+    ];
     await act(() => {
-      render(
+      render(<ProposalsList />, { wrapper: MockedProvider });
-        <MockedProvider mocks={[mock]}>
-          <ProposalsList />
-        </MockedProvider>
-      );
     });
     const container = document.querySelector('.ag-center-cols-container');
     await waitFor(() => {
@@ -110,12 +83,9 @@ describe('ProposalsList', () => {
   });
 
   it('empty response should causes no data message display', async () => {
+    marketsProposalMock = null;
     await act(() => {
-      render(
+      render(<ProposalsList />, { wrapper: MockedProvider });
-        <MockedProvider>
-          <ProposalsList />
-        </MockedProvider>
-      );
     });
     const container = document.querySelector('.ag-center-cols-container');
     await waitFor(() => {

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

@@ -1,13 +1,13 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { t } from '@vegaprotocol/i18n';
 import * as Types from '@vegaprotocol/types';
+import { proposalsDataProvider } from '../../lib/proposals-data-provider';
 import type { AgGridReact } from 'ag-grid-react';
 import { useColumnDefs } from './use-column-defs';
 import type { ProposalListFieldsFragment } from '../../lib/proposals-data-provider/__generated__/Proposals';
-import { useProposalsListQuery } from '../../lib/proposals-data-provider/__generated__/Proposals';
-import { removePaginationWrapper } from '@vegaprotocol/utils';
 
 export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>
   data.filter((proposal) =>
@@ -21,15 +21,13 @@ export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>
 export const ProposalsList = () => {
   const gridRef = useRef<AgGridReact | null>(null);
   const [dataCount, setDataCount] = useState(0);
-  const { data, loading, error, refetch } = useProposalsListQuery({
+  const { data, loading, error, reload } = useDataProvider({
+    dataProvider: proposalsDataProvider,
     variables: {
       proposalType: Types.ProposalType.TYPE_NEW_MARKET,
     },
-    errorPolicy: 'all', // currently there are some proposals failing due to proposals existing without settlement asset ids
   });
-  const filteredData = getNewMarketProposals(
+  const filteredData = getNewMarketProposals(data || []);
-    removePaginationWrapper(data?.proposalsConnection?.edges)
-  );
   const { columnDefs, defaultColDef } = useColumnDefs();
   useEffect(() => {
     setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
@@ -38,10 +36,11 @@ export const ProposalsList = () => {
     setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
   }, []);
   return (
-    <div className="relative h-full">
+    <div className="relative">
       <AgGrid
         ref={gridRef}
         className="w-full h-full"
+        domLayout="autoHeight"
         columnDefs={columnDefs}
         rowData={filteredData}
         defaultColDef={defaultColDef}
@@ -49,8 +48,6 @@ export const ProposalsList = () => {
         suppressNoRowsOverlay
         onFilterChanged={onFilterChanged}
         storeKey="proposedMarkets"
-        getRowId={({ data }) => data.id}
-        style={{ width: '100%', height: '100%' }}
       />
       <div className="pointer-events-none absolute inset-0">
         <AsyncRenderer
@@ -59,7 +56,7 @@ export const ProposalsList = () => {
           data={filteredData}
           noDataMessage={t('No markets')}
           noDataCondition={() => !dataCount}
-          reload={refetch}
+          reload={reload}
         />
       </div>
     </div>

libs/proposals/src/lib/proposals-data-provider/proposals.mock.ts

@@ -11,7 +11,6 @@ export const proposalListQuery = (
 ): ProposalsListQuery => {
   const defaultResult: ProposalsListQuery = {
     proposalsConnection: {
-      __typename: 'ProposalsConnection',
       edges: proposalListFields.map((node) => ({
         __typename: 'ProposalEdge',
         node,
@@ -105,10 +104,8 @@ export const marketUpdateProposal: ProposalListFieldsFragment = {
   },
 };
 
-export const createProposalListFieldsFragment = (
+const proposalListFields: ProposalListFieldsFragment[] = [
-  override?: PartialDeep<ProposalListFieldsFragment>
+  {
-): ProposalListFieldsFragment => {
-  const defaultProposal: ProposalListFieldsFragment = {
     id: 'e9ec6d5c46a7e7bcabf9ba7a893fa5a5eeeec08b731f06f7a6eb7bf0e605b829',
     reference: 'injected_at_runtime',
     state: Schema.ProposalState.STATE_OPEN,
@@ -197,12 +194,7 @@ export const createProposalListFieldsFragment = (
       __typename: 'ProposalTerms',
     },
     __typename: 'Proposal',
-  };
+  },
-  return merge(defaultProposal, override);
-};
-
-const proposalListFields: ProposalListFieldsFragment[] = [
-  createProposalListFieldsFragment(),
   {
     id: '1cd1deb532b97fbeb9262fe94499ecec5835e60ae564b7c5af530c90a13c29cb',
     reference: 'injected_at_runtime',

libs/ui-toolkit/src/components/toast/toast-position-setter.tsx

@@ -7,11 +7,10 @@ import { ToastPosition, useToastsConfiguration, useToasts } from './use-toasts';
 import { useCallback } from 'react';
 import { Intent } from '../../utils/intent';
 
-const TEST_TOAST = {
+const testToast = {
   id: 'test-toast',
   intent: Intent.Primary,
   content: <>{t('This is an example of a toast notification')}</>,
-  onClose: () => useToasts.getState().remove('test-toast'),
 };
 
 export const ToastPositionSetter = () => {
@@ -21,7 +20,7 @@ export const ToastPositionSetter = () => {
   const handleChange = useCallback(
     (position: ToastPosition) => {
       setPostion(position);
-      setToast(TEST_TOAST);
+      setToast(testToast);
     },
     [setToast, setPostion]
   );

libs/ui-toolkit/src/components/toast/use-toasts.ts

@@ -109,12 +109,12 @@ export enum ToastPosition {
   BottomCenter,
 }
 
-type ToastsConfiguration = {
+type ToastConfiguration = {
   position: ToastPosition;
   setPosition: (position: ToastPosition) => void;
 };
 
-export const useToastsConfiguration = create<ToastsConfiguration>()(
+export const useToastsConfiguration = create<ToastConfiguration>()(
   persist(
     immer((set) => ({
       position: ToastPosition.BottomRight,

libs/wallet/src/connect-dialog/connect-dialog.tsx

@@ -30,7 +30,6 @@ import type { Status } from '../use-json-rpc-connect';
 import { useJsonRpcConnect } from '../use-json-rpc-connect';
 import { ViewConnectorForm } from './view-connector-form';
 import { useChainIdQuery } from './__generated__/ChainId';
-import { useVegaWallet } from '../use-vega-wallet';
 
 export const CLOSE_DELAY = 1700;
 type Connectors = { [key: string]: VegaConnector };
@@ -39,7 +38,6 @@ type WalletType = 'jsonRpc' | 'hosted' | 'view';
 export interface VegaConnectDialogProps {
   connectors: Connectors;
   onChangeOpen?: (open: boolean) => void;
-  riskMessage?: React.ReactNode;
 }
 
 export const useVegaWalletDialogStore = create<VegaWalletDialogStore>()(
@@ -62,30 +60,25 @@ export interface VegaWalletDialogStore {
 export const VegaConnectDialog = ({
   connectors,
   onChangeOpen,
-  riskMessage,
 }: VegaConnectDialogProps) => {
   const vegaWalletDialogOpen = useVegaWalletDialogStore(
     (store) => store.vegaWalletDialogOpen
   );
-  const updateVegaWalletDialog = useVegaWalletDialogStore(
+  const updateVegaWalletDialog = useVegaWalletDialogStore((store) =>
-    (store) => (open: boolean) => {
+    onChangeOpen
-      store.updateVegaWalletDialog(open);
+      ? (open: boolean) => {
-      onChangeOpen?.(open);
+          store.updateVegaWalletDialog(open);
-    }
+          onChangeOpen(open);
+        }
+      : store.updateVegaWalletDialog
   );
-  const closeVegaWalletDialog = useVegaWalletDialogStore((store) => () => {
+  const closeVegaWalletDialog = useVegaWalletDialogStore((store) =>
-    store.closeVegaWalletDialog();
+    onChangeOpen
-    onChangeOpen?.(false);
+      ? () => {
-  });
+          store.closeVegaWalletDialog();
-  const { disconnect, acknowledgeNeeded } = useVegaWallet();
+          onChangeOpen(false);
-  const onVegaWalletDialogChange = useCallback(
+        }
-    (open: boolean) => {
+      : store.closeVegaWalletDialog
-      updateVegaWalletDialog(open);
-      if (!open && acknowledgeNeeded) {
-        disconnect();
-      }
-    },
-    [updateVegaWalletDialog, acknowledgeNeeded, disconnect]
   );
 
   const { data, error, loading } = useChainIdQuery();
@@ -119,7 +112,6 @@ export const VegaConnectDialog = ({
         connectors={connectors}
         closeDialog={closeVegaWalletDialog}
         appChainId={data.statistics.chainId}
-        riskMessage={riskMessage}
       />
     );
   };
@@ -128,7 +120,7 @@ export const VegaConnectDialog = ({
     <Dialog
       open={vegaWalletDialogOpen}
       size="small"
-      onChange={onVegaWalletDialogChange}
+      onChange={updateVegaWalletDialog}
     >
       {renderContent()}
     </Dialog>
@@ -139,17 +131,16 @@ const ConnectDialogContainer = ({
   connectors,
   closeDialog,
   appChainId,
-  riskMessage,
 }: {
   connectors: Connectors;
   closeDialog: () => void;
   appChainId: string;
-  riskMessage?: React.ReactNode;
 }) => {
   const { VEGA_WALLET_URL, VEGA_ENV, HOSTED_WALLET_URL } = useEnvironment();
   const [selectedConnector, setSelectedConnector] = useState<VegaConnector>();
   const [walletUrl, setWalletUrl] = useState(VEGA_WALLET_URL || '');
   const [walletType, setWalletType] = useState<WalletType>();
+
   const reset = useCallback(() => {
     setSelectedConnector(undefined);
     setWalletType(undefined);
@@ -198,7 +189,6 @@ const ConnectDialogContainer = ({
       onConnect={closeDialog}
       appChainId={appChainId}
       reset={reset}
-      riskMessage={riskMessage}
     />
   ) : (
     <ConnectorList
@@ -265,7 +255,6 @@ const SelectedForm = ({
   jsonRpcState,
   reset,
   onConnect,
-  riskMessage,
 }: {
   type: WalletType;
   connector: VegaConnector;
@@ -276,7 +265,6 @@ const SelectedForm = ({
   };
   reset: () => void;
   onConnect: () => void;
-  riskMessage?: React.ReactNode;
 }) => {
   if (connector instanceof RestConnector) {
     return (
@@ -329,7 +317,6 @@ const SelectedForm = ({
             onConnect={onConnect}
             appChainId={appChainId}
             reset={reset}
-            riskMessage={riskMessage}
           />
         </ConnectDialogContent>
         <ConnectDialogFooter />

libs/wallet/src/connect-dialog/json-rpc-connector-form.tsx

@@ -1,7 +1,6 @@
 import capitalize from 'lodash/capitalize';
 import { t } from '@vegaprotocol/i18n';
 import {
-  Button,
   ButtonLink,
   Diamond,
   Link,
@@ -15,8 +14,6 @@ import { ClientErrors } from '../connectors';
 import { ConnectDialogTitle } from './connect-dialog-elements';
 import { Status } from '../use-json-rpc-connect';
 import { DocsLinks } from '@vegaprotocol/environment';
-import { useVegaWallet } from '../use-vega-wallet';
-import { setAcknowledged } from '../storage';
 
 export const ServiceErrors = {
   NO_HEALTHY_NODE: 1000,
@@ -29,8 +26,6 @@ export const JsonRpcConnectorForm = ({
   status,
   error,
   reset,
-  onConnect,
-  riskMessage,
 }: {
   connector: JsonRpcConnector;
   appChainId: string;
@@ -38,13 +33,35 @@ export const JsonRpcConnectorForm = ({
   error: WalletClientError | null;
   onConnect: () => void;
   reset: () => void;
-  riskMessage?: React.ReactNode;
 }) => {
-  const { disconnect } = useVegaWallet();
   if (status === Status.Idle) {
     return null;
   }
 
+  return (
+    <Connecting
+      status={status}
+      error={error}
+      connector={connector}
+      appChainId={appChainId}
+      reset={reset}
+    />
+  );
+};
+
+const Connecting = ({
+  status,
+  error,
+  connector,
+  appChainId,
+  reset,
+}: {
+  status: Status;
+  error: WalletClientError | null;
+  connector: JsonRpcConnector;
+  appChainId: string;
+  reset: () => void;
+}) => {
   if (status === Status.Error) {
     return (
       <Error
@@ -108,34 +125,6 @@ export const JsonRpcConnectorForm = ({
     );
   }
 
-  if (status === Status.AcknowledgeNeeded) {
-    const setConnection = () => {
-      setAcknowledged();
-      onConnect();
-    };
-    const handleDisagree = () => {
-      disconnect();
-      onConnect(); // this is dialog closing
-    };
-    return (
-      <>
-        <ConnectDialogTitle>{t('Understand the risk')}</ConnectDialogTitle>
-        {riskMessage}
-        <div className="grid grid-cols-2 gap-5">
-          <div>
-            <Button onClick={handleDisagree} fill>
-              {t('Cancel')}
-            </Button>
-          </div>
-          <div>
-            <Button onClick={setConnection} variant="primary" fill>
-              {t('I agree')}
-            </Button>
-          </div>
-        </div>
-      </>
-    );
-  }
   return null;
 };
 

libs/wallet/src/context.ts

@@ -34,9 +34,6 @@ export interface VegaWalletContextShape {
 
   /** Fetch public keys */
   fetchPubKeys?: () => Promise<PubKey[] | null>;
-
-  /** Acknowledge disclaimer */
-  acknowledgeNeeded?: boolean;
 }
 
 export const VegaWalletContext = createContext<

libs/wallet/src/provider.spec.tsx

@@ -7,8 +7,6 @@ import { VegaWalletProvider } from './provider';
 import { LocalStorage } from '@vegaprotocol/utils';
 import type { ReactNode } from 'react';
 import { WALLET_KEY } from './storage';
-import * as Environment from '@vegaprotocol/environment';
-import * as ReactHelpers from '@vegaprotocol/react-helpers';
 
 const restConnector = new RestConnector();
 const viewConnector = new ViewConnector();
@@ -45,7 +43,6 @@ describe('VegaWalletProvider', () => {
 
     // Default state
     expect(result.current).toEqual({
-      acknowledgeNeeded: false,
       pubKey: null,
       pubKeys: null,
       isReadOnly: false,
@@ -86,7 +83,6 @@ describe('VegaWalletProvider', () => {
 
     // Default state
     expect(result.current).toEqual({
-      acknowledgeNeeded: false,
       pubKey: null,
       pubKeys: null,
       isReadOnly: false,
@@ -146,29 +142,4 @@ describe('VegaWalletProvider', () => {
     });
     expect(result.current.isReadOnly).toBe(true);
   });
-
-  it('acknowledgeNeeded will set on', async () => {
-    jest
-      .spyOn(Environment, 'useEnvironment')
-      .mockReturnValue({ VEGA_ENV: 'MAINNET' });
-    jest.spyOn(ReactHelpers, 'useLocalStorage').mockImplementation(() => [
-      '',
-      () => {
-        /**/
-      },
-      () => {
-        /**/
-      },
-    ]);
-    jest
-      .spyOn(viewConnector, 'connect')
-      .mockImplementation(() => Promise.resolve(mockPubKeys));
-    const { result } = setup();
-    expect(result.current.acknowledgeNeeded).toBe(true);
-
-    await act(async () => {
-      result.current.connect(viewConnector);
-    });
-    expect(result.current.isReadOnly).toBe(true);
-  });
 });

libs/wallet/src/provider.tsx

@@ -9,10 +9,8 @@ import type {
   VegaConnector,
 } from './connectors/vega-connector';
 import { VegaWalletContext } from './context';
-import { WALLET_KEY, WALLET_RISK_ACCEPTED_KEY } from './storage';
+import { WALLET_KEY } from './storage';
 import { ViewConnector } from './connectors';
-import { useEnvironment, Networks } from '@vegaprotocol/environment';
-import { useLocalStorage } from '@vegaprotocol/react-helpers';
 
 interface VegaWalletProviderProps {
   children: ReactNode;
@@ -110,11 +108,6 @@ export const VegaWalletProvider = ({ children }: VegaWalletProviderProps) => {
     return connector.current.sendTx(pubkey, transaction);
   }, []);
 
-  const { VEGA_ENV } = useEnvironment();
-  const [riskAcceptedValue] = useLocalStorage(WALLET_RISK_ACCEPTED_KEY);
-  const acknowledgeNeeded =
-    VEGA_ENV === Networks.MAINNET && riskAcceptedValue !== 'true';
-
   const contextValue = useMemo<VegaWalletContextShape>(() => {
     return {
       isReadOnly,
@@ -125,7 +118,6 @@ export const VegaWalletProvider = ({ children }: VegaWalletProviderProps) => {
       disconnect,
       sendTx,
       fetchPubKeys,
-      acknowledgeNeeded,
     };
   }, [
     isReadOnly,
@@ -136,7 +128,6 @@ export const VegaWalletProvider = ({ children }: VegaWalletProviderProps) => {
     disconnect,
     sendTx,
     fetchPubKeys,
-    acknowledgeNeeded,
   ]);
 
   return (

libs/wallet/src/storage.ts

@@ -8,7 +8,6 @@ interface ConnectorConfig {
 
 export const WALLET_CONFIG = 'vega_wallet_config';
 export const WALLET_KEY = 'vega_wallet_key';
-export const WALLET_RISK_ACCEPTED_KEY = 'vega_wallet_risk_accepted';
 
 export function setConfig(cfg: ConnectorConfig) {
   LocalStorage.setItem(WALLET_CONFIG, JSON.stringify(cfg));
@@ -30,11 +29,3 @@ export function getConfig(): ConnectorConfig | null {
 export function clearConfig() {
   LocalStorage.removeItem(WALLET_CONFIG);
 }
-
-export function getAcknowledged() {
-  return LocalStorage.getItem(WALLET_RISK_ACCEPTED_KEY) === 'true';
-}
-
-export function setAcknowledged() {
-  return LocalStorage.setItem(WALLET_RISK_ACCEPTED_KEY, 'true');
-}

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

@@ -7,13 +7,13 @@ export function useEagerConnect(Connectors: {
   [connector: string]: VegaConnector;
 }) {
   const [connecting, setConnecting] = useState(true);
-  const { connect, acknowledgeNeeded } = useVegaWallet();
+  const { connect } = useVegaWallet();
 
   useEffect(() => {
     const attemptConnect = async () => {
       const cfg = getConfig();
-      // No stored config, or config was malformed or no risk accepted
+      // No stored config, or config was malformed
-      if (!cfg || !cfg.connector || acknowledgeNeeded) {
+      if (!cfg || !cfg.connector) {
         setConnecting(false);
         return;
       }
@@ -42,7 +42,7 @@ export function useEagerConnect(Connectors: {
     if (typeof window !== 'undefined') {
       attemptConnect();
     }
-  }, [connect, Connectors, acknowledgeNeeded]);
+  }, [connect, Connectors]);
 
   return connecting;
 }

libs/wallet/src/use-json-rpc-connect.ts

@@ -13,11 +13,10 @@ export enum Status {
   ListingKeys = 'ListingKeys',
   Connected = 'Connected',
   Error = 'Error',
-  AcknowledgeNeeded = 'AcknowledgeNeeded',
 }
 
 export const useJsonRpcConnect = (onConnect: () => void) => {
-  const { connect, acknowledgeNeeded } = useVegaWallet();
+  const { connect } = useVegaWallet();
   const [status, setStatus] = useState(Status.Idle);
   const [error, setError] = useState<WalletClientError | null>(null);
 
@@ -53,12 +52,9 @@ export const useJsonRpcConnect = (onConnect: () => void) => {
         // Call connect in the wallet provider. The connector will be stored for
         // future actions such as sending transactions
         await connect(connector);
-        if (acknowledgeNeeded) {
+
-          setStatus(Status.AcknowledgeNeeded);
+        setStatus(Status.Connected);
-        } else {
+        onConnect();
-          setStatus(Status.Connected);
-          onConnect();
-        }
       } catch (err) {
         if (err instanceof WalletClientError) {
           setError(err);
@@ -66,7 +62,7 @@ export const useJsonRpcConnect = (onConnect: () => void) => {
         setStatus(Status.Error);
       }
     },
-    [onConnect, connect, acknowledgeNeeded]
+    [onConnect, connect]
   );
 
   return {