Skip to content

Commit 091a9a0

Browse files
committed
text change and fix bug with offerpay progress
1 parent cbe2d70 commit 091a9a0

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

src/qt/offeracceptdialog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ void OfferAcceptDialog::accept()
102102
{
103103
OfferAcceptDialog::close();
104104
}
105+
return;
105106

106107
}
107108
}

src/qt/offerpaydialog.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void OfferPayDialog::pay()
9595
if(this->offerPaid)
9696
{
9797
QMessageBox::information(this, tr("Purchase Complete"),
98-
tr("<p><FONT COLOR='green'><b>Your payment is complete!</b></FONT></p><p>The merchant has been sent your encrypted shipping information and your item should arrive shortly. The merchant may followup with further information.</p><br><br><p>TxID: <b>%1</b></p>").arg(payTXID),
98+
tr("<p><FONT COLOR='green'><b>Your payment is complete!</b></FONT></p><p>The merchant has been sent your delivery information and your item should arrive shortly. The merchant may followup with further information.</p><br><p>TxID: <b>%1</b></p>").arg(payTXID),
9999
QMessageBox::Ok, QMessageBox::Ok);
100100
if(this->offerPaid)
101101
{
@@ -115,6 +115,10 @@ void OfferPayDialog::pay()
115115
}
116116
void OfferPayDialog::offerAcceptWatcher()
117117
{
118+
if(this->progress >= 100)
119+
{
120+
this->progress = 1;
121+
}
118122
if(!lookup())
119123
{
120124
this->progress = 0;
@@ -123,16 +127,18 @@ void OfferPayDialog::offerAcceptWatcher()
123127
ui->purchaseHint->setText(tr("There was a problem looking up this offer information, please try again later..."));
124128
return;
125129
}
130+
126131
this->progress += 1;
132+
if(this->progress >= 100)
133+
{
134+
this->progress = 100;
135+
}
127136
if(this->offerPaid)
128137
{
129138
this->progress = 100;
130139
this->timer->stop();
131140
}
132-
else if(this->progress >= 100)
133-
{
134-
this->progress = 0;
135-
}
141+
136142
ui->progressBar->setValue(this->progress);
137143
}
138144
bool OfferPayDialog::lookup()

0 commit comments

Comments
 (0)