DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix from fields in confirm dialog

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-10-27 12:17:14 -07:00
parent 3ceb2443a3
commit 167cfc8bd5
3 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/confirm.ui
View File

@@ -14,25 +14,6 @@
<string>Confirm Transaction</string> <string>Confirm Transaction</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>From</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="sendFrom">
<property name="text">
<string notr="true"/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="sendToAddrs"> <widget class="QGroupBox" name="sendToAddrs">
<property name="title"> <property name="title">

11
src/sendtab.cpp
View File

@@ -606,15 +606,6 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
// Syncing warning // Syncing warning
confirm.syncingWarning->setVisible(Settings::getInstance()->isSyncing()); confirm.syncingWarning->setVisible(Settings::getInstance()->isSyncing());
// And FromAddress in the confirm dialog
confirm.sendFrom->setText(fnSplitAddressForWrap(tx.fromAddr));
confirm.sendFrom->setFont(fixedFont);
QString tooltip = tr("Current balance : ") +
rpc->getModel()->getAllBalances().value(tx.fromAddr).toDecimalZECUSDString();
tooltip += "\n" + tr("Balance after this Tx: ") +
(rpc->getModel()->getAllBalances().value(tx.fromAddr) - totalSpending).toDecimalZECUSDString();
confirm.sendFrom->setToolTip(tooltip);
// Show the dialog and submit it if the user confirms // Show the dialog and submit it if the user confirms
return d.exec() == QDialog::Accepted; return d.exec() == QDialog::Accepted;
} }
@@ -686,8 +677,6 @@ void MainWindow::sendButton() {
} }
QString MainWindow::doSendTxValidations(Tx tx) { QString MainWindow::doSendTxValidations(Tx tx) {
if (!Settings::isValidAddress(tx.fromAddr)) return QString(tr("From Address is Invalid"));
for (auto toAddr : tx.toAddrs) { for (auto toAddr : tx.toAddrs) {
if (!Settings::isValidAddress(toAddr.addr)) { if (!Settings::isValidAddress(toAddr.addr)) {
QString addr = (toAddr.addr.length() > 100 ? toAddr.addr.left(100) + "..." : toAddr.addr); QString addr = (toAddr.addr.length() > 100 ? toAddr.addr.left(100) + "..." : toAddr.addr);

2
src/version.h
View File

@@ -1 +1 @@
#define APP_VERSION "0.7.9" #define APP_VERSION "1.0-beta1"