diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 38413a32a1..f2f6e31131 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -45,8 +45,11 @@ QT_MOC_CPP = \ qml/models/moc_peerdetailsmodel.cpp \ qml/models/moc_peerlistsortproxy.cpp \ qml/models/moc_transaction.cpp \ + qml/models/moc_sendrecipient.cpp \ qml/models/moc_walletlistmodel.cpp \ qml/models/moc_walletqmlmodel.cpp \ + qml/models/moc_walletqmlmodel.cpp \ + qml/models/moc_walletqmlmodeltransaction.cpp \ qml/moc_appmode.cpp \ qml/moc_bitcoinamount.cpp \ qml/moc_clipboard.cpp \ @@ -132,8 +135,10 @@ BITCOIN_QT_H = \ qml/models/peerdetailsmodel.h \ qml/models/peerlistsortproxy.h \ qml/models/transaction.h \ + qml/models/sendrecipient.h \ qml/models/walletlistmodel.h \ qml/models/walletqmlmodel.h \ + qml/models/walletqmlmodeltransaction.h \ qml/appmode.h \ qml/clipboard.h \ qml/bitcoin.h \ @@ -329,8 +334,10 @@ BITCOIN_QML_BASE_CPP = \ qml/models/peerdetailsmodel.cpp \ qml/models/peerlistsortproxy.cpp \ qml/models/transaction.cpp \ + qml/models/sendrecipient.cpp \ qml/models/walletlistmodel.cpp \ qml/models/walletqmlmodel.cpp \ + qml/models/walletqmlmodeltransaction.cpp \ qml/imageprovider.cpp \ qml/util.cpp \ qml/walletqmlcontroller.cpp @@ -462,6 +469,9 @@ QML_RES_QML = \ qml/pages/wallet/CreateWalletWizard.qml \ qml/pages/wallet/DesktopWallets.qml \ qml/pages/wallet/RequestPayment.qml \ + qml/pages/wallet/Send.qml \ + qml/pages/wallet/SendResult.qml \ + qml/pages/wallet/SendReview.qml \ qml/pages/wallet/WalletBadge.qml \ qml/pages/wallet/WalletSelect.qml diff --git a/src/qml/bitcoin.cpp b/src/qml/bitcoin.cpp index 6a46294afc..9ec1e51701 100644 --- a/src/qml/bitcoin.cpp +++ b/src/qml/bitcoin.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -30,9 +31,10 @@ #include #include #include +#include #include #include -#include +#include #include #include #include @@ -337,10 +339,13 @@ int QmlGuiMain(int argc, char* argv[]) qmlRegisterUncreatableType("org.bitcoincore.qt", 1, 0, "PeerDetailsModel", ""); qmlRegisterType("org.bitcoincore.qt", 1, 0, "BitcoinAmount"); qmlRegisterUncreatableType("org.bitcoincore.qt", 1, 0, "Transaction", ""); + qmlRegisterUncreatableType("org.bitcoincore.qt", 1, 0, "SendRecipient", ""); #ifdef ENABLE_WALLET qmlRegisterUncreatableType("org.bitcoincore.qt", 1, 0, "WalletQmlModel", "WalletQmlModel cannot be instantiated from QML"); + qmlRegisterUncreatableType("org.bitcoincore.qt", 1, 0, "WalletQmlModelTransaction", + "WalletQmlModelTransaction cannot be instantiated from QML"); #endif engine.load(QUrl(QStringLiteral("qrc:///qml/pages/main.qml"))); diff --git a/src/qml/bitcoin_qml.qrc b/src/qml/bitcoin_qml.qrc index 98401d91a2..69a07de568 100644 --- a/src/qml/bitcoin_qml.qrc +++ b/src/qml/bitcoin_qml.qrc @@ -24,7 +24,6 @@ controls/ContinueButton.qml controls/CoreText.qml controls/CoreTextField.qml - controls/LabeledTextInput.qml controls/ExternalLink.qml controls/FocusBorder.qml controls/Header.qml @@ -83,6 +82,9 @@ pages/wallet/CreateWalletWizard.qml pages/wallet/DesktopWallets.qml pages/wallet/RequestPayment.qml + pages/wallet/Send.qml + pages/wallet/SendResult.qml + pages/wallet/SendReview.qml pages/wallet/WalletBadge.qml pages/wallet/WalletSelect.qml diff --git a/src/qml/bitcoinamount.cpp b/src/qml/bitcoinamount.cpp index 9abd30ad6d..153d8fabae 100644 --- a/src/qml/bitcoinamount.cpp +++ b/src/qml/bitcoinamount.cpp @@ -68,15 +68,28 @@ QString BitcoinAmount::amount() const return m_amount; } +QString BitcoinAmount::satoshiAmount() const +{ + return toSatoshis(m_amount); +} + void BitcoinAmount::setAmount(const QString& new_amount) { m_amount = sanitize(new_amount); Q_EMIT amountChanged(); } -long long BitcoinAmount::toSatoshis(QString& amount, const Unit unit) +QString BitcoinAmount::toSatoshis(const QString& text) const { + if (m_unit == Unit::SAT) { + return text; + } else { + return convert(text, m_unit); + } +} +long long BitcoinAmount::toSatoshis(QString& amount, const Unit unit) +{ int num_decimals = decimals(unit); QStringList parts = amount.remove(' ').split("."); @@ -93,7 +106,7 @@ long long BitcoinAmount::toSatoshis(QString& amount, const Unit unit) return str.toLongLong(); } -QString BitcoinAmount::convert(const QString &amount, Unit unit) +QString BitcoinAmount::convert(const QString& amount, Unit unit) const { if (amount == "") { return amount; @@ -113,6 +126,10 @@ QString BitcoinAmount::convert(const QString &amount, Unit unit) result.append(QString(8 - numDigitsAfterDecimal, '0')); } result.remove(decimalPosition, 1); + + while (result.startsWith('0') && result.length() > 1) { + result.remove(0, 1); + } } else if (unit == Unit::SAT) { result.remove(decimalPosition, 1); int newDecimalPosition = decimalPosition - 8; @@ -121,6 +138,16 @@ QString BitcoinAmount::convert(const QString &amount, Unit unit) newDecimalPosition = 0; } result.insert(newDecimalPosition, "."); + + while (result.endsWith('0') && result.contains('.')) { + result.chop(1); + } + if (result.endsWith('.')) { + result.chop(1); + } + if (result.startsWith('.')) { + result.insert(0, "0"); + } } return result; diff --git a/src/qml/bitcoinamount.h b/src/qml/bitcoinamount.h index 29615e4e6f..0631a05b87 100644 --- a/src/qml/bitcoinamount.h +++ b/src/qml/bitcoinamount.h @@ -5,9 +5,10 @@ #ifndef BITCOIN_QML_BITCOINAMOUNT_H #define BITCOIN_QML_BITCOINAMOUNT_H +#include + #include #include -#include class BitcoinAmount : public QObject { @@ -15,6 +16,7 @@ class BitcoinAmount : public QObject Q_PROPERTY(Unit unit READ unit WRITE setUnit NOTIFY unitChanged) Q_PROPERTY(QString unitLabel READ unitLabel NOTIFY unitChanged) Q_PROPERTY(QString amount READ amount WRITE setAmount NOTIFY amountChanged) + Q_PROPERTY(QString satoshiAmount READ satoshiAmount NOTIFY amountChanged) public: enum class Unit { @@ -30,10 +32,12 @@ class BitcoinAmount : public QObject QString unitLabel() const; QString amount() const; void setAmount(const QString& new_amount); + QString satoshiAmount() const; public Q_SLOTS: - QString sanitize(const QString &text); - QString convert(const QString &text, Unit unit); + QString sanitize(const QString& text); + QString convert(const QString& text, Unit unit) const; + QString toSatoshis(const QString& text) const; Q_SIGNALS: void unitChanged(); diff --git a/src/qml/imageprovider.cpp b/src/qml/imageprovider.cpp index e1c07653fc..aeed8a5b97 100644 --- a/src/qml/imageprovider.cpp +++ b/src/qml/imageprovider.cpp @@ -206,5 +206,10 @@ QPixmap ImageProvider::requestPixmap(const QString& id, QSize* size, const QSize *size = requested_size; return QIcon(":/icons/plus").pixmap(requested_size); } + + if (id == "flip-vertical") { + *size = requested_size; + return QIcon(":/icons/flip-vertical").pixmap(requested_size); + } return {}; } diff --git a/src/qml/models/sendrecipient.cpp b/src/qml/models/sendrecipient.cpp new file mode 100644 index 0000000000..f40ec75456 --- /dev/null +++ b/src/qml/models/sendrecipient.cpp @@ -0,0 +1,87 @@ +// Copyright (c) 2025 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include +#include + +SendRecipient::SendRecipient(QObject* parent) + : QObject(parent), m_address(""), m_label(""), m_amount(""), m_message("") +{ +} + +QString SendRecipient::address() const +{ + return m_address; +} + +void SendRecipient::setAddress(const QString& address) +{ + if (m_address != address) { + m_address = address; + Q_EMIT addressChanged(); + } +} + +QString SendRecipient::label() const +{ + return m_label; +} + +void SendRecipient::setLabel(const QString& label) +{ + if (m_label != label) { + m_label = label; + Q_EMIT labelChanged(); + } +} + +QString SendRecipient::amount() const +{ + return m_amount; +} + +void SendRecipient::setAmount(const QString& amount) +{ + if (m_amount != amount) { + m_amount = amount; + Q_EMIT amountChanged(); + } +} + +QString SendRecipient::message() const +{ + return m_message; +} + +void SendRecipient::setMessage(const QString& message) +{ + if (m_message != message) { + m_message = message; + Q_EMIT messageChanged(); + } +} + +bool SendRecipient::subtractFeeFromAmount() const +{ + return m_subtractFeeFromAmount; +} + +CAmount SendRecipient::cAmount() const +{ + // TODO: Figure out who owns the parsing of SendRecipient::amount to CAmount + return m_amount.toLongLong(); +} + +void SendRecipient::clear() +{ + m_address = ""; + m_label = ""; + m_amount = ""; + m_message = ""; + m_subtractFeeFromAmount = false; + Q_EMIT addressChanged(); + Q_EMIT labelChanged(); + Q_EMIT amountChanged(); + Q_EMIT messageChanged(); +} diff --git a/src/qml/models/sendrecipient.h b/src/qml/models/sendrecipient.h new file mode 100644 index 0000000000..042e97c9de --- /dev/null +++ b/src/qml/models/sendrecipient.h @@ -0,0 +1,55 @@ +// Copyright (c) 2025 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_QML_MODELS_SENDRECIPIENT_H +#define BITCOIN_QML_MODELS_SENDRECIPIENT_H + +#include +#include +#include + +class SendRecipient : public QObject +{ + Q_OBJECT + Q_PROPERTY(QString address READ address WRITE setAddress NOTIFY addressChanged) + Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged) + Q_PROPERTY(QString amount READ amount WRITE setAmount NOTIFY amountChanged) + Q_PROPERTY(QString message READ message WRITE setMessage NOTIFY messageChanged) + +public: + explicit SendRecipient(QObject* parent = nullptr); + + QString address() const; + void setAddress(const QString& address); + + QString label() const; + void setLabel(const QString& label); + + QString amount() const; + void setAmount(const QString& amount); + + QString message() const; + void setMessage(const QString& message); + + CAmount cAmount() const; + + bool subtractFeeFromAmount() const; + + Q_INVOKABLE void clear(); + +Q_SIGNALS: + void addressChanged(); + void labelChanged(); + void amountChanged(); + void messageChanged(); + +private: + QString m_address; + QString m_label; + QString m_amount; + QString m_message; + bool m_subtractFeeFromAmount{false}; +}; + +#endif // BITCOIN_QML_MODELS_SENDRECIPIENT_H diff --git a/src/qml/models/walletqmlmodel.cpp b/src/qml/models/walletqmlmodel.cpp index f0c6b45938..626f029bb7 100644 --- a/src/qml/models/walletqmlmodel.cpp +++ b/src/qml/models/walletqmlmodel.cpp @@ -6,10 +6,15 @@ #include -#include -#include +#include +#include +#include #include +#include +#include +#include +#include #include @@ -18,12 +23,14 @@ WalletQmlModel::WalletQmlModel(std::unique_ptr wallet, QObje { m_wallet = std::move(wallet); m_activity_list_model = new ActivityListModel(this); + m_current_recipient = new SendRecipient(this); } -WalletQmlModel::WalletQmlModel(QObject *parent) +WalletQmlModel::WalletQmlModel(QObject* parent) : QObject(parent) { m_activity_list_model = new ActivityListModel(this); + m_current_recipient = new SendRecipient(this); } QString WalletQmlModel::balance() const @@ -42,7 +49,6 @@ QString WalletQmlModel::name() const return QString::fromStdString(m_wallet->getWalletName()); } - std::set WalletQmlModel::getWalletTxs() const { if (!m_wallet) { @@ -82,3 +88,54 @@ std::unique_ptr WalletQmlModel::handleTransactionChanged(Tr } return m_wallet->handleTransactionChanged(fn); } + +bool WalletQmlModel::prepareTransaction() +{ + if (!m_wallet || !m_current_recipient) { + return false; + } + + CScript scriptPubKey = GetScriptForDestination(DecodeDestination(m_current_recipient->address().toStdString())); + wallet::CRecipient recipient = {scriptPubKey, m_current_recipient->cAmount(), m_current_recipient->subtractFeeFromAmount()}; + wallet::CCoinControl coinControl; + coinControl.m_feerate = CFeeRate(1000); + + CAmount balance = m_wallet->getBalance(); + if (balance < recipient.nAmount) { + return false; + } + + std::vector vecSend{recipient}; + int nChangePosRet = -1; + CAmount nFeeRequired = 0; + const auto& res = m_wallet->createTransaction(vecSend, coinControl, true, nChangePosRet, nFeeRequired); + if (res) { + if (m_current_transaction) { + delete m_current_transaction; + } + CTransactionRef newTx = *res; + m_current_transaction = new WalletQmlModelTransaction(m_current_recipient, this); + m_current_transaction->setWtx(newTx); + m_current_transaction->setTransactionFee(nFeeRequired); + Q_EMIT currentTransactionChanged(); + return true; + } else { + return false; + } +} + +void WalletQmlModel::sendTransaction() +{ + if (!m_wallet || !m_current_transaction) { + return; + } + + CTransactionRef newTx = m_current_transaction->getWtx(); + if (!newTx) { + return; + } + + interfaces::WalletValueMap value_map; + interfaces::WalletOrderForm order_form; + m_wallet->commitTransaction(newTx, value_map, order_form); +} diff --git a/src/qml/models/walletqmlmodel.h b/src/qml/models/walletqmlmodel.h index e93b6a055f..252a233482 100644 --- a/src/qml/models/walletqmlmodel.h +++ b/src/qml/models/walletqmlmodel.h @@ -10,6 +10,9 @@ #include +#include +#include + #include #include @@ -21,9 +24,11 @@ class WalletQmlModel : public QObject Q_PROPERTY(QString name READ name NOTIFY nameChanged) Q_PROPERTY(QString balance READ balance NOTIFY balanceChanged) Q_PROPERTY(ActivityListModel* activityListModel READ activityListModel CONSTANT) + Q_PROPERTY(SendRecipient* sendRecipient READ sendRecipient CONSTANT) + Q_PROPERTY(WalletQmlModelTransaction* currentTransaction READ currentTransaction NOTIFY currentTransactionChanged) public: - WalletQmlModel(std::unique_ptr wallet, QObject *parent = nullptr); + WalletQmlModel(std::unique_ptr wallet, QObject* parent = nullptr); WalletQmlModel(QObject *parent = nullptr); ~WalletQmlModel(); @@ -38,16 +43,24 @@ class WalletQmlModel : public QObject int& num_blocks, int64_t& block_time) const; + SendRecipient* sendRecipient() const { return m_current_recipient; } + WalletQmlModelTransaction* currentTransaction() const { return m_current_transaction; } + Q_INVOKABLE bool prepareTransaction(); + Q_INVOKABLE void sendTransaction(); + using TransactionChangedFn = std::function; virtual std::unique_ptr handleTransactionChanged(TransactionChangedFn fn); Q_SIGNALS: void nameChanged(); void balanceChanged(); + void currentTransactionChanged(); private: std::unique_ptr m_wallet; ActivityListModel* m_activity_list_model{nullptr}; + SendRecipient* m_current_recipient{nullptr}; + WalletQmlModelTransaction* m_current_transaction{nullptr}; }; #endif // BITCOIN_QML_MODELS_WALLETQMLMODEL_H diff --git a/src/qml/models/walletqmlmodeltransaction.cpp b/src/qml/models/walletqmlmodeltransaction.cpp new file mode 100644 index 0000000000..199103377a --- /dev/null +++ b/src/qml/models/walletqmlmodeltransaction.cpp @@ -0,0 +1,66 @@ +// Copyright (c) 2011-2025 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include + +#include +#include + +WalletQmlModelTransaction::WalletQmlModelTransaction(const SendRecipient* recipient, QObject* parent) + : QObject(parent), m_address(recipient->address()), m_amount(recipient->cAmount()), m_fee(0), m_label(recipient->label()), m_wtx(nullptr) +{ +} + +QString WalletQmlModelTransaction::amount() const +{ + return QString::number(m_amount); +} + +QString WalletQmlModelTransaction::address() const +{ + return m_address; +} + +QString WalletQmlModelTransaction::fee() const +{ + return QString::number(m_fee); +} + +QString WalletQmlModelTransaction::total() const +{ + return QString::number(m_amount + m_fee); +} + +QString WalletQmlModelTransaction::label() const +{ + return m_label; +} + +CTransactionRef& WalletQmlModelTransaction::getWtx() +{ + return m_wtx; +} + +void WalletQmlModelTransaction::setWtx(const CTransactionRef& newTx) +{ + m_wtx = newTx; +} + +CAmount WalletQmlModelTransaction::getTransactionFee() const +{ + return m_fee; +} + +void WalletQmlModelTransaction::setTransactionFee(const CAmount& newFee) +{ + if (m_fee != newFee) { + m_fee = newFee; + Q_EMIT feeChanged(); + } +} + +CAmount WalletQmlModelTransaction::getTotalTransactionAmount() const +{ + return m_amount + m_fee; +} diff --git a/src/qml/models/walletqmlmodeltransaction.h b/src/qml/models/walletqmlmodeltransaction.h new file mode 100644 index 0000000000..7bf914e06a --- /dev/null +++ b/src/qml/models/walletqmlmodeltransaction.h @@ -0,0 +1,62 @@ +// Copyright (c) 2011-2025 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_QML_MODELS_WALLETQMLMODELTRANSACTION_H +#define BITCOIN_QML_MODELS_WALLETQMLMODELTRANSACTION_H + +#include +#include + +#include + +#include + + +class WalletQmlModelTransaction : public QObject +{ + Q_OBJECT + Q_PROPERTY(QString address READ address CONSTANT) + Q_PROPERTY(QString amount READ amount NOTIFY amountChanged) + Q_PROPERTY(QString label READ label CONSTANT) + Q_PROPERTY(QString fee READ fee NOTIFY feeChanged) + Q_PROPERTY(QString total READ total NOTIFY totalChanged) +public: + explicit WalletQmlModelTransaction(const SendRecipient* recipient, QObject* parent = nullptr); + + QString address() const; + QString amount() const; + QString fee() const; + QString label() const; + QString total() const; + + QList getRecipients() const; + + CTransactionRef& getWtx(); + void setWtx(const CTransactionRef&); + + unsigned int getTransactionSize(); + + void setTransactionFee(const CAmount& newFee); + CAmount getTransactionFee() const; + + CAmount getTotalTransactionAmount() const; + + void reassignAmounts(int nChangePosRet); // needed for the subtract-fee-from-amount feature + +Q_SIGNALS: + void addressChanged(); + void labelChanged(); + void amountChanged(); + void feeChanged(); + void totalChanged(); + +private: + QString m_address; + CAmount m_amount; + CAmount m_fee; + QString m_label; + CTransactionRef m_wtx; +}; + +#endif // BITCOIN_QML_MODELS_WALLETQMLMODELTRANSACTION_H diff --git a/src/qml/pages/main.qml b/src/qml/pages/main.qml index da26fbf614..60aa6c2705 100644 --- a/src/qml/pages/main.qml +++ b/src/qml/pages/main.qml @@ -84,6 +84,9 @@ ApplicationWindow { onAddWallet: { main.push(createWalletWizard) } + onSendTransaction: { + main.push(sendReviewPage) + } } } @@ -96,6 +99,25 @@ ApplicationWindow { } } + Component { + id: sendReviewPage + SendReview { + onBack: { + main.pop() + } + onTransactionSent: { + walletController.selectedWallet.sendRecipient.clear() + main.pop() + sendResult.open() + } + } + } + + SendResult { + id: sendResult + closePolicy: Popup.CloseOnPressOutside + } + Component { id: shutdown Shutdown {} diff --git a/src/qml/pages/wallet/DesktopWallets.qml b/src/qml/pages/wallet/DesktopWallets.qml index 7ac0d9275c..d814c89fab 100644 --- a/src/qml/pages/wallet/DesktopWallets.qml +++ b/src/qml/pages/wallet/DesktopWallets.qml @@ -20,6 +20,7 @@ Page { ButtonGroup { id: navigationTabs } signal addWallet() + signal sendTransaction() header: NavigationBar2 { id: navBar @@ -131,9 +132,9 @@ Page { Activity { id: activityTab } - Item { + Send { id: sendTab - CoreText { text: "Send" } + onTransactionPrepared: root.sendTransaction() } RequestPayment { id: receiveTab diff --git a/src/qml/pages/wallet/Send.qml b/src/qml/pages/wallet/Send.qml new file mode 100644 index 0000000000..a8b234ece2 --- /dev/null +++ b/src/qml/pages/wallet/Send.qml @@ -0,0 +1,180 @@ +// Copyright (c) 2024 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import org.bitcoincore.qt 1.0 + +import "../../controls" +import "../../components" + +Page { + id: root + background: null + + property WalletQmlModel wallet: walletController.selectedWallet + property SendRecipient recipient: wallet.sendRecipient + + signal transactionPrepared() + + ScrollView { + clip: true + width: parent.width + height: parent.height + contentWidth: width + + ColumnLayout { + id: columnLayout + width: 450 + anchors.horizontalCenter: parent.horizontalCenter + + spacing: 10 + + CoreText { + id: title + Layout.topMargin: 30 + Layout.bottomMargin: 20 + text: qsTr("Send bitcoin") + font.pixelSize: 21 + bold: true + } + + LabeledTextInput { + id: address + Layout.fillWidth: true + labelText: qsTr("Send to") + placeholderText: qsTr("Enter address...") + text: root.recipient.address + onTextEdited: root.recipient.address = address.text + } + + Separator { + Layout.fillWidth: true + } + + Item { + BitcoinAmount { + id: bitcoinAmount + } + + height: amountInput.height + Layout.fillWidth: true + CoreText { + id: amountLabel + width: 110 + anchors.left: parent.left + anchors.verticalCenter: parent.verticalCenter + horizontalAlignment: Text.AlignLeft + color: Theme.color.neutral9 + text: "Amount" + font.pixelSize: 18 + } + + TextField { + id: amountInput + anchors.left: amountLabel.right + anchors.verticalCenter: parent.verticalCenter + leftPadding: 0 + font.family: "Inter" + font.styleName: "Regular" + font.pixelSize: 18 + color: Theme.color.neutral9 + placeholderTextColor: Theme.color.neutral7 + background: Item {} + placeholderText: "0.00000000" + selectByMouse: true + onTextEdited: { + amountInput.text = bitcoinAmount.amount = bitcoinAmount.sanitize(amountInput.text) + root.recipient.amount = bitcoinAmount.satoshiAmount + } + } + Item { + width: unitLabel.width + flipIcon.width + height: Math.max(unitLabel.height, flipIcon.height) + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + MouseArea { + anchors.fill: parent + onClicked: { + if (bitcoinAmount.unit == BitcoinAmount.BTC) { + amountInput.text = bitcoinAmount.convert(amountInput.text, BitcoinAmount.BTC) + bitcoinAmount.unit = BitcoinAmount.SAT + } else { + amountInput.text = bitcoinAmount.convert(amountInput.text, BitcoinAmount.SAT) + bitcoinAmount.unit = BitcoinAmount.BTC + } + } + } + CoreText { + id: unitLabel + anchors.right: flipIcon.left + anchors.verticalCenter: parent.verticalCenter + text: bitcoinAmount.unitLabel + font.pixelSize: 18 + color: Theme.color.neutral7 + } + Icon { + id: flipIcon + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + source: "image://images/flip-vertical" + color: Theme.color.neutral8 + size: 30 + } + } + } + + Separator { + Layout.fillWidth: true + } + + LabeledTextInput { + id: label + Layout.fillWidth: true + labelText: qsTr("Note to self") + placeholderText: qsTr("Enter ...") + onTextEdited: root.recipient.label = label.text + } + + Separator { + Layout.fillWidth: true + } + + Item { + height: feeLabel.height + feeValue.height + Layout.fillWidth: true + CoreText { + id: feeLabel + anchors.left: parent.left + anchors.top: parent.top + color: Theme.color.neutral9 + text: "Fee" + font.pixelSize: 15 + } + + CoreText { + id: feeValue + anchors.right: parent.right + anchors.top: parent.top + color: Theme.color.neutral9 + text: qsTr("Default (~2,000 sats)") + font.pixelSize: 15 + } + } + + ContinueButton { + id: continueButton + Layout.fillWidth: true + Layout.topMargin: 30 + text: qsTr("Review") + onClicked: { + if (root.wallet.prepareTransaction()) { + root.transactionPrepared() + } + } + } + } + } +} diff --git a/src/qml/pages/wallet/SendResult.qml b/src/qml/pages/wallet/SendResult.qml new file mode 100644 index 0000000000..10f5c0449b --- /dev/null +++ b/src/qml/pages/wallet/SendResult.qml @@ -0,0 +1,87 @@ +// Copyright (c) 2024 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Dialogs 1.2 +import org.bitcoincore.qt 1.0 + +import "../../controls" +import "../../components" + +Popup { + id: root + modal: true + anchors.centerIn: parent + + background: Rectangle { + anchors.centerIn: parent + width: columnLayout.width + 40 + height: columnLayout.height + 40 + color: Theme.color.neutral0 + border.color: Theme.color.neutral4 + border.width: 1 + radius: 5 + } + + ColumnLayout { + id: columnLayout + anchors.centerIn: parent + spacing: 20 + + Item { + width: 60 + height: 60 + Layout.alignment: Qt.AlignHCenter + Rectangle { + anchors.fill: parent + Layout.alignment: Qt.AlignHCenter + radius: 30 + color: Theme.color.green + opacity: 0.2 + } + Icon { + anchors.centerIn: parent + source: "qrc:/icons/check" + color: Theme.color.green + size: 30 + opacity: 1.0 + } + } + + CoreText { + Layout.alignment: Qt.AlignHCenter + text: qsTr("Transaction sent") + font.pixelSize: 28 + bold: true + } + + CoreText { + Layout.alignment: Qt.AlignHCenter + Layout.maximumWidth: 350 + color: Theme.color.neutral7 + text: qsTr("Based on your selected fee, it should be confirmed within the next 10 minutes.") + font.pixelSize: 18 + } + + ContinueButton { + Layout.preferredWidth: Math.min(200, parent.width - 2 * Layout.leftMargin) + Layout.leftMargin: 20 + Layout.rightMargin: Layout.leftMargin + Layout.alignment: Qt.AlignCenter + text: qsTr("Close window") + borderColor: Theme.color.neutral6 + borderHoverColor: Theme.color.neutral9 + borderPressedColor: Theme.color.neutral9 + textColor: Theme.color.neutral9 + backgroundColor: "transparent" + backgroundHoverColor: "transparent" + backgroundPressedColor: "transparent" + onClicked: { + root.close() + } + } + } +} diff --git a/src/qml/pages/wallet/SendReview.qml b/src/qml/pages/wallet/SendReview.qml new file mode 100644 index 0000000000..fb2d073637 --- /dev/null +++ b/src/qml/pages/wallet/SendReview.qml @@ -0,0 +1,139 @@ +// Copyright (c) 2024 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import org.bitcoincore.qt 1.0 + +import "../../controls" +import "../../components" + +Page { + id: root + background: null + + property WalletQmlModel wallet: walletController.selectedWallet + property WalletQmlModelTransaction transaction: walletController.selectedWallet.currentTransaction + + signal finished() + signal back() + signal transactionSent() + + header: NavigationBar2 { + id: navbar + leftItem: NavButton { + iconSource: "image://images/caret-left" + text: qsTr("Back") + onClicked: { + root.back() + } + } + } + + ScrollView { + clip: true + width: parent.width + height: parent.height + contentWidth: width + + ColumnLayout { + id: columnLayout + width: 450 + anchors.horizontalCenter: parent.horizontalCenter + + spacing: 20 + + CoreText { + id: title + Layout.topMargin: 30 + Layout.bottomMargin: 20 + text: qsTr("Transaction details") + font.pixelSize: 21 + bold: true + } + + RowLayout { + CoreText { + text: qsTr("Send to") + font.pixelSize: 15 + Layout.preferredWidth: 110 + color: Theme.color.neutral7 + } + CoreText { + text: root.transaction.address + font.pixelSize: 15 + color: Theme.color.neutral9 + } + } + + RowLayout { + CoreText { + text: qsTr("Note") + font.pixelSize: 15 + Layout.preferredWidth: 110 + color: Theme.color.neutral7 + } + CoreText { + text: root.transaction.label + font.pixelSize: 15 + color: Theme.color.neutral9 + } + } + + RowLayout { + CoreText { + text: qsTr("Amount") + font.pixelSize: 15 + Layout.preferredWidth: 110 + color: Theme.color.neutral7 + } + CoreText { + text: root.transaction.amount + font.pixelSize: 15 + color: Theme.color.neutral9 + } + } + + RowLayout { + CoreText { + text: qsTr("Fee") + font.pixelSize: 15 + Layout.preferredWidth: 110 + color: Theme.color.neutral7 + } + CoreText { + text: root.transaction.fee + font.pixelSize: 15 + color: Theme.color.neutral9 + } + } + + RowLayout { + CoreText { + text: qsTr("Total") + font.pixelSize: 15 + Layout.preferredWidth: 110 + color: Theme.color.neutral7 + } + CoreText { + text: root.transaction.total + font.pixelSize: 15 + color: Theme.color.neutral9 + } + } + + ContinueButton { + id: confimationButton + Layout.fillWidth: true + Layout.topMargin: 30 + text: qsTr("Send") + onClicked: { + root.wallet.sendTransaction() + root.transactionSent() + } + } + } + } +}