IOS-2410 Refactoring. Taking card ID format from the config

tangem · Oct 27, 2022 · 4e5cf34 · 4e5cf34
1 parent 36c68e7
commit 4e5cf34
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/TangemSdk/TangemSdk/Common/Core/CardSession.swift b/TangemSdk/TangemSdk/Common/Core/CardSession.swift
@@ -282,7 +282,11 @@ public class CardSession {
 
                 if tag != currentTag { //handle wrong tag connection during any operation
                     let cardId = self.environment.card?.cardId
-                    self.viewDelegate.wrongCard(message: TangemSdkError.wrongCardNumber(cardId: cardId).localizedDescription)
+                    let formatter = CardIdFormatter(style: environment.config.cardIdDisplayFormat)
+                    let cardIdFormatted = cardId.flatMap {
+                        formatter.string(from: $0)
+                    }
+                    self.viewDelegate.wrongCard(message: TangemSdkError.wrongCardNumber(cardId: cardIdFormatted).localizedDescription)
                     DispatchQueue.global().asyncAfter(deadline: .now() + 2) { [weak self] in
                         self?.restartPolling()
                     }

diff --git a/TangemSdk/TangemSdk/Common/Core/TangemSdkError.swift b/TangemSdk/TangemSdk/Common/Core/TangemSdkError.swift
@@ -478,9 +478,8 @@ public enum TangemSdkError: Error, LocalizedError, Encodable {
         case .userCancelled: return "error_user_cancelled".localized
         case .cardVerificationFailed: return "error_card_verification_failed".localized
         case .wrongCardNumber(let cardId):
-            if let cardId,
-               let cardIdFormatted = CardIdFormatter(style: .full).string(from: cardId) {
-                return "error_wrong_card_number_with_card_id".localized(cardIdFormatted)
+            if let cardId {
+                return "error_wrong_card_number_with_card_id".localized(cardId)
             } else {
                 return "error_wrong_card_number_without_card_id".localized
             }

diff --git a/TangemSdk/TangemSdk/Operations/PreflightReadTask.swift b/TangemSdk/TangemSdk/Operations/PreflightReadTask.swift
@@ -58,7 +58,9 @@ final class PreflightReadTask: CardSessionRunnable {
                 if session.environment.config.handleErrors {
                     if let expectedCardId = self.cardId?.uppercased(),
                        expectedCardId != readResponse.cardId.uppercased() {
-                        completion(.failure(.wrongCardNumber(cardId: expectedCardId)))
+                        let formatter = CardIdFormatter(style: session.environment.config.cardIdDisplayFormat)
+                        let expectedCardIdFormatted = formatter.string(from: expectedCardId)
+                        completion(.failure(.wrongCardNumber(cardId: expectedCardIdFormatted)))
                         return
                     }
                 }