From 8a3c64c98f4235a660355923d2d9d3857e47531b Mon Sep 17 00:00:00 2001
From: "troyb.eth" <me@troyb.xyz>
Date: Fri, 10 Feb 2023 05:39:37 -0700
Subject: [PATCH 1/6] fix: use skew adjusted price for uPnL (#1993)

upnl uses skew adjusted price
---
 state/futures/selectors.ts | 2 +-
 utils/futures.ts           | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/state/futures/selectors.ts b/state/futures/selectors.ts
index 647e74e9c8..7891202ffa 100644
--- a/state/futures/selectors.ts
+++ b/state/futures/selectors.ts
@@ -217,7 +217,7 @@ export const selectCrossMarginPositions = createSelector(
 );
 
 export const selectIsolatedMarginPositions = createSelector(
-	selectPrices,
+	selectMarkPrices,
 	selectIsolatedAccountData,
 	(prices, account) => {
 		return account?.positions?.map((p) => updatePositionUpnl(p, prices)) ?? [];
diff --git a/utils/futures.ts b/utils/futures.ts
index 220b5a6650..51569f9208 100644
--- a/utils/futures.ts
+++ b/utils/futures.ts
@@ -15,7 +15,7 @@ import {
 	FuturesVolumes,
 	PositionSide,
 } from 'sdk/types/futures';
-import { Prices, PricesMap } from 'sdk/types/prices';
+import { PricesMap } from 'sdk/types/prices';
 import {
 	CrossMarginBalanceInfo,
 	CrossMarginSettings,
@@ -26,6 +26,7 @@ import {
 	TransactionEstimation,
 	futuresPositionKeys,
 	FundingRate,
+	MarkPrices,
 } from 'state/futures/types';
 import { deserializeWeiObject } from 'state/helpers';
 
@@ -243,13 +244,13 @@ const getPositionChangeState = (existingSize: Wei, newSize: Wei) => {
 
 export const updatePositionUpnl = (
 	positionDetails: FuturesPosition<string>,
-	prices: Prices
+	prices: MarkPrices
 ): FuturesPosition => {
 	const deserializedPositionDetails = deserializeWeiObject(
 		positionDetails,
 		futuresPositionKeys
 	) as FuturesPosition;
-	const offChainPrice = prices[deserializedPositionDetails.asset]?.offChain;
+	const offChainPrice = prices[MarketKeyByAsset[deserializedPositionDetails.asset]];
 	const position = deserializedPositionDetails.position;
 
 	const pnl =

From ff11a4625f859c51381102c52683a6b621f6b9aa Mon Sep 17 00:00:00 2001
From: Adam Clarke <adam@adamclarke.co>
Date: Fri, 10 Feb 2023 17:18:47 +0000
Subject: [PATCH 2/6] fix: extend market drop down height (#2001)

---
 sections/futures/Trade/MarketsDropdown.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sections/futures/Trade/MarketsDropdown.tsx b/sections/futures/Trade/MarketsDropdown.tsx
index 78511d44b2..b849cf8e29 100644
--- a/sections/futures/Trade/MarketsDropdown.tsx
+++ b/sections/futures/Trade/MarketsDropdown.tsx
@@ -157,6 +157,7 @@ const MarketsDropdown: React.FC<MarketsDropdownProps> = ({ mobile }) => {
 	return (
 		<SelectContainer mobile={mobile}>
 			<Select
+				maxMenuHeight={Math.max(window.innerHeight - (mobile ? 135 : 250), 300)}
 				instanceId={`markets-dropdown-${marketAsset}`}
 				controlHeight={55}
 				menuWidth={'100%'}

From 038c64ee0f0973ceda47cd3c306ec907462c94e5 Mon Sep 17 00:00:00 2001
From: Adam Clarke <adam@adamclarke.co>
Date: Fri, 10 Feb 2023 17:40:44 +0000
Subject: [PATCH 3/6] fix: show index and market price in market details
 (#1991)

* Show index and market price in market details

* More market details changes

* Remove 24hr change amount on mobile
---
 .../futures/MarketDetails/MarketDetails.tsx   |  10 +-
 .../MarketDetails/MobileMarketDetail.tsx      |  52 ---------
 .../futures/MarketDetails/useGetMarketData.ts | 109 +++++++-----------
 sections/futures/MarketDetails/utils.ts       |   8 +-
 state/futures/selectors.ts                    |  20 +++-
 translations/en.json                          |   7 +-
 6 files changed, 76 insertions(+), 130 deletions(-)
 delete mode 100644 sections/futures/MarketDetails/MobileMarketDetail.tsx

diff --git a/sections/futures/MarketDetails/MarketDetails.tsx b/sections/futures/MarketDetails/MarketDetails.tsx
index 34957b27a2..08a0ff0683 100644
--- a/sections/futures/MarketDetails/MarketDetails.tsx
+++ b/sections/futures/MarketDetails/MarketDetails.tsx
@@ -6,7 +6,6 @@ import media from 'styles/media';
 
 import MarketsDropdown from '../Trade/MarketsDropdown';
 import MarketDetail from './MarketDetail';
-import MobileMarketDetail from './MobileMarketDetail';
 import useGetMarketData from './useGetMarketData';
 
 type MarketDetailsProps = {
@@ -26,9 +25,14 @@ const MarketDetails: React.FC<MarketDetailsProps> = ({ mobile }) => {
 
 			<MarketDetailsContainer mobile={mobile}>
 				{Object.entries(marketData).map(([marketKey, data]) => (
-					<MarketDetail {...data} key={marketKey} marketKey={marketKey} mobile={Boolean(mobile)} />
+					<MarketDetail
+						color={data.color}
+						value={data.value}
+						key={marketKey}
+						marketKey={marketKey}
+						mobile={Boolean(mobile)}
+					/>
 				))}
-				{mobile && <MobileMarketDetail />}
 			</MarketDetailsContainer>
 		</FlexDivCentered>
 	);
diff --git a/sections/futures/MarketDetails/MobileMarketDetail.tsx b/sections/futures/MarketDetails/MobileMarketDetail.tsx
deleted file mode 100644
index 0fb2ff2f27..0000000000
--- a/sections/futures/MarketDetails/MobileMarketDetail.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { selectMarketInfo } from 'state/futures/selectors';
-import { useAppSelector } from 'state/hooks';
-import { formatDollars, formatPercent } from 'utils/formatters/number';
-
-const MobileMarketDetail: React.FC = () => {
-	const marketInfo = useAppSelector(selectMarketInfo);
-
-	const pausedClass = marketInfo?.isSuspended ? 'paused' : '';
-
-	const longSkewText = useMemo(() => {
-		return (
-			!!marketInfo &&
-			formatDollars(marketInfo.openInterest.longUSD, {
-				truncate: true,
-			})
-		);
-	}, [marketInfo]);
-
-	const shortSkewText = useMemo(() => {
-		return (
-			!!marketInfo &&
-			formatDollars(marketInfo.openInterest.shortUSD, {
-				truncate: true,
-			})
-		);
-	}, [marketInfo]);
-
-	return (
-		<div key="Skew">
-			<p className="heading">Skew</p>
-			<SkewDataContainer>
-				<div className={`value green ${pausedClass}`}>
-					{!!marketInfo && formatPercent(marketInfo.openInterest.longPct ?? 0, { minDecimals: 0 })}{' '}
-					({longSkewText})
-				</div>
-				<div className={`value red ${pausedClass}`}>
-					{!!marketInfo && formatPercent(marketInfo.openInterest.shortPct ?? 0, { minDecimals: 0 })}{' '}
-					({shortSkewText})
-				</div>
-			</SkewDataContainer>
-		</div>
-	);
-};
-
-export default MobileMarketDetail;
-
-const SkewDataContainer = styled.div`
-	grid-row: 1;
-`;
diff --git a/sections/futures/MarketDetails/useGetMarketData.ts b/sections/futures/MarketDetails/useGetMarketData.ts
index c5d2e5b278..3b40eb2b58 100644
--- a/sections/futures/MarketDetails/useGetMarketData.ts
+++ b/sections/futures/MarketDetails/useGetMarketData.ts
@@ -1,4 +1,3 @@
-import { wei } from '@synthetixio/wei';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -11,10 +10,8 @@ import {
 	selectMarketAsset,
 	selectMarketInfo,
 	selectMarketKey,
-	selectMarketVolumes,
-	selectMarketPrices,
-	selectSkewAdjustedPrice,
 	selectMarketPriceInfo,
+	selectSkewAdjustedPriceInfo,
 } from 'state/futures/selectors';
 import { useAppSelector } from 'state/hooks';
 import { selectPreviousDayPrices } from 'state/prices/selectors';
@@ -34,10 +31,8 @@ const useGetMarketData = (mobile?: boolean) => {
 	const marketInfo = useAppSelector(selectMarketInfo);
 
 	const pastRates = useAppSelector(selectPreviousDayPrices);
-	const futuresVolumes = useAppSelector(selectMarketVolumes);
-	const marketPrices = useAppSelector(selectMarketPrices);
-	const marketPrice = useAppSelector(selectSkewAdjustedPrice);
-	const marketPriceInfo = useAppSelector(selectMarketPriceInfo);
+	const markPrice = useAppSelector(selectSkewAdjustedPriceInfo);
+	const indexPrice = useAppSelector(selectMarketPriceInfo);
 
 	const { selectedPriceCurrency } = useSelectedPriceCurrency();
 
@@ -48,17 +43,9 @@ const useGetMarketData = (mobile?: boolean) => {
 
 	const pastPrice = pastRates.find((price) => price.synth === getDisplayAsset(marketAsset));
 
-	const oraclePrice = marketPrices.onChain ?? wei(0);
-
 	const data: MarketData = useMemo(() => {
 		const fundingValue = marketInfo?.currentFundingRate;
 
-		const marketName = `${marketInfo?.marketName ?? t('futures.market.info.default-market')}`;
-
-		const futuresTradingVolume = marketInfo?.marketKey
-			? futuresVolumes[marketInfo.marketKey]?.volume ?? wei(0)
-			: wei(0);
-
 		const oiCap = marketInfo?.marketLimit
 			? formatDollars(marketInfo?.marketLimit, { truncate: true })
 			: null;
@@ -70,72 +57,70 @@ const useGetMarketData = (mobile?: boolean) => {
 			? `${formatDollars(marketInfo?.openInterest.shortUSD, { truncate: true })} / ${oiCap}`
 			: NO_VALUE;
 
+		const indexPriceWei = indexPrice?.price ?? zeroBN;
+
 		if (mobile) {
 			return {
-				[marketName]: {
-					value: formatDollars(marketPrice, { isAssetPrice: true }),
-					color: getColorFromPriceInfo(marketPriceInfo),
-				},
-				[MarketDataKey.openInterestLong]: {
-					value: longOi,
-				},
-				[MarketDataKey.openInterestShort]: {
-					value: shortOi,
+				[MarketDataKey.marketPrice]: {
+					value: markPrice ? formatDollars(markPrice.price) : NO_VALUE,
+					color: getColorFromPriceInfo(markPrice),
 				},
-				[MarketDataKey.dailyVolume]: {
-					value: formatDollars(futuresTradingVolume ?? zeroBN, {
-						truncate: true,
-					}),
-				},
-				[t('futures.market.info.hourly-funding')]: {
-					value: fundingValue
-						? formatPercent(fundingValue ?? zeroBN, { minDecimals: 6 })
-						: NO_VALUE,
-					color: fundingValue?.gt(zeroBN) ? 'green' : fundingValue?.lt(zeroBN) ? 'red' : undefined,
+				[MarketDataKey.indexPrice]: {
+					value: indexPrice ? formatDollars(indexPrice.price) : NO_VALUE,
 				},
 				[MarketDataKey.dailyChange]: {
 					value:
-						marketPrice.gt(0) && pastPrice?.rate
-							? `${formatCurrency(
-									selectedPriceCurrency.name,
-									marketPrice.sub(pastPrice.rate) ?? zeroBN,
-									{ sign: '$', minDecimals, isAssetPrice: true }
-							  )} (${formatPercent(marketPrice.sub(pastPrice.rate).div(marketPrice) ?? zeroBN)})`
+						indexPriceWei.gt(0) && pastPrice?.rate
+							? formatPercent(indexPriceWei.sub(pastPrice.rate).div(indexPriceWei) ?? zeroBN)
 							: NO_VALUE,
 					color: pastPrice?.rate
-						? marketPrice.sub(pastPrice.rate).gt(zeroBN)
+						? indexPriceWei.sub(pastPrice.rate).gt(zeroBN)
 							? 'green'
-							: marketPrice.sub(pastPrice.rate).lt(zeroBN)
+							: indexPriceWei.sub(pastPrice.rate).lt(zeroBN)
 							? 'red'
 							: ''
 						: undefined,
 				},
+				[t('futures.market.info.hourly-funding')]: {
+					value: fundingValue
+						? formatPercent(fundingValue ?? zeroBN, { minDecimals: 6 })
+						: NO_VALUE,
+					color: fundingValue?.gt(zeroBN) ? 'green' : fundingValue?.lt(zeroBN) ? 'red' : undefined,
+				},
+				[MarketDataKey.openInterestLong]: {
+					value: longOi,
+				},
+				[MarketDataKey.openInterestShort]: {
+					value: shortOi,
+				},
 			};
 		} else {
 			return {
-				[marketName]: {
-					value: formatDollars(marketPrice),
-					color: getColorFromPriceInfo(marketPriceInfo),
+				[MarketDataKey.marketPrice]: {
+					value: markPrice ? formatDollars(markPrice.price) : NO_VALUE,
+					color: getColorFromPriceInfo(markPrice),
+				},
+				[MarketDataKey.indexPrice]: {
+					value: indexPrice ? formatDollars(indexPrice.price) : NO_VALUE,
 				},
 				[MarketDataKey.dailyChange]: {
 					value:
-						marketPrice.gt(0) && pastPrice?.rate
-							? `${formatDollars(marketPrice.sub(pastPrice.rate) ?? zeroBN)} (${formatPercent(
-									marketPrice.sub(pastPrice.rate).div(marketPrice) ?? zeroBN
-							  )})`
+						indexPriceWei.gt(0) && pastPrice?.rate
+							? formatPercent(indexPriceWei.sub(pastPrice.rate).div(indexPriceWei) ?? zeroBN)
 							: NO_VALUE,
 					color: pastPrice?.rate
-						? marketPrice.sub(pastPrice.rate).gt(zeroBN)
+						? indexPriceWei.sub(pastPrice.rate).gt(zeroBN)
 							? 'green'
-							: marketPrice.sub(pastPrice.rate).lt(zeroBN)
+							: indexPriceWei.sub(pastPrice.rate).lt(zeroBN)
 							? 'red'
 							: ''
 						: undefined,
 				},
-				[MarketDataKey.dailyVolume]: {
-					value: formatDollars(futuresTradingVolume ?? zeroBN, {
-						truncate: true,
-					}),
+				[t('futures.market.info.hourly-funding')]: {
+					value: fundingValue
+						? formatPercent(fundingValue ?? zeroBN, { minDecimals: 6 })
+						: NO_VALUE,
+					color: fundingValue?.gt(zeroBN) ? 'green' : fundingValue?.lt(zeroBN) ? 'red' : undefined,
 				},
 				[MarketDataKey.openInterestLong]: {
 					value: longOi,
@@ -143,26 +128,18 @@ const useGetMarketData = (mobile?: boolean) => {
 				[MarketDataKey.openInterestShort]: {
 					value: shortOi,
 				},
-				[t('futures.market.info.hourly-funding')]: {
-					value: fundingValue
-						? formatPercent(fundingValue ?? zeroBN, { minDecimals: 6 })
-						: NO_VALUE,
-					color: fundingValue?.gt(zeroBN) ? 'green' : fundingValue?.lt(zeroBN) ? 'red' : undefined,
-				},
 			};
 		}
 
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [
 		marketAsset,
-		marketPriceInfo,
+		markPrice,
 		marketInfo,
-		oraclePrice,
-		futuresVolumes,
 		selectedPriceCurrency.name,
 		pastPrice?.rate,
 		minDecimals,
-		marketPrice,
+		indexPrice,
 		t,
 	]);
 
diff --git a/sections/futures/MarketDetails/utils.ts b/sections/futures/MarketDetails/utils.ts
index 89a4b3e72c..9d80828c83 100644
--- a/sections/futures/MarketDetails/utils.ts
+++ b/sections/futures/MarketDetails/utils.ts
@@ -33,8 +33,8 @@ const map: Record<typeof markets[number], string> = {
 };
 
 export enum MarketDataKey {
-	externalPrice = 'External Price',
-	oraclePrice = 'Oracle Price',
+	indexPrice = 'Index Price',
+	marketPrice = 'Market Price',
 	dailyChange = '24H Change',
 	dailyVolume = '24H Volume',
 	dailyTrades = '24H Trades',
@@ -45,8 +45,8 @@ export enum MarketDataKey {
 }
 
 export const marketDataKeyMap: Record<MarketDataKey, string> = {
-	[MarketDataKey.externalPrice]: 'external-price',
-	[MarketDataKey.oraclePrice]: 'oracle-price',
+	[MarketDataKey.indexPrice]: 'index-price',
+	[MarketDataKey.marketPrice]: 'market-price',
 	[MarketDataKey.dailyChange]: '24h-change',
 	[MarketDataKey.dailyVolume]: '24h-vol',
 	[MarketDataKey.dailyTrades]: '24h-trades',
diff --git a/state/futures/selectors.ts b/state/futures/selectors.ts
index 7891202ffa..a7854ed115 100644
--- a/state/futures/selectors.ts
+++ b/state/futures/selectors.ts
@@ -170,7 +170,25 @@ export const selectSkewAdjustedPrice = createSelector(
 	selectMarketInfo,
 	(price, marketInfo) => {
 		if (!marketInfo?.marketSkew || !marketInfo?.settings.skewScale) return price;
-		return wei(price).mul(wei(marketInfo.marketSkew).div(marketInfo.settings.skewScale).add(1));
+		return price
+			? wei(price).mul(wei(marketInfo.marketSkew).div(marketInfo.settings.skewScale).add(1))
+			: zeroBN;
+	}
+);
+
+export const selectSkewAdjustedPriceInfo = createSelector(
+	selectMarketPriceInfo,
+	selectMarketInfo,
+	(priceInfo, marketInfo) => {
+		if (!marketInfo?.marketSkew || !marketInfo?.settings.skewScale) return priceInfo;
+		return priceInfo
+			? {
+					price: wei(priceInfo.price).mul(
+						wei(marketInfo.marketSkew).div(marketInfo.settings.skewScale).add(1)
+					),
+					change: priceInfo?.change,
+			  }
+			: undefined;
 	}
 );
 
diff --git a/translations/en.json b/translations/en.json
index 3193816a4f..61943cf669 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -336,9 +336,8 @@
 				"seconds-ago": "sec ago"
 			},
 			"tooltips": {
-				"market-key": "The current price of the futures market after adding a skew-based premium or discount to the oracle price",
-				"oracle-price": "The exact oracle price of this market without any adjustment for market skew applied",
-				"external-price": "Aggregated market price provided by external sources (Coingecko, Forex Market, etc.)",
+				"market-price": "The current price of the futures market after adding a skew-based premium or discount to the oracle price",
+				"index-price": "The exact index price of this market without any adjustment for market skew applied",
 				"24h-change": "Total change in asset value within the past 24 hours",
 				"24h-vol": "Total trade volume within the past 24 hours",
 				"24h-trades": "Total amount of trades on selected pair within the past 24h",
@@ -468,7 +467,7 @@
 			"futures-markets-table": {
 				"market": "Market",
 				"oracle": "Oracle",
-				"mark-price": "Mark Price",
+				"mark-price": "Market Price",
 				"daily-change": "24H Change",
 				"funding-rate": "1H Funding Rate",
 				"open-interest": "Open Interest",

From 5053c1bd97175383f8a58168a60c0ac585088931 Mon Sep 17 00:00:00 2001
From: Ralf <platschi@posteo.org>
Date: Fri, 10 Feb 2023 14:41:05 -0300
Subject: [PATCH 4/6] chore: bump sentry to v7.37.0 (#1999)

bump sentry
---
 package-lock.json | 135 +++++++++++++++++++++++-----------------------
 package.json      |   4 +-
 2 files changed, 68 insertions(+), 71 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 04adadf986..ef840b8f5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,8 +20,8 @@
 				"@rainbow-me/rainbowkit": "0.8.1",
 				"@reach/dialog": "0.15.0",
 				"@reduxjs/toolkit": "^1.8.5",
-				"@sentry/browser": "^7.28.0",
-				"@sentry/tracing": "^7.28.0",
+				"@sentry/browser": "^7.37.0",
+				"@sentry/tracing": "^7.37.0",
 				"@socket.tech/plugin": "^1.0.3",
 				"@synthetixio/contracts-interface": "2.76.3",
 				"@synthetixio/optimism-networks": "2.74.6",
@@ -6953,14 +6953,14 @@
 			}
 		},
 		"node_modules/@sentry/browser": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.28.0.tgz",
-			"integrity": "sha512-UMsFwNOEpdX3pHdpJ9klSK2FbwG0n9FlrPSb2KMuuW/OA62Yq2YStShoyJ35ix3cwHnhF6/F+lXxJ/WfMvX6DQ==",
-			"dependencies": {
-				"@sentry/core": "7.28.0",
-				"@sentry/replay": "7.28.0",
-				"@sentry/types": "7.28.0",
-				"@sentry/utils": "7.28.0",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.37.0.tgz",
+			"integrity": "sha512-EMlSo4Ebtryd5id2nC31dwcLigwYPWjrAYt36vUJ/L47oXetaH4dndK6wqYyxR2sl8uP2GlsQUnWpGLHKyG3ww==",
+			"dependencies": {
+				"@sentry/core": "7.37.0",
+				"@sentry/replay": "7.37.0",
+				"@sentry/types": "7.37.0",
+				"@sentry/utils": "7.37.0",
 				"tslib": "^1.9.3"
 			},
 			"engines": {
@@ -6973,12 +6973,12 @@
 			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
 		},
 		"node_modules/@sentry/core": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.28.0.tgz",
-			"integrity": "sha512-9wY6mRzoyZ8TEW7X1jpciD0DSqqYPaggiJyykxaVbjwmJc7GjJpY94XHmSeKNUV4w7ddMhdsznhBmGNN6CFMfQ==",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.0.tgz",
+			"integrity": "sha512-2M6aZKIG/1HgfE0hobQ9tKSo6ZsyBrSQqjtQhMVFwVzZJyFw3m1AqcrB+f0myi+1ay2MMPbJ+HhYtBPR3e4EvA==",
 			"dependencies": {
-				"@sentry/types": "7.28.0",
-				"@sentry/utils": "7.28.0",
+				"@sentry/types": "7.37.0",
+				"@sentry/utils": "7.37.0",
 				"tslib": "^1.9.3"
 			},
 			"engines": {
@@ -6991,29 +6991,26 @@
 			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
 		},
 		"node_modules/@sentry/replay": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.28.0.tgz",
-			"integrity": "sha512-AuAREwMqZQhrGTxd69zY3uRPnfcrIRxL4wMefopzkjPx9Zboxkp2rsUJlrC0JLmReNML0ec7ZybZx94LunbE7Q==",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.37.0.tgz",
+			"integrity": "sha512-uGqPjEz3dprahRNslK35tR2N5RGULMH5uL/1InU65O5XUgq/wTyQ7ZH0qy743J8U6dBo/2n7V/RQdB9lA2sLBw==",
 			"dependencies": {
-				"@sentry/core": "7.28.0",
-				"@sentry/types": "7.28.0",
-				"@sentry/utils": "7.28.0"
+				"@sentry/core": "7.37.0",
+				"@sentry/types": "7.37.0",
+				"@sentry/utils": "7.37.0"
 			},
 			"engines": {
 				"node": ">=12"
-			},
-			"peerDependencies": {
-				"@sentry/browser": ">=7.24.0"
 			}
 		},
 		"node_modules/@sentry/tracing": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.28.0.tgz",
-			"integrity": "sha512-TH+f9AGqinX0B4EkP26ecF0ERm1KleTFHYEfpPEdbn92HFJua+Wvcm3uy6cwQ3njswi29sQHJv9bWQqp//mA+g==",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.37.0.tgz",
+			"integrity": "sha512-DvFEwsXNsroVPNFOAblKwzKoO75dLhYw0XVmm+OlXTTQriJG5YkzcqazJ9pJ0l+f9ttswElGr3gLHMn797vsMA==",
 			"dependencies": {
-				"@sentry/core": "7.28.0",
-				"@sentry/types": "7.28.0",
-				"@sentry/utils": "7.28.0",
+				"@sentry/core": "7.37.0",
+				"@sentry/types": "7.37.0",
+				"@sentry/utils": "7.37.0",
 				"tslib": "^1.9.3"
 			},
 			"engines": {
@@ -7026,19 +7023,19 @@
 			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
 		},
 		"node_modules/@sentry/types": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.28.0.tgz",
-			"integrity": "sha512-F6tZldpvC3Lt8FPgJ6wRTcE7P9txIpHSBjyYz9wqFlVJx4IhBmrn6vZU1LvANUaK1jZZF2PW5tFRrVEnydfpqg==",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.0.tgz",
+			"integrity": "sha512-p8iw5oGvWLIk7osMgXhxshUpebJD0riiuT3ihBP0DV+Gs8r0qdQ5gtcStl7Cn0D4013p4j/f3T5q85Z9ENE6fA==",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/@sentry/utils": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.28.0.tgz",
-			"integrity": "sha512-ag1RotlFSJnwUi/MYWY5iQ8aLcwrCBlD/qlGB43PvB3XGDl3e7E/pUy2bdblP7Q2uCKLVUBcudyaSgtvNqu9wA==",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.0.tgz",
+			"integrity": "sha512-CN86EKQ07+SgqfgGehMJsgrCEjc0sl1YDcj2xf9dA0Bn3ma2MTDkCyutxVcRfc2IVWfqAN1rn/L8/BH2v2+eqA==",
 			"dependencies": {
-				"@sentry/types": "7.28.0",
+				"@sentry/types": "7.37.0",
 				"tslib": "^1.9.3"
 			},
 			"engines": {
@@ -64253,14 +64250,14 @@
 			}
 		},
 		"@sentry/browser": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.28.0.tgz",
-			"integrity": "sha512-UMsFwNOEpdX3pHdpJ9klSK2FbwG0n9FlrPSb2KMuuW/OA62Yq2YStShoyJ35ix3cwHnhF6/F+lXxJ/WfMvX6DQ==",
-			"requires": {
-				"@sentry/core": "7.28.0",
-				"@sentry/replay": "7.28.0",
-				"@sentry/types": "7.28.0",
-				"@sentry/utils": "7.28.0",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.37.0.tgz",
+			"integrity": "sha512-EMlSo4Ebtryd5id2nC31dwcLigwYPWjrAYt36vUJ/L47oXetaH4dndK6wqYyxR2sl8uP2GlsQUnWpGLHKyG3ww==",
+			"requires": {
+				"@sentry/core": "7.37.0",
+				"@sentry/replay": "7.37.0",
+				"@sentry/types": "7.37.0",
+				"@sentry/utils": "7.37.0",
 				"tslib": "^1.9.3"
 			},
 			"dependencies": {
@@ -64272,12 +64269,12 @@
 			}
 		},
 		"@sentry/core": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.28.0.tgz",
-			"integrity": "sha512-9wY6mRzoyZ8TEW7X1jpciD0DSqqYPaggiJyykxaVbjwmJc7GjJpY94XHmSeKNUV4w7ddMhdsznhBmGNN6CFMfQ==",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.0.tgz",
+			"integrity": "sha512-2M6aZKIG/1HgfE0hobQ9tKSo6ZsyBrSQqjtQhMVFwVzZJyFw3m1AqcrB+f0myi+1ay2MMPbJ+HhYtBPR3e4EvA==",
 			"requires": {
-				"@sentry/types": "7.28.0",
-				"@sentry/utils": "7.28.0",
+				"@sentry/types": "7.37.0",
+				"@sentry/utils": "7.37.0",
 				"tslib": "^1.9.3"
 			},
 			"dependencies": {
@@ -64289,23 +64286,23 @@
 			}
 		},
 		"@sentry/replay": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.28.0.tgz",
-			"integrity": "sha512-AuAREwMqZQhrGTxd69zY3uRPnfcrIRxL4wMefopzkjPx9Zboxkp2rsUJlrC0JLmReNML0ec7ZybZx94LunbE7Q==",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.37.0.tgz",
+			"integrity": "sha512-uGqPjEz3dprahRNslK35tR2N5RGULMH5uL/1InU65O5XUgq/wTyQ7ZH0qy743J8U6dBo/2n7V/RQdB9lA2sLBw==",
 			"requires": {
-				"@sentry/core": "7.28.0",
-				"@sentry/types": "7.28.0",
-				"@sentry/utils": "7.28.0"
+				"@sentry/core": "7.37.0",
+				"@sentry/types": "7.37.0",
+				"@sentry/utils": "7.37.0"
 			}
 		},
 		"@sentry/tracing": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.28.0.tgz",
-			"integrity": "sha512-TH+f9AGqinX0B4EkP26ecF0ERm1KleTFHYEfpPEdbn92HFJua+Wvcm3uy6cwQ3njswi29sQHJv9bWQqp//mA+g==",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.37.0.tgz",
+			"integrity": "sha512-DvFEwsXNsroVPNFOAblKwzKoO75dLhYw0XVmm+OlXTTQriJG5YkzcqazJ9pJ0l+f9ttswElGr3gLHMn797vsMA==",
 			"requires": {
-				"@sentry/core": "7.28.0",
-				"@sentry/types": "7.28.0",
-				"@sentry/utils": "7.28.0",
+				"@sentry/core": "7.37.0",
+				"@sentry/types": "7.37.0",
+				"@sentry/utils": "7.37.0",
 				"tslib": "^1.9.3"
 			},
 			"dependencies": {
@@ -64317,16 +64314,16 @@
 			}
 		},
 		"@sentry/types": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.28.0.tgz",
-			"integrity": "sha512-F6tZldpvC3Lt8FPgJ6wRTcE7P9txIpHSBjyYz9wqFlVJx4IhBmrn6vZU1LvANUaK1jZZF2PW5tFRrVEnydfpqg=="
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.0.tgz",
+			"integrity": "sha512-p8iw5oGvWLIk7osMgXhxshUpebJD0riiuT3ihBP0DV+Gs8r0qdQ5gtcStl7Cn0D4013p4j/f3T5q85Z9ENE6fA=="
 		},
 		"@sentry/utils": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.28.0.tgz",
-			"integrity": "sha512-ag1RotlFSJnwUi/MYWY5iQ8aLcwrCBlD/qlGB43PvB3XGDl3e7E/pUy2bdblP7Q2uCKLVUBcudyaSgtvNqu9wA==",
+			"version": "7.37.0",
+			"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.0.tgz",
+			"integrity": "sha512-CN86EKQ07+SgqfgGehMJsgrCEjc0sl1YDcj2xf9dA0Bn3ma2MTDkCyutxVcRfc2IVWfqAN1rn/L8/BH2v2+eqA==",
 			"requires": {
-				"@sentry/types": "7.28.0",
+				"@sentry/types": "7.37.0",
 				"tslib": "^1.9.3"
 			},
 			"dependencies": {
diff --git a/package.json b/package.json
index 89ad510cee..cbf4805f54 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
 		"@reach/dialog": "0.15.0",
 		"@reduxjs/toolkit": "^1.8.5",
 		"@socket.tech/plugin": "^1.0.3",
-		"@sentry/browser": "^7.28.0",
-		"@sentry/tracing": "^7.28.0",
+		"@sentry/browser": "^7.37.0",
+		"@sentry/tracing": "^7.37.0",
 		"@synthetixio/contracts-interface": "2.76.3",
 		"@synthetixio/optimism-networks": "2.74.6",
 		"@synthetixio/providers": "2.74.10",

From a0316338bb9c5efd6b002471e3e79d6736b3bb31 Mon Sep 17 00:00:00 2001
From: "troyb.eth" <me@troyb.xyz>
Date: Fri, 10 Feb 2023 10:44:53 -0700
Subject: [PATCH 5/6] fix: open interest on stats page (#2002)

fix OI stats and hooks
---
 hooks/useStatsData.ts | 10 +++++-----
 state/app/hooks.ts    |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/hooks/useStatsData.ts b/hooks/useStatsData.ts
index d68e992018..9012d2ab82 100644
--- a/hooks/useStatsData.ts
+++ b/hooks/useStatsData.ts
@@ -2,26 +2,26 @@ import { useMemo } from 'react';
 
 import { useGetFuturesTradersStats } from 'queries/futures/useGetFuturesTradersStats';
 import { useGetStatsVolumes } from 'queries/futures/useGetStatsVolumes';
-import { selectMarketPrice, selectMarkets } from 'state/futures/selectors';
+import { selectMarkPrices, selectMarkets } from 'state/futures/selectors';
 import { useAppSelector } from 'state/hooks';
 
 export type StatsTimeframe = '1M' | '1Y' | 'MAX';
 
 const useStatsData = () => {
 	const futuresMarkets = useAppSelector(selectMarkets);
-	const price = useAppSelector(selectMarketPrice);
+	const prices = useAppSelector(selectMarkPrices);
 
 	const { data: volumeData, isLoading: volumeIsLoading } = useGetStatsVolumes();
 	const { data: tradersData, isLoading: tradersIsLoading } = useGetFuturesTradersStats();
 
 	const openInterestData = useMemo(() => {
-		return futuresMarkets.map(({ asset, marketSize }) => {
+		return futuresMarkets.map(({ marketKey, asset, marketSize }) => {
 			return {
 				asset,
-				openInterest: marketSize.mul(price).toNumber(),
+				openInterest: marketSize.mul(prices[marketKey]).toNumber(),
 			};
 		});
-	}, [futuresMarkets, price]);
+	}, [futuresMarkets, prices]);
 
 	return {
 		volumeData,
diff --git a/state/app/hooks.ts b/state/app/hooks.ts
index ff8e347794..5823a82e63 100644
--- a/state/app/hooks.ts
+++ b/state/app/hooks.ts
@@ -2,6 +2,7 @@ import { useEffect } from 'react';
 
 import { fetchBalances } from 'state/balances/actions';
 import { sdk } from 'state/config';
+import { fetchMarkets } from 'state/futures/actions';
 import { selectMarkets } from 'state/futures/selectors';
 import { useAppDispatch, useAppSelector, usePollAction } from 'state/hooks';
 import { fetchPreviousDayPrices, updatePrices } from 'state/prices/actions';
@@ -14,6 +15,8 @@ export function useAppData(ready: boolean) {
 	const wallet = useAppSelector(selectWallet);
 	const markets = useAppSelector(selectMarkets);
 
+	usePollAction('fetchMarkets', fetchMarkets, { dependencies: [wallet] });
+
 	usePollAction('fetchBalances', fetchBalances, { dependencies: [wallet] });
 
 	usePollAction('fetchPreviousDayPrices', fetchPreviousDayPrices, {

From 7eabac846e034a48b749fa37c92471d0e402352e Mon Sep 17 00:00:00 2001
From: platschi <platschi@posteo.org>
Date: Fri, 10 Feb 2023 14:49:50 -0300
Subject: [PATCH 6/6] chore: bump version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ef840b8f5e..3d95ff1d65 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "kwenta",
-	"version": "6.1.0",
+	"version": "6.1.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "kwenta",
-			"version": "6.1.0",
+			"version": "6.1.1",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@artsy/fresnel": "1.7.0",
diff --git a/package.json b/package.json
index cbf4805f54..69cced1472 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "kwenta",
-	"version": "6.1.0",
+	"version": "6.1.1",
 	"scripts": {
 		"dev": "next",
 		"build": "next build",