From 0535886e6cecda05e6176f7a132246ac4d153450 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 28 Sep 2021 13:31:18 +0300
Subject: [PATCH] use status.keycard

---
 src/app/keycard/core.nim |  5 +----
 src/app/keycard/view.nim | 10 ++++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/app/keycard/core.nim b/src/app/keycard/core.nim
index fdb6a060f7..a851ddf602 100644
--- a/src/app/keycard/core.nim
+++ b/src/app/keycard/core.nim
@@ -1,19 +1,16 @@
 import NimQml, chronicles, std/wrapnils
 import status/status
-import status/keycard as keycardlib
 import view
 
 type KeycardController* = ref object
   view*: KeycardView
   variant*: QVariant
   status: Status
-  keycard: KeycardModel
 
 proc newController*(status: Status): KeycardController =
   result = KeycardController()
   result.status = status
-  result.keycard = keycardlib.newKeycardModel()
-  result.view = newKeycardView(status, result.keycard)
+  result.view = newKeycardView(status)
   result.variant = newQVariant(result.view)
 
 proc delete*(self: KeycardController) =
diff --git a/src/app/keycard/view.nim b/src/app/keycard/view.nim
index ac11cd5dcb..c28b873be4 100644
--- a/src/app/keycard/view.nim
+++ b/src/app/keycard/view.nim
@@ -8,7 +8,6 @@ logScope:
 QtObject:
   type KeycardView* = ref object of QObject
     status*: Status
-    keycard: KeycardModel
 
   proc setup(self: KeycardView) =
     self.QObject.setup
@@ -16,10 +15,9 @@ QtObject:
   proc delete*(self: KeycardView) =
     self.QObject.delete
 
-  proc newKeycardView*(status: Status, keycard: KeycardModel): KeycardView =
+  proc newKeycardView*(status: Status): KeycardView =
     new(result, delete)
     result.status = status
-    result.keycard = keycard
     result.setup
 
   proc cardConnected*(self: KeycardView) {.signal.}
@@ -33,6 +31,6 @@ QtObject:
     self.cardConnected()
 
   proc testConnection*(self: KeycardView) {.slot.} =
-    info "Connecting Keycard ", msg = self.keycard.start()
-    info "Selecting applet ", msg = self.keycard.select()
-    info "Disconnecting Keycard ", msg = self.keycard.stop()
\ No newline at end of file
+    info "Connecting Keycard ", msg = self.status.keycard.start()
+    info "Selecting applet ", msg = self.status.keycard.select()
+    info "Disconnecting Keycard ", msg = self.status.keycard.stop()
\ No newline at end of file