From a2eecb73c0337b7d330b46eab09645c44f098f57 Mon Sep 17 00:00:00 2001 From: "stepie.ub" Date: Tue, 30 May 2023 13:50:34 +0545 Subject: [PATCH] bug fixes --- GME Remit.xcodeproj/project.pbxproj | 1 + .../Home/User Interface/View/Home.storyboard | 6 +-- .../View/SetupRecipient.storyboard | 36 ++----------- .../View/SetupRecipientViewController.swift | 12 +++-- .../Wireframe/SetupRecipientWireframe.swift | 53 ++++++++++++++----- .../TermsAndConditionInteractor.swift | 2 +- 6 files changed, 54 insertions(+), 56 deletions(-) diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 91c46bb0..77c822dc 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -8967,6 +8967,7 @@ DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; + "EXCLUDED_ARCHS[sdk=*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", diff --git a/GME Remit/Modules/Home/User Interface/View/Home.storyboard b/GME Remit/Modules/Home/User Interface/View/Home.storyboard index 86da9b70..4c01a97b 100644 --- a/GME Remit/Modules/Home/User Interface/View/Home.storyboard +++ b/GME Remit/Modules/Home/User Interface/View/Home.storyboard @@ -37,7 +37,7 @@ - + @@ -288,7 +288,7 @@ - + @@ -308,8 +308,8 @@ + - diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard index 6764aaca..b7da7a2d 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard @@ -1,9 +1,9 @@ - + - + @@ -26,7 +26,7 @@ - + @@ -590,14 +590,6 @@ - - - - - - - - @@ -649,24 +641,6 @@ - - - - - - - - - - - - - - - - - - @@ -745,10 +719,6 @@ - - - - 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 8cce22a0..284fdf9f 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift @@ -114,7 +114,7 @@ class SetupRecipientViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - title = "send_money_title_text".localized() + self.navigationItem.title = "send_money_title_text".localized() setupNormalNavigation() // accountTextField.delegate = self lastNameTextField.delegate = self @@ -421,6 +421,7 @@ extension SetupRecipientViewController { } self.viewModel?.presenter?.gotoSendMoney(recipient, paymentMethod) } + // self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return } @@ -432,10 +433,11 @@ extension SetupRecipientViewController { }, cancelAction: { [weak self] in guard let `self` = self else { return } self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return } - self.delegate?.setupRecieient( - self, - didSelectRecipientID: nil - ) + self.navigationController?.popToRootViewController(animated: true) +// self.delegate?.setupRecieient( +// self, +// didSelectRecipientID: nil +// ) } }) } diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift index 00634fce..6313903f 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift @@ -73,13 +73,19 @@ extension SetupRecipientWireframe: SetupRecipientWireframeInput { recipient = model sendReciptent = completion let viewcontroller = getMainView() - let navigationController = UINavigationController( - rootViewController: viewcontroller - ) - navigationController.hero.isEnabled = true - navigationController.modalPresentationStyle = .overFullScreen -// base.navigationController.push(getMainView(), animated: true) - base.present(navigationController, animated: true) +// let navigationController = UINavigationController( +// rootViewController: viewcontroller +// ) + + if let navVC = base.navigationController { + // let wireframe = BeneficiaryDetailWireframe() + navVC.push(viewcontroller, animated: true) + } + +// navigationController.hero.isEnabled = true +// navigationController.mxodalPresentationStyle = .overFullScreen +//// base.navigationController.push(getMainView(), animated: true) +// base.present(navigationController, animated: true) } @@ -94,12 +100,19 @@ extension SetupRecipientWireframe: SetupRecipientWireframeInput { self.delegate = delegate self.parentType = parentType let viewcontroller = getMainView() - let navigationController = UINavigationController( - rootViewController: viewcontroller - ) - navigationController.hero.isEnabled = true - navigationController.modalPresentationStyle = .overFullScreen - base.present(navigationController, animated: true, completion: completion) + +// let navigationController = UINavigationController( +// rootViewController: viewcontroller +// ) +// navigationController.hero.isEnabled = true +// navigationController.modalPresentationStyle = .overFullScreen +// base.present(navigationController, animated: true, completion: completion) + if let navVC = base.navigationController { +// let wireframe = BeneficiaryDetailWireframe() +// wireframe.recipient = reciptent + navVC.push(viewcontroller, animated: true) + } + } func openSelectMode(with model: [TablePresenterProtocol], type: SetupOpenType) { @@ -197,7 +210,19 @@ extension SetupRecipientWireframe: TablePresenterDelegate { wireframe.output = self.presenter wireframe.viewModel = self.viewModel wireframe.paymentMethod = paymentMethod - wireframe.open(for: recipientData, in: navigationVC) + + guard let parentVC = self.view.presentingViewController else { + wireframe.open(for: recipientData, in: navigationVC) + + return + } + + guard let parentNavVC = parentVC.navigationController else { + return + } + + wireframe.open(for: recipientData, in: parentNavVC) + navigationVC.navigationController?.popToRootViewController(animated: true) } } diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift index 6cded540..3e0bad0d 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift @@ -149,7 +149,7 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput { "PayOutPartner": reciepient.payoutPartner ?? reciepient.paymentMethod?.payoutPartner ?? "", "IsAgreed": "TRUE", "TxnPassword": model.transactionPassword ?? "", - "ReceiverAccountNo": paymentModel?.agent?.accountNumber ?? "", + "ReceiverAccountNo": paymentModel?.agent?.accountNumber ?? reciepient.agent?.accountNumber ?? "", "ProcessId": "", // "schemeId": "", "isUseBiometric": model.isUseBiometric ?? false,