Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-01-03 01:19:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

send: fix uri handling from scanned QR code

Browse source
This commit is contained in:
tobtoht 2024-10-10 14:03:46 +02:00
parent c2b5c051da
commit 796d4dd3f0
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/SendWidget.cpp
View file

@ -45,7 +45,7 @@ SendWidget::SendWidget(Wallet *wallet, QWidget *parent)
connect(ui->lineAmount, &QLineEdit::textChanged, this, &SendWidget::amountEdited); connect(ui->lineAmount, &QLineEdit::textChanged, this, &SendWidget::amountEdited);
connect(ui->lineAddress, &QPlainTextEdit::textChanged, this, &SendWidget::addressEdited); connect(ui->lineAddress, &QPlainTextEdit::textChanged, this, &SendWidget::addressEdited);
connect(ui->btn_openAlias, &QPushButton::clicked, this, &SendWidget::aliasClicked); connect(ui->btn_openAlias, &QPushButton::clicked, this, &SendWidget::aliasClicked);
connect(ui->lineAddress, &PayToEdit::dataPasted, this, &SendWidget::onDataPasted); connect(ui->lineAddress, &PayToEdit::dataPasted, this, &SendWidget::onDataFromQR);
ui->label_conversionAmount->setText(""); ui->label_conversionAmount->setText("");
ui->label_conversionAmount->hide(); ui->label_conversionAmount->hide();
ui->btn_openAlias->hide(); ui->btn_openAlias->hide();
@ -140,7 +140,7 @@ void SendWidget::scanClicked() {
auto dialog = new QrCodeScanDialog(this, false); auto dialog = new QrCodeScanDialog(this, false);
dialog->exec(); dialog->exec();
ui->lineAddress->setText(dialog->decodedString()); this->onDataFromQR(dialog->decodedString());
dialog->deleteLater(); dialog->deleteLater();
#else #else
Utils::showError(this, "Can't open QR scanner", "Feather was built without webcam QR scanner support"); Utils::showError(this, "Can't open QR scanner", "Feather was built without webcam QR scanner support");
@ -402,13 +402,17 @@ void SendWidget::setSubtractFeeFromAmountEnabled(bool enabled) {
ui->check_subtractFeeFromAmount->setVisible(enabled); ui->check_subtractFeeFromAmount->setVisible(enabled);
} }
void SendWidget::onDataPasted(const QString &data) { void SendWidget::onDataFromQR(const QString &data) {
if (!data.isEmpty()) { if (!data.isEmpty()) {
QVariantMap uriData = m_wallet->parse_uri_to_object(data); QVariantMap uriData = m_wallet->parse_uri_to_object(data);
if (!uriData.contains("error")) { if (!uriData.contains("error")) {
ui->lineAddress->setText(uriData.value("address").toString()); ui->lineAddress->setText(uriData.value("address").toString());
ui->lineDescription->setText(uriData.value("tx_description").toString()); ui->lineDescription->setText(uriData.value("tx_description").toString());
ui->lineAmount->setText(uriData.value("amount").toString());
// Strip trailing zeroes
auto amountStr = uriData.value("amount").toString();
auto amount = WalletManager::amountFromString(amountStr);
ui->lineAmount->setText(WalletManager::displayAmount(amount, false));
} else { } else {
ui->lineAddress->setText(data); ui->lineAddress->setText(data);
} }