diff --git a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift index 1f71bc51..28b8ae6d 100644 --- a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift +++ b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift @@ -141,6 +141,7 @@ class ExistingUserRegistrationViewController: UIViewController { case dobTxtField: validDic["dob"] = dobTxtField.isValid case mobNoTxtField: + textField.text = String(textField.text!.prefix(13)) textField.removeNonASCII() if textField.text?.prefix(3) != "+81" { if textField.text?.count == 1 { @@ -150,7 +151,6 @@ class ExistingUserRegistrationViewController: UIViewController { } } validDic["mobNum"] = mobNoTxtField.isValid - default: () } isValid = validDic.allSatisfy { $0.value } @@ -169,7 +169,7 @@ class ExistingUserRegistrationViewController: UIViewController { mobNoTxtField.titleText = StringConstants().mobileNumberTitle mobNoTxtField.placeholder = StringConstants().mobileNumberTitle mobNoTxtField.errorMessage = StringConstants().mobileNumberError - mobNoTxtField.validCondition = { $0.count == 13} + mobNoTxtField.validCondition = { $0.count >= 13} headerTitle.text = "existing_jme_user_registration_text".localized() existingUserDescription.text = StringConstants().existingUserDesc diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift index 8edb80d9..d88e1132 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift @@ -244,7 +244,7 @@ class ExistingUserKycViewController: UIViewController { // sourceOfFund.validCondition = {!$0.isEmpty} occupationTextField.validCondition = {!$0.isEmpty} monthlyIncome.validCondition = {!$0.isEmpty} - mobileNumber.validCondition = {!$0.isEmpty && $0.count > 13} + mobileNumber.validCondition = {!$0.isEmpty && $0.count >= 13} businessType.validCondition = {!$0.isEmpty} // emailAddress.validCondition = {$0.isEmail()} address.validCondition = {!$0.isEmpty && $0.count < 50} @@ -261,6 +261,7 @@ class ExistingUserKycViewController: UIViewController { switch textField { case mobileNumber: textField.removeNonASCII() + textField.text = String(textField.text!.prefix(13)) if textField.text?.prefix(3) != "+81" { if textField.text?.count == 1 { textField.text = "+81" + (textField.text ?? "") 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 f0643032..811eb00d 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 @@ -1,9 +1,9 @@ - + - + @@ -33,16 +33,16 @@ - + - + - + - + @@ -189,7 +189,7 @@ - + @@ -307,7 +307,7 @@