IOS-7652 Load images during onboarding

Podfile

@@ -24,7 +24,7 @@ use_frameworks!
 inhibit_all_warnings!
 
 def tangem_sdk_pod
-  pod 'TangemSdk', :git => 'https://github.com/Tangem/tangem-sdk-ios.git', :tag => 'develop-302'
+  pod 'TangemSdk', :git => 'https://github.com/Tangem/tangem-sdk-ios.git', :tag => 'develop-305'
   #pod 'TangemSdk', :path => '../tangem-sdk-ios'
 end
 

Podfile.lock

@@ -233,7 +233,7 @@ DEPENDENCIES:
   - Moya
   - Solana.Swift (from `https://github.com/tangem/Solana.Swift`, tag `1.2.0-tangem11`)
   - SwiftyJSON (from `https://github.com/tangem/SwiftyJSON.git`, tag `5.0.1-tangem1`)
-  - TangemSdk (from `https://github.com/Tangem/tangem-sdk-ios.git`, tag `develop-302`)
+  - TangemSdk (from `https://github.com/Tangem/tangem-sdk-ios.git`, tag `develop-305`)
   - WalletConnectSwiftV2 (from `https://github.com/WalletConnect/WalletConnectSwiftV2`, tag `1.18.7`)
 
 SPEC REPOS:
@@ -287,7 +287,7 @@ EXTERNAL SOURCES:
     :tag: 5.0.1-tangem1
   TangemSdk:
     :git: https://github.com/Tangem/tangem-sdk-ios.git
-    :tag: develop-302
+    :tag: develop-305
   WalletConnectSwiftV2:
     :git: https://github.com/WalletConnect/WalletConnectSwiftV2
     :tag: 1.18.7
@@ -310,7 +310,7 @@ CHECKOUT OPTIONS:
     :tag: 5.0.1-tangem1
   TangemSdk:
     :git: https://github.com/Tangem/tangem-sdk-ios.git
-    :tag: develop-302
+    :tag: develop-305
   WalletConnectSwiftV2:
     :git: https://github.com/WalletConnect/WalletConnectSwiftV2
     :tag: 1.18.7
@@ -354,6 +354,6 @@ SPEC CHECKSUMS:
   TangemSdk: 4a188873f9dbed6340cca9ad6a010240af6df432
   WalletConnectSwiftV2: 5ea47db4d86e39fc749b66a05a661af9e87b277d
 
-PODFILE CHECKSUM: 39c88afa827f141b4be8ae0e19ec89ead613922e
+PODFILE CHECKSUM: 12f86daf305325609ee75b5b41a4192a4d4e5026
 
 COCOAPODS: 1.15.2

Tangem/Modules/Onboarding/BaseModels/OnboardingViewModel.swift

@@ -28,9 +28,10 @@ class OnboardingViewModel<Step: OnboardingStep, Coordinator: OnboardingRoutable>
     @Published var supplementCardSettings: AnimatedViewSettings = .zero
     @Published var isNavBarVisible: Bool = false
     @Published var alert: AlertBinder?
-    @Published var cardImage: Image?
+    @Published var mainImage: Image?
     @Published var customOnboardingImage: Image?
     @Published var secondImage: Image?
+    @Published var thirdImage: Image?
 
     private var confettiFired: Bool = false
     var bag: Set<AnyCancellable> = []
@@ -184,12 +185,7 @@ class OnboardingViewModel<Step: OnboardingStep, Coordinator: OnboardingRoutable>
         isFromMain = input.isStandalone
         isNavBarVisible = input.isStandalone
 
-        let loadImageInput = input.cardInput.imageLoadInput
-        loadImage(
-            supportsOnlineImage: loadImageInput.supportsOnlineImage,
-            cardId: loadImageInput.cardId,
-            cardPublicKey: loadImageInput.cardPublicKey
-        )
+        loadMainImage(imageLoadInput: input.cardInput.imageLoadInput)
 
         bindAnalytics()
     }
@@ -212,20 +208,11 @@ class OnboardingViewModel<Step: OnboardingStep, Coordinator: OnboardingRoutable>
         userWalletRepository.add(userWalletModel)
     }
 
-    func loadImage(supportsOnlineImage: Bool, cardId: String?, cardPublicKey: Data?) {
-        guard let cardId = cardId, let cardPublicKey = cardPublicKey else {
-            return
-        }
-
+    func loadImage(supportsOnlineImage: Bool, cardId: String, cardPublicKey: Data) -> AnyPublisher<Image, Never> {
         CardImageProvider(supportsOnlineImage: supportsOnlineImage)
             .loadImage(cardId: cardId, cardPublicKey: cardPublicKey)
             .map { $0.image }
-            .sink { [weak self] image in
-                withAnimation {
-                    self?.cardImage = image
-                }
-            }
-            .store(in: &bag)
+            .eraseToAnyPublisher()
     }
 
     func setupContainer(with size: CGSize) {
@@ -327,6 +314,20 @@ class OnboardingViewModel<Step: OnboardingStep, Coordinator: OnboardingRoutable>
         Analytics.log(.onboardingEnableBiometric, params: [.state: Analytics.ParameterValue.toggleState(for: agreed)])
     }
 
+    private func loadMainImage(imageLoadInput: OnboardingInput.ImageLoadInput) {
+        loadImage(
+            supportsOnlineImage: imageLoadInput.supportsOnlineImage,
+            cardId: imageLoadInput.cardId,
+            cardPublicKey: imageLoadInput.cardPublicKey
+        )
+        .sink { [weak self] image in
+            withAnimation {
+                self?.mainImage = image
+            }
+        }
+        .store(in: &bag)
+    }
+
     private func bindAnalytics() {
         $currentStepIndex
             .removeDuplicates()

Tangem/Modules/Onboarding/Note/SingleCardOnboardingView.swift

@@ -106,7 +106,7 @@ struct SingleCardOnboardingView: View {
                             AnimatedView(settings: viewModel.$mainCardSettings) {
                                 OnboardingCardView(
                                     placeholderCardType: .dark,
-                                    cardImage: viewModel.cardImage,
+                                    cardImage: viewModel.mainImage,
                                     cardScanned: viewModel.isInitialAnimPlayed && viewModel.isCardScanned
                                 )
                             }

Tangem/Modules/Onboarding/Twins/TwinsOnboardingViewModel.swift

@@ -380,7 +380,7 @@ class TwinsOnboardingViewModel: OnboardingTopupViewModel<TwinsOnboardingStep, On
         CardImageProvider()
             .loadTwinImage(for: twinCardSeries.pair.number)
             .map { $0.image }
-            .zip($cardImage.compactMap { $0 })
+            .zip($mainImage.compactMap { $0 })
             .receive(on: DispatchQueue.main)
             .sink { [weak self] paired, main in
                 guard let self = self else { return }

Tangem/Modules/Onboarding/Wallet/WalletOnboardingView.swift

@@ -130,15 +130,15 @@ struct WalletOnboardingView: View {
                             AnimatedView(settings: viewModel.$thirdCardSettings) {
                                 OnboardingCardView(
                                     placeholderCardType: secondCardPlaceholder,
-                                    cardImage: viewModel.secondImage ?? viewModel.cardImage,
+                                    cardImage: viewModel.thirdImage,
                                     cardScanned: viewModel.canShowThirdCardImage && (viewModel.backupCardsAddedCount >= 2 || currentStep == .backupIntro) && viewModel.canDisplayCardImage
                                 )
                             }
 
                             AnimatedView(settings: viewModel.$supplementCardSettings) {
                                 OnboardingCardView(
                                     placeholderCardType: secondCardPlaceholder,
-                                    cardImage: viewModel.secondImage ?? viewModel.cardImage,
+                                    cardImage: viewModel.secondImage,
                                     cardScanned: (viewModel.backupCardsAddedCount >= 1 || currentStep == .backupIntro) && viewModel.canDisplayCardImage
                                 )
                             }
@@ -147,7 +147,7 @@ struct WalletOnboardingView: View {
                                 ZStack(alignment: .topTrailing) {
                                     OnboardingCardView(
                                         placeholderCardType: .dark,
-                                        cardImage: viewModel.customOnboardingImage ?? viewModel.cardImage,
+                                        cardImage: viewModel.customOnboardingImage ?? viewModel.mainImage,
                                         cardScanned: viewModel.isInitialAnimPlayed
                                     )
                                     Text(Localization.commonOriginCard)

Tangem/Modules/Onboarding/Wallet/WalletOnboardingViewModel.swift

@@ -329,19 +329,6 @@ class WalletOnboardingViewModel: OnboardingViewModel<WalletOnboardingStep, Onboa
         subscribeToScreenshots()
     }
 
-    private func loadImageForRestoredbackup(cardId: String, cardPublicKey: Data) {
-        CardImageProvider()
-            .loadImage(cardId: cardId, cardPublicKey: cardPublicKey)
-            .map { $0.image }
-            .assign(to: \.cardImage, on: self, ownership: .weak)
-            .store(in: &bag)
-    }
-
-    override func loadImage(supportsOnlineImage: Bool, cardId: String?, cardPublicKey: Data?) {
-        super.loadImage(supportsOnlineImage: supportsOnlineImage, cardId: cardId, cardPublicKey: cardPublicKey)
-        secondImage = nil
-    }
-
     override func setupContainer(with size: CGSize) {
         stackCalculator.setup(
             for: size,
@@ -691,8 +678,8 @@ class WalletOnboardingViewModel: OnboardingViewModel<WalletOnboardingStep, Onboa
                 Future { [weak self] promise in
                     self?.backupService.addBackupCard { result in
                         switch result {
-                        case .success:
-                            promise(.success(()))
+                        case .success(let card):
+                            promise(.success(card))
                         case .failure(let error):
                             promise(.failure(error))
                         }
@@ -708,14 +695,32 @@ class WalletOnboardingViewModel: OnboardingViewModel<WalletOnboardingStep, Onboa
                     self?.isMainButtonBusy = false
                 }
                 self?.stepPublisher = nil
-            }, receiveValue: { [weak self] (_: Void, _: Notification) in
+            }, receiveValue: { [weak self] card, _ in
+                self?.loadImage(for: card)
                 self?.updateStep()
                 withAnimation {
                     self?.isMainButtonBusy = false
                 }
             })
     }
 
+    private func loadImage(for card: Card) {
+        let input = OnboardingInput.ImageLoadInput(
+            supportsOnlineImage: true,
+            cardId: card.cardId,
+            cardPublicKey: card.cardPublicKey
+        )
+
+        switch backupService.addedBackupCardsCount {
+        case 1:
+            loadSecondImage(imageLoadInput: input)
+        case 2:
+            loadThirdImage(imageLoadInput: input)
+        default:
+            break
+        }
+    }
+
     private func backupCard() {
         isMainButtonBusy = true
 
@@ -835,6 +840,34 @@ class WalletOnboardingViewModel: OnboardingViewModel<WalletOnboardingStep, Onboa
             withExtendedLifetime(interactor) {}
         }
     }
+
+    private func loadSecondImage(imageLoadInput: OnboardingInput.ImageLoadInput) {
+        loadImage(
+            supportsOnlineImage: imageLoadInput.supportsOnlineImage,
+            cardId: imageLoadInput.cardId,
+            cardPublicKey: imageLoadInput.cardPublicKey
+        )
+        .sink { [weak self] image in
+            withAnimation {
+                self?.secondImage = image
+            }
+        }
+        .store(in: &bag)
+    }
+
+    private func loadThirdImage(imageLoadInput: OnboardingInput.ImageLoadInput) {
+        loadImage(
+            supportsOnlineImage: imageLoadInput.supportsOnlineImage,
+            cardId: imageLoadInput.cardId,
+            cardPublicKey: imageLoadInput.cardPublicKey
+        )
+        .sink { [weak self] image in
+            withAnimation {
+                self?.thirdImage = image
+            }
+        }
+        .store(in: &bag)
+    }
 }
 
 // MARK: - Seed phrase related