Merge branch 'develop' into ENG-5340/export-necessary-functionality-f…

…rom-ext
secretkeylabs · Oct 2, 2024 · e8f70d1 · e8f70d1
2 parents 69cdb39 + 84cb04b
commit e8f70d1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/src/app/components/rareSatIcon/rareSatIcon.tsx b/src/app/components/rareSatIcon/rareSatIcon.tsx
@@ -35,8 +35,8 @@ import styled from 'styled-components';
 
 const Image = styled.img<{ size?: number }>`
   object-fit: cover;
-  width: ${(props) => `${props.size}px` ?? '100%'};
-  height: ${(props) => `${props.size}px` ?? '100%'};
+  width: ${(props) => (typeof props.size === 'undefined' ? '100%' : `${props.size}px`)};
+  height: ${(props) => (typeof props.size === 'undefined' ? '100%' : `${props.size}px`)};
 `;
 
 interface Props {

diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -36,12 +36,11 @@ const useMasterCoinsList = () => {
   const isStacksSwapsEnabled = useHasFeature(FeatureId.STACKS_SWAPS);
 
   const coinsMasterList = useMemo(
-    () =>
-      [
-        ...(runesFtList || []),
-        btcFt,
-        ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...(sip10FtList ?? [])] : []),
-      ] ?? [],
+    () => [
+      ...(runesFtList || []),
+      btcFt,
+      ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...(sip10FtList ?? [])] : []),
+    ],
     [runesFtList, hideStx, isStacksSwapsEnabled, sip10FtList],
   );
 

diff --git a/src/app/screens/swap/useVisibleMasterCoinsList.tsx b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
@@ -14,13 +14,12 @@ const useVisibleMasterCoinsList = () => {
   const { hideStx } = useWalletSelector();
 
   const coinsMasterList = useMemo(
-    () =>
-      [
-        ...sip10FtList,
-        ...runesFtList,
-        btcFt,
-        ...(!hideStx && isStacksSwapsEnabled ? [stxFt] : []),
-      ] ?? [],
+    () => [
+      ...sip10FtList,
+      ...runesFtList,
+      btcFt,
+      ...(!hideStx && isStacksSwapsEnabled ? [stxFt] : []),
+    ],
     [sip10FtList, runesFtList, hideStx, isStacksSwapsEnabled],
   );