From 83053e867e305c1a051caf91d1ce08f71a884eb1 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Mon, 3 May 2021 08:37:34 +0200
Subject: [PATCH] Add certificate list screens (#7)

* Blue color scheme.

* Add wallet viewer.

* Add pages.

* Add code prefetching.

* Set brightness.

* Add data model for certificate storage.

* Add list.
---
 DGCAWallet.xcodeproj/project.pbxproj          |  20 ++
 DGCAWallet/Components/WalletCell.swift        |  44 ++++
 DGCAWallet/Models/LocalData.swift             |  45 ++--
 DGCAWallet/Services/Brightness.swift          |  54 +++++
 .../Storyboards/Base.lproj/Main.storyboard    |  82 ++++++-
 .../Storyboards/CertificateViewer.storyboard  | 202 ++++++++++++------
 DGCAWallet/ViewControllers/CertCode.swift     |  43 ++++
 DGCAWallet/ViewControllers/CertPages.swift    | 102 +++++++++
 DGCAWallet/ViewControllers/CertTable.swift    |  61 ++++++
 .../ViewControllers/CertificateViewer.swift   |  32 +--
 DGCAWallet/ViewControllers/Home.swift         |   2 +
 DGCAWallet/ViewControllers/List.swift         |  93 +++++++-
 DGCAWallet/ViewControllers/Scan.swift         |  19 +-
 13 files changed, 653 insertions(+), 146 deletions(-)
 create mode 100644 DGCAWallet/Components/WalletCell.swift
 create mode 100644 DGCAWallet/Services/Brightness.swift
 create mode 100644 DGCAWallet/ViewControllers/CertCode.swift
 create mode 100644 DGCAWallet/ViewControllers/CertPages.swift
 create mode 100644 DGCAWallet/ViewControllers/CertTable.swift

diff --git a/DGCAWallet.xcodeproj/project.pbxproj b/DGCAWallet.xcodeproj/project.pbxproj
index 938f149..60e0541 100644
--- a/DGCAWallet.xcodeproj/project.pbxproj
+++ b/DGCAWallet.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
 		CE13CF23262DDF810070C80E /* RoundedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13CF22262DDF810070C80E /* RoundedButton.swift */; };
 		CE1D1EF6263597A2004C8919 /* LocalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1D1EF5263597A2004C8919 /* LocalData.swift */; };
 		CE1F155C2639F9E700736D48 /* SwiftyJSON in Frameworks */ = {isa = PBXBuildFile; productRef = CE1F155B2639F9E700736D48 /* SwiftyJSON */; };
+		CE260F56263DD1720083A200 /* WalletCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE260F55263DD1720083A200 /* WalletCell.swift */; };
 		CE37B643263867D700DEE13D /* SecureBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE37B642263867D700DEE13D /* SecureBackground.swift */; };
 		CE56B5052639F48E00FB31B1 /* SwiftDGC in Frameworks */ = {isa = PBXBuildFile; productRef = CE56B5042639F48E00FB31B1 /* SwiftDGC */; };
 		CE8096D9263B07BB00A65AD6 /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8096D8263B07BB00A65AD6 /* UIColor.swift */; };
@@ -33,6 +34,10 @@
 		CEA6D70E261F8D2900715333 /* DGCAWalletUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA6D70D261F8D2900715333 /* DGCAWalletUITests.swift */; };
 		CED2726026398683003D47A9 /* UIFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = CED2725F26398683003D47A9 /* UIFont.swift */; };
 		CED949CA263B50CE00883558 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = CED949C9263B50CE00883558 /* List.swift */; };
+		CEDABD40263C5FF4007A9B97 /* CertTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEDABD3F263C5FF4007A9B97 /* CertTable.swift */; };
+		CEDABD49263C70EF007A9B97 /* CertPages.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEDABD48263C70EF007A9B97 /* CertPages.swift */; };
+		CEE9DA55263C7D4000A31532 /* CertCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE9DA54263C7D4000A31532 /* CertCode.swift */; };
+		CEE9DA5D263C865200A31532 /* Brightness.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE9DA5C263C865200A31532 /* Brightness.swift */; };
 		CEFAD87F262714C4009AFEF9 /* EHNTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEFAD87E262714C4009AFEF9 /* EHNTests.swift */; };
 /* End PBXBuildFile section */
 
@@ -59,6 +64,7 @@
 		CE13CF0E262DD0D80070C80E /* FullFloatingPanelLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullFloatingPanelLayout.swift; sourceTree = "<group>"; };
 		CE13CF22262DDF810070C80E /* RoundedButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundedButton.swift; sourceTree = "<group>"; };
 		CE1D1EF5263597A2004C8919 /* LocalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalData.swift; sourceTree = "<group>"; };
+		CE260F55263DD1720083A200 /* WalletCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletCell.swift; sourceTree = "<group>"; };
 		CE37B642263867D700DEE13D /* SecureBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackground.swift; sourceTree = "<group>"; };
 		CE8096D8263B07BB00A65AD6 /* UIColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColor.swift; sourceTree = "<group>"; };
 		CE891304263581D900CB92AF /* Home.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Home.swift; sourceTree = "<group>"; };
@@ -82,8 +88,12 @@
 		CEA6D70F261F8D2900715333 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CED2725F26398683003D47A9 /* UIFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIFont.swift; sourceTree = "<group>"; };
 		CED949C9263B50CE00883558 /* List.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		CEDABD3F263C5FF4007A9B97 /* CertTable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CertTable.swift; sourceTree = "<group>"; };
+		CEDABD48263C70EF007A9B97 /* CertPages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CertPages.swift; sourceTree = "<group>"; };
 		CEDCA7972639E6E700FCB83E /* SwiftDGC */ = {isa = PBXFileReference; lastKnownFileType = folder; name = SwiftDGC; path = "../dgca-app-core-ios"; sourceTree = "<group>"; };
 		CEDCA79B2639E77800FCB83E /* Package.resolved */ = {isa = PBXFileReference; lastKnownFileType = text; name = Package.resolved; path = DGCAWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved; sourceTree = SOURCE_ROOT; };
+		CEE9DA54263C7D4000A31532 /* CertCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CertCode.swift; sourceTree = "<group>"; };
+		CEE9DA5C263C865200A31532 /* Brightness.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Brightness.swift; sourceTree = "<group>"; };
 		CEFAD87E262714C4009AFEF9 /* EHNTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EHNTests.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -130,6 +140,7 @@
 			isa = PBXGroup;
 			children = (
 				CE37B642263867D700DEE13D /* SecureBackground.swift */,
+				CEE9DA5C263C865200A31532 /* Brightness.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -149,7 +160,10 @@
 				CE13CF09262DCDDA0070C80E /* CertificateViewer.swift */,
 				CED949C9263B50CE00883558 /* List.swift */,
 				CEA6D6EF261F8D2700715333 /* Scan.swift */,
+				CEE9DA54263C7D4000A31532 /* CertCode.swift */,
 				CE891304263581D900CB92AF /* Home.swift */,
+				CEDABD48263C70EF007A9B97 /* CertPages.swift */,
+				CEDABD3F263C5FF4007A9B97 /* CertTable.swift */,
 			);
 			path = ViewControllers;
 			sourceTree = "<group>";
@@ -159,6 +173,7 @@
 			children = (
 				CE13CF0E262DD0D80070C80E /* FullFloatingPanelLayout.swift */,
 				CE13CF22262DDF810070C80E /* RoundedButton.swift */,
+				CE260F55263DD1720083A200 /* WalletCell.swift */,
 				CEA1556A262F784E0024B7AC /* SelfSizedTableView.swift */,
 				CEA1556F262F79DE0024B7AC /* InfoCell.swift */,
 			);
@@ -399,19 +414,24 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CEE9DA5D263C865200A31532 /* Brightness.swift in Sources */,
 				CE13CF0A262DCDDA0070C80E /* CertificateViewer.swift in Sources */,
+				CEDABD40263C5FF4007A9B97 /* CertTable.swift in Sources */,
 				CE37B643263867D700DEE13D /* SecureBackground.swift in Sources */,
 				CE13CF0F262DD0D80070C80E /* FullFloatingPanelLayout.swift in Sources */,
 				CEA1556B262F784E0024B7AC /* SelfSizedTableView.swift in Sources */,
 				CE8096D9263B07BB00A65AD6 /* UIColor.swift in Sources */,
+				CEDABD49263C70EF007A9B97 /* CertPages.swift in Sources */,
 				CE1D1EF6263597A2004C8919 /* LocalData.swift in Sources */,
 				CED2726026398683003D47A9 /* UIFont.swift in Sources */,
+				CEE9DA55263C7D4000A31532 /* CertCode.swift in Sources */,
 				CEA1555D262F63B30024B7AC /* EuDgcSchema.swift in Sources */,
 				CEA6D6F0261F8D2700715333 /* Scan.swift in Sources */,
 				CE13CF23262DDF810070C80E /* RoundedButton.swift in Sources */,
 				CEA6D6EC261F8D2700715333 /* AppDelegate.swift in Sources */,
 				CE891305263581D900CB92AF /* Home.swift in Sources */,
 				CEA15563262F6DAB0024B7AC /* CertViewerDelegate.swift in Sources */,
+				CE260F56263DD1720083A200 /* WalletCell.swift in Sources */,
 				CEA15570262F79DE0024B7AC /* InfoCell.swift in Sources */,
 				CED949CA263B50CE00883558 /* List.swift in Sources */,
 				CEA6D6EE261F8D2700715333 /* SceneDelegate.swift in Sources */,
diff --git a/DGCAWallet/Components/WalletCell.swift b/DGCAWallet/Components/WalletCell.swift
new file mode 100644
index 0000000..cd45f28
--- /dev/null
+++ b/DGCAWallet/Components/WalletCell.swift
@@ -0,0 +1,44 @@
+/*-
+ * ---license-start
+ * eu-digital-green-certificates / dgca-wallet-app-ios
+ * ---
+ * Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ * ---
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ---license-end
+ */
+//
+//  InfoCell.swift
+//  DGCAWallet
+//
+//  Created by Yannick Spreen on 4/20/21.
+//
+
+import UIKit
+import SwiftDGC
+
+class WalletCell: UITableViewCell {
+  @IBOutlet weak var typeLabel: UILabel!
+  @IBOutlet weak var nameLabel: UILabel!
+  @IBOutlet weak var dateLabel: UILabel!
+
+  func draw(_ dated: DatedCertString) {
+    guard let cert = dated.cert else {
+      return
+    }
+
+    typeLabel.text = cert.certTypeString
+    nameLabel.text = cert.fullName
+    dateLabel.text = "scanned \(dated.date.dateString)"
+  }
+}
diff --git a/DGCAWallet/Models/LocalData.swift b/DGCAWallet/Models/LocalData.swift
index 218f556..eb8d9dc 100644
--- a/DGCAWallet/Models/LocalData.swift
+++ b/DGCAWallet/Models/LocalData.swift
@@ -29,36 +29,28 @@
 import Foundation
 import SwiftDGC
 
-struct LocalData: Codable {
-  static var sharedInstance = LocalData()
-
-  var encodedPublicKeys = [String: String]()
-  var resumeToken: String?
-  var lastFetch_: Date?
-  var lastFetch: Date {
-    get {
-      lastFetch_ ?? .init(timeIntervalSince1970: 0)
-    }
-    set(v) {
-      lastFetch_ = v
-    }
+struct DatedCertString: Codable {
+  var date: Date
+  var certString: String
+  var cert: HCert? {
+    HCert(from: certString)
   }
+}
 
-  mutating func add(encodedPublicKey: String) {
-    let kid = KID.from(encodedPublicKey)
-    let kidStr = KID.string(from: kid)
-
-    encodedPublicKeys[kidStr] = encodedPublicKey
-  }
+struct LocalData: Codable {
+  static var sharedInstance = LocalData()
 
-  static func set(resumeToken: String) {
-    sharedInstance.resumeToken = resumeToken
-  }
+  var certStrings = [DatedCertString]()
 
   public func save() {
     Self.storage.save(self)
   }
 
+  public static func add(_ cert: HCert) {
+    sharedInstance.certStrings.append(.init(date: Date(), certString: cert.payloadString))
+    sharedInstance.save()
+  }
+
   static let storage = SecureStorage<LocalData>()
 
   static func initialize(completion: @escaping () -> Void) {
@@ -66,16 +58,9 @@ struct LocalData: Codable {
       guard let result = success else {
         return
       }
-      print("\(result.encodedPublicKeys.count) certs loaded.")
+      print("\(result.certStrings.count) certs loaded.")
       LocalData.sharedInstance = result
       completion()
     }
-    HCert.publicKeyStorageDelegate = LocalDataDelegate()
-  }
-}
-
-struct LocalDataDelegate: PublicKeyStorageDelegate {
-  func getEncodedPublicKey(for kidStr: String) -> String? {
-    LocalData.sharedInstance.encodedPublicKeys[kidStr]
   }
 }
diff --git a/DGCAWallet/Services/Brightness.swift b/DGCAWallet/Services/Brightness.swift
new file mode 100644
index 0000000..be041d2
--- /dev/null
+++ b/DGCAWallet/Services/Brightness.swift
@@ -0,0 +1,54 @@
+//
+/*-
+ * ---license-start
+ * eu-digital-green-certificates / dgca-wallet-app-ios
+ * ---
+ * Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ * ---
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ---license-end
+ */
+//  
+//  Brightness.swift
+//  DGCAWallet
+//  
+//  Created by Yannick Spreen on 4/30/21.
+//  
+        
+
+import Foundation
+import UIKit
+
+struct Brightness {
+  static var fallback: CGFloat?
+
+  static func setTo(_ val: CGFloat) {
+    UIScreen.main.brightness = val
+  }
+
+  public static func forceFull() {
+    if fallback != nil {
+      return
+    }
+    fallback = UIScreen.main.brightness
+    setTo(1.0)
+  }
+
+  public static func reset() {
+    guard let val = fallback else {
+      return
+    }
+    fallback = nil
+    setTo(val)
+  }
+}
diff --git a/DGCAWallet/Storyboards/Base.lproj/Main.storyboard b/DGCAWallet/Storyboards/Base.lproj/Main.storyboard
index 2c1a764..d7e93d0 100644
--- a/DGCAWallet/Storyboards/Base.lproj/Main.storyboard
+++ b/DGCAWallet/Storyboards/Base.lproj/Main.storyboard
@@ -113,9 +113,14 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cE2-eV-IV4">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="130.5"/>
+                                <color key="backgroundColor" name="blue"/>
+                            </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MID-ne-Jur" customClass="RoundedButton" customModule="DGCAWallet" customModuleProvider="target">
-                                <rect key="frame" x="157.5" y="804" width="99" height="42"/>
+                                <rect key="frame" x="149.5" y="800" width="115" height="46"/>
                                 <color key="backgroundColor" name="green"/>
+                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
                                 <state key="normal" title="Scan Code">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
@@ -128,34 +133,95 @@
                                     <action selector="scanNewCert" destination="BcE-gA-Tuj" eventType="touchUpInside" id="2VM-Sl-2XM"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Here Be Certs" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JQk-K9-Yz6">
-                                <rect key="frame" x="78" y="200" width="107" height="21"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Certificate Wallet" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q38-2s-CMN">
+                                <rect key="frame" x="16" y="76" width="382" height="38.5"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="32"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="emV-oh-VSt">
+                                <rect key="frame" x="0.0" y="130.5" width="414" height="653.5"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="walletCell" rowHeight="164" id="JcT-Kw-bMh" customClass="WalletCell" customModule="DGCAWallet" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="28" width="414" height="164"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JcT-Kw-bMh" id="m3f-OR-BSb">
+                                            <rect key="frame" x="0.0" y="0.0" width="383" height="164"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Vaccination Shot 1 of 2" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Md0-O5-XZH">
+                                                    <rect key="frame" x="20" y="27" width="355" height="29"/>
+                                                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="24"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Max Mustermann" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6NN-i3-YUv">
+                                                    <rect key="frame" x="20" y="72" width="220" height="65"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="scanned 2021-04-01" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="APa-yy-a1r">
+                                                    <rect key="frame" x="256" y="122" width="119" height="15"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="APa-yy-a1r" firstAttribute="leading" secondItem="6NN-i3-YUv" secondAttribute="trailing" constant="16" id="5pY-rs-i85"/>
+                                                <constraint firstItem="6NN-i3-YUv" firstAttribute="top" secondItem="Md0-O5-XZH" secondAttribute="bottom" constant="16" id="G7X-Kg-G9n"/>
+                                                <constraint firstItem="Md0-O5-XZH" firstAttribute="leading" secondItem="m3f-OR-BSb" secondAttribute="leadingMargin" id="RIv-q4-GJN"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="Md0-O5-XZH" secondAttribute="trailing" id="UC5-Se-Y5x"/>
+                                                <constraint firstItem="Md0-O5-XZH" firstAttribute="top" secondItem="m3f-OR-BSb" secondAttribute="topMargin" constant="16" id="c5q-qS-b9t"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="APa-yy-a1r" secondAttribute="trailing" id="gtM-xa-4f4"/>
+                                                <constraint firstItem="6NN-i3-YUv" firstAttribute="bottom" secondItem="m3f-OR-BSb" secondAttribute="bottomMargin" constant="-16" id="hrz-Gp-N7H"/>
+                                                <constraint firstItem="APa-yy-a1r" firstAttribute="bottom" secondItem="m3f-OR-BSb" secondAttribute="bottomMargin" constant="-16" id="kme-C0-ptJ"/>
+                                                <constraint firstItem="6NN-i3-YUv" firstAttribute="leading" secondItem="m3f-OR-BSb" secondAttribute="leadingMargin" id="sBt-6B-WYJ"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="dateLabel" destination="APa-yy-a1r" id="hq8-y8-eho"/>
+                                            <outlet property="nameLabel" destination="6NN-i3-YUv" id="IDI-aQ-bij"/>
+                                            <outlet property="typeLabel" destination="Md0-O5-XZH" id="qRx-qH-fi6"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                            </tableView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="uNl-GU-yxp"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
+                            <constraint firstItem="uNl-GU-yxp" firstAttribute="trailing" secondItem="emV-oh-VSt" secondAttribute="trailing" id="8WI-H8-cdQ"/>
+                            <constraint firstItem="cE2-eV-IV4" firstAttribute="leading" secondItem="UFr-2P-Rlu" secondAttribute="leading" id="9cu-kA-qbU"/>
+                            <constraint firstItem="cE2-eV-IV4" firstAttribute="bottom" secondItem="Q38-2s-CMN" secondAttribute="bottom" constant="16" id="Dl1-7l-S6E"/>
+                            <constraint firstAttribute="trailing" secondItem="cE2-eV-IV4" secondAttribute="trailing" id="E40-ov-fjJ"/>
+                            <constraint firstItem="Q38-2s-CMN" firstAttribute="leading" secondItem="uNl-GU-yxp" secondAttribute="leading" constant="16" id="KNg-EC-1F1"/>
+                            <constraint firstItem="MID-ne-Jur" firstAttribute="top" secondItem="emV-oh-VSt" secondAttribute="bottom" constant="16" id="bin-s2-AUs"/>
+                            <constraint firstItem="emV-oh-VSt" firstAttribute="top" secondItem="cE2-eV-IV4" secondAttribute="bottom" id="c0G-cv-PAJ"/>
+                            <constraint firstItem="uNl-GU-yxp" firstAttribute="trailing" secondItem="Q38-2s-CMN" secondAttribute="trailing" constant="16" id="eKt-6C-cJa"/>
+                            <constraint firstItem="Q38-2s-CMN" firstAttribute="top" secondItem="uNl-GU-yxp" secondAttribute="top" constant="32" id="oUg-uk-l2G"/>
+                            <constraint firstItem="emV-oh-VSt" firstAttribute="leading" secondItem="uNl-GU-yxp" secondAttribute="leading" id="pKd-uN-jev"/>
                             <constraint firstItem="uNl-GU-yxp" firstAttribute="bottom" secondItem="MID-ne-Jur" secondAttribute="bottom" constant="16" id="pf2-H3-Vdw"/>
                             <constraint firstItem="MID-ne-Jur" firstAttribute="centerX" secondItem="UFr-2P-Rlu" secondAttribute="centerX" id="uZx-Wx-iCQ"/>
+                            <constraint firstItem="cE2-eV-IV4" firstAttribute="top" secondItem="UFr-2P-Rlu" secondAttribute="top" id="zLe-s2-K2y"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="K7b-oY-EUm"/>
                     <connections>
+                        <outlet property="table" destination="emV-oh-VSt" id="afK-OZ-s2d"/>
                         <segue destination="BYZ-38-t0r" kind="show" identifier="scanner" id="4aa-0o-E6T"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="nMj-BI-krI" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="183" y="106"/>
+            <point key="canvasLocation" x="182.60869565217394" y="105.80357142857143"/>
         </scene>
     </scenes>
     <designables>
         <designable name="MID-ne-Jur">
-            <size key="intrinsicContentSize" width="99" height="42"/>
+            <size key="intrinsicContentSize" width="115" height="46"/>
         </designable>
     </designables>
     <resources>
diff --git a/DGCAWallet/Storyboards/CertificateViewer.storyboard b/DGCAWallet/Storyboards/CertificateViewer.storyboard
index 0c53937..b77990a 100644
--- a/DGCAWallet/Storyboards/CertificateViewer.storyboard
+++ b/DGCAWallet/Storyboards/CertificateViewer.storyboard
@@ -6,6 +6,7 @@
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -19,14 +20,14 @@
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fKu-7E-jAI">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="169.33333333333334"/>
-                                <color key="backgroundColor" name="darkGrey"/>
+                                <color key="backgroundColor" name="blue"/>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yEe-AH-rsr" userLabel="Container">
                                 <rect key="frame" x="0.0" y="44" width="375" height="734"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a9u-Ia-KEX" customClass="RoundedButton" customModule="DGCAWallet" customModuleProvider="target">
                                         <rect key="frame" x="148.66666666666666" y="627" width="78" height="51"/>
-                                        <color key="backgroundColor" name="darkGrey"/>
+                                        <color key="backgroundColor" name="blue"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
                                         <state key="normal" title="Done">
                                             <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -55,100 +56,53 @@
                                         </segments>
                                         <color key="selectedSegmentTintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </segmentedControl>
-                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" contentInsetAdjustmentBehavior="never" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="NIJ-V3-NpL">
-                                        <rect key="frame" x="0.0" y="125.33333333333334" width="375" height="497.66666666666663"/>
-                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <prototypes>
-                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="infoCell" rowHeight="147" id="C3K-o8-BC5" customClass="InfoCell" customModule="DGCAWallet" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="28" width="375" height="147"/>
-                                                <autoresizingMask key="autoresizingMask"/>
-                                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="C3K-o8-BC5" id="Xhy-8E-hY4">
-                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="147"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="DE4382974329" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbw-zt-5Bq">
-                                                            <rect key="frame" x="16" y="108.66666666666667" width="343" height="38.333333333333329"/>
-                                                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="32"/>
-                                                            <color key="textColor" name="black"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identification Number" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1YP-3x-Q7c">
-                                                            <rect key="frame" x="16" y="16" width="343" height="88.666666666666671"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                                            <color key="textColor" name="black"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                    </subviews>
-                                                    <constraints>
-                                                        <constraint firstAttribute="bottom" secondItem="dbw-zt-5Bq" secondAttribute="bottom" id="6RB-eC-VdG"/>
-                                                        <constraint firstItem="1YP-3x-Q7c" firstAttribute="top" secondItem="Xhy-8E-hY4" secondAttribute="top" constant="16" id="Gqz-1L-Yoj"/>
-                                                        <constraint firstItem="dbw-zt-5Bq" firstAttribute="leading" secondItem="Xhy-8E-hY4" secondAttribute="leading" constant="16" id="HXP-rX-faJ"/>
-                                                        <constraint firstItem="dbw-zt-5Bq" firstAttribute="top" secondItem="1YP-3x-Q7c" secondAttribute="bottom" constant="4" id="Uwv-ga-rrc"/>
-                                                        <constraint firstAttribute="trailing" secondItem="1YP-3x-Q7c" secondAttribute="trailing" constant="16" id="WR1-qN-UTj"/>
-                                                        <constraint firstItem="1YP-3x-Q7c" firstAttribute="leading" secondItem="Xhy-8E-hY4" secondAttribute="leading" constant="16" id="YeC-zN-X9H"/>
-                                                        <constraint firstItem="dbw-zt-5Bq" firstAttribute="trailing" secondItem="Xhy-8E-hY4" secondAttribute="trailing" constant="-16" id="iKh-7R-Lby"/>
-                                                    </constraints>
-                                                </tableViewCellContentView>
-                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                <connections>
-                                                    <outlet property="contentLabel" destination="dbw-zt-5Bq" id="yhn-zI-ier"/>
-                                                    <outlet property="headerLabel" destination="1YP-3x-Q7c" id="59L-gm-Xxz"/>
-                                                </connections>
-                                            </tableViewCell>
-                                        </prototypes>
-                                    </tableView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="main_eu_logo" translatesAutoresizingMaskIntoConstraints="NO" id="hui-fP-OUM">
                                         <rect key="frame" x="16" y="694" width="343" height="40"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="40" id="N2f-XP-S4e"/>
                                         </constraints>
                                     </imageView>
-                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="gradient" translatesAutoresizingMaskIntoConstraints="NO" id="Enm-XG-fIc">
-                                        <rect key="frame" x="0.0" y="591" width="375" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="32" id="1kc-qQ-0OX"/>
-                                        </constraints>
-                                    </imageView>
+                                    <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dsC-7e-Skh">
+                                        <rect key="frame" x="0.0" y="125.33333333333334" width="375" height="497.66666666666663"/>
+                                        <connections>
+                                            <segue destination="PGK-qk-zXH" kind="embed" id="qHl-nM-9kf"/>
+                                        </connections>
+                                    </containerView>
                                 </subviews>
                                 <constraints>
                                     <constraint firstAttribute="trailing" secondItem="9hO-yQ-B4J" secondAttribute="trailing" constant="16" id="1gH-1K-TaY"/>
                                     <constraint firstItem="DVW-2y-e4I" firstAttribute="top" secondItem="yEe-AH-rsr" secondAttribute="top" constant="32" id="6Py-fR-Th3"/>
                                     <constraint firstAttribute="trailing" secondItem="DVW-2y-e4I" secondAttribute="trailing" constant="16" id="7qh-Db-iAm"/>
                                     <constraint firstAttribute="trailing" secondItem="hui-fP-OUM" secondAttribute="trailing" constant="16" id="AAA-qP-qNW"/>
-                                    <constraint firstItem="NIJ-V3-NpL" firstAttribute="top" secondItem="9hO-yQ-B4J" secondAttribute="bottom" constant="16" id="GFZ-yy-x5z"/>
-                                    <constraint firstItem="Enm-XG-fIc" firstAttribute="bottom" secondItem="NIJ-V3-NpL" secondAttribute="bottom" id="NWZ-cm-Psu"/>
-                                    <constraint firstItem="NIJ-V3-NpL" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" id="SsD-py-p7P"/>
+                                    <constraint firstItem="dsC-7e-Skh" firstAttribute="top" secondItem="9hO-yQ-B4J" secondAttribute="bottom" constant="16" id="B3L-6A-LB6"/>
                                     <constraint firstItem="hui-fP-OUM" firstAttribute="top" secondItem="a9u-Ia-KEX" secondAttribute="bottom" constant="16" id="Tch-gr-75v"/>
                                     <constraint firstAttribute="bottom" secondItem="hui-fP-OUM" secondAttribute="bottom" id="ZUd-50-Uxg"/>
                                     <constraint firstItem="9hO-yQ-B4J" firstAttribute="top" secondItem="DVW-2y-e4I" secondAttribute="bottom" constant="8" id="Ze2-GE-hdA"/>
-                                    <constraint firstAttribute="trailing" secondItem="NIJ-V3-NpL" secondAttribute="trailing" id="bMe-Iq-2qV"/>
+                                    <constraint firstAttribute="trailing" secondItem="dsC-7e-Skh" secondAttribute="trailing" id="csD-4w-284"/>
+                                    <constraint firstItem="dsC-7e-Skh" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" id="fGR-NQ-ao6"/>
                                     <constraint firstItem="DVW-2y-e4I" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="iQB-29-cRZ"/>
                                     <constraint firstItem="a9u-Ia-KEX" firstAttribute="centerX" secondItem="yEe-AH-rsr" secondAttribute="centerX" id="j6y-x9-na3"/>
-                                    <constraint firstItem="Enm-XG-fIc" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" id="lRw-rQ-ghB"/>
+                                    <constraint firstItem="a9u-Ia-KEX" firstAttribute="top" secondItem="dsC-7e-Skh" secondAttribute="bottom" constant="4" id="kyo-Ax-A3w"/>
                                     <constraint firstItem="9hO-yQ-B4J" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="mYn-Jw-TYN"/>
                                     <constraint firstItem="hui-fP-OUM" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="n5N-1z-2iN"/>
-                                    <constraint firstAttribute="trailing" secondItem="Enm-XG-fIc" secondAttribute="trailing" id="pfk-p7-CvN"/>
-                                    <constraint firstItem="a9u-Ia-KEX" firstAttribute="top" secondItem="NIJ-V3-NpL" secondAttribute="bottom" constant="4" id="wZx-rx-Vmt"/>
                                 </constraints>
                             </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="ghT-Ae-92i"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="fKu-7E-jAI" firstAttribute="bottom" secondItem="NIJ-V3-NpL" secondAttribute="top" id="36H-da-mo3"/>
                             <constraint firstAttribute="trailing" secondItem="yEe-AH-rsr" secondAttribute="trailing" id="6hb-Qt-RV8"/>
                             <constraint firstItem="fKu-7E-jAI" firstAttribute="top" secondItem="Zct-pN-WQt" secondAttribute="top" id="ArD-jJ-uNk"/>
                             <constraint firstAttribute="topMargin" secondItem="yEe-AH-rsr" secondAttribute="top" id="GhU-Hb-haJ"/>
                             <constraint firstItem="fKu-7E-jAI" firstAttribute="leading" secondItem="Zct-pN-WQt" secondAttribute="leading" id="KHE-SX-BoC"/>
                             <constraint firstAttribute="trailing" secondItem="fKu-7E-jAI" secondAttribute="trailing" id="LqF-m6-W1w"/>
                             <constraint firstItem="yEe-AH-rsr" firstAttribute="leading" secondItem="Zct-pN-WQt" secondAttribute="leading" id="LsU-48-7M6"/>
+                            <constraint firstItem="fKu-7E-jAI" firstAttribute="bottom" secondItem="9hO-yQ-B4J" secondAttribute="bottom" constant="16" id="UI9-1s-kb2"/>
                             <constraint firstAttribute="bottomMargin" secondItem="yEe-AH-rsr" secondAttribute="bottom" id="xEk-Du-C7N"/>
                         </constraints>
                     </view>
                     <connections>
                         <outlet property="dismissButton" destination="a9u-Ia-KEX" id="Jy0-Qx-2Y9"/>
-                        <outlet property="infoTable" destination="NIJ-V3-NpL" id="MVc-Gh-ijP"/>
                         <outlet property="nameLabel" destination="DVW-2y-e4I" id="cyN-o4-vZQ"/>
                         <outlet property="typeSegments" destination="9hO-yQ-B4J" id="ENI-Wn-8KC"/>
                     </connections>
@@ -157,6 +111,127 @@
             </objects>
             <point key="canvasLocation" x="136.80000000000001" y="117.48768472906404"/>
         </scene>
+        <!--Cert PagesVC-->
+        <scene sceneID="epa-ao-EQs">
+            <objects>
+                <pageViewController autoresizesArchivedViewToFullSize="NO" transitionStyle="scroll" navigationOrientation="horizontal" spineLocation="none" id="PGK-qk-zXH" customClass="CertPagesVC" customModule="DGCAWallet" customModuleProvider="target" sceneMemberID="viewController"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="IUQ-f6-kbe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1103" y="117"/>
+        </scene>
+        <!--Cert CodeVC-->
+        <scene sceneID="ua8-UZ-7hv">
+            <objects>
+                <viewController storyboardIdentifier="code" id="5hQ-ih-adI" customClass="CertCodeVC" customModule="DGCAWallet" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="nMP-53-s92">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="400"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7nr-IP-So2">
+                                <rect key="frame" x="16" y="60" width="343" height="324"/>
+                            </imageView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="9QX-BY-k3B"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="9QX-BY-k3B" firstAttribute="trailing" secondItem="7nr-IP-So2" secondAttribute="trailing" constant="16" id="2sf-yt-cft"/>
+                            <constraint firstItem="7nr-IP-So2" firstAttribute="top" secondItem="9QX-BY-k3B" secondAttribute="top" constant="16" id="QVn-Gj-8eG"/>
+                            <constraint firstItem="9QX-BY-k3B" firstAttribute="bottom" secondItem="7nr-IP-So2" secondAttribute="bottom" constant="16" id="bYc-8z-em3"/>
+                            <constraint firstItem="7nr-IP-So2" firstAttribute="leading" secondItem="9QX-BY-k3B" secondAttribute="leading" constant="16" id="iwZ-Mv-lE5"/>
+                        </constraints>
+                        <edgeInsets key="layoutMargins" top="0.0" left="20" bottom="0.0" right="20"/>
+                    </view>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <size key="freeformSize" width="375" height="400"/>
+                    <connections>
+                        <outlet property="imageView" destination="7nr-IP-So2" id="ADg-pj-TOL"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Fy6-pe-6cT" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-839" y="117"/>
+        </scene>
+        <!--Cert TableVC-->
+        <scene sceneID="zRW-4o-eiU">
+            <objects>
+                <viewController storyboardIdentifier="infoTable" id="Rtb-d3-6Ll" customClass="CertTableVC" customModule="DGCAWallet" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="yGn-qb-22J">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="400"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" contentInsetAdjustmentBehavior="never" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="TPx-cd-Djx">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="400"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="infoCell" rowHeight="147" id="0du-5w-c9P" customClass="InfoCell" customModule="DGCAWallet" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="147"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="0du-5w-c9P" id="Hk9-2h-FIE">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="147"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="DE4382974329" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gn8-3g-ntq">
+                                                    <rect key="frame" x="16" y="108.66666666666667" width="343" height="38.333333333333329"/>
+                                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="32"/>
+                                                    <color key="textColor" name="black"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identification Number" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bxm-hI-f1t">
+                                                    <rect key="frame" x="16" y="16" width="343" height="88.666666666666671"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                    <color key="textColor" name="black"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="gn8-3g-ntq" firstAttribute="top" secondItem="bxm-hI-f1t" secondAttribute="bottom" constant="4" id="4D3-Ty-4Ud"/>
+                                                <constraint firstAttribute="trailing" secondItem="bxm-hI-f1t" secondAttribute="trailing" constant="16" id="8R9-0q-GQH"/>
+                                                <constraint firstItem="bxm-hI-f1t" firstAttribute="leading" secondItem="Hk9-2h-FIE" secondAttribute="leading" constant="16" id="Ihe-up-uIJ"/>
+                                                <constraint firstItem="bxm-hI-f1t" firstAttribute="top" secondItem="Hk9-2h-FIE" secondAttribute="top" constant="16" id="VhD-Rd-lV9"/>
+                                                <constraint firstItem="gn8-3g-ntq" firstAttribute="leading" secondItem="Hk9-2h-FIE" secondAttribute="leading" constant="16" id="njw-tX-boE"/>
+                                                <constraint firstAttribute="bottom" secondItem="gn8-3g-ntq" secondAttribute="bottom" id="o6A-dF-SVL"/>
+                                                <constraint firstItem="gn8-3g-ntq" firstAttribute="trailing" secondItem="Hk9-2h-FIE" secondAttribute="trailing" constant="-16" id="tuf-BH-LkK"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <connections>
+                                            <outlet property="contentLabel" destination="gn8-3g-ntq" id="9Pg-s9-eCW"/>
+                                            <outlet property="headerLabel" destination="bxm-hI-f1t" id="Kul-aU-86r"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                            </tableView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="gradient" translatesAutoresizingMaskIntoConstraints="NO" id="8HZ-m0-XR3">
+                                <rect key="frame" x="0.0" y="368" width="375" height="32"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="32" id="Ide-Dz-DW1"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="pSE-pl-RlJ"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="TPx-cd-Djx" secondAttribute="bottom" id="X51-03-Pbm"/>
+                            <constraint firstAttribute="trailing" secondItem="TPx-cd-Djx" secondAttribute="trailing" id="Zr6-C4-Orm"/>
+                            <constraint firstItem="TPx-cd-Djx" firstAttribute="leading" secondItem="yGn-qb-22J" secondAttribute="leading" id="g0g-xO-fT6"/>
+                            <constraint firstItem="TPx-cd-Djx" firstAttribute="top" secondItem="yGn-qb-22J" secondAttribute="top" id="hOl-eX-xSv"/>
+                            <constraint firstItem="8HZ-m0-XR3" firstAttribute="bottom" secondItem="TPx-cd-Djx" secondAttribute="bottom" id="hp6-B1-6LW"/>
+                            <constraint firstItem="pSE-pl-RlJ" firstAttribute="trailing" secondItem="8HZ-m0-XR3" secondAttribute="trailing" id="sAZ-Kz-1xL"/>
+                            <constraint firstItem="8HZ-m0-XR3" firstAttribute="leading" secondItem="yGn-qb-22J" secondAttribute="leading" id="u8J-bS-f0h"/>
+                        </constraints>
+                        <edgeInsets key="layoutMargins" top="0.0" left="20" bottom="0.0" right="20"/>
+                    </view>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <size key="freeformSize" width="375" height="400"/>
+                    <connections>
+                        <outlet property="table" destination="TPx-cd-Djx" id="Egu-3C-be5"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="RPx-uO-wbp" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-839" y="-289"/>
+        </scene>
     </scenes>
     <designables>
         <designable name="a9u-Ia-KEX">
@@ -169,8 +244,11 @@
         <namedColor name="black">
             <color red="0.25099998712539673" green="0.25099998712539673" blue="0.25099998712539673" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
-        <namedColor name="darkGrey">
-            <color red="0.25098039215686274" green="0.25098039215686274" blue="0.25098039215686274" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        <namedColor name="blue">
+            <color red="0.0" green="0.2669999897480011" blue="0.57999998331069946" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/DGCAWallet/ViewControllers/CertCode.swift b/DGCAWallet/ViewControllers/CertCode.swift
new file mode 100644
index 0000000..dc31816
--- /dev/null
+++ b/DGCAWallet/ViewControllers/CertCode.swift
@@ -0,0 +1,43 @@
+//
+/*-
+ * ---license-start
+ * eu-digital-green-certificates / dgca-wallet-app-ios
+ * ---
+ * Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ * ---
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ---license-end
+ */
+//  
+//  CertTable.swift
+//  DGCAWallet
+//  
+//  Created by Yannick Spreen on 4/30/21.
+//  
+
+import SwiftDGC
+import UIKit
+
+class CertCodeVC: UIViewController {
+  @IBOutlet weak var imageView: UIImageView!
+
+  var hCert: HCert! {
+    (parent as? CertPagesVC)?.embeddingVC.hCert
+  }
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    imageView.image = hCert.qrCode
+  }
+}
diff --git a/DGCAWallet/ViewControllers/CertPages.swift b/DGCAWallet/ViewControllers/CertPages.swift
new file mode 100644
index 0000000..ff8274b
--- /dev/null
+++ b/DGCAWallet/ViewControllers/CertPages.swift
@@ -0,0 +1,102 @@
+//
+/*-
+ * ---license-start
+ * eu-digital-green-certificates / dgca-wallet-app-ios
+ * ---
+ * Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ * ---
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ---license-end
+ */
+//  
+//  CertPages.swift
+//  DGCAWallet
+//  
+//  Created by Yannick Spreen on 4/30/21.
+//  
+        
+
+import UIKit
+
+class CertPagesVC: UIPageViewController {
+  weak var embeddingVC: CertificateViewerVC!
+
+  var index = 0
+  let vcs: [UIViewController] = [
+    UIStoryboard(name: "CertificateViewer", bundle: .main).instantiateViewController(withIdentifier: "infoTable"),
+    UIStoryboard(name: "CertificateViewer", bundle: .main).instantiateViewController(withIdentifier: "code"),
+  ]
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    self.dataSource = self
+    self.delegate = self
+    setViewControllers([vcs[0]], direction: .forward, animated: false)
+    let appearance = UIPageControl.appearance(whenContainedInInstancesOf: [UIPageViewController.self])
+    appearance.pageIndicatorTintColor = UIColor.disabledText
+    appearance.currentPageIndicatorTintColor = UIColor.black
+  }
+
+  override func viewDidAppear(_ animated: Bool) {
+    super.viewDidAppear(animated)
+
+    setBrightness()
+  }
+
+  func setBrightness() {
+    if index == 1 {
+      Brightness.forceFull()
+    } else {
+      Brightness.reset()
+    }
+  }
+}
+
+extension CertPagesVC: UIPageViewControllerDataSource {
+  func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
+    let index = vcs.firstIndex(of: viewController) ?? 0
+    return index == 0 ? nil : vcs[index - 1]
+  }
+
+  func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
+    let index = vcs.firstIndex(of: viewController) ?? vcs.count - 1
+    return index == vcs.count - 1 ? nil : vcs[index + 1]
+  }
+
+  func presentationCount(for pageViewController: UIPageViewController) -> Int {
+    vcs.count
+  }
+
+  func presentationIndex(for pageViewController: UIPageViewController) -> Int {
+    index
+  }
+}
+
+extension CertPagesVC: UIPageViewControllerDelegate {
+  func pageViewController(
+    _ pageViewController: UIPageViewController,
+    didFinishAnimating finished: Bool,
+    previousViewControllers: [UIViewController],
+    transitionCompleted completed: Bool
+  ) {
+    guard
+      completed,
+      let vc = pageViewController.viewControllers?.first
+    else {
+      return
+    }
+    index = vcs.firstIndex(of: vc) ?? 0
+    setBrightness()
+  }
+}
diff --git a/DGCAWallet/ViewControllers/CertTable.swift b/DGCAWallet/ViewControllers/CertTable.swift
new file mode 100644
index 0000000..b8ca1c4
--- /dev/null
+++ b/DGCAWallet/ViewControllers/CertTable.swift
@@ -0,0 +1,61 @@
+//
+/*-
+ * ---license-start
+ * eu-digital-green-certificates / dgca-wallet-app-ios
+ * ---
+ * Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ * ---
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ---license-end
+ */
+//  
+//  CertTable.swift
+//  DGCAWallet
+//  
+//  Created by Yannick Spreen on 4/30/21.
+//  
+        
+import SwiftDGC
+import UIKit
+
+class CertTableVC: UIViewController {
+  @IBOutlet weak var table: UITableView!
+
+  var hCert: HCert! {
+    (parent as? CertPagesVC)?.embeddingVC.hCert
+  }
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    table.dataSource = self
+    table.contentInset = .init(top: 0, left: 0, bottom: 32, right: 0)
+    table.reloadData()
+  }
+}
+
+
+extension CertTableVC: UITableViewDataSource {
+  func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    return hCert.info.count
+  }
+
+  func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    let base = tableView.dequeueReusableCell(withIdentifier: "infoCell", for: indexPath)
+    guard let cell = base as? InfoCell else {
+      return base
+    }
+    cell.draw(hCert.info[indexPath.row])
+    return cell
+  }
+}
diff --git a/DGCAWallet/ViewControllers/CertificateViewer.swift b/DGCAWallet/ViewControllers/CertificateViewer.swift
index ebc9e24..753caba 100644
--- a/DGCAWallet/ViewControllers/CertificateViewer.swift
+++ b/DGCAWallet/ViewControllers/CertificateViewer.swift
@@ -32,20 +32,13 @@ import SwiftDGC
 class CertificateViewerVC: UIViewController {
   @IBOutlet weak var nameLabel: UILabel!
   @IBOutlet weak var typeSegments: UISegmentedControl!
-  @IBOutlet weak var infoTable: UITableView!
   @IBOutlet weak var dismissButton: UIButton!
 
-  var hCert: HCert! {
-    didSet {
-      self.draw()
-    }
-  }
-
+  var hCert: HCert!
   var childDismissedDelegate: CertViewerDelegate?
 
   func draw() {
     nameLabel.text = hCert.fullName
-    infoTable.reloadData()
     typeSegments.selectedSegmentIndex = [
       HCertType.test,
       HCertType.vaccine,
@@ -55,16 +48,13 @@ class CertificateViewerVC: UIViewController {
 
   override func viewDidLoad() {
     super.viewDidLoad()
+
     // selected option color
     typeSegments.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.black!], for: .selected)
     // color of other options
     typeSegments.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.disabledText!], for: .normal)
     typeSegments.backgroundColor = UIColor(white: 1.0, alpha: 0.06)
-
-    infoTable.dataSource = self
-    infoTable.contentInset = .init(top: 0, left: 0, bottom: 32, right: 0)
-
-    return
+    draw()
   }
 
   override func viewDidAppear(_ animated: Bool) {
@@ -76,6 +66,7 @@ class CertificateViewerVC: UIViewController {
   override func viewDidDisappear(_ animated: Bool) {
     super.viewDidDisappear(animated)
 
+    Brightness.reset()
     childDismissedDelegate?.childDismissed()
   }
 
@@ -83,19 +74,10 @@ class CertificateViewerVC: UIViewController {
   func closeButton() {
     dismiss(animated: true, completion: nil)
   }
-}
-
-extension CertificateViewerVC: UITableViewDataSource {
-  func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-    return hCert.info.count
-  }
 
-  func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-    let base = tableView.dequeueReusableCell(withIdentifier: "infoCell", for: indexPath)
-    guard let cell = base as? InfoCell else {
-      return base
+  override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+    if let child = segue.destination as? CertPagesVC {
+      child.embeddingVC = self
     }
-    cell.draw(hCert.info[indexPath.row])
-    return cell
   }
 }
diff --git a/DGCAWallet/ViewControllers/Home.swift b/DGCAWallet/ViewControllers/Home.swift
index 3f3def7..7101388 100644
--- a/DGCAWallet/ViewControllers/Home.swift
+++ b/DGCAWallet/ViewControllers/Home.swift
@@ -28,11 +28,13 @@
 
 import Foundation
 import UIKit
+import SwiftDGC
 
 class HomeVC: UIViewController {
   override func viewDidAppear(_ animated: Bool) {
     super.viewDidAppear(animated)
 
+    HCert.PREFETCH_ALL_CODES = true
     LocalData.initialize {
       DispatchQueue.main.async { [weak self] in
         guard let self = self else {
diff --git a/DGCAWallet/ViewControllers/List.swift b/DGCAWallet/ViewControllers/List.swift
index 0b48c37..d7667bf 100644
--- a/DGCAWallet/ViewControllers/List.swift
+++ b/DGCAWallet/ViewControllers/List.swift
@@ -35,7 +35,18 @@ class ListVC: UIViewController {
   override func viewDidAppear(_ animated: Bool) {
     super.viewDidAppear(animated)
 
-    return
+    if let cert = newHCertScanned {
+      newHCertScanned = nil
+      presentViewer(for: cert)
+    }
+  }
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    table.dataSource = self
+    table.delegate = self
+    reloadTable()
   }
 
   @IBAction
@@ -43,7 +54,14 @@ class ListVC: UIViewController {
     performSegue(withIdentifier: "scanner", sender: self)
   }
 
+  @IBOutlet weak var table: UITableView!
+
+  func reloadTable() {
+    table.reloadData()
+  }
+
   var presentingViewer: CertificateViewerVC?
+  var newHCertScanned: HCert?
 
   func presentViewer(for certificate: HCert) {
     guard
@@ -55,18 +73,28 @@ class ListVC: UIViewController {
       return
     }
 
+    viewer.hCert = certificate
+    viewer.childDismissedDelegate = self
     let fpc = FloatingPanelController()
     fpc.set(contentViewController: viewer)
     fpc.isRemovalInteractionEnabled = true // Let it removable by a swipe-down
     fpc.layout = FullFloatingPanelLayout()
     fpc.surfaceView.layer.cornerRadius = 24.0
     fpc.surfaceView.clipsToBounds = true
-    viewer.hCert = certificate
-    viewer.childDismissedDelegate = self
+    fpc.delegate = self
     presentingViewer = viewer
 
     present(fpc, animated: true, completion: nil)
   }
+
+  override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+    super.prepare(for: segue, sender: sender)
+
+    if let scan = segue.destination as? ScanVC {
+      scan.delegate = self
+      return
+    }
+  }
 }
 
 extension ListVC: CertViewerDelegate {
@@ -74,3 +102,62 @@ extension ListVC: CertViewerDelegate {
     presentingViewer = nil
   }
 }
+
+extension ListVC: ScanVCDelegate {
+  func hCertScanned(_ cert: HCert) {
+    LocalData.add(cert)
+    newHCertScanned = cert
+    DispatchQueue.main.async { [weak self] in
+      self?.reloadTable()
+      self?.navigationController?.popViewController(animated: true)
+    }
+  }
+}
+
+extension ListVC: UITableViewDataSource {
+  func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    LocalData.sharedInstance.certStrings.count
+  }
+
+  func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    let cell = table.dequeueReusableCell(withIdentifier: "walletCell", for: indexPath)
+    guard let walletCell = cell as? WalletCell else {
+      return cell
+    }
+
+    walletCell.draw(LocalData.sharedInstance.certStrings[indexPath.row])
+    return walletCell
+  }
+}
+
+extension ListVC: UITableViewDelegate {
+  func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+    table.deselectRow(at: indexPath, animated: true)
+    guard
+      let cert = LocalData.sharedInstance.certStrings[indexPath.row].cert
+    else {
+      return
+    }
+    presentViewer(for: cert)
+  }
+}
+
+extension ListVC: FloatingPanelControllerDelegate {
+  func floatingPanel(_ fpc: FloatingPanelController, shouldRemoveAt location: CGPoint, with velocity: CGVector) -> Bool {
+    let pos = location.y / view.bounds.height
+    if pos >= 0.33 {
+      return true
+    }
+    let threshold: CGFloat = 5.0
+    switch fpc.layout.position {
+    case .top:
+        return (velocity.dy <= -threshold)
+    case .left:
+        return (velocity.dx <= -threshold)
+    case .bottom:
+        return (velocity.dy >= threshold)
+    case .right:
+        return (velocity.dx >= threshold)
+    }
+  }
+}
diff --git a/DGCAWallet/ViewControllers/Scan.swift b/DGCAWallet/ViewControllers/Scan.swift
index b630618..256bf70 100644
--- a/DGCAWallet/ViewControllers/Scan.swift
+++ b/DGCAWallet/ViewControllers/Scan.swift
@@ -30,22 +30,5 @@ import UIKit
 import SwiftDGC
 import FloatingPanel
 
-class ScanVC: SwiftDGC.ScanVC {
-  override func viewDidLoad() {
-    super.viewDidLoad()
+class ScanVC: SwiftDGC.ScanVC { }
 
-    delegate = self
-  }
-}
-
-extension ScanVC: ScanVCDelegate {
-  func hCertScanned(_ cert: HCert) {
-    var delay = 0.0
-    #if targetEnvironment(simulator)
-    delay = 0.1
-    #endif
-    DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
-      self?.navigationController?.popViewController(animated: true)
-    }
-  }
-}