diff --git a/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift b/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift index e1fab458..1211c342 100644 --- a/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift +++ b/GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift @@ -179,11 +179,13 @@ class ResendViewController: UIViewController { } func selectedAcunt(acunt: Account) { - guard let index = self.selectedIndex, let requestModel = self.requestModel else {return} + guard let index = self.selectedIndex, let requestModel = self.requestModel, let transactionId = self.transactions.elementAt(index: index)?.transactionId else {return} + requestModel.autoDebitAccount = acunt + if let navigation = self.navigationController { let wireframe = ResendExchangeWireframe() - wireframe.openExchangeWireFrame(model: requestModel, source: navigation) + wireframe.openExchangeWireFrame(model: requestModel, transactionId: transactionId , source: navigation) } } diff --git a/GMERemittance/Module/ResendExchange/User Interface/View/ResendExchangeViewController.swift b/GMERemittance/Module/ResendExchange/User Interface/View/ResendExchangeViewController.swift index 795adf77..7a0e2727 100644 --- a/GMERemittance/Module/ResendExchange/User Interface/View/ResendExchangeViewController.swift +++ b/GMERemittance/Module/ResendExchange/User Interface/View/ResendExchangeViewController.swift @@ -53,6 +53,7 @@ class ResendExchangeViewController: UIViewController { var reciepient: Recipient? var requestModel: ResendRequestModel? + var transactionId: String? var exchangeRateModel: SendMoneyExchangeRateModel? { didSet { // list all rhe @@ -85,6 +86,7 @@ class ResendExchangeViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() self.setup() + fetchInfo() } override func viewWillAppear(_ animated: Bool) { @@ -122,6 +124,15 @@ class ResendExchangeViewController: UIViewController { setupTargets() } + private func fetchInfo() { + guard let transactionId = self.transactionId else {return} + self.fetch(transactionId: transactionId, success: { (model) in + print(model) + }) { (error) in +// self.alert(message: erro) + } + } + private func configureViews() { self.exchangeRateModel = nil self.exchangeRateLabel.isHidden = true @@ -259,3 +270,6 @@ extension ResendExchangeViewController { +extension ResendExchangeViewController: FetchResendDetailService { + +} diff --git a/GMERemittance/Module/ResendExchange/User Interface/Wireframe/ResendExchangeWireframe.swift b/GMERemittance/Module/ResendExchange/User Interface/Wireframe/ResendExchangeWireframe.swift index d449de39..e9bfb5e9 100644 --- a/GMERemittance/Module/ResendExchange/User Interface/Wireframe/ResendExchangeWireframe.swift +++ b/GMERemittance/Module/ResendExchange/User Interface/Wireframe/ResendExchangeWireframe.swift @@ -11,6 +11,7 @@ import UIKit class ResendExchangeWireframe { weak var view: UIViewController! var model: ResendRequestModel? + var transactionId: String? } extension ResendExchangeWireframe: ResendExchangeWireframeInput { @@ -23,6 +24,7 @@ extension ResendExchangeWireframe: ResendExchangeWireframeInput { let presenter = ResendExchangePresenter() let viewController = viewControllerFromStoryboard(of: ResendExchangeViewController.self) viewController.requestModel = self.model + viewController.transactionId = transactionId viewController.presenter = presenter interactor.output = presenter presenter.interactor = interactor @@ -33,8 +35,9 @@ extension ResendExchangeWireframe: ResendExchangeWireframeInput { return viewController } - func openExchangeWireFrame(model: ResendRequestModel, source: UINavigationController) { + func openExchangeWireFrame(model: ResendRequestModel, transactionId: String, source: UINavigationController) { self.model = model + self.transactionId = transactionId self.pushMainView(in: source) } }