From 992ab372ca63083932f71d0980636180e077da07 Mon Sep 17 00:00:00 2001
From: naturexie <786281870@qq.com>
Date: Fri, 17 Jan 2025 19:14:28 +0800
Subject: [PATCH] feat: adjust wnear icon and symbol

---
 screens/MarginTrading/components/MarketTrading.tsx |  5 ++---
 .../Trading/components/ChangeCollateralMobile.tsx  |  4 ++--
 screens/Trading/components/tokenbox.tsx            |  6 ++++--
 screens/Trading/index.tsx                          | 14 ++------------
 transformers/asstets.ts                            |  3 ++-
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/screens/MarginTrading/components/MarketTrading.tsx b/screens/MarginTrading/components/MarketTrading.tsx
index 6d9dfa2e..225a1324 100644
--- a/screens/MarginTrading/components/MarketTrading.tsx
+++ b/screens/MarginTrading/components/MarketTrading.tsx
@@ -67,11 +67,10 @@ const MarketMarginTrading = ({ hidden }: { hidden: boolean }) => {
         const results = await Promise.all(promises);
         const mergedData: any[] = Object.values(marginConfigList).map((item, index) => {
           const volumeData: any | undefined = results[index];
-          // console.log(volumeData, "volumeData");
           return {
             ...item,
-            totalVolume: volumeData?.data.total_volume || 0,
-            volume24h: volumeData?.data["24h_volume"] || 0,
+            totalVolume: volumeData?.data?.total_volume || 0,
+            volume24h: volumeData?.data?.["24h_volume"] || 0,
           };
         });
         setMergedData(mergedData);
diff --git a/screens/Trading/components/ChangeCollateralMobile.tsx b/screens/Trading/components/ChangeCollateralMobile.tsx
index 9edcd15d..3c1614ec 100644
--- a/screens/Trading/components/ChangeCollateralMobile.tsx
+++ b/screens/Trading/components/ChangeCollateralMobile.tsx
@@ -497,7 +497,7 @@ const ChangeCollateralMobile: FC<ChangeCollateralMobileProps> = ({ open, onClose
                     </div>
                     <div>
                       <div className="flex items-center justify-end">
-                        <img src={iconC} alt="" className="w-4 h-4" />
+                        <img src={iconC} alt="" className="w-4 h-4 rounded-full" />
                         <p className="text-base ml-1">{symbolC}</p>
                       </div>
                       <p className="text-xs text-gray-300 mt-1.5">
@@ -640,7 +640,7 @@ const ChangeCollateralMobile: FC<ChangeCollateralMobileProps> = ({ open, onClose
                     </div>
                     <div>
                       <div className="flex items-center justify-end">
-                        <img src={iconC} alt="" className="w-4 h-4" />
+                        <img src={iconC} alt="" className="w-4 h-4 rounded-full" />
                         <p className="text-base ml-1">{symbolC}</p>
                       </div>
                       <p className="text-xs text-gray-300 mt-1.5">
diff --git a/screens/Trading/components/tokenbox.tsx b/screens/Trading/components/tokenbox.tsx
index fd5cef40..8e56b74e 100644
--- a/screens/Trading/components/tokenbox.tsx
+++ b/screens/Trading/components/tokenbox.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from "react";
 import { useDebounce } from "react-use";
+import _ from "lodash";
 import Decimal from "decimal.js";
 import { NearIcon } from "../../MarginTrading/components/Icon";
 import { TokenThinArrow, TokenSelected } from "./TradingIcon";
@@ -106,10 +107,11 @@ const TradingToken: React.FC<TradingTokenInter> = ({
     }
   };
   function getTokenBalance(asset: Asset) {
+    if (_.isEmpty(account?.balances)) return "";
     if (asset.token_id == nearTokenId) {
       return shrinkToken(
-        new Decimal(account.balances[asset.metadata.token_id])
-          .plus(account.balances["near"])
+        new Decimal(account?.balances?.[asset.metadata.token_id] || 0)
+          .plus(account?.balances?.["near"] || 0)
           .toFixed(0),
         asset.metadata.decimals,
       );
diff --git a/screens/Trading/index.tsx b/screens/Trading/index.tsx
index 1836429f..ad3dce65 100644
--- a/screens/Trading/index.tsx
+++ b/screens/Trading/index.tsx
@@ -241,12 +241,7 @@ const Trading = () => {
                         onClick={handlePopupToggle}
                         className="flex justify-center items-center"
                       >
-                        <p className="mr-1">
-                          {currentTokenCate2?.metadata?.symbol ||
-                            (isMainStream
-                              ? categoryAssets2[0]?.metadata.symbol
-                              : categoryAssets2MEME[0]?.metadata.symbol)}
-                        </p>
+                        <p className="mr-1">{currentTokenCate2?.metadata?.symbol}</p>
                         <TokenArrow />
                       </div>
                       {showPopupCate2 && (
@@ -329,12 +324,7 @@ const Trading = () => {
                             onClick={handlePopupToggle}
                             className="flex justify-center items-center"
                           >
-                            <p className="mr-1">
-                              {currentTokenCate2?.metadata?.symbol ||
-                                (isMainStream
-                                  ? categoryAssets2[0]?.metadata.symbol
-                                  : categoryAssets2MEME[0]?.metadata.symbol)}
-                            </p>
+                            <p className="mr-1">{currentTokenCate2?.metadata?.symbol}</p>
                             <TokenArrow />
                           </div>
                           {showPopupCate2 && (
diff --git a/transformers/asstets.ts b/transformers/asstets.ts
index 8884f7b9..17bc8c3c 100644
--- a/transformers/asstets.ts
+++ b/transformers/asstets.ts
@@ -19,8 +19,9 @@ export function transformAssets({
       asset.config.can_deposit = true;
       asset.config.can_withdraw = true;
     }
-    if (!assetMetadata?.icon && nearNativeTokens.includes(assetMetadata?.token_id)) {
+    if (nearNativeTokens.includes(assetMetadata?.token_id)) {
       assetMetadata.icon = nearMetadata.icon;
+      assetMetadata.symbol = nearMetadata.symbol;
     }
     map[asset.token_id] = omit(
       {