Fix/spot (#2505)

* feat: change rsk mainnet endpoint SOV-1537 * fix: change back metamask helper * fix: RBTC/DLLR --------- Co-authored-by: soulBit <[email protected]>
DistributedCollective · Mar 16, 2023 · e143cd7 · e143cd7
1 parent 099528f
commit e143cd7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 32 deletions.
diff --git a/src/app/components/PairNavbarInfo/index.tsx b/src/app/components/PairNavbarInfo/index.tsx
@@ -118,12 +118,25 @@ export const PairNavbarInfo: React.FC<IPairNavbarInfoProps> = ({ pair }) => {
     [invertPrice],
   );
 
+  const low = useMemo(() => normalize(invertPrice ? highPrice : lowPrice), [
+    highPrice,
+    invertPrice,
+    lowPrice,
+    normalize,
+  ]);
+  const high = useMemo(() => normalize(invertPrice ? lowPrice : highPrice), [
+    highPrice,
+    invertPrice,
+    lowPrice,
+    normalize,
+  ]);
+
   return (
     <div className="tw-flex tw-items-center tw-justify-around tw-flex-1 tw-text-xs">
       <div className="tw-hidden sm:tw-flex tw-items-center tw-text-center tw-flex-row">
         {t(translations.pairNavbar.lastTradedPrice)}
         <span className="tw-ml-2 tw-font-semibold tw-text-sm tw-text-primary">
-          {toNumberFormat(normalize(_lastPrice), 8)}
+          {toNumberFormat(_lastPrice, 8)}
         </span>
       </div>
       <div className="tw-hidden md:tw-flex tw-items-center tw-text-center tw-flex-row">
@@ -146,7 +159,7 @@ export const PairNavbarInfo: React.FC<IPairNavbarInfoProps> = ({ pair }) => {
           <div>
             {t(translations.pairNavbar.dayLow)}
             <span className="tw-ml-2 tw-font-semibold tw-text-sm tw-text-trade-short">
-              {toNumberFormat(normalize(lowPrice), 8)}
+              {toNumberFormat(low, 8)}
             </span>
           </div>
         )}{' '}
@@ -156,7 +169,7 @@ export const PairNavbarInfo: React.FC<IPairNavbarInfoProps> = ({ pair }) => {
           <div>
             {t(translations.pairNavbar.dayHigh)}{' '}
             <span className="tw-ml-2 tw-font-semibold tw-text-sm tw-text-trade-long">
-              {toNumberFormat(normalize(highPrice), 8)}
+              {toNumberFormat(high, 8)}
             </span>
           </div>
         )}

diff --git a/src/app/components/TradingChart/datafeed.ts b/src/app/components/TradingChart/datafeed.ts
@@ -27,7 +27,6 @@ import {
   getTokensFromSymbol,
   hasDirectFeed,
   queryPairByChunks,
-  shouldInvertPair,
 } from './helpers';
 import { CandleDuration } from 'app/pages/PerpetualPage/hooks/graphql/useGetCandles';
 import { TradingCandleDictionary } from './dictionary';
@@ -126,16 +125,6 @@ const tradingChartDataFeeds = (
         hasDirectFeed(symbolInfo.name),
       );
 
-      if (shouldInvertPair(symbolInfo.name) && items) {
-        items = items.map(item => ({
-          ...item,
-          open: 1 / item.open,
-          high: 1 / item.high,
-          low: 1 / item.low,
-          close: 1 / item.close,
-        }));
-      }
-
       if (!items || items.length === 0) {
         onHistoryCallback([], {
           noData: true,

diff --git a/src/app/components/TradingChart/helpers.ts b/src/app/components/TradingChart/helpers.ts
@@ -38,10 +38,7 @@ export const shouldInvertPair = (symbolName: string) =>
   pairstoInvert.includes(symbolName);
 
 export const hasDirectFeed = (symbolName: string) => {
-  const [base, quote] = symbolName.split('/') as [Asset, Asset];
-  if (base === Asset.RBTC && quote === Asset.DLLR) {
-    return true;
-  }
+  const [, quote] = symbolName.split('/') as [Asset, Asset];
   return [Asset.RBTC, Asset.XUSD].includes(quote);
 };
 
@@ -459,9 +456,6 @@ const getTokenAddress = (asset: Asset) =>
 
 export const getTokensFromSymbol = (symbol: string) => {
   let [base, quote] = symbol.split('/');
-  if (shouldInvertPair(symbol)) {
-    [base, quote] = [quote, base];
-  }
   return {
     baseToken: getTokenAddress(base as Asset),
     quoteToken: getTokenAddress(quote as Asset),

diff --git a/src/app/components/TradingChart/streaming.ts b/src/app/components/TradingChart/streaming.ts
@@ -20,7 +20,6 @@ import {
   getTokensFromSymbol,
   hasDirectFeed,
   queryPairByChunks,
-  shouldInvertPair,
 } from './helpers';
 
 type SubItem = {
@@ -95,16 +94,6 @@ export class Streaming {
             return;
           }
 
-          if (shouldInvertPair(subscriptionItem.symbolInfo.name) && bar) {
-            bar = {
-              ...bar,
-              open: 1 / bar.open,
-              high: 1 / bar.high,
-              low: 1 / bar.low,
-              close: 1 / bar.close,
-            };
-          }
-
           // update last bar cache and execute chart callback
           subscriptionItem.lastBar = bar;
           subscriptionItem.handler(bar);