fixed invalid section (#89)

Co-authored-by: Alexandr Chernyy <[email protected]>
eu-digital-green-certificates · Jul 22, 2021 · 176d5e7 · 176d5e7
1 parent 689a6e3
commit 176d5e7
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/Sources/Models/HCert.swift b/Sources/Models/HCert.swift
@@ -288,9 +288,11 @@ public struct HCert {
   }
 
   mutating func makeSectionsForVerifier(includeInvalidSection: Bool = true) {
-    info = isValid && includeInvalidSection ? [] : [
-      InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
-    ]
+    if includeInvalidSection {
+      info = isValid ? [] : [
+        InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
+      ]
+    }
     if includeInvalidSection {
       info += [
         InfoSection(
@@ -349,9 +351,11 @@ public struct HCert {
   }
 
   mutating func makeSectionsForVaccine(includeInvalidSection: Bool = true) {
-    info = isValid && includeInvalidSection ? [] : [
-      InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
-    ]
+    if includeInvalidSection {
+      info = isValid ? [] : [
+        InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
+      ]
+    }
     if includeInvalidSection {
       info += [
         InfoSection(
@@ -394,9 +398,11 @@ public struct HCert {
   }
 
   mutating func makeSectionsForTest(includeInvalidSection: Bool = true) {
-    info = isValid && includeInvalidSection ? [] : [
-      InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
-    ]
+    if includeInvalidSection {
+      info = isValid ? [] : [
+        InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
+      ]
+    }
     if includeInvalidSection {
       info += [
         InfoSection(
@@ -439,9 +445,11 @@ public struct HCert {
   }
 
   mutating func makeSectionsForRecovery(includeInvalidSection: Bool = true) {
-    info = isValid && includeInvalidSection ? [] : [
+    if includeInvalidSection {
+      info = isValid ? [] : [
       InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
-    ]
+      ]
+    }
     if includeInvalidSection {
       info += [
         InfoSection(