From 842ebd6e83980fc195335e6c04d39cffc52e4e1b Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Thu, 1 Mar 2018 05:43:45 +0100
Subject: [PATCH] src/apps/fido_u2f: show layout for bogus ids again

---
 src/apps/fido_u2f/__init__.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/apps/fido_u2f/__init__.py b/src/apps/fido_u2f/__init__.py
index 228f3ca4d..2d32e8de0 100644
--- a/src/apps/fido_u2f/__init__.py
+++ b/src/apps/fido_u2f/__init__.py
@@ -458,10 +458,22 @@ class ConfirmState:
     @ui.layout
     async def confirm_layout(self) -> None:
         from trezor.ui.confirm import ConfirmDialog, CONFIRMED
-
-        content = ConfirmContent(self.action, self.app_id)
-        dialog = ConfirmDialog(content, )
-        self.confirmed = await dialog == CONFIRMED
+        from trezor.ui.text import Text
+
+        if bytes(self.app_id) == _BOGUS_APPID:
+            text = Text(
+                'U2F mismatch', ui.ICON_WRONG,
+                'Another U2F device',
+                'was used to register',
+                'in this application.',
+                icon_color=ui.RED)
+            text.render()
+            await loop.sleep(3 * 1000 * 1000)
+            self.confirmed = True
+        else:
+            content = ConfirmContent(self.action, self.app_id)
+            dialog = ConfirmDialog(content, )
+            self.confirmed = await dialog == CONFIRMED
 
 
 class ConfirmContent(ui.Widget):