qml: fix sent activity amount sign

Author: johnny9

qml/models/activitylistmodel.cpp

@@ -96,7 +96,7 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
     case RequestIdRole:
         return tx->requestId;
     case NetAmountSatRole:
-        return QVariant::fromValue<qlonglong>(tx->credit + tx->debit);
+        return QVariant::fromValue<qlonglong>(tx->netAmount());
     default:
         return QVariant();
     }

qml/models/transaction.cpp

@@ -48,10 +48,15 @@ Transaction::Transaction(uint256 hash, qint64 time)
 {
 }
 
+CAmount Transaction::netAmount() const
+{
+    return credit + debit;
+}
+
 QString Transaction::prettyAmount(int display_unit) const
 {
-    CAmount net = credit - debit;
-    bool plus_sign = (net > 0);
+    const CAmount net = netAmount();
+    const bool plus_sign = (net > 0);
     QmlBitcoinUnits::Unit unit = (display_unit == 1)
         ? QmlBitcoinUnits::Unit::SAT
         : QmlBitcoinUnits::Unit::BTC;

qml/models/transaction.h

@@ -47,6 +47,7 @@ class Transaction : public QObject
 
     Transaction(uint256 hash, qint64 time);
 
+    CAmount netAmount() const;
     QString prettyAmount(int display_unit = 0) const;
     QString dateTimeString() const;
     void updateStatus(const interfaces::WalletTxStatus& wtx, int num_blocks, int64_t block_time);

qml/pages/wallet/SendResult.qml

@@ -92,6 +92,7 @@ Page {
             }
 
             ContinueButton {
+                objectName: "sendResultDoneButton"
                 Layout.fillWidth: true
                 Layout.preferredWidth: 1
                 Layout.minimumWidth: 150

test/functional/qml_test_send_receive.py

@@ -131,7 +131,7 @@ def has_text():
 
 
 def btc_text_to_sats(text):
-    match = re.search(r"([0-9]+(?:\.[0-9]+)?)", text.replace(",", ""))
+    match = re.search(r"(-?[0-9]+(?:\.[0-9]+)?)", text.replace(",", ""))
     if match is None:
         raise AssertionError(f"Could not parse BTC amount from {text!r}")
     try:
@@ -220,7 +220,7 @@ def run_test(*, save_screenshots=False, screenshot_root=None):
         )
         checkpoints.checkpoint("gui wallet funded", gui)
 
-        gui.click("desktopWalletsSendTab")
+        gui.click("sendTabButton")
         gui.wait_for_page("sendPage", timeout_ms=10000)
         checkpoints.checkpoint("send page opened", gui)
 
@@ -318,9 +318,31 @@ def run_test(*, save_screenshots=False, screenshot_root=None):
         )
         checkpoints.checkpoint("broadcast fee verified", gui)
 
+        gui.wait_for_page("sendResultPopup", timeout_ms=10000)
+        gui.click("sendResultDoneButton")
+        gui.wait_for_property("activityTabButton", "visible", True, timeout_ms=10000)
+        gui.click("activityTabButton")
+        gui.wait_for_property("activitySearchToggle", "visible", True, timeout_ms=10000)
+        gui.click("activitySearchToggle")
+        gui.wait_for_property("activitySearchToggle", "checked", True, timeout_ms=5000)
+        gui.click("activityTypeFilterButton")
+        gui.click("activityTypeSent")
+        gui.wait_for_property("activityFilterProxyModel", "count", 1, timeout_ms=20000)
+        activity_amount_text = gui.get_list_item_property("activityListView", 0, "amount")
+        activity_amount_sats = amount_text_to_sats(activity_amount_text)
+        assert activity_amount_text.startswith("-"), (
+            f"Expected sent Activity amount to display with a minus sign, got {activity_amount_text!r}"
+        )
+        assert activity_amount_sats < 0, (
+            f"Expected sent Activity amount to parse as negative sats, got "
+            f"{activity_amount_text!r} ({activity_amount_sats} sats)"
+        )
+        checkpoints.checkpoint("sent Activity amount sign verified", gui)
+
         print(
             "Send flow passed: preview totals were correct with include-fee off and on, "
-            "and the broadcast fee matched the subtract-fee preview."
+            "the broadcast fee matched the subtract-fee preview, and Activity showed the "
+            "sent amount as negative."
         )
         return 0
     except Exception as err:  # noqa: BLE001 - preserve failure context for functional test output

test/test_transaction.cpp

@@ -68,6 +68,7 @@ class TransactionTests : public QObject
 private Q_SLOTS:
     void initTestCase();
     void fromWalletTx_hidesSenderChangeOutput();
+    void fromWalletTx_mixedDebitKeepsNegativeNetAmount();
     void fromWalletTx_showsIncomingPaymentToChangeAddress();
 };
 
@@ -92,6 +93,28 @@ void TransactionTests::fromWalletTx_hidesSenderChangeOutput()
     QCOMPARE(parts.at(0)->idx, 0);
     QCOMPARE(parts.at(0)->debit, -71 * COIN_VALUE);
     QCOMPARE(parts.at(0)->credit, 0);
+    QCOMPARE(parts.at(0)->netAmount(), -71 * COIN_VALUE);
+    QCOMPARE(parts.at(0)->prettyAmount(), QStringLiteral("-71.00000000"));
+}
+
+void TransactionTests::fromWalletTx_mixedDebitKeepsNegativeNetAmount()
+{
+    const interfaces::WalletTx wtx = MakeWalletTx(
+        /*txin_is_mine=*/{ISMINE_SPENDABLE, ISMINE_NO},
+        /*output_values=*/{80 * COIN_VALUE},
+        /*txout_is_mine=*/{ISMINE_NO},
+        /*txout_is_change=*/{false},
+        /*debit=*/100 * COIN_VALUE);
+
+    const auto parts = Transaction::fromWalletTx(wtx);
+
+    QCOMPARE(parts.size(), 1);
+    QCOMPARE(parts.at(0)->type, Transaction::Other);
+    QCOMPARE(parts.at(0)->idx, 0);
+    QCOMPARE(parts.at(0)->debit, -100 * COIN_VALUE);
+    QCOMPARE(parts.at(0)->credit, 0);
+    QCOMPARE(parts.at(0)->netAmount(), -100 * COIN_VALUE);
+    QCOMPARE(parts.at(0)->prettyAmount(), QStringLiteral("-100.00000000"));
 }
 
 void TransactionTests::fromWalletTx_showsIncomingPaymentToChangeAddress()
@@ -111,6 +134,8 @@ void TransactionTests::fromWalletTx_showsIncomingPaymentToChangeAddress()
     QCOMPARE(parts.at(0)->idx, 0);
     QCOMPARE(parts.at(0)->debit, 0);
     QCOMPARE(parts.at(0)->credit, 5 * COIN_VALUE);
+    QCOMPARE(parts.at(0)->netAmount(), 5 * COIN_VALUE);
+    QCOMPARE(parts.at(0)->prettyAmount(), QStringLiteral("+5.00000000"));
 }
 
 #ifdef BITCOINQML_NO_TEST_MAIN