Merge master

.gitignore

@@ -4,6 +4,7 @@ release/
 x64/
 artifacts/
 .vscode/
+res/libsodium.a
 res/libsodium/libsodium*
 res/libsodium.a
 src/ui_*.h

res/zec_qt_wallet_de.ts

@@ -1405,7 +1405,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig
     </message>
     <message>
         <location filename="../src/createzcashconfdialog.ui" line="109"/>
-        <source>Please chose a directory to store your wallet.dat and blockchain</source>
+        <source>Please choose a directory to store your wallet.dat and blockchain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

res/zec_qt_wallet_es.ts

@@ -1421,7 +1421,7 @@ El saldo es insuficiente para una migración automática.
     </message>
     <message>
         <location filename="../src/createzcashconfdialog.ui" line="109"/>
-        <source>Please chose a directory to store your wallet.dat and blockchain</source>
+        <source>Please choose a directory to store your wallet.dat and blockchain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

res/zec_qt_wallet_pt.ts

@@ -1420,7 +1420,7 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç
     </message>
     <message>
         <location filename="../src/createzcashconfdialog.ui" line="109"/>
-        <source>Please chose a directory to store your wallet.dat and blockchain</source>
+        <source>Please choose a directory to store your wallet.dat and blockchain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/createzcashconfdialog.ui

@@ -106,7 +106,7 @@
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Please chose a directory to store your wallet.dat and blockchain</string>
+         <string>Please choose a directory to store your wallet.dat and blockchain</string>
         </property>
        </widget>
       </item>

src/mainwindow.cpp

@@ -1044,12 +1044,15 @@ void MainWindow::setupTransactionsTab() {
         QString memo = txModel->getMemo(index.row());
 
         if (!memo.isEmpty()) {
-            QMessageBox::information(this, tr("Memo"), memo, QMessageBox::Ok);
+            QMessageBox mb(QMessageBox::Information, tr("Memo"), memo, QMessageBox::Ok, this);
+            mb.setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+            mb.exec();
         }
     });
 
     // Set up context menu on transactions tab
     ui->transactionsTable->setContextMenuPolicy(Qt::CustomContextMenu);
+
     // Table right click
     QObject::connect(ui->transactionsTable, &QTableView::customContextMenuRequested, [=] (QPoint pos) {
         QModelIndex index = ui->transactionsTable->indexAt(pos);
@@ -1087,7 +1090,9 @@ void MainWindow::setupTransactionsTab() {
 
         if (!memo.isEmpty()) {
             menu.addAction(tr("View Memo"), [=] () {
-                QMessageBox::information(this, tr("Memo"), memo, QMessageBox::Ok);
+                QMessageBox mb(QMessageBox::Information, tr("Memo"), memo, QMessageBox::Ok, this);
+                mb.setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+                mb.exec();
             });
         }
 

src/rpc.cpp

@@ -1088,7 +1088,7 @@ void RPC::refreshZECPrice() {
 
 void RPC::shutdownZcashd() {
     // Shutdown embedded zcashd if it was started
-    if (ezcashd == nullptr || conn == nullptr) {
+    if (ezcashd == nullptr || ezcashd->processId() == 0 || conn == nullptr) {
         // No zcashd running internally, just return
         return;
     }

src/scripts/control

@@ -3,7 +3,6 @@ Version: RELEASE_VERSION
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: openssl (>= 1.0.0)
 Maintainer: Aditya Kulkarni <zcash@adityapk.com>
 Description: zec-qt-wallet is a full node and UI wallet for Zcash.
  zec-qt-wallet is a full node and UI wallet for Zcash. It comes with 

src/version.h

@@ -1 +1 @@
-#define APP_VERSION "0.5.7-androidbeta"
+#define APP_VERSION "0.5.9-androidbeta"