1.9.39

nunchuk-io · Oct 23, 2024 · d29cb30 · d29cb30
1 parent ee8f007
commit d29cb30
Show file tree

Hide file tree

Showing 23 changed files with 527 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required( VERSION 3.1 )
 #set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING "Minimum OS X deployment version")
 if(UNIX AND APPLE)
-    project(Nunchuk VERSION 1.9.38)
+    project(Nunchuk VERSION 1.9.39)
 else()
-    project(nunchuk-qt VERSION 1.9.38)
+    project(nunchuk-qt VERSION 1.9.39)
 endif()
 
 set( CMAKE_CXX_STANDARD 20 )

diff --git a/Images/wallet-dark-disabled.svg b/Images/wallet-dark-disabled.svg
diff --git a/Models/Commons/Slugs.cpp b/Models/Commons/Slugs.cpp
@@ -74,3 +74,8 @@ bool Slugs::isHoneyBadgerPlus() const
 {
     return slugs().contains("honey_badger_plus_testnet") || slugs().contains("honey_badger_plus");
 }
+
+bool Slugs::isDraftWallet() const
+{
+    return false;
+}
diff --git a/Models/Commons/Slugs.h b/Models/Commons/Slugs.h
@@ -22,6 +22,8 @@ class Slugs
     virtual bool isPremierGroup() const;
     virtual bool isGroupWallet() const;
     virtual bool isUserWallet() const;
+
+    virtual bool isDraftWallet() const;
 };
 
 #endif // SLUGS_H
diff --git a/Models/Premiums/QAssistedDraftWallets.cpp b/Models/Premiums/QAssistedDraftWallets.cpp
@@ -160,8 +160,13 @@ bool QAssistedDraftWallets::RequestAddOrUpdateAKeyToDraftWallet(StructAddHardwar
                     ret = Draco::instance()->assistedWalletAddKey(hardware.mRequestId, data, isDuplicateKey, error_msg);
                     DBG_INFO << data << ret << isDuplicateKey;
                 } else {
-                    ret = Byzantine::instance()->DraftWalletAddKey(hardware.mGroupId, hardware.mRequestId, data, isDuplicateKey, error_msg);
-                    DBG_INFO << data << ret << error_msg << isDuplicateKey;
+                    auto dash = QGroupWallets::instance()->GetDashboard(hardware.mGroupId);
+                    if (dash && dash->isDraftWallet()) {
+                        ret = Draco::instance()->assistedWalletAddKey(hardware.mRequestId, data, isDuplicateKey, error_msg);
+                    } else {
+                        ret = Byzantine::instance()->DraftWalletAddKey(hardware.mGroupId, hardware.mRequestId, data, isDuplicateKey, error_msg);
+                        DBG_INFO << data << ret << error_msg << isDuplicateKey;
+                    }
                     if (ret) {
                         if (auto dashboard = QGroupWallets::instance()->dashboardInfoPtr()) {
                             dashboard->GetAlertsInfo();
@@ -222,8 +227,13 @@ bool QAssistedDraftWallets::RequestAddOrUpdateReuseKeyToDraftWallet(StructAddHar
             DBG_INFO << data << ret << isDuplicateKey;
         }
         else {
-            ret = Byzantine::instance()->DraftWalletAddKey(hardware.mGroupId, hardware.mRequestId, data, isDuplicateKey, error_msg);
-            DBG_INFO << data << ret << error_msg << isDuplicateKey;
+            auto dash = QGroupWallets::instance()->GetDashboard(hardware.mGroupId);
+            if (dash && dash->isDraftWallet()) {
+                ret = Draco::instance()->assistedWalletAddKey(hardware.mRequestId, data, isDuplicateKey, error_msg);
+            } else {
+                ret = Byzantine::instance()->DraftWalletAddKey(hardware.mGroupId, hardware.mRequestId, data, isDuplicateKey, error_msg);
+                DBG_INFO << data << ret << error_msg << isDuplicateKey;
+            }
             if (ret) {
                 if (auto dashboard = QGroupWallets::instance()->dashboardInfoPtr()) {
                     dashboard->GetAlertsInfo();
@@ -329,7 +339,7 @@ int QAssistedDraftWallets::reuseKeyGetCurrentIndex(const QString &xfp)
                                                     ENUNCHUCK::AddressType::NATIVE_SEGWIT,
                                                     msg);
     if((int)EWARNING::WarningType::NONE_MSG != msg.type()){
-        AppModel::instance()->showToast(msg.code(), msg.what(), EWARNING::WarningType::EXCEPTION_MSG);
+        DBG_INFO << msg.code() << msg.what();
     }
     return ret;
 }

diff --git a/Models/Premiums/QBasePremium.cpp b/Models/Premiums/QBasePremium.cpp
@@ -11,6 +11,7 @@
 #include "Premiums/QInheritancePlan.h"
 #include "Premiums/QRecurringPayment.h"
 #include "Premiums/QWalletServicesTag.h"
+#include "Premiums/QUserWallets.h"
 
 QBasePremium::QBasePremium(WalletId wallet_id)
     :m_wallet_id(wallet_id)
@@ -79,3 +80,14 @@ QStringList QBasePremium::slugs() const
 {
     return walletInfoPtr() ? walletInfoPtr()->slugs() : QStringList();
 }
+
+bool QBasePremium::isDraftWallet() const
+{
+    auto dash = dynamic_cast<const QGroupDashboard*>(this);
+    if (dash) {
+        if (auto draft = QUserWallets::instance()->dashboardInfoPtr()) {
+            return qUtils::strCompare(dash->groupId(), draft->groupId());
+        }
+    }
+    return false;
+}
diff --git a/Models/Premiums/QBasePremium.h b/Models/Premiums/QBasePremium.h
@@ -27,6 +27,7 @@ class QBasePremium : public QObject, public Slugs
     virtual QRecurringPaymentPtr recurringPaymentPtr() const;
     virtual QWalletServicesTagPtr servicesTagPtr() const;
     QStringList slugs() const final;
+    bool isDraftWallet() const final;
 private:
     WalletId m_wallet_id;
 };

diff --git a/Models/Premiums/QGroupDashboard.cpp b/Models/Premiums/QGroupDashboard.cpp
@@ -128,6 +128,9 @@ QString QGroupDashboard::userEmail() const
 
 QVariantList QGroupDashboard::members() const
 {
+    if (isDraftWallet()) {
+        return {};
+    }
     return groupInfo()["members"].toArray().toVariantList();
 }
 
@@ -165,7 +168,7 @@ QJsonObject QGroupDashboard::walletJson() const
 
 void QGroupDashboard::GetMemberInfo()
 {
-    if (isUserWallet() || isReplaced()) return;
+    if (isUserWallet() || isReplaced() || isDraftWallet()) return;
     QJsonObject output;
     QString error_msg = "";
     bool ret = Byzantine::instance()->GetOneGroupWallets(groupId(), output, error_msg);
@@ -180,7 +183,10 @@ void QGroupDashboard::GetAlertsInfo()
     QJsonObject output;
     QString error_msg = "";
     bool ret {false};
-    if (isUserWallet()) {
+    if (isDraftWallet()) {
+        ret = Draco::instance()->DraftWalletGetAlerts(output, error_msg);
+    }
+    else if (isUserWallet()) {
         ret = Draco::instance()->GetAlerts(wallet_id(), output, error_msg);
     }
     else {
@@ -216,7 +222,10 @@ bool QGroupDashboard::MarkAlertAsRead(const QString &alert_id)
     QJsonObject output;
     QString error_msg = "";
     bool ret {false};
-    if (isUserWallet()) {
+    if (isDraftWallet()) {
+        ret = Draco::instance()->DraftWalletMarkAnAlertAsRead(alert_id, output, error_msg);
+    }
+    else if (isUserWallet()) {
         ret = Draco::instance()->MarkAlertAsRead(wallet_id(), alert_id, output, error_msg);
     }
     else {
@@ -237,7 +246,10 @@ bool QGroupDashboard::DismissAlert(const QString &alert_id)
     QJsonObject output;
     QString error_msg = "";
     bool ret {false};
-    if (isUserWallet()) {
+    if (isDraftWallet()) {
+        ret = Draco::instance()->DraftWalletDismissAnAlert(alert_id, output, error_msg);
+    }
+    else if (isUserWallet()) {
         ret = Draco::instance()->DismissAlert(wallet_id(), alert_id, output, error_msg);
     }
     else {
@@ -262,7 +274,9 @@ void QGroupDashboard::GetWalletInfo()
     QJsonObject output;
     QString error_msg = "";
     bool ret {false};
-    if (isUserWallet()) {
+    if (isDraftWallet()) {
+
+    } else if (isUserWallet()) {
         ret = Draco::instance()->assistedWalletGetInfo(wallet_id(), output, error_msg);
     } else {
         ret = Byzantine::instance()->GetCurrentGroupWallet(groupId(), output, error_msg);
@@ -301,10 +315,14 @@ void QGroupDashboard::checkInheritanceWallet()
 
 void QGroupDashboard::GetDraftWalletInfo()
 {
-    if (isUserWallet()) return;
     QJsonObject output;
     QString error_msg = "";
-    bool ret = Byzantine::instance()->GetCurrentGroupDraftWallet(groupId(), output, error_msg);
+    bool ret {false};
+    if (isDraftWallet()) {
+        ret = Draco::instance()->DraftWalletGetCurrent(output, error_msg);
+    } else if (!isUserWallet()){
+        ret = Byzantine::instance()->GetCurrentGroupDraftWallet(groupId(), output, error_msg);
+    }
     if (ret) {
         QJsonObject draft_wallet = output["draft_wallet"].toObject();
         UpdateKeys(draft_wallet);
@@ -560,6 +578,7 @@ bool QGroupDashboard::canEntryClickAlert()
             return true;
         }
     }
+    case AlertEnum::E_Alert_t::WALLET_PENDING:
     case AlertEnum::E_Alert_t::GROUP_WALLET_PENDING:{
         QtConcurrent::run([this]() {
             GetDraftWalletInfo();
@@ -856,7 +875,12 @@ void QGroupDashboard::byzantineRoomDeleted(QString room_id, QString group_id)
 
 void QGroupDashboard::requestShowLetAddYourKeys()
 {
-    setFlow((int)AlertEnum::E_Alert_t::GROUP_WALLET_PENDING);
+    if (isDraftWallet()) {
+        setFlow((int)AlertEnum::E_Alert_t::WALLET_PENDING);
+    }
+    else {
+        setFlow((int)AlertEnum::E_Alert_t::GROUP_WALLET_PENDING);
+    }
     QEventProcessor::instance()->sendEvent(E::EVT_SHOW_GROUP_WALLET_CONFIG_REQUEST);
 }
 

diff --git a/Models/Premiums/QGroupWallets.cpp b/Models/Premiums/QGroupWallets.cpp
@@ -2,6 +2,7 @@
 #include "Chats/ClientController.h"
 #include "QEventProcessor.h"
 #include "ViewsEnums.h"
+#include "Premiums/QUserWallets.h"
 
 QGroupWallets::QGroupWallets()
     : QAssistedDraftWallets(GROUP_WALLET)
@@ -57,18 +58,25 @@ void QGroupWallets::GetAllGroups()
     if(!CLIENT_INSTANCE->isNunchukLoggedIn()){
         return;
     }
+    QUserWallets::instance()->GetDraftWallet();
     QtConcurrent::run([=, this]() {
         QJsonObject output;
         QString error_msg = "";
         bool ret = Byzantine::instance()->GetAllGroupWallets(output, error_msg);
+        QJsonArray groupList;
+        auto draft = QUserWallets::instance()->dashboardInfoPtr();
+        if (draft) {
+            groupList.append(draft->groupInfo());
+        }
         if (ret) {
             QJsonArray groups = output["groups"].toArray();
             for (auto v : groups) {
                 QJsonObject group = v.toObject();
+                groupList.append(group);
                 DBG_INFO << group["id"].toString() << group["status"].toString();
             }
             GetListAllRequestAddKey(groups);
-            emit dashboardList(groups);
+            emit dashboardList(groupList);
         } else {
             //Show error
             DBG_INFO << error_msg;
@@ -110,7 +118,12 @@ void QGroupWallets::ResetGroupWallet()
     if (!mDashboard) return;
     QJsonObject output;
     QString error_msg = "";
-    bool ret = Byzantine::instance()->ResetGroupWallet(mDashboard->groupId(), output, error_msg);
+    bool ret {false};
+    if (mDashboard->isDraftWallet()) {
+        ret = Draco::instance()->DraftWalletResetCurrent(output, error_msg);
+    } else {
+        ret = Byzantine::instance()->ResetGroupWallet(mDashboard->groupId(), output, error_msg);
+    }
     if(ret){
         GetAllGroups();
         QString msg_name = QString("Wallet has been canceled");
@@ -139,6 +152,10 @@ void QGroupWallets::MakePendingDashboardList(const QJsonArray &groups)
         else{ // status = "DELETED"
             continue;
         }
+        auto draft = QUserWallets::instance()->dashboardInfoPtr();
+        if (draft && draft->groupId() == group_id) {
+            dashboard = draft;
+        }
         if(group_id != ""){
             groupids.append(group_id);
             if (!Contains(group_id)) {

diff --git a/Models/Premiums/QUserWallets.cpp b/Models/Premiums/QUserWallets.cpp
@@ -7,6 +7,7 @@
 #include "ServiceSetting.h"
 #include "nunchuckiface.h"
 #include "ViewsEnums.h"
+#include "ifaces/Servers/Draco.h"
 
 QUserWallets::QUserWallets()
     : QAssistedDraftWallets(USER_WALLET)
@@ -24,3 +25,52 @@ QUserWallets *QUserWallets::instance()
     static QUserWallets mInstance;
     return &mInstance;
 }
+
+void QUserWallets::GetDraftWallet()
+{
+    QJsonObject output;
+    QString error_msg = "";
+    bool ret = Draco::instance()->DraftWalletGetCurrent(output, error_msg);
+    if (ret) {
+        QJsonObject draft_wallet = output["draft_wallet"].toObject();
+        if (draft_wallet.isEmpty()) {
+            mDashboard.clear();
+        }
+        else {
+            QJsonObject info;
+            info["status"] = "PENDING_WALLET";
+            info["id"] = draft_wallet["id"];
+            QJsonObject user;
+            DracoUser   me   = ClientController::instance()->getMe();
+            user["id"] = me.id;
+            user["name"] = me.name;
+            user["email"] = me.email;
+            user["avatar"] = me.avatar;
+            user["chat_id"] = me.chat_id;
+            QJsonObject member;
+            member["user"] = user;
+            member["status"] = "ACTIVE";
+            member["role"] = "MASTER";
+            QJsonArray members;
+            members.append(member);
+            info["members"] = members;
+            QGroupDashboardPtr dashboard = QGroupDashboardPtr(new QGroupDashboard(""));
+            dashboard->setGroupInfo(info);
+            DBG_INFO << info;
+            mDashboard = dashboard;
+        }
+    }
+}
+
+QGroupDashboardPtr QUserWallets::dashboardInfoPtr()
+{
+    return mDashboard;
+}
+
+bool QUserWallets::hasDraftWallet(const QString& group_id)
+{
+    if (!mDashboard.isNull() && mDashboard->groupId() == group_id) {
+        return true;
+    }
+    return false;
+}
diff --git a/Models/Premiums/QUserWallets.h b/Models/Premiums/QUserWallets.h
@@ -27,6 +27,7 @@
 #include "TypeDefine.h"
 #include "Servers/Draco.h"
 #include "Premiums/QAssistedDraftWallets.h"
+#include "Premiums/QGroupDashboard.h"
 
 class QUserWallets : public QAssistedDraftWallets
 {
@@ -35,9 +36,12 @@ class QUserWallets : public QAssistedDraftWallets
     QUserWallets();
     ~QUserWallets();
     static QUserWallets *instance();
-private:
-
+    void GetDraftWallet();
 
+    QGroupDashboardPtr dashboardInfoPtr();
+    bool hasDraftWallet(const QString& group_id);
+private:
+    QGroupDashboardPtr          mDashboard {};
 };
 
 #endif // QUSERWALLETS_H
diff --git a/Qml/Components/customizes/Buttons/QIconButton.qml b/Qml/Components/customizes/Buttons/QIconButton.qml
@@ -41,7 +41,7 @@ QBaseButton {
         id: idIcon
         width: iconSize
         height: iconSize
-        icons: icon !== "" ? [icon, icon, icon, icon] : icons
+        icons: icon !== "" ? [icon, icon, icon, icon] : idBtn.icons
         anchors.centerIn: parent
         scale: btnMouse.pressed ? 0.9 : 1
         transformOrigin: Item.Center

diff --git a/Qml/Components/customizes/QHomePendingWallet.qml b/Qml/Components/customizes/QHomePendingWallet.qml
@@ -118,11 +118,13 @@ Rectangle {
                             }
                         }
                     }
+
                     QIconButton {
                         width: 48
                         height: 48
                         bgColor: "#F5F5F5"
-                        icon: "qrc:/Images/Images/OnlineMode/wallet-dark.png"
+                        enabled: !("PENDING_WALLET" === pendingDashboard.groupStatus)
+                        icons: ["wallet-dark.svg", "wallet-dark.svg", "wallet-dark-disabled.svg", "wallet-dark.svg"]
                         onClicked: {
                             // FIXME GOTO WALLET INFO
                             dashboardInfo.isShowDashBoard = false

diff --git a/Qml/Components/customizes/Signers/QAddRequestKey.qml b/Qml/Components/customizes/Signers/QAddRequestKey.qml
@@ -411,7 +411,7 @@ Item {
                     anchors.verticalCenter: parent.verticalCenter
                     horizontalAlignment: Text.AlignLeft
                     verticalAlignment: Text.AlignVCenter
-                    font.pixelSize: 12
+                    font.pixelSize: 16
                 }
             }
             QBadge {