From 0fbbf97e3425b8b723f86cd8370d00e00fd3915b Mon Sep 17 00:00:00 2001 From: Dibya Date: Sun, 28 May 2023 16:03:06 +0545 Subject: [PATCH] flow resolved --- GME Remit.xcodeproj/project.pbxproj | 1 + .../Presenter/SetupRecipientPresenter.swift | 2 +- .../View/SetupRecipientViewController.swift | 13 ++++++++++--- .../View/ViewModel/SetupRecipientViewModel.swift | 2 +- .../View/TermsAndConditionViewController.swift | 12 +++++++----- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index ebc6c98a..5afd34bc 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -8965,6 +8965,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Presenter/SetupRecipientPresenter.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Presenter/SetupRecipientPresenter.swift index 1547afd3..a33776cf 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Presenter/SetupRecipientPresenter.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Presenter/SetupRecipientPresenter.swift @@ -66,7 +66,7 @@ extension SetupRecipientPresenter: SetupRecipientModuleInterface { func saveRecipient(at recipient: Recipient, parentType: RecipientParentType, viewcontroller: SetupRecipientViewController) { viewModel?.progress(isShow: true) - if recipient.receiverID == nil { + if recipient.receiverID == "" { interactor?.addRecipient(at: recipient) } else { self.recipient = recipient diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift index 7ad69235..d4f1f79b 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift @@ -94,7 +94,11 @@ class SetupRecipientViewController: UIViewController { // MARK: VC's Life cycle var receiverID: String? = "" - var receiver: Recipient? + var receiver: Recipient? { + didSet { + self.receiverID = receiver?.paymentMethod?.receiverId + } + } var setnativeCountryFirst: Bool = false var countryCode: String = "" @@ -289,7 +293,7 @@ extension SetupRecipientViewController { let saveTrigger = saveButton.rx.tap.flatMap { [weak self] _ -> Observable in var recipient = Recipient() - + recipient.receiverID = recipient.paymentMethod?.receiverId recipient.firstName = self?.firstNameTextField.text recipient.middleName = self?.middleNameTextField.text recipient.lastName = self?.lastNameTextField.text @@ -312,11 +316,14 @@ extension SetupRecipientViewController { recipient.agent = recipients.paymentMethod?.agent } } + recipient.receiverID = self?.receiverID ?? "" + recipient.paymentMethod?.receiverId = self?.receiverID ?? "" // recipient.purposeOfRemit = self?.reasonTextField.text // recipient.purposeOfRemitID = self?.reasonTextField.text return Observable.just(recipient) + }.asDriverOnErrorJustComplete() let input = SetupRecipientViewModel.Input( @@ -658,7 +665,7 @@ extension SetupRecipientViewController { } private func setText(with recipient: Recipient?) { - self.receiverID = recipient?.receiverID ?? "" +// self.receiverID = recipient?.paymentMethod?.receiverId ?? "" fullNameTextField.text = recipient?.fullName?.uppercased() fullNameTextField.sendActions(for: .editingChanged) diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift index 3e4f85aa..9c9d5ddd 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift @@ -195,7 +195,7 @@ class SetupRecipientViewModel: ViewModelType { let selectedNativeCountry = try? self.selectedNativeCountryLinker.value() var recipient = $0 - recipient.receiverID = selectedRecipient?.receiverID +// recipient.receiverID = selectedRecipient?.receiverID recipient.country = selectedCountry?.countryName recipient.countryID = selectedCountry?.countryId diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift index 8fcc7870..67dad1c3 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift @@ -164,11 +164,13 @@ extension TermsAndConditionViewController: TermsAndConditionViewInterface { cancelTitle: "no_text".localized(), okAction: { [weak self] in guard let `self` = self else { return } self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return } - self.delegate?.setupRecieientForTermsVC( - self, - didSelectRecipientID: self.reciepient?.receiverID ?? "" - ) - } + self.delegate?.setupRecieientForTermsVC( + self, + didSelectRecipientID: self.reciepient?.receiverID ?? "" + ) + + + } }, cancelAction: { [weak self] in guard let `self` = self else { return } self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return }