(Market): fix laggy nav issue + double breadcrumb

LedgerHQ · May 18, 2022 · 3116662 · 3116662 · github-actions · May 18, 2022
1 parent 1d050e2
commit 3116662
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/renderer/components/Breadcrumb/index.js b/src/renderer/components/Breadcrumb/index.js
@@ -45,7 +45,7 @@ const Breadcrumb = () => (
 
     <Route path="/asset/:assetId+" component={AssetCrumb} />
     <Route path="/account/:id/nft-collection/:collectionAddress?" component={NFTCrumb} />
-    <Route path="/market" component={MarketCrumb} />
+
     <Route path="/market/:currencyId/" component={MarketCrumb} />
   </Wrapper>
 );

diff --git a/src/renderer/screens/market/MarketCoinScreen/index.tsx b/src/renderer/screens/market/MarketCoinScreen/index.tsx
@@ -118,15 +118,9 @@ export default function MarketCoinScreen() {
   }, [rampCatalog.value]);
 
   const availableOnBuy =
-    currency && currency.ticker && onRampAvailableTickers.includes(currency.ticker.toUpperCase());
+    currency && currency.ticker && onRampAvailableTickers.includes(currency.ticker?.toUpperCase());
   const availableOnSwap = internalCurrency && swapAvailableIds.includes(internalCurrency.id);
 
-  useEffect(() => {
-    return () => {
-      selectCurrency();
-    };
-  }, [selectCurrency]);
-
   const color = internalCurrency
     ? getCurrencyColor(internalCurrency, colors.background.main)
     : colors.primary.c80;
@@ -144,7 +138,7 @@ export default function MarketCoinScreen() {
         },
       });
     },
-    [internalCurrency, history, currency],
+    [history, currency],
   );
 
   const openAddAccounts = useCallback(() => {

diff --git a/src/renderer/screens/market/MarketList.tsx b/src/renderer/screens/market/MarketList.tsx
@@ -211,6 +211,7 @@ const CurrencyRow = memo(function CurrencyRowItem({
   locale,
   swapAvailableIds,
   onRampAvailableTickers,
+  range,
   style,
 }: any) {
   const currency = data ? data[index] : null;
@@ -230,6 +231,7 @@ const CurrencyRow = memo(function CurrencyRowItem({
       selectCurrency={selectCurrency}
       availableOnBuy={availableOnBuy}
       availableOnSwap={availableOnSwap}
+      range={range}
       style={{ ...style }}
     />
   );
@@ -276,7 +278,7 @@ function MarketList({
   } = useMarketData();
   const dispatch = useDispatch();
 
-  const { orderBy, order, starred, search } = requestParams;
+  const { orderBy, order, starred, search, range } = requestParams;
   const currenciesLength = marketData.length;
   const freshLoading = loading && !currenciesLength;
 
@@ -368,6 +370,7 @@ function MarketList({
                         locale={locale}
                         swapAvailableIds={swapAvailableIds}
                         onRampAvailableTickers={onRampAvailableTickers}
+                        range={range}
                       />
                     )}
                   </List>
@@ -400,6 +403,7 @@ function MarketList({
                             locale={locale}
                             swapAvailableIds={swapAvailableIds}
                             onRampAvailableTickers={onRampAvailableTickers}
+                            range={range}
                           />
                         )}
                       </List>