diff --git a/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard b/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard index 929064ef..2d90fbd9 100644 --- a/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard +++ b/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard @@ -259,7 +259,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -306,6 +306,7 @@ + diff --git a/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift b/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift index ae620c12..ec1d49a1 100644 --- a/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift +++ b/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift @@ -12,7 +12,6 @@ class SendMoneyExchangeRateViewController: UIViewController { // MARK: IBOutlets - @IBOutlet weak var collectionView: UICollectionView! @IBOutlet weak var exchangeBackground1: UIView! @IBOutlet weak var exchangeBackground2: UIView! @IBOutlet weak var dropDownImageView: UIImageView! @@ -22,14 +21,14 @@ class SendMoneyExchangeRateViewController: UIViewController { @IBOutlet weak var countryCodeLabel: UILabel! @IBOutlet weak var countryFlagImage: UIImageView! - @IBOutlet weak var paymentModeStackViewConstraint: NSLayoutConstraint! + @IBOutlet weak var continueButton: UIButton! @IBOutlet weak var paymentModeStackView: UIStackView! @IBOutlet weak var senderTextField: UITextField! @IBOutlet weak var reciepientTextField: UITextField! @IBOutlet weak var transferFeeInfoLabel: UILabel! - @IBOutlet weak var exchangeRateInfoLabel: UILabel! + var countryListTapGuesture: UITapGestureRecognizer? // MARK: Properties @@ -37,7 +36,7 @@ class SendMoneyExchangeRateViewController: UIViewController { var presenter: SendMoneyExchangeRateModuleInterface? var reciepient: Recipient? var hudDelegate: HUDStatusDelegate? - var actionDelegate: SendMoneyPaymentModeActionDelegate? + var actionDelegate: SendMoneyExchangeRateActionDelegate? // MARK: VC's Life cycle @@ -49,6 +48,10 @@ class SendMoneyExchangeRateViewController: UIViewController { // MARK: IBActions + @IBAction func continueButton(_ sender: UIButton) { + self.actionDelegate?.continueToVerificationAction() + } + // MARK: Other Functions private func setup() { diff --git a/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift b/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift index 69b7dc8e..1d7f9620 100644 --- a/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift +++ b/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift @@ -14,11 +14,11 @@ protocol HUDStatusDelegate { } protocol SendMoneyPaymentModeActionDelegate { - func continueAction() + func continueToExchangeAction() } protocol SendMoneyExchangeRateActionDelegate { - func continueAction() + func continueToVerificationAction() } @@ -172,13 +172,13 @@ extension SendMoneyParentViewController: HUDStatusDelegate { } extension SendMoneyParentViewController: SendMoneyPaymentModeActionDelegate { - func continueAction() { + func continueToExchangeAction() { self.addExchangeViewController() } } extension SendMoneyParentViewController: SendMoneyExchangeRateActionDelegate { - func continueAction() { + func continueToVerificationAction() { self.addVerificationViewController() } } diff --git a/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift b/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift index c4a16054..92515f79 100644 --- a/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift +++ b/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift @@ -52,7 +52,7 @@ class SendMoneyPaymentModeViewController: UIViewController { // MARK: IBActions @IBAction func _continue(_ sender: UIButton) { - self.actionDelegate?.continueAction() + self.actionDelegate?.continueToExchangeAction() } // MARK: Other Functions