From d66bcc4b63ed91bdaf5edf4ff7da58a68009d35a Mon Sep 17 00:00:00 2001
From: James Houlahan <james.houlahan@protonmail.com>
Date: Fri, 24 Jul 2020 10:05:27 +0200
Subject: [PATCH] fix: bad ID in frontend

---
 .../qml/BridgeUI/OutgoingNoEncPopup.qml         |  4 ++--
 pkg/confirmer/confirmer_test.go                 | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/internal/frontend/qml/BridgeUI/OutgoingNoEncPopup.qml b/internal/frontend/qml/BridgeUI/OutgoingNoEncPopup.qml
index b2daec84..2f861eb1 100644
--- a/internal/frontend/qml/BridgeUI/OutgoingNoEncPopup.qml
+++ b/internal/frontend/qml/BridgeUI/OutgoingNoEncPopup.qml
@@ -84,7 +84,7 @@ Window {
             anchors.horizontalCenter: parent.horizontalCenter
 
             ButtonRounded {
-                id: cancel
+                id: sendAnyway
                 onClicked : root.hide(true)
                 height: Style.main.fontSize*2
                 //width: Style.dialog.widthButton*1.3
@@ -93,7 +93,7 @@ Window {
             }
 
             ButtonRounded {
-                id: sendAnyway
+                id: cancel
                 onClicked : root.hide(false)
                 height: Style.main.fontSize*2
                 //width: Style.dialog.widthButton*1.3
diff --git a/pkg/confirmer/confirmer_test.go b/pkg/confirmer/confirmer_test.go
index 58caafe3..7e1e87f9 100644
--- a/pkg/confirmer/confirmer_test.go
+++ b/pkg/confirmer/confirmer_test.go
@@ -82,3 +82,20 @@ func TestConfirmerMultipleRequestCalls(t *testing.T) {
 	_, errAgain := req.Result()
 	assert.Error(t, errAgain)
 }
+
+func TestConfirmerMultipleSetResultCalls(t *testing.T) {
+	c := New()
+
+	req := c.NewRequest(1 * time.Second)
+
+	go func() {
+		assert.NoError(t, c.SetResult(req.ID(), true))
+		assert.Error(t, c.SetResult(req.ID(), true))
+		assert.Error(t, c.SetResult(req.ID(), true))
+		assert.Error(t, c.SetResult(req.ID(), true))
+	}()
+
+	res, err := req.Result()
+	assert.NoError(t, err)
+	assert.True(t, res)
+}