Release 0.90.7

BlockSettle · Jun 5, 2020 · d6fd9dc · d6fd9dc
2 parents d68d7cf + d8ee20b
commit d6fd9dc
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 7 deletions.
diff --git a/BlockSettleHW/hwdevicemanager.cpp b/BlockSettleHW/hwdevicemanager.cpp
@@ -43,7 +43,6 @@ void HwDeviceManager::scanDevices()
       return;
    }
 
-
    setScanningFlag(true);
 
    auto doneScanning = [this, expectedClients = 2, finished = std::make_shared<int>(0)]() {
@@ -216,13 +215,13 @@ void HwDeviceManager::signTX(QVariant reqTX)
          if (!validSign) {
             SPDLOG_LOGGER_ERROR(logger_, "sign verification failed");
             releaseConnection();
-            emit operationFailed(tr("Signing failed. Please ensure you type the correct password."));
+            emit operationFailed(tr("Signing failed. Please ensure you type the correct passphrase."));
             return;
          }
       } catch (const std::exception &e) {
          SPDLOG_LOGGER_ERROR(logger_, "sign verification failed: {}", e.what());
          releaseConnection();
-         emit operationFailed(tr("Signing failed. Please ensure you type the correct password."));
+         emit operationFailed(tr("Signing failed. Please ensure you type the correct passphrase."));
          return;
       }
 
@@ -252,6 +251,11 @@ void HwDeviceManager::releaseDevices()
    releaseConnection();
 }
 
+void HwDeviceManager::hwOperationDone()
+{
+   model_->resetModel({});
+}
+
 bool HwDeviceManager::awaitingUserAction(int deviceIndex)
 {
    if (model_->rowCount() <= deviceIndex) {

diff --git a/BlockSettleHW/hwdevicemanager.h b/BlockSettleHW/hwdevicemanager.h
@@ -55,6 +55,7 @@ class HwDeviceManager : public QObject
    Q_INVOKABLE void prepareHwDeviceForSign(QString walletId);
    Q_INVOKABLE void signTX(QVariant reqTX);
    Q_INVOKABLE void releaseDevices();
+   Q_INVOKABLE void hwOperationDone();
 
    // Info asked from UI
    Q_INVOKABLE bool awaitingUserAction(int deviceIndex);

diff --git a/BlockSettleSigner/qml/BsDialogs/TxSignDialog.qml b/BlockSettleSigner/qml/BsDialogs/TxSignDialog.qml
@@ -54,6 +54,8 @@ BSWalletHandlerDialog {
     rejectable: true
     width: 500
 
+    onAboutToHide: hwDeviceManager.hwOperationDone()
+
     function init() {
         if (walletInfo.encType === QPasswordData.Auth) {
             btnConfirm.visible = false

diff --git a/BlockSettleSigner/qml/BsDialogs/TxSignSettlementBaseDialog.qml b/BlockSettleSigner/qml/BsDialogs/TxSignSettlementBaseDialog.qml
@@ -92,6 +92,8 @@ CustomTitleDialogWindowWithExpander {
     rejectable: true
     width: 500
 
+    onAboutToHide: hwDeviceManager.hwOperationDone()
+
     function init() {
         if (walletInfo.encType === QPasswordData.Auth) {
             btnConfirm.visible = false

diff --git a/BlockSettleSigner/qml/BsHw/HwAvailableDevices.qml b/BlockSettleSigner/qml/BsHw/HwAvailableDevices.qml
@@ -47,6 +47,10 @@ Item {
         }
     }
 
+    function release() {
+        hwDeviceManager.hwOperationDone();
+    }
+
     function init() {
         rescan();
     }

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,7 +84,7 @@ set(QML2_IMPORT_PATH "${BLOCK_SETTLE_ROOT}/BlockSettleSigner/qml" CACHE STRING "
 # Terminal, PB, PuB and offline tools share same version for consistency
 SET(BS_VERSION_MAJOR 0 )
 SET(BS_VERSION_MINOR 90 )
-SET(BS_VERSION_PATCH 6 )
+SET(BS_VERSION_PATCH 7 )
 SET(BS_VERSION_STRING "${BS_VERSION_MAJOR}.${BS_VERSION_MINOR}.${BS_VERSION_PATCH}")
 
 include(GetGitRevisionDescription)

diff --git a/Deploy/Ubuntu/DEBIAN/control b/Deploy/Ubuntu/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: bsterminal
-Version: 0.90.6
+Version: 0.90.7
 Section: x11
 Priority: optional
 Architecture: amd64

diff --git a/Deploy/Windows/bsterminal.nsi b/Deploy/Windows/bsterminal.nsi
@@ -4,7 +4,7 @@ SetCompressor /SOLID lzma
 # General Symbol Definitions
 !define COMPANY "BlockSettle AB"
 !define URL http://blocksettle.com/
-!define VERSION "0.90.6"
+!define VERSION "0.90.7"
 !define PRODUCT_NAME "BlockSettle Terminal"
 
 # MultiUser Symbol Definitions

diff --git a/changelog.json b/changelog.json
@@ -1,7 +1,20 @@
 {
-   "latest_version": "0.90.6",
+   "latest_version": "0.90.7",
    "release_date": "05 Jun 2020",
    "changes": [
+      {
+         "version_string": "0.90.7",
+         "previous_version": "0.90.6",
+         "release_date": "05 Jun 2020",
+         "release_type": "prod",
+         "improvements": [
+            "Minor rename",
+            "Merge pull request #779 from BlockSettle/fixImportButton"
+         ],
+         "bug_fixes": [],
+         "revision": "de41cb6e4",
+         "common_revision": "de41cb6e4"
+      },
       {
          "version_string": "0.90.6",
          "previous_version": "0.90.6",