2.7.1

GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift

@@ -380,7 +380,8 @@ extension SetupRecipientViewController {
       self.stateProvinceTextField.text = $0?.name
       self.stateProvinceTextField.sendActions(for: .editingChanged)
       
-      if !self.districtTextField.isHidden {
+      let count = $0?.districts?.count ?? 0
+      if count != 0 && !self.districtTextField.isHidden {
         self.districtTextField.valid.onNext(false)
       } else {
         self.districtTextField.valid.onNext(true)

GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift

@@ -378,11 +378,10 @@ extension SetupRecipientViewModel: SetupRecipientViewModelInterface {
     case .bank:
       guard let model = model as? SendMoneyBank else { return }
       selectedBankLinker.onNext(model)
+      payoutPartner = model.payoutPartner
       if model.branchRequired?.lowercased() == "true" {
         selectedBranchLinker.onNext(nil)
       }
-      
-      payoutPartner = model.payoutPartner
     case .branch:
       guard let model = model as? SendMoneyBankBranch else { return }
       selectedBranchLinker.onNext(model)