2 files changed, 11 insertions, 10 deletions
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index 6bfee09c..c40e6765 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -29,6 +29,14 @@ ApplicationWindow{
}
}
+ Component {
+ id: deviceVerificationDialog
+ DeviceVerification {}
+ }
+ DeviceVerificationFlow {
+ id: deviceVerificationFlow
+ }
+
background: Item{
id: userProfileItem
width: userProfileDialog.width
@@ -98,22 +106,15 @@ ApplicationWindow{
Layout.alignment: Qt.AlignRight
text: displayName
}
- Component {
- id: deviceVerificationDialog
- DeviceVerification {}
- }
- DeviceVerificationFlow {
- id: deviceVerificationFlow
- }
}
Button{
id: verifyButton
text:"Verify"
onClicked: {
- var dialog = deviceVerificationDialog.createObject(userProfileDialog,
- {flow: deviceVerificationFlow,sender: false});
deviceVerificationFlow.userId = user_data.userId
deviceVerificationFlow.deviceId = model.deviceID
+ var dialog = deviceVerificationDialog.createObject(userProfileDialog,
+ {flow: deviceVerificationFlow,sender: true});
dialog.show();
}
contentItem: Text {
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index 31f6f9c1..fca360f7 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -83,7 +83,7 @@ ApplicationWindow {
Button {
Layout.alignment: Qt.AlignRight
text: "Start verification"
- onClicked: { stack.replace(awaitingVerificationRequestAccept); flow.sendVerificationRequest(); }
+ onClicked: { stack.replace(awaitingVerificationRequestAccept); flow.startVerificationRequest(); }
}
}
}
|
