From 2178bf4ae16a09ac6543776f6eb85760ea396327 Mon Sep 17 00:00:00 2001
From: Dmitry S <dmitry.tothemoon@gmail.com>
Date: Sun, 23 Jul 2023 17:10:01 +0200
Subject: [PATCH] Add BUSD token for BSC

---
 internal/service/blockchain/currencies.json        | 14 ++++++++++++++
 ui-dashboard/src/assets/icons/crypto/busd.svg      | 12 ++++++++++++
 .../src/pages/balance-page/balance-page.tsx        | 11 +++--------
 ui-dashboard/src/types/index.ts                    |  8 ++++++--
 ui-payment/src/assets/icons/crypto/busd.svg        | 12 ++++++++++++
 5 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 ui-dashboard/src/assets/icons/crypto/busd.svg
 create mode 100644 ui-payment/src/assets/icons/crypto/busd.svg

diff --git a/internal/service/blockchain/currencies.json b/internal/service/blockchain/currencies.json
index 14d6971..90ed399 100644
--- a/internal/service/blockchain/currencies.json
+++ b/internal/service/blockchain/currencies.json
@@ -121,6 +121,20 @@
         "type": "token",
         "name": "USDT",
         "tokenAddress": "0x55d398326f99059fF775485246999027B3197955",
+        "testTokenAddress": "0x337610d27c682E347C9cD60BD4b3b107C9d34dDd",
+        "decimals": "18",
+        "networkId": "56",
+        "testNetworkId": "97",
+        "minimal_withdrawal_amount_usd": "10",
+        "minimal_instant_internal_transfer_amount_usd": "30"
+    },
+    {
+        "blockchain": "BSC",
+        "blockchainName": "BNB Chain",
+        "ticker": "BSC_BUSD",
+        "type": "token",
+        "name": "BUSD",
+        "tokenAddress": "0xe9e7CEA3DedcA5984780Bafc599bD69ADd087D56",
         "testTokenAddress": "0xed24fc36d5ee211ea25a80239fb8c4cfd80f12ee",
         "decimals": "18",
         "networkId": "56",
diff --git a/ui-dashboard/src/assets/icons/crypto/busd.svg b/ui-dashboard/src/assets/icons/crypto/busd.svg
new file mode 100644
index 0000000..9d3224c
--- /dev/null
+++ b/ui-dashboard/src/assets/icons/crypto/busd.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xodm="http://www.corel.com/coreldraw/odm/2003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" 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:#F0B90B;}
+</style>
+<g id="Layer_x0020_1">
+	<g id="_2082423932144">
+		<path d="M1250,0c690.3,0,1250,559.7,1250,1250c0,690.3-559.7,1250-1250,1250C559.7,2500,0,1940.3,0,1250C0,559.7,559.7,0,1250,0    L1250,0z"></path>
+		<path class="st0" d="M400,1250.4l212.3-212.3l212.3,212.3l-212.3,212.3L400,1250.4z M1887.7,1036.7l-851,851L1249,2100l851-851    L1887.7,1036.7z M718.4,1568.8l851-851l212.3,212.3l-851,851L718.4,1568.8L718.4,1568.8z M718,932.5L1250.5,400l212.3,212.3    l-532.5,532.5L718,932.5z"></path>
+	</g>
+</g>
+</svg>
diff --git a/ui-dashboard/src/pages/balance-page/balance-page.tsx b/ui-dashboard/src/pages/balance-page/balance-page.tsx
index c3e81c1..ce21378 100644
--- a/ui-dashboard/src/pages/balance-page/balance-page.tsx
+++ b/ui-dashboard/src/pages/balance-page/balance-page.tsx
@@ -39,15 +39,10 @@ const BalancePage: React.FC = () => {
     const {merchantId} = useSharedMerchantId();
 
     const renderIconName = (name: string) => {
-        if (name.length < 4) {
-            return name;
-        }
-
-        if (name.slice(-4) == "usdt") {
-            return "usdt";
-        }
+        // ETH or ETH_USDT => "eth" or "usdt"
+        const lowered = name.toLowerCase();
 
-        return name;
+        return lowered.includes("_") ? lowered.split("_")[1] : lowered;
     };
 
     const balancesColumns: ColumnsType<MerchantBalance> = [
diff --git a/ui-dashboard/src/types/index.ts b/ui-dashboard/src/types/index.ts
index 3b67533..f70c892 100644
--- a/ui-dashboard/src/types/index.ts
+++ b/ui-dashboard/src/types/index.ts
@@ -27,7 +27,9 @@ const BLOCKCHAIN_TICKER = [
     "MATIC_USDC",
     "TRON",
     "TRON_USDT",
-    "BNB"
+    "BNB",
+    "BSC_USDT",
+    "BSC_BUSD"
 ] as const;
 
 type BlockchainTicker = typeof BLOCKCHAIN_TICKER[number];
@@ -98,7 +100,9 @@ const CURRENCY_SYMBOL: Record<CurrencyWithFiat, string> = {
     MATIC_USDC: "",
     TRON: "",
     TRON_USDT: "",
-    BNB: ""
+    BNB: "",
+    BSC_USDT: "",
+    BSC_BUSD: ""
 };
 
 type PaymentType = "payment" | "withdrawal";
diff --git a/ui-payment/src/assets/icons/crypto/busd.svg b/ui-payment/src/assets/icons/crypto/busd.svg
new file mode 100644
index 0000000..9d3224c
--- /dev/null
+++ b/ui-payment/src/assets/icons/crypto/busd.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xodm="http://www.corel.com/coreldraw/odm/2003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" 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:#F0B90B;}
+</style>
+<g id="Layer_x0020_1">
+	<g id="_2082423932144">
+		<path d="M1250,0c690.3,0,1250,559.7,1250,1250c0,690.3-559.7,1250-1250,1250C559.7,2500,0,1940.3,0,1250C0,559.7,559.7,0,1250,0    L1250,0z"></path>
+		<path class="st0" d="M400,1250.4l212.3-212.3l212.3,212.3l-212.3,212.3L400,1250.4z M1887.7,1036.7l-851,851L1249,2100l851-851    L1887.7,1036.7z M718.4,1568.8l851-851l212.3,212.3l-851,851L718.4,1568.8L718.4,1568.8z M718,932.5L1250.5,400l212.3,212.3    l-532.5,532.5L718,932.5z"></path>
+	</g>
+</g>
+</svg>