Merge branch 'master' into fix/backup-wallet-id-migration

Author: piotr-iohk

Bitkit/Utilities/TrezorErrorPresenter.swift

@@ -54,7 +54,7 @@ enum TrezorErrorPresenter {
         if message.contains("Pairing required") {
             return "Bluetooth pairing required. Please put your Trezor in pairing mode."
         }
-        if message.contains("Code verification failed") || message.contains("verification failed") {
+        if message.contains("Code verification failed") {
             return t("hardware__pairing_code_invalid")
         }
         if message.contains("DeviceBusy") || message.contains("Device is busy") {

BitkitTests/TrezorDeviceBusyTests.swift

@@ -39,4 +39,16 @@ final class TrezorDeviceBusyTests: XCTestCase {
     func testPresenterPassesUnrelatedMessageThrough() {
         XCTAssertEqual(TrezorErrorPresenter.mapMessage("some unmapped detail"), "some unmapped detail")
     }
+
+    func testPresenterMapsPairingCodeFailureToInvalidPrompt() {
+        XCTAssertEqual(TrezorErrorPresenter.mapMessage("Code verification failed"), t("hardware__pairing_code_invalid"))
+    }
+
+    /// A message-signature verification error shares the "verification failed" phrasing but is not a
+    /// pairing failure, so it must fall through rather than showing the pairing-code prompt.
+    func testPresenterDoesNotMapMessageVerificationToPairingPrompt() {
+        let message = "Bitcoin message verification failed"
+        XCTAssertNotEqual(TrezorErrorPresenter.mapMessage(message), t("hardware__pairing_code_invalid"))
+        XCTAssertEqual(TrezorErrorPresenter.mapMessage(message), message)
+    }
 }