Merge remote-tracking branch 'upstream/dev' into cipi

btcz · Mar 27, 2022 · 7e3ba0c · 7e3ba0c
2 parents 6d30e0f + bd0343c
commit 7e3ba0c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml
@@ -1346,7 +1346,7 @@ QtObject {
                                                 "FIL/EURS": "COINBASE:FILEUR",
                                                 "FIL/JEUR": "COINBASE:FILEUR",
                                                 "FIRO/BTC": "BINANCE:FIROBTC",
-                                                "FIRO/ETH": "BINANCE:FIROETH",
+                                                "FIRO/ETH": "HUOBI:FIROETH",
                                                 "FIRO/USDT": "BITTREX:FIROUSD",
                                                 "FIRO/BUSD": "BITTREX:FIROUSD",
                                                 "FIRO/USDC": "BITTREX:FIROUSD",

diff --git a/src/core/atomicdex/models/qt.orders.proxy.model.cpp b/src/core/atomicdex/models/qt.orders.proxy.model.cpp
@@ -280,7 +280,7 @@ namespace atomic_dex
         SPDLOG_INFO("exporting csv with path: {}", csv_path.string());
         std::ofstream ofs(csv_path.string(), std::ios::out | std::ios::trunc);
         int           nb_items = this->rowCount();
-        ofs << "Date, BaseCoin, BaseAmount, Status, RelCoin, RelAmount, UUID, ErrorState" << std::endl;
+        ofs << "Date,BaseCoin,BaseAmount,Status,RelCoin,RelAmount,UUID,ErrorState" << std::endl;
         for (int cur_idx = 0; cur_idx < nb_items; ++cur_idx)
         {
             QModelIndex idx = this->index(cur_idx, 0);

diff --git a/src/core/atomicdex/services/exporter/exporter.service.cpp b/src/core/atomicdex/services/exporter/exporter.service.cpp
@@ -90,7 +90,7 @@ namespace atomic_dex
                 ofs.setFileName(std_path_to_qstring(csv_path));
                 ofs.open(QIODevice::Text | QIODevice::WriteOnly | QIODevice::Truncate);
                 std::stringstream ss;
-                ss << "Date, BaseCoin, BaseAmount, Status, RelCoin, RelAmount, UUID, ErrorState" << std::endl;
+                ss << "Date,BaseCoin,BaseAmount,Status,RelCoin,RelAmount,UUID,ErrorState" << std::endl;
                 for (auto&& cur_swap: result.swaps)
                 {
                     ss << cur_swap.human_date.toStdString() << ",";