diff --git a/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift b/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift
index 0f3c9122..66d1720e 100644
--- a/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift
+++ b/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift
@@ -145,12 +145,12 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
@IBAction func touchSupportBarButton(_ sender: UIBarButtonItem) {
let alert = UIAlertController(title: nil, message: "help_you_text".localized(), preferredStyle: .actionSheet)
- let liveChat = UIAlertAction(title: "Live Chat", style: .default) { UIAlertAction in
+ let liveChat = UIAlertAction(title: "live_chat_text".localized(), style: .default) { UIAlertAction in
self.alertWithOkCancel(
- message: "Do you wanna start chat?",
- title: "Chat",
- okTitle: "Yes",
- cancelTitle: "No",
+ message: "check_start_chat_text".localized(),
+ title: "check_start_chat_title_text".localized(),
+ okTitle: "yes_text".localized(),
+ cancelTitle: "no_text".localized(),
okAction: {
if !ChannelIO.isBooted {
self.setChannelIO()
diff --git a/GMERemittance/Module/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift b/GMERemittance/Module/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift
index b249d554..d9c9d437 100644
--- a/GMERemittance/Module/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift
+++ b/GMERemittance/Module/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift
@@ -66,7 +66,7 @@ class KycForm1ViewController: UIViewController {
let email = "email_text_optional".localized()
let emailPlaceholder = "placeholder_enter_receiver_email_text".localized()
let dob = "dob_text".localized()
- let dobPlaceholder = "select_dob_text".localized()
+ let dobPlaceholder = "dob_valid_error".localized()
let gender = "gender_text".localized()
let genderPlacholder = "gender_placeholder_text".localized()
let addressInKorea = "address_in_korea_text".localized()
@@ -277,6 +277,15 @@ class KycForm1ViewController: UIViewController {
self.provinceTextField.titleFont = titleFont
self.occupationTextField.titleFont = titleFont
self.referralCodeTextField.titleFont = titleFont
+
+ self.firstNameTextField.statusImageView.isHidden = true
+ self.emailTextField.statusImageView.isHidden = true
+ self.dobTextField.statusImageView.isHidden = true
+ self.genderTextField.statusImageView.isHidden = true
+ self.addressTextField.statusImageView.isHidden = true
+ self.provinceTextField.statusImageView.isHidden = true
+ self.occupationTextField.statusImageView.isHidden = true
+ self.referralCodeTextField.statusImageView.isHidden = true
}
private func setError(){
@@ -549,7 +558,7 @@ extension KycForm1ViewController {
dob: dobTextField.text ?? "",
mobile: GMEDB.shared.user.string(.mobileNumber) ?? "",
email: emailTextField.text ?? "",
- nativeCountry: GMEDB.shared.user.string(.country) ?? "",
+ nativeCountry: GMEDB.shared.user.string(.countryID) ?? "",
country: addressTextField.text ?? "",
province: selectedProvience?.id ?? "",
occupation: selectedOccupation?.id ?? "",
diff --git a/GMERemittance/Module/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift b/GMERemittance/Module/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift
index ffad1e48..53344418 100644
--- a/GMERemittance/Module/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift
+++ b/GMERemittance/Module/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift
@@ -321,6 +321,14 @@ class KycForm2ViewController: UIViewController {
self.headerTitleLabel.text = StringConstants().headerTitle
self.saveAndContinueButton.setTitle("save_and_continue_text".localized(), for: UIControl.State.normal)
+
+ bankTextField.statusImageView.isHidden = true
+ accountNumberTextField.statusImageView.isHidden = true
+ verificationIdTextField.statusImageView.isHidden = true
+ verificationIdNumberTextField.statusImageView.isHidden = true
+ issueDateTextField.statusImageView.isHidden = true
+ expiryDateTextField.statusImageView.isHidden = true
+ sourceOfFundTextField.statusImageView.isHidden = true
}
private func setupHiddenFields() {
diff --git a/GMERemittance/Module/RegisterModules/Register/User Interface/View/Register.storyboard b/GMERemittance/Module/RegisterModules/Register/User Interface/View/Register.storyboard
index 07fae080..ca40897d 100644
--- a/GMERemittance/Module/RegisterModules/Register/User Interface/View/Register.storyboard
+++ b/GMERemittance/Module/RegisterModules/Register/User Interface/View/Register.storyboard
@@ -33,7 +33,7 @@
-
+
-
+
-
+
@@ -209,11 +209,11 @@
-
+
-
-
-
+
+
+
diff --git a/GMERemittance/Module/RegisterModules/Register/User Interface/View/RegisterViewController.swift b/GMERemittance/Module/RegisterModules/Register/User Interface/View/RegisterViewController.swift
index 815e4660..25fbc118 100644
--- a/GMERemittance/Module/RegisterModules/Register/User Interface/View/RegisterViewController.swift
+++ b/GMERemittance/Module/RegisterModules/Register/User Interface/View/RegisterViewController.swift
@@ -18,7 +18,7 @@ class RegisterViewController: UIViewController {
let useridError = "userid_error_text".localized()
let passwordTitle = "password_text".localized()
- let passwordPlaceholder = "create_password_text".localized()
+ let passwordPlaceholder = "password_policy_error".localized()
let passwordError = "password_policy_error".localized()
let confirmPasswordTitle = "confirm_password_text".localized()
@@ -150,12 +150,16 @@ class RegisterViewController: UIViewController {
subHeaderLabel.text = StringConstants().registerSubtitle
alreadyHaveAccountLabel.text = StringConstants().alreadyHaveAccountText
+ idTextField.statusImageView.isHidden = true
+ passwordTextField.statusImageView.isHidden = true
+ nativeCountryTextField.statusImageView.isHidden = true
+ mobileTextField.statusImageView.isHidden = true
idTextField.titleText = StringConstants().userIdTitle
idTextField.titleFont = font
idTextField.placeholder = StringConstants().useridPlaceholder
idTextField.errorMessage = StringConstants().useridError
- idTextField.validCondition = {$0.count > 5}
+ idTextField.validCondition = {3 < $0.count && $0.count < 16}
passwordTextField.titleText = StringConstants().passwordTitle
passwordTextField.titleFont = font
@@ -232,6 +236,10 @@ extension RegisterViewController: RegisterViewInterface {
func show(message: String) {
self.alertWithOk(type: .normal, message: message, title: "Success", okTitle: "Ok") {
+ //TODO: save native country and mobile number at GMEDB
+ GMEDB.shared.user.set(self.selectedNativeCountry?.code, .countryID)
+ GMEDB.shared.user.set(self.mobileTextField.text, .mobileNumber)
+
self.presenter?.login()
}
}
diff --git a/GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift b/GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift
index e3bac91d..e0aa9131 100644
--- a/GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift
+++ b/GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift
@@ -190,8 +190,8 @@ class SplashScreenViewController: UIViewController {
self.alertWithOkCancel(
message: "Do you wanna start chat?",
title: "Chat",
- okTitle: "Yes",
- cancelTitle: "No",
+ okTitle: "yes_text".localized(),
+ cancelTitle: "no_text".localized(),
okAction: {
if !ChannelIO.isBooted {
self.setChannelIO()
diff --git a/GMERemittance/Utility/Database/GMEDB.swift b/GMERemittance/Utility/Database/GMEDB.swift
index b8fc8d12..fc1588ae 100644
--- a/GMERemittance/Utility/Database/GMEDB.swift
+++ b/GMERemittance/Utility/Database/GMEDB.swift
@@ -51,6 +51,7 @@ class GMEDB {
case idType
case idNumber
case countryCode
+ case countryID
case ErrorCode
case hasRequestedPennyTest
case isPennyTestPending
diff --git a/Pods/ValidationTextField/ValidationTextField/Classes/ValidationTextField.swift b/Pods/ValidationTextField/ValidationTextField/Classes/ValidationTextField.swift
index 5071ab5f..1c28109d 100644
--- a/Pods/ValidationTextField/ValidationTextField/Classes/ValidationTextField.swift
+++ b/Pods/ValidationTextField/ValidationTextField/Classes/ValidationTextField.swift
@@ -136,6 +136,8 @@ open class ValidationTextField: UITextField {
open var errorImage: UIImage?
+ open lazy var statusImageView = UIImageView()
+
private lazy var titleLabel = UILabel()
private lazy var errorLabel = UILabel()
@@ -144,8 +146,6 @@ open class ValidationTextField: UITextField {
private lazy var containerView = UIStackView()
- private lazy var statusImageView = UIImageView()
-
private var validateStatus: ValidateType = .ready {
didSet {
switch validateStatus {
diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings
index 96c9b912..b6c231b1 100644
--- a/en.lproj/Localizable.strings
+++ b/en.lproj/Localizable.strings
@@ -513,6 +513,9 @@
// ChannelIO
"channelIO_error_message_text" = "Service not available.";
+"check_start_chat_text" = "Do you wanna start chat?";
+"check_start_chat_title_text" = "Chat";
+"live_chat_text" = "Live Chat";
// Thunes for Myanmar
"id_type_title_text" = "ID Type (Optional)";
@@ -523,4 +526,4 @@
// New Register
"userid_title_text" = "User ID";
"userid_placeholder_text" = "Enter your ID for using GME";
-"userid_error_text" = "ID must be at least 6 characters";
+"userid_error_text" = "ID must be at least 4 characters to 15 character";