diff --git a/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift b/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift index 4993155e..e99592ad 100644 --- a/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift +++ b/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift @@ -98,7 +98,7 @@ class ResendViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - self.navigationItem.title = "transaction_report_text".localized() + self.navigationItem.title = "resend_text".localized() } override func viewWillDisappear(_ animated: Bool) { diff --git a/GMERemittance/Module/ResendExchange/User Interface/View/ResendExchangeViewController.swift b/GMERemittance/Module/ResendExchange/User Interface/View/ResendExchangeViewController.swift index 2d361cab..6d0da108 100644 --- a/GMERemittance/Module/ResendExchange/User Interface/View/ResendExchangeViewController.swift +++ b/GMERemittance/Module/ResendExchange/User Interface/View/ResendExchangeViewController.swift @@ -119,15 +119,21 @@ class ResendExchangeViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() self.setup() - fetchInfo() } override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) + self.navigationItem.title = "resend_text".localized() configureViews() + fetchInfo() self.action = ActionBehaviour.calculate } + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + self.navigationItem.title = "" + } + // MARK: IBActions @IBAction func continueButton(_ sender: UIButton) { self.view.endEditing(true) @@ -209,10 +215,13 @@ class ResendExchangeViewController: UIViewController { private func fetchInfo() { guard let transactionId = self.transactionId else {return} + self.showLoading() self.fetch(transactionId: transactionId, success: { (model) in + self.hideLoading() self.resendInfoModel = model self.calculateExchangeRate(senderAmount: self.senderTextField.text!, reciepientAmount: self.reciepientTextField.text!, calcBy: self.calcBy) }) { (error) in + self.hideLoading() self.alert(message: error.localizedDescription) } } diff --git a/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift index d3d7d825..205e138c 100644 --- a/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift +++ b/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift @@ -112,8 +112,11 @@ class SendMoneyVerificationViewController: UITableViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) + self.navigationItem.title = "Resend" populateRecieversInformations() populateTransactionDetails() + mQwertyTransKeyView?.delegate = self + mNumberTransKeyView?.delegate = self } override func viewDidDisappear(_ animated: Bool) { @@ -251,7 +254,7 @@ class SendMoneyVerificationViewController: UITableViewController { mQwertyTransKeyView?.setKeyboardType(self, keypadType: 0, mTK_inputType: 2, - mTK_inputTitle: "입력", + mTK_inputTitle: "Password", mTK_cryptType: 0, mTK_maxLength: 100, mTK_minLength: 0,