diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 99d14685..7ece08e2 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -110,6 +110,7 @@ Page {
flow.sender = false;
flow.deviceId = deviceId;
flow.tranId = transactionId;
+ deviceVerificationList.add(flow.tranId);
var dialog = deviceVerificationDialog.createObject(timelineRoot,
{flow: flow,sender: false});
dialog.show();
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index 1a3d1432..03fc5055 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -30,7 +30,11 @@ ApplicationWindow {
implicitHeight: currentItem.implicitHeight
}
- onClosing: stack.replace(newVerificationRequest)
+ onClosing: {
+ flow.cancelVerification();
+ deviceVerificationList.remove(flow.tranId);
+ delete flow;
+ }
property var flow
Connections {
@@ -78,7 +82,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification();
- // deviceVerificationList.remove(flow.tranId);
+ deviceVerificationList.remove(flow.tranId);
delete flow;
}
}
@@ -135,7 +139,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification();
- // deviceVerificationList.remove(flow.tranId);
+ deviceVerificationList.remove(flow.tranId);
delete flow;
}
}
@@ -179,7 +183,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification();
- // deviceVerificationList.remove(flow.tranId);
+ deviceVerificationList.remove(flow.tranId);
delete flow;
}
}
@@ -230,7 +234,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification();
- // deviceVerificationList.remove(flow.tranId);
+ deviceVerificationList.remove(flow.tranId);
delete flow;
}
}
@@ -369,7 +373,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification();
- // deviceVerificationList.remove(flow.tranId);
+ deviceVerificationList.remove(flow.tranId);
delete flow;
}
}
@@ -413,7 +417,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification();
- // deviceVerificationList.remove(flow.tranId);
+ deviceVerificationList.remove(flow.tranId);
delete flow;
}
}
@@ -451,7 +455,7 @@ ApplicationWindow {
text: "Close"
onClicked: {
dialog.close()
- // deviceVerificationList.remove(flow.tranId);
+ deviceVerificationList.remove(flow.tranId);
delete flow;
}
}
@@ -485,8 +489,8 @@ ApplicationWindow {
Layout.alignment: Qt.AlignRight
text: "Close"
onClicked: {
- dialog.close()
- // deviceVerificationList.remove(flow.tranId);
+ dialog.close();
+ deviceVerificationList.remove(flow.tranId);
delete flow;
}
}
@@ -521,7 +525,7 @@ ApplicationWindow {
text: "Close"
onClicked: {
dialog.close()
- // deviceVerificationList.remove(flow.tranId);
+ deviceVerificationList.remove(flow.tranId);
delete flow;
}
}
|
