Asset selection hotfix (#256)

* refine asset selector * dark mode tweaks
unstoppabledomains · Jan 15, 2025 · 564cbba · 564cbba
1 parent a2b5faf
commit 564cbba
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/packages/ui-components/src/components/Wallet/OperationStatus.tsx b/packages/ui-components/src/components/Wallet/OperationStatus.tsx
@@ -56,7 +56,7 @@ const useStyles = makeStyles()((theme: Theme) => ({
     '& > svg': {
       width: AVATAR_RESULT_SIZE,
       height: AVATAR_RESULT_SIZE,
-      fill: theme.palette.getContrastText(theme.palette.success.main),
+      fill: theme.palette.common.white,
       padding: theme.spacing(3),
     },
   },

diff --git a/packages/ui-components/src/components/Wallet/SendConfirm.tsx b/packages/ui-components/src/components/Wallet/SendConfirm.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import {makeStyles} from '@unstoppabledomains/ui-kit/styles';
 
 import type {TokenEntry} from '../../lib';
-import { useTranslationContext} from '../../lib';
+import {useTranslationContext} from '../../lib';
 import type {AccountAsset} from '../../lib/types/fireBlocks';
 import {
   getBlockchainDisplaySymbol,
@@ -36,21 +36,12 @@ const useStyles = makeStyles()((theme: Theme) => ({
     width: '100%',
     gap: '7px',
     marginBottom: theme.spacing(5),
-    backgroundColor: theme.palette.primaryShades[100],
+    color: theme.palette.getContrastText(theme.palette.secondary.light),
+    backgroundColor: theme.palette.secondary.light,
     padding: 12,
     borderRadius: 8,
     height: '100%',
   },
-  icon: {
-    fontSize: '60px',
-  },
-  subTitlePending: {
-    marginTop: theme.spacing(1),
-    color: theme.palette.neutralShades[400],
-  },
-  subTitleComplete: {
-    marginTop: theme.spacing(1),
-  },
 }));
 
 const MAX_DISPLAY_LENGTH = 12;

diff --git a/packages/ui-components/src/lib/wallet/asset.test.ts b/packages/ui-components/src/lib/wallet/asset.test.ts
@@ -141,6 +141,27 @@ describe('selecting asset', () => {
     expect(asset?.blockchainAsset.blockchain.id).toBe('POLYGON');
   });
 
+  it('should select Polygon asset by native token asset', () => {
+    const asset = getAsset(mockAssets, {
+      token: {
+        address: 'mockTokenAddress',
+        type: TokenType.Native,
+        symbol: 'MATIC',
+        name: 'Polygon',
+        ticker: 'MATIC',
+        value: 1,
+        tokenConversionUsd: 1,
+        balance: 1,
+        walletAddress: '0x8ee1E1d88EBE2B44eAD162777DE787Ef6A2dC2F2',
+        walletBlockChainLink: 'mockBlockchainLink',
+        walletName: 'Polygon',
+      },
+      address: '0x8ee1E1d88EBE2B44eAD162777DE787Ef6A2dC2F2',
+    });
+    expect(asset).toBeDefined();
+    expect(asset?.blockchainAsset.blockchain.id).toBe('POLYGON');
+  });
+
   it('should not return an asset for invalid chain ID', () => {
     const asset = getAsset(mockAssets, {
       chainId: 9999999999,

diff --git a/packages/ui-components/src/lib/wallet/asset.ts b/packages/ui-components/src/lib/wallet/asset.ts
@@ -35,7 +35,7 @@ export const getAsset = (
       const isToken =
         opts.token.type === TokenType.Erc20 ||
         opts.token.type === TokenType.Spl;
-      const tokenAsset =
+      return (
         opts.token.walletName.toLowerCase() ===
           a.blockchainAsset.blockchain.name.toLowerCase() &&
         [
@@ -46,10 +46,8 @@ export const getAsset = (
             ? opts.token.symbol.toLowerCase()
             : opts.token.ticker.toLowerCase(),
         ) &&
-        a.address.toLowerCase() === opts.token.walletAddress.toLowerCase();
-      if (tokenAsset) {
-        return tokenAsset;
-      }
+        a.address.toLowerCase() === opts.token.walletAddress.toLowerCase()
+      );
     }
 
     // find by address on default signing assets