feat(suite): add minHeight to Flex component

trezor · Oct 1, 2024 · 4bc84bf · 4bc84bf
1 parent 5288cb9
commit 4bc84bf
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/packages/components/src/components/Flex/Flex.tsx b/packages/components/src/components/Flex/Flex.tsx
@@ -14,6 +14,7 @@ export const allowedFlexFrameProps = [
     'margin',
     'width',
     'height',
+    'minHeight',
     'overflow',
 ] as const satisfies FramePropsKeys[];
 type AllowedFrameProps = Pick<FrameProps, (typeof allowedFlexFrameProps)[number]>;

diff --git a/packages/product-components/src/components/SelectAssetModal/NetworkTabs.tsx b/packages/product-components/src/components/SelectAssetModal/NetworkTabs.tsx
@@ -70,17 +70,19 @@ export const NetworkTabs = ({
                         onClick={() => {
                             if (
                                 searchCategory?.coingeckoId === network.coingeckoId &&
-                                searchCategory.coingeckoNativeId === network.coingeckoNativeId
+                                searchCategory?.coingeckoNativeId === network.coingeckoNativeId
                             ) {
                                 setSearchCategory(null);
 
                                 return;
                             }
 
-                            setSearchCategory({
-                                coingeckoId: network.coingeckoId,
-                                coingeckoNativeId: network.coingeckoNativeId,
-                            });
+                            if (network.coingeckoId) {
+                                setSearchCategory({
+                                    coingeckoId: network.coingeckoId,
+                                    coingeckoNativeId: network.coingeckoNativeId,
+                                });
+                            }
                         }}
                         key={network.coingeckoId}
                     >

diff --git a/packages/product-components/src/components/SelectAssetModal/mockData.ts b/packages/product-components/src/components/SelectAssetModal/mockData.ts
@@ -77,10 +77,10 @@ export const selectAssetModalOptions: SelectAssetOptionProps[] = [
     },
     {
         type: 'currency',
-        value: 'matic-network',
-        label: 'MATIC',
-        cryptoName: 'Polygon',
-        coingeckoId: 'matic-network',
+        value: 'polygon-pos',
+        label: 'POL',
+        cryptoName: 'Polygon PoS',
+        coingeckoId: 'polygon-pos',
     },
     {
         type: 'currency',
@@ -720,7 +720,7 @@ export const selectAssetModalOptions: SelectAssetOptionProps[] = [
     {
         type: 'currency',
         value: 'ethereum--0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0',
-        label: 'MATIC',
+        label: 'POL',
         cryptoName: 'Polygon',
         coingeckoId: 'ethereum',
         contractAddress: '0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0',
@@ -1087,9 +1087,9 @@ export const selectAssetModalNetworks: SelectAssetNetworkProps[] = [
     },
     {
         name: 'Polygon PoS',
-        symbol: 'matic',
+        symbol: 'pol',
         coingeckoId: 'polygon-pos',
-        coingeckoNativeId: 'matic-network',
+        coingeckoNativeId: 'polygon-ecosystem-token',
     },
     {
         name: 'Solana',

diff --git a/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketInfo.ts b/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketInfo.ts
@@ -151,11 +151,11 @@ export const useCoinmarketInfo = (): CoinmarketInfoProps => {
                 return toCryptoOption(cryptoId, coinInfo);
             }
 
-            const { coingeckoId, name } = networks.btc;
+            const { coingeckoId, name, symbol } = networks.btc;
             const item: CoinmarketCryptoSelectItemProps = {
                 type: 'currency',
-                value: cryptoId,
-                label: 'BTC',
+                value: coingeckoId as CryptoId,
+                label: symbol.toUpperCase(),
                 cryptoName: name,
                 coingeckoId,
             };

diff --git a/.../coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCryptoSelect.tsx b/.../coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCryptoSelect.tsx
@@ -74,7 +74,7 @@ export const CoinmarketFormInputCryptoSelect = <
     };
 
     const getNetworks = () => {
-        const networksToSelect: NetworkSymbol[] = ['eth', 'sol', 'matic', 'bnb'];
+        const networksToSelect: NetworkSymbol[] = ['eth', 'sol', 'pol', 'bnb'];
         const networkAllKeys = Object.keys(networks) as NetworkSymbol[];
         const networkKeys = networkAllKeys.filter(item => networksToSelect.includes(item));
         const networksSelected = networkKeys.map(networkKey => ({