Merge pull request #2142 from minvws/bugfix/5016-small-fixes

minvws · Nov 4, 2022 · 2f125d6 · 2f125d6
2 parents f5cccd0 + 6171ea9
commit 2f125d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Sources/CTR/Interface/Holder/Event/List/ListRemoteEventsViewModel+ViewState.swift b/Sources/CTR/Interface/Holder/Event/List/ListRemoteEventsViewModel+ViewState.swift
@@ -433,10 +433,14 @@ extension ListRemoteEventsViewModel {
 		let formattedBirthDate: String = dataRow.identity.birthDateString
 			.flatMap(Formatter.getDateFrom)
 			.map(DateFormatter.Format.dayMonthYear.string) ?? (dataRow.identity.birthDateString ?? "")
+
+		let formattedTestDate: String = Formatter.getDateFrom(dateString8601: recovery.firstPositiveTestDate)
+			.map(DateFormatter.Format.dayMonthYear.string) ?? recovery.firstPositiveTestDate
 
 		return ListRemoteEventsViewController.Row(
 			title: L.general_recoverycertificate().capitalizingFirstLetter(),
 			details: [
+				L.holder_listRemoteEvents_listElement_testDate(formattedTestDate),
 				L.holder_listRemoteEvents_listElement_name(dataRow.identity.fullName),
 				L.holder_listRemoteEvents_listElement_birthDate(formattedBirthDate)
 			],
@@ -460,10 +464,14 @@ extension ListRemoteEventsViewModel {
 		let formattedBirthDate: String = dataRow.identity.birthDateString
 			.flatMap(Formatter.getDateFrom)
 			.map(DateFormatter.Format.dayMonthYear.string) ?? (dataRow.identity.birthDateString ?? "")
+
+		let formattedTestDate: String = Formatter.getDateFrom(dateString8601: test.sampleDate)
+			.map(DateFormatter.Format.dayMonthYear.string) ?? test.sampleDate
 
 		return ListRemoteEventsViewController.Row(
 			title: L.general_testcertificate().capitalizingFirstLetter(),
 			details: [
+				L.holder_listRemoteEvents_listElement_testDate(formattedTestDate),
 				L.holder_listRemoteEvents_listElement_name(dataRow.identity.fullName),
 				L.holder_listRemoteEvents_listElement_birthDate(formattedBirthDate)
 			],

diff --git a/Sources/CTR/Interface/Holder/StoredEvents/List/ListStoredEventsViewModel.swift b/Sources/CTR/Interface/Holder/StoredEvents/List/ListStoredEventsViewModel.swift
@@ -248,12 +248,12 @@ class ListStoredEventsViewModel {
 
 	private func getRowFromRecoveryDCC(_ recovery: EuCredentialAttributes.RecoveryEntry, identity: EventFlow.Identity) -> ListStoredEventsViewController.Row {
 
-		let formattedVaccinationDate: String = Formatter.getDateFrom(dateString8601: recovery.firstPositiveTestDate)
+		let formattedTestDate: String = Formatter.getDateFrom(dateString8601: recovery.firstPositiveTestDate)
 			.map(DateFormatter.Format.dayMonthYear.string) ?? recovery.firstPositiveTestDate
 
 		return ListStoredEventsViewController.Row(
 			title: L.general_recoverycertificate().capitalizingFirstLetter(),
-			details: formattedVaccinationDate,
+			details: formattedTestDate,
 			action: { [weak self] in
 				self?.coordinator?.userWishesToSeeEventDetails(
 					L.general_recoverycertificate().capitalizingFirstLetter(),
@@ -265,12 +265,12 @@ class ListStoredEventsViewModel {
 
 	private func getRowFromNegativeTestDCC(_ test: EuCredentialAttributes.TestEntry, identity: EventFlow.Identity) -> ListStoredEventsViewController.Row {
 
-		let formattedVaccinationDate: String = Formatter.getDateFrom(dateString8601: test.sampleDate)
+		let formattedTestDate: String = Formatter.getDateFrom(dateString8601: test.sampleDate)
 			.map(DateFormatter.Format.dayMonthYear.string) ?? test.sampleDate
 
 		return ListStoredEventsViewController.Row(
 			title: L.general_negativeTest().capitalizingFirstLetter(),
-			details: formattedVaccinationDate,
+			details: formattedTestDate,
 			action: { [weak self] in
 				self?.coordinator?.userWishesToSeeEventDetails(
 					L.general_negativeTest().capitalizingFirstLetter(),