chore: upgrade to 1.0.1

chore: update snap to 1.0.0
feat(trading): add LP fee settings (#5773 )
2024-02-09 12:20:30 -08:00 · 2024-02-09 12:19:17 -08:00 · 2024-02-09 19:44:15 +00:00 · 2024-02-09 12:55:17 +00:00 · 2024-02-09 10:32:54 +00:00 · 2024-02-09 10:31:15 +00:00
39 changed files with 563 additions and 264 deletions
@@ -24,10 +24,6 @@ context('Proposal page', { tags: '@smoke' }, function () {
          cy.get_element_by_col_id('title').should('have.text', proposalTitle);
          cy.get_element_by_col_id('type').should('have.text', 'NewMarket');
          cy.get_element_by_col_id('state').should('have.text', 'Enacted');
-          cy.getByTestId('vote-progress').should('be.visible');
-          cy.getByTestId('vote-progress-bar-for')
-            .invoke('attr', 'style')
-            .should('eq', 'width: 100%;');
          cy.get('[col-id="cDate"]')
            .invoke('text')
            .should('match', dateTimeRegex);
@@ -73,10 +69,6 @@ context('Proposal page', { tags: '@smoke' }, function () {
            'have.text',
            'Waiting for Node Vote'
          );
-          cy.getByTestId('vote-progress').should('be.visible');
-          cy.getByTestId('vote-progress-bar-against')
-            .invoke('attr', 'style')
-            .should('eq', 'width: 100%;');
          cy.get('[col-id="cDate"]')
            .invoke('text')
            .should('match', dateTimeRegex);
@@ -1,5 +1,4 @@
 import { type ProposalListFieldsFragment } from '@vegaprotocol/proposals';
-import { VoteProgress } from '@vegaprotocol/proposals';
 import { type AgGridReact } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { AgGrid } from '@vegaprotocol/datagrid';
@@ -12,12 +11,7 @@ import { type ColDef } from 'ag-grid-community';
 import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
 import { ProposalStateMapping } from '@vegaprotocol/types';
-import BigNumber from 'bignumber.js';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
 import { JsonViewerDialog } from '../dialogs/json-viewer-dialog';
@@ -31,15 +25,7 @@ type ProposalsTableProps = {
  data: ProposalListFieldsFragment[] | null;
 };
 export const ProposalsTable = ({ data }: ProposalsTableProps) => {
-  const { params } = useNetworkParams([
-    NetworkParams.governance_proposal_market_requiredMajority,
-  ]);
  const tokenLink = useLinks(DApp.Governance);
-  const requiredMajorityPercentage = useMemo(() => {
-    const requiredMajority =
-      params?.governance_proposal_market_requiredMajority ?? 1;
-    return new BigNumber(requiredMajority).times(100);
-  }, [params?.governance_proposal_market_requiredMajority]);

  const gridRef = useRef<AgGridReact>(null);
  useLayoutEffect(() => {
@@ -90,33 +76,6 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
          return value ? ProposalStateMapping[value] : '-';
        },
      },
-      {
-        colId: 'voting',
-        maxWidth: 100,
-        hide: window.innerWidth <= BREAKPOINT_MD,
-        headerName: t('Voting'),
-        cellRenderer: ({
-          data,
-        }: VegaICellRendererParams<ProposalListFieldsFragment>) => {
-          if (data) {
-            const yesTokens = new BigNumber(data.votes.yes.totalTokens);
-            const noTokens = new BigNumber(data.votes.no.totalTokens);
-            const totalTokensVoted = yesTokens.plus(noTokens);
-            const yesPercentage = totalTokensVoted.isZero()
-              ? new BigNumber(0)
-              : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
-            return (
-              <div className="flex h-full items-center justify-center pt-2 uppercase">
-                <VoteProgress
-                  threshold={requiredMajorityPercentage}
-                  progress={yesPercentage}
-                />
-              </div>
-            );
-          }
-          return '-';
-        },
-      },
      {
        colId: 'cDate',
        maxWidth: 150,
@@ -184,7 +143,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
        },
      },
    ],
-    [requiredMajorityPercentage, tokenLink]
+    [tokenLink]
  );
  return (
    <>
@@ -0,0 +1,46 @@
+import { t } from '@vegaprotocol/i18n';
+import { TxDetailsShared } from '../shared/tx-details-shared';
+import { TableWithTbody } from '../../../table';
+import type { components } from '../../../../../types/explorer';
+
+import type { BlockExplorerTransactionResult } from '../../../../routes/types/block-explorer-response';
+import type { TendermintBlocksResponse } from '../../../../routes/blocks/tendermint-blocks-response';
+import { TableCell, TableRow } from '../../../table';
+
+type Update = components['schemas']['v1UpdatePartyProfile'];
+
+interface TxDetailsUpdatePartyProfileProps {
+  txData: BlockExplorerTransactionResult | undefined;
+  pubKey: string | undefined;
+  blockData: TendermintBlocksResponse | undefined;
+}
+
+/**
+ * Party profiles can be an alias and arbitrary key/values pairs.
+ * This component displays the alias, if any, but not the metadata. When there is
+ * some wider usage, we can decide how to render it. For now, it's available in the
+ * full TX details.
+ */
+export const TxDetailsUpdatePartyProfile = ({
+  txData,
+  pubKey,
+  blockData,
+}: TxDetailsUpdatePartyProfileProps) => {
+  if (!txData?.command.updatePartyProfile) {
+    return <>{t('Awaiting Block Explorer transaction details')}</>;
+  }
+
+  const update: Update = txData.command.updatePartyProfile;
+
+  return (
+    <TableWithTbody className="mb-8" allowWrap={true}>
+      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
+      {update.alias && (
+        <TableRow modifier="bordered">
+          <TableCell>{t('New alias')}</TableCell>
+          <TableCell>{update.alias}</TableCell>
+        </TableRow>
+      )}
+    </TableWithTbody>
+  );
+};
@@ -34,6 +34,7 @@ import { TxDetailsUpdateReferralSet } from './tx-update-referral-set';
 import { TxDetailsJoinTeam } from './tx-join-team';
 import { TxDetailsUpdateMarginMode } from './tx-update-margin-mode';
 import { TxBatchProposal } from './tx-batch-proposal';
+import { TxDetailsUpdatePartyProfile } from './proposal/tx-update-party-profile';

 interface TxDetailsWrapperProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -139,6 +140,8 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
      return TxDetailsUpdateMarginMode;
    case 'Batch Proposal':
      return TxBatchProposal;
+    case 'Update Party Profile':
+      return TxDetailsUpdatePartyProfile;
    default:
      return TxDetailsGeneric;
  }
@@ -44,6 +44,7 @@ export type FilterOption =
  | 'Submit Order'
  | 'Transfer Funds'
  | 'Undelegate'
+  | 'Update Party Profile'
  | 'Update Referral Set'
  | 'Update Margin Mode'
  | 'Validator Heartbeat'
@@ -79,6 +80,7 @@ export const filterOptions: Record<string, FilterOption[]> = {
    'Apply Referral Code',
    'Create Referral Set',
    'Join Team',
+    'Update Party Profile',
    'Update Referral Set',
  ],
  'External Data': ['Chain Event', 'Submit Oracle Data'],
@@ -1,4 +1,4 @@
-NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/af6a2d529a11f8158bc8ca2a
+NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.rpc.grove.city/v1/af6a2d529a11f8158bc8ca2a
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
@@ -1,4 +1,4 @@
-import { getNumberFormat } from '@vegaprotocol/utils';
+import { formatNumber } from '@vegaprotocol/utils';
 import sortBy from 'lodash/sortBy';
 import omit from 'lodash/omit';
 import { useReferralProgramQuery } from './__generated__/CurrentReferralProgram';
@@ -107,9 +107,7 @@ export const useReferralProgram = () => {
      discountFactor: Number(t.referralDiscountFactor),
      discount: BigNumber(t.referralDiscountFactor).times(100).toFixed(2) + '%',
      minimumVolume: Number(t.minimumRunningNotionalTakerVolume),
-      volume: getNumberFormat(0).format(
-        Number(t.minimumRunningNotionalTakerVolume)
-      ),
+      volume: formatNumber(t.minimumRunningNotionalTakerVolume, 0),
      epochs: Number(t.minimumEpochs),
    };
  });
@@ -14,9 +14,9 @@ import {
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import {
  addDecimalsFormatNumber,
+  formatNumber,
  getDateFormat,
  getDateTimeFormat,
-  getNumberFormat,
  getUserLocale,
  removePaginationWrapper,
 } from '@vegaprotocol/utils';
@@ -323,7 +323,7 @@ export const Statistics = ({
      }
      description={<QUSDTooltip />}
    >
-      {getNumberFormat(0).format(Number(totalCommissionValue))}
+      {formatNumber(totalCommissionValue, 0)}
    </StatTile>
  );

@@ -563,8 +563,8 @@ export const RefereesTable = ({
              )
                .map((r) => ({
                  ...r,
-                  volume: getNumberFormat(0).format(r.volume),
-                  commission: getNumberFormat(0).format(r.commission),
+                  volume: formatNumber(r.volume, 0),
+                  commission: formatNumber(r.commission, 0),
                }))
                .reverse()}
            />
@@ -1,6 +1,6 @@
 import { Link } from 'react-router-dom';
 import { Splash } from '@vegaprotocol/ui-toolkit';
-import { getNumberFormat } from '@vegaprotocol/utils';
+import { formatNumber } from '@vegaprotocol/utils';
 import { type useTeams } from '../../lib/hooks/use-teams';
 import { useT } from '../../lib/use-t';
 import { Table } from '../table';
@@ -15,8 +15,7 @@ export const CompetitionsLeaderboard = ({
 }) => {
  const t = useT();

-  const num = (n?: number | string) =>
-    !n ? '-' : getNumberFormat(0).format(Number(n));
+  const num = (n?: number | string) => (!n ? '-' : formatNumber(n, 0));

  if (!data || data.length === 0) {
    return <Splash>{t('Could not find any teams')}</Splash>;
@@ -33,9 +32,9 @@ export const CompetitionsLeaderboard = ({
        { name: 'status', displayName: t('Status') },
        { name: 'volume', displayName: t('Volume') },
      ]}
-      data={data.map((td, i) => {
+      data={data.map((td) => {
        // leaderboard place or medal
-        let rank: number | React.ReactNode = i + 1;
+        let rank: number | React.ReactNode = td.rank;
        if (rank === 1) rank = <Rank variant="gold" />;
        if (rank === 2) rank = <Rank variant="silver" />;
        if (rank === 3) rank = <Rank variant="bronze" />;
@@ -1,6 +1,11 @@
 import { type TransferNode } from '@vegaprotocol/types';
-import { ActiveRewardCard } from '../rewards-container/active-rewards';
+import {
+  ActiveRewardCard,
+  isActiveReward,
+} from '../rewards-container/active-rewards';
 import { useT } from '../../lib/use-t';
+import { useAssetsMapProvider } from '@vegaprotocol/assets';
+import { useMarketsMapProvider } from '@vegaprotocol/markets';

 export const GamesContainer = ({
  data,
@@ -10,8 +15,35 @@ export const GamesContainer = ({
  currentEpoch: number;
 }) => {
  const t = useT();
+  // Re-load markets and assets in the games container to ensure that the
+  // the cards are updated (not grayed out) when the user navigates to the games page
+  const { data: assets } = useAssetsMapProvider();
+  const { data: markets } = useMarketsMapProvider();

-  if (!data || data.length === 0) {
+  const enrichedTransfers = data
+    .filter((node) => isActiveReward(node, currentEpoch))
+    .map((node) => {
+      if (node.transfer.kind.__typename !== 'RecurringTransfer') {
+        return node;
+      }
+
+      const asset =
+        assets &&
+        assets[
+          node.transfer.kind.dispatchStrategy?.dispatchMetricAssetId || ''
+        ];
+
+      const marketsInScope =
+        node.transfer.kind.dispatchStrategy?.marketIdsInScope?.map(
+          (id) => markets && markets[id]
+        );
+
+      return { ...node, asset, markets: marketsInScope };
+    });
+
+  if (!enrichedTransfers || !enrichedTransfers.length) return null;
+
+  if (!enrichedTransfers || enrichedTransfers.length === 0) {
    return (
      <p className="mb-6 text-muted">
        {t('There are currently no games available.')}
@@ -21,7 +53,7 @@ export const GamesContainer = ({

  return (
    <div className="mb-12 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-      {data.map((game, i) => {
+      {enrichedTransfers.map((game, i) => {
        // TODO: Remove `kind` prop from ActiveRewardCard
        const { transfer } = game;
        if (
@@ -468,7 +468,7 @@ export const ActiveRewardCard = ({
            }
          </div>
          {dispatchStrategy?.dispatchMetric && (
-            <span className="text-muted text-sm h-[2rem]">
+            <span className="text-muted text-sm h-[3rem]">
              {t(DispatchMetricDescription[dispatchStrategy?.dispatchMetric])}
            </span>
          )}
@@ -288,7 +288,7 @@ def test_game_card(competitions_page: Page):
    expect(game_1.get_by_test_id("distribution-strategy")
           ).to_have_text("Pro rata")
    expect(game_1.get_by_test_id("dispatch-metric-info")
-           ).to_have_text("Price maker fees paid • ")
+           ).to_have_text("Price maker fees paid • tDAI")
    expect(game_1.get_by_test_id("assessed-over")).to_have_text("15 epochs")
    expect(game_1.get_by_test_id("scope")).to_have_text("In team")
    expect(game_1.get_by_test_id("staking-requirement")).to_have_text("0.00")
@@ -36,7 +36,9 @@ export const useTeams = (aggregationEpochs = DEFAULT_AGGREGATION_EPOCHS) => {
      ...stats.find((s) => s.teamId === t.teamId),
    }));

-    return orderBy(data, (d) => Number(d.totalQuantumRewards || 0), 'desc');
+    return orderBy(data, (d) => Number(d.totalQuantumRewards || 0), 'desc').map(
+      (d, i) => ({ ...d, rank: i + 1 })
+    );
  }, [teams, stats]);

  return {
@@ -0,0 +1,18 @@
+query TransferFee(
+  $fromAccount: ID!
+  $fromAccountType: AccountType!
+  $toAccount: ID!
+  $amount: String!
+  $assetId: String!
+) {
+  estimateTransferFee(
+    fromAccount: $fromAccount
+    fromAccountType: $fromAccountType
+    toAccount: $toAccount
+    amount: $amount
+    assetId: $assetId
+  ) {
+    fee
+    discount
+  }
+}
@@ -0,0 +1,63 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type TransferFeeQueryVariables = Types.Exact<{
+  fromAccount: Types.Scalars['ID'];
+  fromAccountType: Types.AccountType;
+  toAccount: Types.Scalars['ID'];
+  amount: Types.Scalars['String'];
+  assetId: Types.Scalars['String'];
+}>;
+
+
+export type TransferFeeQuery = { __typename?: 'Query', estimateTransferFee?: { __typename?: 'EstimatedTransferFee', fee: string, discount: string } | null };
+
+
+export const TransferFeeDocument = gql`
+    query TransferFee($fromAccount: ID!, $fromAccountType: AccountType!, $toAccount: ID!, $amount: String!, $assetId: String!) {
+  estimateTransferFee(
+    fromAccount: $fromAccount
+    fromAccountType: $fromAccountType
+    toAccount: $toAccount
+    amount: $amount
+    assetId: $assetId
+  ) {
+    fee
+    discount
+  }
+}
+    `;
+
+/**
+ * __useTransferFeeQuery__
+ *
+ * To run a query within a React component, call `useTransferFeeQuery` and pass it any options that fit your needs.
+ * When your component renders, `useTransferFeeQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useTransferFeeQuery({
+ *   variables: {
+ *      fromAccount: // value for 'fromAccount'
+ *      fromAccountType: // value for 'fromAccountType'
+ *      toAccount: // value for 'toAccount'
+ *      amount: // value for 'amount'
+ *      assetId: // value for 'assetId'
+ *   },
+ * });
+ */
+export function useTransferFeeQuery(baseOptions: Apollo.QueryHookOptions<TransferFeeQuery, TransferFeeQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<TransferFeeQuery, TransferFeeQueryVariables>(TransferFeeDocument, options);
+      }
+export function useTransferFeeLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TransferFeeQuery, TransferFeeQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<TransferFeeQuery, TransferFeeQueryVariables>(TransferFeeDocument, options);
+        }
+export type TransferFeeQueryHookResult = ReturnType<typeof useTransferFeeQuery>;
+export type TransferFeeLazyQueryHookResult = ReturnType<typeof useTransferFeeLazyQuery>;
+export type TransferFeeQueryResult = Apollo.QueryResult<TransferFeeQuery, TransferFeeQueryVariables>;
@@ -25,7 +25,6 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
  const t = useT();
  const { pubKey, pubKeys, isReadOnly } = useVegaWallet();
  const { params } = useNetworkParams([
-    NetworkParams.transfer_fee_factor,
    NetworkParams.transfer_minTransferQuantumMultiple,
  ]);

@@ -72,7 +71,6 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
        pubKeys={pubKeys ? pubKeys?.map((pk) => pk.publicKey) : null}
        isReadOnly={isReadOnly}
        assetId={assetId}
-        feeFactor={params.transfer_fee_factor}
        minQuantumMultiple={params.transfer_minTransferQuantumMultiple}
        submitTransfer={transfer}
        accounts={sortedAccounts}
@@ -15,6 +15,30 @@ import {
 } from './transfer-form';
 import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
 import { removeDecimal } from '@vegaprotocol/utils';
+import type { TransferFeeQuery } from './__generated__/TransferFee';
+
+const feeFactor = 0.001;
+const mockUseTransferFeeQuery = jest.fn(
+  ({
+    variables: { amount },
+  }: {
+    variables: { amount: string };
+  }): { data: TransferFeeQuery } => {
+    return {
+      data: {
+        estimateTransferFee: {
+          discount: '0',
+          fee: (Number(amount) * feeFactor).toFixed(),
+        },
+      },
+    };
+  }
+);
+
+jest.mock('./__generated__/TransferFee', () => ({
+  useTransferFeeQuery: (props: { variables: { amount: string } }) =>
+    mockUseTransferFeeQuery(props),
+}));

 describe('TransferForm', () => {
  const renderComponent = (props: TransferFormProps) => {
@@ -56,7 +80,6 @@ describe('TransferForm', () => {
  const props = {
    pubKey,
    pubKeys: [pubKey, '2'.repeat(64)],
-    feeFactor: '0.001',
    submitTransfer: jest.fn(),
    accounts: [
      {
@@ -79,7 +102,6 @@ describe('TransferForm', () => {
      pubKey,
      'a4b6e3de5d7ef4e31ae1b090be49d1a2ef7bcefff60cccf7658a0d4922651cce',
    ],
-    feeFactor: '0.001',
    submitTransfer: jest.fn(),
    accounts: [],
    minQuantumMultiple: '1',
@@ -96,10 +118,6 @@ describe('TransferForm', () => {
  });

  it.each([
-    {
-      targetText: 'Transfer fee',
-      tooltipText: /transfer\.fee\.factor/,
-    },
    {
      targetText: 'Amount to be transferred',
      tooltipText: /without the fee/,
@@ -109,9 +127,6 @@ describe('TransferForm', () => {
      tooltipText: /total amount taken from your account/,
    },
  ])('Tooltip for "$targetText" shows', async (o) => {
-    // 1003-TRAN-015
-    // 1003-TRAN-016
-    // 1003-TRAN-017
    // 1003-TRAN-018
    // 1003-TRAN-019
    renderComponent(props);
@@ -124,6 +139,10 @@ describe('TransferForm', () => {
    // Select asset
    await selectAsset(asset);

+    await userEvent.selectOptions(
+      screen.getByLabelText('From account'),
+      `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+    );
    // set valid amount
    const amountInput = screen.getByLabelText('Amount');
    await userEvent.type(amountInput, amount);
@@ -214,9 +233,7 @@ describe('TransferForm', () => {
    // set valid amount
    await userEvent.clear(amountInput);
    await userEvent.type(amountInput, amount);
-    expect(screen.getByTestId('transfer-fee')).toHaveTextContent(
-      new BigNumber(props.feeFactor).times(amount).toFixed()
-    );
+    expect(screen.getByTestId('transfer-fee')).toHaveTextContent('1');

    await submit();

@@ -385,47 +402,44 @@ describe('TransferForm', () => {
      });
    });
  });
-  describe('IncludeFeesCheckbox', () => {
-    it('validates fields when checkbox is not checked', async () => {
-      renderComponent(props);

-      // check current pubkey not shown
-      const keySelect: HTMLSelectElement = screen.getByLabelText('To Vega key');
-      const pubKeyOptions = ['', pubKey, props.pubKeys[1]];
-      expect(keySelect.children).toHaveLength(pubKeyOptions.length);
-      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual(
-        pubKeyOptions
-      );
+  it('validates fields', async () => {
+    renderComponent(props);

-      await submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
+    // check current pubkey not shown
+    const keySelect: HTMLSelectElement = screen.getByLabelText('To Vega key');
+    const pubKeyOptions = ['', pubKey, props.pubKeys[1]];
+    expect(keySelect.children).toHaveLength(pubKeyOptions.length);
+    expect(Array.from(keySelect.options).map((o) => o.value)).toEqual(
+      pubKeyOptions
+    );

-      // Select a pubkey
-      await userEvent.selectOptions(
-        screen.getByLabelText('To Vega key'),
-        props.pubKeys[1]
-      );
+    await submit();
+    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value

-      // Select asset
-      await selectAsset(asset);
+    // Select a pubkey
+    await userEvent.selectOptions(
+      screen.getByLabelText('To Vega key'),
+      props.pubKeys[1]
+    );

-      await userEvent.selectOptions(
-        screen.getByLabelText('From account'),
-        `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
-      );
+    // Select asset
+    await selectAsset(asset);

-      const amountInput = screen.getByLabelText('Amount');
+    await userEvent.selectOptions(
+      screen.getByLabelText('From account'),
+      `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+    );

-      await userEvent.type(amountInput, amount);
-      const expectedFee = new BigNumber(amount)
-        .times(props.feeFactor)
-        .toFixed();
-      const total = new BigNumber(amount).plus(expectedFee).toFixed();
-      // 1003-TRAN-021
-      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
-      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(amount);
-      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
-    });
+    const amountInput = screen.getByLabelText('Amount');
+
+    await userEvent.type(amountInput, amount);
+    const expectedFee = new BigNumber(amount).times(feeFactor).toFixed();
+    const total = new BigNumber(amount).plus(expectedFee).toFixed();
+    // 1003-TRAN-021
+    expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
+    expect(screen.getByTestId('transfer-amount')).toHaveTextContent(amount);
+    expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
  });

  describe('AddressField', () => {
@@ -457,24 +471,29 @@ describe('TransferForm', () => {

  describe('TransferFee', () => {
    const props = {
-      amount: '200',
-      feeFactor: '0.001',
-      fee: '0.2',
-      transferAmount: '200',
-      decimals: 8,
+      amount: '20000',
+      discount: '0',
+      fee: '20',
+      decimals: 2,
    };
-    it('calculates and renders the transfer fee', () => {
+    it('calculates and renders amounts and fee', () => {
      render(<TransferFee {...props} />);
+      expect(screen.queryByTestId('discount')).not.toBeInTheDocument();
+      expect(screen.getByTestId('transfer-fee')).toHaveTextContent('0.2');
+      expect(screen.getByTestId('transfer-amount')).toHaveTextContent('200.00');
+      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(
+        '200.20'
+      );
+    });

-      const expected = new BigNumber(props.amount)
-        .times(props.feeFactor)
-        .toFixed();
-      const total = new BigNumber(props.amount).plus(expected).toFixed();
-      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expected);
-      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(
-        props.amount
+    it('calculates and renders amounts, fee and discount', () => {
+      render(<TransferFee {...props} discount="10" />);
+      expect(screen.getByTestId('discount')).toHaveTextContent('0.1');
+      expect(screen.getByTestId('transfer-fee')).toHaveTextContent('0.2');
+      expect(screen.getByTestId('transfer-amount')).toHaveTextContent('200.00');
+      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(
+        '200.10'
      );
-      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
    });
  });
 });
@@ -4,8 +4,9 @@ import {
  useRequired,
  useVegaPublicKey,
  addDecimal,
-  formatNumber,
  toBigNum,
+  removeDecimal,
+  addDecimalsFormatNumber,
 } from '@vegaprotocol/utils';
 import { useT } from './use-t';
 import {
@@ -21,10 +22,11 @@ import type { Transfer } from '@vegaprotocol/wallet';
 import { normalizeTransfer } from '@vegaprotocol/wallet';
 import BigNumber from 'bignumber.js';
 import type { ReactNode } from 'react';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { AssetOption, Balance } from '@vegaprotocol/assets';
 import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
+import { useTransferFeeQuery } from './__generated__/TransferFee';

 interface FormFields {
  toVegaKey: string;
@@ -51,7 +53,6 @@ export interface TransferFormProps {
    asset: Asset;
  }>;
  assetId?: string;
-  feeFactor: string | null;
  minQuantumMultiple: string | null;
  submitTransfer: (transfer: Transfer) => void;
 }
@@ -61,7 +62,6 @@ export const TransferForm = ({
  pubKeys,
  isReadOnly,
  assetId: initialAssetId,
-  feeFactor,
  submitTransfer,
  accounts,
  minQuantumMultiple,
@@ -136,11 +136,22 @@ export const TransferForm = ({

  // Max amount given selected asset and from account
  const max = accountBalance ? new BigNumber(accountBalance) : new BigNumber(0);
+  const normalizedAmount =
+    (amount && asset && removeDecimal(amount, asset.decimals)) || '0';

-  const fee = useMemo(
-    () => feeFactor && new BigNumber(feeFactor).times(amount).toString(),
-    [amount, feeFactor]
-  );
+  const transferFeeQuery = useTransferFeeQuery({
+    variables: {
+      fromAccount: pubKey || '',
+      fromAccountType: accountType || AccountType.ACCOUNT_TYPE_GENERAL,
+      amount: normalizedAmount,
+      assetId: asset?.id || '',
+      toAccount: selectedPubKey,
+    },
+    skip: !pubKey || !amount || !asset || !selectedPubKey || fromVested,
+  });
+  const transferFee = transferFeeQuery.loading
+    ? transferFeeQuery.data || transferFeeQuery.previousData
+    : transferFeeQuery.data;

  const onSubmit = useCallback(
    (fields: FormFields) => {
@@ -432,12 +443,14 @@ export const TransferForm = ({
          </TradingInputError>
        )}
      </TradingFormGroup>
-      {amount && fee && (
+      {(transferFee?.estimateTransferFee || fromVested) && amount && asset && (
        <TransferFee
-          amount={amount}
-          feeFactor={feeFactor}
-          fee={fromVested ? '0' : fee}
-          decimals={asset?.decimals}
+          amount={normalizedAmount}
+          fee={fromVested ? '0' : transferFee?.estimateTransferFee?.fee}
+          discount={
+            fromVested ? '0' : transferFee?.estimateTransferFee?.discount
+          }
+          decimals={asset.decimals}
        />
      )}
      <TradingButton type="submit" fill={true} disabled={isReadOnly}>
@@ -449,39 +462,44 @@ export const TransferForm = ({

 export const TransferFee = ({
  amount,
-  feeFactor,
  fee,
+  discount,
  decimals,
 }: {
  amount: string;
-  feeFactor: string | null;
  fee?: string;
-  decimals?: number;
+  discount?: string;
+  decimals: number;
 }) => {
  const t = useT();
-  if (!feeFactor || !amount || !fee) return null;
-  if (isNaN(Number(feeFactor)) || isNaN(Number(amount)) || isNaN(Number(fee))) {
+  if (!amount || !fee) return null;
+  if (isNaN(Number(amount)) || isNaN(Number(fee))) {
    return null;
  }

-  const totalValue = new BigNumber(amount).plus(fee).toString();
+  const totalValue = (
+    BigInt(amount) +
+    BigInt(fee) -
+    BigInt(discount || '0')
+  ).toString();

  return (
    <div className="mb-4 flex flex-col gap-2 text-xs">
      <div className="flex flex-wrap items-center justify-between gap-1">
-        <Tooltip
-          description={t(
-            `The transfer fee is set by the network parameter transfer.fee.factor, currently set to {{feeFactor}}`,
-            { feeFactor }
-          )}
-        >
-          <div>{t('Transfer fee')}</div>
-        </Tooltip>
-
+        <div>{t('Transfer fee')}</div>
        <div data-testid="transfer-fee" className="text-muted">
-          {formatNumber(fee, decimals)}
+          {addDecimalsFormatNumber(fee, decimals)}
        </div>
      </div>
+      {discount && discount !== '0' && (
+        <div className="flex flex-wrap items-center justify-between gap-1">
+          <div>{t('Discount')}</div>
+          <div data-testid="discount" className="text-muted">
+            {addDecimalsFormatNumber(discount, decimals)}
+          </div>
+        </div>
+      )}
+
      <div className="flex flex-wrap items-center justify-between gap-1">
        <Tooltip
          description={t(
@@ -492,7 +510,7 @@ export const TransferFee = ({
        </Tooltip>

        <div data-testid="transfer-amount" className="text-muted">
-          {formatNumber(amount, decimals)}
+          {addDecimalsFormatNumber(amount, decimals)}
        </div>
      </div>
      <div className="flex flex-wrap items-center justify-between gap-1">
@@ -505,7 +523,7 @@ export const TransferFee = ({
        </Tooltip>

        <div data-testid="total-transfer-fee" className="text-muted">
-          {formatNumber(totalValue, decimals)}
+          {addDecimalsFormatNumber(totalValue, decimals)}
        </div>
      </div>
    </div>
@@ -86,6 +86,7 @@ export const DocsLinks = VEGA_DOCS_URL
      POST_REDUCE_ONLY: `${VEGA_DOCS_URL}/concepts/trading-on-vega/orders#conditional-order-parameters`,
      QUANTUM: `${VEGA_DOCS_URL}/concepts/assets/asset-framework#quantum`,
      REFERRALS: `${VEGA_DOCS_URL}/tutorials/proposals/referral-program-proposal`,
+      LIQUIDITY_FEE_PERCENTAGE: `${VEGA_DOCS_URL}/concepts/liquidity/rewards-penalties#determining-the-liquidity-fee-percentage`,
    }
  : undefined;

@@ -35,7 +35,6 @@
  "The total amount of each asset on this key. Includes used and available collateral.": "The total amount of each asset on this key. Includes used and available collateral.",
  "The total amount taken from your account. The amount to be transferred plus the fee.": "The total amount taken from your account. The amount to be transferred plus the fee.",
  "The total amount to be transferred (without the fee)": "The total amount to be transferred (without the fee)",
-  "The transfer fee is set by the network parameter transfer.fee.factor, currently set to {{feeFactor}}": "The transfer fee is set by the network parameter transfer.fee.factor, currently set to {{feeFactor}}",
  "To account": "To account",
  "To Vega key": "To Vega key",
  "Total": "Total",
@@ -110,6 +110,7 @@
  "Fills": "Fills",
  "Final commission rate": "Final commission rate",
  "Find out more": "Find out more",
+  "For more info, visit the documentation": "For more info, visit the documentation",
  "Free from the risks of real trading, Fairground is a safe and fun place to try out Vega yourself with virtual assets.": "Free from the risks of real trading, Fairground is a safe and fun place to try out Vega yourself with virtual assets.",
  "From epoch": "From epoch",
  "Fully decentralised high performance peer-to-network trading.": "Fully decentralised high performance peer-to-network trading.",
@@ -94,7 +94,7 @@ export const LiquidityTable = ({
      return `${addDecimalsFormatNumberQuantum(
        value,
        assetDecimalPlaces ?? 0,
-        quantum ?? 0
+        quantum ?? 1
      )}`;
    };

@@ -165,7 +165,7 @@ export const LiquidityTable = ({
      return `${addDecimalsFormatNumberQuantum(
        newValue,
        assetDecimalPlaces ?? 0,
-        quantum ?? 0
+        quantum ?? 1
      )}`;
    };

@@ -227,7 +227,7 @@ export const LiquidityTable = ({
            addDecimalsFormatNumberQuantum(
              pendingCommitmentAmount,
              assetDecimalPlaces ?? 0,
-              quantum ?? 0
+              quantum ?? 1
            );

          if (
@@ -238,7 +238,7 @@ export const LiquidityTable = ({
              addDecimalsFormatNumberQuantum(
                currentCommitmentAmount,
                assetDecimalPlaces ?? 0,
-                quantum ?? 0
+                quantum ?? 1
              );

            return (
@@ -286,7 +286,7 @@ export const LiquidityTable = ({
            addDecimalsFormatNumberQuantum(
              pendingCommitmentAmount,
              assetDecimalPlaces ?? 0,
-              quantum ?? 0
+              quantum ?? 1
            );

          if (
@@ -297,7 +297,7 @@ export const LiquidityTable = ({
              addDecimalsFormatNumberQuantum(
                currentCommitmentAmount,
                assetDecimalPlaces ?? 0,
-                quantum ?? 0
+                quantum ?? 1
              );

            return (
@@ -1,7 +1,7 @@
 import { DepthChart } from 'pennant';
 import throttle from 'lodash/throttle';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { addDecimal, getNumberFormat } from '@vegaprotocol/utils';
+import { addDecimal, formatNumber } from '@vegaprotocol/utils';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { marketDepthProvider } from './market-depth-provider';
@@ -216,13 +216,12 @@ export const DepthChartContainer = ({ marketId }: DepthChartManagerProps) => {

  const volumeFormat = useCallback(
    (volume: number) =>
-      getNumberFormat(market?.positionDecimalPlaces || 0).format(volume),
+      formatNumber(volume, market?.positionDecimalPlaces || 0),
    [market?.positionDecimalPlaces]
  );

  const priceFormat = useCallback(
-    (price: number) =>
-      getNumberFormat(market?.decimalPlaces || 0).format(price),
+    (price: number) => formatNumber(price, market?.decimalPlaces || 0),
    [market?.decimalPlaces]
  );

@@ -171,6 +171,10 @@ query MarketInfo($marketId: ID!) {
        infrastructureFee
        liquidityFee
      }
+      liquidityFeeSettings {
+        feeConstant
+        method
+      }
    }
    priceMonitoringSettings {
      parameters {
@@ -28,6 +28,7 @@ import {
  InsurancePoolInfoPanel,
  KeyDetailsInfoPanel,
  LiquidationStrategyInfoPanel,
+  LiquidityFeesSettings,
  LiquidityInfoPanel,
  LiquidityMonitoringParametersInfoPanel,
  LiquidityPriceRangeInfoPanel,
@@ -300,6 +301,11 @@ export const MarketInfoAccordion = ({
            }
            content={<LiquiditySLAParametersInfoPanel market={market} />}
          />
+          <AccordionItem
+            itemId="lp-fee-settings"
+            title={t('Liquidity fee settings')}
+            content={<LiquidityFeesSettings market={market} />}
+          />
          <AccordionItem
            itemId="liquidity"
            title={t('Liquidity')}
@@ -44,6 +44,8 @@ import type {
 } from '@vegaprotocol/types';
 import {
  ConditionOperatorMapping,
+  LiquidityFeeMethodMapping,
+  LiquidityFeeMethodMappingDescription,
  MarketStateMapping,
  MarketTradingModeMapping,
 } from '@vegaprotocol/types';
@@ -54,6 +56,7 @@ import {
  TOKEN_PROPOSAL,
  useEnvironment,
  useLinks,
+  DocsLinks,
 } from '@vegaprotocol/environment';
 import type { Provider } from '../../oracle-schema';
 import { OracleBasicProfile } from '../../components/oracle-basic-profile';
@@ -110,6 +113,44 @@ export const CurrentFeesInfoPanel = ({ market }: MarketInfoProps) => {
  );
 };

+export const LiquidityFeesSettings = ({ market }: MarketInfoProps) => {
+  const t = useT();
+  return (
+    <>
+      <MarketInfoTable
+        data={{
+          feeConstant: market.fees.liquidityFeeSettings?.feeConstant,
+          method: market.fees.liquidityFeeSettings && (
+            <Tooltip
+              description={
+                LiquidityFeeMethodMappingDescription[
+                  market.fees.liquidityFeeSettings?.method
+                ]
+              }
+            >
+              <span>
+                {
+                  LiquidityFeeMethodMapping[
+                    market.fees.liquidityFeeSettings?.method
+                  ]
+                }
+              </span>
+            </Tooltip>
+          ),
+        }}
+      />
+      <p className="text-xs">
+        <ExternalLink
+          href={DocsLinks?.LIQUIDITY_FEE_PERCENTAGE}
+          className="mt-2"
+        >
+          {t('Fore more info, visit the documentation')}
+        </ExternalLink>
+      </p>
+    </>
+  );
+};
+
 export const MarketPriceInfoPanel = ({ market }: MarketInfoProps) => {
  const t = useT();
  const assetSymbol = getAsset(market).symbol;
@@ -16,7 +16,6 @@ export const useTooltipMapping: () => Record<string, ReactNode> = () => {
    infrastructureFee: t(
      'Fees paid to validators as a reward for running the infrastructure of the network.'
    ),
-
    markPrice: t(
      'A concept derived from traditional markets. It is a calculated value for the ‘current market price’ on a market.'
    ),
@@ -154,5 +153,9 @@ export const useTooltipMapping: () => Record<string, ReactNode> = () => {
    minProbabilityOfTradingLPOrders: t(
      'The lower bound for the probability of trading calculation, used to measure liquidity available on a market to determine if LPs are meeting their commitment. This is a network parameter.'
    ),
+    method: t(`The method used to calculate the market's liquidity fee.`),
+    feeConstant: t(
+      'The constant liquidity fee used when using the constant fee method .'
+    ),
  };
 };
@@ -240,7 +240,7 @@ export const OracleFullProfile = ({
          <div className="font-alpha calt dark:text-vega-light-300 text-vega-dark-300 mb-2 grid grid-cols-4 gap-1 uppercase">
            <div className="col-span-1">{t('Market')}</div>
            <div className="col-span-1">{t('Status')}</div>
-            <div className="col-span-1">{t('Specifications')}</div>
+            <div className="col-span-2">{t('Specifications')}</div>
          </div>
          <div className="max-h-60 overflow-auto">
            {oracleMarkets?.map((market) => (
@@ -12,6 +12,10 @@ fragment MarketFields on Market {
      infrastructureFee
      liquidityFee
    }
+    liquidityFeeSettings {
+      feeConstant
+      method
+    }
  }
  tradableInstrument {
    instrument {
@@ -52,6 +52,11 @@ export const createMarketFragment = (
        infrastructureFee: '',
        liquidityFee: '',
      },
+      liquidityFeeSettings: {
+        __typename: 'LiquidityFeeSettings',
+        method: Schema.LiquidityFeeMethod.METHOD_MARGINAL_COST,
+        feeConstant: '',
+      },
    },
    tradableInstrument: {
      instrument: {
@@ -14,6 +14,32 @@ export type Scalars = {
  Timestamp: any;
 };

+/** Margins for a hypothetical position not related to any existing party */
+export type AbstractMarginLevels = {
+  __typename?: 'AbstractMarginLevels';
+  /** Asset for the current margins */
+  asset: Asset;
+  /**
+   * If the margin of the party is greater than this level, then collateral will be released from the margin account into
+   * the general account of the party for the given asset.
+   */
+  collateralReleaseLevel: Scalars['String'];
+  /** This is the minimum margin required for a party to place a new order on the network, expressed as unsigned integer */
+  initialLevel: Scalars['String'];
+  /** Minimal margin for the position to be maintained in the network (unsigned integer) */
+  maintenanceLevel: Scalars['String'];
+  /** Margin factor, only relevant for isolated margin mode, else 0 */
+  marginFactor: Scalars['String'];
+  /** Margin mode of the party, cross margin or isolated margin */
+  marginMode: MarginMode;
+  /** Market in which the margin is required for this party */
+  market: Market;
+  /** When in isolated margin, the required order margin level, otherwise, 0 */
+  orderMarginLevel: Scalars['String'];
+  /** If the margin is between maintenance and search, the network will initiate a collateral search, expressed as unsigned integer */
+  searchLevel: Scalars['String'];
+};
+
 /** An account record */
 export type AccountBalance = {
  __typename?: 'AccountBalance';
@@ -359,6 +385,8 @@ export enum AuctionTrigger {

 export type BatchProposal = {
  __typename?: 'BatchProposal';
+  /** Terms of all the proposals in the batch */
+  batchTerms?: Maybe<BatchProposalTerms>;
  /** RFC3339Nano time and date when the proposal reached the network */
  datetime: Scalars['Timestamp'];
  /** Details of the rejection reason */
@@ -389,10 +417,10 @@ export type BatchProposal = {
  votes: ProposalVotes;
 };

-/** The rationale for the proposal */
+/** The terms for the batch proposal */
 export type BatchProposalTerms = {
  __typename?: 'BatchProposalTerms';
-  /** Actual changes being introduced by the proposal - actions the proposal triggers if passed and enacted. */
+  /** Actual changes being introduced by the batch proposal - actions the proposal triggers if passed and enacted. */
  changes: Array<Maybe<BatchProposalTermsChange>>;
  /**
   * RFC3339Nano time and date when voting closes for this proposal.
@@ -531,6 +559,22 @@ export type CompositePriceConfiguration = {
  decayWeight: Scalars['String'];
 };

+export type CompositePriceSource = {
+  __typename?: 'CompositePriceSource';
+  /** The source of the price */
+  PriceSource: Scalars['String'];
+  /** The last time the price source was updated in RFC3339Nano */
+  lastUpdated: Scalars['Timestamp'];
+  /** The current value of the composite source price */
+  price: Scalars['String'];
+};
+
+export type CompositePriceState = {
+  __typename?: 'CompositePriceState';
+  /** Underlying state of the composite price */
+  priceSources?: Maybe<Array<CompositePriceSource>>;
+};
+
 export enum CompositePriceType {
  /** Composite price is set to the last trade (legacy) */
  COMPOSITE_PRICE_TYPE_LAST_TRADE = 'COMPOSITE_PRICE_TYPE_LAST_TRADE',
@@ -2165,9 +2209,9 @@ export type MarginEdge = {
 export type MarginEstimate = {
  __typename?: 'MarginEstimate';
  /** Margin level estimate assuming no slippage */
-  bestCase: MarginLevels;
+  bestCase: AbstractMarginLevels;
  /** Margin level estimate assuming slippage cap is applied */
-  worstCase: MarginLevels;
+  worstCase: AbstractMarginLevels;
 };

 /** Margins for a given a party */
@@ -2439,6 +2483,8 @@ export type MarketData = {
  liquidityProviderSla?: Maybe<Array<LiquidityProviderSLA>>;
  /** The mark price (an unsigned integer) */
  markPrice: Scalars['String'];
+  /** State of the underlying internal composite price */
+  markPriceState?: Maybe<CompositePriceState>;
  /** The methodology used for the calculation of the mark price */
  markPriceType: CompositePriceType;
  /** Market of the associated mark price */
@@ -3053,6 +3099,8 @@ export type ObservableMarketData = {
  liquidityProviderSla?: Maybe<Array<ObservableLiquidityProviderSLA>>;
  /** The mark price (an unsigned integer) */
  markPrice: Scalars['String'];
+  /** State of the underlying internal composite price */
+  markPriceState?: Maybe<CompositePriceState>;
  /** The methodology used to calculated mark price */
  markPriceType: CompositePriceType;
  /** The market growth factor for the last market time window */
@@ -4021,6 +4069,8 @@ export type PerpetualData = {
  fundingRate?: Maybe<Scalars['String']>;
  /** Internal composite price used as input to the internal VWAP */
  internalCompositePrice: Scalars['String'];
+  /** The internal state of the underlying internal composite price */
+  internalCompositePriceState?: Maybe<CompositePriceState>;
  /** The methodology used to calculated internal composite price for perpetual markets */
  internalCompositePriceType: CompositePriceType;
  /** Time-weighted average price calculated from data points for this period from the internal data source. */
@@ -4031,6 +4081,8 @@ export type PerpetualData = {
  seqNum: Scalars['Int'];
  /** Time at which the funding period started */
  startTime: Scalars['Timestamp'];
+  /** The last value from the external oracle */
+  underlyingIndexPrice: Scalars['String'];
 };

 export type PerpetualProduct = {
@@ -4328,7 +4380,7 @@ export type ProposalDetail = {
  __typename?: 'ProposalDetail';
  /** Batch proposal ID that is provided by Vega once proposal reaches the network */
  batchId?: Maybe<Scalars['ID']>;
-  /** Terms of the proposal for a batch proposal */
+  /** Terms of all the proposals in the batch */
  batchTerms?: Maybe<BatchProposalTerms>;
  /** RFC3339Nano time and date when the proposal reached the Vega network */
  datetime: Scalars['Timestamp'];
@@ -4354,7 +4406,7 @@ export type ProposalDetail = {
  requiredParticipation: Scalars['String'];
  /** State of the proposal */
  state: ProposalState;
-  /** Terms of the proposal for proposal */
+  /** Terms of the proposal */
  terms?: Maybe<ProposalTerms>;
 };

@@ -1,12 +1,13 @@
-import type {
-  ConditionOperator,
-  EntityScope,
-  GovernanceTransferKind,
-  GovernanceTransferType,
-  IndividualScope,
-  PeggedReference,
-  ProposalChange,
-  TransferStatus,
+import {
+  type LiquidityFeeMethod,
+  type ConditionOperator,
+  type EntityScope,
+  type GovernanceTransferKind,
+  type GovernanceTransferType,
+  type IndividualScope,
+  type PeggedReference,
+  type ProposalChange,
+  type TransferStatus,
 } from './__generated__/types';
 import type { AccountType } from './__generated__/types';
 import type {
@@ -734,3 +735,23 @@ export const ProposalProductTypeShortName: Record<ProposalProductType, string> =
    SpotProduct: 'Spot',
    PerpetualProduct: 'Perp',
  };
+
+export const LiquidityFeeMethodMapping: { [e in LiquidityFeeMethod]: string } =
+  {
+    /** Fee is set by the market to a constant value irrespective of any liquidity provider's nominated fee */
+    METHOD_CONSTANT: 'Constant',
+    /** Fee is smallest value of all bids, such that liquidity providers with nominated fees less than or equal to this value still have sufficient commitment to fulfil the market's target stake. */
+    METHOD_MARGINAL_COST: 'Marginal cost',
+    METHOD_UNSPECIFIED: 'Unspecified',
+    /** Fee is the weighted average of all liquidity providers' nominated fees, weighted by their commitment */
+    METHOD_WEIGHTED_AVERAGE: 'Weighted average',
+  };
+
+export const LiquidityFeeMethodMappingDescription: {
+  [e in LiquidityFeeMethod]: string;
+} = {
+  METHOD_CONSTANT: `This liquidity fee is a constant value, set in the market parameters, and overrides the liquidity providers' nominated fees.`,
+  METHOD_MARGINAL_COST: `This liquidity fee factor is determined by sorting all LP fee bids from lowest to highest, with LPs' commitments tallied up to the point of fulfilling the market's target stake. The last LP's bid becomes the fee factor.`,
+  METHOD_UNSPECIFIED: 'Unspecified',
+  METHOD_WEIGHTED_AVERAGE: `This liquidity fee is the weighted average of all liquidity providers' nominated fees, weighted by their commitment.`,
+};
@@ -23,6 +23,7 @@ describe('number utils', () => {
    { v: new BigNumber(123000), d: 1, o: '12,300.0' },
    { v: new BigNumber(123001), d: 2, o: '1,230.01' },
    { v: new BigNumber(123001000), d: 2, o: '1,230,010.00' },
+    { v: '100000000000000000001', d: 18, o: '100.000000000000000001' },
  ])(
    'formats with addDecimalsFormatNumber given number correctly',
    ({ v, d, o }) => {
@@ -31,27 +32,10 @@ describe('number utils', () => {
  );

  it.each([
-    { v: new BigNumber(123000), d: 5, o: '1.23', q: 0.1 },
-    { v: new BigNumber(123000), d: 3, o: '123.00', q: 0.1 },
-    { v: new BigNumber(123000), d: 1, o: '12,300.00', q: 0.1 },
-    { v: new BigNumber(123001000), d: 2, o: '1,230,010.00', q: 0.1 },
-    { v: new BigNumber(123001), d: 2, o: '1,230.01', q: 100 },
-    { v: new BigNumber(123001), d: 2, o: '1,230.01', q: 0.1 },
-    { v: new BigNumber(123001), d: 2, o: '1,230.01', q: 1 },
-    {
-      v: BigNumber('123456789123456789'),
-      d: 10,
-      o: '12,345,678.91234568',
-      q: '0.00003846',
-    },
-    {
-      v: BigNumber('123456789123456789'),
-      d: 10,
-      o: '12,345,678.91234568',
-      q: '1',
-    },
-    // USDT / USDC
-    { v: new BigNumber(12345678), d: 6, o: '12.35', q: 1000000 },
+    { v: '1234000000000000000', d: 18, q: '1000000000000000000', o: '1.23' }, //vega
+    { v: '1235000000000000000', d: 18, q: '1000000000000000000', o: '1.24' }, //vega
+    { v: '1230012', d: 6, q: '1000000', o: '1.23' }, // USDT
+    { v: '1234560000000000000', d: 18, q: '500000000000000', o: '1.2346' }, // WEth
  ])(
    'formats with addDecimalsFormatNumberQuantum given number correctly',
    ({ v, d, o, q }) => {
@@ -1,5 +1,4 @@
 import { BigNumber } from 'bignumber.js';
-import isNil from 'lodash/isNil';
 import memoize from 'lodash/memoize';

 import { getUserLocale } from '../get-user-locale';
@@ -53,36 +52,36 @@ export function removeDecimal(
  return new BigNumber(value || 0).times(times).toFixed(0);
 }

-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
-export const getNumberFormat = memoize((digits: number) => {
-  if (isNil(digits) || digits < 0) {
-    return new Intl.NumberFormat(getUserLocale());
-  }
-  return new Intl.NumberFormat(getUserLocale(), {
-    minimumFractionDigits: Math.min(Math.max(0, digits), MIN_FRACTION_DIGITS),
-    maximumFractionDigits: Math.min(Math.max(0, digits), MAX_FRACTION_DIGITS),
-  });
-});
-
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
-export const getFixedNumberFormat = memoize((digits: number) => {
-  if (isNil(digits) || digits < 0) {
-    return new Intl.NumberFormat(getUserLocale());
-  }
-  return new Intl.NumberFormat(getUserLocale(), {
-    minimumFractionDigits: Math.min(Math.max(0, digits), MAX_FRACTION_DIGITS),
-    maximumFractionDigits: Math.min(Math.max(0, digits), MAX_FRACTION_DIGITS),
-  });
-});
-
 export const getDecimalSeparator = memoize(
  () =>
-    getNumberFormat(1)
+    new Intl.NumberFormat(getUserLocale())
      .formatToParts(1.1)
-      .find((part) => part.type === 'decimal')?.value
+      .find((part) => part.type === 'decimal')?.value ?? '.'
 );

-/** formatNumber will format the number with fixed decimals
+export const getGroupFormat = memoize(() => {
+  const parts = new Intl.NumberFormat(getUserLocale()).formatToParts(
+    100000000000.1
+  );
+  const groupSeparator = parts.find((part) => part.type === 'group')?.value;
+  const groupSize =
+    (groupSeparator &&
+      parts.reverse().find((part) => part.type === 'integer')?.value.length) ||
+    0;
+  return {
+    groupSize,
+    groupSeparator,
+  };
+});
+
+const getFormat = memoize(() => ({
+  decimalSeparator: getDecimalSeparator(),
+  ...getGroupFormat(),
+}));
+
+/**
+ * formatNumber will format the number with maximum number of decimals
+ * trailing zeros are removed but min(MIN_FRACTION_DIGITS, formatDecimals) decimal places will be kept
 * @param rawValue - should be a number that is not outside the safe range fail as in https://mikemcl.github.io/bignumber.js/#toN
 * @param formatDecimals - number of decimals to use
 */
@@ -90,7 +89,23 @@ export const formatNumber = (
  rawValue: string | number | BigNumber,
  formatDecimals = 0
 ) => {
-  return getNumberFormat(formatDecimals).format(Number(rawValue));
+  const decimalPlaces = Math.min(
+    Math.max(0, formatDecimals),
+    MAX_FRACTION_DIGITS
+  );
+  const format = getFormat();
+  const formatted = new BigNumber(rawValue).toFormat(decimalPlaces, format);
+  // if there are no decimal places just return formatted value
+  if (!decimalPlaces) {
+    return formatted;
+  }
+  // minimum number of decimal places to keep when removing trailing zeros
+  const minimumFractionDigits = Math.min(decimalPlaces, MIN_FRACTION_DIGITS);
+  const parts = formatted.split(format.decimalSeparator);
+  parts[1] = (parts[1] || '')
+    .replace(/0+$/, '')
+    .padEnd(minimumFractionDigits, '0');
+  return parts.join(format.decimalSeparator);
 };

 /** formatNumberFixed will format the number with fixed decimals
@@ -101,7 +116,10 @@ export const formatNumberFixed = (
  rawValue: string | number | BigNumber,
  formatDecimals = 0
 ) => {
-  return getFixedNumberFormat(formatDecimals).format(Number(rawValue));
+  return new BigNumber(rawValue).toFormat(
+    Math.min(Math.max(0, formatDecimals), MAX_FRACTION_DIGITS),
+    getFormat()
+  );
 };

 export const quantumDecimalPlaces = (
@@ -131,9 +149,14 @@ export const addDecimalsFormatNumberQuantum = (
  if (isNaN(Number(quantum))) {
    return addDecimalsFormatNumber(rawValue, decimalPlaces);
  }
-  const quantumValue = addDecimal(quantum, decimalPlaces);
-  const numberDP = Math.max(0, Math.log10(100 / Number(quantumValue)));
-  return addDecimalsFormatNumber(rawValue, decimalPlaces, Math.ceil(numberDP));
+  const numberDP = Math.ceil(
+    Math.abs(Math.log10(toBigNum(quantum, decimalPlaces).toNumber()))
+  );
+  return addDecimalsFormatNumber(
+    rawValue,
+    decimalPlaces,
+    Math.max(MIN_FRACTION_DIGITS, numberDP)
+  );
 };

 export const addDecimalsFormatNumber = (
@@ -141,9 +164,10 @@ export const addDecimalsFormatNumber = (
  decimalPlaces: number,
  formatDecimals: number = decimalPlaces
 ) => {
-  const x = addDecimal(rawValue, decimalPlaces);
-
-  return formatNumber(x, formatDecimals);
+  return formatNumber(
+    new BigNumber(rawValue || 0).dividedBy(Math.pow(10, decimalPlaces)),
+    formatDecimals
+  );
 };

 export const addDecimalsFixedFormatNumber = (
@@ -10,24 +10,24 @@ describe('formatValue', () => {
    {
      v: '123456789123456789',
      d: 10,
-      o: '12,345,678.91234568',
+      o: '12,345,678.9123456789',
    },
  ])('formats values correctly', ({ v, d, o }) => {
    expect(formatValue(v, d)).toStrictEqual(o);
  });

  it.each([
-    { v: 123000, d: 5, o: '1.23', q: '0.1' },
-    { v: 123000, d: 3, o: '123.00', q: '0.1' },
-    { v: 123000, d: 1, o: '12,300.00', q: '0.1' },
-    { v: 123001000, d: 2, o: '1,230,010.00', q: '0.1' },
+    { v: 123000, d: 5, o: '1.23', q: '1' },
+    { v: 123000, d: 3, o: '123.00', q: '1' },
+    { v: 123000, d: 1, o: '12,300.00', q: '1' },
+    { v: 123001000, d: 2, o: '1,230,010.00', q: '1' },
    { v: 123001, d: 2, o: '1,230.01', q: '100' },
-    { v: 123001, d: 2, o: '1,230.01', q: '0.1' },
+    { v: 123001, d: 2, o: '1,230.01', q: '1' },
    {
      v: '123456789123456789',
      d: 10,
-      o: '12,345,678.91234568',
-      q: '0.00003846',
+      o: '12,345,678.91235',
+      q: '384600',
    },
  ])(
    'formats with formatValue with quantum given number correctly',
@@ -42,15 +42,15 @@ describe('formatRange', () => {
      min: 123000,
      max: 12300011111,
      d: 5,
-      o: '1.23 - 123,000.11111',
-      q: '0.1',
+      o: '1.23 - 123,000.11',
+      q: '1000',
    },
    {
      min: 123000,
      max: 12300011111,
      d: 3,
-      o: '123.00 - 12,300,011.111',
-      q: '0.1',
+      o: '123.00 - 12,300,011.11',
+      q: '100',
    },
    {
      min: 123000,
@@ -41,7 +41,7 @@ const ethereumRequest = <T>(args: RequestArguments): Promise<T> => {

 export const LOCAL_SNAP_ID = 'local:http://localhost:8080';
 export const DEFAULT_SNAP_ID = 'npm:@vegaprotocol/snap';
-export const DEFAULT_SNAP_VERSION = '0.3.1';
+export const DEFAULT_SNAP_VERSION = '1.0.1';

 type GetSnapsResponse = Record<string, Snap>;

@@ -40,8 +40,6 @@

 ## Transfer

- **Must** display tooltip for "Transfer fee when hovered over.(<a name="1003-TRAN-017" href="#1003-TRAN-017">1003-TRAN-017</a>)
-
 - **Must** display tooltip for "Amount to be transferred" when hovered over.(<a name="1003-TRAN-018" href="#1003-TRAN-018">1003-TRAN-018</a>)

 - **Must** display tooltip for "Total amount (with fee)" when hovered over.(<a name="1003-TRAN-019" href="#1003-TRAN-019">1003-TRAN-019</a>)
Author	SHA1	Message	Date
Matthew Russell	a688041b4c	chore: upgrade to 1.0.1	2024-02-09 12:20:30 -08:00
Matthew Russell	50e6052427	chore: update snap to 1.0.0	2024-02-09 12:19:17 -08:00
m.rayandcandida-d	0d850bd8b9	feat(trading): add LP fee settings (#5773 ) Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>	2024-02-09 19:44:15 +00:00
Bartłomiej Głownia	44189591fc	feat(accounts): get trasfer fee from estimateTransferFee API (#5721 )	2024-02-09 12:55:17 +00:00
Art	3ed2ec88d7	chore(explorer): remove voting column from proposal table (#5776 )	2024-02-09 10:32:54 +00:00
Bartłomiej Głownia	a21feea699	chore(utils): improve formatNumber to keep precision (#5761 )	2024-02-09 10:31:15 +00:00
m.rayandMatthew Russell	41fd14dd00	feat(trading): mobile layout and buttons (#5751 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2024-02-09 10:30:24 +00:00
Edd	c5a27dc6a2	chore(trading): switch eth provider URL (#5779 )	2024-02-09 10:26:08 +00:00
Art	0a3b1cadba	fix(trading): keep leaderboard rank when filtering (#5775 )	2024-02-09 10:00:28 +01:00
Edd	b953de953a	feat(explorer): update party profile tx (#5719 )	2024-02-08 19:06:38 +00:00