diff --git a/GMERemittance/Module/TransactionHistory/Application Logic/Service/TransactionHistoryServiceType.swift b/GMERemittance/Module/TransactionHistory/Application Logic/Service/TransactionHistoryServiceType.swift index cca06d7e..5acbc271 100644 --- a/GMERemittance/Module/TransactionHistory/Application Logic/Service/TransactionHistoryServiceType.swift +++ b/GMERemittance/Module/TransactionHistory/Application Logic/Service/TransactionHistoryServiceType.swift @@ -20,7 +20,7 @@ protocol FetchTransactionHistoryService: ApiServiceType { extension FetchTransactionHistoryService { func fetchTransactionHistories(user: String, success: @escaping (([TransactionModel]) -> ()), failure: @escaping ((Error) -> ())) { let url = baseUrl + "mobile/tranhistory/" + "\(user)" - self.auth.request(method: .post, url: url, params: nil, success: { (response: TransactionModelContainer) in + self.auth.request(method: .get, url: url, params: nil, success: { (response: TransactionModelContainer) in if (response.errorCode ?? "") == "1" { let error = NSError.init(domain: "Network", code: 0, userInfo: [NSLocalizedDescriptionKey : response.message ?? ""]) failure(error) diff --git a/GMERemittance/Module/TransactionHistory/User Interface/Presenter/TransactionHistoryPresenter.swift b/GMERemittance/Module/TransactionHistory/User Interface/Presenter/TransactionHistoryPresenter.swift index 7736e70c..3097838d 100644 --- a/GMERemittance/Module/TransactionHistory/User Interface/Presenter/TransactionHistoryPresenter.swift +++ b/GMERemittance/Module/TransactionHistory/User Interface/Presenter/TransactionHistoryPresenter.swift @@ -30,6 +30,7 @@ class TransactionHistoryPresenter { extension TransactionHistoryPresenter: TransactionHistoryModuleInterface { func viewIsReady() { + self.view?.showLoading() interactor?.viewIsReady() } @@ -54,10 +55,12 @@ extension TransactionHistoryPresenter: TransactionHistoryModuleInterface { extension TransactionHistoryPresenter: TransactionHistoryInteractorOutput { func show(error: Error) { + self.view?.hideLoading() self.view?.show(error: error.localizedDescription) } func show(models: [TransactionModel]) { + self.view?.hideLoading() self.view?.show(models: models) self.models = models self.filteredModels = self.models diff --git a/GMERemittance/Module/TransactionHistory/User Interface/View/Cell/TransactionHistoryTableViewCell.swift b/GMERemittance/Module/TransactionHistory/User Interface/View/Cell/TransactionHistoryTableViewCell.swift index 5b1d012a..99141255 100644 --- a/GMERemittance/Module/TransactionHistory/User Interface/View/Cell/TransactionHistoryTableViewCell.swift +++ b/GMERemittance/Module/TransactionHistory/User Interface/View/Cell/TransactionHistoryTableViewCell.swift @@ -26,7 +26,7 @@ class TransactionHistoryTableViewCell: UITableViewCell { func setup() { - self.dateLabel.text = model?.paidDate + self.dateLabel.text = model?.sendDate self.amountLabel.text = model?.pAmt self.paymentMethodLabel.text = model?.payOutMode self.nameLabel.text = model?.user diff --git a/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift b/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift index e3682658..27ea3b39 100644 --- a/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift +++ b/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift @@ -74,7 +74,7 @@ extension TransactionHistoryViewController: TransactionHistoryViewInterface { } func hideLoading() { - self.hideLoading() + self.hideProgressHud() } func show(error: String) {