diff --git a/DGCAVerifier/BusinessRules/Internal/Validators/Medical/TestValidators.swift b/DGCAVerifier/BusinessRules/Internal/Validators/Medical/TestValidators.swift index 42fdbd5..1532967 100644 --- a/DGCAVerifier/BusinessRules/Internal/Validators/Medical/TestValidators.swift +++ b/DGCAVerifier/BusinessRules/Internal/Validators/Medical/TestValidators.swift @@ -57,6 +57,7 @@ class TestBaseValidator: DGCValidator { } private func getEndHours(for hcert: HCert) -> String? { + if (VerificationState.shared.shouldValidateTestOnly() && ScanMode.fetchFromLocalSettings() == .booster) { return rapidEndHours } if (hcert.isMolecularTest) { return molecularEndHours } if (hcert.isRapidTest) { return rapidEndHours } return nil diff --git a/DGCAVerifier/Pages/Result/VerificationViewController.swift b/DGCAVerifier/Pages/Result/VerificationViewController.swift index e5abfcf..2966e4d 100644 --- a/DGCAVerifier/Pages/Result/VerificationViewController.swift +++ b/DGCAVerifier/Pages/Result/VerificationViewController.swift @@ -107,7 +107,7 @@ class VerificationViewController: UIViewController { noTestAvailableButton.setTitle("result.scan.button.no.test".localized) noTestAvailableButton.setTitleColor(Palette.blue, for: .normal) noTestAvailableButton.style = .white - noTestAvailableButton.setRightImage(named: "icon_arrow-right") + noTestAvailableButton.setRightImage(named: "close") noTestAvailableButton.addTarget(self, action: #selector(self.noTestAvailableDidTap), for: .touchUpInside) buttonStackView.addArrangedSubview(secondScanButton) diff --git a/Verifier.xcodeproj/project.pbxproj b/Verifier.xcodeproj/project.pbxproj index ba899f1..b6a9674 100644 --- a/Verifier.xcodeproj/project.pbxproj +++ b/Verifier.xcodeproj/project.pbxproj @@ -2144,7 +2144,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.6; + MARKETING_VERSION = 1.2.8; PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2168,7 +2168,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.6; + MARKETING_VERSION = 1.2.8; PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2255,7 +2255,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.6; + MARKETING_VERSION = 1.2.8; PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2280,7 +2280,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.6; + MARKETING_VERSION = 1.2.8; PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2411,7 +2411,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.6; + MARKETING_VERSION = 1.2.8; PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2436,7 +2436,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.6; + MARKETING_VERSION = 1.2.8; PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2630,7 +2630,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.6; + MARKETING_VERSION = 1.2.8; PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2655,7 +2655,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.6; + MARKETING_VERSION = 1.2.8; PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "";