edit mobile placeholder

GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRates.storyboard

@@ -358,7 +358,7 @@
                                                 </subviews>
                                             </stackView>
                                             <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H6t-AW-Fpn">
-                                                <rect key="frame" x="30" y="587" width="315" height="50"/>
+                                                <rect key="frame" x="10" y="587" width="355" height="50"/>
                                                 <color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="50" id="pHQ-HE-Zh2"/>
@@ -379,13 +379,13 @@
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
-                                            <constraint firstItem="H6t-AW-Fpn" firstAttribute="leading" secondItem="Tjv-J7-eoY" secondAttribute="leading" constant="30" id="3Jp-Qx-gd9"/>
+                                            <constraint firstItem="H6t-AW-Fpn" firstAttribute="leading" secondItem="Tjv-J7-eoY" secondAttribute="leading" constant="10" id="3Jp-Qx-gd9"/>
                                             <constraint firstAttribute="trailing" secondItem="EEF-HP-StG" secondAttribute="trailing" constant="10" id="I8A-kZ-vEa"/>
-                                            <constraint firstAttribute="trailing" secondItem="H6t-AW-Fpn" secondAttribute="trailing" constant="30" id="Mbv-gP-bRl"/>
+                                            <constraint firstAttribute="trailing" secondItem="H6t-AW-Fpn" secondAttribute="trailing" constant="10" id="Mbv-gP-bRl"/>
                                             <constraint firstItem="H6t-AW-Fpn" firstAttribute="centerX" secondItem="Tjv-J7-eoY" secondAttribute="centerX" id="Qzt-CS-3AW"/>
                                             <constraint firstItem="EEF-HP-StG" firstAttribute="leading" secondItem="Tjv-J7-eoY" secondAttribute="leading" constant="10" id="ePP-lR-JCG"/>
                                             <constraint firstItem="EEF-HP-StG" firstAttribute="top" secondItem="Tjv-J7-eoY" secondAttribute="top" constant="20" id="hNL-ky-Y6q"/>
-                                            <constraint firstItem="H6t-AW-Fpn" firstAttribute="top" relation="greaterThanOrEqual" secondItem="EEF-HP-StG" secondAttribute="bottom" constant="24" id="qYs-5j-zGe"/>
+                                            <constraint firstItem="H6t-AW-Fpn" firstAttribute="top" relation="greaterThanOrEqual" secondItem="EEF-HP-StG" secondAttribute="bottom" constant="50" id="qYs-5j-zGe"/>
                                             <constraint firstAttribute="bottom" secondItem="H6t-AW-Fpn" secondAttribute="bottom" constant="30" id="sVR-Fo-Djr"/>
                                         </constraints>
                                     </view>
@@ -393,7 +393,7 @@
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstItem="Tjv-J7-eoY" firstAttribute="top" secondItem="EcO-VE-kpa" secondAttribute="top" id="7ub-qJ-iz0"/>
-                                    <constraint firstAttribute="bottom" secondItem="Tjv-J7-eoY" secondAttribute="bottom" id="KgE-9H-mKA"/>
+                                    <constraint firstAttribute="bottom" secondItem="Tjv-J7-eoY" secondAttribute="bottom" id="FMq-GO-gqB"/>
                                     <constraint firstAttribute="trailing" secondItem="Tjv-J7-eoY" secondAttribute="trailing" id="nKm-4I-j1P"/>
                                     <constraint firstItem="Tjv-J7-eoY" firstAttribute="width" secondItem="EcO-VE-kpa" secondAttribute="width" id="t7G-fK-cGt"/>
                                     <constraint firstItem="Tjv-J7-eoY" firstAttribute="leading" secondItem="EcO-VE-kpa" secondAttribute="leading" id="vdv-zb-ckQ"/>

GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift

@@ -478,6 +478,7 @@ class ExchangeRatesViewController: UIViewController {
     })
     
     setupLanguage()
+    calculateTItleLabel.layer.cornerRadius = 10
   }
   
   private func setupLanguage() {

GMERemittance/Module/RegisterModules/KYC/Kyc/User Interface/View/KycViewController.swift

@@ -1,41 +1,39 @@
- //
- //  KycViewController.swift
- //  GMERemittance
- //
- //  Created by gme_2 on 12/09/2018.
- //Copyright © 2018 Gobal Money Express Co. Ltd. All rights reserved.
- //
- 
- import UIKit
- import XLPagerTabStrip
- 
- 
- 
- protocol KYCForm1Delegate {
+//
+//  KycViewController.swift
+//  GMERemittance
+//
+//  Created by gme_2 on 12/09/2018.
+// Copyright © 2018 Gobal Money Express Co. Ltd. All rights reserved.
+//
+
+import UIKit
+import XLPagerTabStrip
+
+protocol KYCForm1Delegate {
   func _continue(model: KycForm1Model)
   func show(model: KycModel)
   func addModel(model: KycForm1Model)
- }
- 
- protocol KYCForm2Delegate {
+}
+
+protocol KYCForm2Delegate {
   func addModel(model: KycForm2Model)
   func _continue(model: KycForm2Model)
- }
- 
- protocol KYCForm3Delegate {
+}
+
+protocol KYCForm3Delegate {
   func isAllCompleted(isCompletedKYC3: Bool) -> Bool
   func submit(model: KycForm3Model)
- }
- 
- 
- class KYCRequestModel {
+}
+
+
+class KYCRequestModel {
   var kycForm1: KycForm1Model?
   var kycForm2: KycForm2Model?
   var kycForm3: KycForm3Model?
- }
- 
- 
- class KycViewController: ButtonBarPagerTabStripViewController {
+}
+
+
+class KycViewController: ButtonBarPagerTabStripViewController {
   
   enum KycViewControllers: Int {
     case form1 = 0
@@ -109,12 +107,8 @@
   
   override func viewControllers(for pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
     self.form1 = KycForm1Wireframe().getMainViewWithDelegate(delegate: self)
-    let _ = form1.view
     self.form2 = KycForm2Wireframe().getMainViewWithDelegate(delegate: self)
-    let _ = form2.view
     self.form3 = KycForm3Wireframe().getMainViewWithDelegate(delegate: self)
-    let _ = form3.view
-    
     return [form1, form2, form3]
   }
   
@@ -151,10 +145,10 @@
       self.moveToViewController(at: KycViewControllers.fomr3.rawValue)
     }
   }
- }
- 
- // MARK: KycViewInterface
- extension KycViewController: KycViewInterface {
+}
+
+// MARK: KycViewInterface
+extension KycViewController: KycViewInterface {
   
   func show(error: String) {
     self.alert(type: .error, message: error)
@@ -167,10 +161,10 @@
   func hideLoading() {
     self.hideProgressHud()
   }
- }
- 
- 
- extension KycViewController: KYCForm1Delegate {
+}
+
+
+extension KycViewController: KYCForm1Delegate {
   
   func addModel(model: KycForm1Model) {
     self.requestModel?.kycForm1 = model
@@ -188,9 +182,9 @@
   func show(model: KycModel) {
     self.kycModel = model
   }
- }
- 
- extension KycViewController: KYCForm2Delegate {
+}
+
+extension KycViewController: KYCForm2Delegate {
   
   func addModel(model: KycForm2Model) {
     self.requestModel?.kycForm2 = model
@@ -200,18 +194,18 @@
     self.requestModel?.kycForm2 = model
     moveToViewController(at: KycViewControllers.fomr3.rawValue)
   }
- }
- 
- extension KycViewController: KYCForm3Delegate {
+}
+
+extension KycViewController: KYCForm3Delegate {
   func isAllCompleted(isCompletedKYC3: Bool) -> Bool {
     return requestModel?.kycForm1?.isCompleted ?? false &&
       requestModel?.kycForm2?.isCompleted ?? false &&
-      isCompletedKYC3
+    isCompletedKYC3
   }
   
   func submit(model: KycForm3Model) {
     self.requestModel?.kycForm3 = model
     self.initiateSubmitProcess()
   }
- }
- 
+}
+

GMERemittance/Module/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift

@@ -130,7 +130,6 @@ class KycForm1ViewController: UIViewController {
   
   var presenter: KycForm1ModuleInterface?
 
-  var continueActionInitiated = false
   let datePicker = UIDatePicker()
   
   var errorTextFieldDict: [String: UITextField] = [:]
@@ -191,7 +190,6 @@ class KycForm1ViewController: UIViewController {
   override func viewWillDisappear(_ animated: Bool) {
     super.viewWillDisappear(animated)
     self.view.endEditing(true)
-    self.continueActionInitiated = false
   }
   
   
@@ -199,7 +197,6 @@ class KycForm1ViewController: UIViewController {
   
   @IBAction func save(_ sender: UIButton) {
     self.view.endEditing(true)
-    self.continueActionInitiated = true
     self.delegate?._continue(model: generateModel())
   }
   
@@ -277,6 +274,8 @@ class KycForm1ViewController: UIViewController {
     self.provinceTextField.statusImageView.isHidden = true
     self.occupationTextField.statusImageView.isHidden = true
     self.referralCodeTextField.statusImageView.isHidden = true
+    
+    saveButton.setTitle(StringConstants().saveAndCoutinueText, for: .normal)
   }
   
   private func setError(){

GMERemittance/Module/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift

@@ -315,7 +315,7 @@ class KycForm2ViewController: UIViewController {
         return false
         
       default:
-        return !text.isEmpty && self.isValidateIDNumber
+        return !text.isEmpty && text.count < 51 && self.isValidateIDNumber
       }
     }
     self.verificationIdNumberTextField.titleFont = titleFont
@@ -478,7 +478,7 @@ extension KycForm2ViewController: UITextFieldDelegate {
       {
         var _text = text.replacingOccurrences(of: "-", with: "")
         if _text.count >= 6 {
-          _text.insert("-", at: String.Index.init(encodedOffset: 6))
+          _text.insert("-", at: _text.index(_text.startIndex, offsetBy: 6))
           textField.text = _text
         }
         // We're adding

GMERemittance/Module/RegisterModules/Register/User Interface/View/RegisterViewController.swift

@@ -32,7 +32,7 @@ class RegisterViewController: UIViewController {
     let registerSubtitle = "register_subtitle_text".localized()
     
     let mobileNumber = "mobile_number_text".localized()
-    let mobilePlaceholder = "mobile_number_placeholder_text".localized()
+    let mobilePlaceholder = "010xxxxxxxx"//"mobile_number_placeholder_text".localized()
     
     let nativeCountry = "native_country_text".localized()
     let nativeCountryPlaceholder = "native_country_placeholder_text".localized()