diff --git a/.DS_Store b/.DS_Store index 8c68aba6..2e9cf908 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Interactor/RecipientsInteractor.swift b/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Interactor/RecipientsInteractor.swift index a673dac6..6fe7926d 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Interactor/RecipientsInteractor.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Interactor/RecipientsInteractor.swift @@ -15,7 +15,7 @@ class RecipientsInteractor { weak var output: RecipientsInteractorOutput? private let service: RecipientsServiceType - private var recipients: [Recipient]? + private var recipients: FetchBeneficiariesModel? // MARK: Initialization @@ -57,8 +57,8 @@ extension RecipientsInteractor: RecipientsInteractorInput { private func fetchRecipients() { service.fetchRecipients( success: { - self.recipients = $0.recipients?.beneficiaries - self.output?.setRecipients(using: $0.recipients?.beneficiaries ?? []) + self.recipients = $0.recipients + self.output?.setRecipients(using: $0.recipients) }, failure: { self.output?.setError(with:$0) } ) diff --git a/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Interactor/RecipientsInteractorIO.swift b/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Interactor/RecipientsInteractorIO.swift index 34daff36..10e8a508 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Interactor/RecipientsInteractorIO.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Interactor/RecipientsInteractorIO.swift @@ -12,6 +12,6 @@ protocol RecipientsInteractorInput: class { } protocol RecipientsInteractorOutput: class { - func setRecipients(using model: [Recipient]) + func setRecipients(using model: FetchBeneficiariesModel?) func setError(with error: Error) } diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/Presenter/RecipientsPresenter.swift b/GME Remit/Modules/RecipientModules/Recipients/User Interface/Presenter/RecipientsPresenter.swift index 1e2d0be4..0aac3614 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/Presenter/RecipientsPresenter.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/Presenter/RecipientsPresenter.swift @@ -47,7 +47,7 @@ extension RecipientsPresenter: RecipientsModuleInterface { // MARK: Recipients interactor output interface extension RecipientsPresenter: RecipientsInteractorOutput { - func setRecipients(using model: [Recipient]) { + func setRecipients(using model: FetchBeneficiariesModel?) { viewModel?.progress(isShow: false) viewModel?.setRecipients(using: model) } diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard index 359cb8bb..2a6916aa 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard +++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard @@ -1,9 +1,9 @@ - + - + @@ -28,7 +28,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -296,13 +296,13 @@ - + - + - + @@ -477,16 +477,19 @@ - + - + diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/ViewModel/RecipientsViewModel.swift b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/ViewModel/RecipientsViewModel.swift index 2a8a188d..49a7926b 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/ViewModel/RecipientsViewModel.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/ViewModel/RecipientsViewModel.swift @@ -158,14 +158,14 @@ class RecipientsViewModel: ViewModelType { // MARK: - RecipientsViewModelInterface extension RecipientsViewModel: RecipientsViewModelInterface { - func setRecipients(using model: [Recipient]) { - recipientsLinker.onNext(model) + func setRecipients(using model: FetchBeneficiariesModel?) { + recipientsLinker.onNext(model?.beneficiaries ?? []) guard let selectedID = selectedRecipientID else { return } - selectedRecipient = model.filter({$0.receiverID == selectedID}).first + selectedRecipient = model?.beneficiaries?.filter({$0.receiverID == selectedID}).first if let receipnt = selectedRecipient{ presenter?.openSendMoneyCalculate(who: receipnt) diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/ViewModel/RecipientsViewModelInterface.swift b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/ViewModel/RecipientsViewModelInterface.swift index e6f6ceca..e369b1ef 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/ViewModel/RecipientsViewModelInterface.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/ViewModel/RecipientsViewModelInterface.swift @@ -7,7 +7,7 @@ // protocol RecipientsViewModelInterface: class { - func setRecipients(using model: [Recipient]) + func setRecipients(using model: FetchBeneficiariesModel?) func setError(with error: Error) func progress(isShow: Bool)