fix: check if preview

feat(trading): referral preview update
fix(trading): display funding rate when market in monitoring auction (#5218 )
2023-11-14 13:37:08 +00:00 · 2023-11-13 14:55:27 +00:00 · 2023-11-10 13:01:24 +00:00 · 2023-11-09 22:31:18 +00:00 · 2023-11-09 12:43:50 -08:00 · 2023-11-09 12:37:32 -08:00
59 changed files with 800 additions and 929 deletions
@@ -52,4 +52,3 @@ cypress.env.json
 /apps/**/cypress/reports/
 /apps/**/cypress/downloads/
 /apps/**/fixtures/wallet/node**
-.nx/
@@ -1,2 +1,4 @@
 * @vegaprotocol/frontend
+apps/ @vegaprotocol/frontend-qa
+libs/ @vegaprotocol/frontend-qa
 *.graphql @vegaprotocol/core
@@ -133,7 +133,7 @@ export const proposalsData = {
              instrument: {
                name: 'UNIDAI Monthly (Dec 2022)',
                code: 'UNIDAI.MF21',
-                product: {
+                futureProduct: {
                  settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
                  __typename: 'FutureProduct',
                },
@@ -240,7 +240,7 @@ export const proposalsData = {
              instrument: {
                name: 'ETHBTC Quarterly (Feb 2023)',
                code: 'ETHBTC.QM21',
-                product: {
+                futureProduct: {
                  settlementAsset: { symbol: 'tBTC', __typename: 'Asset' },
                  __typename: 'FutureProduct',
                },
@@ -35,5 +35,6 @@ NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=false
 NX_UPDATE_MARKET_STATE=false
-NX_REFERRALS=true
+NX_REFERRALS=false
 NX_GOVERNANCE_TRANSFERS=false
+NX_VOLUME_DISCOUNTS=false
@@ -31,8 +31,9 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 CYPRESS_FAIRGROUND=false

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

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true
-NX_REFERRALS=true
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_VOLUME_DISCOUNTS=false
@@ -21,8 +21,9 @@ 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=true
+NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true
-NX_REFERRALS=true
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_VOLUME_DISCOUNTS=false
@@ -25,3 +25,4 @@ NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
 NX_GOVERNANCE_TRANSFERS=true
+NX_VOLUME_DISCOUNTS=true
@@ -29,3 +29,4 @@ NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
+NX_VOLUME_DISCOUNTS=true
@@ -20,8 +20,9 @@ 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=true
+NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true
-NX_REFERRALS=true
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_VOLUME_DISCOUNTS=false
@@ -189,6 +189,7 @@ 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',
-              product: {
+              futureProduct: {
                __typename: 'FutureProduct',
                settlementAsset: {
                  __typename: 'Asset',
@@ -39,18 +39,6 @@ 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 =
@@ -66,10 +54,10 @@ export const ProposalHeader = ({
          <span>
            {t('Code')}: {change.instrument.code}.
          </span>{' '}
-          {proposal?.terms && getAsset(proposal)?.symbol ? (
+          {change.instrument.futureProduct?.settlementAsset.symbol ? (
            <>
              <span className="font-semibold">
-                {getAsset(proposal)?.symbol}
+                {change.instrument.futureProduct.settlementAsset.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,6 +84,7 @@ query Proposal(
  $includeNewMarketProductField: Boolean!
  $includeUpdateMarketState: Boolean!
  $includeUpdateReferralProgram: Boolean!
+  $includeUpdateVolumeDiscountProgram: Boolean!
 ) {
  proposal(id: $proposalId) {
    id
@@ -103,6 +104,7 @@ query Proposal(
    ...UpdateMarketState @include(if: $includeUpdateMarketState)
    ...UpdateReferralProgram @include(if: $includeUpdateReferralProgram)
    ...UpdateVolumeDiscountProgram
+      @include(if: $includeUpdateVolumeDiscountProgram)
    terms {
      closingDatetime
      enactmentDatetime
@@ -130,25 +132,46 @@ query Proposal(
          instrument {
            name
            code
-            product {
-              ... on FutureProduct {
-                settlementAsset {
-                  id
-                  name
-                  symbol
-                  decimals
-                  quantum
-                }
-                quoteName
-                dataSourceSpecBinding {
-                  settlementDataProperty
-                  tradingTerminationProperty
-                }
-                dataSourceSpecForSettlementData {
-                  sourceType {
-                    ... on DataSourceDefinitionInternal {
-                      sourceType {
-                        ... on DataSourceSpecConfigurationTime {
+            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
+                          }
                          conditions {
                            operator
                            value
@@ -156,44 +179,52 @@ query Proposal(
                        }
                      }
                    }
-                    ... on DataSourceDefinitionExternal {
-                      sourceType {
-                        ... on DataSourceSpecConfiguration {
-                          signers {
-                            signer {
-                              ... on PubKey {
-                                key
-                              }
-                              ... on ETHAddress {
-                                address
-                              }
-                            }
-                          }
-                          filters {
-                            key {
-                              name
-                              type
-                            }
-                            conditions {
-                              operator
-                              value
-                            }
-                          }
-                        }
-                      }
-                    }
                  }
                }
              }
-              ... on PerpetualProduct {
-                settlementAsset {
-                  id
-                  name
-                  symbol
-                  decimals
-                  quantum
-                }
-                quoteName
+              # 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
              }
            }
          }
@@ -62,6 +62,7 @@ export const ProposalContainer = () => {
      includeNewMarketProductField: !!FLAGS.PRODUCT_PERPETUALS,
      includeUpdateMarketState: !!FLAGS.UPDATE_MARKET_STATE,
      includeUpdateReferralProgram: !!FLAGS.REFERRALS,
+      includeUpdateVolumeDiscountProgram: !!FLAGS.VOLUME_DISCOUNTS,
    },
    skip: !params.proposalId,
  });
@@ -101,16 +101,9 @@ fragment ProposalFields on Proposal {
        instrument {
          name
          code
-          product {
-            ... on FutureProduct {
-              settlementAsset {
-                symbol
-              }
-            }
-            ... on PerpetualProduct {
-              settlementAsset {
-                symbol
-              }
+          futureProduct {
+            settlementAsset {
+              symbol
            }
          }
        }
@@ -171,6 +164,7 @@ query Proposals(
  $includeNewMarketProductFields: Boolean!
  $includeUpdateMarketStates: Boolean!
  $includeUpdateReferralPrograms: Boolean!
+  $includeUpdateVolumeDiscountPrograms: Boolean!
 ) {
  proposalsConnection {
    edges {
@@ -180,6 +174,7 @@ query Proposals(
        ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
        ...UpdateReferralPrograms @include(if: $includeUpdateReferralPrograms)
        ...UpdateVolumeDiscountPrograms
+          @include(if: $includeUpdateVolumeDiscountPrograms)
      }
    }
  }
@@ -11,16 +11,17 @@ 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, 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 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 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, 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 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 const NewMarketProductFieldsFragmentDoc = gql`
    fragment NewMarketProductFields on Proposal {
@@ -130,16 +131,9 @@ export const ProposalFieldsFragmentDoc = gql`
        instrument {
          name
          code
-          product {
-            ... on FutureProduct {
-              settlementAsset {
-                symbol
-              }
-            }
-            ... on PerpetualProduct {
-              settlementAsset {
-                symbol
-              }
+          futureProduct {
+            settlementAsset {
+              symbol
            }
          }
        }
@@ -197,7 +191,7 @@ export const ProposalFieldsFragmentDoc = gql`
 }
    `;
 export const ProposalsDocument = gql`
-    query Proposals($includeNewMarketProductFields: Boolean!, $includeUpdateMarketStates: Boolean!, $includeUpdateReferralPrograms: Boolean!) {
+    query Proposals($includeNewMarketProductFields: Boolean!, $includeUpdateMarketStates: Boolean!, $includeUpdateReferralPrograms: Boolean!, $includeUpdateVolumeDiscountPrograms: Boolean!) {
  proposalsConnection {
    edges {
      node {
@@ -205,7 +199,7 @@ export const ProposalsDocument = gql`
        ...NewMarketProductFields @include(if: $includeNewMarketProductFields)
        ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
        ...UpdateReferralPrograms @include(if: $includeUpdateReferralPrograms)
-        ...UpdateVolumeDiscountPrograms
+        ...UpdateVolumeDiscountPrograms @include(if: $includeUpdateVolumeDiscountPrograms)
      }
    }
  }
@@ -231,6 +225,7 @@ ${UpdateVolumeDiscountProgramsFragmentDoc}`;
 *      includeNewMarketProductFields: // value for 'includeNewMarketProductFields'
 *      includeUpdateMarketStates: // value for 'includeUpdateMarketStates'
 *      includeUpdateReferralPrograms: // value for 'includeUpdateReferralPrograms'
+ *      includeUpdateVolumeDiscountPrograms: // value for 'includeUpdateVolumeDiscountPrograms'
 *   },
 * });
 */
@@ -50,6 +50,7 @@ export const ProposalsContainer = () => {
      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
      includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
+      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
    },
  });

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

@@ -1,5 +1,7 @@
-import { Route, Routes } from 'react-router-dom';
+import { Route, Routes, useParams } from 'react-router-dom';
+import { MarketState } from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/i18n';
+import { useMarket } from '@vegaprotocol/markets';
 import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import {
  SidebarButton,
@@ -9,7 +11,12 @@ 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 (
    <>
@@ -37,12 +44,14 @@ export const MarketsSidebar = () => {
          element={
            <>
              <SidebarDivider />
-              <SidebarButton
-                view={ViewType.Order}
-                icon={VegaIconNames.TICKET}
-                tooltip={t('Order')}
-                routeId={currentRouteId}
-              />
+              {active && (
+                <SidebarButton
+                  view={ViewType.Order}
+                  icon={VegaIconNames.TICKET}
+                  tooltip={t('Order')}
+                  routeId={currentRouteId}
+                />
+              )}
              <SidebarButton
                view={ViewType.Info}
                icon={VegaIconNames.BREAKDOWN}
@@ -17,7 +17,7 @@ import { useReferral } from './hooks/use-referral';
 import { Routes } from '../../lib/links';
 import { useTransactionEventSubscription } from '@vegaprotocol/web3';
 import { t } from '@vegaprotocol/i18n';
-import { Statistics } from './referral-statistics';
+import { Statistics, useStats } from './referral-statistics';
 import { useReferralProgram } from './hooks/use-referral-program';

 const RELOAD_DELAY = 3000;
@@ -132,6 +132,8 @@ export const ApplyCodeForm = () => {
      }),
  });

+  const { epochsValue, nextBenefitTierValue } = useStats({ program });
+
  // go to main page when successfully applied
  useEffect(() => {
    if (status === 'successful') {
@@ -196,6 +198,10 @@ export const ApplyCodeForm = () => {
    };
  };

+  const nextBenefitTierEpochsValue = nextBenefitTierValue
+    ? nextBenefitTierValue.epochs - epochsValue
+    : 0;
+
  return (
    <>
      <div className="w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg">
@@ -238,7 +244,12 @@ export const ApplyCodeForm = () => {
      ) : null}
      {previewData ? (
        <div className="mt-10">
-          <h2 className="text-2xl mb-5">{t('You are joining')}</h2>
+          <h2 className="text-2xl mb-5">
+            {t(
+              'You are joining the group shown, but will not have access to benefits until you have completed at least %s epochs.',
+              [nextBenefitTierEpochsValue.toString()]
+            )}
+          </h2>
          <Statistics data={previewData} program={program} as="referee" />
        </div>
      ) : null}
@@ -25,7 +25,7 @@ import compact from 'lodash/compact';
 import { useReferralProgram } from './hooks/use-referral-program';
 import { useStakeAvailable } from './hooks/use-stake-available';
 import sortBy from 'lodash/sortBy';
-import { useLayoutEffect, useRef, useState } from 'react';
+import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useCurrentEpochInfoQuery } from './hooks/__generated__/Epoch';
 import BigNumber from 'bignumber.js';
 import { t } from '@vegaprotocol/i18n';
@@ -59,21 +59,20 @@ export const ReferralStatistics = () => {
  return <CreateCodeContainer />;
 };

-export const Statistics = ({
+export const useStats = ({
  data,
  program,
  as,
 }: {
-  data: NonNullable<ReturnType<typeof useReferral>['data']>;
+  data?: NonNullable<ReturnType<typeof useReferral>['data']>;
  program: ReturnType<typeof useReferralProgram>;
-  as: 'referrer' | 'referee';
+  as?: 'referrer' | 'referee';
 }) => {
-  const { benefitTiers, details } = program;
+  const { benefitTiers } = program;
  const { data: epochData } = useCurrentEpochInfoQuery();
-  const { stakeAvailable } = useStakeAvailable();
  const { data: statsData } = useReferralSetStatsQuery({
    variables: {
-      code: data.code,
+      code: data?.code || '',
    },
    skip: !data?.code,
    fetchPolicy: 'cache-and-network',
@@ -81,19 +80,12 @@ export const Statistics = ({

  const currentEpoch = Number(epochData?.epoch.id);

-  const compactNumFormat = new Intl.NumberFormat(getUserLocale(), {
-    minimumFractionDigits: 0,
-    maximumFractionDigits: 2,
-    notation: 'compact',
-    compactDisplay: 'short',
-  });
-
  const stats =
    statsData?.referralSetStats.edges &&
    compact(removePaginationWrapper(statsData.referralSetStats.edges));
-  const refereeInfo = data.referee;
+  const refereeInfo = data?.referee;
  const refereeStats = stats?.find(
-    (r) => r.partyId === data.referee?.refereeId
+    (r) => r.partyId === data?.referee?.refereeId
  );

  const statsAvailable = stats && stats.length > 0 && stats[0];
@@ -136,6 +128,60 @@ export const Statistics = ({
    ? nextBenefitTierValue.epochs - epochsValue
    : 0;

+  return {
+    baseCommissionValue,
+    runningVolumeValue,
+    referrerVolumeValue,
+    multiplier,
+    finalCommissionValue,
+    discountFactorValue,
+    currentBenefitTierValue,
+    nextBenefitTierValue,
+    epochsValue,
+    nextBenefitTierVolumeValue,
+    nextBenefitTierEpochsValue,
+  };
+};
+
+export const Statistics = ({
+  data,
+  program,
+  as,
+}: {
+  data: NonNullable<ReturnType<typeof useReferral>['data']>;
+  program: ReturnType<typeof useReferralProgram>;
+  as: 'referrer' | 'referee';
+}) => {
+  const {
+    baseCommissionValue,
+    runningVolumeValue,
+    referrerVolumeValue,
+    multiplier,
+    finalCommissionValue,
+    discountFactorValue,
+    currentBenefitTierValue,
+    epochsValue,
+    nextBenefitTierVolumeValue,
+    nextBenefitTierEpochsValue,
+  } = useStats({ data, program, as });
+
+  const isApplyCodePreview = useMemo(
+    () => data.referee === null,
+    [data.referee]
+  );
+
+  const { benefitTiers } = useReferralProgram();
+
+  const { stakeAvailable } = useStakeAvailable();
+  const { details } = program;
+
+  const compactNumFormat = new Intl.NumberFormat(getUserLocale(), {
+    minimumFractionDigits: 0,
+    maximumFractionDigits: 2,
+    notation: 'compact',
+    compactDisplay: 'short',
+  });
+
  const baseCommissionTile = (
    <StatTile
      title={t('Base commission rate')}
@@ -229,11 +275,18 @@ export const Statistics = ({

  const currentBenefitTierTile = (
    <StatTile title={t('Current tier')}>
-      {currentBenefitTierValue?.tier || 'None'}
+      {isApplyCodePreview
+        ? currentBenefitTierValue?.tier || benefitTiers[0]?.tier || 'None'
+        : currentBenefitTierValue?.tier || 'None'}
    </StatTile>
  );
  const discountFactorTile = (
-    <StatTile title={t('Discount')}>{discountFactorValue * 100}%</StatTile>
+    <StatTile title={t('Discount')}>
+      {isApplyCodePreview
+        ? benefitTiers[0].discountFactor * 100
+        : discountFactorValue * 100}
+      %
+    </StatTile>
  );
  const runningVolumeTile = (
    <StatTile
@@ -265,11 +318,11 @@ export const Statistics = ({
    <>
      <div className="grid grid-rows-1 gap-5 grid-cols-1 md:grid-cols-3">
        {currentBenefitTierTile}
-        {discountFactorTile}
+        {runningVolumeTile}
        {codeTile}
      </div>
      <div className="grid grid-rows-1 gap-5 grid-cols-1 sm:grid-cols-2 xl:grid-cols-4">
-        {runningVolumeTile}
+        {discountFactorTile}
        {nextTierVolumeTile}
        {epochsTile}
        {nextTierEpochsTile}
@@ -15,12 +15,15 @@ export const LedgerContainer = () => {
  });

  const assets = (data?.party?.accountsConnection?.edges ?? [])
-    .map((item) => item?.node?.asset)
-    .filter((asset): asset is PartyAssetFieldsFragment => !!asset?.id)
-    .reduce(
-      (aggr, item) => Object.assign(aggr, { [item.id]: item.symbol }),
-      {} as Record<string, string>
-    );
+    .map<PartyAssetFieldsFragment>(
+      (item) => item?.node?.asset ?? ({} as PartyAssetFieldsFragment)
+    )
+    .reduce((aggr, item) => {
+      if ('id' in item && 'symbol' in item) {
+        aggr[item.id as string] = item.symbol as string;
+      }
+      return aggr;
+    }, {} as Record<string, string>);

  if (!pubKey) {
    return (
@@ -1,12 +0,0 @@
-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,19 +1,12 @@
 import { t } from '@vegaprotocol/i18n';
-import {
-  Dialog,
-  Intent,
-  Switch,
-  ToastPositionSetter,
-  TradingButton,
-} from '@vegaprotocol/ui-toolkit';
+import { Switch, ToastPositionSetter } from '@vegaprotocol/ui-toolkit';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { useTelemetryApproval } from '../../lib/hooks/use-telemetry-approval';
-import { useState, type ReactNode } from 'react';
+import 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')}>
@@ -38,52 +31,6 @@ 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>
  );
 };
@@ -170,7 +170,7 @@ html [data-theme='dark'] {

 .ag-theme-balham,
 .ag-theme-balham-dark {
-  --ag-grid-size: 3px; /* Used for compactness */
+  --ag-grid-size: 2px; /* Used for compactness */
  --ag-row-height: 36px;
  --ag-header-height: 28px;
 }
@@ -184,7 +184,7 @@ html [data-theme='dark'] {

 /* Light variables */
 .ag-theme-balham {
-  --ag-background-color: theme(colors.vega.clight.900);
+  --ag-background-color: transparent;
  --ag-border-color: theme(colors.vega.clight.600);
  --ag-header-background-color: theme(colors.vega.clight.700);
  --ag-odd-row-background-color: transparent;
@@ -196,7 +196,7 @@ html [data-theme='dark'] {

 /* Dark variables */
 .ag-theme-balham-dark {
-  --ag-background-color: theme(colors.vega.cdark.900);
+  --ag-background-color: transparent;
  --ag-border-color: theme(colors.vega.cdark.600);
  --ag-header-background-color: theme(colors.vega.cdark.700);
  --ag-odd-row-background-color: transparent;
@@ -1,23 +1,10 @@
-import { act, render, screen, within } from '@testing-library/react';
+import { act, render, screen } 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,
@@ -26,7 +13,12 @@ const singleRow = {
    __typename: 'Market',
    id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
  },
-  asset: asset1,
+  asset: {
+    __typename: 'Asset',
+    id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+    symbol: 'tBTC',
+    decimals: 5,
+  },
  available: '125600000',
  used: '125600000',
  total: '251200000',
@@ -41,7 +33,12 @@ const secondRow = {
    __typename: 'Market',
    id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
  },
-  asset: asset2,
+  asset: {
+    __typename: 'Asset',
+    id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+    symbol: 'aBTC',
+    decimals: 5,
+  },
  available: '125600001',
  used: '125600001',
  total: '251200002',
@@ -137,7 +134,7 @@ describe('AccountsTable', () => {

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

-    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');
+    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');
  });

  it('should apply correct formatting in view as user mode', async () => {
@@ -179,7 +176,12 @@ describe('AccountsTable', () => {
        rowData={singleRowData}
        onClickAsset={() => null}
        isReadOnly={false}
-        pinnedAsset={asset1}
+        pinnedAsset={{
+          decimals: 5,
+          id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+          symbol: 'tBTC',
+          name: 'tBTC',
+        }}
      />
    );
    await screen.findAllByRole('rowgroup');
@@ -211,13 +213,23 @@ describe('AccountsTable', () => {
    const result = getAccountData([singleRow]);
    const expected = [
      {
-        asset: asset1,
+        asset: {
+          __typename: 'Asset',
+          decimals: 5,
+          id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+          symbol: 'tBTC',
+        },
        available: '0',
        balance: '0',
        breakdown: [
          {
            __typename: 'AccountBalance',
-            asset: asset1,
+            asset: {
+              __typename: 'Asset',
+              decimals: 5,
+              id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+              symbol: 'tBTC',
+            },
            available: '0',
            balance: '125600000',
            total: '125600000',
@@ -1,10 +1,4 @@
-import {
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-  within,
-} from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import BigNumber from 'bignumber.js';
 import {
@@ -13,7 +7,7 @@ import {
  TransferForm,
  type TransferFormProps,
 } from './transfer-form';
-import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
+import { AccountType } from '@vegaprotocol/types';
 import { removeDecimal } from '@vegaprotocol/utils';

 describe('TransferForm', () => {
@@ -45,7 +39,8 @@ describe('TransferForm', () => {
  };

  const amount = '100';
-  const pubKey = '1'.repeat(64);
+  const pubKey =
+    '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680';
  const asset = {
    id: 'eur',
    symbol: '€',
@@ -55,7 +50,10 @@ describe('TransferForm', () => {
  };
  const props = {
    pubKey,
-    pubKeys: [pubKey, '2'.repeat(64)],
+    pubKeys: [
+      pubKey,
+      'a4b6e3de5d7ef4e31ae1b090be49d1a2ef7bcefff60cccf7658a0d4922651cce',
+    ],
    feeFactor: '0.001',
    submitTransfer: jest.fn(),
    accounts: [
@@ -184,7 +182,7 @@ describe('TransferForm', () => {

    // Test use max button
    await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
-    expect(amountInput).toHaveValue('1000.00');
+    expect(amountInput).toHaveValue('1000');

    // Test amount validation
    await userEvent.clear(amountInput);
@@ -269,7 +267,7 @@ describe('TransferForm', () => {

    // Test use max button
    await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
-    expect(amountInput).toHaveValue('100.00');
+    expect(amountInput).toHaveValue('100');

    // If transfering from a vested account 'include fees' checkbox should
    // be disabled and fees should be 0
@@ -298,88 +296,6 @@ describe('TransferForm', () => {
    });
  });

-  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();
@@ -5,6 +5,7 @@ import {
  vegaPublicKey,
  addDecimal,
  formatNumber,
+  addDecimalsFormatNumber,
  toBigNum,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
@@ -213,7 +214,12 @@ export const TransferForm = ({
                <AssetOption
                  key={a.key}
                  asset={a}
-                  balance={<Balance balance={a.balance} symbol={a.symbol} />}
+                  balance={
+                    <Balance
+                      balance={formatNumber(a.balance, a.decimals)}
+                      symbol={a.symbol}
+                    />
+                  }
                />
              ))}
            </TradingRichSelect>
@@ -280,8 +286,8 @@ export const TransferForm = ({
                  return (
                    <option value={id} key={id}>
                      {AccountTypeMapping[a.type]} (
-                      {addDecimal(a.balance, a.asset.decimals)} {a.asset.symbol}
-                      )
+                      {addDecimalsFormatNumber(a.balance, a.asset.decimals)}{' '}
+                      {a.asset.symbol})
                    </option>
                  );
                })}
@@ -407,7 +413,7 @@ export const TransferForm = ({
            type="button"
            className="absolute top-0 right-0 ml-auto text-xs underline"
            onClick={() =>
-              setValue('amount', accountBalance, {
+              setValue('amount', parseFloat(accountBalance).toString(), {
                shouldValidate: true,
              })
            }
@@ -37,9 +37,6 @@ export const AgGridThemed = ({
    <div className={wrapperClasses}>
      <AgGridReact
        defaultColDef={defaultColDef}
-        overlayLoadingTemplate={t('Loading...')}
-        overlayNoRowsTemplate={t('No data')}
-        suppressDragLeaveHidesColumns
        ref={gridRef}
        {...defaultProps}
        {...props}
@@ -151,7 +151,6 @@ export const DealTicketMarginDetails = ({
  const { decimals: assetDecimals, quantum } = asset;
  let marginRequiredBestCase: string | undefined = undefined;
  let marginRequiredWorstCase: string | undefined = undefined;
-
  if (marginEstimate) {
    if (currentMargins) {
      marginRequiredBestCase = (
@@ -289,7 +288,7 @@ export const DealTicketMarginDetails = ({
  const quoteName = getQuoteName(market);

  return (
-    <div className="flex flex-col w-full gap-2 pt-2">
+    <div className="flex flex-col w-full gap-2">
      <Accordion>
        <AccordionPanel
          itemId="margin"
@@ -297,7 +296,7 @@ export const DealTicketMarginDetails = ({
            <AccordionPrimitive.Trigger
              data-testid="accordion-toggle"
              className={classNames(
-                'w-full',
+                'w-full pt-2',
                'flex items-center gap-2 text-xs',
                'group'
              )}
@@ -685,7 +685,7 @@ export const DealTicket = ({
        subLabel={`${formatValue(
          normalizedOrder.size,
          market.positionDecimalPlaces
-        )} ${baseQuote} @ ${
+        )} ${baseQuote || ''} @ ${
          type === Schema.OrderType.TYPE_MARKET
            ? 'market'
            : `${formatValue(
@@ -278,4 +278,18 @@ describe('createDownloadUrl', () => {
      )}&dateRange.endTimestamp=${toNanoSeconds(dateTo)}`
    );
  });
+
+  it('should throw if invalid args are provided', () => {
+    // invalid url
+    expect(() => {
+      // @ts-ignore override z.infer type
+      createDownloadUrl({ ...args, protohost: 'foo' });
+    }).toThrow();
+
+    // invalid partyId
+    expect(() => {
+      // @ts-ignore override z.infer type
+      createDownloadUrl({ ...args, partyId: 'z'.repeat(64) });
+    }).toThrow();
+  });
 });
@@ -1,18 +1,18 @@
-import { useRef, useCallback } from 'react';
-import { subDays } from 'date-fns';
-import { Controller, useForm } from 'react-hook-form';
+import { useRef, useState } from 'react';
+import { format, subDays } from 'date-fns';
 import {
-  InputError,
  Intent,
+  Loader,
  TradingButton,
  TradingFormGroup,
  TradingInput,
  TradingSelect,
 } from '@vegaprotocol/ui-toolkit';
+import { z } from 'zod';
 import {
  formatForInput,
-  getDateTimeFormat,
  toNanoSeconds,
+  VEGA_ID_REGEX,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { localLoggerFactory } from '@vegaprotocol/logger';
@@ -35,18 +35,18 @@ const getProtoHost = (vegaurl: string) => {
  return `${loc.protocol}//${loc.host}`;
 };

-type LedgerFormValues = {
-  assetId: string;
-  dateFrom: string;
-  dateTo?: string;
-};
+const downloadSchema = z.object({
+  protohost: z.string().url().nonempty(),
+  partyId: z.string().regex(VEGA_ID_REGEX).nonempty(),
+  assetId: z.string().regex(VEGA_ID_REGEX).nonempty(),
+  dateFrom: z.string().nonempty(),
+  dateTo: z.string().optional(),
+});
+
+export const createDownloadUrl = (args: z.infer<typeof downloadSchema>) => {
+  // check args from form inputs
+  downloadSchema.parse(args);

-export const createDownloadUrl = (
-  args: LedgerFormValues & {
-    partyId: string;
-    protohost: string;
-  }
-) => {
  const params = new URLSearchParams();
  params.append('partyId', args.partyId);
  params.append('assetId', args.assetId);
@@ -71,102 +71,115 @@ interface Props {

 export const LedgerExportForm = ({ partyId, vegaUrl, assets }: Props) => {
  const now = useRef(new Date());
-  const { control, handleSubmit, watch } = useForm<LedgerFormValues>({
-    defaultValues: {
-      dateFrom: formatForInput(subDays(now.current, 7)),
-      dateTo: '',
-      assetId: Object.keys(assets)[0],
-    },
+  const [dateFrom, setDateFrom] = useState(() => {
+    return formatForInput(subDays(now.current, 7));
  });
-  const dateTo = watch('dateTo');
+  const [dateTo, setDateTo] = useState('');
  const maxFromDate = formatForInput(new Date(dateTo || now.current));
  const maxToDate = formatForInput(now.current);
+
+  const [assetId, setAssetId] = useState(Object.keys(assets)[0]);
  const protohost = getProtoHost(vegaUrl);
+  const disabled = Boolean(!assetId);

  const hasItem = useLedgerDownloadFile((store) => store.hasItem);
  const updateDownloadQueue = useLedgerDownloadFile(
    (store) => store.updateQueue
  );

-  const startDownload = useCallback(
-    async (formValues: LedgerFormValues) => {
-      const link = createDownloadUrl({
-        protohost,
-        partyId,
-        ...formValues,
-      });
-
-      const dateTimeFormatter = getDateTimeFormat();
-      const title = t('Downloading for %s from %s till %s', [
-        assets[formValues.assetId],
-        dateTimeFormatter.format(new Date(formValues.dateFrom)),
-        dateTimeFormatter.format(new Date(formValues.dateTo || Date.now())),
-      ]);
-
-      const downloadStoreItem = {
-        title,
-        link,
-        isChanged: true,
-      };
-      if (hasItem(link)) {
-        updateDownloadQueue(downloadStoreItem);
-        return;
-      }
-      const ts = setTimeout(() => {
-        updateDownloadQueue({
-          ...downloadStoreItem,
-          intent: Intent.Warning,
-          isDelayed: true,
-          isChanged: true,
-        });
-      }, 1000 * 30);
-
-      try {
-        updateDownloadQueue(downloadStoreItem);
-        const resp = await fetch(link);
-        if (!resp?.ok) {
-          if (resp?.status === 429) {
-            throw new Error('Too many requests. Try again later.');
-          }
-          throw new Error('Download of ledger entries failed');
-        }
-        const { headers } = resp;
-        const nameHeader = headers.get('content-disposition');
-        const filename =
-          nameHeader?.split('=').pop() ?? DEFAULT_EXPORT_FILE_NAME;
-        updateDownloadQueue({
-          ...downloadStoreItem,
-          filename,
-        });
-        const blob = await resp.blob();
-        if (blob) {
-          updateDownloadQueue({
-            ...downloadStoreItem,
-            blob,
-            isDownloaded: true,
-            isChanged: true,
-            intent: Intent.Success,
-          });
-        }
-      } catch (err) {
-        localLoggerFactory({ application: 'ledger' }).error(
-          'Download file',
-          err
-        );
-        updateDownloadQueue({
-          ...downloadStoreItem,
-          intent: Intent.Danger,
-          isError: true,
-          isChanged: true,
-          errorMessage: (err as Error).message || undefined,
-        });
-      } finally {
-        clearTimeout(ts);
-      }
-    },
-    [assets, hasItem, partyId, protohost, updateDownloadQueue]
+  const assetDropDown = (
+    <TradingSelect
+      id="select-ledger-asset"
+      value={assetId}
+      onChange={(e) => {
+        setAssetId(e.target.value);
+      }}
+      className="w-full"
+      data-testid="select-ledger-asset"
+    >
+      {Object.keys(assets).map((assetKey) => (
+        <option key={assetKey} value={assetKey}>
+          {assets[assetKey]}
+        </option>
+      ))}
+    </TradingSelect>
  );

+  const link = createDownloadUrl({
+    protohost,
+    partyId,
+    assetId,
+    dateFrom,
+    dateTo,
+  });
+
+  const startDownload = async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+
+    const title = t('Downloading for %s from %s till %s', [
+      assets[assetId],
+      format(new Date(dateFrom), 'dd MMMM yyyy HH:mm'),
+      format(new Date(dateTo || Date.now()), 'dd MMMM yyyy HH:mm'),
+    ]);
+
+    const downloadStoreItem = {
+      title,
+      link,
+      isChanged: true,
+    };
+    if (hasItem(link)) {
+      updateDownloadQueue(downloadStoreItem);
+      return;
+    }
+    const ts = setTimeout(() => {
+      updateDownloadQueue({
+        ...downloadStoreItem,
+        intent: Intent.Warning,
+        isDelayed: true,
+        isChanged: true,
+      });
+    }, 1000 * 30);
+
+    try {
+      updateDownloadQueue(downloadStoreItem);
+      const resp = await fetch(link);
+      if (!resp?.ok) {
+        if (resp?.status === 429) {
+          throw new Error('Too many requests. Try again later.');
+        }
+        throw new Error('Download of ledger entries failed');
+      }
+      const { headers } = resp;
+      const nameHeader = headers.get('content-disposition');
+      const filename = nameHeader?.split('=').pop() ?? DEFAULT_EXPORT_FILE_NAME;
+      updateDownloadQueue({
+        ...downloadStoreItem,
+        filename,
+      });
+      const blob = await resp.blob();
+      if (blob) {
+        updateDownloadQueue({
+          ...downloadStoreItem,
+          blob,
+          isDownloaded: true,
+          isChanged: true,
+          intent: Intent.Success,
+        });
+      }
+    } catch (err) {
+      localLoggerFactory({ application: 'ledger' }).error('Download file', err);
+      updateDownloadQueue({
+        ...downloadStoreItem,
+        intent: Intent.Danger,
+        isError: true,
+        isChanged: true,
+        errorMessage: (err as Error).message || undefined,
+      });
+    } finally {
+      clearTimeout(ts);
+    }
+  };
+
  if (!protohost || Object.keys(assets).length === 0) {
    return null;
  }
@@ -174,117 +187,49 @@ export const LedgerExportForm = ({ partyId, vegaUrl, assets }: Props) => {
  const offset = new Date().getTimezoneOffset();

  return (
-    <form
-      onSubmit={handleSubmit(startDownload)}
-      className="p-4 w-[350px]"
-      noValidate
-    >
+    <form onSubmit={startDownload} className="p-4 w-[350px]">
      <h2 className="mb-4">{t('Export ledger entries')}</h2>
-      <Controller
-        name="assetId"
-        control={control}
-        rules={{
-          required: t('You need to select an asset'),
-        }}
-        render={({ field, fieldState }) => (
-          <div className="mb-2">
-            <TradingFormGroup
-              label={t('Select asset')}
-              labelFor="asset"
-              compact
-            >
-              <TradingSelect
-                {...field}
-                id="select-ledger-asset"
-                className="w-full"
-                data-testid="select-ledger-asset"
-              >
-                {Object.keys(assets).map((assetKey) => (
-                  <option key={assetKey} value={assetKey}>
-                    {assets[assetKey]}
-                  </option>
-                ))}
-              </TradingSelect>
-            </TradingFormGroup>
-            {fieldState.error && (
-              <InputError>{fieldState.error.message}</InputError>
-            )}
-          </div>
-        )}
-      />
-      <Controller
-        name="dateFrom"
-        control={control}
-        rules={{
-          required: t('You need to provide a date from'),
-          max: {
-            value: maxFromDate,
-            message: dateTo
-              ? t('Date from cannot be greater than date to')
-              : t('Date from cannot be in the future'),
-          },
-          deps: ['dateTo'],
-        }}
-        render={({ field, fieldState }) => (
-          <div className="mb-2">
-            <TradingFormGroup
-              label={t('Date from')}
-              labelFor="date-from"
-              compact
-            >
-              <TradingInput
-                {...field}
-                type="datetime-local"
-                data-testid="date-from"
-                id="date-from"
-                max={maxFromDate}
-              />
-            </TradingFormGroup>
-            {fieldState.error && (
-              <InputError>{fieldState.error.message}</InputError>
-            )}
-          </div>
-        )}
-      />
-      <Controller
-        name="dateTo"
-        control={control}
-        rules={{
-          max: {
-            value: maxToDate,
-            message: t('Date to cannot be in the future'),
-          },
-        }}
-        render={({ field, fieldState }) => (
-          <div className="mb-2">
-            <TradingFormGroup label={t('Date to')} labelFor="date-to" compact>
-              <TradingInput
-                {...field}
-                type="datetime-local"
-                data-testid="date-to"
-                id="date-to"
-                max={maxToDate}
-              />
-            </TradingFormGroup>
-            {fieldState.error && (
-              <InputError>{fieldState.error.message}</InputError>
-            )}
-          </div>
-        )}
-      />
+      <TradingFormGroup label={t('Select asset')} labelFor="asset">
+        {assetDropDown}
+      </TradingFormGroup>
+      <TradingFormGroup label={t('Date from')} labelFor="date-from">
+        <TradingInput
+          type="datetime-local"
+          data-testid="date-from"
+          id="date-from"
+          value={dateFrom}
+          onChange={(e) => setDateFrom(e.target.value)}
+          max={maxFromDate}
+        />
+      </TradingFormGroup>
+      <TradingFormGroup label={t('Date to')} labelFor="date-to">
+        <TradingInput
+          type="datetime-local"
+          data-testid="date-to"
+          id="date-to"
+          value={dateTo}
+          onChange={(e) => setDateTo(e.target.value)}
+          max={maxToDate}
+        />
+      </TradingFormGroup>
      <div className="relative text-sm" title={t('Download all to .csv file')}>
-        <TradingButton fill type="submit" data-testid="ledger-download-button">
+        <TradingButton
+          fill
+          disabled={disabled}
+          type="submit"
+          data-testid="ledger-download-button"
+        >
          {t('Download')}
        </TradingButton>
      </div>
-      {offset ? (
+      {offset && (
        <p className="text-xs text-neutral-400 mt-1">
          {t(
            'The downloaded file uses the UTC time zone for all listed times. Your time zone is UTC%s.',
            [toHoursAndMinutes(offset)]
          )}
        </p>
-      ) : null}
+      )}
    </form>
  );
 };
@@ -2,6 +2,7 @@ import { useMemo } from 'react';
 import {
  addDecimalsFormatNumber,
  addDecimalsFormatNumberQuantum,
+  formatNumberPercentage,
  getDateTimeFormat,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
@@ -28,12 +29,6 @@ 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) || '-';
@@ -106,6 +101,9 @@ export const LiquidityTable = ({

    const feesAccruedTooltip = ({ value, data }: ITooltipParams) => {
      if (!value) return '-';
+      const newValue = new BigNumber(value)
+        .times(Number(stakeToCcyVolume) || 1)
+        .toString();
      let lessThanFull = false,
        lessThanMinimum = false;
      if (data.sla) {
@@ -128,11 +126,11 @@ export const LiquidityTable = ({
              new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).times(
                100
              ),
-              4
+              2
            ),
            formatNumberPercentage(
              new BigNumber(data.commitmentMinTimeFraction).times(100),
-              4
+              2
            ),
          ]
        );
@@ -145,12 +143,12 @@ export const LiquidityTable = ({
              new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).times(
                100
              ),
-              4
+              2
            ),
          ]
        );
      }
-      return addDecimalsFormatNumber(value, assetDecimalPlaces ?? 0);
+      return addDecimalsFormatNumber(newValue, assetDecimalPlaces ?? 0);
    };

    const stakeToCcyVolumeQuantumFormatter = ({
@@ -396,7 +394,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: assetDecimalsQuantumFormatter,
+            valueFormatter: stakeToCcyVolumeQuantumFormatter,
            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'
@@ -16,7 +16,7 @@ import type {
  MarketDataQueryVariables,
 } from './__generated__/market-data';
 import { getMarketPrice } from './get-price';
-import { isMarketInAuction } from './is-market-in-auction';
+import { MarketTradingMode } from '@vegaprotocol/types';

 export type MarketData = MarketDataFieldsFragment;

@@ -142,7 +142,11 @@ export const fundingRateProvider = makeDerivedDataProvider<
  MarketDataQueryVariables
 >([marketDataProvider], (parts) => {
  const marketData = parts[0] as ReturnType<typeof getData>;
-  return marketData && !isMarketInAuction(marketData.marketTradingMode)
+  return marketData &&
+    ![
+      MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
+      MarketTradingMode.TRADING_MODE_SUSPENDED_VIA_GOVERNANCE,
+    ].includes(marketData.marketTradingMode)
    ? marketData?.productData?.fundingRate || null
    : null;
 });
@@ -28,22 +28,6 @@ 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,3 +1,12 @@
+fragment MarketCandlesFields on Candle {
+  high
+  low
+  open
+  close
+  volume
+  periodStart
+}
+
 query MarketsCandles($interval: Interval!, $since: String!) {
  marketsConnection {
    edges {
@@ -148,6 +148,7 @@ export const OrderListManager = ({
              expiresAt: editOrder.expiresAt,
              side: editOrder.side,
              marketId: editOrder.market.id,
+              remaining: editOrder.remaining,
            };
            create({ orderAmendment }, originalOrder);
            setEditOrder(null);
@@ -1,4 +1,5 @@
 import {
+  MAXGOINT64,
  addDecimalsFormatNumber,
  getDateTimeFormat,
  isNumeric,
@@ -144,11 +145,22 @@ export const OrderListTable = memo<
              if (!data?.market || !isNumeric(data.size)) {
                return '-';
              }
+
              const prefix = data
                ? data.side === Schema.Side.SIDE_BUY
                  ? '+'
                  : '-'
                : '';
+
+              if (
+                data.size === MAXGOINT64 &&
+                data.timeInForce ===
+                  Schema.OrderTimeInForce.TIME_IN_FORCE_IOC &&
+                data.reduceOnly
+              ) {
+                return t('MAX');
+              }
+
              return (
                prefix +
                addDecimalsFormatNumber(
@@ -27,9 +27,7 @@ jest.mock('@vegaprotocol/data-provider', () => ({
 }));

 describe('PositionsManager', () => {
-  // TODO: temporarily disable close position
-  // eslint-disable-next-line jest/no-disabled-tests
-  it.skip('should close position with max uint64', async () => {
+  it('should close position with max uint64', async () => {
    render(<PositionsManager partyIds={['partyId']} isReadOnly={false} />, {
      wrapper: MockedProvider,
    });
@@ -29,7 +29,6 @@ export const PositionsManager = ({
 }: PositionsManagerProps) => {
  const { pubKeys, pubKey } = useVegaWallet();
  const create = useVegaTransactionStore((store) => store.create);
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
  const onClose = useCallback(
    ({ marketId, openVolume }: { marketId: string; openVolume: string }) =>
      create({
@@ -74,8 +73,7 @@ export const PositionsManager = ({
      pubKeys={pubKeys}
      rowData={data}
      onMarketClick={onMarketClick}
-      // TODO: temporarily disable close position
-      // onClose={onClose}
+      onClose={onClose}
      isReadOnly={isReadOnly}
      multipleKeys={partyIds.length > 1}
      overlayNoRowsTemplate={error ? error.message : t('No positions')}
@@ -85,6 +85,7 @@ describe('ProposalsList', () => {
      'Settlement asset',
      'State',
      'Parent market',
+      'Voting',
      'Closing date',
      'Enactment date',
      '', // actions col
@@ -1,6 +1,8 @@
 import { useMemo } from 'react';
+import BigNumber from 'bignumber.js';
 import type { ColDef } from 'ag-grid-community';
 import {
+  CenteredGridCellWrapper,
  COL_DEFS,
  DateRangeFilter,
  SetFilter,
@@ -9,18 +11,33 @@ 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 {
-  ProposalProductTypeShortName,
+  ProductTypeMapping,
+  ProductTypeShortName,
  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([
      {
@@ -37,38 +54,27 @@ export const useColumnDefs = () => {
        }) => {
          if (!value || !data) return '-';

-          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);
+          // TODO: update when we switch to ProductConfiguration
+          const productType = 'Future';
          return (
-            productType && (
-              <StackedCell
-                primary={value}
-                secondary={
-                  <span
-                    title={ProposalProductTypeShortName[productType]}
-                    className="uppercase"
-                  >
-                    {ProposalProductTypeShortName[productType]}
-                  </span>
-                }
-              />
-            )
+            <StackedCell
+              primary={value}
+              secondary={
+                <span
+                  title={ProductTypeMapping[productType]}
+                  className="uppercase"
+                >
+                  {ProductTypeShortName[productType]}
+                </span>
+              }
+            />
          );
        },
      },
      {
        colId: 'asset',
        headerName: t('Settlement asset'),
-        field: 'terms.change.instrument.product.settlementAsset.symbol',
+        field: 'terms.change.instrument.futureProduct.settlementAsset.symbol',
      },
      {
        colId: 'state',
@@ -88,6 +94,32 @@ 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'),
@@ -124,7 +156,7 @@ export const useColumnDefs = () => {
        },
      },
    ]);
-  }, []);
+  }, [requiredMajorityPercentage]);

  return columnDefs;
 };
@@ -16,90 +16,78 @@ fragment NewMarketFields on NewMarket {
  instrument {
    name
    code
-    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
-                      }
+    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
-                      }
-                    }
-                  }
-                  filters {
-                    key {
-                      name
-                      type
-                    }
-                    conditions {
-                      operator
-                      value
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        dataSourceSpecBinding {
-          settlementDataProperty
-          tradingTerminationProperty
-        }
      }
-      ... on PerpetualProduct {
-        settlementAsset {
-          id
-          name
-          symbol
-          decimals
-          quantum
+      dataSourceSpecForTradingTermination {
+        sourceType {
+          ... on DataSourceDefinitionExternal {
+            sourceType {
+              ... on DataSourceSpecConfiguration {
+                signers {
+                  signer {
+                    ... on PubKey {
+                      key
+                    }
+                    ... on ETHAddress {
+                      address
+                    }
+                  }
+                }
+                filters {
+                  key {
+                    name
+                    type
+                  }
+                  conditions {
+                    operator
+                    value
+                  }
+                }
+              }
+            }
+          }
        }
-        quoteName
+      }
+      dataSourceSpecBinding {
+        settlementDataProperty
+        tradingTerminationProperty
      }
    }
  }
@@ -128,7 +128,7 @@ export const createProposalListFieldsFragment = (
    instrument: {
      code: 'ETHUSD',
      name: 'ETHUSD',
-      product: {
+      futureProduct: {
        settlementAsset: {
          id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
          name: 'tDAI TEST',
@@ -262,7 +262,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'ETHUSD',
          name: 'ETHUSD',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -352,7 +352,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'LINKUSD',
          name: 'LINKUSD',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'eb30d55e90e1f9e5c4727d6fa2a5a8cd36ab9ae9738eb8f3faf53e2bee4861ee',
              name: 'mUSDT-II',
@@ -442,7 +442,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'LINKUSD',
          name: 'LINKUSD',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'eb30d55e90e1f9e5c4727d6fa2a5a8cd36ab9ae9738eb8f3faf53e2bee4861ee',
              name: 'mUSDT-II',
@@ -532,7 +532,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'ETHUSD',
          name: 'ETHUSD',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -622,7 +622,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'LINKUSD',
          name: 'LINKUSD',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'eb30d55e90e1f9e5c4727d6fa2a5a8cd36ab9ae9738eb8f3faf53e2bee4861ee',
              name: 'mUSDT-II',
@@ -712,7 +712,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'ETHDAI.MF21',
          name: 'ETHDAI Monthly (Dec 2022)',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -802,7 +802,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'AAPL.MF21',
          name: 'Apple Monthly (Dec 2022)',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d',
              name: 'tUSDC TEST',
@@ -892,7 +892,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'BTCUSD.MF21',
          name: 'BTCUSD Monthly (Dec 2022)',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -982,7 +982,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'TSLA.QM21',
          name: 'Tesla Quarterly (Feb 2023)',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: '177e8f6c25a955bd18475084b99b2b1d37f28f3dec393fab7755a7e69c3d8c3b',
              name: 'tEURO TEST',
@@ -1072,7 +1072,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'AAVEDAI.MF21',
          name: 'AAVEDAI Monthly (Dec 2022)',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -1162,7 +1162,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'ETHBTC.QM21',
          name: 'ETHBTC Quarterly (Feb 2023)',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'cee709223217281d7893b650850ae8ee8a18b7539b5658f9b4cc24de95dd18ad',
              name: 'tBTC TEST',
@@ -1252,7 +1252,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
        instrument: {
          code: 'UNIDAI.MF21',
          name: 'UNIDAI Monthly (Dec 2022)',
-          product: {
+          futureProduct: {
            settlementAsset: {
              id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
              name: 'tDAI TEST',
@@ -1,72 +0,0 @@
-import { renderHook, waitFor } from '@testing-library/react';
-import { useVegaWallet } from '../use-vega-wallet';
-import { useChainId } from './use-chain-id';
-
-global.fetch = jest.fn();
-const mockFetch = global.fetch as jest.Mock;
-mockFetch.mockImplementation((url: string) => {
-  return Promise.resolve({ ok: true });
-});
-
-jest.mock('../use-vega-wallet', () => {
-  const original = jest.requireActual('../use-vega-wallet');
-  return {
-    ...original,
-    useVegaWallet: jest.fn(),
-  };
-});
-
-describe('useChainId', () => {
-  it('does not call fetch when statistics url could not be determined', async () => {
-    (useVegaWallet as jest.Mock).mockReturnValue({
-      vegaUrl: '',
-    });
-    renderHook(() => useChainId());
-    await waitFor(() => {
-      expect(mockFetch).toHaveBeenCalledTimes(0);
-    });
-  });
-
-  it('calls fetch with correct statistics url', async () => {
-    (useVegaWallet as jest.Mock).mockReturnValue({
-      vegaUrl: 'http://localhost:1234/graphql',
-    });
-    renderHook(() => useChainId());
-    await waitFor(() => {
-      expect(mockFetch).toHaveBeenCalledWith(
-        'http://localhost:1234/statistics'
-      );
-    });
-  });
-
-  it('does not return chain id when chain id is not present in response', async () => {
-    (useVegaWallet as jest.Mock).mockReturnValue({
-      vegaUrl: 'http://localhost:1234/graphql',
-    });
-    const { result } = renderHook(() => useChainId());
-    await waitFor(() => {
-      expect(result.current).toBeUndefined();
-    });
-  });
-
-  it('returns chain id when chain id is present in response', async () => {
-    (useVegaWallet as jest.Mock).mockReturnValue({
-      vegaUrl: 'http://localhost:1234/graphql',
-    });
-    mockFetch.mockImplementation(() => {
-      return Promise.resolve({
-        ok: true,
-        json: () => ({
-          statistics: {
-            chainId: '1234',
-          },
-        }),
-      });
-    });
-    const { result } = renderHook(() => useChainId());
-    await waitFor(() => {
-      expect(result.current).not.toBeUndefined();
-      expect(result.current).toEqual('1234');
-    });
-  });
-});
@@ -3,37 +3,17 @@ import { useVegaWallet } from '../use-vega-wallet';

 const cache: Record<string, string> = {};

-/**
- * Gets the statistics url for a given vega url.
- * Example:
- * https://graphql.example.com/graphql -> https://graphql.example.com/statistics
- */
-const getNodeStatisticsUrl = (vegaUrl: string) => {
-  try {
-    const url = new URL(vegaUrl);
-    url.pathname = 'statistics';
-    return url.toString();
-  } catch (err) {
-    return undefined;
-  }
-};
-
 export const useChainId = () => {
  const { vegaUrl } = useVegaWallet();
  const [chainId, setChainId] = useState<undefined | string>(cache[vegaUrl]);
  const [fetchAttempt, setFetchAttempt] = useState(1);
-
-  const statisticsUrl = getNodeStatisticsUrl(vegaUrl);
-
  useEffect(() => {
-    // abort when `/statistics` URL could not be determined
-    if (!statisticsUrl) return;
    let isCancelled = false;
    if (cache[vegaUrl]) {
      setChainId(cache[vegaUrl]);
      return;
    }
-    fetch(statisticsUrl)
+    fetch(vegaUrl.replace('graphql', 'statistics'))
      .then((response) => response.json())
      .then((response) => {
        if (isCancelled) {
@@ -52,6 +32,6 @@ export const useChainId = () => {
    return () => {
      isCancelled = true;
    };
-  }, [fetchAttempt, statisticsUrl, vegaUrl]);
+  }, [fetchAttempt, vegaUrl]);
  return chainId;
 };
@@ -65,6 +65,7 @@ fragment OrderTxUpdateFields on OrderUpdate {
  expiresAt
  side
  marketId
+  remaining
 }

 subscription OrderTxUpdate($partyId: ID!) {
@@ -21,14 +21,14 @@ export type WithdrawalBusEventSubscriptionVariables = Types.Exact<{

 export type WithdrawalBusEventSubscription = { __typename?: 'Subscription', busEvents?: Array<{ __typename?: 'BusEvent', event: { __typename?: 'Deposit' } | { __typename?: 'TimeUpdate' } | { __typename?: 'TransactionResult' } | { __typename?: 'Withdrawal', id: string, status: Types.WithdrawalStatus, amount: string, createdTimestamp: any, withdrawnTimestamp?: any | null, txHash?: string | null, pendingOnForeignChain: boolean, asset: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, status: Types.AssetStatus, source: { __typename?: 'BuiltinAsset' } | { __typename?: 'ERC20', contractAddress: string } }, details?: { __typename?: 'Erc20WithdrawalDetails', receiverAddress: string } | null } }> | null };

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

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


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

 export type DepositBusEventFieldsFragment = { __typename?: 'Deposit', id: string, status: Types.DepositStatus, amount: string, createdTimestamp: any, creditedTimestamp?: any | null, txHash?: string | null, asset: { __typename?: 'Asset', id: string, symbol: string, decimals: number } };

@@ -88,6 +88,7 @@ export const OrderTxUpdateFieldsFragmentDoc = gql`
  expiresAt
  side
  marketId
+  remaining
 }
    `;
 export const DepositBusEventFieldsFragmentDoc = gql`
@@ -56,6 +56,7 @@ describe('useVegaTransactionStore', () => {
    side: Side.SIDE_BUY,
    marketId:
      '3aa2a828687cc3d59e92445d294891cbbd40e2165bbfb15674158ef5d4e8848d',
+    remaining: '12',
  };

  const processedTransactionUpdate = {
@@ -193,6 +193,7 @@ const submitOrder: VegaStoredTxState = {
    createdAt: new Date(),
    marketId: 'market-1',
    status: OrderStatus.STATUS_ACTIVE,
+    remaining: '10',
  },
 };

@@ -249,6 +250,7 @@ const editOrder: VegaStoredTxState = {
    createdAt: new Date(),
    marketId: 'market-1',
    status: OrderStatus.STATUS_ACTIVE,
+    remaining: '10',
  },
 };

@@ -489,6 +491,7 @@ describe('getRejectionReason', () => {
        timeInForce: Types.OrderTimeInForce.TIME_IN_FORCE_FOK,
        side: Types.Side.SIDE_BUY,
        marketId: '',
+        remaining: '',
      })
    ).toBe('Insufficient asset balance');
  });
@@ -505,6 +508,7 @@ describe('getRejectionReason', () => {
        timeInForce: Types.OrderTimeInForce.TIME_IN_FORCE_FOK,
        side: Types.Side.SIDE_BUY,
        marketId: '',
+        remaining: '',
      })
    ).toBe(
      'Your Fill or Kill (FOK) order was not filled and it has been stopped'
@@ -41,6 +41,7 @@ import {
  toBigNum,
  truncateByChars,
  formatTrigger,
+  MAXGOINT64,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useAssetsMapProvider } from '@vegaprotocol/assets';
@@ -585,6 +586,23 @@ export const VegaTransactionDetails = ({ tx }: { tx: VegaStoredTxState }) => {
        <Panel>
          {t('Close position for')}{' '}
          <strong>{market.tradableInstrument.instrument.code}</strong>
+          {tx.order?.remaining && (
+            <p>
+              {t('Filled')}{' '}
+              <SizeAtPrice
+                meta={{
+                  positionDecimalPlaces: market.positionDecimalPlaces,
+                  decimalPlaces: market.decimalPlaces,
+                  asset: getAsset(market).symbol,
+                }}
+                side={tx.order.side}
+                size={(
+                  BigInt(tx.order.size) - BigInt(tx.order.remaining)
+                ).toString()}
+                price={tx.order.price}
+              />
+            </p>
+          )}
        </Panel>
      );
    }
@@ -953,7 +971,19 @@ export const getVegaTransactionContentIntent = (tx: VegaStoredTxState) => {
    isWithdrawTransaction(tx.body) &&
    Intent.Warning;

+  // Toast for an IOC should go green when it is stopped,
+  // because stopping an IOC once all available volume has filled is the correct behaviour (it is immediate or cancel),
+  // this behaviour should apply to all IOC, not just those created due to "Close position"
+  const intentForClosedPosition =
+    tx.order &&
+    tx.order.status === Schema.OrderStatus.STATUS_STOPPED &&
+    tx.order.timeInForce === Schema.OrderTimeInForce.TIME_IN_FORCE_IOC &&
+    tx.order.size === MAXGOINT64 &&
+    // isClosePositionTransaction(tx) &&
+    Intent.Success;
+
  const intent =
+    intentForClosedPosition ||
    intentForRejectedOrder ||
    intentForCompletedWithdrawal ||
    intentMap[tx.status];
@@ -76,6 +76,7 @@ const orderUpdate: OrderTxUpdateFieldsFragment = {
  createdAt: '2022-07-05T14:25:47.815283706Z',
  expiresAt: '2022-07-05T14:25:47.815283706Z',
  size: '10',
+  remaining: '10',
  price: '300000',
  timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
  side: Side.SIDE_BUY,
Author	SHA1	Message	Date
Madalina Raicu	7345bb26cc	fix: check if preview	2023-11-14 13:37:08 +00:00
Madalina Raicu	46354a6af4	feat(trading): referral preview update	2023-11-13 14:55:27 +00:00
m.ray	7f95ba577e	fix(trading): display funding rate when market in monitoring auction (#5218 )	2023-11-10 13:01:24 +00:00
m.ray	2f7e53e282	feat(trading): close position stopped and IOC behaviour update (#5211 )	2023-11-09 22:31:18 +00:00
Matthew Russell	568dcd5305	fix(trading,governance,explorer): update codeowners	2023-11-09 12:43:50 -08:00
Matthew Russell	9605b0e7fa	chore(trading,governance,explorer): add specific rules for qa reviews	2023-11-09 12:37:32 -08:00
Art	0776332ba7	fix(trading): fees page issues (#5217 )	2023-11-09 16:50:50 +01:00