diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 5afd34bc..a81939c1 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -8935,8 +8935,10 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); + MARKETING_VERSION = 1.6.0; ONLY_ACTIVE_ARCH = YES; + "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der"; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", @@ -8982,8 +8984,10 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); + MARKETING_VERSION = 1.6.0; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", "-ObjC", diff --git a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift index 5ac67dcc..b5115230 100644 --- a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift +++ b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift @@ -652,6 +652,7 @@ extension HomeViewController { messageTitleLabel.text = "Change Password" messageLabel.text = "Please change your password" messageLeftImageview.image = UIImage(named: "Documents") + messageView.isUserInteractionEnabled = true let tap = UITapGestureRecognizer(target: self, action: #selector(self.changePassword(_:))) messageView.addGestureRecognizer(tap) } @@ -663,6 +664,7 @@ extension HomeViewController { messageTitleLabel.text = "change_txn_pin".localized() messageLabel.text = "change_txn_pin_detail".localized() messageLeftImageview.image = UIImage(named: "Documents") + messageView.isUserInteractionEnabled = true let tap = UITapGestureRecognizer(target: self, action: #selector(self.changetxnPin(_:))) messageView.addGestureRecognizer(tap) } @@ -674,6 +676,7 @@ extension HomeViewController { messageTitleLabel.text = "setup_new_pin_title".localized() messageLabel.text = "setup_new_pin_body".localized() messageLeftImageview.image = UIImage(named: "Documents") + messageView.isUserInteractionEnabled = true let tap = UITapGestureRecognizer(target: self, action: #selector(self.setupTxnPin(_:))) messageView.addGestureRecognizer(tap) } @@ -685,6 +688,7 @@ extension HomeViewController { messageTitleLabel.text = "change_txn_pin_n_pass".localized() messageLabel.text = "change_txn_pin_n_pass_detail".localized() messageLeftImageview.image = UIImage(named: "Documents") + messageView.isUserInteractionEnabled = true let tap = UITapGestureRecognizer(target: self, action: #selector(changePinAndPassword(_:))) messageView.addGestureRecognizer(tap) } @@ -697,12 +701,14 @@ extension HomeViewController { messageLabel.text = StringConstants().soonToUseGmeServicesTitle messageLeftImageview.image = UIImage(named: "Documents") if user?.agreeYn?.lowercased() == "false" { + messageView.isUserInteractionEnabled = true DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 3) { let w = NewRegisterWireframe.init() w.isFrom = true w.open(on: self, step: .terms) } } + messageView.isUserInteractionEnabled = false } private func showKycIncompleteMessage() { @@ -712,6 +718,7 @@ extension HomeViewController { messageTitleLabel.text = "kyc_fill_text".localized() messageLabel.text = "complete_your_registration_text".localized() messageLeftImageview.image = UIImage(named: "Documents") + messageView.isUserInteractionEnabled = true let tap = UITapGestureRecognizer(target: self, action: #selector(self.handleTap(_:))) messageView.addGestureRecognizer(tap) } @@ -723,6 +730,7 @@ extension HomeViewController { messageTitleLabel.text = "Verify email" messageLabel.text = "Please click here to verify your email address" messageLeftImageview.image = UIImage(named: "Documents") + messageView.isUserInteractionEnabled = true let tap = UITapGestureRecognizer(target: self, action: #selector(otpVerificationTapped(_:))) messageView.addGestureRecognizer(tap) } diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard index d6b18224..b41244c6 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard @@ -33,16 +33,16 @@ - + - + - + - + @@ -306,8 +306,8 @@ -