From ba09eab548276963fe605a01d33a3472d192caa3 Mon Sep 17 00:00:00 2001 From: Elizaveta Semenova Date: Tue, 11 Jul 2023 15:24:01 +0300 Subject: [PATCH] [PWN-8912] Remember lastChosenCountry on second registration step for bank transfer info sheet --- .../SecondStep/StrigaRegistrationSecondStepViewModel.swift | 4 ++++ .../Main/NewHome/Subview/Empty/HomeEmptyViewModel.swift | 1 + 2 files changed, 5 insertions(+) diff --git a/p2p_wallet/Scenes/Main/BankTransfer/StrigaRegistration/SecondStep/StrigaRegistrationSecondStepViewModel.swift b/p2p_wallet/Scenes/Main/BankTransfer/StrigaRegistration/SecondStep/StrigaRegistrationSecondStepViewModel.swift index 0157b47184..7cf18b1c04 100644 --- a/p2p_wallet/Scenes/Main/BankTransfer/StrigaRegistration/SecondStep/StrigaRegistrationSecondStepViewModel.swift +++ b/p2p_wallet/Scenes/Main/BankTransfer/StrigaRegistration/SecondStep/StrigaRegistrationSecondStepViewModel.swift @@ -76,6 +76,10 @@ final class StrigaRegistrationSecondStepViewModel: BaseViewModel, ObservableObje .assignWeak(to: \.country, on: self) .store(in: &subscriptions) + $selectedCountry + .assignWeak(to: \.lastChosenCountry, on: self) + .store(in: &subscriptions) + $selectedIndustry .map { $0?.wholeName ?? "" } .assignWeak(to: \.occupationIndustry, on: self) diff --git a/p2p_wallet/Scenes/Main/NewHome/Subview/Empty/HomeEmptyViewModel.swift b/p2p_wallet/Scenes/Main/NewHome/Subview/Empty/HomeEmptyViewModel.swift index 07928daa56..9a94aa6d68 100644 --- a/p2p_wallet/Scenes/Main/NewHome/Subview/Empty/HomeEmptyViewModel.swift +++ b/p2p_wallet/Scenes/Main/NewHome/Subview/Empty/HomeEmptyViewModel.swift @@ -77,6 +77,7 @@ private extension HomeEmptyViewModel { func bindBankTransfer() { bankTransferService.state .filter { $0.value.userId != nil && $0.value.mobileVerified } + .receive(on: RunLoop.main) .compactMap { [weak self] value -> HomeBannerParameters? in guard let self else { return nil }