Skip to content

Commit d6fd9dc

Browse files
author
Siraj Razick
committed
Release 0.90.7
2 parents d68d7cf + d8ee20b commit d6fd9dc

File tree

9 files changed

+33
-7
lines changed

9 files changed

+33
-7
lines changed

BlockSettleHW/hwdevicemanager.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ void HwDeviceManager::scanDevices()
4343
return;
4444
}
4545

46-
4746
setScanningFlag(true);
4847

4948
auto doneScanning = [this, expectedClients = 2, finished = std::make_shared<int>(0)]() {
@@ -216,13 +215,13 @@ void HwDeviceManager::signTX(QVariant reqTX)
216215
if (!validSign) {
217216
SPDLOG_LOGGER_ERROR(logger_, "sign verification failed");
218217
releaseConnection();
219-
emit operationFailed(tr("Signing failed. Please ensure you type the correct password."));
218+
emit operationFailed(tr("Signing failed. Please ensure you type the correct passphrase."));
220219
return;
221220
}
222221
} catch (const std::exception &e) {
223222
SPDLOG_LOGGER_ERROR(logger_, "sign verification failed: {}", e.what());
224223
releaseConnection();
225-
emit operationFailed(tr("Signing failed. Please ensure you type the correct password."));
224+
emit operationFailed(tr("Signing failed. Please ensure you type the correct passphrase."));
226225
return;
227226
}
228227

@@ -252,6 +251,11 @@ void HwDeviceManager::releaseDevices()
252251
releaseConnection();
253252
}
254253

254+
void HwDeviceManager::hwOperationDone()
255+
{
256+
model_->resetModel({});
257+
}
258+
255259
bool HwDeviceManager::awaitingUserAction(int deviceIndex)
256260
{
257261
if (model_->rowCount() <= deviceIndex) {

BlockSettleHW/hwdevicemanager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class HwDeviceManager : public QObject
5555
Q_INVOKABLE void prepareHwDeviceForSign(QString walletId);
5656
Q_INVOKABLE void signTX(QVariant reqTX);
5757
Q_INVOKABLE void releaseDevices();
58+
Q_INVOKABLE void hwOperationDone();
5859

5960
// Info asked from UI
6061
Q_INVOKABLE bool awaitingUserAction(int deviceIndex);

BlockSettleSigner/qml/BsDialogs/TxSignDialog.qml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ BSWalletHandlerDialog {
5454
rejectable: true
5555
width: 500
5656

57+
onAboutToHide: hwDeviceManager.hwOperationDone()
58+
5759
function init() {
5860
if (walletInfo.encType === QPasswordData.Auth) {
5961
btnConfirm.visible = false

BlockSettleSigner/qml/BsDialogs/TxSignSettlementBaseDialog.qml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ CustomTitleDialogWindowWithExpander {
9292
rejectable: true
9393
width: 500
9494

95+
onAboutToHide: hwDeviceManager.hwOperationDone()
96+
9597
function init() {
9698
if (walletInfo.encType === QPasswordData.Auth) {
9799
btnConfirm.visible = false

BlockSettleSigner/qml/BsHw/HwAvailableDevices.qml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ Item {
4747
}
4848
}
4949

50+
function release() {
51+
hwDeviceManager.hwOperationDone();
52+
}
53+
5054
function init() {
5155
rescan();
5256
}

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ set(QML2_IMPORT_PATH "${BLOCK_SETTLE_ROOT}/BlockSettleSigner/qml" CACHE STRING "
8484
# Terminal, PB, PuB and offline tools share same version for consistency
8585
SET(BS_VERSION_MAJOR 0 )
8686
SET(BS_VERSION_MINOR 90 )
87-
SET(BS_VERSION_PATCH 6 )
87+
SET(BS_VERSION_PATCH 7 )
8888
SET(BS_VERSION_STRING "${BS_VERSION_MAJOR}.${BS_VERSION_MINOR}.${BS_VERSION_PATCH}")
8989

9090
include(GetGitRevisionDescription)

Deploy/Ubuntu/DEBIAN/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: bsterminal
2-
Version: 0.90.6
2+
Version: 0.90.7
33
Section: x11
44
Priority: optional
55
Architecture: amd64

Deploy/Windows/bsterminal.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SetCompressor /SOLID lzma
44
# General Symbol Definitions
55
!define COMPANY "BlockSettle AB"
66
!define URL http://blocksettle.com/
7-
!define VERSION "0.90.6"
7+
!define VERSION "0.90.7"
88
!define PRODUCT_NAME "BlockSettle Terminal"
99

1010
# MultiUser Symbol Definitions

changelog.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
{
2-
"latest_version": "0.90.6",
2+
"latest_version": "0.90.7",
33
"release_date": "05 Jun 2020",
44
"changes": [
5+
{
6+
"version_string": "0.90.7",
7+
"previous_version": "0.90.6",
8+
"release_date": "05 Jun 2020",
9+
"release_type": "prod",
10+
"improvements": [
11+
"Minor rename",
12+
"Merge pull request #779 from BlockSettle/fixImportButton"
13+
],
14+
"bug_fixes": [],
15+
"revision": "de41cb6e4",
16+
"common_revision": "de41cb6e4"
17+
},
518
{
619
"version_string": "0.90.6",
720
"previous_version": "0.90.6",

0 commit comments

Comments
 (0)