From e188e74f9058cdc3883e82bd6e0b834d16c073a6 Mon Sep 17 00:00:00 2001
From: Hossein <hossein13785ab@gmail.com>
Date: Wed, 27 Nov 2024 17:03:08 +0330
Subject: [PATCH] #232: Add support for new currencies across all components.

---
 public/assets/locales/en/translation.json     |  4 ++-
 public/assets/locales/fa/translation.json     |  4 ++-
 src/assets/images.js                          |  4 +++
 src/assets/images/src/solana.svg              | 36 +++++++++++++++++++
 src/assets/images/src/tether.svg              | 20 ++++++++++-
 src/assets/images/src/toncoin.svg             | 18 ++++++++++
 .../components/WalletSubMenu/WalletSubMenu.js |  7 ++--
 7 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 src/assets/images/src/solana.svg
 create mode 100644 src/assets/images/src/toncoin.svg

diff --git a/public/assets/locales/en/translation.json b/public/assets/locales/en/translation.json
index 50f1e01c..58e4f4c7 100644
--- a/public/assets/locales/en/translation.json
+++ b/public/assets/locales/en/translation.json
@@ -84,7 +84,9 @@
     "TBNB": "TBNB",
     "TBUSD": "TBUSD",
     "BCH": "BCH",
-    "TRX": "TRX"
+    "TRX": "TRX",
+    "SOL": "SOL",
+    "TON": "TON"
   },
   "marketInterval": {
     "24h": "24 hours",
diff --git a/public/assets/locales/fa/translation.json b/public/assets/locales/fa/translation.json
index a93a1eaf..3158295d 100644
--- a/public/assets/locales/fa/translation.json
+++ b/public/assets/locales/fa/translation.json
@@ -84,7 +84,9 @@
     "TBNB": "بایننس (ت)",
     "TBUSD": "دلار بایننس(ت)",
     "BCH": "بیتکوین کش",
-    "TRX": "ترون"
+    "TRX": "ترون",
+    "SOL": "سولانا",
+    "TON": "تون کوین"
   },
   "marketInterval": {
     "24h": "24 ساعت",
diff --git a/src/assets/images.js b/src/assets/images.js
index cd5d2df1..faf9b319 100644
--- a/src/assets/images.js
+++ b/src/assets/images.js
@@ -19,6 +19,8 @@ import tron from "./images/src/tron.svg";
 import testTron from "./images/src/testTron.svg";
 import ethereumLight from "./images/src/ethereumLight.svg";
 import toman from "./images/src/toman.svg";
+import toncoin from "./images/src/toncoin.svg";
+import solana from "./images/src/solana.svg";
 import spaceStar from "./images/src/spaceStar.png";
 import astronaut from "./images/src/astronaut.svg";
 import astronautAlone from "./images/src/astronautAlone.svg";
@@ -62,6 +64,8 @@ export const images = {
   TTRX: testTron,
   ETH: ethereumLight,
   IRT: toman,
+  TON: toncoin,
+  SOL: solana,
   spaceStar: spaceStar,
   astronaut: astronaut,
   astronautAlone: astronautAlone,
diff --git a/src/assets/images/src/solana.svg b/src/assets/images/src/solana.svg
new file mode 100644
index 00000000..d09ddb68
--- /dev/null
+++ b/src/assets/images/src/solana.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 2499.6 2500" style="enable-background:new 0 0 2499.6 2500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#0E0E0E;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_00000021834792655739791350000017812679319390934171_);}
+	.st3{fill:url(#SVGID_00000148630987111574291310000007624911039926599052_);}
+</style>
+<path class="st0" d="M2499.6,1250c0,690.2-559.6,1249.8-1250.1,1249.9c-690,0-1249.6-559.7-1249.5-1250C-0.2,559.6,559.4,0,1249.7,0
+	S2499.6,559.7,2499.6,1250L2499.6,1250z"/>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="1866.2711" y1="700.5444" x2="1030.5182" y2="2301.3472" gradientTransform="matrix(1 0 0 1 0 -186)">
+		<stop  offset="0" style="stop-color:#00FFA3"/>
+		<stop  offset="1" style="stop-color:#DC1FFF"/>
+	</linearGradient>
+	<path class="st1" d="M739,1562.2c9.1-9.1,21.7-14.5,35-14.5h1207.6c22.1,0,33.1,26.6,17.5,42.2l-238.6,238.6
+		c-9.1,9.1-21.7,14.5-35,14.5H518c-22.1,0-33.1-26.6-17.5-42.2L739,1562.2z"/>
+	
+		<linearGradient id="SVGID_00000013165162665847192720000006682728064259598750_" gradientUnits="userSpaceOnUse" x1="1500.8663" y1="509.7726" x2="665.1135" y2="2110.5757" gradientTransform="matrix(1 0 0 1 0 -186)">
+		<stop  offset="0" style="stop-color:#00FFA3"/>
+		<stop  offset="1" style="stop-color:#DC1FFF"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000013165162665847192720000006682728064259598750_);" d="M739,671.5c9.5-9.1,22.1-14.5,35-14.5
+		h1207.6c22.1,0,33.1,26.6,17.5,42.2l-238.6,238.6c-9.1,9.1-21.7,14.5-35,14.5H518c-22.1,0-33.1-26.6-17.5-42.2L739,671.5z"/>
+	
+		<linearGradient id="SVGID_00000134932396305448332280000002874291342403482283_" gradientUnits="userSpaceOnUse" x1="1682.3982" y1="604.5472" x2="846.6449" y2="2205.3503" gradientTransform="matrix(1 0 0 1 0 -186)">
+		<stop  offset="0" style="stop-color:#00FFA3"/>
+		<stop  offset="1" style="stop-color:#DC1FFF"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000134932396305448332280000002874291342403482283_);" d="M1760.6,1114c-9.1-9.1-21.7-14.5-35-14.5
+		H518c-22.1,0-33.1,26.6-17.5,42.2L739,1380.3c9.1,9.1,21.7,14.5,35,14.5h1207.6c22.1,0,33.1-26.6,17.5-42.2L1760.6,1114z"/>
+</g>
+</svg>
diff --git a/src/assets/images/src/tether.svg b/src/assets/images/src/tether.svg
index d92d961e..e15b43f2 100644
--- a/src/assets/images/src/tether.svg
+++ b/src/assets/images/src/tether.svg
@@ -1 +1,19 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2500 2500"><defs><style>.cls-1{fill:#26a17b;}.cls-2{fill:#fff;}</style></defs><path id="path0_fill" data-name="path0 fill" class="cls-1" d="M1249.8,0c690.28,0,1250,559.72,1250,1250s-559.72,1250-1250,1250S-.2,1940.63-.2,1250,559.52,0,1249.8,0Z" transform="translate(0.2 0)"/><g id="Vector"><path id="path1_fill" data-name="path1 fill" class="cls-2" d="M1403.79,1020.66V834.55h425.35V551.22h-1158V834.55H1096.5v186.11C751,1036.63,491,1105,491,1187S751,1337.33,1096.5,1353.3v595.48h307.64V1353.3c345.14-16,604.51-84.38,604.51-166.32-.34-82-259.72-150.35-604.86-166.32Zm.35,282.29c-8.68.35-53.12,3.13-152.43,3.13-79.51,0-135.07-2.09-154.86-3.13v.35c-305.21-13.54-533.33-66.67-533.33-130.21s227.77-116.67,533.33-130.21v206.95c20.14,1.39,77.08,4.86,156.25,4.86,94.79,0,142.36-3.82,151.39-4.86V1042.19c304.86,13.54,532.29,66.66,532.29,130.21-.7,63.54-228.13,116.66-532.64,130.55" transform="translate(0.2 0)"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 2500 2500" style="enable-background:new 0 0 2500 2500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#50AF95;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M457.7,173.3L1.9,1130.8c-3.6,7.3-1.9,16.1,4,21.7L1237,2332.2c7.3,7,18.7,7,26,0l1231.1-1179.7
+		c5.9-5.6,7.5-14.3,4-21.7l-455.9-957.5c-3-6.6-9.6-10.8-16.8-10.8H474.7C467.4,162.5,460.8,166.7,457.7,173.3
+		C457.7,173.3,457.7,173.3,457.7,173.3z"/>
+	<path class="st1" d="M1408.2,1229.1L1408.2,1229.1c-8.8,0.7-54.5,3.4-156.4,3.4c-81,0-138.5-2.4-158.7-3.4l0,0
+		c-313.1-13.8-546.8-68.3-546.8-133.5S780,975.9,1093.1,961.9v212.9c20.5,1.5,79.1,4.9,160.1,4.9c97.2,0,145.9-4.1,154.7-4.9V962
+		c312.4,13.9,545.6,68.4,545.6,133.5c0,65.1-233.1,119.6-545.6,133.5l0,0L1408.2,1229.1z M1408.2,940V749.5h436V458.9H657v290.6h436
+		V940c-354.4,16.3-620.8,86.5-620.8,170.6c0,84.1,266.5,154.2,620.8,170.6v610.6h315.1v-610.8c353.5-16.3,619.6-86.4,619.6-170.4
+		C2027.7,1026.4,1761.9,956.3,1408.2,940L1408.2,940L1408.2,940z M1408.2,940L1408.2,940z"/>
+</g>
+</svg>
diff --git a/src/assets/images/src/toncoin.svg b/src/assets/images/src/toncoin.svg
new file mode 100644
index 00000000..7bc59ed7
--- /dev/null
+++ b/src/assets/images/src/toncoin.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 2499.6 2500" style="enable-background:new 0 0 2499.6 2500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#0088CC;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+</style>
+<g>
+	<circle class="st0" cx="1249.8" cy="1250" r="1249.8"/>
+	<path class="st1" d="M901.6,826h700.8c26.8,0,49.1,4.5,75.9,17.9c31.2,13.4,49.1,35.7,58,53.6c0,0,0,4.5,4.5,4.5
+		c13.4,22.3,22.3,49.1,22.3,80.3c0,26.8-4.5,53.6-22.3,80.3l0,0l-441.9,758.8c-8.9,17.9-26.8,26.8-49.1,26.8
+		c-17.9,0-35.7-8.9-49.1-26.8l-433-758.8l0,0c-8.9-17.9-26.8-40.2-26.8-75.9c-4.5-31.2,4.5-58,17.9-84.8s35.7-49.1,67-58
+		C852.5,826,883.8,826,901.6,826z M1196.2,933.1H901.6c-17.9,0-26.8,0-31.2,4.5c-8.9,4.5-13.4,8.9-17.9,17.9
+		c-4.5,4.5-4.5,13.4-4.5,22.3c0,4.5,4.5,8.9,13.4,26.8l0,0l334.8,580.3V933.1z M1303.4,933.1v656.1l339.2-584.7
+		c4.5-8.9,4.5-17.9,4.5-26.8s0-17.9-4.5-22.3s-4.5-8.9-8.9-8.9l-4.5-4.5c-8.9-4.5-17.9-4.5-31.2-4.5h-294.6V933.1z"/>
+</g>
+</svg>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.js b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.js
index e3dd7137..918710ed 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.js
@@ -13,7 +13,10 @@ const WalletSubMenu = () => {
     const {t} = useTranslation();
     const [showZero, setShowZero] = useState(false);
     const assets = useSelector((state) => state.exchange.assets)
+
+    console.log("assets", assets)
     const {data: data, isLoading} = useGetUserAccount()
+    console.log("data", data)
 
     return (
         <div className={`width-100 card-bg column ${classes.container}`}>
@@ -32,8 +35,8 @@ const WalletSubMenu = () => {
                             </div>
                             <WalletBalance/>
                             <ScrollBar customClass={`column`}>
-                                {assets.filter(asset => data.wallets[asset].free > 0)
-                                    .concat(assets.filter(asset => data.wallets[asset].free === 0))
+                                {assets?.filter(asset => data?.wallets?.[asset]?.free > 0)
+                                    .concat(assets.filter(asset => data?.wallets?.[asset]?.free === 0))
                                     .map((name) => <WalletListItem key={name} assetName={name} showZero={showZero}/>)}
                             </ScrollBar>
                         </div>