Browse Source

issue fixing

v0.17
stepie.ub 1 year ago
parent
commit
28bda6566b
  1. 19
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
  2. 6
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift

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

@ -116,7 +116,7 @@ class SetupRecipientViewController: UIViewController {
super.viewWillAppear(animated) super.viewWillAppear(animated)
title = "send_money_title_text".localized() title = "send_money_title_text".localized()
setupNormalNavigation() setupNormalNavigation()
accountTextField.delegate = self
// accountTextField.delegate = self
lastNameTextField.delegate = self lastNameTextField.delegate = self
reasonTextField.isHidden = true reasonTextField.isHidden = true
} }
@ -141,12 +141,23 @@ class SetupRecipientViewController: UIViewController {
let nav = UINavigationController.init(rootViewController: webController) let nav = UINavigationController.init(rootViewController: webController)
self.present(nav, animated: true, completion: nil) self.present(nav, animated: true, completion: nil)
} }
@objc func textFieldDidChange(_ textField: UITextField) {
if (textField == accountTextField) {
viewModel?.enteredAccountNumber = (accountTextField.text ?? "")
}
}
} }
// MARK: Other Functions // MARK: Other Functions
extension SetupRecipientViewController { extension SetupRecipientViewController {
private func setup() { private func setup() {
// all setup should be done here // all setup should be done here
accountTextField.addTarget(self, action: #selector(SetupRecipientViewController.textFieldDidChange(_:)), for: .editingChanged)
countryContainerView.hero.id = "setupRecipient" countryContainerView.hero.id = "setupRecipient"
countryContainerView.hero.modifiers = [.fade, .scale(0.2)] countryContainerView.hero.modifiers = [.fade, .scale(0.2)]
self.paymentModeTextField.text = receiver?.paymentMethod?.name ?? "" self.paymentModeTextField.text = receiver?.paymentMethod?.name ?? ""
@ -329,6 +340,7 @@ extension SetupRecipientViewController {
recipient.relationshipID = self?.relationTextField.text recipient.relationshipID = self?.relationTextField.text
if recipient.agent?.id == nil { if recipient.agent?.id == nil {
if let recipients = self?.receiver { if let recipients = self?.receiver {
recipient.agent?.accountNumber = self?.accountTextField.text
recipient.agent = recipients.paymentMethod?.agent recipient.agent = recipients.paymentMethod?.agent
} }
} }
@ -745,6 +757,9 @@ extension SetupRecipientViewController: OtpDelegate, UITextFieldDelegate {
self.viewModel?.presenter?.checkOtp(otp: otp, userId: userId, receiverID: self.receiverID ?? "") self.viewModel?.presenter?.checkOtp(otp: otp, userId: userId, receiverID: self.receiverID ?? "")
} }
func textFieldDidEndEditing(_ textField: UITextField) { func textFieldDidEndEditing(_ textField: UITextField) {
if textField == lastNameTextField { if textField == lastNameTextField {
if validationRequired == "True" { if validationRequired == "True" {
@ -755,5 +770,7 @@ extension SetupRecipientViewController: OtpDelegate, UITextFieldDelegate {
self.viewModel?.presenter?.checkAccountValidation(request: accounValidation) self.viewModel?.presenter?.checkAccountValidation(request: accounValidation)
} }
} }
else if (textField == accountTextField) {
}
} }
} }

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

@ -69,7 +69,7 @@ class SetupRecipientViewModel: ViewModelType {
private let nativeCountiresLinker = PublishSubject<[NativeCountryModel]>() private let nativeCountiresLinker = PublishSubject<[NativeCountryModel]>()
// Selected Model Linker // Selected Model Linker
private let selectedRecipientLinker = BehaviorSubject<Recipient?>(value: nil)
let selectedRecipientLinker = BehaviorSubject<Recipient?>(value: nil)
private let selectedCountryServicesLinker = BehaviorSubject<CountryAndServiceModel?>(value: nil) private let selectedCountryServicesLinker = BehaviorSubject<CountryAndServiceModel?>(value: nil)
private let selectedPaymentModeTypesLinker = BehaviorSubject<PaymentServiceType?>(value: nil) private let selectedPaymentModeTypesLinker = BehaviorSubject<PaymentServiceType?>(value: nil)
let selectedBankLinker = BehaviorSubject<SendMoneyBank?>(value: nil) let selectedBankLinker = BehaviorSubject<SendMoneyBank?>(value: nil)
@ -87,7 +87,8 @@ class SetupRecipientViewModel: ViewModelType {
var presenter: SetupRecipientModuleInterface? var presenter: SetupRecipientModuleInterface?
var isFirst = true var isFirst = true
var payoutPartner: String? var payoutPartner: String?
var enteredAccountNumber: String?
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
func transform(input: Input) -> Output { func transform(input: Input) -> Output {
@ -248,6 +249,7 @@ class SetupRecipientViewModel: ViewModelType {
name = firstName name = firstName
} }
recipient.agent?.accountNumber = (self.enteredAccountNumber ?? "")
let validateModel = ValidateAccountRequest( let validateModel = ValidateAccountRequest(
firstName: name, firstName: name,
lastName: lastName, lastName: lastName,

Loading…
Cancel
Save