Merge #440: Move name operation into "Type" column

279743d Namecoin / Qt: Move name operation into Type column (Jeremy Rand) Pull request description: Removes redundant UI info, improving UX. ACKs for top commit: domob1812: Thanks for the updates, ACK 279743d. Tree-SHA512: 3d1730e565e23a85ecb739a532391ab61b7da605c0d61529a2c9857b4fac61fe37c818e5813370c2922741c266fc9ad3d48b986ebe35bbf45cca4526513c05f8
namecoin · Aug 19, 2021 · 7c055a2 · 7c055a2
2 parents 8dcb420 + 279743d
commit 7c055a2
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 12 deletions.
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
@@ -107,23 +107,38 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
 
             if(nNameCredit)
             {
-                // TODO: Use "Pre-Registration" / "Registration" / "Update" strings
-                std::string opName = GetOpName(nNameCredit.value().getNameOp());
-                std::string description = opName.substr(3);
+                TransactionRecord sub(hash, nTime, TransactionRecord::NameOp, "", -(nDebit - nChange), nCredit - nChange);
 
                 // TODO: Use friendly names based on namespaces
                 if(nNameCredit.value().isAnyUpdate())
                 {
-                    // Check if renewal (previous value is unchanged)
-                    if(nNameDebit && nNameDebit.value().isAnyUpdate() && nNameDebit.value().getOpValue() == nNameCredit.value().getOpValue())
+                    if(nNameCredit.value().getNameOp() == OP_NAME_FIRSTUPDATE)
                     {
-                        description = "NAME_RENEW";
+                        sub.nameOpType = TransactionRecord::NameOpType::FirstUpdate;
+                    }
+                    else
+                    {
+                        // OP_NAME_UPDATE
+
+                        // Check if renewal (previous value is unchanged)
+                        if(nNameDebit && nNameDebit.value().isAnyUpdate() && nNameDebit.value().getOpValue() == nNameCredit.value().getOpValue())
+                        {
+                            sub.nameOpType = TransactionRecord::NameOpType::Renew;
+                        }
+                        else
+                        {
+                            sub.nameOpType = TransactionRecord::NameOpType::Update;
+                        }
                     }
 
-                    description += " " + EncodeNameForMessage(nNameCredit.value().getOpName());
+                    sub.address = EncodeNameForMessage(nNameCredit.value().getOpName());
+                }
+                else
+                {
+                    sub.nameOpType = TransactionRecord::NameOpType::New;
                 }
 
-                parts.append(TransactionRecord(hash, nTime, TransactionRecord::NameOp, description, -(nDebit - nChange), nCredit - nChange));
+                parts.append(sub);
             }
             else
             {

diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
@@ -84,25 +84,34 @@ class TransactionRecord
         NameOp,
     };
 
+    enum class NameOpType
+    {
+        Other,
+        New,
+        FirstUpdate,
+        Update,
+        Renew,
+    };
+
     /** Number of confirmation recommended for accepting a transaction */
     static const int RecommendedNumConfirmations = 6;
 
     TransactionRecord():
-            hash(), time(0), type(Other), address(""), debit(0), credit(0), idx(0)
+            hash(), time(0), type(Other), address(""), debit(0), credit(0), nameOpType(NameOpType::Other), idx(0)
     {
     }
 
     TransactionRecord(uint256 _hash, qint64 _time):
             hash(_hash), time(_time), type(Other), address(""), debit(0),
-            credit(0), idx(0)
+            credit(0), nameOpType(NameOpType::Other), idx(0)
     {
     }
 
     TransactionRecord(uint256 _hash, qint64 _time,
                 Type _type, const std::string &_address,
                 const CAmount& _debit, const CAmount& _credit):
             hash(_hash), time(_time), type(_type), address(_address), debit(_debit), credit(_credit),
-            idx(0)
+            nameOpType(NameOpType::Other), idx(0)
     {
     }
 
@@ -119,6 +128,7 @@ class TransactionRecord
     std::string address;
     CAmount debit;
     CAmount credit;
+    NameOpType nameOpType;
     /**@}*/
 
     /** Subtransaction index, for sort key */

diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -391,7 +391,20 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
     case TransactionRecord::Generated:
         return tr("Mined");
     case TransactionRecord::NameOp:
-        return tr("Name operation");
+        switch(wtx->nameOpType)
+        {
+        case TransactionRecord::NameOpType::New:
+            return tr("Name pre-registration");
+        case TransactionRecord::NameOpType::FirstUpdate:
+            return tr("Name registration");
+        case TransactionRecord::NameOpType::Update:
+            return tr("Name update");
+        case TransactionRecord::NameOpType::Renew:
+            return tr("Name renewal");
+        case TransactionRecord::NameOpType::Other:
+            return tr("Unknown name operation");
+        } // no default case, so the compiler can warn about missing cases
+        assert(false);
     default:
         return QString();
     }
@@ -410,6 +423,7 @@ QVariant TransactionTableModel::txAddressDecoration(const TransactionRecord *wtx
     case TransactionRecord::SendToOther:
         return QIcon(":/icons/tx_output");
     case TransactionRecord::NameOp:
+        // TODO: Use nameOpType here
         return QIcon(":/icons/bitcoin_transparent_letter");
     default:
         return QIcon(":/icons/tx_inout");