diff --git a/GMERemittance/AppDelegate.swift b/GMERemittance/AppDelegate.swift index e069a81e..8b65df69 100644 --- a/GMERemittance/AppDelegate.swift +++ b/GMERemittance/AppDelegate.swift @@ -1,4 +1,4 @@ -// + // // AppDelegate.swift // GMERemittance // diff --git a/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift b/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift index 71540376..e7ace711 100644 --- a/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift +++ b/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift @@ -99,6 +99,7 @@ class SendMoneyPaymentModeViewController: UIViewController { // if bank validate bank, if branch validate branch if account validate account var shouldGoNextPage = true + var callingApi = false var errors = "" if shouldValidateBank() { let bank = bankTextField.text! @@ -119,8 +120,6 @@ class SendMoneyPaymentModeViewController: UIViewController { shouldGoNextPage = false errors = errors + " " + Constants.validationErrorMessageAccountNumber }else { -// IdType, IdNumber CustomerFirstName CustomerLastName ReceiverFirstName ReceiverLastName Country AccountType IssuerCode AccountNo -// Amount BankCode PayoutPartner ProcessId let validationRequest = SendMoneyAccountValidationRequestModel() validationRequest.idType = "" validationRequest.idNumber = "" @@ -136,7 +135,7 @@ class SendMoneyPaymentModeViewController: UIViewController { validationRequest.bankCode = self.selectedBank?.id validationRequest.payoutPartner = self.selectedPayoutMode?.payoutPartner validationRequest.processId = "" - + callingApi = true self.presenter?.validate(model: validationRequest) } } @@ -144,10 +143,12 @@ class SendMoneyPaymentModeViewController: UIViewController { } } - if shouldGoNextPage { - proceedToNextPage() - }else { - self.show(error: errors) + if !callingApi { + if shouldGoNextPage { + proceedToNextPage() + }else { + self.show(error: errors) + } } }