diff --git a/GME Remit/Modules/Home/User Interface/Wireframe/HomeWireframe.swift b/GME Remit/Modules/Home/User Interface/Wireframe/HomeWireframe.swift index 02dd7020..61002bce 100644 --- a/GME Remit/Modules/Home/User Interface/Wireframe/HomeWireframe.swift +++ b/GME Remit/Modules/Home/User Interface/Wireframe/HomeWireframe.swift @@ -74,10 +74,7 @@ extension HomeWireframe: HomeWireframeInput { } func openKyc() { - KycWireframe().openViewControllerWithNavigation( - viewController: KycWireframe().getMainView(), - source: view - ) + NewRegisterWireframe().open(on: view, step: .first) } func showPennyTestSubmit() { diff --git a/GME Remit/Modules/RegisterModules/Register/User Interface/Wireframe/RegisterWireframe.swift b/GME Remit/Modules/RegisterModules/Register/User Interface/Wireframe/RegisterWireframe.swift index 9ad6ede2..18157dec 100644 --- a/GME Remit/Modules/RegisterModules/Register/User Interface/Wireframe/RegisterWireframe.swift +++ b/GME Remit/Modules/RegisterModules/Register/User Interface/Wireframe/RegisterWireframe.swift @@ -50,8 +50,8 @@ extension RegisterWireframe: RegisterWireframeInput { } func showKyc() { - view.navigationController?.pushViewController(KycWireframe().getMainView(), animated: true) - // FIXME: FOR NEW REGISTRATION -// view.navigationController?.pushViewController(NewRegisterWireframe().getMainView(), animated: true) + if let navigation = self.view.navigationController { + NewRegisterWireframe().pushMainView(in: navigation) + } } } diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegisterViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegisterViewController.swift index 65375554..c458f8e4 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegisterViewController.swift +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegisterViewController.swift @@ -57,6 +57,7 @@ class NewRegisterViewController: UIViewController { title = "For remittance" setupNormalNavigation() setupNavigationShadow(isUse: true) + navigationItem.setHidesBackButton(true, animated: true) } override func viewWillDisappear(_ animated: Bool) { diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift index 41900bf9..a0547c4d 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift @@ -45,6 +45,16 @@ extension NewRegisterWireframe: NewRegisterWireframeInput { return viewController } + func open(on viewcontroller: UIViewController, step: NewRegisterViewController.Step) { + let vc = getMainView() + let naviVC = UINavigationController(rootViewController: vc) + naviVC.modalPresentationStyle = .fullScreen + + stepper?.onNext(step) + + viewcontroller.present(naviVC, animated: true, completion: nil) + } + func moveStep(to step: NewRegisterViewController.Step) { switch step { case .first: move(step1VC) diff --git a/GME Remit/Modules/SplashScreen/User Interface/Wireframe/SplashScreenWireframe.swift b/GME Remit/Modules/SplashScreen/User Interface/Wireframe/SplashScreenWireframe.swift index db85b091..44d04c3b 100644 --- a/GME Remit/Modules/SplashScreen/User Interface/Wireframe/SplashScreenWireframe.swift +++ b/GME Remit/Modules/SplashScreen/User Interface/Wireframe/SplashScreenWireframe.swift @@ -42,8 +42,7 @@ extension SplashScreenWireframe: SplashScreenWireframeInput { func register() { if let navigation = self.view.navigationController { -// registerWireFrame.openRegistrationFromSplash(source: navigation) - NewRegisterWireframe().pushMainView(in: navigation) + registerWireFrame.openRegistrationFromSplash(source: navigation) } } } diff --git a/GME Remit/Utilities/CustomUI/ValidationTextField.swift b/GME Remit/Utilities/CustomUI/ValidationTextField.swift index ec9edf48..8d5c4931 100644 --- a/GME Remit/Utilities/CustomUI/ValidationTextField.swift +++ b/GME Remit/Utilities/CustomUI/ValidationTextField.swift @@ -260,8 +260,7 @@ import RxSwift model: item, source: parentVC ) - default : - keyboardToolbar.isHidden = false + default: () } }