qml: support mBTC and bits display units

johnny9 · johnny9 · commit be69994a3be1 · 2026-05-25T14:33:46.000-04:00
diff --git a/qml/bitcoinamount.cpp b/qml/bitcoinamount.cpp
@@ -4,6 +4,7 @@
 
 #include <qml/bitcoinamount.h>
 
+#include <cassert>
 #include <limits>
 
 #include <QRegularExpression>
@@ -27,9 +28,10 @@ QString BitcoinAmount::sanitize(const QString &text)
         result = parts[0] + "." + parts[1];
     }
 
-    // Limit decimal places to 8
-    if (parts.size() == 2 && parts[1].length() > 8) {
-        result = parts[0] + "." + parts[1].left(8);
+    // Limit decimal places to the selected unit precision.
+    const int decimals = unitDecimals();
+    if (parts.size() == 2 && parts[1].length() > decimals) {
+        result = parts[0] + "." + parts[1].left(decimals);
     }
 
     return result;
@@ -85,6 +87,8 @@ QString BitcoinAmount::unitLabel() const
 {
     switch (m_unit) {
     case Unit::BTC: return QStringLiteral("₿");
+    case Unit::mBTC: return QStringLiteral("mBTC");
+    case Unit::uBTC: return QStringLiteral("bits");
     case Unit::SAT:
         return (qAbs(m_satoshi) == 1)
             ? tr("sat", "unit label, singular")
@@ -95,10 +99,10 @@ QString BitcoinAmount::unitLabel() const
 
 void BitcoinAmount::flipUnit()
 {
-    if (m_unit == Unit::BTC) {
-        m_unit = Unit::SAT;
-    } else {
+    if (m_unit == Unit::SAT) {
         m_unit = Unit::BTC;
+    } else {
+        m_unit = Unit::SAT;
     }
     Q_EMIT unitChanged();
     Q_EMIT displayChanged();
@@ -126,11 +130,17 @@ QString BitcoinAmount::toDisplay() const
     if (!m_isSet) {
         return "";
     }
-    if (m_unit == Unit::SAT) {
-        return QString::number(m_satoshi);
-    } else {
-        return satsToBtcString(m_satoshi);
+    const qint64 factor = unitFactor();
+    const int decimals = unitDecimals();
+    const bool negative = m_satoshi < 0;
+    const qint64 abs_sat = negative ? -m_satoshi : m_satoshi;
+    const qint64 whole = abs_sat / factor;
+    QString result = QString::number(whole);
+    if (decimals > 0) {
+        result += "." + QString::number(abs_sat % factor).rightJustified(decimals, '0');
     }
+    if (negative) result.prepend('-');
+    return result;
 }
 
 QString BitcoinAmount::displayWithUnit() const
@@ -139,25 +149,48 @@ QString BitcoinAmount::displayWithUnit() const
     return display.isEmpty() ? QString{} : display + QStringLiteral(" ") + unitLabel();
 }
 
-qint64 BitcoinAmount::btcToSats(const QString& btcSanitized)
+qint64 BitcoinAmount::unitFactor() const
 {
-    if (btcSanitized.isEmpty() || btcSanitized == ".") return 0;
+    switch (m_unit) {
+    case Unit::BTC: return COIN;
+    case Unit::mBTC: return 100000;
+    case Unit::uBTC: return 100;
+    case Unit::SAT: return 1;
+    }
+    assert(false);
+}
 
-    QString cleaned = btcSanitized;
+int BitcoinAmount::unitDecimals() const
+{
+    switch (m_unit) {
+    case Unit::BTC: return 8;
+    case Unit::mBTC: return 5;
+    case Unit::uBTC: return 2;
+    case Unit::SAT: return 0;
+    }
+    assert(false);
+}
+
+qint64 BitcoinAmount::displayToSats(const QString& sanitized) const
+{
+    if (sanitized.isEmpty() || sanitized == ".") return 0;
+
+    QString cleaned = sanitized;
     if (cleaned.startsWith('.')) cleaned.prepend('0');
 
     QStringList parts = cleaned.split('.');
     const qint64 whole = parts[0].isEmpty() ? 0 : parts[0].toLongLong();
     qint64 frac = 0;
     if (parts.size() == 2) {
-        frac = parts[1].leftJustified(8, '0').toLongLong();
+        frac = parts[1].leftJustified(unitDecimals(), '0').toLongLong();
     }
 
-    if (whole > std::numeric_limits<qint64>::max() / COIN) {
+    const qint64 factor = unitFactor();
+    if (whole > std::numeric_limits<qint64>::max() / factor) {
         return std::numeric_limits<qint64>::max();
     }
 
-    return whole * COIN + frac;
+    return whole * factor + frac;
 }
 
 void BitcoinAmount::fromDisplay(const QString& text)
@@ -168,13 +201,13 @@ void BitcoinAmount::fromDisplay(const QString& text)
     }
 
     qint64 newSat = 0;
-    if (m_unit == Unit::BTC) {
-        QString sanitized = sanitize(text);
-        newSat = btcToSats(sanitized);
-    } else {
+    if (m_unit == Unit::SAT) {
         QString digitsOnly = text;
         digitsOnly.remove(QRegularExpression("[^0-9]"));
         newSat = digitsOnly.trimmed().isEmpty() ? 0 : digitsOnly.toLongLong();
+    } else {
+        QString sanitized = sanitize(text);
+        newSat = displayToSats(sanitized);
     }
     setSatoshi(newSat);
 }
diff --git a/qml/bitcoinamount.h b/qml/bitcoinamount.h
@@ -22,6 +22,8 @@ class BitcoinAmount : public QObject
 public:
     enum class Unit {
         BTC,
+        mBTC,
+        uBTC,
         SAT
     };
     Q_ENUM(Unit)
@@ -56,7 +58,9 @@ public Q_SLOTS:
 
 private:
     QString sanitize(const QString& text);
-    static qint64 btcToSats(const QString& btc);
+    qint64 displayToSats(const QString& sanitized) const;
+    qint64 unitFactor() const;
+    int unitDecimals() const;
 
     qint64 m_satoshi{0};
     bool m_isSet{false};
diff --git a/qml/components/BitcoinAmountInputField.qml b/qml/components/BitcoinAmountInputField.qml
@@ -69,7 +69,9 @@ ColumnLayout {
             }
 
             validator: RegExpValidator {
-                regExp: /^(0|[1-9]\d*)(\.\d{0,8})?$/
+                regExp: root.amount && root.amount.unit === BitcoinAmount.SAT
+                    ? /^(0|[1-9]\d*)?$/
+                    : /^(0|[1-9]\d*)(\.\d{0,8})?$/
             }
             maximumLength: 17
         }
diff --git a/qml/models/activityfilterproxymodel.cpp b/qml/models/activityfilterproxymodel.cpp
@@ -34,12 +34,24 @@ void WriteCsvRow(QTextStream& stream, const QStringList& values)
 
 QmlBitcoinUnits::Unit ExportDisplayUnit(int display_unit)
 {
-    return display_unit == 1 ? QmlBitcoinUnits::Unit::SAT : QmlBitcoinUnits::Unit::BTC;
+    switch (display_unit) {
+    case static_cast<int>(QmlBitcoinUnits::Unit::BTC): return QmlBitcoinUnits::Unit::BTC;
+    case static_cast<int>(QmlBitcoinUnits::Unit::mBTC): return QmlBitcoinUnits::Unit::mBTC;
+    case static_cast<int>(QmlBitcoinUnits::Unit::uBTC): return QmlBitcoinUnits::Unit::uBTC;
+    case static_cast<int>(QmlBitcoinUnits::Unit::SAT): return QmlBitcoinUnits::Unit::SAT;
+    }
+    return QmlBitcoinUnits::Unit::BTC;
 }
 
 QString ExportDisplayUnitLabel(int display_unit)
 {
-    return display_unit == 1 ? QStringLiteral("sat") : QStringLiteral("BTC");
+    switch (ExportDisplayUnit(display_unit)) {
+    case QmlBitcoinUnits::Unit::BTC: return QStringLiteral("BTC");
+    case QmlBitcoinUnits::Unit::mBTC: return QStringLiteral("mBTC");
+    case QmlBitcoinUnits::Unit::uBTC: return QStringLiteral("bits");
+    case QmlBitcoinUnits::Unit::SAT: return QStringLiteral("sat");
+    }
+    return QStringLiteral("BTC");
 }
 } // namespace
 
diff --git a/qml/models/transaction.cpp b/qml/models/transaction.cpp
@@ -17,6 +17,17 @@ using wallet::isminetype;
 
 namespace {
     const int RecommendedNumConfirmations = 6;
+
+    QmlBitcoinUnits::Unit DisplayUnit(int display_unit)
+    {
+        switch (display_unit) {
+        case static_cast<int>(QmlBitcoinUnits::Unit::BTC): return QmlBitcoinUnits::Unit::BTC;
+        case static_cast<int>(QmlBitcoinUnits::Unit::mBTC): return QmlBitcoinUnits::Unit::mBTC;
+        case static_cast<int>(QmlBitcoinUnits::Unit::uBTC): return QmlBitcoinUnits::Unit::uBTC;
+        case static_cast<int>(QmlBitcoinUnits::Unit::SAT): return QmlBitcoinUnits::Unit::SAT;
+        }
+        return QmlBitcoinUnits::Unit::BTC;
+    }
 }
 
 Transaction::Transaction(
@@ -57,10 +68,7 @@ QString Transaction::prettyAmount(int display_unit) const
 {
     const CAmount net = netAmount();
     const bool plus_sign = (net > 0);
-    QmlBitcoinUnits::Unit unit = (display_unit == 1)
-        ? QmlBitcoinUnits::Unit::SAT
-        : QmlBitcoinUnits::Unit::BTC;
-    return QmlBitcoinUnits::format(unit, net, plus_sign);
+    return QmlBitcoinUnits::format(DisplayUnit(display_unit), net, plus_sign);
 }
 
 QString Transaction::dateTimeString() const
diff --git a/qml/models/walletqmlmodel.cpp b/qml/models/walletqmlmodel.cpp
@@ -74,6 +74,17 @@ QString FormatFeeEstimate(CAmount amount)
     return bitcoin_amount.displayWithUnit();
 }
 
+QmlBitcoinUnits::Unit DisplayUnit(int display_unit)
+{
+    switch (display_unit) {
+    case static_cast<int>(QmlBitcoinUnits::Unit::BTC): return QmlBitcoinUnits::Unit::BTC;
+    case static_cast<int>(QmlBitcoinUnits::Unit::mBTC): return QmlBitcoinUnits::Unit::mBTC;
+    case static_cast<int>(QmlBitcoinUnits::Unit::uBTC): return QmlBitcoinUnits::Unit::uBTC;
+    case static_cast<int>(QmlBitcoinUnits::Unit::SAT): return QmlBitcoinUnits::Unit::SAT;
+    }
+    return QmlBitcoinUnits::Unit::BTC;
+}
+
 std::optional<CAmount> ParseCustomFeeRatePerKvB(const QString& custom_fee_rate)
 {
     const QString trimmed = custom_fee_rate.trimmed();
@@ -360,10 +371,7 @@ QString WalletQmlModel::balance() const
     if (!m_wallet) {
         return "0";
     }
-    QmlBitcoinUnits::Unit unit = (m_display_unit == 1)
-        ? QmlBitcoinUnits::Unit::SAT
-        : QmlBitcoinUnits::Unit::BTC;
-    return QmlBitcoinUnits::format(unit, m_wallet->getBalance());
+    return QmlBitcoinUnits::format(DisplayUnit(m_display_unit), m_wallet->getBalance());
 }
 
 qint64 WalletQmlModel::balanceSatoshi() const
diff --git a/qml/models/walletqmlmodeltransaction.cpp b/qml/models/walletqmlmodeltransaction.cpp
@@ -8,6 +8,31 @@
 #include <qml/models/sendrecipient.h>
 #include <qml/models/sendrecipientslistmodel.h>
 
+namespace {
+QmlBitcoinUnits::Unit DisplayUnit(int display_unit)
+{
+    switch (display_unit) {
+    case static_cast<int>(QmlBitcoinUnits::Unit::BTC): return QmlBitcoinUnits::Unit::BTC;
+    case static_cast<int>(QmlBitcoinUnits::Unit::mBTC): return QmlBitcoinUnits::Unit::mBTC;
+    case static_cast<int>(QmlBitcoinUnits::Unit::uBTC): return QmlBitcoinUnits::Unit::uBTC;
+    case static_cast<int>(QmlBitcoinUnits::Unit::SAT): return QmlBitcoinUnits::Unit::SAT;
+    }
+    return QmlBitcoinUnits::Unit::BTC;
+}
+
+QString DisplayUnitLabel(QmlBitcoinUnits::Unit unit, CAmount value)
+{
+    switch (unit) {
+    case QmlBitcoinUnits::Unit::BTC: return QStringLiteral("₿");
+    case QmlBitcoinUnits::Unit::mBTC: return QStringLiteral("mBTC");
+    case QmlBitcoinUnits::Unit::uBTC: return QStringLiteral("bits");
+    case QmlBitcoinUnits::Unit::SAT:
+        return (qAbs(value) == 1) ? QStringLiteral("sat") : QStringLiteral("sats");
+    }
+    return QStringLiteral("₿");
+}
+} // namespace
+
 WalletQmlModelTransaction::WalletQmlModelTransaction(const SendRecipientsListModel* recipient, QObject* parent)
     : QObject(parent),
       m_amount(recipient->totalAmountSatoshi()),
@@ -35,12 +60,9 @@ BitcoinAmount* WalletQmlModelTransaction::amountAmount() const
 
 QString WalletQmlModelTransaction::formatWithUnit(CAmount value, int display_unit)
 {
-    auto unit = (display_unit == 1) ? QmlBitcoinUnits::Unit::SAT : QmlBitcoinUnits::Unit::BTC;
+    const auto unit = DisplayUnit(display_unit);
     QString num = QmlBitcoinUnits::format(unit, value, false, QmlBitcoinUnits::SeparatorStyle::STANDARD);
-    if (display_unit == 1) {
-        return num + " " + ((qAbs(value) == 1) ? QStringLiteral("sat") : QStringLiteral("sats"));
-    }
-    return num + " ₿";
+    return num + " " + DisplayUnitLabel(unit, value);
 }
 
 QString WalletQmlModelTransaction::amount() const
diff --git a/qml/pages/settings/SettingsDisplayUnit.qml b/qml/pages/settings/SettingsDisplayUnit.qml
@@ -47,13 +47,31 @@ Page {
             onClicked: optionsModel.displayUnit = 0
         }
 
+        OptionButton {
+            objectName: "displayUnitMBTC"
+            Layout.fillWidth: true
+            text: qsTr("mBTC")
+            description: qsTr("5 decimal places (1 mBTC = 100,000 sat)")
+            checked: optionsModel.displayUnit === 1
+            onClicked: optionsModel.displayUnit = 1
+        }
+
+        OptionButton {
+            objectName: "displayUnitUBTC"
+            Layout.fillWidth: true
+            text: qsTr("bits")
+            description: qsTr("2 decimal places (1 bit = 100 sat)")
+            checked: optionsModel.displayUnit === 2
+            onClicked: optionsModel.displayUnit = 2
+        }
+
         OptionButton {
             objectName: "displayUnitSAT"
             Layout.fillWidth: true
             text: qsTr("sat")
             description: qsTr("Satoshi, the smallest unit (1 sat = 0.00000001 BTC)")
-            checked: optionsModel.displayUnit === 1
-            onClicked: optionsModel.displayUnit = 1
+            checked: optionsModel.displayUnit === 3
+            onClicked: optionsModel.displayUnit = 3
         }
     }
 }
diff --git a/qml/pages/wallet/RequestPayment.qml b/qml/pages/wallet/RequestPayment.qml
@@ -221,7 +221,7 @@ Page {
                         color: Theme.color.neutral9
                         placeholderTextColor: enabled ? Theme.color.neutral7 : Theme.color.neutral4
                         background: Item {}
-                        placeholderText: !root.request || root.request.amount.unit === BitcoinAmount.BTC
+                        placeholderText: !root.request || root.request.amount.unit !== BitcoinAmount.SAT
                             ? "0.00000000" : "0"
                         selectByMouse: true
                         enabled: root.requestIsEditing()
@@ -243,11 +243,11 @@ Page {
                             }
                         }
                         validator: RegularExpressionValidator {
-                            regularExpression: !root.request || root.request.amount.unit === BitcoinAmount.BTC
+                            regularExpression: !root.request || root.request.amount.unit !== BitcoinAmount.SAT
                                 ? /^(0|[1-9]\d{0,7})(\.\d{0,8})?$/
                                 : /^(0|[1-9]\d{0,15})$/
                         }
-                        maximumLength: !root.request || root.request.amount.unit === BitcoinAmount.BTC ? 17 : 16
+                        maximumLength: !root.request || root.request.amount.unit !== BitcoinAmount.SAT ? 17 : 16
                     }
 
                     Item {
diff --git a/qml/pages/wallet/Send.qml b/qml/pages/wallet/Send.qml
@@ -309,11 +309,11 @@ PageStack {
                                 }
                             }
                             validator: RegularExpressionValidator {
-                                regularExpression: root.recipient.amount.unit === BitcoinAmount.BTC
+                                regularExpression: root.recipient.amount.unit !== BitcoinAmount.SAT
                                     ? /^(0|[1-9]\d{0,7})(\.\d{0,8})?$/
                                     : /^(0|[1-9]\d{0,15})$/
                             }
-                            maximumLength: root.recipient.amount.unit === BitcoinAmount.BTC ? 17 : 16
+                            maximumLength: root.recipient.amount.unit !== BitcoinAmount.SAT ? 17 : 16
                         }
                         Item {
                             objectName: "sendAmountUnitToggle"
diff --git a/qml/pages/wallet/WalletBadge.qml b/qml/pages/wallet/WalletBadge.qml
@@ -145,7 +145,7 @@ Button {
                 CoreText {
                     id: balanceText
                     visible: root.showBalance
-                    text: root.balance + " " + (optionsModel.displayUnit === 1 ? (root.balanceSatoshi === 1 ? qsTr("sat") : qsTr("sats")) : "₿")
+                    text: root.balance + " " + optionsModel.displayUnitLabelForAmount(root.balanceSatoshi)
                     color: Theme.color.neutral7
                 }
             }
diff --git a/test/functional/qml_test_activity_filter_export.py b/test/functional/qml_test_activity_filter_export.py
@@ -218,7 +218,7 @@ def run_test(save_screenshots=False, screenshot_root=None):
         checkpoints.checkpoint("display unit switched to sats", gui)
 
         gui.click("activityTabButton")
-        gui.wait_for_property("activityFilterProxyModel", "displayUnit", 1, timeout_ms=5000)
+        gui.wait_for_property("activityFilterProxyModel", "displayUnit", 3, timeout_ms=5000)
         gui.wait_for_property("activityFilterProxyModel", "count", 1, timeout_ms=10000)
         checkpoints.checkpoint("returned to filtered Activity in sats", gui)
 
diff --git a/test/qml/qml_tests_main.cpp b/test/qml/qml_tests_main.cpp
diff --git a/test/qml/tst_displaysettings.qml b/test/qml/tst_displaysettings.qml
diff --git a/test/test_activityfilterproxymodel.cpp b/test/test_activityfilterproxymodel.cpp
diff --git a/test/test_bitcoinamount.cpp b/test/test_bitcoinamount.cpp
diff --git a/test/test_display_settings.cpp b/test/test_display_settings.cpp

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,9 @@ ColumnLayout {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`validator: RegExpValidator {`
`72`		`- regExp: /^(0\|[1-9]\d*)(\.\d{0,8})?$/`
	`72`	`+ regExp: root.amount && root.amount.unit === BitcoinAmount.SAT`
	`73`	`+ ? /^(0\|[1-9]\d*)?$/`
	`74`	`+ : /^(0\|[1-9]\d*)(\.\d{0,8})?$/`
`73`	`75`	`}`
`74`	`76`	`maximumLength: 17`
`75`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,24 @@ void WriteCsvRow(QTextStream& stream, const QStringList& values)`
`34`	`34`
`35`	`35`	`QmlBitcoinUnits::Unit ExportDisplayUnit(int display_unit)`
`36`	`36`	`{`
`37`		`- return display_unit == 1 ? QmlBitcoinUnits::Unit::SAT : QmlBitcoinUnits::Unit::BTC;`
	`37`	`+ switch (display_unit) {`
	`38`	`+ case static_cast<int>(QmlBitcoinUnits::Unit::BTC): return QmlBitcoinUnits::Unit::BTC;`
	`39`	`+ case static_cast<int>(QmlBitcoinUnits::Unit::mBTC): return QmlBitcoinUnits::Unit::mBTC;`
	`40`	`+ case static_cast<int>(QmlBitcoinUnits::Unit::uBTC): return QmlBitcoinUnits::Unit::uBTC;`
	`41`	`+ case static_cast<int>(QmlBitcoinUnits::Unit::SAT): return QmlBitcoinUnits::Unit::SAT;`
	`42`	`+ }`
	`43`	`+ return QmlBitcoinUnits::Unit::BTC;`
`38`	`44`	`}`
`39`	`45`
`40`	`46`	`QString ExportDisplayUnitLabel(int display_unit)`
`41`	`47`	`{`
`42`		`- return display_unit == 1 ? QStringLiteral("sat") : QStringLiteral("BTC");`
	`48`	`+ switch (ExportDisplayUnit(display_unit)) {`
	`49`	`+ case QmlBitcoinUnits::Unit::BTC: return QStringLiteral("BTC");`
	`50`	`+ case QmlBitcoinUnits::Unit::mBTC: return QStringLiteral("mBTC");`
	`51`	`+ case QmlBitcoinUnits::Unit::uBTC: return QStringLiteral("bits");`
	`52`	`+ case QmlBitcoinUnits::Unit::SAT: return QStringLiteral("sat");`
	`53`	`+ }`
	`54`	`+ return QStringLiteral("BTC");`
`43`	`55`	`}`
`44`	`56`	`} // namespace`
`45`	`57`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ Page {`
`221`	`221`	`color: Theme.color.neutral9`
`222`	`222`	`placeholderTextColor: enabled ? Theme.color.neutral7 : Theme.color.neutral4`
`223`	`223`	`background: Item {}`
`224`		`- placeholderText: !root.request \|\| root.request.amount.unit === BitcoinAmount.BTC`
	`224`	`+ placeholderText: !root.request \|\| root.request.amount.unit !== BitcoinAmount.SAT`
`225`	`225`	`? "0.00000000" : "0"`
`226`	`226`	`selectByMouse: true`
`227`	`227`	`enabled: root.requestIsEditing()`
`@@ -243,11 +243,11 @@ Page {`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`	`validator: RegularExpressionValidator {`
`246`		`- regularExpression: !root.request \|\| root.request.amount.unit === BitcoinAmount.BTC`
	`246`	`+ regularExpression: !root.request \|\| root.request.amount.unit !== BitcoinAmount.SAT`
`247`	`247`	`? /^(0\|[1-9]\d{0,7})(\.\d{0,8})?$/`
`248`	`248`	`: /^(0\|[1-9]\d{0,15})$/`
`249`	`249`	`}`
`250`		`- maximumLength: !root.request \|\| root.request.amount.unit === BitcoinAmount.BTC ? 17 : 16`
	`250`	`+ maximumLength: !root.request \|\| root.request.amount.unit !== BitcoinAmount.SAT ? 17 : 16`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`Item {`
Original file line number	Diff line number	Diff line change
`@@ -309,11 +309,11 @@ PageStack {`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`	`validator: RegularExpressionValidator {`
`312`		`- regularExpression: root.recipient.amount.unit === BitcoinAmount.BTC`
	`312`	`+ regularExpression: root.recipient.amount.unit !== BitcoinAmount.SAT`
`313`	`313`	`? /^(0\|[1-9]\d{0,7})(\.\d{0,8})?$/`
`314`	`314`	`: /^(0\|[1-9]\d{0,15})$/`
`315`	`315`	`}`
`316`		`- maximumLength: root.recipient.amount.unit === BitcoinAmount.BTC ? 17 : 16`
	`316`	`+ maximumLength: root.recipient.amount.unit !== BitcoinAmount.SAT ? 17 : 16`
`317`	`317`	`}`
`318`	`318`	`Item {`
`319`	`319`	`objectName: "sendAmountUnitToggle"`