vegaprotocol · MadalinaRaicu · Aug 19, 2022 · Aug 6, 2022 · Aug 9, 2022 · Aug 9, 2022
diff --git a/apps/explorer/src/app/routes/markets/__generated__/MarketsQuery.ts b/apps/explorer/src/app/routes/markets/__generated__/MarketsQuery.ts
diff --git a/apps/explorer/src/app/routes/markets/index.tsx b/apps/explorer/src/app/routes/markets/index.tsx
@@ -21,6 +21,7 @@ const MARKETS_QUERY = gql`
       }
       tradableInstrument {
         instrument {
+          id
           name
           metadata {
             tags

diff --git a/apps/simple-trading-app/src/app/components/deal-ticket/__generated__/MarketTags.ts b/apps/simple-trading-app/src/app/components/deal-ticket/__generated__/MarketTags.ts
diff --git a/apps/simple-trading-app/src/app/components/deal-ticket/review-trade.tsx b/apps/simple-trading-app/src/app/components/deal-ticket/review-trade.tsx
@@ -23,6 +23,7 @@ export const MARKET_TAGS_QUERY = gql`
     market(id: $marketId) {
       tradableInstrument {
         instrument {
+          id
           metadata {
             tags
           }

diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/__generated__/SimpleMarkets.ts b/apps/simple-trading-app/src/app/components/simple-market-list/__generated__/SimpleMarkets.ts
diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/data-provider.ts b/apps/simple-trading-app/src/app/components/simple-market-list/data-provider.ts
@@ -30,6 +30,7 @@ export const MARKETS_QUERY = gql`
       }
       tradableInstrument {
         instrument {
+          id
           code
           metadata {
             tags

diff --git a/apps/trading-e2e/src/integration/home.cy.ts b/apps/trading-e2e/src/integration/home.cy.ts
@@ -65,7 +65,7 @@ describe('home', () => {
           }
         });
 
-      // the oldest market trading in continous mode shown at top of overlay table
+      // the oldest market trading in continuos mode shown at top of overlay table
       cy.get('table tr')
         .eq(1)
         .within(() =>

diff --git a/apps/trading-e2e/src/support/mocks/generate-market-list.ts b/apps/trading-e2e/src/support/mocks/generate-market-list.ts
@@ -1,7 +1,11 @@
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
 import type { MarketList, MarketList_markets } from '@vegaprotocol/market-list';
-import { MarketState, MarketTradingMode } from '@vegaprotocol/types';
+import {
+  AuctionTrigger,
+  MarketState,
+  MarketTradingMode,
+} from '@vegaprotocol/types';
 
 export const generateMarketList = (
   override?: PartialDeep<MarketList>
@@ -12,16 +16,41 @@ export const generateMarketList = (
       decimalPlaces: 5,
       state: MarketState.Active,
       tradingMode: MarketTradingMode.Continuous,
+      positionDecimalPlaces: 2,
+      name: 'Market 0',
+      fees: {
+        __typename: 'Fees',
+        factors: {
+          __typename: 'FeeFactors',
+          makerFee: '0.001',
+          liquidityFee: '0.001',
+          infrastructureFee: '0.001',
+        },
+      },
       data: {
         market: {
           id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
           __typename: 'Market',
+          state: MarketState.Active,
+          tradingMode: MarketTradingMode.Continuous,
         },
         markPrice: '4612690058',
         __typename: 'MarketData',
+        bestBidPrice: '4612690058',
+        bestOfferPrice: '4612690058',
+        trigger: AuctionTrigger.Liquidity,
+        indicativeVolume: '0',
       },
       tradableInstrument: {
         instrument: {
+          id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
+          product: {
+            __typename: 'Future',
+            settlementAsset: {
+              __typename: 'Asset',
+              symbol: 'ETH',
+            },
+          },
           name: 'BTC/USD Monthly',
           code: 'BTCUSD.MF21',
           metadata: {
@@ -37,25 +66,59 @@ export const generateMarketList = (
         open: '',
         close: '',
       },
-      candles: [{ __typename: 'Candle', open: '100', close: '100' }],
+      candles: [
+        {
+          __typename: 'Candle',
+          open: '100',
+          close: '100',
+          high: '100',
+          low: '100',
+        },
+      ],
       __typename: 'Market',
     },
     {
       id: 'market-1',
       decimalPlaces: 2,
       state: MarketState.Suspended,
       tradingMode: MarketTradingMode.MonitoringAuction,
+      name: 'BTC/USD Monthly',
+      positionDecimalPlaces: 2,
+      fees: {
+        __typename: 'Fees',
+        factors: {
+          __typename: 'FeeFactors',
+          makerFee: '0.001',
+          liquidityFee: '0.001',
+          infrastructureFee: '0.001',
+        },
+      },
       data: {
         market: {
           id: '34d95e10faa00c21d19d382d6d7e6fc9722a96985369f0caec041b0f44b775ed',
           __typename: 'Market',
+          state: MarketState.Suspended,
+          tradingMode: MarketTradingMode.MonitoringAuction,
         },
         markPrice: '8441',
         __typename: 'MarketData',
+        bestBidPrice: '4612690058',
+        bestOfferPrice: '4612690058',
+        trigger: AuctionTrigger.Liquidity,
+
+        indicativeVolume: '0',
       },
       tradableInstrument: {
         instrument: {
+          product: {
+            __typename: 'Future',
+            settlementAsset: {
+              __typename: 'Asset',
+              symbol: 'ETH',
+            },
+          },
           name: 'SOL/USD',
+          id: '34d95e10faa00c21d19d382d6d7e6fc9722a96985369f0caec041b0f44b775ed',
           code: 'SOLUSD',
           metadata: {
             __typename: 'InstrumentMetadata',
@@ -70,7 +133,15 @@ export const generateMarketList = (
         open: '',
         close: '',
       },
-      candles: [{ __typename: 'Candle', open: '100', close: '100' }],
+      candles: [
+        {
+          __typename: 'Candle',
+          open: '100',
+          close: '100',
+          high: '100',
+          low: '100',
+        },
+      ],
       __typename: 'Market',
     },
   ];

diff --git a/apps/trading/lib/apollo-client.ts b/apps/trading/lib/apollo-client.ts
@@ -31,7 +31,13 @@ export function createClient(base?: string) {
         },
       },
       Instrument: {
-        keyFields: false,
+        keyFields: ['product'],
+      },
+      TradableInstrument: {
+        keyFields: ['instrument'],
+      },
+      Product: {
+        keyFields: ['settlementAsset', ['id']],
       },
       MarketData: {
         keyFields: ['market', ['id']],

diff --git a/apps/trading/pages/markets/[marketId].page.tsx b/apps/trading/pages/markets/[marketId].page.tsx
@@ -40,6 +40,7 @@ const MARKET_QUERY = gql`
       }
       tradableInstrument {
         instrument {
+          id
           name
           code
           metadata {

diff --git a/apps/trading/pages/markets/__generated__/Market.ts b/apps/trading/pages/markets/__generated__/Market.ts
diff --git a/libs/deal-ticket/src/components/__generated__/DealTicketQuery.ts b/libs/deal-ticket/src/components/__generated__/DealTicketQuery.ts
diff --git a/libs/deal-ticket/src/components/__generated__/MarketNames.ts b/libs/deal-ticket/src/components/__generated__/MarketNames.ts
diff --git a/libs/deal-ticket/src/components/deal-ticket-container.tsx b/libs/deal-ticket/src/components/deal-ticket-container.tsx
@@ -15,6 +15,7 @@ const DEAL_TICKET_QUERY = gql`
       tradingMode
       tradableInstrument {
         instrument {
+          id
           product {
             ... on Future {
               quoteName

diff --git a/libs/deal-ticket/src/components/market-selector.tsx b/libs/deal-ticket/src/components/market-selector.tsx
@@ -34,12 +34,14 @@ export const MARKET_NAMES_QUERY = gql`
       name
       tradableInstrument {
         instrument {
+          id
           code
           metadata {
             tags
           }
           product {
             ... on Future {
+              id
               quoteName
             }
           }

diff --git a/libs/market-list/src/lib/__generated__/MarketList.ts b/libs/market-list/src/lib/__generated__/MarketList.ts
diff --git a/libs/market-list/src/lib/components/select-market.tsx b/libs/market-list/src/lib/components/select-market.tsx
@@ -100,7 +100,7 @@ export const SelectAllMarketsTableBody = ({
   ) : (
     <thead>
       <tr>
-        <td className="text-black dark:text-white text-h5">
+        <td className="text-black dark:text-white text-ui">
           {t('Loading market data...')}
         </td>
       </tr>

diff --git a/libs/market-list/src/lib/markets-data-provider.ts b/libs/market-list/src/lib/markets-data-provider.ts
@@ -53,6 +53,7 @@ export const MARKET_LIST_QUERY = gql`
       }
       tradableInstrument {
         instrument {
+          id
           name
           code
           metadata {

diff --git a/libs/orders/src/lib/components/mocks/generate-orders.ts b/libs/orders/src/lib/components/mocks/generate-orders.ts
@@ -23,6 +23,7 @@ export const generateOrder = (
       tradableInstrument: {
         __typename: 'TradableInstrument',
         instrument: {
+          id: 'instrument-id',
           __typename: 'Instrument',
           code: 'instrument-code',
         },

diff --git a/libs/orders/src/lib/components/order-data-provider/__generated__/OrderFields.ts b/libs/orders/src/lib/components/order-data-provider/__generated__/OrderFields.ts
diff --git a/libs/orders/src/lib/components/order-data-provider/__generated__/OrderSub.ts b/libs/orders/src/lib/components/order-data-provider/__generated__/OrderSub.ts
diff --git a/libs/orders/src/lib/components/order-data-provider/__generated__/Orders.ts b/libs/orders/src/lib/components/order-data-provider/__generated__/Orders.ts
diff --git a/libs/orders/src/lib/components/order-data-provider/order-data-provider.ts b/libs/orders/src/lib/components/order-data-provider/order-data-provider.ts
@@ -24,6 +24,7 @@ const ORDER_FRAGMENT = gql`
       positionDecimalPlaces
       tradableInstrument {
         instrument {
+          id
           code
         }
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ const MARKETS_QUERY = gql` @@
           }
           tradableInstrument {
             instrument {
+              id
               name
               metadata {
                 tags
@@ Expand Down @@