Merge pull request #1232 from KomodoPlatform/wallet_enabling_rework

Wallet enabling rework

atomic_defi_design/qml/Portfolio/Portfolio.qml

@@ -199,6 +199,8 @@ Item {
                             text: qsTr("Show only coins with balance") + " <b>%1</b>".arg(qsTr("(%1/%2)").arg(coinsList.innerList.count).arg(portfolio_mdl.length))
                             checked: portfolio_coins.with_balance
                             onCheckedChanged: portfolio_coins.with_balance = checked
+
+                            Component.onDestruction: portfolio_coins.with_balance = false
                         }
                     }
                 }

atomic_defi_design/qml/Screens/Dashboard.qml

@@ -199,6 +199,7 @@ Item {
 
             anchors.fill: parent
             transformOrigin: Item.Center
+            asynchronous: true
 
             sourceComponent: {
                 switch (current_page) {
@@ -399,4 +400,4 @@ Item {
                 return qsTr(event_name)
         }
     }
-}
+}

atomic_defi_design/qml/Screens/InitialLoading.qml

@@ -17,7 +17,7 @@ SetupPage {
     readonly property string current_status: API.app.wallet_mgr.initial_loading_status
 
     onCurrent_statusChanged: {
-        if (current_status === "complete")
+        if (current_status === "enabling_coins")
             onLoaded()
     }
 
@@ -47,4 +47,4 @@ SetupPage {
                 current_status === "enabling_coins" ? qsTr("Enabling assets") : qsTr("Getting ready")) + "..."
         }
     }
-}
+}

src/app/app.cpp

@@ -82,7 +82,7 @@ namespace atomic_dex
             if (coin_info.has_parent_fees_ticker && coin_info.ticker != coin_info.fees_ticker)
             {
                 auto coin_parent_info = mm2.get_coin_info(coin_info.fees_ticker);
-                if (extra_coins.insert(coin_parent_info.ticker).second)
+                if (!coin_parent_info.currently_enabled && !coin_parent_info.active && extra_coins.insert(coin_parent_info.ticker).second)
                 {
                     SPDLOG_INFO("Adding extra coin: {} to enable", coin_parent_info.ticker);
                 }

src/core/atomicdex/managers/qt.wallet.manager.cpp

@@ -338,6 +338,7 @@ namespace atomic_dex
     {
         this->m_current_status = std::move(status);
         emit onStatusChanged();
+        SPDLOG_INFO("Set status: {}", m_current_status.toStdString());
     }
 
     bool

src/core/atomicdex/models/qt.portfolio.model.cpp

@@ -30,6 +30,7 @@
 #include "atomicdex/utilities/global.utilities.hpp"
 #include "atomicdex/utilities/qt.utilities.hpp"
 #include "qt.portfolio.model.hpp"
+#include "atomicdex/managers/qt.wallet.manager.hpp"
 
 namespace atomic_dex
 {
@@ -135,10 +136,11 @@ namespace atomic_dex
                     auto&& [prev_balance, new_balance, is_change_b] = update_value(BalanceRole, balance, idx, *this);
                     const QString display                           = QString::fromStdString(coin.ticker) + " (" + balance + ")";
                     update_value(Display, display, idx, *this);
-                    if (is_change_b)
-                    {
-                        balance_update_handler(prev_balance.toString(), new_balance.toString(), QString::fromStdString(ticker));
-                    }
+                    // Not a good way to trigger notification, use websocket instead in the future. New was of enabling coins is not compatible.
+                    // if (is_change_b && m_system_manager.has_system<qt_wallet_manager>() && m_system_manager.get_system<qt_wallet_manager>().get_status() == "complete")
+                    // {
+                    //     balance_update_handler(prev_balance.toString(), new_balance.toString(), QString::fromStdString(ticker));
+                    // }
                     QJsonArray trend = nlohmann_json_array_to_qt_json_array(coingecko.get_ticker_historical(ticker));
                     update_value(Trend7D, trend, idx, *this);
                     // SPDLOG_DEBUG("updated currency values of: {}", ticker);
@@ -153,9 +155,13 @@ namespace atomic_dex
     bool
     portfolio_model::update_balance_values(const std::vector<std::string>& tickers)
     {
-        //SPDLOG_INFO("update_balance_values");
+        SPDLOG_INFO("update_balance_values");
         for (auto&& ticker: tickers)
         {
+            if (ticker.empty())
+            {
+                return false;
+            }
             if (m_ticker_registry.find(ticker) == m_ticker_registry.end())
             {
                 SPDLOG_WARN("ticker: {} not inserted yet in the model, skipping", ticker);
@@ -185,10 +191,11 @@ namespace atomic_dex
                 update_value(Display, display, idx, *this);
                 QString change24_h = retrieve_change_24h(coingecko, coin, *m_config, m_system_manager);
                 update_value(Change24H, change24_h, idx, *this);
-                if (is_change_b)
-                {
-                    balance_update_handler(prev_balance.toString(), new_balance.toString(), QString::fromStdString(ticker));
-                }
+                // Not a good way to trigger notification, use websocket instead in the future. New was of enabling coins is not compatible.
+                // if (is_change_b && m_system_manager.has_system<qt_wallet_manager>() && m_system_manager.get_system<qt_wallet_manager>().get_status() == "complete")
+                // {
+                //     balance_update_handler(prev_balance.toString(), new_balance.toString(), QString::fromStdString(ticker));
+                // }
                 QJsonArray trend = nlohmann_json_array_to_qt_json_array(coingecko.get_ticker_historical(ticker));
                 update_value(Trend7D, trend, idx, *this);
                 if (ticker == mm2_system.get_current_ticker() && (is_change_b || is_change_mc || is_change_mcpfo))

src/core/atomicdex/pages/qt.portfolio.page.cpp

@@ -167,6 +167,7 @@ namespace atomic_dex
     void
     portfolio_page::initialize_portfolio(const std::vector<std::string>& tickers)
     {
+        SPDLOG_INFO("initialize_portfolio with tickers: {}", fmt::join(tickers, ", "));
         m_portfolio_mdl->initialize_portfolio(tickers);
         m_global_cfg_mdl->update_status(tickers, true);
     }

src/core/atomicdex/pages/qt.wallet.page.cpp

@@ -566,8 +566,22 @@ namespace atomic_dex
             this->set_send_busy(false);
         };
 
+        auto error_functor = [this](pplx::task<void> previous_task) {
+            try
+            {
+                previous_task.wait();
+            }
+            catch (const std::exception& e)
+            {
+                SPDLOG_ERROR("error caught in send: {}", e.what());
+                auto error_json = QJsonObject({{"error_code", 500}, {"error_message", QString::fromStdString(e.what())}});
+                this->set_rpc_send_data(error_json);
+                this->set_send_busy(false);
+            }
+        };
+
         //! Process
-        mm2_system.get_mm2_client().async_rpc_batch_standalone(batch).then(answer_functor).then(&handle_exception_pplx_task);
+        mm2_system.get_mm2_client().async_rpc_batch_standalone(batch).then(answer_functor).then(error_functor);
     }
 
     void
@@ -645,7 +659,20 @@ namespace atomic_dex
             this->set_broadcast_busy(false);
         };
 
-        mm2_system.get_mm2_client().async_rpc_batch_standalone(batch).then(answer_functor).then(&handle_exception_pplx_task);
+        auto error_functor = [this](pplx::task<void> previous_task) {
+            try
+            {
+                previous_task.wait();
+            }
+            catch (const std::exception& e)
+            {
+                SPDLOG_ERROR("error caught in broadcast finished: {}", e.what());
+                this->set_rpc_broadcast_data(QString::fromStdString(e.what()));
+                this->set_broadcast_busy(false);
+            }
+        };
+
+        mm2_system.get_mm2_client().async_rpc_batch_standalone(batch).then(answer_functor).then(error_functor);
     }
 
     void