Merge pull request #1306 from mars-protocol/develop

v2.8.5

Author: Patricie29

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mars-v2-frontend",
-  "version": "2.8.4",
+  "version": "2.8.5",
   "homepage": "./",
   "private": false,
   "license": "SEE LICENSE IN LICENSE FILE",

src/components/trade/TradeModule/AssetSelector/AssetSelectorPair.tsx

@@ -1,5 +1,6 @@
 import { useCallback } from 'react'
 
+import AssetImage from 'components/common/assets/AssetImage'
 import Button from 'components/common/Button'
 import { ChevronDown } from 'components/common/Icons'
 import Text from 'components/common/Text'
@@ -43,9 +44,12 @@ export default function AssetSelectorPair(props: Props) {
         onClick={() => useStore.setState({ assetOverlayState: 'pair' })}
         className='flex items-center justify-between w-full py-5 rounded-b-none bg-white/10'
       >
-        <Text size='sm' className='text-white/60'>
-          <span className='text-white'>{buyAsset.symbol}</span>/{sellAsset.symbol}
-        </Text>
+        <div className='flex items-center gap-1'>
+          <AssetImage asset={buyAsset} className='w-5 h-5' />
+          <Text size='sm' className='text-white/60'>
+            <span className='text-white'>{buyAsset.symbol}</span>/{sellAsset.symbol}
+          </Text>
+        </div>
         <div className='flex items-center gap-2'>
           <Text>All markets</Text>
           <ChevronDown className='w-3 h-3' />

src/components/trade/TradeModule/AssetSelector/AssetSelectorPerps.tsx

@@ -1,5 +1,6 @@
 import { useCallback } from 'react'
 
+import AssetImage from 'components/common/assets/AssetImage'
 import Button from 'components/common/Button'
 import { ChevronDown } from 'components/common/Icons'
 import Text from 'components/common/Text'
@@ -50,6 +51,7 @@ export default function AssetSelectorPerps(props: Props) {
         className='flex items-center justify-between w-full py-5 rounded-b-none bg-white/5 '
       >
         <div className='flex items-center gap-2'>
+          <AssetImage asset={perpsAsset} className='w-5 h-5' />
           <Text size='sm' className='text-white/60'>
             <span className='text-white'>{perpsAsset.symbol}</span>/USD
           </Text>