diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift index 85d16eb0..a98b4962 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift @@ -367,8 +367,8 @@ extension SetupRecipientViewController { self.branchTextField.text = "" self.branchTextField.valid.onNext(true) } else { - self.branchTextField.isHidden = false - self.branchTextField.valid.onNext(false) + self.branchTextField.isHidden = $0?.branches?.count == 0 + self.branchTextField.valid.onNext($0?.branches?.count == 0) } if $0?.accountRequired?.lowercased() == "false" { diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/Presenter/ExistingUserKycPresenter.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/Presenter/ExistingUserKycPresenter.swift index 18137c70..462c4560 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/Presenter/ExistingUserKycPresenter.swift +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/Presenter/ExistingUserKycPresenter.swift @@ -142,7 +142,6 @@ class ExistingUserKycPresenter { personalInfo.visaStatus = visaStatus?.id personalInfo.occupation = occupation?.id personalInfo.purpose = purpose?.id - personalInfo.isBackIDRequired = purpose?.isRequired return personalInfo } return nil diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift index 2ed231de..6c971e5c 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift @@ -539,13 +539,7 @@ class ExistingUserKycViewController: UIViewController { output.model.drive(onNext: {[weak self] model in guard let personalInformation = model.personalInformation else { return } - if let isBackIDRequired = model.personalInformation?.isBackIDRequired{ - self?.backIDImageBase64.onNext(isBackIDRequired ? nil : "dummy") - self?.backIDContainer.isHidden = !isBackIDRequired - }else{ - self?.backIDImageBase64.onNext("dummy") - self?.backIDContainer.isHidden = true - } + self?.emailAddress.text = personalInformation.email self?.emailAddress.sendActions(for: .editingChanged) diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift index 051e38dd..b8af4f61 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift @@ -147,7 +147,7 @@ class KYCVerifyStep1Presenter: ViewModelType { personalInfo.additionalIdType = additionalIdType?.id personalInfo.occupation = occupation?.id personalInfo.purpose = purpose?.id - personalInfo.isBackIDRequired = purpose?.isRequired + personalInfo.isBackIDRequired = additionalIdType?.isRequired return personalInfo } return nil