Merge pull request #926 from Kwenta/v2

Merge v2 into v2-dev
Kwenta · Jun 2, 2022 · eae03df · eae03df
2 parents 392ed2b + 2dd1255
commit eae03df
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/queries/rates/useExchangeRatesQuery.ts b/queries/rates/useExchangeRatesQuery.ts
@@ -18,7 +18,7 @@ type CurrencyRate = BigNumberish;
 type SynthRatesTuple = [string[], CurrencyRate[]];
 
 // Additional commonly used currencies to fetch, besides the one returned by the SynthUtil.synthsRates
-const additionalCurrencies = [CRYPTO_CURRENCY_MAP.SNX, 'XAU', 'XAG'].map(
+const additionalCurrencies = [CRYPTO_CURRENCY_MAP.SNX, 'XAU', 'XAG', 'DYDX', 'APE'].map(
 	ethers.utils.formatBytes32String
 );
 

diff --git a/queries/rates/utils.ts b/queries/rates/utils.ts
@@ -81,6 +81,8 @@ const markets = [
 	'sXAU',
 	'sXAG',
 	'sWTI',
+	'sDYDX',
+	'sAPE',
 ] as const;
 
 const map: Record<typeof markets[number], string> = {
@@ -96,6 +98,8 @@ const map: Record<typeof markets[number], string> = {
 	sXAU: '',
 	sXAG: '',
 	sWTI: '',
+	sDYDX: 'dydx',
+	sAPE: 'apecoin',
 };
 
 export const synthToCoingeckoPriceId = (synth: any) => {

diff --git a/sections/futures/Trade/Trade.tsx b/sections/futures/Trade/Trade.tsx
@@ -174,7 +174,7 @@ const Trade: React.FC<TradeProps> = ({ refetch, onEditPositionInput, position, c
 	}, [router.events]);
 
 	const onTradeAmountSUSDChange = (value: string) => {
-		const valueIsNull = value === '' || Number(value) === 0;
+		const valueIsNull = marketAssetRate.eq(0) || value === '' || Number(value) === 0;
 		const size = valueIsNull ? '' : wei(value).div(marketAssetRate).toNumber().toString();
 		const leverage = valueIsNull
 			? ''

diff --git a/sections/futures/UserInfo/UserInfo.tsx b/sections/futures/UserInfo/UserInfo.tsx
@@ -3,7 +3,6 @@ import React, { useMemo, useState, useCallback, useEffect } from 'react';
 import styled from 'styled-components';
 import { castArray } from 'lodash';
 import { useRouter } from 'next/router';
-import useSynthetixQueries from '@synthetixio/queries';
 
 import { TabPanel } from 'components/Tab';
 import TabButton from 'components/Button/TabButton';
@@ -32,6 +31,7 @@ import { FuturesTrade } from 'queries/futures/types';
 import { useRecoilValue } from 'recoil';
 import { walletAddressState } from 'store/wallet';
 import useGetFuturesTradesForAccount from 'queries/futures/useGetFuturesTradesForAccount';
+import useExchangeRatesQuery from 'queries/rates/useExchangeRatesQuery';
 
 enum FuturesTab {
 	POSITION = 'position',
@@ -54,7 +54,6 @@ const UserInfo: React.FC<UserInfoProps> = ({ marketAsset, position, openOrders,
 	const router = useRouter();
 	const walletAddress = useRecoilValue(walletAddressState);
 
-	const { useExchangeRatesQuery } = useSynthetixQueries();
 	const exchangeRatesQuery = useExchangeRatesQuery({
 		refetchInterval: 15000,
 	});