rebranding to SD
This commit is contained in:
@@ -47,8 +47,8 @@ void RequestDialog::setupDialog(MainWindow* main, QDialog* d, Ui_RequestDialog*
|
||||
void RequestDialog::showPaymentConfirmation(MainWindow* main, QString paymentURI) {
|
||||
PaymentURI payInfo = Settings::parseURI(paymentURI);
|
||||
if (!payInfo.error.isEmpty()) {
|
||||
QMessageBox::critical(main, tr("Error paying zcash URI"),
|
||||
tr("URI should be of the form 'zcash:<addr>?amt=x&memo=y") + "\n" + payInfo.error);
|
||||
QMessageBox::critical(main, tr("Error paying hush URI"),
|
||||
tr("URI should be of the form 'hush:<addr>?amt=x&memo=y") + "\n" + payInfo.error);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -80,12 +80,12 @@ void RequestDialog::showPaymentConfirmation(MainWindow* main, QString paymentURI
|
||||
req.lblHeader->setText(tr("You are paying a payment request. Your address will not be visible to the person requesting this payment."));
|
||||
|
||||
if (d.exec() == QDialog::Accepted) {
|
||||
main->payZcashURI(paymentURI, req.cmbMyAddress->currentText());
|
||||
main->payhushURI(paymentURI, req.cmbMyAddress->currentText());
|
||||
}
|
||||
}
|
||||
|
||||
// Static method that shows the request dialog
|
||||
void RequestDialog::showRequestZcash(MainWindow* main) {
|
||||
void RequestDialog::showRequesthush(MainWindow* main) {
|
||||
QDialog d(main);
|
||||
Ui_RequestDialog req;
|
||||
|
||||
@@ -123,17 +123,17 @@ void RequestDialog::showRequestZcash(MainWindow* main) {
|
||||
req.txtFrom->setFocus();
|
||||
|
||||
if (d.exec() == QDialog::Accepted) {
|
||||
// Construct a zcash Payment URI with the data and pay it immediately.
|
||||
QString memoURI = "zcash:" + req.cmbMyAddress->currentText()
|
||||
// Construct a hush Payment URI with the data and pay it immediately.
|
||||
QString memoURI = "hush:" + req.cmbMyAddress->currentText()
|
||||
+ "?amt=" + Settings::getDecimalString(req.txtAmount->text().toDouble())
|
||||
+ "&memo=" + QUrl::toPercentEncoding(req.txtMemo->toPlainText());
|
||||
|
||||
QString sendURI = "zcash:" + AddressBook::addressFromAddressLabel(req.txtFrom->text())
|
||||
QString sendURI = "hush:" + AddressBook::addressFromAddressLabel(req.txtFrom->text())
|
||||
+ "?amt=0.0001"
|
||||
+ "&memo=" + QUrl::toPercentEncoding(memoURI);
|
||||
|
||||
// If the disclosed address in the memo doesn't have a balance, it will automatically fallback to the default
|
||||
// sapling address
|
||||
main->payZcashURI(sendURI, req.cmbMyAddress->currentText());
|
||||
main->payhushURI(sendURI, req.cmbMyAddress->currentText());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user