Merge remote-tracking branch 'origin/develop' into fix/claim

feat(ci): update vega landing page whenever new console is released (#3751 )
fix(governance): fix time delay notice for withdrawal of 0.00 assets (#3740 )
2023-05-12 14:29:43 +01:00 · 2023-05-12 15:18:15 +02:00 · 2023-05-12 15:04:53 +02:00 · 2023-05-12 13:44:22 +01:00 · 2023-05-12 12:10:20 +00:00 · 2023-05-12 09:58:10 +01:00
42 changed files with 690 additions and 276 deletions
@@ -33,5 +33,4 @@ jobs:
          config: baseUrl=${{ github.event.inputs.url }}
          env: grepTags=@live
        env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -66,7 +66,7 @@ jobs:
      ######

      - name: Run Cypress tests
-        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome --env.grepTags="${{ inputs.tags }}"
+        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }}  --browser chrome --env.grepTags="${{ inputs.tags }}"
        working-directory: frontend-monorepo
        env:
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
@@ -148,6 +148,7 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.ref_name }}
+            vegaprotocol/${{ matrix.app }}:mainnet

      # bucket creation in github.com/vegaprotocol/terraform//frontend
      - name: Publish dist to s3
@@ -174,3 +175,50 @@ jobs:
        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
        with:
          files: ${{ matrix.app }}-ipfs-hash
+
+      - name: Trigger fleek deployment
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+        run: |
+          # display info about app
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
+            https://api.fleek.co/graphql
+
+          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
+            https://api.fleek.co/graphql
+
+      - name: Checkout vega.xyz
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+        uses: actions/checkout@v3
+        with:
+          repository: vegaprotocol/vega.xyz
+          path: './vega-xyz'
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+
+      - name: Update hash on interstitial page
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+        env:
+          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+        run: |
+          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
+          tar -xzf kubo.tgz
+          export PATH="$PATH:$PWD/kubo"
+          which ipfs
+          new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
+          cd vega-xyz
+          ./interstital-allow-update.sh ${new_hash}
+          git config --global user.email "vega-ci-bot@vega.xyz"
+          git config --global user.name "vega-ci-bot"
+          branch_name=${{ github.ref_name }}-hash-update
+          git checkout -b "${branch_name}"
+          git add interstitial-allow.json netlify.toml
+          commit_msg="feat(ci): Update CID for console release @ ${{ github.ref }}"
+          git commit -m "${commit_msg}"
+          git push -u origin "${branch_name}"
+          pr_url="$(gh pr create --title "${commit_msg}" --body 'update ipfs hash for console @ ${{ github.ref }}')"
+          echo $pr_url
+          gh pr merge --auto $pr_url
@@ -11,7 +11,7 @@ recalculate-ipfs:
 	echo "ipfs hash inside the image"
 	docker run --rm ${TAG} cat /ipfs-hash
 	echo "recalculating ipfs hash"
-	docker run --rm ${TAG} ipfs add -rw /usr/share/nginx/html
+	docker run --rm ${TAG} ipfs add -r /usr/share/nginx/html

 .PHONY: eject-ipfs-hash
 unpack:
@@ -1,3 +1,5 @@
+import { Icon } from '@vegaprotocol/ui-toolkit';
+
 // https://github.com/vegaprotocol/vega/blob/develop/core/blockchain/response.go
 export const ErrorCodes = new Map([
  [51, 'Transaction failed validation'],
@@ -28,7 +30,11 @@ export const ChainResponseCode = ({
 }: ChainResponseCodeProps) => {
  const isSuccess = successCodes.has(code);

-  const icon = isSuccess ? '✅' : '❌';
+  const icon = isSuccess ? (
+    <Icon name="tick-circle" className="fill-vega-green-550" />
+  ) : (
+    <Icon name="cross" className="fill-vega-pink-550" />
+  );
  const label = ErrorCodes.get(code) || 'Unknown response code';

  // Hack for batches with many errors - see https://github.com/vegaprotocol/vega/issues/7245
@@ -36,7 +42,7 @@ export const ChainResponseCode = ({
    error && error.length > 100 ? error.replace(/,/g, ',\r\n') : error;

  return (
-    <div title={`Response code: ${code} - ${label}`} className="inline-block">
+    <div title={`Response code: ${code} - ${label}`} className=" inline-block">
      <span
        className="mr-2"
        aria-label={isSuccess ? 'Success' : 'Warning'}
@@ -4,6 +4,7 @@ import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import ProposalLink from '../../links/proposal-link/proposal-link';
+import { VoteIcon } from '../../vote-icon/vote-icon';

 interface TxProposalVoteProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -30,27 +31,22 @@ export const TxProposalVote = ({
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }

-  const vote = txData.command.voteSubmission.value ? '👍' : '👎';
+  const vote = txData.command.voteSubmission.value === 'VALUE_YES';
+
  return (
    <TableWithTbody className="mb-8" allowWrap={true}>
      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      <TableRow modifier="bordered">
-        <TableCell>{t('Proposal ID')}</TableCell>
-        <TableCell>{txData.command.voteSubmission.proposalId}</TableCell>
-      </TableRow>
      <TableRow modifier="bordered">
        <TableCell>{t('Proposal details')}</TableCell>
        <TableCell>
          <ProposalLink id={txData.command.voteSubmission.proposalId} />
        </TableCell>
      </TableRow>
-      <TableRow modifier="bordered">
-        <TableCell>{t('Proposal')}</TableCell>
-        <TableCell>{txData.command.voteSubmission.proposalId}</TableCell>
-      </TableRow>
      <TableRow modifier="bordered">
        <TableCell>{t('Vote')}</TableCell>
-        <TableCell>{vote}</TableCell>
+        <TableCell>
+          <VoteIcon vote={vote} />
+        </TableCell>
      </TableRow>
    </TableWithTbody>
  );
@@ -1,5 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import type { components } from '../../../types/explorer';
+import { VoteIcon } from '../vote-icon/vote-icon';

 interface TxOrderTypeProps {
  orderType: string;
@@ -137,12 +138,15 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
  let type = displayString[orderType] || orderType;

  let colours =
-    'text-white dark:text-white bg-vega-dark-150 dark:bg-vega-dark-150';
+    'text-white dark:text-white bg-vega-dark-150 dark:bg-vega-dark-250';

  // This will get unwieldy and should probably produce a different colour of tag
  if (type === 'Chain Event' && !!command?.chainEvent) {
    type = getLabelForChainEvent(command.chainEvent);
    colours = 'text-white dark-text-white bg-vega-pink dark:bg-vega-pink';
+  } else if (type === 'Validator Heartbeat') {
+    colours =
+      'text-white dark-text-white bg-vega-light-200 dark:bg-vega-dark-100';
  } else if (type === 'Proposal' || type === 'Governance Proposal') {
    if (command && !!command.proposalSubmission) {
      type = getLabelForProposal(command.proposalSubmission);
@@ -150,6 +154,16 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
    colours = 'text-black bg-vega-yellow';
  }

+  if (type === 'Vote on Proposal') {
+    return (
+      <VoteIcon
+        vote={command?.voteSubmission?.value === 'VALUE_YES'}
+        yesText="Proposal vote"
+        noText="Proposal vote"
+      />
+    );
+  }
+
  if (type === 'Vote on Proposal' || type === 'Vote Submission') {
    colours = 'text-black bg-vega-yellow';
  }
@@ -98,6 +98,6 @@ describe('Txs infinite list item', () => {
    expect(screen.getByTestId('pub-key')).toHaveTextContent('testPubKey');
    expect(screen.getByTestId('tx-type')).toHaveTextContent('testType');
    expect(screen.getByTestId('tx-block')).toHaveTextContent('1');
-    expect(screen.getByTestId('tx-success')).toHaveTextContent('Success: ✅');
+    expect(screen.getByTestId('tx-success')).toHaveTextContent('Success');
  });
 });
@@ -31,7 +31,7 @@ export const TxsInfiniteListItem = ({
  return (
    <div
      data-testid="transaction-row"
-      className="flex items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item grid grid-cols-10 py-2"
+      className="flex items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item grid grid-cols-10"
    >
      <div
        className="text-sm col-span-10 md:col-span-3 leading-none"
@@ -83,7 +83,7 @@ export const TxsInfiniteListItem = ({
        data-testid="tx-success"
      >
        <span className="md:hidden uppercase text-vega-dark-300">
-          Success:&nbsp;
+          Success&nbsp;
        </span>
        {isNumber(code) ? (
          <ChainResponseCode code={code} hideLabel={true} />
@@ -0,0 +1,37 @@
+import { render } from '@testing-library/react';
+import { VoteIcon } from './vote-icon';
+
+describe('Vote TX icon', () => {
+  it('should use the text For by default for yes votes', () => {
+    const yes = render(<VoteIcon vote={true} />);
+    expect(yes.getByTestId('label')).toHaveTextContent('For');
+  });
+
+  it('should use the yesText for yes votes if specified', () => {
+    const yes = render(<VoteIcon vote={true} yesText="Test" />);
+    expect(yes.getByTestId('label')).toHaveTextContent('Test');
+  });
+
+  it('should display the tick icon for yes votes', () => {
+    const no = render(<VoteIcon vote={true} />);
+    expect(no.getByRole('img')).toHaveAttribute(
+      'aria-label',
+      'tick-circle icon'
+    );
+  });
+
+  it('should use the text Against by default for no votes', () => {
+    const no = render(<VoteIcon vote={false} />);
+    expect(no.getByTestId('label')).toHaveTextContent('Against');
+  });
+
+  it('should use the noText for no votes if specified', () => {
+    const no = render(<VoteIcon vote={false} noText="Test" />);
+    expect(no.getByTestId('label')).toHaveTextContent('Test');
+  });
+
+  it('should display the delete icon for no votes', () => {
+    const no = render(<VoteIcon vote={false} />);
+    expect(no.getByRole('img')).toHaveAttribute('aria-label', 'delete icon');
+  });
+});
@@ -0,0 +1,40 @@
+import { Icon } from '@vegaprotocol/ui-toolkit';
+import type { IconName } from '@vegaprotocol/ui-toolkit';
+
+export interface VoteIconProps {
+  // True is a yes vote, false is undefined or no vorte
+  vote: boolean;
+  // Defaults to 'For', but can be any text
+  yesText?: string;
+  // Defaults to 'Against', but can be any text
+  noText?: string;
+}
+
+/**
+ * Displays a lozenge with an icon representing the way a user voted for a proposal.
+ * The yes and no text can be overridden
+ *
+ * @returns
+ */
+export function VoteIcon({
+  vote,
+  yesText = 'For',
+  noText = 'Against',
+}: VoteIconProps) {
+  const label = vote ? yesText : noText;
+  const bg = vote ? 'bg-vega-green-550' : 'bg-vega-pink-550';
+  const icon: IconName = vote ? 'tick-circle' : 'delete';
+  const fill = vote ? 'vega-green-300' : 'vega-pink-300';
+  const text = vote ? 'vega-green-200' : 'vega-pink-200';
+
+  return (
+    <div
+      className={`voteicon inline-block my-1 py-1 px-2 py rounded-md text-white leading-one sm align-top ${bg}`}
+    >
+      <Icon name={icon} size={3} className={`mr-2 p-0 fill-${fill}`} />
+      <span className={`text-base text-${text}`} data-testid="label">
+        {label}
+      </span>
+    </div>
+  );
+}
@@ -60,3 +60,7 @@
  --ag-row-hover-color: theme(colors.neutral[800]);
  --ag-font-size: 12px;
 }
+
+.voteicon svg {
+  vertical-align: baseline;
+}
@@ -57,7 +57,6 @@ context(
    // 2001-STKE-002, 2001-STKE-032
    before('visit staking tab and connect vega wallet', function () {
      cy.visit('/');
-      cy.validatorsSelfDelegate();
      ethereumWalletConnect();
      // this is a workaround for #2422 which can be removed once issue is resolved
      cy.associateTokensToVegaWallet('4');
@@ -109,7 +109,7 @@ context(
            );
            cy.getByTestId('protocol-upgrade-proposal-status').should(
              'have.text',
-              'Approved '
+              'Approved by validators '
            );
          });
      });
@@ -136,7 +136,7 @@ context(
        );
        cy.getByTestId('protocol-upgrade-state').should(
          'have.text',
-          'Approved'
+          'Approved by validators'
        );
        cy.getByTestId('protocol-upgrade-release-tag').should(
          'have.text',
@@ -31,9 +31,6 @@ const totalPenaltyToolTip = '[data-testid="total-penalty-tooltip"]';
 const epochCountDown = '[data-testid="epoch-countdown"]';
 const stakeNumberRegex = /^\d{1,3}(,\d{3})*(\.\d+)?$/;

-// If running locally, validators need to have self-stake to be displayed
-// Run cy.validatorsSelfDelegate() in before hook
-
 context('Validators Page - verify elements on page', function () {
  before('navigate to validators page', function () {
    cy.visit('/validators');
@@ -33,4 +33,6 @@ before(() => {
    aliasGQLQuery(req, 'ChainId', chainIdQuery());
    aliasGQLQuery(req, 'Statistics', statisticsQuery());
  });
+  // Self stake validators so they are displayed
+  cy.validatorsSelfDelegate();
 });
@@ -2,7 +2,6 @@ import './i18n';

 import React, { useEffect } from 'react';
 import * as Sentry from '@sentry/react';
-import { Integrations } from '@sentry/tracing';
 import { BrowserRouter as Router, useLocation } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
@@ -184,6 +183,10 @@ const ScrollToTop = () => {
  return null;
 };

+const removeQueryParams = (url: string) => {
+  return url.split('?')[0];
+};
+
 const AppContainer = () => {
  const { config, loading, error } = useEthereumConfig();
  const {
@@ -204,22 +207,46 @@ const AppContainer = () => {
    if (ENV.dsn && telemetryOn) {
      Sentry.init({
        dsn: ENV.dsn,
-        integrations: [new Integrations.BrowserTracing()],
        tracesSampleRate: 0.1,
        enabled: true,
        environment: VEGA_ENV,
        release: GIT_COMMIT_HASH,
        beforeSend(event) {
-          if (event.request?.url?.includes('/claim?')) {
-            return {
-              ...event,
-              request: {
-                ...event.request,
-                url: event.request?.url.split('?')[0],
-              },
-            };
-          }
-          return event;
+          const requestUrl = event.request?.url;
+          const transaction = event.transaction;
+
+          const updatedRequest =
+            requestUrl && requestUrl.includes('/test?')
+              ? { ...event.request, url: removeQueryParams(requestUrl) }
+              : event.request;
+
+          const updatedTransaction =
+            transaction && transaction.includes('/test?')
+              ? removeQueryParams(transaction)
+              : transaction;
+
+          const updatedBreadcrumbs = event.breadcrumbs?.map((breadcrumb) => {
+            if (
+              breadcrumb.type === 'navigation' &&
+              breadcrumb.data?.to?.includes('/test?')
+            ) {
+              return {
+                ...breadcrumb,
+                data: {
+                  ...breadcrumb.data,
+                  to: removeQueryParams(breadcrumb.data.to),
+                },
+              };
+            }
+            return breadcrumb;
+          });
+
+          return {
+            ...event,
+            request: updatedRequest,
+            transaction: updatedTransaction,
+            breadcrumbs: updatedBreadcrumbs ?? event.breadcrumbs,
+          };
        },
      });
      Sentry.setTag('branch', GIT_BRANCH);
@@ -202,6 +202,7 @@
  "tokenVotes": "Token votes",
  "liquidityVotes": "Liquidity votes",
  "castYourVote": "Cast your vote",
+  "yourVote": "Your vote",
  "for": "For",
  "against": "Against",
  "majorityRequired": "Majority Required",
@@ -787,9 +788,9 @@
  "homeVegaTokenButtonText": "Manage tokens",
  "downloadProposalJson": "Download proposal as JSON",
  "networkUpgrade": "Network Upgrade",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED": "Approved",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING": "Pending",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED": "Rejected",
+  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED": "Approved by validators",
+  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING": "Waiting for validator votes",
+  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED": "Declined by validators",
  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED": "Unspecified",
  "vegaRelease{release}": "Vega Release {{release}}",
  "upgradeBlockHeight": "Upgrade block height",
@@ -50,7 +50,22 @@ export const useTranches = create<TranchesStore>()((set) => ({
        ?.map((t) => {
          const tranche_progress =
            t.duration !== 0 ? (now - t.cliff_start) / t.duration : 0;
-          const lockedDecimal = tranche_progress < 0 ? 1 : 1 - tranche_progress;
+          let lockedDecimal;
+          if (t.duration !== 0) {
+            if (tranche_progress < 0) {
+              lockedDecimal = 1;
+            } else {
+              lockedDecimal = 1 - tranche_progress;
+            }
+          } else {
+            if (now < t.cliff_start) {
+              lockedDecimal = 1;
+            } else {
+              lockedDecimal = 0;
+            }
+          }
+          const clampedLockedDecimal = Math.max(0, Math.min(1, lockedDecimal));
+
          return {
            tranche_id: t.tranche_id,
            tranche_start: secondsToDate(t.cliff_start),
@@ -60,7 +75,7 @@ export const useTranches = create<TranchesStore>()((set) => ({
              toBigNum(t.current_balance, decimals)
            ),
            locked_amount: toBigNum(t.initial_balance, decimals).times(
-              lockedDecimal
+              clampedLockedDecimal
            ),
            users: t.users,
          };
@@ -24,7 +24,6 @@ const openProposalClosesNextMonth = generateProposal({
  },
  terms: {
    closingDatetime: nextMonth.toString(),
-    enactmentDatetime: nextMonth.toString(),
  },
 });

@@ -36,7 +35,6 @@ const openProposalClosesNextWeek = generateProposal({
  },
  terms: {
    closingDatetime: nextWeek.toString(),
-    enactmentDatetime: nextWeek.toString(),
  },
 });

@@ -45,7 +43,6 @@ const enactedProposalClosedLastWeek = generateProposal({
  state: ProposalState.STATE_ENACTED,
  terms: {
    closingDatetime: lastWeek.toString(),
-    enactmentDatetime: lastWeek.toString(),
  },
 });

@@ -54,7 +51,6 @@ const failedProposalClosedLastMonth = generateProposal({
  state: ProposalState.STATE_FAILED,
  terms: {
    closingDatetime: lastMonth.toString(),
-    enactmentDatetime: lastMonth.toString(),
  },
 });

@@ -32,7 +32,9 @@ describe('ProtocolUpgradeProposalDetailInfo', () => {

  it('should render the state', () => {
    const { getByTestId } = renderComponent();
-    expect(getByTestId('protocol-upgrade-state')).toHaveTextContent('Pending');
+    expect(getByTestId('protocol-upgrade-state')).toHaveTextContent(
+      'Waiting for validator votes'
+    );
  });

  it('should render the vega release tag', () => {
@@ -26,28 +26,34 @@ describe('ProtocolUpgradeProposalsListItem', () => {
        status:
          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED,
        icon: 'protocol-upgrade-proposal-status-icon-rejected',
+        text: 'Declined by validators',
      },
      {
        status:
          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
        icon: 'protocol-upgrade-proposal-status-icon-pending',
+        text: 'Waiting for validator votes',
      },
      {
        status:
          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED,
        icon: 'protocol-upgrade-proposal-status-icon-approved',
+        text: 'Approved by validators',
      },
      {
        status:
          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED,
        icon: 'protocol-upgrade-proposal-status-icon-unspecified',
+        text: 'Unspecified',
      },
    ];

-    statuses.forEach(({ status, icon }) => {
+    statuses.forEach(({ status, icon, text }) => {
      renderComponent({ ...proposal, status });
      const statusIcon = screen.getByTestId(icon);
+      const textContent = screen.getByText(text);
      expect(statusIcon).toBeInTheDocument();
+      expect(textContent).toBeInTheDocument();
    });
  });

@@ -111,7 +111,9 @@ describe('Vote buttons', () => {
      </AppStateProvider>
    );
    expect(
-      screen.getByText('You need some VEGA tokens to participate in governance')
+      screen.getByText(
+        'You need some VEGA tokens to participate in governance.'
+      )
    ).toBeTruthy();
  });

@@ -2,7 +2,12 @@ import { format } from 'date-fns';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
-import { AsyncRenderer, Button, ButtonLink } from '@vegaprotocol/ui-toolkit';
+import {
+  AsyncRenderer,
+  Button,
+  ButtonLink,
+  ExternalLink,
+} from '@vegaprotocol/ui-toolkit';
 import { addDecimal, toBigNum } from '@vegaprotocol/utils';
 import { ProposalState, VoteValue } from '@vegaprotocol/types';
 import {
@@ -161,7 +166,12 @@ export const VoteButtons = ({
      {changeVote || (voteState === VoteState.NotCast && proposalVotable) ? (
        <>
          {currentStakeAvailable.isLessThanOrEqualTo(0) && (
-            <p data-testid="no-stake-available">{t('noGovernanceTokens')}</p>
+            <>
+              <p data-testid="no-stake-available">{t('noGovernanceTokens')}.</p>
+              <ExternalLink href="https://blog.vega.xyz/how-to-vote-on-vega-2195d1e52ec5">
+                {t('findOutMoreAboutHowToVote')}
+              </ExternalLink>
+            </>
          )}

          <div className="flex gap-4" data-testid="vote-buttons">
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { formatDistanceToNow } from 'date-fns';
-import { RoundedWrapper, Icon } from '@vegaprotocol/ui-toolkit';
+import { RoundedWrapper, Icon, ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { ProposalState } from '@vegaprotocol/types';
 import { useVoteSubmit, VoteProgress } from '@vegaprotocol/proposals';
@@ -202,7 +202,12 @@ export const VoteDetails = ({
        )}

        <section className="mt-10">
-          <SubHeading title={t('castYourVote')} />
+          {proposal?.state === ProposalState.STATE_OPEN ? (
+            <SubHeading title={t('castYourVote')} />
+          ) : (
+            <SubHeading title={t('yourVote')} />
+          )}
+
          {pubKey ? (
            proposal && (
              <VoteButtonsContainer
@@ -224,6 +229,9 @@ export const VoteDetails = ({
                  <Icon name={'info-sign'} />
                  <div>{t('connectAVegaWalletToVote')}</div>
                </div>
+                <ExternalLink href="https://blog.vega.xyz/how-to-vote-on-vega-2195d1e52ec5">
+                  {t('findOutMoreAboutHowToVote')}
+                </ExternalLink>
              </div>
              <ConnectToVega />
            </RoundedWrapper>
@@ -20,8 +20,11 @@ import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
 const orderByDate = (arr: ProposalFieldsFragment[]) =>
  orderBy(
    arr,
-    [(p) => new Date(p?.terms?.closingDatetime).getTime(), (p) => p.id],
-    ['desc', 'desc']
+    [
+      (p) => new Date(p?.terms?.closingDatetime).getTime(),
+      (p) => new Date(p?.datetime).getTime(),
+    ],
+    ['asc', 'asc']
  );

 const orderByUpgradeBlockHeight = (
@@ -54,22 +54,16 @@ export const TrancheItem = ({
          {formatNumber(total, 2)}
        </span>
      </div>
-      <table className="w-full">
-        <tbody>
-          <tr>
-            <td>{t('Starts unlocking')}</td>
-            <td className="text-right">
-              {format(tranche.tranche_start, DATE_FORMAT_LONG)}
-            </td>
-          </tr>
-          <tr>
-            <td>{t('Fully unlocked')}</td>
-            <td className="text-right">
-              {format(tranche.tranche_end, DATE_FORMAT_LONG)}
-            </td>
-          </tr>
-        </tbody>
-      </table>
+      <div className="grid grid-cols-2 my-2">
+        <div>
+          <span>{t('Starts unlocking')}:</span>{' '}
+          <span>{format(tranche.tranche_start, DATE_FORMAT_LONG)}</span>
+        </div>
+        <div className="justify-self-end">
+          <span>{t('Fully unlocked')}:</span>{' '}
+          <span>{format(tranche.tranche_end, DATE_FORMAT_LONG)}</span>
+        </div>
+      </div>
      <LockedProgress
        locked={locked}
        unlocked={unlocked}
@@ -1,4 +1,37 @@
 [
+  {
+    "tranche_id": 59,
+    "tranche_start": "2024-05-01T00:00:00.000Z",
+    "tranche_end": "2024-11-01T00:00:00.000Z",
+    "total_added": "15000",
+    "total_removed": "0",
+    "locked_amount": "15000",
+    "deposits": [
+      {
+        "amount": "15000",
+        "user": "0xA530ac2B576eF27C09B7b55C83b3E163D167e9AE",
+        "tx": "0x90af73d7321833fc32445850655a1210f0298845b9222e695e1229801f7a95b0"
+      }
+    ],
+    "withdrawals": [],
+    "users": [
+      {
+        "address": "0xA530ac2B576eF27C09B7b55C83b3E163D167e9AE",
+        "deposits": [
+          {
+            "amount": "15000",
+            "user": "0xA530ac2B576eF27C09B7b55C83b3E163D167e9AE",
+            "tranche_id": 59,
+            "tx": "0x90af73d7321833fc32445850655a1210f0298845b9222e695e1229801f7a95b0"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "15000",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "15000"
+      }
+    ]
+  },
  {
    "tranche_id": 58,
    "tranche_start": "2023-05-11T00:00:00.000Z",
@@ -48,8 +81,8 @@
    "tranche_start": "2023-04-20T00:00:00.000Z",
    "tranche_end": "2023-05-20T00:00:00.000Z",
    "total_added": "19242.125",
-    "total_removed": "1979.64045368475",
-    "locked_amount": "5608.9383879726076446",
+    "total_removed": "2249.511113406525",
+    "locked_amount": "4805.928581211419705575",
    "deposits": [
      {
        "amount": "188",
@@ -238,6 +271,11 @@
        "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
        "tx": "0x47f5bf2c758c5270dd1b6519ac649ddabef8199f8a0bae319e36f8ac5c9c142e"
      },
+      {
+        "amount": "269.870659721775",
+        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "tx": "0x156ef84c345adecdf7b1c55756b1f4326716d1b0191ce1a208f614fc807ce033"
+      },
      {
        "amount": "202.093666077975",
        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
@@ -311,6 +349,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "269.870659721775",
+            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+            "tranche_id": 56,
+            "tx": "0x156ef84c345adecdf7b1c55756b1f4326716d1b0191ce1a208f614fc807ce033"
+          },
          {
            "amount": "202.093666077975",
            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
@@ -337,8 +381,8 @@
          }
        ],
        "total_tokens": "1207.5",
-        "withdrawn_tokens": "597.002068860225",
-        "remaining_tokens": "610.497931139775"
+        "withdrawn_tokens": "866.872728582",
+        "remaining_tokens": "340.627271418"
      },
      {
        "address": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
@@ -1860,7 +1904,7 @@
    "tranche_start": "2023-03-06T00:00:00.000Z",
    "tranche_end": "2023-04-06T00:00:00.000Z",
    "total_added": "14099",
-    "total_removed": "3785.49002352036",
+    "total_removed": "4343.49002352036",
    "locked_amount": "0",
    "deposits": [
      {
@@ -2630,6 +2674,11 @@
        "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc",
        "tx": "0xb0edcc25e422bc3db3ad8027dfdfc0928abd7a8af8957a1699e4cf2dc8cee8f7"
      },
+      {
+        "amount": "558",
+        "user": "0xA7f89FF809549F4577993de3d1B3017241a53F40",
+        "tx": "0x84e5ff587c312b578fa946e2dce386cdf19c7638602b12eceaaab7de563f8394"
+      },
      {
        "amount": "30",
        "user": "0xBe9F912Ad481C61B653463E8F1D2b2b310D49861",
@@ -4446,10 +4495,17 @@
            "tx": "0x46d80a145d2f49ef3152cbfaa6d2bb054deabe21396ab43553a3f076e2db62e1"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "558",
+            "user": "0xA7f89FF809549F4577993de3d1B3017241a53F40",
+            "tranche_id": 53,
+            "tx": "0x84e5ff587c312b578fa946e2dce386cdf19c7638602b12eceaaab7de563f8394"
+          }
+        ],
        "total_tokens": "558",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "558"
+        "withdrawn_tokens": "558",
+        "remaining_tokens": "0"
      },
      {
        "address": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D",
@@ -4907,7 +4963,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "86666.297",
    "total_removed": "0",
-    "locked_amount": "49327.3172923405910546417",
+    "locked_amount": "49030.0504645820725222068",
    "deposits": [
      {
        "amount": "86666.297",
@@ -4973,7 +5029,7 @@
    "tranche_end": "2023-06-01T00:00:00.000Z",
    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "284.955770502645375",
+    "locked_amount": "267.758572446072375",
    "deposits": [
      {
        "amount": "2500",
@@ -5006,7 +5062,7 @@
    "tranche_end": "2023-11-01T00:00:00.000Z",
    "total_added": "15000.000000000000015",
    "total_removed": "0",
-    "locked_amount": "14163.9766379830905141639766379830905",
+    "locked_amount": "14061.9150060386475140619150060386475",
    "deposits": [
      {
        "amount": "1.5e-14",
@@ -5048,10 +5104,15 @@
    "tranche_id": 46,
    "tranche_start": "2023-11-01T00:00:00.000Z",
    "tranche_end": "2024-05-01T00:00:00.000Z",
-    "total_added": "7500",
+    "total_added": "22500",
    "total_removed": "0",
-    "locked_amount": "7500",
+    "locked_amount": "22500",
    "deposits": [
+      {
+        "amount": "15000",
+        "user": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
+        "tx": "0x959f5eed214f5376e834c2c20ed2a23a75c4465240c2776452ade80afa11ae2e"
+      },
      {
        "amount": "7500",
        "user": "0xA530ac2B576eF27C09B7b55C83b3E163D167e9AE",
@@ -5060,6 +5121,21 @@
    ],
    "withdrawals": [],
    "users": [
+      {
+        "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
+        "deposits": [
+          {
+            "amount": "15000",
+            "user": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
+            "tranche_id": 46,
+            "tx": "0x959f5eed214f5376e834c2c20ed2a23a75c4465240c2776452ade80afa11ae2e"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "15000",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "15000"
+      },
      {
        "address": "0xA530ac2B576eF27C09B7b55C83b3E163D167e9AE",
        "deposits": [
@@ -5094,7 +5170,7 @@
    "tranche_end": "2023-09-01T00:00:00.000Z",
    "total_added": "17500",
    "total_removed": "0",
-    "locked_amount": "10723.00897619766325",
+    "locked_amount": "10603.93707226247975",
    "deposits": [
      {
        "amount": "12500",
@@ -5361,7 +5437,7 @@
    "tranche_end": "2023-08-01T00:00:00.000Z",
    "total_added": "37500",
    "total_removed": "18302.01762945",
-    "locked_amount": "16936.07322360343725",
+    "locked_amount": "16676.690070595455",
    "deposits": [
      {
        "amount": "7500",
@@ -5791,7 +5867,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "49282.312321912380332265",
+    "locked_amount": "48985.316712730632200127",
    "deposits": [
      {
        "amount": "129999.45",
@@ -5824,7 +5900,7 @@
    "tranche_end": "2024-04-01T00:00:00.000Z",
    "total_added": "54144.7663",
    "total_removed": "0",
-    "locked_amount": "48189.54915726316779685587",
+    "locked_amount": "48004.33914075889629566061",
    "deposits": [
      {
        "amount": "54144.7663",
@@ -5857,7 +5933,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "62600",
    "total_removed": "0",
-    "locked_amount": "19679.51570903094634",
+    "locked_amount": "19464.79667681379966",
    "deposits": [
      {
        "amount": "10000",
@@ -6050,7 +6126,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "1763.627124556063",
+    "locked_amount": "1746.4770421106035",
    "deposits": [
      {
        "amount": "5000",
@@ -7119,7 +7195,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "1709370.7872515768348",
-    "locked_amount": "115570.728817751808474185",
+    "locked_amount": "108916.74248669465746918748",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -40991,7 +41067,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "715655.108029600523393",
-    "locked_amount": "202093.2974680882797136777084",
+    "locked_amount": "191868.437149237997353062585",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -42383,8 +42459,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "15870102.715470999700000001",
-    "total_removed": "873375.18460711694221852",
-    "locked_amount": "6016297.4428328087189762607645230040375777",
+    "total_removed": "875570.57907812695176852",
+    "locked_amount": "5980040.74464094540876136852099906476290886",
    "deposits": [
      {
        "amount": "16249.93",
@@ -42903,6 +42979,11 @@
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
        "tx": "0x989d22d5ba66353cb132b5643100a99e78133e5d40aef1ac91ed6ab0a2290299"
      },
+      {
+        "amount": "2195.39447101000955",
+        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+        "tx": "0xa515dafd399b366ba7f510ea6314587eb19e83fa92dbd5c2a212f3541a0cc4ef"
+      },
      {
        "amount": "10150.87581603206683",
        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -46873,6 +46954,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "2195.39447101000955",
+            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+            "tranche_id": 2,
+            "tx": "0xa515dafd399b366ba7f510ea6314587eb19e83fa92dbd5c2a212f3541a0cc4ef"
+          },
          {
            "amount": "10150.87581603206683",
            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -47163,8 +47250,8 @@
          }
        ],
        "total_tokens": "150551.801",
-        "withdrawn_tokens": "91577.204932811647",
-        "remaining_tokens": "58974.596067188353"
+        "withdrawn_tokens": "93772.59940382165655",
+        "remaining_tokens": "56779.20159617834345"
      },
      {
        "address": "0x4d982Ab0823fD2f48e934a7be2bb0a5374a26148",
@@ -59170,8 +59257,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
-    "total_removed": "44544.1737890903416",
-    "locked_amount": "32022.838198356764871382775241",
+    "total_removed": "44730.9909821383416",
+    "locked_amount": "30402.650633041581093917170877724",
    "deposits": [
      {
        "amount": "3000",
@@ -65800,6 +65887,11 @@
        "user": "0x3F9E884B459a6AaC3f66b72555611AdE68a7F472",
        "tx": "0x4697229c7f272bd3fc06ecdc1b15143d28e20083e15f1b3cadb3fc80e80af180"
      },
+      {
+        "amount": "186.817193048",
+        "user": "0x0003423D0A1858B6Eaf9a67914aBc67cDF989c2F",
+        "tx": "0x7f120bd664d54bdabddad1ddb7ffdd84fbaa2630f1657289e3a7b11503ec4018"
+      },
      {
        "amount": "182.662252664",
        "user": "0xb1169C6daAc76bAcaf0D8f87641Fc38fbabe569F",
@@ -71055,10 +71147,17 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "186.817193048",
+            "user": "0x0003423D0A1858B6Eaf9a67914aBc67cDF989c2F",
+            "tranche_id": 5,
+            "tx": "0x7f120bd664d54bdabddad1ddb7ffdd84fbaa2630f1657289e3a7b11503ec4018"
+          }
+        ],
        "total_tokens": "200",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "200"
+        "withdrawn_tokens": "186.817193048",
+        "remaining_tokens": "13.182806952"
      },
      {
        "address": "0x659ce8E49DA0c872AAC44c70496122044CbcA911",
@@ -88971,7 +89070,7 @@
    "tranche_start": "2021-12-05T00:00:00.000Z",
    "tranche_end": "2022-06-05T00:00:00.000Z",
    "total_added": "171288.42",
-    "total_removed": "70140.5995794947989",
+    "total_removed": "71890.5995794947989",
    "locked_amount": "0",
    "deposits": [
      {
@@ -93196,6 +93295,41 @@
      }
    ],
    "withdrawals": [
+      {
+        "amount": "250",
+        "user": "0xcAEbd70D80D5aB92Ae5A2E1c92F479298826548C",
+        "tx": "0x7ffbc82e96bb7c796feb548a7ca48a7430a47dae3f2e9de859e6d45ac31a4e6c"
+      },
+      {
+        "amount": "250",
+        "user": "0xac494D6eC2CcA7C9BD1caD0c1D0516F3706c6b7c",
+        "tx": "0x85a5d2a4faa6490fc25e080f09dc4d9b5fb3857d762042ba2dcbc0f04de41e0c"
+      },
+      {
+        "amount": "250",
+        "user": "0x4eE1C5ED78143f298ae4E5E17e538a99E8512db7",
+        "tx": "0xcb7b99dc5240cdcaaed2fae06e9fd8172db0387179fe09b5f1e1cefff16c6025"
+      },
+      {
+        "amount": "250",
+        "user": "0x01E41ffFBcBC9DDA6E2e9e7291cA8AcCE1AF2091",
+        "tx": "0x0af2b3703c268eed4532409b52b6fae066207adf80f9dd2fc17b7aacc40f2879"
+      },
+      {
+        "amount": "250",
+        "user": "0xa9C1CA1E66CB3063352433843521861844A2Fd33",
+        "tx": "0x8fad99b8976fff57a099e59351ae96379ec3041e32ccce144727eea29cfffe59"
+      },
+      {
+        "amount": "250",
+        "user": "0x13A01db15250975cE4f7AddF5C20CC1f5056Fc47",
+        "tx": "0xc4bcffd71245b9f2af79e04fd58740f7b4cce50da80a405403c959563d132f2c"
+      },
+      {
+        "amount": "250",
+        "user": "0x2A6Ea2aBEf3D7d7A76CBeF3c297eE0eF9a86BBA8",
+        "tx": "0x163b699e8a25073ad1ad45c8a8f9b1348eb0b648d3f4bc6f3f64648e0ad726bf"
+      },
      {
        "amount": "250",
        "user": "0x0E3407C9A94effa675471afe7A9D37e687C32141",
@@ -95538,10 +95672,17 @@
            "tx": "0x87b7e454992157e175f824cbd5cbfd068ce890b8603edcb70174bae9b5c4afc8"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0x13A01db15250975cE4f7AddF5C20CC1f5056Fc47",
+            "tranche_id": 6,
+            "tx": "0xc4bcffd71245b9f2af79e04fd58740f7b4cce50da80a405403c959563d132f2c"
+          }
+        ],
        "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
      },
      {
        "address": "0x7b4127D262acC0Ff3dB2D0521d1F1f3b602243C2",
@@ -98054,10 +98195,17 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0x4eE1C5ED78143f298ae4E5E17e538a99E8512db7",
+            "tranche_id": 6,
+            "tx": "0xcb7b99dc5240cdcaaed2fae06e9fd8172db0387179fe09b5f1e1cefff16c6025"
+          }
+        ],
        "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
      },
      {
        "address": "0x1dC24e9601e40013a12CB9976a519860c4eDF359",
@@ -98099,10 +98247,17 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0x01E41ffFBcBC9DDA6E2e9e7291cA8AcCE1AF2091",
+            "tranche_id": 6,
+            "tx": "0x0af2b3703c268eed4532409b52b6fae066207adf80f9dd2fc17b7aacc40f2879"
+          }
+        ],
        "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
      },
      {
        "address": "0x6EE016F4512C910b401B18087BBAC15412dD97cA",
@@ -98436,10 +98591,17 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0xac494D6eC2CcA7C9BD1caD0c1D0516F3706c6b7c",
+            "tranche_id": 6,
+            "tx": "0x85a5d2a4faa6490fc25e080f09dc4d9b5fb3857d762042ba2dcbc0f04de41e0c"
+          }
+        ],
        "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
      },
      {
        "address": "0xa7137DA63B53138A6DCdC9D9a010F42F951F1113",
@@ -98481,10 +98643,17 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0xa9C1CA1E66CB3063352433843521861844A2Fd33",
+            "tranche_id": 6,
+            "tx": "0x8fad99b8976fff57a099e59351ae96379ec3041e32ccce144727eea29cfffe59"
+          }
+        ],
        "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
      },
      {
        "address": "0xbCd93996629B0fFA1DfaE74Bb6e107ddB1CE7934",
@@ -98511,10 +98680,17 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0xcAEbd70D80D5aB92Ae5A2E1c92F479298826548C",
+            "tranche_id": 6,
+            "tx": "0x7ffbc82e96bb7c796feb548a7ca48a7430a47dae3f2e9de859e6d45ac31a4e6c"
+          }
+        ],
        "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
      },
      {
        "address": "0x64Aac7Cb63317DE77C331686E0b2dAA41303Adf0",
@@ -98593,10 +98769,17 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0x2A6Ea2aBEf3D7d7A76CBeF3c297eE0eF9a86BBA8",
+            "tranche_id": 6,
+            "tx": "0x163b699e8a25073ad1ad45c8a8f9b1348eb0b648d3f4bc6f3f64648e0ad726bf"
+          }
+        ],
        "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
      },
      {
        "address": "0x5D84C52FEf44a84298422f0F87147F80145e2043",
@@ -1,6 +0,0 @@
-FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
-EXPOSE 80
-WORKDIR /usr/share/nginx/html
-COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
-RUN rm -rf /usr/share/nginx/html/*
-COPY ./dist-result/ /usr/share/nginx/html/
@@ -1,29 +0,0 @@
-# Build container
-ARG NODE_VERSION
-FROM --platform=amd64 node:${NODE_VERSION}-alpine3.16 as build
-WORKDIR /app
-# Argument to allow building of different apps
-ARG APP
-ARG ENV_NAME=""
-RUN apk add --update --no-cache \
-  python3 \
-  make \
-  gcc \
-  g++
-COPY . ./
-RUN yarn --network-timeout 100000 --pure-lockfile
-# work around for different build process in trading
-RUN sh docker/docker-build.sh
-
-# Server environment
-# if this fails you need to docker pull nginx:1.23-alpine and pin new SHA
-# this is to ensure that we run always same version of alpine to make sure ipfs is indempotent
-FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
-# configuration of system
-EXPOSE 80
-# Copy dist
-WORKDIR /usr/share/nginx/html
-COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
-RUN rm -rf /usr/share/nginx/html/*
-COPY --from=build /app/dist/apps/${APP}/* /usr/share/nginx/html
-RUN apk add --no-cache go-ipfs; ipfs init && echo "$(ipfs add -rQ .)" > /ipfs-hash; apk del go-ipfs
@@ -27,5 +27,5 @@ RUN rm -rf /usr/share/nginx/html/*
 COPY --from=build /app/dist/apps/${APP}/* /usr/share/nginx/html
 RUN apk add --no-cache go-ipfs==0.16.0-r6 \
      && ipfs init \
-      && echo "$(ipfs add -rwQ /usr/share/nginx/html)" > /ipfs-hash \
+      && echo "$(ipfs add -rQ /usr/share/nginx/html)" > /ipfs-hash \
      && echo "ipfs hash of this build: $(cat /ipfs-hash)"
@@ -5,6 +5,6 @@ RUN rm -rf /usr/share/nginx/html/*
 COPY ./dist-result/ /usr/share/nginx/html/
 RUN apk add --no-cache go-ipfs==0.16.0-r6 \
      && ipfs init \
-      && echo "$(ipfs add -rwQ /usr/share/nginx/html)" > /ipfs-hash \
+      && echo "$(ipfs add -rQ /usr/share/nginx/html)" > /ipfs-hash \
      && echo "ipfs hash of this build: $(cat /ipfs-hash)"

@@ -1,4 +1,6 @@
+import { gql } from 'graphql-request';
 import { selfDelegate } from '../capsule/self-delegate';
+import { requestGQL, setGraphQLEndpoint } from '../capsule/request';

 declare global {
  // eslint-disable-next-line @typescript-eslint/no-namespace
@@ -19,112 +21,143 @@ export const addValidatorsSelfDelegate = () => {
      vegaUrl: Cypress.env('VEGA_URL'),
      faucetUrl: Cypress.env('FAUCET_URL'),
    };
+    setGraphQLEndpoint(config.vegaUrl);
+    cy.wrap(getStakedByOperator()).as('selfStakeAmount');
+    cy.get('@selfStakeAmount').then((selfStakeAmount) => {
+      if (String(selfStakeAmount) == '0') {
+        // Get node wallet recovery phrases
+        cy.exec('vegacapsule nodes ls --home-path ~/.vegacapsule/testnet/')
+          .its('stdout')
+          .then((result) => {
+            const obj = JSON.parse(result);
+            console.log(obj);
+            cy.writeFile(
+              './src/fixtures/wallet/node0RecoveryPhrase',
+              obj['testnet-nodeset-validators-0-validator'].Vega.NodeWalletInfo
+                .VegaWalletRecoveryPhrase
+            );
+            cy.writeFile(
+              './src/fixtures/wallet/node1RecoveryPhrase',
+              obj['testnet-nodeset-validators-1-validator'].Vega.NodeWalletInfo
+                .VegaWalletRecoveryPhrase
+            );
+            cy.wrap(
+              obj['testnet-nodeset-validators-0-validator'].Vega.NodeWalletInfo
+                .VegaWalletPublicKey
+            ).as('node0PubKey');
+            cy.wrap(
+              obj['testnet-nodeset-validators-1-validator'].Vega.NodeWalletInfo
+                .VegaWalletPublicKey
+            ).as('node1PubKey');

-    // Get node wallet recovery phrases
-    cy.exec('vegacapsule nodes ls --home-path ~/.vegacapsule/testnet/')
-      .its('stdout')
-      .then((result) => {
-        const obj = JSON.parse(result);
-        console.log(obj);
-        cy.writeFile(
-          './src/fixtures/wallet/node0RecoveryPhrase',
-          obj['testnet-nodeset-validators-0-validator'].Vega.NodeWalletInfo
-            .VegaWalletRecoveryPhrase
+            cy.wrap(
+              obj['testnet-nodeset-validators-0-validator'].Vega.NodeWalletInfo
+                .VegaWalletID
+            ).as('node0Id');
+            cy.wrap(
+              obj['testnet-nodeset-validators-1-validator'].Vega.NodeWalletInfo
+                .VegaWalletID
+            ).as('node1Id');
+          });
+
+        // Import node wallets
+        cy.exec(
+          'vega wallet import -w node0_wallet --recovery-phrase-file ./src/fixtures/wallet/node0RecoveryPhrase -p ./src/fixtures/wallet/passphrase --home ~/.vegacapsule/testnet/wallet'
        );
-        cy.writeFile(
-          './src/fixtures/wallet/node1RecoveryPhrase',
-          obj['testnet-nodeset-validators-1-validator'].Vega.NodeWalletInfo
-            .VegaWalletRecoveryPhrase
+        cy.exec(
+          'vega wallet import -w node1_wallet --recovery-phrase-file ./src/fixtures/wallet/node1RecoveryPhrase -p ./src/fixtures/wallet/passphrase --home ~/.vegacapsule/testnet/wallet'
        );
-        cy.wrap(
-          obj['testnet-nodeset-validators-0-validator'].Vega.NodeWalletInfo
-            .VegaWalletPublicKey
-        ).as('node0PubKey');
-        cy.wrap(
-          obj['testnet-nodeset-validators-1-validator'].Vega.NodeWalletInfo
-            .VegaWalletPublicKey
-        ).as('node1PubKey');

-        cy.wrap(
-          obj['testnet-nodeset-validators-0-validator'].Vega.NodeWalletInfo
-            .VegaWalletID
-        ).as('node0Id');
-        cy.wrap(
-          obj['testnet-nodeset-validators-1-validator'].Vega.NodeWalletInfo
-            .VegaWalletID
-        ).as('node1Id');
-      });
+        // Initialise api token
+        cy.exec(
+          'vega wallet api-token init --home ~/.vegacapsule/testnet/wallet --passphrase-file ./src/fixtures/wallet/passphrase'
+        );

-    // Import node wallets
-    cy.exec(
-      'vega wallet import -w node0_wallet --recovery-phrase-file ./src/fixtures/wallet/node0RecoveryPhrase -p ./src/fixtures/wallet/passphrase --home ~/.vegacapsule/testnet/wallet'
-    );
-    cy.exec(
-      'vega wallet import -w node1_wallet --recovery-phrase-file ./src/fixtures/wallet/node1RecoveryPhrase -p ./src/fixtures/wallet/passphrase --home ~/.vegacapsule/testnet/wallet'
-    );
+        // Generate api tokens for wallets
+        cy.exec(
+          'vega wallet api-token generate --wallet-name node0_wallet --tokens-passphrase-file ./src/fixtures/wallet/passphrase  --wallet-passphrase-file ./src/fixtures/wallet/passphrase --home ~/.vegacapsule/testnet/wallet'
+        )
+          .its('stdout')
+          .then((result) => {
+            const apiToken = result.match('[a-zA-Z0-9]{64}');
+            if (apiToken) {
+              cy.wrap(apiToken[0]).as('node0ApiToken');
+            }
+          });

-    // Initialise api token
-    cy.exec(
-      'vega wallet api-token init --home ~/.vegacapsule/testnet/wallet --passphrase-file ./src/fixtures/wallet/passphrase'
-    );
+        cy.exec(
+          'vega wallet api-token generate --wallet-name node1_wallet --tokens-passphrase-file ./src/fixtures/wallet/passphrase  --wallet-passphrase-file ./src/fixtures/wallet/passphrase --home ~/.vegacapsule/testnet/wallet'
+        )
+          .its('stdout')
+          .then((result) => {
+            const apiToken = result.match('[a-zA-Z0-9]{64}');
+            if (apiToken) {
+              cy.wrap(apiToken[0]).as('node1ApiToken');
+            }
+          });

-    // Generate api tokens for wallets
-    cy.exec(
-      'vega wallet api-token generate --wallet-name node0_wallet --tokens-passphrase-file ./src/fixtures/wallet/passphrase  --wallet-passphrase-file ./src/fixtures/wallet/passphrase --home ~/.vegacapsule/testnet/wallet'
-    )
-      .its('stdout')
-      .then((result) => {
-        const apiToken = result.match('[a-zA-Z0-9]{64}');
-        if (apiToken) {
-          cy.wrap(apiToken[0]).as('node0ApiToken');
-        }
-      });
+        cy.updateCapsuleMultiSig();
+        cy.highlight('Validators self-delegating');

-    cy.exec(
-      'vega wallet api-token generate --wallet-name node1_wallet --tokens-passphrase-file ./src/fixtures/wallet/passphrase  --wallet-passphrase-file ./src/fixtures/wallet/passphrase --home ~/.vegacapsule/testnet/wallet'
-    )
-      .its('stdout')
-      .then((result) => {
-        const apiToken = result.match('[a-zA-Z0-9]{64}');
-        if (apiToken) {
-          cy.wrap(apiToken[0]).as('node1ApiToken');
-        }
-      });
-
-    cy.updateCapsuleMultiSig();
-    cy.highlight('Validators self-delegating');
-
-    // Self delegating Node 0 wallet
-    cy.get('@node0PubKey').then((node0PubKey) => {
-      cy.get('@node0ApiToken').then((node0ApiToken) => {
-        cy.get('@node0Id').then((node0Id) => {
-          cy.wrap(
-            selfDelegate(
-              config,
-              String(node0PubKey),
-              String(node0ApiToken),
-              String(node0Id)
-            ),
-            { timeout: 60000 }
-          );
-          // Self delegating Node 1 wallet
-          cy.get('@node1PubKey').then((node1PubKey) => {
-            cy.get('@node1ApiToken').then((node1ApiToken) => {
-              cy.get('@node1Id').then((node1Id) => {
-                cy.wrap(
-                  selfDelegate(
-                    config,
-                    String(node1PubKey),
-                    String(node1ApiToken),
-                    String(node1Id)
-                  ),
-                  { timeout: 60000 }
-                );
+        // Self delegating Node 0 wallet
+        cy.get('@node0PubKey').then((node0PubKey) => {
+          cy.get('@node0ApiToken').then((node0ApiToken) => {
+            cy.get('@node0Id').then((node0Id) => {
+              cy.wrap(
+                selfDelegate(
+                  config,
+                  String(node0PubKey),
+                  String(node0ApiToken),
+                  String(node0Id)
+                ),
+                { timeout: 60000 }
+              );
+              // Self delegating Node 1 wallet
+              cy.get('@node1PubKey').then((node1PubKey) => {
+                cy.get('@node1ApiToken').then((node1ApiToken) => {
+                  cy.get('@node1Id').then((node1Id) => {
+                    cy.wrap(
+                      selfDelegate(
+                        config,
+                        String(node1PubKey),
+                        String(node1ApiToken),
+                        String(node1Id)
+                      ),
+                      { timeout: 60000 }
+                    );
+                  });
+                });
              });
            });
          });
        });
-      });
+      }
    });
  });
 };
+
+async function getStakedByOperator() {
+  const query = gql`
+    query ExplorerNodes {
+      nodesConnection {
+        edges {
+          node {
+            stakedByOperator
+          }
+        }
+      }
+    }
+  `;
+
+  const res = await requestGQL<{
+    nodesConnection: {
+      edges: Array<{
+        node: {
+          stakedByOperator: string;
+        };
+      }>;
+    };
+  }>(query);
+
+  return res.nodesConnection.edges[0].node.stakedByOperator;
+}
@@ -3,6 +3,7 @@ import { useMemo } from 'react';
 import { useCallback } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';

 interface OrderTypeCellProps {
  value?: Schema.OrderType;
@@ -23,7 +24,15 @@ export const OrderTypeCell = ({
    }
    if (!value) return '-';
    if (order?.peggedOrder) {
-      return t('Pegged');
+      const reference =
+        Schema.PeggedReferenceMapping[order.peggedOrder?.reference];
+      // the offset (e.g. + 0.001 for a Sell, or -1231.023 for a Buy)
+      const side = order.side === Schema.Side.SIDE_BUY ? '-' : '+';
+      const offset = addDecimalsFormatNumber(
+        order.peggedOrder?.offset,
+        order.market.decimalPlaces
+      );
+      return t('%s %s %s Peg limit', [reference, side, offset]);
    }
    if (order?.liquidityProvision) {
      return t('Liquidity provision');
@@ -21,6 +21,8 @@ fragment OrderFields on Order {
  }
  peggedOrder {
    __typename
+    reference
+    offset
  }
 }

@@ -64,6 +66,7 @@ fragment OrderUpdateFields on OrderUpdate {
  type
  side
  size
+  remaining
  status
  rejectionReason
  price
@@ -75,6 +78,8 @@ fragment OrderUpdateFields on OrderUpdate {
  liquidityProvisionId
  peggedOrder {
    __typename
+    reference
+    offset
  }
 }

@@ -3,14 +3,14 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type OrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder' } | null };
+export type OrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null };

 export type OrderByIdQueryVariables = Types.Exact<{
  orderId: Types.Scalars['ID'];
 }>;


-export type OrderByIdQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder' } | null } };
+export type OrderByIdQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } };

 export type OrdersQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
@@ -20,9 +20,9 @@ export type OrdersQueryVariables = Types.Exact<{
 }>;


-export type OrdersQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, ordersConnection?: { __typename?: 'OrderConnection', edges?: Array<{ __typename?: 'OrderEdge', cursor?: string | null, node: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder' } | null } }> | null, pageInfo?: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } | null } | null } | null };
+export type OrdersQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, ordersConnection?: { __typename?: 'OrderConnection', edges?: Array<{ __typename?: 'OrderEdge', cursor?: string | null, node: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } }> | null, pageInfo?: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } | null } | null } | null };

-export type OrderUpdateFieldsFragment = { __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder' } | null };
+export type OrderUpdateFieldsFragment = { __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, remaining: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null };

 export type OrdersUpdateSubscriptionVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
@@ -30,7 +30,7 @@ export type OrdersUpdateSubscriptionVariables = Types.Exact<{
 }>;


-export type OrdersUpdateSubscription = { __typename?: 'Subscription', orders?: Array<{ __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder' } | null }> | null };
+export type OrdersUpdateSubscription = { __typename?: 'Subscription', orders?: Array<{ __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, remaining: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null }> | null };

 export const OrderFieldsFragmentDoc = gql`
    fragment OrderFields on Order {
@@ -56,6 +56,8 @@ export const OrderFieldsFragmentDoc = gql`
  }
  peggedOrder {
    __typename
+    reference
+    offset
  }
 }
    `;
@@ -66,6 +68,7 @@ export const OrderUpdateFieldsFragmentDoc = gql`
  type
  side
  size
+  remaining
  status
  rejectionReason
  price
@@ -77,6 +80,8 @@ export const OrderUpdateFieldsFragmentDoc = gql`
  liquidityProvisionId
  peggedOrder {
    __typename
+    reference
+    offset
  }
 }
    `;
@@ -213,6 +213,8 @@ describe('OrderListTable', () => {
        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
        peggedOrder: {
          __typename: 'PeggedOrder',
+          reference: Schema.PeggedReference.PEGGED_REFERENCE_MID,
+          offset: '100',
        },
      });

@@ -222,7 +224,7 @@ describe('OrderListTable', () => {

      const amendCell = getAmendCell();
      const typeCell = screen.getAllByRole('gridcell')[2];
-      expect(typeCell).toHaveTextContent('Pegged');
+      expect(typeCell).toHaveTextContent('Mid - 10.0 Peg limit');
      expect(amendCell.queryAllByRole('button')).toHaveLength(0);
    });

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { hexlify } from 'ethers/lib/utils';
+import { hexlify, toUtf8Bytes } from 'ethers/lib/utils';
 import abi from '../abis/claim_abi.json';
 import { calcGasBuffer } from '../utils';

@@ -70,7 +70,7 @@ export class Claim {
        tranche,
        expiry,
      },
-      hexlify(country),
+      hexlify(toUtf8Bytes(country)),
      target,
    ].filter(Boolean);
    const res = await this.contract.estimateGas[method](...args);
@@ -110,7 +110,9 @@ export class Claim {
   * @return {Promise<boolean>}
   */
  async isCountryBlocked(country: string): Promise<boolean> {
-    const isAllowed = await this.contract.allowed_countries(hexlify(country));
+    const isAllowed = await this.contract.allowed_countries(
+      hexlify(toUtf8Bytes(country))
+    );
    return !isAllowed;
  }
 }
@@ -44,7 +44,7 @@ export class CollateralBridge {
  is_asset_listed(address: string) {
    return this.contract.is_asset_listed(address);
  }
-  get_withdraw_threshold(assetSource: string) {
+  get_withdraw_threshold(assetSource: string): Promise<BigNumber> {
    return this.contract.get_withdraw_threshold(assetSource);
  }
  default_withdraw_delay() {
@@ -1,4 +1,4 @@
-import type { ConditionOperator } from './__generated__/types';
+import type { ConditionOperator, PeggedReference } from './__generated__/types';
 import type {
  AccountType,
  AuctionTrigger,
@@ -474,3 +474,9 @@ export const ConditionOperatorMapping: { [C in ConditionOperator]: string } = {
  OPERATOR_LESS_THAN: 'Less than',
  OPERATOR_LESS_THAN_OR_EQUAL: 'Less than or equal to',
 };
+
+export const PeggedReferenceMapping: { [R in PeggedReference]: string } = {
+  PEGGED_REFERENCE_BEST_ASK: 'Ask',
+  PEGGED_REFERENCE_BEST_BID: 'Bid',
+  PEGGED_REFERENCE_MID: 'Mid',
+};
@@ -70,13 +70,14 @@ const WithdrawDelayNotification = ({
  return (
    <Notification
      intent={Intent.Warning}
+      key={symbol}
      testId={
-        threshold.isFinite()
-          ? 'amount-withdrawal-delay-notification'
-          : 'withdrawals-delay-notification'
+        threshold.isEqualTo(0)
+          ? 'withdrawals-delay-notification'
+          : 'amount-withdrawal-delay-notification'
      }
      message={[
-        !threshold.isFinite()
+        threshold.isEqualTo(0)
          ? t('All %s withdrawals are subject to a %s delay.', replacements)
          : t('Withdrawals of %s %s or more will be delayed for %s.', [
              formatNumber(threshold, decimals),
@@ -166,10 +167,7 @@ export const WithdrawForm = ({
  };

  const showWithdrawDelayNotification =
-    delay &&
-    selectedAsset &&
-    (!threshold.isFinite() ||
-      new BigNumber(amount).isGreaterThanOrEqualTo(threshold));
+    delay && selectedAsset && new BigNumber(amount).isGreaterThan(threshold);

  return (
    <>
@@ -120,7 +120,7 @@ describe('WithdrawManager', () => {
  it('shows withdraw delay notification if amount greater than threshold', async () => {
    render(generateJsx(props));
    fireEvent.change(screen.getByLabelText('Amount'), {
-      target: { value: '1000' },
+      target: { value: '1001' },
    });
    expect(
      await screen.findByTestId('amount-withdrawal-delay-notification')
@@ -128,7 +128,7 @@ describe('WithdrawManager', () => {
  });

  it('shows withdraw delay notification if threshold is 0', async () => {
-    withdrawAsset.threshold = new BigNumber(Infinity);
+    withdrawAsset.threshold = new BigNumber(0);
    render(generateJsx(props));
    fireEvent.change(screen.getByLabelText('Amount'), {
      target: { value: '0.01' },
Author	SHA1	Message	Date
sam-keen	1a22d11447	Merge remote-tracking branch 'origin/develop' into fix/claim	2023-05-12 14:29:43 +01:00
Mikołaj Młodzikowski	d5f0bd419e	feat(ci): update vega landing page whenever new console is released (#3751 )	2023-05-12 15:18:15 +02:00
Sam KeenandBartłomiej Głownia	2c7934a8c7	fix(governance): fix time delay notice for withdrawal of 0.00 assets (#3740 ) Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>	2023-05-12 15:04:53 +02:00
Joe Tsang	fae61c28ca	chore(cypress): remove cypress project id (#3739 )	2023-05-12 13:44:22 +01:00
dexturr	fcd4541625	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-12 12:10:20 +00:00
Sam KeenandJoe	8e0a92fdec	fix(governance): network upgrade proposal e2e test tweak (#3748 ) Co-authored-by: Joe <joe@vega.xyz>	2023-05-12 09:58:10 +01:00
Dexter	2cb4aa1029	fix: claim not encoding ascii correctly	2023-05-12 08:59:15 +01:00
dexturr	6e7109ed87	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-12 06:09:45 +00:00
dexturr	f2c698ce06	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-12 00:16:15 +00:00
dexturr	ad9a3a3400	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-11 18:10:08 +00:00
Sam Keen	efeac49d58	feat(governance): change status labels for network upgrade proposals (#3711 )	2023-05-11 15:43:27 +00:00
Mikołaj Młodzikowski	2d430710ab	feat(ci): use actual secret in the script	2023-05-11 17:31:12 +02:00
Mikołaj Młodzikowski	bca1a98985	fix(ci): remove old dockerfile	2023-05-11 17:16:28 +02:00
Edd	8a080d3279	fix(explorer): fix bug where no votes displayed a yes icon (#3699 )	2023-05-11 14:55:00 +00:00
Mikołaj Młodzikowski	f121836b4e	feat(ci): fleek updates (#3724 )	2023-05-11 15:42:35 +02:00
Sam Keen	b641c82ad8	feat(governance): voting blog link and button title (#3717 )	2023-05-11 12:59:28 +00:00
Sam Keen	bf73559c30	fix(governance): change proposal sort order (#3716 )	2023-05-11 12:39:30 +00:00
dexturr	653cec2592	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-11 12:07:57 +00:00
m.ray	579c884a5a	feat(trading): show pegged order offset and reference in the order table (#3675 )	2023-05-11 12:43:20 +01:00
Bartłomiej Głownia	b2279c7e47	feat(trading): hook up new EstimatePosition and EstimateFees api methods (#3634 )	2023-05-11 12:58:12 +02:00
Sam Keen	a8c17b6807	fix(governance): tranches data (#3708 )	2023-05-11 10:22:52 +00:00
Sam Keen	b4c7dc6f59	fix(governance): more thorough catch for url in error reporting (#3686 )	2023-05-11 10:21:16 +00:00