qml: Split amount and display updating for Bitcoin amount input

Author: johnny9

src/qml/bitcoinamount.cpp

@@ -66,6 +66,7 @@ void BitcoinAmount::setUnit(const Unit unit)
 {
     m_unit = unit;
     Q_EMIT unitChanged();
+    Q_EMIT displayChanged();
 }
 
 QString BitcoinAmount::unitLabel() const
@@ -85,7 +86,7 @@ void BitcoinAmount::flipUnit()
         m_unit = Unit::BTC;
     }
     Q_EMIT unitChanged();
-    Q_EMIT amountChanged();
+    Q_EMIT displayChanged();
 }
 
 QString BitcoinAmount::satsToBtcString(qint64 sat)
@@ -151,3 +152,8 @@ void BitcoinAmount::fromDisplay(const QString& text)
     }
     setSatoshi(newSat);
 }
+
+void BitcoinAmount::format()
+{
+    Q_EMIT displayChanged();
+}

src/qml/bitcoinamount.h

@@ -15,7 +15,7 @@ class BitcoinAmount : public QObject
     Q_OBJECT
     Q_PROPERTY(Unit unit READ unit WRITE setUnit NOTIFY unitChanged)
     Q_PROPERTY(QString unitLabel READ unitLabel NOTIFY unitChanged)
-    Q_PROPERTY(QString display READ toDisplay WRITE fromDisplay NOTIFY amountChanged)
+    Q_PROPERTY(QString display READ toDisplay WRITE fromDisplay NOTIFY displayChanged)
     Q_PROPERTY(qint64 satoshi READ satoshi WRITE setSatoshi NOTIFY amountChanged)
 
 public:
@@ -38,6 +38,8 @@ class BitcoinAmount : public QObject
 
     bool isSet() const { return m_isSet; }
 
+    Q_INVOKABLE void format();
+
     static QString satsToBtcString(qint64 sat);
 
 public Q_SLOTS:
@@ -47,6 +49,7 @@ public Q_SLOTS:
 Q_SIGNALS:
     void unitChanged();
     void amountChanged();
+    void displayChanged();
 
 private:
     QString sanitize(const QString& text);

src/qml/pages/wallet/Send.qml

@@ -220,10 +220,11 @@ PageStack {
                             placeholderText: "0.00000000"
                             selectByMouse: true
                             text: root.recipient.amount.display
-                            onEditingFinished: root.recipient.amount.display = text
+                            onTextEdited: root.recipient.amount.display = text
+                            onEditingFinished: root.recipient.amount.format()
                             onActiveFocusChanged: {
                                 if (!activeFocus) {
-                                    root.recipient.amount.display = text
+                                    root.recipient.amount.format()
                                 }
                             }
                         }