diff --git a/GME Remit/Modules/Notice/NotificationHistory/User Interface/Presenter/NotificationHistoryPresenter.swift b/GME Remit/Modules/Notice/NotificationHistory/User Interface/Presenter/NotificationHistoryPresenter.swift index 0f4359c4..36100865 100644 --- a/GME Remit/Modules/Notice/NotificationHistory/User Interface/Presenter/NotificationHistoryPresenter.swift +++ b/GME Remit/Modules/Notice/NotificationHistory/User Interface/Presenter/NotificationHistoryPresenter.swift @@ -23,12 +23,12 @@ class NotificationHistoryPresenter: ViewModelType { let isProgress: Driver let models: Driver<[NoticeModel]> } - + private let disposeBag = DisposeBag() private let progressLinker = PublishSubject() private let errorLinker = PublishSubject() - + private let model = PublishSubject<[NoticeModel]>() func transform(input: Input) -> Output { @@ -45,7 +45,7 @@ class NotificationHistoryPresenter: ViewModelType { .drive(onNext: {[weak self] in self?.wireframe?.detail(index: $0.key ?? "") }).disposed(by: disposeBag) - + return Output( isError: errorLinker.asDriverOnErrorJustComplete(), isProgress: progressLinker.asDriverOnErrorJustComplete(), @@ -58,7 +58,11 @@ class NotificationHistoryPresenter: ViewModelType { extension NotificationHistoryPresenter: NotificationHistoryInteractorOutput { func setNotices(with model: [NoticeModel]) { progressLinker.onNext(false) - self.model.onNext(model) + let filteredDate = model.sorted(by: { (noticeModel1, noticeModel2) -> Bool in + return noticeModel1.date ?? "" > noticeModel2.date ?? "" + }) + + self.model.onNext(filteredDate) } func setError(with error: Error) { diff --git a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistoryViewController.swift b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistoryViewController.swift index e8f147b0..e5d4330a 100644 --- a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistoryViewController.swift +++ b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistoryViewController.swift @@ -45,7 +45,7 @@ class NotificationHistoryViewController: UIViewController { } // MARK: IBActions - + } // MARK: Other Functions @@ -66,7 +66,7 @@ extension NotificationHistoryViewController { self?.dismiss(animated: true) }.disposed(by: disposeBag) } - + private func setBinding() { let viewWillAppear = rx.sentMessage(#selector(UIViewController.viewWillAppear(_:))) .mapToVoid().asDriverOnErrorJustComplete() @@ -77,15 +77,15 @@ extension NotificationHistoryViewController { ) let output = presenter.transform(input: input) - + output.isError - .drive( - onNext: { self.alert(type: .error, message: $0.localizedDescription) } + .drive( + onNext: { self.alert(type: .error, message: $0.localizedDescription) } ).disposed(by: disposeBag) output.isProgress - .drive( - onNext: { $0 ? self.showProgressHud() : self.hideProgressHud() } + .drive( + onNext: { $0 ? self.showProgressHud() : self.hideProgressHud() } ).disposed(by: disposeBag) output