feat(trading): update copy for reset dialog and jest

fix(trading): reset console to default
chore(deal-ticket): re-enable margin estimates for perps (#5317 )
2023-11-24 15:45:53 +00:00 · 2023-11-23 17:44:14 +00:00 · 2023-11-20 13:57:18 -08:00 · 2023-11-20 13:07:17 -08:00 · 2023-11-17 10:33:24 -08:00 · 2023-11-17 10:25:30 -08:00
57 changed files with 1407 additions and 872 deletions
@@ -52,3 +52,4 @@ cypress.env.json
 /apps/**/cypress/reports/
 /apps/**/cypress/downloads/
 /apps/**/fixtures/wallet/node**
+.nx/
@@ -133,7 +133,7 @@ export const proposalsData = {
              instrument: {
                name: 'UNIDAI Monthly (Dec 2022)',
                code: 'UNIDAI.MF21',
-                futureProduct: {
+                product: {
                  settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
                  __typename: 'FutureProduct',
                },
@@ -240,7 +240,7 @@ export const proposalsData = {
              instrument: {
                name: 'ETHBTC Quarterly (Feb 2023)',
                code: 'ETHBTC.QM21',
-                futureProduct: {
+                product: {
                  settlementAsset: { symbol: 'tBTC', __typename: 'Asset' },
                  __typename: 'FutureProduct',
                },
@@ -35,6 +35,5 @@ NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=false
 NX_UPDATE_MARKET_STATE=false
-NX_REFERRALS=false
+NX_REFERRALS=true
 NX_GOVERNANCE_TRANSFERS=false
-NX_VOLUME_DISCOUNTS=false
@@ -31,9 +31,8 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 CYPRESS_FAIRGROUND=false

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
-NX_VOLUME_DISCOUNTS=true
@@ -28,4 +28,3 @@ NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
-NX_VOLUME_DISCOUNTS=true
@@ -22,9 +22,8 @@ NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false
-NX_REFERRALS=false
-NX_VOLUME_DISCOUNTS=false
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true
@@ -21,9 +21,8 @@ NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false
-NX_REFERRALS=false
-NX_VOLUME_DISCOUNTS=false
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true
@@ -25,4 +25,3 @@ NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
 NX_GOVERNANCE_TRANSFERS=true
-NX_VOLUME_DISCOUNTS=true
@@ -29,4 +29,3 @@ NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
-NX_VOLUME_DISCOUNTS=true
@@ -20,9 +20,8 @@ NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false
-NX_REFERRALS=false
-NX_VOLUME_DISCOUNTS=false
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true
@@ -189,7 +189,6 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
      includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
-      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
    },
  });

@@ -77,7 +77,7 @@ describe('Proposal header', () => {
              __typename: 'InstrumentConfiguration',
              name: 'Some market',
              code: 'FX:BTCUSD/DEC99',
-              futureProduct: {
+              product: {
                __typename: 'FutureProduct',
                settlementAsset: {
                  __typename: 'Asset',
@@ -39,6 +39,18 @@ export const ProposalHeader = ({

  const titleContent = shorten(title ?? '', 100);

+  const getAsset = (proposal: ProposalQuery['proposal']) => {
+    const terms = proposal?.terms;
+    if (
+      terms?.change.__typename === 'NewMarket' &&
+      (terms.change.instrument.product?.__typename === 'FutureProduct' ||
+        terms.change.instrument.product?.__typename === 'PerpetualProduct')
+    ) {
+      return terms.change.instrument.product.settlementAsset;
+    }
+    return undefined;
+  };
+
  switch (change?.__typename) {
    case 'NewMarket': {
      proposalType =
@@ -54,10 +66,10 @@ export const ProposalHeader = ({
          <span>
            {t('Code')}: {change.instrument.code}.
          </span>{' '}
-          {change.instrument.futureProduct?.settlementAsset.symbol ? (
+          {proposal?.terms && getAsset(proposal)?.symbol ? (
            <>
              <span className="font-semibold">
-                {change.instrument.futureProduct.settlementAsset.symbol}
+                {getAsset(proposal)?.symbol}
              </span>{' '}
              {t('settled future')}.
            </>
@@ -78,7 +78,7 @@ export const ProposalVolumeDiscountProgramDetails = ({
              {t('BenefitTiers')}
            </h3>
            <KeyValueTable>
-              {benefitTiers
+              {[...benefitTiers]
                .sort(
                  (a, b) =>
                    Number(a.minimumRunningNotionalTakerVolume) -
@@ -84,7 +84,6 @@ query Proposal(
  $includeNewMarketProductField: Boolean!
  $includeUpdateMarketState: Boolean!
  $includeUpdateReferralProgram: Boolean!
-  $includeUpdateVolumeDiscountProgram: Boolean!
 ) {
  proposal(id: $proposalId) {
    id
@@ -104,7 +103,6 @@ query Proposal(
    ...UpdateMarketState @include(if: $includeUpdateMarketState)
    ...UpdateReferralProgram @include(if: $includeUpdateReferralProgram)
    ...UpdateVolumeDiscountProgram
-      @include(if: $includeUpdateVolumeDiscountProgram)
    terms {
      closingDatetime
      enactmentDatetime
@@ -132,46 +130,25 @@ query Proposal(
          instrument {
            name
            code
-            futureProduct {
-              settlementAsset {
-                id
-                name
-                symbol
-                decimals
-                quantum
-              }
-              quoteName
-
-              dataSourceSpecForSettlementData {
-                sourceType {
-                  ... on DataSourceDefinitionInternal {
-                    sourceType {
-                      ... on DataSourceSpecConfigurationTime {
-                        conditions {
-                          operator
-                          value
-                        }
-                      }
-                    }
-                  }
-                  ... on DataSourceDefinitionExternal {
-                    sourceType {
-                      ... on DataSourceSpecConfiguration {
-                        signers {
-                          signer {
-                            ... on PubKey {
-                              key
-                            }
-                            ... on ETHAddress {
-                              address
-                            }
-                          }
-                        }
-                        filters {
-                          key {
-                            name
-                            type
-                          }
+            product {
+              ... on FutureProduct {
+                settlementAsset {
+                  id
+                  name
+                  symbol
+                  decimals
+                  quantum
+                }
+                quoteName
+                dataSourceSpecBinding {
+                  settlementDataProperty
+                  tradingTerminationProperty
+                }
+                dataSourceSpecForSettlementData {
+                  sourceType {
+                    ... on DataSourceDefinitionInternal {
+                      sourceType {
+                        ... on DataSourceSpecConfigurationTime {
                          conditions {
                            operator
                            value
@@ -179,52 +156,44 @@ query Proposal(
                        }
                      }
                    }
+                    ... on DataSourceDefinitionExternal {
+                      sourceType {
+                        ... on DataSourceSpecConfiguration {
+                          signers {
+                            signer {
+                              ... on PubKey {
+                                key
+                              }
+                              ... on ETHAddress {
+                                address
+                              }
+                            }
+                          }
+                          filters {
+                            key {
+                              name
+                              type
+                            }
+                            conditions {
+                              operator
+                              value
+                            }
+                          }
+                        }
+                      }
+                    }
                  }
                }
              }
-              # dataSourceSpecForTradingTermination {
-              #   sourceType {
-              #     ... on DataSourceDefinitionInternal {
-              #       sourceType {
-              #         ... on DataSourceSpecConfigurationTime {
-              #           conditions {
-              #             operator
-              #             value
-              #           }
-              #         }
-              #       }
-              #     }
-              #     ... on DataSourceDefinitionExternal {
-              #       sourceType {
-              #         ... on DataSourceSpecConfiguration {
-              #           signers {
-              #             signer {
-              #               ... on PubKey {
-              #                 key
-              #               }
-              #               ... on ETHAddress {
-              #                 address
-              #               }
-              #             }
-              #           }
-              #           filters {
-              #             key {
-              #               name
-              #               type
-              #             }
-              #             conditions {
-              #               operator
-              #               value
-              #             }
-              #           }
-              #         }
-              #       }
-              #     }
-              #   }
-              # }
-              dataSourceSpecBinding {
-                settlementDataProperty
-                tradingTerminationProperty
+              ... on PerpetualProduct {
+                settlementAsset {
+                  id
+                  name
+                  symbol
+                  decimals
+                  quantum
+                }
+                quoteName
              }
            }
          }
@@ -62,7 +62,6 @@ export const ProposalContainer = () => {
      includeNewMarketProductField: !!FLAGS.PRODUCT_PERPETUALS,
      includeUpdateMarketState: !!FLAGS.UPDATE_MARKET_STATE,
      includeUpdateReferralProgram: !!FLAGS.REFERRALS,
-      includeUpdateVolumeDiscountProgram: !!FLAGS.VOLUME_DISCOUNTS,
    },
    skip: !params.proposalId,
  });
@@ -101,9 +101,16 @@ fragment ProposalFields on Proposal {
        instrument {
          name
          code
-          futureProduct {
-            settlementAsset {
-              symbol
+          product {
+            ... on FutureProduct {
+              settlementAsset {
+                symbol
+              }
+            }
+            ... on PerpetualProduct {
+              settlementAsset {
+                symbol
+              }
            }
          }
        }
@@ -164,7 +171,6 @@ query Proposals(
  $includeNewMarketProductFields: Boolean!
  $includeUpdateMarketStates: Boolean!
  $includeUpdateReferralPrograms: Boolean!
-  $includeUpdateVolumeDiscountPrograms: Boolean!
 ) {
  proposalsConnection {
    edges {
@@ -174,7 +180,6 @@ query Proposals(
        ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
        ...UpdateReferralPrograms @include(if: $includeUpdateReferralPrograms)
        ...UpdateVolumeDiscountPrograms
-          @include(if: $includeUpdateVolumeDiscountPrograms)
      }
    }
  }
@@ -11,17 +11,16 @@ export type UpdateReferralProgramsFragment = { __typename?: 'Proposal', terms: {

 export type UpdateVolumeDiscountProgramsFragment = { __typename?: 'Proposal', terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } } };

-export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };
+export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, product?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename?: 'PerpetualProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename?: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };

 export type ProposalsQueryVariables = Types.Exact<{
  includeNewMarketProductFields: Types.Scalars['Boolean'];
  includeUpdateMarketStates: Types.Scalars['Boolean'];
  includeUpdateReferralPrograms: Types.Scalars['Boolean'];
-  includeUpdateVolumeDiscountPrograms: Types.Scalars['Boolean'];
 }>;


-export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null, product?: { __typename: 'FutureProduct' } | { __typename: 'PerpetualProduct' } | { __typename: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState', updateType: Types.MarketUpdateType, price?: string | null, market: { __typename?: 'Market', decimalPlaces: number, id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, product: { __typename: 'Future', quoteName: string } | { __typename: 'Perpetual', quoteName: string } | { __typename: 'Spot' } } } } } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram', windowLength: number, endOfProgram: any, benefitTiers: Array<{ __typename?: 'BenefitTier', minimumEpochs: number, minimumRunningNotionalTakerVolume: string, referralDiscountFactor: string, referralRewardFactor: string }>, stakingTiers: Array<{ __typename?: 'StakingTier', minimumStakedTokens: string, referralRewardMultiplier: string }> } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };
+export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, product?: { __typename: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename: 'PerpetualProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState', updateType: Types.MarketUpdateType, price?: string | null, market: { __typename?: 'Market', decimalPlaces: number, id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, product: { __typename: 'Future', quoteName: string } | { __typename: 'Perpetual', quoteName: string } | { __typename: 'Spot' } } } } } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram', windowLength: number, endOfProgram: any, benefitTiers: Array<{ __typename?: 'BenefitTier', minimumEpochs: number, minimumRunningNotionalTakerVolume: string, referralDiscountFactor: string, referralRewardFactor: string }>, stakingTiers: Array<{ __typename?: 'StakingTier', minimumStakedTokens: string, referralRewardMultiplier: string }> } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };

 export const NewMarketProductFieldsFragmentDoc = gql`
    fragment NewMarketProductFields on Proposal {
@@ -131,9 +130,16 @@ export const ProposalFieldsFragmentDoc = gql`
        instrument {
          name
          code
-          futureProduct {
-            settlementAsset {
-              symbol
+          product {
+            ... on FutureProduct {
+              settlementAsset {
+                symbol
+              }
+            }
+            ... on PerpetualProduct {
+              settlementAsset {
+                symbol
+              }
            }
          }
        }
@@ -191,7 +197,7 @@ export const ProposalFieldsFragmentDoc = gql`
 }
    `;
 export const ProposalsDocument = gql`
-    query Proposals($includeNewMarketProductFields: Boolean!, $includeUpdateMarketStates: Boolean!, $includeUpdateReferralPrograms: Boolean!, $includeUpdateVolumeDiscountPrograms: Boolean!) {
+    query Proposals($includeNewMarketProductFields: Boolean!, $includeUpdateMarketStates: Boolean!, $includeUpdateReferralPrograms: Boolean!) {
  proposalsConnection {
    edges {
      node {
@@ -199,7 +205,7 @@ export const ProposalsDocument = gql`
        ...NewMarketProductFields @include(if: $includeNewMarketProductFields)
        ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
        ...UpdateReferralPrograms @include(if: $includeUpdateReferralPrograms)
-        ...UpdateVolumeDiscountPrograms @include(if: $includeUpdateVolumeDiscountPrograms)
+        ...UpdateVolumeDiscountPrograms
      }
    }
  }
@@ -225,7 +231,6 @@ ${UpdateVolumeDiscountProgramsFragmentDoc}`;
 *      includeNewMarketProductFields: // value for 'includeNewMarketProductFields'
 *      includeUpdateMarketStates: // value for 'includeUpdateMarketStates'
 *      includeUpdateReferralPrograms: // value for 'includeUpdateReferralPrograms'
- *      includeUpdateVolumeDiscountPrograms: // value for 'includeUpdateVolumeDiscountPrograms'
 *   },
 * });
 */
@@ -50,7 +50,6 @@ export const ProposalsContainer = () => {
      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
      includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
-      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
    },
  });

@@ -42,7 +42,6 @@ export const RejectedProposalsContainer = () => {
      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
      includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
-      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
    },
  });

@@ -1,7 +1,5 @@
-import { Route, Routes, useParams } from 'react-router-dom';
-import { MarketState } from '@vegaprotocol/types';
+import { Route, Routes } from 'react-router-dom';
 import { t } from '@vegaprotocol/i18n';
-import { useMarket } from '@vegaprotocol/markets';
 import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import {
  SidebarButton,
@@ -11,12 +9,7 @@ import {
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 export const MarketsSidebar = () => {
-  const { marketId } = useParams();
  const currentRouteId = useGetCurrentRouteId();
-  const { data } = useMarket(marketId);
-  const active =
-    data &&
-    [MarketState.STATE_ACTIVE, MarketState.STATE_PENDING].includes(data.state);

  return (
    <>
@@ -44,14 +37,12 @@ export const MarketsSidebar = () => {
          element={
            <>
              <SidebarDivider />
-              {active && (
-                <SidebarButton
-                  view={ViewType.Order}
-                  icon={VegaIconNames.TICKET}
-                  tooltip={t('Order')}
-                  routeId={currentRouteId}
-                />
-              )}
+              <SidebarButton
+                view={ViewType.Order}
+                icon={VegaIconNames.TICKET}
+                tooltip={t('Order')}
+                routeId={currentRouteId}
+              />
              <SidebarButton
                view={ViewType.Info}
                icon={VegaIconNames.BREAKDOWN}
@@ -8,7 +8,7 @@ jest.mock('@vegaprotocol/accounts', () => ({
  ),
 }));

-jest.mock('../../components/welcome-dialog/get-started.ts', () => ({
+jest.mock('../../components/welcome-dialog/get-started', () => ({
  GetStarted: () => <div>GetStarted</div>,
 }));

@@ -8,7 +8,7 @@ jest.mock('../../components/withdraw-container', () => ({
  ),
 }));

-jest.mock('../../components/welcome-dialog/get-started.ts', () => ({
+jest.mock('../../components/welcome-dialog/get-started', () => ({
  GetStarted: () => <div>GetStarted</div>,
 }));

@@ -36,6 +36,22 @@ query Fees(
      }
    }
  }
+  referrer: referralSets(referrer: $partyId) {
+    edges {
+      node {
+        id
+        referrer
+      }
+    }
+  }
+  referee: referralSets(referee: $partyId) {
+    edges {
+      node {
+        id
+        referrer
+      }
+    }
+  }
  referralSetReferees(referee: $partyId) {
    edges {
      node {
@@ -15,7 +15,7 @@ export type FeesQueryVariables = Types.Exact<{
 }>;


-export type FeesQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string }, volumeDiscountStats: { __typename?: 'VolumeDiscountStatsConnection', edges: Array<{ __typename?: 'VolumeDiscountStatsEdge', node: { __typename?: 'VolumeDiscountStats', atEpoch: number, discountFactor: string, runningVolume: string } } | null> }, referralSetReferees: { __typename?: 'ReferralSetRefereeConnection', edges: Array<{ __typename?: 'ReferralSetRefereeEdge', node: { __typename?: 'ReferralSetReferee', atEpoch: number } } | null> }, referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, discountFactor: string, referralSetRunningNotionalTakerVolume: string } } | null> } };
+export type FeesQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string }, volumeDiscountStats: { __typename?: 'VolumeDiscountStatsConnection', edges: Array<{ __typename?: 'VolumeDiscountStatsEdge', node: { __typename?: 'VolumeDiscountStats', atEpoch: number, discountFactor: string, runningVolume: string } } | null> }, referrer: { __typename?: 'ReferralSetConnection', edges: Array<{ __typename?: 'ReferralSetEdge', node: { __typename?: 'ReferralSet', id: string, referrer: string } } | null> }, referee: { __typename?: 'ReferralSetConnection', edges: Array<{ __typename?: 'ReferralSetEdge', node: { __typename?: 'ReferralSet', id: string, referrer: string } } | null> }, referralSetReferees: { __typename?: 'ReferralSetRefereeConnection', edges: Array<{ __typename?: 'ReferralSetRefereeEdge', node: { __typename?: 'ReferralSetReferee', atEpoch: number } } | null> }, referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, discountFactor: string, referralSetRunningNotionalTakerVolume: string } } | null> } };


 export const DiscountProgramsDocument = gql`
@@ -81,6 +81,22 @@ export const FeesDocument = gql`
      }
    }
  }
+  referrer: referralSets(referrer: $partyId) {
+    edges {
+      node {
+        id
+        referrer
+      }
+    }
+  }
+  referee: referralSets(referee: $partyId) {
+    edges {
+      node {
+        id
+        referrer
+      }
+    }
+  }
  referralSetReferees(referee: $partyId) {
    edges {
      node {
@@ -17,6 +17,14 @@ import { useReferralStats } from './use-referral-stats';
 import { formatPercentage, getAdjustedFee } from './utils';
 import { Table, Td, Th, THead, Tr } from './table';
 import BigNumber from 'bignumber.js';
+import { Links } from '../../lib/links';
+import { Link } from 'react-router-dom';
+import {
+  Tooltip,
+  VegaIcon,
+  VegaIconNames,
+  truncateMiddle,
+} from '@vegaprotocol/ui-toolkit';

 export const FeesContainer = () => {
  const { pubKey } = useVegaWallet();
@@ -56,16 +64,25 @@ export const FeesContainer = () => {
    referralTierIndex,
    referralTiers,
    epochsInSet,
+    code,
+    isReferrer,
  } = useReferralStats(
    feesData?.referralSetStats,
    feesData?.referralSetReferees,
    programData?.currentReferralProgram,
-    feesData?.epoch
+    feesData?.epoch,
+    feesData?.referrer,
+    feesData?.referee
  );

  const loading = paramsLoading || feesLoading || programLoading;
  const isConnected = Boolean(pubKey);

+  const isReferralProgramRunning = Boolean(programData?.currentReferralProgram);
+  const isVolumeDiscountProgramRunning = Boolean(
+    programData?.currentVolumeDiscountProgram
+  );
+
  return (
    <div className="grid auto-rows-min grid-cols-4 gap-3">
      {isConnected && (
@@ -90,6 +107,8 @@ export const FeesContainer = () => {
            <TotalDiscount
              referralDiscount={referralDiscount}
              volumeDiscount={volumeDiscount}
+              isReferralProgramRunning={isReferralProgramRunning}
+              isVolumeDiscountProgramRunning={isVolumeDiscountProgramRunning}
            />
          </FeeCard>
          <FeeCard
@@ -97,23 +116,37 @@ export const FeesContainer = () => {
            className="sm:col-span-2"
            loading={loading}
          >
-            <CurrentVolume
-              tiers={volumeTiers}
-              tierIndex={volumeTierIndex}
-              windowLengthVolume={volumeInWindow}
-              windowLength={volumeDiscountWindowLength}
-            />
+            {isVolumeDiscountProgramRunning ? (
+              <CurrentVolume
+                tiers={volumeTiers}
+                tierIndex={volumeTierIndex}
+                windowLengthVolume={volumeInWindow}
+                windowLength={volumeDiscountWindowLength}
+              />
+            ) : (
+              <p className="pt-3 text-sm text-muted">
+                {t('No volume discount program active')}
+              </p>
+            )}
          </FeeCard>
          <FeeCard
            title={t('Referral benefits')}
            className="sm:col-span-2"
            loading={loading}
          >
-            <ReferralBenefits
-              setRunningNotionalTakerVolume={referralVolumeInWindow}
-              epochsInSet={epochsInSet}
-              epochs={referralDiscountWindowLength}
-            />
+            {isReferrer ? (
+              <ReferrerInfo code={code} />
+            ) : isReferralProgramRunning ? (
+              <ReferralBenefits
+                setRunningNotionalTakerVolume={referralVolumeInWindow}
+                epochsInSet={epochsInSet}
+                epochs={referralDiscountWindowLength}
+              />
+            ) : (
+              <p className="pt-3 text-sm text-muted">
+                {t('No referral program active')}
+              </p>
+            )}
          </FeeCard>
        </>
      )}
@@ -142,7 +175,7 @@ export const FeesContainer = () => {
        />
      </FeeCard>
      <FeeCard
-        title={t('Liquidity fees')}
+        title={t('Fees by market')}
        className="lg:col-span-full"
        loading={marketsLoading}
      >
@@ -325,26 +358,64 @@ const ReferralBenefits = ({
 const TotalDiscount = ({
  referralDiscount,
  volumeDiscount,
+  isReferralProgramRunning,
+  isVolumeDiscountProgramRunning,
 }: {
  referralDiscount: number;
  volumeDiscount: number;
+  isReferralProgramRunning: boolean;
+  isVolumeDiscountProgramRunning: boolean;
 }) => {
+  const totalDiscount = 1 - (1 - volumeDiscount) * (1 - referralDiscount);
+  const totalDiscountDescription = t(
+    'The total discount is calculated according to the following formula: '
+  );
+  const formula = (
+    <span className="italic">
+      1 - (1 - d<sub>volume</sub>) ⋇ (1 - d<sub>referral</sub>)
+    </span>
+  );
+
  return (
    <div>
      <Stat
-        value={formatPercentage(referralDiscount + volumeDiscount) + '%'}
+        description={
+          <>
+            {totalDiscountDescription}
+            {formula}
+          </>
+        }
+        value={formatPercentage(totalDiscount) + '%'}
        highlight={true}
      />
      <table className="w-full mt-0.5 text-xs text-muted">
        <tbody>
          <tr>
            <th className="font-normal text-left">{t('Volume discount')}</th>
-            <td className="text-right">{formatPercentage(volumeDiscount)}%</td>
+            <td className="text-right">
+              {formatPercentage(volumeDiscount)}%
+              {!isVolumeDiscountProgramRunning && (
+                <Tooltip description={t('No active volume discount programme')}>
+                  <span className="cursor-help">
+                    {' '}
+                    <VegaIcon name={VegaIconNames.INFO} size={12} />
+                  </span>
+                </Tooltip>
+              )}
+            </td>
          </tr>
          <tr>
            <th className="font-normal text-left ">{t('Referral discount')}</th>
            <td className="text-right">
              {formatPercentage(referralDiscount)}%
+              {!isReferralProgramRunning && (
+                <Tooltip description={t('No active referral programme')}>
+                  <span className="cursor-help">
+                    {' '}
+                    <VegaIcon name={VegaIconNames.INFO} size={12} />
+                  </span>
+                </Tooltip>
+              )}
            </td>
          </tr>
        </tbody>
@@ -491,3 +562,31 @@ const YourTier = () => {
    </span>
  );
 };
+
+const ReferrerInfo = ({ code }: { code?: string }) => (
+  <div className="pt-3 text-sm text-vega-clight-200 dark:vega-cdark-200">
+    <p className="mb-1">
+      {t('Connected key is owner of the referral set')}
+      {code && (
+        <>
+          {' '}
+          <span className="text-transparent bg-rainbow bg-clip-text">
+            {truncateMiddle(code)}
+          </span>
+        </>
+      )}
+      {'. '}
+      {t('As owner, it is eligible for commission not fee discounts.')}
+    </p>
+    <p>
+      {t('See')}{' '}
+      <Link
+        className="underline text-black dark:text-white"
+        to={Links.REFERRALS()}
+      >
+        {t('Referrals')}
+      </Link>{' '}
+      {t('for more information.')}
+    </p>
+  </div>
+);
@@ -1,23 +1,31 @@
+import { Tooltip } from '@vegaprotocol/ui-toolkit';
 import classNames from 'classnames';
+import type { ReactNode } from 'react';

 export const Stat = ({
  value,
  text,
  highlight,
+  description,
 }: {
  value: string | number;
  text?: string;
  highlight?: boolean;
+  description?: ReactNode;
 }) => {
+  const val = (
+    <span
+      className={classNames('inline-block text-3xl leading-none', {
+        'text-transparent bg-rainbow bg-clip-text': highlight,
+        'cursor-help': description,
+      })}
+    >
+      {value}
+    </span>
+  );
  return (
    <p className="pt-3 leading-none first:pt-6">
-      <span
-        className={classNames('inline-block text-3xl leading-none', {
-          'text-transparent bg-rainbow bg-clip-text': highlight,
-        })}
-      >
-        {value}
-      </span>
+      {description ? <Tooltip description={description}>{val}</Tooltip> : val}
      {text && (
        <small className="block mt-0.5 text-xs text-muted">{text}</small>
      )}
@@ -73,6 +73,8 @@ describe('useReferralStats', () => {
      referralTierIndex: -1,
      referralTiers: [],
      epochsInSet: 0,
+      code: undefined,
+      isReferrer: false,
    });
  });

@@ -93,6 +95,8 @@ describe('useReferralStats', () => {
      referralTierIndex: 1,
      referralTiers: program.benefitTiers,
      epochsInSet: Number(epoch.id) - set.atEpoch,
+      code: undefined,
+      isReferrer: false,
    });
  });

@@ -2,12 +2,15 @@ import compact from 'lodash/compact';
 import maxBy from 'lodash/maxBy';
 import { getReferralBenefitTier } from './utils';
 import type { DiscountProgramsQuery, FeesQuery } from './__generated__/Fees';
+import { first } from 'lodash';

 export const useReferralStats = (
  setStats?: FeesQuery['referralSetStats'],
  setReferees?: FeesQuery['referralSetReferees'],
  program?: DiscountProgramsQuery['currentReferralProgram'],
-  epoch?: FeesQuery['epoch']
+  epoch?: FeesQuery['epoch'],
+  setIfReferrer?: FeesQuery['referrer'],
+  setIfReferee?: FeesQuery['referee']
 ) => {
  const referralTiers = program?.benefitTiers || [];

@@ -18,9 +21,18 @@ export const useReferralStats = (
      referralTierIndex: -1,
      referralTiers,
      epochsInSet: 0,
+      code: undefined,
+      isReferrer: false,
    };
  }

+  const setIfReferrerData = first(
+    compact(setIfReferrer?.edges).map((e) => e.node)
+  );
+  const setIfRefereeData = first(
+    compact(setIfReferee?.edges).map((e) => e.node)
+  );
+
  const referralSetsStats = compact(setStats.edges).map((e) => e.node);
  const referralSets = compact(setReferees.edges).map((e) => e.node);

@@ -48,5 +60,7 @@ export const useReferralStats = (
    referralTierIndex,
    referralTiers,
    epochsInSet,
+    code: (setIfReferrerData || setIfRefereeData)?.id,
+    isReferrer: Boolean(setIfReferrerData),
  };
 };
@@ -21,7 +21,7 @@ describe('getAdjustedFee', () => {
      new BigNumber(referralDiscount),
    ];

-    // 1 - 0.5 - 0.5
+    // 1 - 0.5 = 0.5
    const v = new BigNumber(1).minus(new BigNumber(volumeDiscount));

    // 1 - 0.5 = 0.5
@@ -34,13 +34,15 @@ describe('getAdjustedFee', () => {
    // 0.1 + 0.1 + 0.1 = 0.3
    const totalFees = fees.reduce((sum, x) => sum.plus(x), new BigNumber(0));

-    // 0.3 * 0.75 = 0.225
-    const expected = new BigNumber(totalFees).times(factor).toNumber();
+    // (1 - 0.3) * 0.75 = 0.525
+    const expected = new BigNumber(totalFees)
+      .times(new BigNumber(1).minus(factor))
+      .toNumber();

    expect(getAdjustedFee(fees, discounts)).toBe(expected);
  });

-  it('combines discount factors multiplicativly', () => {
+  it('combines discount factors multiplicatively', () => {
    const volumeDiscount = 0.4;
    const referralDiscount = 0.1;

@@ -67,7 +69,9 @@ describe('getAdjustedFee', () => {
    // summed fees
    const totalFees = fees.reduce((sum, x) => sum.plus(x), new BigNumber(0));

-    const expected = new BigNumber(totalFees).times(factor).toNumber();
+    const expected = new BigNumber(totalFees)
+      .times(new BigNumber(1).minus(factor))
+      .toNumber();

    expect(getAdjustedFee(fees, discounts)).toBe(expected);
  });
@@ -12,7 +12,9 @@ export const formatPercentage = (num: number) => {
  const pct = new BigNumber(num).times(100);
  const dps = pct.decimalPlaces();
  const formatter = new Intl.NumberFormat(getUserLocale(), {
-    minimumFractionDigits: dps || 0,
+    // set to 0 in order to remove the "trailing zeroes" for numbers such as:
+    // 0.123456789 -non-zero-min-> 12.3456800% -zero-min-> 12.34568%
+    minimumFractionDigits: 0,
    maximumFractionDigits: dps || 0,
  });
  return formatter.format(parseFloat(pct.toFixed(5)));
@@ -101,5 +103,7 @@ export const getAdjustedFee = (fees: BigNumber[], discounts: BigNumber[]) => {

  const totalFactor = new BigNumber(1).minus(combinedFactors);

-  return totalFee.times(BigNumber.max(0, totalFactor)).toNumber();
+  return totalFee
+    .times(new BigNumber(1).minus(BigNumber.max(0, totalFactor)))
+    .toNumber();
 };
@@ -0,0 +1,12 @@
+import { Settings } from './settings';
+import { render, screen } from '@testing-library/react';
+
+describe('Settings', () => {
+  it('should the settings component with all the options', () => {
+    render(<Settings />);
+    expect(screen.getByText('Dark mode')).toBeInTheDocument();
+    expect(screen.getByText('Share usage data')).toBeInTheDocument();
+    expect(screen.getByText('Toast location')).toBeInTheDocument();
+    expect(screen.getByText('Reset to default')).toBeInTheDocument();
+  });
+});
@@ -1,12 +1,19 @@
 import { t } from '@vegaprotocol/i18n';
-import { Switch, ToastPositionSetter } from '@vegaprotocol/ui-toolkit';
+import {
+  Dialog,
+  Intent,
+  Switch,
+  ToastPositionSetter,
+  TradingButton,
+} from '@vegaprotocol/ui-toolkit';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { useTelemetryApproval } from '../../lib/hooks/use-telemetry-approval';
-import type { ReactNode } from 'react';
+import { useState, type ReactNode } from 'react';

 export const Settings = () => {
  const { theme, setTheme } = useThemeSwitcher();
  const [isApproved, setIsApproved] = useTelemetryApproval();
+  const [open, setOpen] = useState(false);
  return (
    <div>
      <SettingsGroup label={t('Dark mode')}>
@@ -31,6 +38,52 @@ export const Settings = () => {
      <SettingsGroup label={t('Toast location')}>
        <ToastPositionSetter />
      </SettingsGroup>
+      <SettingsGroup label={t('Reset to default')}>
+        <TradingButton
+          name="reset-to-defaults"
+          size="small"
+          intent={Intent.None}
+          onClick={() => {
+            setOpen(true);
+          }}
+        >
+          {t('Reset')}
+        </TradingButton>
+        <Dialog open={open} title={t('Reset')}>
+          <div className="mb-4">
+            <p>
+              {t(
+                'You will lose all persisted settings and you will be logged out.'
+              )}
+            </p>
+            <p>
+              {t('Are you sure you want to reset all settings to default?')}
+            </p>
+          </div>
+
+          <div className="flex flex-col gap-4">
+            <TradingButton
+              name="reset-to-defaults-cancel"
+              intent={Intent.Primary}
+              onClick={() => {
+                localStorage.clear();
+                window.location.reload();
+              }}
+            >
+              {t('Yes, clear cache and refresh')}
+            </TradingButton>
+            <TradingButton
+              name="reset-to-defaults-cancel"
+              intent={Intent.None}
+              onClick={() => {
+                setOpen(false);
+              }}
+            >
+              {t('No, keep settings')}
+            </TradingButton>
+          </div>
+        </Dialog>
+      </SettingsGroup>
    </div>
  );
 };
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 yarn --pure-lockfile
 app=${1:-trading}
-envCmd="envCmd="yarn env-cmd -f ./apps/${app}/.env.${2:-mainnet}"
+envCmd="envCmd="yarn -f ./apps/${app}/.env.${2:-mainnet}"
 yarn install
 if [ "${app}" = "trading" ]; then
  $envCmd yarn nx export trading
-  DIST_LOCATION=dist/apps/trading/exported
+  DIST_LOCATION=dist/apps/trading/exported/
 else
  $envCmd yarn nx build ${app}
  DIST_LOCATION=dist/apps/${app}
@@ -1,10 +1,23 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, render, screen, within } from '@testing-library/react';
 import * as Types from '@vegaprotocol/types';
 import type { AccountFields } from './accounts-data-provider';
 import { getAccountData } from './accounts-data-provider';
 import { AccountTable } from './accounts-table';
 import userEvent from '@testing-library/user-event';
-
+const asset1 = {
+  __typename: 'Asset',
+  id: 'asset-1',
+  symbol: 'tBTC',
+  decimals: 5,
+  name: 'T BTC',
+};
+const asset2 = {
+  __typename: 'Asset',
+  id: 'asset-2',
+  symbol: 'aBTC',
+  decimals: 5,
+  name: 'A BTC',
+};
 const singleRow = {
  __typename: 'AccountBalance',
  type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
@@ -13,12 +26,7 @@ const singleRow = {
    __typename: 'Market',
    id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
  },
-  asset: {
-    __typename: 'Asset',
-    id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-    symbol: 'tBTC',
-    decimals: 5,
-  },
+  asset: asset1,
  available: '125600000',
  used: '125600000',
  total: '251200000',
@@ -33,12 +41,7 @@ const secondRow = {
    __typename: 'Market',
    id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
  },
-  asset: {
-    __typename: 'Asset',
-    id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-    symbol: 'aBTC',
-    decimals: 5,
-  },
+  asset: asset2,
  available: '125600001',
  used: '125600001',
  total: '251200002',
@@ -134,7 +137,7 @@ describe('AccountsTable', () => {

  it('should sort assets', async () => {
    // 7001-COLL-010
-    const { container } = render(
+    render(
      <AccountTable
        rowData={multiRowData}
        onClickAsset={() => null}
@@ -142,13 +145,13 @@ describe('AccountsTable', () => {
      />
    );

-    const headerCell = screen.getByText('Asset');
-    await userEvent.click(headerCell);
-    const rows = container.querySelectorAll(
-      '.ag-center-cols-container .ag-row'
-    );
-    expect(rows[0].textContent).toContain('aBTC');
-    expect(rows[1].textContent).toContain('tBTC');
+    const headerCell = screen
+      .getAllByRole('columnheader')
+      .find((h) => h?.getAttribute('col-id') === 'asset.symbol') as HTMLElement;
+
+    await userEvent.click(within(headerCell).getByText(/asset/i));
+
+    expect(headerCell).toHaveAttribute('aria-sort', 'ascending');
  });

  it('should apply correct formatting in view as user mode', async () => {
@@ -176,12 +179,7 @@ describe('AccountsTable', () => {
        rowData={singleRowData}
        onClickAsset={() => null}
        isReadOnly={false}
-        pinnedAsset={{
-          decimals: 5,
-          id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-          symbol: 'tBTC',
-          name: 'tBTC',
-        }}
+        pinnedAsset={asset1}
      />
    );
    await screen.findAllByRole('rowgroup');
@@ -213,23 +211,13 @@ describe('AccountsTable', () => {
    const result = getAccountData([singleRow]);
    const expected = [
      {
-        asset: {
-          __typename: 'Asset',
-          decimals: 5,
-          id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-          symbol: 'tBTC',
-        },
+        asset: asset1,
        available: '0',
        balance: '0',
        breakdown: [
          {
            __typename: 'AccountBalance',
-            asset: {
-              __typename: 'Asset',
-              decimals: 5,
-              id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-              symbol: 'tBTC',
-            },
+            asset: asset1,
            available: '0',
            balance: '125600000',
            total: '125600000',
@@ -1,9 +1,10 @@
+import sortBy from 'lodash/sortBy';
 import * as Schema from '@vegaprotocol/types';
 import { truncateByChars } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
  NetworkParams,
-  useNetworkParam,
+  useNetworkParams,
 } from '@vegaprotocol/network-parameters';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import type { Transfer } from '@vegaprotocol/wallet';
@@ -21,7 +22,11 @@ export const ALLOWED_ACCOUNTS = [

 export const TransferContainer = ({ assetId }: { assetId?: string }) => {
  const { pubKey, pubKeys } = useVegaWallet();
-  const { param } = useNetworkParam(NetworkParams.transfer_fee_factor);
+  const { params } = useNetworkParams([
+    NetworkParams.transfer_fee_factor,
+    NetworkParams.transfer_minTransferQuantumMultiple,
+  ]);
+
  const { data } = useDataProvider({
    dataProvider: accountsDataProvider,
    variables: { partyId: pubKey || '' },
@@ -40,6 +45,7 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
  const accounts = data
    ? data.filter((account) => ALLOWED_ACCOUNTS.includes(account.type))
    : [];
+  const sortedAccounts = sortBy(accounts, (a) => a.asset.symbol.toLowerCase());

  return (
    <>
@@ -59,9 +65,10 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
        pubKey={pubKey}
        pubKeys={pubKeys ? pubKeys?.map((pk) => pk.publicKey) : null}
        assetId={assetId}
-        feeFactor={param}
+        feeFactor={params.transfer_fee_factor}
+        minQuantumMultiple={params.transfer_minTransferQuantumMultiple}
        submitTransfer={transfer}
-        accounts={accounts}
+        accounts={sortedAccounts}
      />
    </>
  );
@@ -1,4 +1,10 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import {
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+  within,
+} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import BigNumber from 'bignumber.js';
 import {
@@ -7,20 +13,12 @@ import {
  TransferForm,
  type TransferFormProps,
 } from './transfer-form';
-import { AccountType } from '@vegaprotocol/types';
+import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
 import { removeDecimal } from '@vegaprotocol/utils';
-import { MockedProvider } from '@apollo/client/testing';

 describe('TransferForm', () => {
  const renderComponent = (props: TransferFormProps) => {
-    return render(
-      // Wrap with mock provider as the form will make queries to fetch the selected
-      // toVegaKey accounts. We don't test this for now but we need to wrap so that
-      // the component has access to the client
-      <MockedProvider>
-        <TransferForm {...props} />
-      </MockedProvider>
-    );
+    return render(<TransferForm {...props} />);
  };

  const submit = async () => {
@@ -47,20 +45,17 @@ describe('TransferForm', () => {
  };

  const amount = '100';
-  const pubKey =
-    '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680';
+  const pubKey = '1'.repeat(64);
  const asset = {
    id: 'eur',
    symbol: '€',
    name: 'EUR',
    decimals: 2,
+    quantum: '1',
  };
  const props = {
    pubKey,
-    pubKeys: [
-      pubKey,
-      'a4b6e3de5d7ef4e31ae1b090be49d1a2ef7bcefff60cccf7658a0d4922651cce',
-    ],
+    pubKeys: [pubKey, '2'.repeat(64)],
    feeFactor: '0.001',
    submitTransfer: jest.fn(),
    accounts: [
@@ -72,9 +67,10 @@ describe('TransferForm', () => {
      {
        type: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
        asset,
-        balance: '100000',
+        balance: '10000',
      },
    ],
+    minQuantumMultiple: '1',
  };

  it('form tooltips correctly displayed', async () => {
@@ -132,7 +128,7 @@ describe('TransferForm', () => {
    // 1003-TRAN-004
    renderComponent(props);
    await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(3); // pubkey is set as default value
+    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey is set as default value
    const toggle = screen.getByText('Enter manually');
    await userEvent.click(toggle);
    // has switched to input
@@ -145,12 +141,12 @@ describe('TransferForm', () => {
      screen.getByLabelText('To Vega key'),
      'invalid-address'
    );
-    expect(screen.getAllByTestId('input-error-text')[0]).toHaveTextContent(
+    expect(screen.getAllByTestId('input-error-text')[1]).toHaveTextContent(
      'Invalid Vega key'
    );
  });

-  it('validates fields and submits', async () => {
+  it('sends transfer from general accounts', async () => {
    // 1003-TRAN-002
    // 1003-TRAN-003
    // 1002-WITH-010
@@ -168,7 +164,7 @@ describe('TransferForm', () => {
    ]);

    await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(3); // pubkey is set as default value
+    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey is set as default value

    // Select a pubkey
    await userEvent.selectOptions(
@@ -181,15 +177,20 @@ describe('TransferForm', () => {

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

    const amountInput = screen.getByLabelText('Amount');

+    // Test use max button
+    await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
+    expect(amountInput).toHaveValue('1000.00');
+
    // Test amount validation
-    await userEvent.type(amountInput, '0.00000001');
+    await userEvent.clear(amountInput);
+    await userEvent.type(amountInput, '0.001'); // Below quantum multiple amount
    expect(
-      await screen.findByText('Value is below minimum')
+      await screen.findByText(/Amount below minimum requirement/)
    ).toBeInTheDocument();

    await userEvent.clear(amountInput);
@@ -210,7 +211,7 @@ describe('TransferForm', () => {
    await waitFor(() => {
      expect(props.submitTransfer).toHaveBeenCalledTimes(1);
      expect(props.submitTransfer).toHaveBeenCalledWith({
-        fromAccountType: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
+        fromAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
        toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
        to: props.pubKeys[1],
        asset: asset.id,
@@ -220,6 +221,165 @@ describe('TransferForm', () => {
    });
  });

+  it('sends transfer from vested accounts', async () => {
+    const mockSubmit = jest.fn();
+    renderComponent({
+      ...props,
+      submitTransfer: mockSubmit,
+      minQuantumMultiple: '100000',
+    });
+
+    // 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
+    );
+
+    await submit();
+    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
+
+    // Select a pubkey
+    await userEvent.selectOptions(
+      screen.getByLabelText('To Vega key'),
+      props.pubKeys[1] // Use not current pubkey so we can check it switches to current pubkey later
+    );
+
+    // Select asset
+    await selectAsset(asset);
+
+    await userEvent.selectOptions(
+      screen.getByLabelText('From account'),
+      `${AccountType.ACCOUNT_TYPE_VESTED_REWARDS}-${asset.id}`
+    );
+
+    // Check switch back to connected key
+    expect(screen.getByLabelText('To Vega key')).toHaveValue(props.pubKey);
+
+    const amountInput = screen.getByLabelText('Amount');
+
+    const checkbox = screen.getByTestId('include-transfer-fee');
+    expect(checkbox).not.toBeChecked();
+
+    await userEvent.clear(amountInput);
+    await userEvent.type(amountInput, '50');
+
+    expect(await screen.findByText(/Use max to bypass/)).toBeInTheDocument();
+
+    // Test use max button
+    await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
+    expect(amountInput).toHaveValue('100.00');
+
+    // If transfering from a vested account 'include fees' checkbox should
+    // be disabled and fees should be 0
+    expect(checkbox).not.toBeChecked();
+    expect(checkbox).toBeDisabled();
+    const expectedFee = '0';
+    const total = new BigNumber(amount).plus(expectedFee).toFixed();
+
+    expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
+    expect(screen.getByTestId('transfer-amount')).toHaveTextContent(amount);
+    expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
+
+    await submit();
+
+    await waitFor(() => {
+      // 1003-TRAN-023
+      expect(mockSubmit).toHaveBeenCalledTimes(1);
+      expect(mockSubmit).toHaveBeenCalledWith({
+        fromAccountType: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
+        toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
+        to: props.pubKey,
+        asset: asset.id,
+        amount: removeDecimal(amount, asset.decimals),
+        oneOff: {},
+      });
+    });
+  });
+
+  it('handles lots of decimal places', async () => {
+    const balance = '904195168829277777';
+    const expectedBalance = '0.904195168829277777';
+
+    const longDecimalAsset = {
+      id: 'assetId',
+      symbol: 'VEGA',
+      name: 'VEGA',
+      decimals: 18,
+      quantum: '1',
+    };
+
+    const account = {
+      type: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
+      asset: longDecimalAsset,
+      balance,
+    };
+
+    const mockSubmit = jest.fn();
+
+    renderComponent({
+      ...props,
+      accounts: [account],
+      submitTransfer: mockSubmit,
+      minQuantumMultiple: '100000',
+    });
+
+    // Select a pubkey
+    await userEvent.selectOptions(
+      screen.getByLabelText('To Vega key'),
+      props.pubKeys[1] // Use not current pubkey so we can check it switches to current pubkey later
+    );
+
+    // Select asset
+    await selectAsset(longDecimalAsset);
+
+    const accountSelect = screen.getByLabelText('From account');
+    const option = within(accountSelect)
+      .getAllByRole('option')
+      .find(
+        (o) => o.getAttribute('value') === `${account.type}-${account.asset.id}`
+      );
+    // plus one for disabled 'please select' option
+
+    expect(option).toHaveTextContent(
+      `${AccountTypeMapping[account.type]} (${expectedBalance} ${
+        account.asset.symbol
+      })`
+    );
+
+    await userEvent.selectOptions(
+      accountSelect,
+      `${AccountType.ACCOUNT_TYPE_VESTED_REWARDS}-${longDecimalAsset.id}`
+    );
+
+    expect(accountSelect).toHaveValue(
+      `${AccountType.ACCOUNT_TYPE_VESTED_REWARDS}-${longDecimalAsset.id}`
+    );
+
+    // Check switch back to connected key
+    const amountInput = screen.getByLabelText('Amount');
+
+    // Test use max button
+    await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
+    expect(amountInput).toHaveValue(expectedBalance);
+
+    await submit();
+
+    await waitFor(() => {
+      // 1003-TRAN-023
+      expect(mockSubmit).toHaveBeenCalledTimes(1);
+      expect(mockSubmit).toHaveBeenCalledWith({
+        fromAccountType: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
+        toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
+        to: props.pubKey,
+        asset: longDecimalAsset.id,
+        amount: balance,
+        oneOff: {},
+      });
+    });
+  });
+
  describe('IncludeFeesCheckbox', () => {
    it('validates fields and submits when checkbox is checked', async () => {
      const mockSubmit = jest.fn();
@@ -234,7 +394,7 @@ describe('TransferForm', () => {
      );

      await submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(3); // pubkey set as default value
+      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value

      // Select a pubkey
      await userEvent.selectOptions(
@@ -247,7 +407,7 @@ describe('TransferForm', () => {

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

      const amountInput = screen.getByLabelText('Amount');
@@ -281,7 +441,7 @@ describe('TransferForm', () => {
        // 1003-TRAN-023
        expect(mockSubmit).toHaveBeenCalledTimes(1);
        expect(mockSubmit).toHaveBeenCalledWith({
-          fromAccountType: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
+          fromAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
          toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
          to: props.pubKeys[1],
          asset: asset.id,
@@ -303,7 +463,7 @@ describe('TransferForm', () => {
      );

      await submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(3); // pubkey set as default value
+      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value

      // Select a pubkey
      await userEvent.selectOptions(
@@ -314,6 +474,11 @@ describe('TransferForm', () => {
      // Select asset
      await selectAsset(asset);

+      await userEvent.selectOptions(
+        screen.getByLabelText('From account'),
+        `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+      );
+
      const amountInput = screen.getByLabelText('Amount');
      const checkbox = screen.getByTestId('include-transfer-fee');
      expect(checkbox).not.toBeChecked();
@@ -333,26 +498,28 @@ describe('TransferForm', () => {

  describe('AddressField', () => {
    const props = {
+      mode: 'select' as const,
      select: <div>select</div>,
      input: <div>input</div>,
      onChange: jest.fn(),
    };

-    it('toggles content and calls onChange', async () => {
+    it('renders correct content by mode prop and calls onChange', async () => {
      const mockOnChange = jest.fn();
-      render(<AddressField {...props} onChange={mockOnChange} />);
+      const { rerender } = render(
+        <AddressField {...props} onChange={mockOnChange} />
+      );

      // select should be shown by default
      expect(screen.getByText('select')).toBeInTheDocument();
      expect(screen.queryByText('input')).not.toBeInTheDocument();
      await userEvent.click(screen.getByText('Enter manually'));
+      expect(mockOnChange).toHaveBeenCalled();
+
+      rerender(<AddressField {...props} mode="input" />);
+
      expect(screen.queryByText('select')).not.toBeInTheDocument();
      expect(screen.getByText('input')).toBeInTheDocument();
-      expect(mockOnChange).toHaveBeenCalledTimes(1);
-      await userEvent.click(screen.getByText('Select from wallet'));
-      expect(screen.getByText('select')).toBeInTheDocument();
-      expect(screen.queryByText('input')).not.toBeInTheDocument();
-      expect(mockOnChange).toHaveBeenCalledTimes(2);
    });
  });

@@ -1,12 +1,11 @@
 import sortBy from 'lodash/sortBy';
 import {
-  minSafe,
  maxSafe,
  required,
  vegaPublicKey,
  addDecimal,
  formatNumber,
-  addDecimalsFormatNumber,
+  toBigNum,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -27,14 +26,20 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { AssetOption, Balance } from '@vegaprotocol/assets';
 import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { accountsDataProvider } from './accounts-data-provider';

 interface FormFields {
  toVegaKey: string;
-  asset: string;
+  asset: string; // This is used to simply filter the from account list, the fromAccount type should be used in the tx
  amount: string;
-  fromAccount: AccountType;
+  fromAccount: string; // AccountType-AssetId
+}
+
+interface Asset {
+  id: string;
+  symbol: string;
+  name: string;
+  decimals: number;
+  quantum: string;
 }

 export interface TransferFormProps {
@@ -43,10 +48,11 @@ export interface TransferFormProps {
  accounts: Array<{
    type: AccountType;
    balance: string;
-    asset: { id: string; symbol: string; name: string; decimals: number };
+    asset: Asset;
  }>;
  assetId?: string;
  feeFactor: string | null;
+  minQuantumMultiple: string | null;
  submitTransfer: (transfer: Transfer) => void;
 }

@@ -57,6 +63,7 @@ export const TransferForm = ({
  feeFactor,
  submitTransfer,
  accounts,
+  minQuantumMultiple,
 }: TransferFormProps) => {
  const {
    control,
@@ -72,6 +79,8 @@ export const TransferForm = ({
    },
  });

+  const [toVegaKeyMode, setToVegaKeyMode] = useState<ToVegaKeyMode>('select');
+
  const assets = sortBy(
    accounts
      .filter(
@@ -99,48 +108,29 @@ export const TransferForm = ({
        ...account.asset,
        balance: addDecimal(account.balance, account.asset.decimals),
      })),
-    'name'
+    (a) => a.symbol.toLowerCase()
  );

  const selectedPubKey = watch('toVegaKey');
  const amount = watch('amount');
  const fromAccount = watch('fromAccount');
-  const assetId = watch('asset');
+  const selectedAssetId = watch('asset');

-  const asset = assets.find((a) => a.id === assetId);
-
-  const { data: toAccounts } = useDataProvider({
-    dataProvider: accountsDataProvider,
-    variables: {
-      partyId: selectedPubKey,
-    },
-    skip: !selectedPubKey,
-  });
+  // Convert the account type (Type-AssetId) into separate values
+  const [accountType, accountAssetId] = fromAccount
+    ? parseFromAccount(fromAccount)
+    : [undefined, undefined];
+  const fromVested = accountType === AccountType.ACCOUNT_TYPE_VESTED_REWARDS;
+  const asset = assets.find((a) => a.id === accountAssetId);

  const account = accounts.find(
-    (a) => a.asset.id === assetId && a.type === fromAccount
+    (a) => a.asset.id === accountAssetId && a.type === accountType
  );
  const accountBalance =
    account && addDecimal(account.balance, account.asset.decimals);

-  // The general account of the selected pubkey. You can only transfer
-  // to general accounts, either when redeeming vested rewards or just
-  // during normal general -> general transfers
-  const toGeneralAccount =
-    toAccounts &&
-    toAccounts.find((a) => {
-      return (
-        a.asset.id === assetId && a.type === AccountType.ACCOUNT_TYPE_GENERAL
-      );
-    });
-
  const [includeFee, setIncludeFee] = useState(false);

-  // Min viable amount given asset decimals EG for WEI 0.000000000000000001
-  const min = asset
-    ? new BigNumber(addDecimal('1', asset.decimals))
-    : new BigNumber(0);
-
  // Max amount given selected asset and from account
  const max = accountBalance ? new BigNumber(accountBalance) : new BigNumber(0);

@@ -164,16 +154,21 @@ export const TransferForm = ({

  const onSubmit = useCallback(
    (fields: FormFields) => {
-      if (!asset) {
-        throw new Error('Submitted transfer with no asset selected');
-      }
      if (!transferAmount) {
        throw new Error('Submitted transfer with no amount selected');
      }
+
+      const [type, assetId] = parseFromAccount(fields.fromAccount);
+      const asset = assets.find((a) => a.id === assetId);
+
+      if (!asset) {
+        throw new Error('Submitted transfer with no asset selected');
+      }
+
      const transfer = normalizeTransfer(
        fields.toVegaKey,
        transferAmount,
-        fields.fromAccount,
+        type,
        AccountType.ACCOUNT_TYPE_GENERAL, // field is readonly in the form
        {
          id: asset.id,
@@ -182,7 +177,7 @@ export const TransferForm = ({
      );
      submitTransfer(transfer);
    },
-    [asset, submitTransfer, transferAmount]
+    [submitTransfer, transferAmount, assets]
  );

  // reset for placeholder workaround https://github.com/radix-ui/primitives/issues/1569
@@ -198,11 +193,120 @@ export const TransferForm = ({
      className="text-sm"
      data-testid="transfer-form"
    >
+      <TradingFormGroup label={t('Asset')} labelFor="asset">
+        <Controller
+          control={control}
+          name="asset"
+          render={({ field }) => (
+            <TradingRichSelect
+              data-testid="select-asset"
+              id={field.name}
+              name={field.name}
+              onValueChange={(value) => {
+                field.onChange(value);
+                setValue('fromAccount', '');
+              }}
+              placeholder={t('Please select an asset')}
+              value={field.value}
+            >
+              {assets.map((a) => (
+                <AssetOption
+                  key={a.key}
+                  asset={a}
+                  balance={<Balance balance={a.balance} symbol={a.symbol} />}
+                />
+              ))}
+            </TradingRichSelect>
+          )}
+        />
+        {errors.asset?.message && (
+          <TradingInputError forInput="asset">
+            {errors.asset.message}
+          </TradingInputError>
+        )}
+      </TradingFormGroup>
+      <TradingFormGroup label={t('From account')} labelFor="fromAccount">
+        <Controller
+          control={control}
+          name="fromAccount"
+          rules={{
+            validate: {
+              required,
+              sameAccount: (value) => {
+                if (
+                  pubKey === selectedPubKey &&
+                  value === AccountType.ACCOUNT_TYPE_GENERAL
+                ) {
+                  return t(
+                    'Cannot transfer to the same account type for the connected key'
+                  );
+                }
+                return true;
+              },
+            },
+          }}
+          render={({ field }) => (
+            <TradingSelect
+              id="fromAccount"
+              defaultValue=""
+              {...field}
+              onChange={(e) => {
+                field.onChange(e);
+
+                const [type] = parseFromAccount(e.target.value);
+
+                // Enforce that if transferring from a vested rewards account it must go to
+                // the current connected general account
+                if (
+                  type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS &&
+                  pubKey
+                ) {
+                  setValue('toVegaKey', pubKey);
+                  setToVegaKeyMode('select');
+                  setIncludeFee(false);
+                }
+              }}
+            >
+              <option value="" disabled={true}>
+                {t('Please select')}
+              </option>
+              {accounts
+                .filter((a) => {
+                  if (!selectedAssetId) return true;
+                  return selectedAssetId === a.asset.id;
+                })
+                .map((a) => {
+                  const id = `${a.type}-${a.asset.id}`;
+                  return (
+                    <option value={id} key={id}>
+                      {AccountTypeMapping[a.type]} (
+                      {addDecimal(a.balance, a.asset.decimals)} {a.asset.symbol}
+                      )
+                    </option>
+                  );
+                })}
+            </TradingSelect>
+          )}
+        />
+        {errors.fromAccount?.message && (
+          <TradingInputError forInput="fromAccount">
+            {errors.fromAccount.message}
+          </TradingInputError>
+        )}
+      </TradingFormGroup>
      <TradingFormGroup label="To Vega key" labelFor="toVegaKey">
        <AddressField
-          onChange={() => setValue('toVegaKey', '')}
+          onChange={() => {
+            setValue('toVegaKey', '');
+            setToVegaKeyMode((curr) => (curr === 'input' ? 'select' : 'input'));
+          }}
+          mode={toVegaKeyMode}
          select={
-            <TradingSelect {...register('toVegaKey')} id="toVegaKey">
+            <TradingSelect
+              {...register('toVegaKey')}
+              disabled={fromVested}
+              id="toVegaKey"
+            >
              <option value="" disabled={true}>
                {t('Please select')}
              </option>
@@ -218,18 +322,21 @@ export const TransferForm = ({
            </TradingSelect>
          }
          input={
-            <TradingInput
-              // eslint-disable-next-line jsx-a11y/no-autofocus
-              autoFocus={true} // focus input immediately after is shown
-              id="toVegaKey"
-              type="text"
-              {...register('toVegaKey', {
-                validate: {
-                  required,
-                  vegaPublicKey,
-                },
-              })}
-            />
+            fromVested ? null : (
+              <TradingInput
+                // eslint-disable-next-line jsx-a11y/no-autofocus
+                autoFocus={true} // focus input immediately after is shown
+                id="toVegaKey"
+                type="text"
+                disabled={fromVested}
+                {...register('toVegaKey', {
+                  validate: {
+                    required,
+                    vegaPublicKey,
+                  },
+                })}
+              />
+            )
          }
        />
        {errors.toVegaKey?.message && (
@@ -238,111 +345,6 @@ export const TransferForm = ({
          </TradingInputError>
        )}
      </TradingFormGroup>
-      <TradingFormGroup label={t('Asset')} labelFor="asset">
-        <Controller
-          control={control}
-          name="asset"
-          rules={{
-            validate: {
-              required,
-            },
-          }}
-          render={({ field }) => (
-            <TradingRichSelect
-              data-testid="select-asset"
-              id={field.name}
-              name={field.name}
-              onValueChange={(value) => {
-                field.onChange(value);
-              }}
-              placeholder={t('Please select an asset')}
-              value={field.value}
-            >
-              {assets.map((a) => (
-                <AssetOption
-                  key={a.key}
-                  asset={a}
-                  balance={
-                    <Balance
-                      balance={formatNumber(a.balance, a.decimals)}
-                      symbol={a.symbol}
-                    />
-                  }
-                />
-              ))}
-            </TradingRichSelect>
-          )}
-        />
-        {errors.asset?.message && (
-          <TradingInputError forInput="asset">
-            {errors.asset.message}
-          </TradingInputError>
-        )}
-      </TradingFormGroup>
-      <TradingFormGroup label={t('From account')} labelFor="fromAccount">
-        <TradingSelect
-          id="fromAccount"
-          defaultValue=""
-          {...register('fromAccount', {
-            validate: {
-              required,
-              sameAccount: (value) => {
-                if (
-                  pubKey === selectedPubKey &&
-                  value === AccountType.ACCOUNT_TYPE_GENERAL
-                ) {
-                  return t(
-                    'Cannot transfer to the same account type for the connected key'
-                  );
-                }
-                return true;
-              },
-            },
-          })}
-        >
-          <option value="" disabled={true}>
-            {t('Please select')}
-          </option>
-          {accounts
-            .filter((a) => {
-              if (!assetId) return true;
-              return assetId === a.asset.id;
-            })
-            .map((a) => {
-              return (
-                <option value={a.type} key={`${a.type}-${a.asset.id}`}>
-                  {AccountTypeMapping[a.type]} (
-                  {addDecimalsFormatNumber(a.balance, a.asset.decimals)}{' '}
-                  {a.asset.symbol})
-                </option>
-              );
-            })}
-        </TradingSelect>
-        {errors.fromAccount?.message && (
-          <TradingInputError forInput="fromAccount">
-            {errors.fromAccount.message}
-          </TradingInputError>
-        )}
-      </TradingFormGroup>
-      <TradingFormGroup label={t('To account')} labelFor="toAccount">
-        <TradingSelect
-          id="toAccount"
-          defaultValue={AccountType.ACCOUNT_TYPE_GENERAL}
-        >
-          <option value={AccountType.ACCOUNT_TYPE_GENERAL}>
-            {toGeneralAccount
-              ? `${
-                  AccountTypeMapping[AccountType.ACCOUNT_TYPE_GENERAL]
-                } (${addDecimalsFormatNumber(
-                  toGeneralAccount.balance,
-                  toGeneralAccount.asset.decimals
-                )} ${toGeneralAccount.asset.symbol})`
-              : `${AccountTypeMapping[AccountType.ACCOUNT_TYPE_GENERAL]} ${
-                  asset ? `(0 ${asset.symbol})` : ''
-                }`}
-          </option>
-        </TradingSelect>
-      </TradingFormGroup>
      <TradingFormGroup label="Amount" labelFor="amount">
        <TradingInput
          id="amount"
@@ -353,7 +355,43 @@ export const TransferForm = ({
          {...register('amount', {
            validate: {
              required,
-              minSafe: (value) => minSafe(new BigNumber(min))(value),
+              minSafe: (v) => {
+                if (!asset || !minQuantumMultiple) return true;
+
+                const value = new BigNumber(v);
+
+                if (value.isZero()) {
+                  return t('Amount cannot be 0');
+                }
+
+                const minByQuantumMultiple = toBigNum(
+                  minQuantumMultiple,
+                  asset.decimals
+                );
+
+                if (fromVested) {
+                  // special conditions which let you bypass min transfer rules set by quantum multiple
+                  if (value.isGreaterThanOrEqualTo(max)) {
+                    return true;
+                  }
+
+                  if (value.isLessThan(minByQuantumMultiple)) {
+                    return t(
+                      'Amount below minimum requirements for partial transfer. Use max to bypass'
+                    );
+                  }
+
+                  return true;
+                } else {
+                  if (value.isLessThan(minByQuantumMultiple)) {
+                    return t(
+                      'Amount below minimum requirement set by transfer.minTransferQuantumMultiple'
+                    );
+                  }
+                }
+
+                return true;
+              },
              maxSafe: (v) => {
                const value = new BigNumber(v);
                if (value.isGreaterThan(max)) {
@@ -369,7 +407,9 @@ export const TransferForm = ({
            type="button"
            className="absolute top-0 right-0 ml-auto text-xs underline"
            onClick={() =>
-              setValue('amount', parseFloat(accountBalance).toString())
+              setValue('amount', accountBalance, {
+                shouldValidate: true,
+              })
            }
          >
            {t('Use max')}
@@ -390,10 +430,10 @@ export const TransferForm = ({
          <div>
            <TradingCheckbox
              name="include-transfer-fee"
-              disabled={!transferAmount}
+              disabled={!transferAmount || fromVested}
              label={t('Include transfer fee')}
              checked={includeFee}
-              onCheckedChange={() => setIncludeFee(!includeFee)}
+              onCheckedChange={() => setIncludeFee((x) => !x)}
            />
          </div>
        </Tooltip>
@@ -403,7 +443,7 @@ export const TransferForm = ({
          amount={transferAmount}
          transferAmount={transferAmount}
          feeFactor={feeFactor}
-          fee={fee}
+          fee={fromVested ? '0' : fee}
          decimals={asset?.decimals}
        />
      )}
@@ -485,32 +525,38 @@ export const TransferFee = ({
  );
 };

+type ToVegaKeyMode = 'input' | 'select';
+
 interface AddressInputProps {
  select: ReactNode;
  input: ReactNode;
+  mode: ToVegaKeyMode;
  onChange: () => void;
 }

 export const AddressField = ({
  select,
  input,
+  mode,
  onChange,
 }: AddressInputProps) => {
-  const [isInput, setIsInput] = useState(false);
-
+  const isInput = mode === 'input';
  return (
    <>
      {isInput ? input : select}
-      <button
-        type="button"
-        onClick={() => {
-          setIsInput((curr) => !curr);
-          onChange();
-        }}
-        className="absolute top-0 right-0 ml-auto text-xs underline"
-      >
-        {isInput ? t('Select from wallet') : t('Enter manually')}
-      </button>
+      {select && input && (
+        <button
+          type="button"
+          onClick={onChange}
+          className="absolute top-0 right-0 ml-auto text-xs underline"
+        >
+          {isInput ? t('Select from wallet') : t('Enter manually')}
+        </button>
+      )}
    </>
  );
 };
+
+const parseFromAccount = (fromAccountStr: string) => {
+  return fromAccountStr.split('-') as [AccountType, string];
+};
@@ -72,15 +72,11 @@ export const DealTicketFeeDetails = ({

  return (
    <KeyValue
-      label={t('Fees')}
-      value={
-        totalDiscountedFeeAmount &&
-        `~${formatValue(totalDiscountedFeeAmount, assetDecimals)}`
-      }
-      formattedValue={
+      label={
        <>
+          {t('Fees')}
          {totalDiscountFactor ? (
-            <Pill size="xxs" intent={Intent.Warning} className="mr-1">
+            <Pill size="xxs" intent={Intent.Info} className="ml-1">
              -
              {formatNumberPercentage(
                new BigNumber(totalDiscountFactor).multipliedBy(100),
@@ -88,10 +84,16 @@ export const DealTicketFeeDetails = ({
              )}
            </Pill>
          ) : null}
-          {totalDiscountedFeeAmount &&
-            `~${formatValue(totalDiscountedFeeAmount, assetDecimals, quantum)}`}
        </>
      }
+      value={
+        totalDiscountedFeeAmount &&
+        `~${formatValue(totalDiscountedFeeAmount, assetDecimals)}`
+      }
+      formattedValue={
+        totalDiscountedFeeAmount &&
+        `~${formatValue(totalDiscountedFeeAmount, assetDecimals, quantum)}`
+      }
      labelDescription={
        <div className="flex flex-col gap-2">
          <p>
@@ -149,6 +151,7 @@ export const DealTicketMarginDetails = ({
  const { decimals: assetDecimals, quantum } = asset;
  let marginRequiredBestCase: string | undefined = undefined;
  let marginRequiredWorstCase: string | undefined = undefined;
+
  if (marginEstimate) {
    if (currentMargins) {
      marginRequiredBestCase = (
@@ -286,7 +289,7 @@ export const DealTicketMarginDetails = ({
  const quoteName = getQuoteName(market);

  return (
-    <div className="flex flex-col w-full gap-2">
+    <div className="flex flex-col w-full gap-2 pt-2">
      <Accordion>
        <AccordionPanel
          itemId="margin"
@@ -294,7 +297,7 @@ export const DealTicketMarginDetails = ({
            <AccordionPrimitive.Trigger
              data-testid="accordion-toggle"
              className={classNames(
-                'w-full pt-2',
+                'w-full',
                'flex items-center gap-2 text-xs',
                'group'
              )}
@@ -79,7 +79,11 @@ export const FeesBreakdown = ({
    volumeDiscountFactor
  );

-  const { volumeDiscount, referralDiscount } = getDiscountedFee(
+  const {
+    discountedFee: discountedTotalFeeAmount,
+    volumeDiscount,
+    referralDiscount,
+  } = getDiscountedFee(
    totalFeeAmount,
    referralDiscountFactor,
    volumeDiscountFactor
@@ -131,7 +135,7 @@ export const FeesBreakdown = ({
      <FeesBreakdownItem
        label={t('Total fees')}
        factor={feeFactors ? sumFeesFactors(feeFactors)?.toString() : undefined}
-        value={totalFeeAmount}
+        value={discountedTotalFeeAmount}
        symbol={symbol}
        decimals={decimals}
      />
@@ -1,6 +1,12 @@
 import type { MockedResponse } from '@apollo/react-testing';
 import { MockedProvider } from '@apollo/react-testing';
-import { act, render, screen, waitFor } from '@testing-library/react';
+import {
+  act,
+  render,
+  renderHook,
+  screen,
+  waitFor,
+} from '@testing-library/react';
 import { RadioGroup } from '@vegaprotocol/ui-toolkit';
 import type {
  NodeCheckTimeUpdateSubscription,
@@ -11,30 +17,33 @@ import {
  NodeCheckTimeUpdateDocument,
 } from '../../utils/__generated__/NodeCheck';
 import type { RowDataProps } from './row-data';
-import { POLL_INTERVAL } from './row-data';
+import {
+  POLL_INTERVAL,
+  Result,
+  SUBSCRIPTION_TIMEOUT,
+  useNodeBasicStatus,
+  useNodeSubscriptionStatus,
+  useResponseTime,
+} from './row-data';
 import { BLOCK_THRESHOLD, RowData } from './row-data';
-import type { HeaderEntry } from '@vegaprotocol/apollo-client';
-import { useHeaderStore } from '@vegaprotocol/apollo-client';
 import { CUSTOM_NODE_KEY } from '../../types';

-jest.mock('@vegaprotocol/apollo-client', () => ({
-  useHeaderStore: jest.fn().mockReturnValue({}),
-}));
-
-const statsQueryMock: MockedResponse<NodeCheckQuery> = {
+const mockStatsQuery = (
+  blockHeight = '1234'
+): MockedResponse<NodeCheckQuery> => ({
  request: {
    query: NodeCheckDocument,
  },
  result: {
    data: {
      statistics: {
-        blockHeight: '1234', // the actual value used in the component is the value from the header store
+        blockHeight,
        vegaTime: new Date().toISOString(),
        chainId: 'test-chain-id',
      },
    },
  },
-};
+});

 const subMock: MockedResponse<NodeCheckTimeUpdateSubscription> = {
  request: {
@@ -59,18 +68,6 @@ global.performance.getEntriesByName = jest.fn().mockReturnValue([
  },
 ]);

-const mockHeaders = (
-  url: string,
-  headers: Partial<HeaderEntry> = {
-    blockHeight: 100,
-    timestamp: new Date(),
-  }
-) => {
-  (useHeaderStore as unknown as jest.Mock).mockReturnValue({
-    [url]: headers,
-  });
-};
-
 const renderComponent = (
  props: RowDataProps,
  queryMock: MockedResponse<NodeCheckQuery>,
@@ -86,6 +83,98 @@ const renderComponent = (
  );
 };

+describe('useNodeSubscriptionStatus', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+  const mockWrapper =
+    (withData = false) =>
+    ({ children }: { children: React.ReactNode }) =>
+      (
+        <MockedProvider mocks={withData ? [subMock, subMock, subMock] : []}>
+          {children}
+        </MockedProvider>
+      );
+  it('results initially as loading', async () => {
+    const { result } = renderHook(() => useNodeSubscriptionStatus(), {
+      wrapper: mockWrapper(true),
+    });
+    expect(result.current.status).toBe(Result.Loading);
+  });
+  it('results as successful when data received', async () => {
+    const { result } = renderHook(() => useNodeSubscriptionStatus(), {
+      wrapper: mockWrapper(true),
+    });
+    expect(result.current.status).toBe(Result.Loading);
+    await act(() => {
+      jest.advanceTimersByTime(SUBSCRIPTION_TIMEOUT);
+    });
+    expect(result.current.status).toBe(Result.Successful);
+  });
+  it('result as failed when no data received', async () => {
+    const { result } = renderHook(() => useNodeSubscriptionStatus(), {
+      wrapper: mockWrapper(false),
+    });
+    expect(result.current.status).toBe(Result.Loading);
+    await act(() => {
+      jest.advanceTimersByTime(SUBSCRIPTION_TIMEOUT);
+    });
+    expect(result.current.status).toBe(Result.Failed);
+  });
+});
+
+describe('useNodeBasicStatus', () => {
+  const mockWrapper =
+    (withData = false) =>
+    ({ children }: { children: React.ReactNode }) =>
+      (
+        <MockedProvider mocks={withData ? [mockStatsQuery('1234')] : []}>
+          {children}
+        </MockedProvider>
+      );
+  it('results initially as loading', async () => {
+    const { result } = renderHook(() => useNodeBasicStatus(), {
+      wrapper: mockWrapper(true),
+    });
+    expect(result.current.status).toBe(Result.Loading);
+    expect(result.current.currentBlockHeight).toBeNaN();
+  });
+  it('results as successful when data received', async () => {
+    const { result } = renderHook(() => useNodeBasicStatus(), {
+      wrapper: mockWrapper(true),
+    });
+    await waitFor(() => {
+      expect(result.current.status).toBe(Result.Successful);
+      expect(result.current.currentBlockHeight).toBe(1234);
+    });
+  });
+  it('result as failed when no data received', async () => {
+    const { result } = renderHook(() => useNodeBasicStatus(), {
+      wrapper: mockWrapper(false),
+    });
+    await waitFor(() => {
+      expect(result.current.status).toBe(Result.Failed);
+      expect(result.current.currentBlockHeight).toBeNaN();
+    });
+  });
+});
+
+describe('useResponseTime', () => {
+  it('returns response time when url is valid', () => {
+    const { result } = renderHook(() =>
+      useResponseTime('https://localhost:1234')
+    );
+    expect(result.current.responseTime).toBe(50);
+  });
+  it('does not return response time when url is invalid', () => {
+    const { result } = renderHook(() => useResponseTime('nope'));
+    expect(result.current.responseTime).toBeUndefined();
+  });
+});
+
 describe('RowData', () => {
  const props = {
    id: '0',
@@ -94,9 +183,13 @@ describe('RowData', () => {
    onBlockHeight: jest.fn(),
  };

+  afterAll(() => {
+    jest.useRealTimers();
+    jest.resetAllMocks();
+  });
+
  it('radio button enabled after stats query successful', async () => {
-    mockHeaders(props.url);
-    render(renderComponent(props, statsQueryMock, subMock));
+    render(renderComponent(props, mockStatsQuery('100'), subMock));

    // radio should be enabled until query resolves
    expect(
@@ -127,8 +220,6 @@ describe('RowData', () => {
  });

  it('radio button still enabled if query fails', async () => {
-    mockHeaders(props.url, {});
-
    const failedQueryMock: MockedResponse<NodeCheckQuery> = {
      request: {
        query: NodeCheckDocument,
@@ -178,12 +269,11 @@ describe('RowData', () => {

  it('highlights rows with a slow block height', async () => {
    const blockHeight = 100;
-    mockHeaders(props.url, { blockHeight });

    const { rerender } = render(
      renderComponent(
        { ...props, highestBlock: blockHeight + BLOCK_THRESHOLD },
-        statsQueryMock,
+        mockStatsQuery(String(blockHeight)),
        subMock
      )
    );
@@ -201,7 +291,7 @@ describe('RowData', () => {
    rerender(
      renderComponent(
        { ...props, highestBlock: blockHeight + BLOCK_THRESHOLD + 1 },
-        statsQueryMock,
+        mockStatsQuery(String(blockHeight)),
        subMock
      )
    );
@@ -216,7 +306,7 @@ describe('RowData', () => {
          ...props,
          id: CUSTOM_NODE_KEY,
        },
-        statsQueryMock,
+        mockStatsQuery('1234'),
        subMock
      )
    );
@@ -230,16 +320,17 @@ describe('RowData', () => {
  it('updates highest block after new header received', async () => {
    const mockOnBlockHeight = jest.fn();
    const blockHeight = 200;
-    mockHeaders(props.url, { blockHeight });
    render(
      renderComponent(
        { ...props, onBlockHeight: mockOnBlockHeight },
-        statsQueryMock,
+        mockStatsQuery(String(blockHeight)),
        subMock
      )
    );

-    expect(mockOnBlockHeight).toHaveBeenCalledWith(blockHeight);
+    await waitFor(() => {
+      expect(mockOnBlockHeight).toHaveBeenCalledWith(blockHeight);
+    });
  });

  it('should poll the query unless an errors is returned', async () => {
@@ -275,7 +366,6 @@ describe('RowData', () => {
      };
    };

-    mockHeaders(props.url);
    const statsQueryMock1 = createStatsQueryMock('1234');
    const statsQueryMock2 = createStatsQueryMock('1235');
    const statsQueryMock3 = createFailedStatsQueryMock();
@@ -1,5 +1,3 @@
-import type { ApolloError } from '@apollo/client';
-import { useHeaderStore } from '@vegaprotocol/apollo-client';
 import { isValidUrl } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { TradingRadio } from '@vegaprotocol/ui-toolkit';
@@ -12,6 +10,7 @@ import {
 import { LayoutCell } from './layout-cell';

 export const POLL_INTERVAL = 1000;
+export const SUBSCRIPTION_TIMEOUT = 3000;
 export const BLOCK_THRESHOLD = 3;

 export interface RowDataProps {
@@ -21,15 +20,39 @@ export interface RowDataProps {
  onBlockHeight: (blockHeight: number) => void;
 }

-export const RowData = ({
-  id,
-  url,
-  highestBlock,
-  onBlockHeight,
-}: RowDataProps) => {
-  const [subFailed, setSubFailed] = useState(false);
-  const [time, setTime] = useState<number>();
-  // no use of data here as we need the data nodes reference to block height
+export enum Result {
+  Successful,
+  Failed,
+  Loading,
+}
+
+export const useNodeSubscriptionStatus = () => {
+  const [status, setStatus] = useState<Result>(Result.Loading);
+  const { data, error } = useNodeCheckTimeUpdateSubscription();
+  useEffect(() => {
+    if (error) {
+      setStatus(Result.Failed);
+    }
+    if (data?.busEvents && data.busEvents.length > 0) {
+      setStatus(Result.Successful);
+    }
+    // set as failed when no data received after SUBSCRIPTION_TIMEOUT ms
+    const timeout = setTimeout(() => {
+      if (!data || error) {
+        setStatus(Result.Failed);
+      }
+    }, SUBSCRIPTION_TIMEOUT);
+    return () => {
+      clearTimeout(timeout);
+    };
+  }, [data, error]);
+
+  return { status };
+};
+
+export const useNodeBasicStatus = () => {
+  const [status, setStatus] = useState<Result>(Result.Loading);
+
  const { data, error, loading, startPolling, stopPolling } = useNodeCheckQuery(
    {
      pollInterval: POLL_INTERVAL,
@@ -38,28 +61,7 @@ export const RowData = ({
      ssr: false,
    }
  );
-  const headerStore = useHeaderStore();
-  const headers = headerStore[url];

-  const {
-    data: subData,
-    error: subError,
-    loading: subLoading,
-  } = useNodeCheckTimeUpdateSubscription();
-
-  useEffect(() => {
-    const timeout = setTimeout(() => {
-      if (!subData) {
-        setSubFailed(true);
-      }
-    }, 3000);
-
-    return () => {
-      clearTimeout(timeout);
-    };
-  }, [subData]);
-
-  // handle polling
  useEffect(() => {
    const handleStartPoll = () => {
      if (error) return;
@@ -83,56 +85,57 @@ export const RowData = ({
    };
  }, [startPolling, stopPolling, error]);

-  // measure response time
+  const currentBlockHeight = parseInt(
+    data?.statistics.blockHeight || 'NONE',
+    10
+  );
+
+  useEffect(() => {
+    if (loading) {
+      setStatus(Result.Loading);
+      return;
+    }
+    if (!error && !isNaN(currentBlockHeight)) {
+      setStatus(Result.Successful);
+      return;
+    }
+    setStatus(Result.Failed);
+  }, [currentBlockHeight, error, loading]);
+
+  return {
+    status,
+    currentBlockHeight,
+  };
+};
+
+export const useResponseTime = (url: string, trigger?: unknown) => {
+  const [responseTime, setResponseTime] = useState<number>();
  useEffect(() => {
    if (!isValidUrl(url)) return;
    if (typeof window.performance.getEntriesByName !== 'function') return; // protection for test environment
-    // every time we get data measure response speed
    const requestUrl = new URL(url);
    const requests = window.performance.getEntriesByName(requestUrl.href);
    const { duration } =
      (requests.length && requests[requests.length - 1]) || {};
-    setTime(duration);
-  }, [url, data]);
+    setResponseTime(duration);
+  }, [url, trigger]);
+  return { responseTime };
+};

+export const RowData = ({
+  id,
+  url,
+  highestBlock,
+  onBlockHeight,
+}: RowDataProps) => {
+  const { status: subStatus } = useNodeSubscriptionStatus();
+  const { status, currentBlockHeight } = useNodeBasicStatus();
+  const { responseTime } = useResponseTime(url, currentBlockHeight); // measure response time (ms) every time we get data (block height)
  useEffect(() => {
-    if (headers?.blockHeight) {
-      onBlockHeight(headers.blockHeight);
+    if (!isNaN(currentBlockHeight)) {
+      onBlockHeight(currentBlockHeight);
    }
-  }, [headers?.blockHeight, onBlockHeight]);
-
-  const getHasError = () => {
-    // the stats query errored
-    if (error) {
-      return true;
-    }
-
-    // if we are still awaiting a header entry its not an error
-    // we are still waiting for the query to resolve
-    if (!headers) {
-      return false;
-    }
-
-    // highlight this node as 'error' if its more than BLOCK_THRESHOLD blocks behind the most
-    // advanced node
-    if (
-      highestBlock !== null &&
-      headers.blockHeight < highestBlock - BLOCK_THRESHOLD
-    ) {
-      return true;
-    }
-
-    return false;
-  };
-
-  const getSubFailed = (
-    subError: ApolloError | undefined,
-    subFailed: boolean
-  ) => {
-    if (subError) return true;
-    if (subFailed) return true;
-    return false;
-  };
+  }, [currentBlockHeight, onBlockHeight]);

  return (
    <>
@@ -143,72 +146,58 @@ export const RowData = ({
      )}
      <LayoutCell
        label={t('Response time')}
-        isLoading={!error && loading}
-        hasError={Boolean(error)}
+        isLoading={status === Result.Loading}
+        hasError={status === Result.Failed}
        dataTestId="response-time-cell"
      >
-        {getResponseTimeDisplayValue(time, error)}
+        {display(status, formatResponseTime(responseTime))}
      </LayoutCell>
      <LayoutCell
        label={t('Block')}
-        isLoading={loading}
-        hasError={getHasError()}
+        isLoading={status === Result.Loading}
+        hasError={
+          status === Result.Failed ||
+          (highestBlock != null &&
+            !isNaN(currentBlockHeight) &&
+            currentBlockHeight < highestBlock - BLOCK_THRESHOLD)
+        }
        dataTestId="block-height-cell"
      >
        <span
          data-testid="query-block-height"
          data-query-block-height={
-            error ? 'failed' : data?.statistics.blockHeight
+            status === Result.Failed ? 'failed' : currentBlockHeight
          }
        >
-          {getBlockDisplayValue(headers?.blockHeight, error)}
+          {display(status, currentBlockHeight)}
        </span>
      </LayoutCell>
      <LayoutCell
        label={t('Subscription')}
-        isLoading={subFailed ? false : subLoading}
-        hasError={getSubFailed(subError, subFailed)}
+        isLoading={subStatus === Result.Loading}
+        hasError={subStatus === Result.Failed}
        dataTestId="subscription-cell"
      >
-        {getSubscriptionDisplayValue(subFailed, subData?.busEvents, subError)}
+        {display(subStatus, t('Yes'), t('No'))}
      </LayoutCell>
    </>
  );
 };

-const getResponseTimeDisplayValue = (
-  responseTime?: number,
-  error?: ApolloError
-) => {
-  if (error) {
-    return t('n/a');
-  }
-  if (typeof responseTime === 'number') {
-    return `${Number(responseTime).toFixed(2)}ms`;
-  }
-  return '-';
-};
+const formatResponseTime = (time: number | undefined) =>
+  time != null ? `${Number(time).toFixed(2)}ms` : '-';

-const getBlockDisplayValue = (block?: number, error?: ApolloError) => {
-  if (error) {
-    return t('n/a');
-  }
-  if (block) {
-    return block;
-  }
-  return '-';
-};
-
-const getSubscriptionDisplayValue = (
-  subFailed: boolean,
-  events?: { id: string }[] | null,
-  error?: ApolloError
+const display = (
+  status: Result,
+  yes: string | number | undefined,
+  no = t('n/a')
 ) => {
-  if (subFailed || error) {
-    return t('No');
+  switch (status) {
+    case Result.Successful:
+      return yes;
+    case Result.Failed:
+      return no;
+    default:
+      return '-';
  }
-  if (events?.length) {
-    return t('Yes');
-  }
-  return '-';
 };
@@ -289,17 +289,30 @@ describe('FeesDiscountBreakdownTooltip', () => {
    const { container } = render(<FeesDiscountBreakdownTooltip {...props} />);
    const dt = container.querySelectorAll('dt');
    const dd = container.querySelectorAll('dd');
-    const expected = [
-      { label: 'Infrastructure Fee Referral Discount', value: '0.05 BTC' },
-      { label: 'Infrastructure Fee Volume Discount', value: '0.06 BTC' },
-      { label: 'Liquidity Fee Referral Discount', value: '0.01 BTC' },
-      { label: 'Liquidity Fee Volume Discount', value: '0.02 BTC' },
-      { label: 'Maker Fee Referral Discount', value: '0.03 BTC' },
-      { label: 'Maker Fee Volume Discount', value: '0.04 BTC' },
+    const expectedDt = [
+      'Infrastructure Fee',
+      'Referral Discount',
+      'Volume Discount',
+      'Liquidity Fee',
+      'Referral Discount',
+      'Volume Discount',
+      'Maker Fee',
+      'Referral Discount',
+      'Volume Discount',
    ];
-    expected.forEach(({ label, value }, i) => {
+    const expectedDD = [
+      '0.05 BTC',
+      '0.06 BTC',
+      '0.01 BTC',
+      '0.02 BTC',
+      '0.03 BTC',
+      '0.04 BTC',
+    ];
+    expectedDt.forEach((label, i) => {
      expect(dt[i]).toHaveTextContent(label);
-      expect(dd[i]).toHaveTextContent(value);
+    });
+    expectedDD.forEach((label, i) => {
+      expect(dd[i]).toHaveTextContent(label);
    });
  });
 });
@@ -391,7 +391,7 @@ const FeesDiscountBreakdownTooltipItem = ({
  label: string;
  asset: ReturnType<typeof getAsset>;
 }) =>
-  value ? (
+  value && value !== '0' ? (
    <>
      <dt className="col-span-1">{label}</dt>
      <dd className="text-right col-span-1">
@@ -418,34 +418,47 @@ export const FeesDiscountBreakdownTooltip = ({
      className="max-w-sm bg-vega-light-100 dark:bg-vega-dark-100 border border-vega-light-200 dark:border-vega-dark-200 px-4 py-2 z-20 rounded text-sm break-word text-black dark:text-white"
    >
      <dl className="grid grid-cols-2 gap-x-1">
+        {(fees.infrastructureFeeReferralDiscount || '0') !== '0' ||
+        (fees.infrastructureFeeVolumeDiscount || '0') !== '0' ? (
+          <dt className="col-span-2">{t('Infrastructure Fee')}</dt>
+        ) : null}
        <FeesDiscountBreakdownTooltipItem
          value={fees.infrastructureFeeReferralDiscount}
-          label={t('Infrastructure Fee Referral Discount')}
+          label={t('Referral Discount')}
          asset={asset}
        />
        <FeesDiscountBreakdownTooltipItem
          value={fees.infrastructureFeeVolumeDiscount}
-          label={t('Infrastructure Fee Volume Discount')}
+          label={t('Volume Discount')}
          asset={asset}
        />
+        {(fees.liquidityFeeReferralDiscount || '0') !== '0' ||
+        (fees.liquidityFeeVolumeDiscount || '0') !== '0' ? (
+          <dt className="col-span-2">{t('Liquidity Fee')}</dt>
+        ) : null}
+
        <FeesDiscountBreakdownTooltipItem
          value={fees.liquidityFeeReferralDiscount}
-          label={t('Liquidity Fee Referral Discount')}
+          label={t('Referral Discount')}
          asset={asset}
        />
        <FeesDiscountBreakdownTooltipItem
          value={fees.liquidityFeeVolumeDiscount}
-          label={t('Liquidity Fee Volume Discount')}
+          label={t('Volume Discount')}
          asset={asset}
        />
+        {(fees.makerFeeReferralDiscount || '0') !== '0' ||
+        (fees.makerFeeVolumeDiscount || '0') !== '0' ? (
+          <dt className="col-span-2">{t('Maker Fee')}</dt>
+        ) : null}
        <FeesDiscountBreakdownTooltipItem
          value={fees.makerFeeReferralDiscount}
-          label={t('Maker Fee Referral Discount')}
+          label={t('Referral Discount')}
          asset={asset}
        />
        <FeesDiscountBreakdownTooltipItem
          value={fees.makerFeeVolumeDiscount}
-          label={t('Maker Fee Volume Discount')}
+          label={t('Volume Discount')}
          asset={asset}
        />
      </dl>
@@ -2,7 +2,6 @@ import { useMemo } from 'react';
 import {
  addDecimalsFormatNumber,
  addDecimalsFormatNumberQuantum,
-  formatNumberPercentage,
  getDateTimeFormat,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
@@ -29,6 +28,12 @@ import { LiquidityProvisionStatus } from '@vegaprotocol/types';
 import { LiquidityProvisionStatusMapping } from '@vegaprotocol/types';
 import type { LiquidityProvisionData } from './liquidity-data-provider';

+const formatNumberPercentage = (value: BigNumber, decimals?: number) => {
+  const decimalPlaces =
+    typeof decimals === 'undefined' ? value.dp() || 0 : decimals;
+  return `${value.toFixed(decimalPlaces, 1)}%`;
+};
+
 const percentageFormatter = ({ value }: ValueFormatterParams) => {
  if (!value) return '-';
  return formatNumberPercentage(new BigNumber(value).times(100), 2) || '-';
@@ -126,11 +131,11 @@ export const LiquidityTable = ({
              new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).times(
                100
              ),
-              2
+              4
            ),
            formatNumberPercentage(
              new BigNumber(data.commitmentMinTimeFraction).times(100),
-              2
+              4
            ),
          ]
        );
@@ -143,7 +148,7 @@ export const LiquidityTable = ({
              new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).times(
                100
              ),
-              2
+              4
            ),
          ]
        );
@@ -394,7 +399,7 @@ export const LiquidityTable = ({
            headerTooltip: t(
              `The liquidity fees accrued by each provider, which will be distributed at the end of the epoch after applying any penalties.`
            ),
-            valueFormatter: stakeToCcyVolumeQuantumFormatter,
+            valueFormatter: assetDecimalsQuantumFormatter,
            tooltipValueGetter: feesAccruedTooltip,
            cellClassRules: {
              'text-warning': ({ data }: { data: LiquidityProvisionData }) => {
@@ -6,4 +6,4 @@ export * from './markets-candles';
 export * from './markets-data';
 export * from './OracleMarketsSpec';
 export * from './OracleSpecDataConnection';
-export * from './SuccessorMarket'
+export * from './SuccessorMarket'
@@ -28,6 +28,22 @@ export const getAsset = (market: Partial<Market>) => {
  throw new Error('Failed to retrieve asset. Invalid product type');
 };

+export const getProductType = (market: Partial<Market>) => {
+  if (!market.tradableInstrument?.instrument.product) {
+    throw new Error(
+      'Failed to retrieve product type. Invalid tradable instrument'
+    );
+  }
+
+  const type = market.tradableInstrument.instrument.product.__typename;
+
+  if (!type) {
+    throw new Error('Failed to retrieve asset. Invalid product type');
+  }
+
+  return type;
+};
+
 export const getQuoteName = (market: Partial<Market>) => {
  if (!market.tradableInstrument?.instrument.product) {
    throw new Error(
@@ -1,12 +1,3 @@
-fragment MarketCandlesFields on Candle {
-  high
-  low
-  open
-  close
-  volume
-  periodStart
-}
-
 query MarketsCandles($interval: Interval!, $since: String!) {
  marketsConnection {
    edges {
@@ -176,6 +176,7 @@ export const NetworkParams = {
  market_liquidity_feeCalculationTimeStep:
    'market_liquidity_feeCalculationTimeStep',
  transfer_fee_factor: 'transfer_fee_factor',
+  transfer_minTransferQuantumMultiple: 'transfer_minTransferQuantumMultiple',
  network_validators_incumbentBonus: 'network_validators_incumbentBonus',
 } as const;

@@ -85,7 +85,6 @@ describe('ProposalsList', () => {
      'Settlement asset',
      'State',
      'Parent market',
-      'Voting',
      'Closing date',
      'Enactment date',
      '', // actions col
@@ -1,8 +1,6 @@
 import { useMemo } from 'react';
-import BigNumber from 'bignumber.js';
 import type { ColDef } from 'ag-grid-community';
 import {
-  CenteredGridCellWrapper,
  COL_DEFS,
  DateRangeFilter,
  SetFilter,
@@ -11,33 +9,18 @@ import {
 import compact from 'lodash/compact';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
 import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import {
-  ProductTypeMapping,
-  ProductTypeShortName,
+  ProposalProductTypeShortName,
  ProposalStateMapping,
 } from '@vegaprotocol/types';
 import type { ProposalListFieldsFragment } from '../../lib/proposals-data-provider/__generated__/Proposals';
-import { VoteProgress } from '../voting-progress';
 import { ProposalActionsDropdown } from '../proposal-actions-dropdown';

 export const useColumnDefs = () => {
-  const { params } = useNetworkParams([
-    NetworkParams.governance_proposal_market_requiredMajority,
-  ]);
-  const requiredMajorityPercentage = useMemo(() => {
-    const requiredMajority =
-      params?.governance_proposal_market_requiredMajority ?? 1;
-    return new BigNumber(requiredMajority).times(100);
-  }, [params?.governance_proposal_market_requiredMajority]);
-
  const columnDefs: ColDef[] = useMemo(() => {
    return compact([
      {
@@ -54,27 +37,38 @@ export const useColumnDefs = () => {
        }) => {
          if (!value || !data) return '-';

-          // TODO: update when we switch to ProductConfiguration
-          const productType = 'Future';
+          const getProductType = (data: ProposalListFieldsFragment) => {
+            if (
+              data.terms.__typename === 'ProposalTerms' &&
+              data.terms.change.__typename === 'NewMarket'
+            ) {
+              return data.terms.change.instrument.product?.__typename;
+            }
+            return undefined;
+          };
+
+          const productType = getProductType(data);
          return (
-            <StackedCell
-              primary={value}
-              secondary={
-                <span
-                  title={ProductTypeMapping[productType]}
-                  className="uppercase"
-                >
-                  {ProductTypeShortName[productType]}
-                </span>
-              }
-            />
+            productType && (
+              <StackedCell
+                primary={value}
+                secondary={
+                  <span
+                    title={ProposalProductTypeShortName[productType]}
+                    className="uppercase"
+                  >
+                    {ProposalProductTypeShortName[productType]}
+                  </span>
+                }
+              />
+            )
          );
        },
      },
      {
        colId: 'asset',
        headerName: t('Settlement asset'),
-        field: 'terms.change.instrument.futureProduct.settlementAsset.symbol',
+        field: 'terms.change.instrument.product.settlementAsset.symbol',
      },
      {
        colId: 'state',
@@ -94,32 +88,6 @@ export const useColumnDefs = () => {
        field: 'terms.change.successorConfiguration.parentMarketId',
        cellRenderer: 'ParentMarketCell',
      },
-      {
-        colId: 'voting',
-        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 (
-              <CenteredGridCellWrapper>
-                <VoteProgress
-                  threshold={requiredMajorityPercentage}
-                  progress={yesPercentage}
-                />
-              </CenteredGridCellWrapper>
-            );
-          }
-          return '-';
-        },
-        filter: false,
-      },
      {
        colId: 'closing-date',
        headerName: t('Closing date'),
@@ -156,7 +124,7 @@ export const useColumnDefs = () => {
        },
      },
    ]);
-  }, [requiredMajorityPercentage]);
+  }, []);

  return columnDefs;
 };
@@ -16,78 +16,90 @@ fragment NewMarketFields on NewMarket {
  instrument {
    name
    code
-    futureProduct {
-      settlementAsset {
-        id
-        name
-        symbol
-        decimals
-        quantum
-      }
-      quoteName
-      dataSourceSpecForSettlementData {
-        sourceType {
-          ... on DataSourceDefinitionExternal {
-            sourceType {
-              ... on DataSourceSpecConfiguration {
-                signers {
-                  signer {
-                    ... on PubKey {
-                      key
-                    }
-                    ... on ETHAddress {
-                      address
+    product {
+      ... on FutureProduct {
+        settlementAsset {
+          id
+          name
+          symbol
+          decimals
+          quantum
+        }
+        quoteName
+        dataSourceSpecForSettlementData {
+          sourceType {
+            ... on DataSourceDefinitionExternal {
+              sourceType {
+                ... on DataSourceSpecConfiguration {
+                  signers {
+                    signer {
+                      ... on PubKey {
+                        key
+                      }
+                      ... on ETHAddress {
+                        address
+                      }
                    }
                  }
-                }
-                filters {
-                  key {
-                    name
-                    type
-                  }
-                  conditions {
-                    operator
-                    value
+                  filters {
+                    key {
+                      name
+                      type
+                    }
+                    conditions {
+                      operator
+                      value
+                    }
                  }
                }
              }
            }
          }
        }
-      }
-      dataSourceSpecForTradingTermination {
-        sourceType {
-          ... on DataSourceDefinitionExternal {
-            sourceType {
-              ... on DataSourceSpecConfiguration {
-                signers {
-                  signer {
-                    ... on PubKey {
-                      key
-                    }
-                    ... on ETHAddress {
-                      address
+        dataSourceSpecForTradingTermination {
+          sourceType {
+            ... on DataSourceDefinitionExternal {
+              sourceType {
+                ... on DataSourceSpecConfiguration {
+                  signers {
+                    signer {
+                      ... on PubKey {
+                        key
+                      }
+                      ... on ETHAddress {
+                        address
+                      }
                    }
                  }
-                }
-                filters {
-                  key {
-                    name
-                    type
-                  }
-                  conditions {
-                    operator
-                    value
+                  filters {
+                    key {
+                      name
+                      type
+                    }
+                    conditions {
+                      operator
+                      value
+                    }
                  }
                }
              }
            }
          }
        }
+        dataSourceSpecBinding {
+          settlementDataProperty
+          tradingTerminationProperty
+        }
      }
-      dataSourceSpecBinding {
-        settlementDataProperty
-        tradingTerminationProperty
+      ... on PerpetualProduct {
+        settlementAsset {
+          id
+          name
+          symbol
+          decimals
+          quantum
+        }
+        quoteName
      }
    }
  }
@@ -128,7 +128,7 @@ export const createProposalListFieldsFragment = (
    instrument: {
      code: 'ETHUSD',
      name: 'ETHUSD',
-      futureProduct: {
+      product: {
        settlementAsset: {
          id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
          name: 'tDAI TEST',
@@ -262,7 +262,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'ETHUSD',
          name: 'ETHUSD',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -352,7 +352,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'LINKUSD',
          name: 'LINKUSD',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'eb30d55e90e1f9e5c4727d6fa2a5a8cd36ab9ae9738eb8f3faf53e2bee4861ee',
              name: 'mUSDT-II',
@@ -442,7 +442,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'LINKUSD',
          name: 'LINKUSD',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'eb30d55e90e1f9e5c4727d6fa2a5a8cd36ab9ae9738eb8f3faf53e2bee4861ee',
              name: 'mUSDT-II',
@@ -532,7 +532,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'ETHUSD',
          name: 'ETHUSD',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -622,7 +622,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'LINKUSD',
          name: 'LINKUSD',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'eb30d55e90e1f9e5c4727d6fa2a5a8cd36ab9ae9738eb8f3faf53e2bee4861ee',
              name: 'mUSDT-II',
@@ -712,7 +712,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'ETHDAI.MF21',
          name: 'ETHDAI Monthly (Dec 2022)',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -802,7 +802,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'AAPL.MF21',
          name: 'Apple Monthly (Dec 2022)',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d',
              name: 'tUSDC TEST',
@@ -892,7 +892,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'BTCUSD.MF21',
          name: 'BTCUSD Monthly (Dec 2022)',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -982,7 +982,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'TSLA.QM21',
          name: 'Tesla Quarterly (Feb 2023)',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: '177e8f6c25a955bd18475084b99b2b1d37f28f3dec393fab7755a7e69c3d8c3b',
              name: 'tEURO TEST',
@@ -1072,7 +1072,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'AAVEDAI.MF21',
          name: 'AAVEDAI Monthly (Dec 2022)',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -1162,7 +1162,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'ETHBTC.QM21',
          name: 'ETHBTC Quarterly (Feb 2023)',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'cee709223217281d7893b650850ae8ee8a18b7539b5658f9b4cc24de95dd18ad',
              name: 'tBTC TEST',
@@ -1252,7 +1252,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'UNIDAI.MF21',
          name: 'UNIDAI Monthly (Dec 2022)',
-          futureProduct: {
+          product: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -71,7 +71,7 @@
    "jsondiffpatch": "^0.4.1",
    "lodash": "^4.17.21",
    "next": "13.3.0",
-    "pennant": "1.14.0",
+    "pennant": "^1.14.1",
    "react": "18.2.0",
    "react-copy-to-clipboard": "^5.0.4",
    "react-dom": "18.2.0",
@@ -20500,10 +20500,10 @@ pend@~1.2.0:
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==

-pennant@1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.14.0.tgz#4100c25a6d836d6f0ff425181fb6f812f9fe5778"
-  integrity sha512-9H0zWzFUSbD1BlDXnHFmKwkAxXGb1xTxjkUD+RwaMygtSwPXzQEyk2ScVyMqxdcz0RuJmI5HCVmZTOjdr1NwuA==
+pennant@^1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.14.1.tgz#8e7a53256095e398b03397af31c831b02a56032b"
+  integrity sha512-rjzo/tlFanO96OKhJiyjQtjug7sY6pjVZqVbieD3Tf4zt20bqIb6m4L2JfwOXEe0jqP/yddgCNPY+vlkVuJW1Q==
  dependencies:
    "@babel/runtime" "^7.13.10"
    "@d3fc/d3fc-technical-indicator" "^8.0.1"
Author	SHA1	Message	Date
Madalina Raicu	f84fad1ccd	feat(trading): update copy for reset dialog and jest	2023-11-24 15:45:53 +00:00
Madalina Raicu	b1549c8a81	fix(trading): reset console to default	2023-11-23 17:44:14 +00:00
Matthew Russell	d9dc43b359	chore(deal-ticket): re-enable margin estimates for perps (#5317 )	2023-11-20 13:57:18 -08:00
m.rayandMatthew Russell	06a6fe6d67	fix(accounts): remove account balance formatting in transfer form (#5315 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-11-20 13:07:17 -08:00
Matthew Russell	4b7338ed94	chore(deal-ticket,markets): dont show margin estimate for perps (#5305 )	2023-11-17 10:33:24 -08:00
Edd	2983c6c6ba	feat(governance): enable volume discount update view (#5304 ) (#5307 )	2023-11-17 10:25:30 -08:00
Matthew Russellandasiaznik	70f42c1c7e	fix(trading): fees page fixes for mainnet (#5303 ) Co-authored-by: asiaznik <artur@vegaprotocol.io>	2023-11-17 08:53:21 -08:00
m.ray	2304ce9763	fix(proposals): perpetual proposed markets (#5290 )	2023-11-17 12:00:19 +00:00
m.ray	79a16b8562	fix(trading): show deal ticket in sidebar by default (#5292 )	2023-11-16 09:08:20 -08:00
Matthew Russell	5661b74082	fix(trading): do not use stakeToCcyVolume to format fees value (#5280 )	2023-11-16 09:34:38 +00:00
m.ray	22703d937e	fix(trading): fix percentage formatter rounding in liquidity table (#5250 )	2023-11-13 16:14:18 +00:00
Matthew RussellandMadalina Raicu	f780013846	feat(accounts): transfer form improvements to handle transfers from vesting accounts (#5212 ) Co-authored-by: Madalina Raicu <madalina@raygroup.uk>	2023-11-08 23:52:30 -08:00
Ben	73f37c2477	chore(ci): fix prepare dist (#5214 )	2023-11-08 09:43:36 +00:00
Art	607ad06971	fix(environment): missing block height in node switcher (#5210 )	2023-11-08 09:47:23 +01:00
Matthew Russell	7aee2a3a7b	chore(candles-chart): update pennant package so chart draws at 60 fps (#5213 )	2023-11-07 21:49:09 -08:00
Bartłomiej Głownia	1fdf519780	feat(trading): fee discounts tweaks (#5205 )	2023-11-07 16:15:54 +01:00