Browse Source

Add to confirm dialog

recurring
adityapk00 5 years ago
parent
commit
25072c010e
  1. 16
      src/confirm.ui
  2. 2
      src/mainwindow.h
  3. 15
      src/sendtab.cpp

16
src/confirm.ui

@ -133,6 +133,22 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="grpRecurring">
<property name="title">
<string>Recurring Payment</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="lblRecurringDesc">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">

2
src/mainwindow.h

@ -68,7 +68,7 @@ private:
void removeExtraAddresses();
Tx createTxFromSendPage();
bool confirmTx(Tx tx);
bool confirmTx(Tx tx, RecurringPaymentInfo* rpi);
void turnstileDoMigration(QString fromAddr = "");
void turnstileProgress();

15
src/sendtab.cpp

@ -108,6 +108,8 @@ void MainWindow::editSchedule() {
}
else {
delete this->sendTxRecurringInfo;
this->sendTxRecurringInfo = recurringInfo;
ui->lblRecurDesc->setText(recurringInfo->getScheduleDescription());
}
@ -492,7 +494,7 @@ Tx MainWindow::createTxFromSendPage() {
return tx;
}
bool MainWindow::confirmTx(Tx tx) {
bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
auto fnSplitAddressForWrap = [=] (const QString& a) -> QString {
if (!a.startsWith("z")) return a;
@ -616,6 +618,15 @@ bool MainWindow::confirmTx(Tx tx) {
}
}
// Recurring payment info
if (rpi == nullptr) {
confirm.grpRecurring->setVisible(false);
}
else {
confirm.grpRecurring->setVisible(true);
confirm.lblRecurringDesc->setText(rpi->getScheduleDescription());
}
// Syncing warning
confirm.syncingWarning->setVisible(Settings::getInstance()->isSyncing());
@ -657,7 +668,7 @@ void MainWindow::sendButton() {
}
// Show a dialog to confirm the Tx
if (confirmTx(tx)) {
if (confirmTx(tx, sendTxRecurringInfo)) {
// And send the Tx
rpc->executeTransaction(tx,
[=] (QString opid) {

Loading…
Cancel
Save