diff --git a/lib/Makefile b/lib/Makefile
index cf1630c..9dbe82a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -19,10 +19,10 @@ release: target/release/silentdragonlite.$(EXT)
debug: target/debug/silentdragonlite.$(EXT)
target/release/silentdragonlite.$(EXT): src/lib.rs Cargo.toml
- CFLAGS=$(CFLAGS) cargo build --lib --release
+ LIBS="" CFLAGS=$(CFLAGS) cargo build --lib --release
target/debug/silentdragonlite.$(EXT): src/lib.rs Cargo.toml
- CFLAGS=$(CFLAGS) cargo build --lib
+ LIBS="" CFLAGS=$(CFLAGS) cargo build --lib
clean:
rm -rf target
\ No newline at end of file
diff --git a/src/confirm.ui b/src/confirm.ui
index 6bb28a7..5babfd4 100644
--- a/src/confirm.ui
+++ b/src/confirm.ui
@@ -14,25 +14,6 @@
Confirm Transaction
- -
-
-
- From
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
diff --git a/src/controller.cpp b/src/controller.cpp
index c4eb99c..31df411 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -387,10 +387,17 @@ void Controller::refreshTransactions() {
address = (it["address"].is_null() ? "" : QString::fromStdString(it["address"]));
model->markAddressUsed(address);
+ QString memo;
+ if (!it["memo"].is_null()) {
+ memo = QString::fromStdString(it["memo"]);
+ }
+
+
+
items.push_back(TransactionItemDetail{
address,
CAmount::fromqint64(it["amount"].get()),
- ""
+ memo
});
diff --git a/src/liteinterface.cpp b/src/liteinterface.cpp
index de77a7b..e91e36a 100644
--- a/src/liteinterface.cpp
+++ b/src/liteinterface.cpp
@@ -39,7 +39,7 @@ void LiteInterface::createNewZaddr(bool, const std::function& cb) {
if (conn == nullptr)
return;
- conn->doRPCWithDefaultErrorHandling("new", "zs1", cb);
+ conn->doRPCWithDefaultErrorHandling("new", "z", cb);
}
void LiteInterface::createNewTaddr(const std::function& cb) {
diff --git a/src/main.cpp b/src/main.cpp
index b0f78eb..68cc73d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -150,8 +150,8 @@ public:
parser.setApplicationDescription("Shielded desktop light wallet for hush");
parser.addHelpOption();
- // Positional argument will specify a zcash payment URI
- parser.addPositionalArgument("zcashURI", "An optional hush URI to pay");
+ // Positional argument will specify a hush payment URI
+ parser.addPositionalArgument("hushURI", "An optional hush URI to pay");
parser.process(a);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 16e5772..8c8645b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -285,7 +285,7 @@ void MainWindow::setupSettingsModal() {
// Enable the troubleshooting options only if using embedded hushd
if (!rpc->isEmbedded()) {
settings.chkRescan->setEnabled(false);
- settings.chkRescan->setToolTip(tr("You're using an external hushd. Please restart zcashd with -rescan"));
+ settings.chkRescan->setToolTip(tr("You're using an external hushd. Please restart hushd with -rescan"));
}
if (settingsDialog.exec() == QDialog::Accepted) {
diff --git a/src/sendtab.cpp b/src/sendtab.cpp
index 8760089..fc6790a 100644
--- a/src/sendtab.cpp
+++ b/src/sendtab.cpp
@@ -606,14 +606,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
// Syncing warning
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).toDecimalhushUSDString();
- tooltip += "\n" + tr("Balance after this Tx: ") +
- (rpc->getModel()->getAllBalances().value(tx.fromAddr) - totalSpending).toDecimalhushUSDString();
- confirm.sendFrom->setToolTip(tooltip);
+
// Show the dialog and submit it if the user confirms
return d.exec() == QDialog::Accepted;
@@ -686,7 +679,7 @@ void MainWindow::sendButton() {
}
QString MainWindow::doSendTxValidations(Tx tx) {
- if (!Settings::isValidAddress(tx.fromAddr)) return QString(tr("From Address is Invalid"));
+
for (auto toAddr : tx.toAddrs) {
if (!Settings::isValidAddress(toAddr.addr)) {
diff --git a/src/txtablemodel.cpp b/src/txtablemodel.cpp
index 35cd6da..9d86172 100644
--- a/src/txtablemodel.cpp
+++ b/src/txtablemodel.cpp
@@ -150,7 +150,7 @@ bool TxTableModel::exportToCsv(QString fileName) const {
}
}
- if (role == Qt::DecorationRole && index.column() == 0) {
+ if (role == Qt::DecorationRole && index.column() == 0) {
bool hasMemo = false;
for (int i=0; i < dat.items.length(); i++) {
if (!dat.items[i].memo.isEmpty()) {
diff --git a/src/websockets.cpp b/src/websockets.cpp
index f3bd605..d35d959 100644
--- a/src/websockets.cpp
+++ b/src/websockets.cpp
@@ -320,7 +320,7 @@ void AppDataServer::updateUIWithNewQRCode(MainWindow* mainwindow) {
if (ipv4Addr.isEmpty())
return;
- QString uri = "ws://" + ipv4Addr + ":8237";
+ QString uri = "ws://" + ipv4Addr + ":8777";
// Get a new secret
unsigned char* secretBin = new unsigned char[crypto_secretbox_KEYBYTES];