Merge remote-tracking branch 'upstream/activation-v2-boilerplate' int…

…o nogeo
cipig · Dec 20, 2023 · 95cbc4d · 95cbc4d
2 parents a8a6ea3 + 63da539
commit 95cbc4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/atomic_defi_design/Dex/Constants/Style.qml b/atomic_defi_design/Dex/Constants/Style.qml
@@ -203,6 +203,7 @@ QtObject {
             case 'QRC-20':            return dark_theme ? colorCoinDark["QTUM"] : colorCoin["QTUM"]
             case 'KRC-20':            return dark_theme ? colorCoinDark["KCS"] : colorCoin["KCS"]
             case 'Smart Chain':       return dark_theme ? colorCoinDark["KMD"] : colorCoin["KMD"]
+            case 'Matic':
             case 'PLG-20':            return dark_theme ? colorCoinDark["MATIC"] : colorCoin["MATIC"]
             case 'Moonriver':         return dark_theme ? colorCoinDark["MOVR"] : colorCoin["MOVR"]
             case 'HRC-20':            return dark_theme ? colorCoinDark["ONE"] : colorCoin["ONE"]
@@ -245,6 +246,7 @@ QtObject {
             case 'QRC-20':            return dark_theme ? colorCoinDark["QTUM"] : colorCoin["QTUM"]
             case 'KRC-20':            return dark_theme ? colorCoinDark["KCS"] : colorCoin["KCS"]
             case 'Smart Chain':       return dark_theme ? colorCoinDark["KMD"] : colorCoin["KMD"]
+            case 'Matic':
             case 'PLG-20':            return dark_theme ? colorCoinDark["MATIC"] : colorCoin["MATIC"]
             case 'Moonriver':         return dark_theme ? colorCoinDark["MOVR"] : colorCoin["MOVR"]
             case 'HRC-20':            return dark_theme ? colorCoinDark["ONE"] : colorCoin["ONE"]

diff --git a/src/core/atomicdex/services/mm2/mm2.service.cpp b/src/core/atomicdex/services/mm2/mm2.service.cpp
@@ -611,13 +611,13 @@ namespace atomic_dex
         {
             SPDLOG_INFO(">>>>>>>>>>>>>>>>>>>>>>>>>>> Enabling {} BEP20 coins <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<", bep20_coins.size());
             // enable_erc20_coins(bep20_coins, "BNB");
-            enable_erc_family_coins(erc_family_coins);
+            enable_erc_family_coins(bep20_coins);
         }
         if (bep20_testnet_coins.size() > 0)
         {
             SPDLOG_INFO(">>>>>>>>>>>>>>>>>>>>>>>>>>> Enabling {} bep20_testnet_coins <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<", bep20_testnet_coins.size());
             // enable_erc20_coins(bep20_testnet_coins, "BNBT");
-            enable_erc_family_coins(erc_family_coins);
+            enable_erc_family_coins(bep20_testnet_coins);
         }
         if (erc_family_coins.size() > 0)
         {