From 434f76013e6e06a0e5f44dcc8634b4fbe6c894da Mon Sep 17 00:00:00 2001
From: Amrit Giri <amritchang@gmail.com>
Date: Tue, 10 Nov 2020 13:34:55 +0545
Subject: [PATCH] issue fixed

---
 GME Remit/APIs/Router/APIRouter.swift         |   2 +-
 GME Remit/AppDelegate.swift                   |   3 +
 .../View/LoginViewController.swift            |   4 +-
 .../View/ExistingUserKyc.storyboard           |  92 +++++++---------
 .../View/ExistingUserKycViewController.swift  |   4 +-
 .../View/KYCVerifyStep1.storyboard            | 104 ++++++++----------
 .../View/KYCVerifyStep1ViewController.swift   |   4 +-
 .../View/NewRegister.storyboard               |   6 +-
 .../View/VerifyIDNumberViewController.swift   |   2 +-
 9 files changed, 102 insertions(+), 119 deletions(-)

diff --git a/GME Remit/APIs/Router/APIRouter.swift b/GME Remit/APIs/Router/APIRouter.swift
index c864b269..5e6a6dea 100644
--- a/GME Remit/APIs/Router/APIRouter.swift	
+++ b/GME Remit/APIs/Router/APIRouter.swift	
@@ -507,7 +507,7 @@ extension APIRouter {
         case .oldUserRegister:
             return "\(baseUrlWithoutVersion)v1/mobile/oldUserRegister"
         case .verifyIdNumber:
-            return "\(baseUrlWithoutVersion)v3/mobile/verifyIdNumber"
+            return "\(baseUrlWithoutVersion)v3/validation"
         case .newUserRegister:
             return "\(baseUrlWithoutVersion)v1/mobile/newUserRegister"
         }
diff --git a/GME Remit/AppDelegate.swift b/GME Remit/AppDelegate.swift
index 07e257cc..3f823b77 100644
--- a/GME Remit/AppDelegate.swift	
+++ b/GME Remit/AppDelegate.swift	
@@ -89,6 +89,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     let useInfo = launchOptions?[.remoteNotification] as? [String: AnyObject]
     destination = extractDestination(userInfo: useInfo)
     self.window?.rootViewController = LauncherScreenWireframe().getMainView()
+    if #available(iOS 13.0, *) {
+        window?.overrideUserInterfaceStyle = .light
+    }
 
     GMEDB
       .shared
diff --git a/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift b/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift
index 03c4dfee..319f0612 100644
--- a/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift	
+++ b/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift	
@@ -142,10 +142,10 @@ class LoginViewController: UIViewController {
         passwordTextField.delegate = self
         userNameTextField.returnKeyType = .next
         
-        userNameTextField.validCondition = { $0.count > 3 }
+        userNameTextField.validCondition = { !$0.isEmpty }
         userNameTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
         
-        passwordTextField.validCondition = { $0.count > 5 }
+        passwordTextField.validCondition = { !$0.isEmpty }
         passwordTextField.errorMessage = "password_empty_error".localized()
         passwordTextField.isSecureTextEntry = true
         passwordTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKyc.storyboard b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKyc.storyboard
index b372b6e2..d9f3659f 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKyc.storyboard	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKyc.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -290,9 +290,9 @@
                                                                             </textField>
                                                                         </subviews>
                                                                     </stackView>
-                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EE0-NK-Hdn">
+                                                                    <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EE0-NK-Hdn">
                                                                         <rect key="frame" x="0.0" y="780" width="315" height="50"/>
-                                                                        <color key="backgroundColor" name="ThemeRed"/>
+                                                                        <color key="backgroundColor" name="ThemeText"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="50" id="D00-1q-w5H"/>
                                                                         </constraints>
@@ -376,31 +376,26 @@
                                                                                             <view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QGZ-PI-ZkX">
                                                                                                 <rect key="frame" x="110" y="8" width="203" height="116"/>
                                                                                                 <subviews>
-                                                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="zwu-UQ-xmg">
-                                                                                                        <rect key="frame" x="0.0" y="32" width="203" height="52.5"/>
-                                                                                                        <subviews>
-                                                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Front ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wP4-uJ-zT1">
-                                                                                                                <rect key="frame" x="0.0" y="0.0" width="54" height="17.5"/>
-                                                                                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
-                                                                                                                <color key="textColor" name="ThemeText"/>
-                                                                                                                <nil key="highlightedColor"/>
-                                                                                                            </label>
-                                                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jpj-a0-JRM">
-                                                                                                                <rect key="frame" x="0.0" y="28.5" width="58" height="24"/>
-                                                                                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
-                                                                                                                <state key="normal" title="View Sample">
-                                                                                                                    <color key="titleColor" name="ThemeBlue"/>
-                                                                                                                </state>
-                                                                                                            </button>
-                                                                                                        </subviews>
-                                                                                                    </stackView>
+                                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Front ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wP4-uJ-zT1">
+                                                                                                        <rect key="frame" x="49.5" y="5" width="54" height="17.5"/>
+                                                                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
+                                                                                                        <color key="textColor" name="ThemeText"/>
+                                                                                                        <nil key="highlightedColor"/>
+                                                                                                    </label>
+                                                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jpj-a0-JRM">
+                                                                                                        <rect key="frame" x="135" y="86" width="58" height="24"/>
+                                                                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
+                                                                                                        <state key="normal" title="View Sample">
+                                                                                                            <color key="titleColor" name="ThemeBlue"/>
+                                                                                                        </state>
+                                                                                                    </button>
                                                                                                 </subviews>
                                                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                                 <constraints>
-                                                                                                    <constraint firstItem="zwu-UQ-xmg" firstAttribute="centerY" secondItem="QGZ-PI-ZkX" secondAttribute="centerY" id="DcJ-ag-hhV"/>
-                                                                                                    <constraint firstItem="zwu-UQ-xmg" firstAttribute="centerX" secondItem="QGZ-PI-ZkX" secondAttribute="centerX" id="IJF-N2-mlz"/>
-                                                                                                    <constraint firstItem="zwu-UQ-xmg" firstAttribute="leading" secondItem="QGZ-PI-ZkX" secondAttribute="leading" id="mfP-MB-kYk"/>
-                                                                                                    <constraint firstAttribute="trailing" secondItem="zwu-UQ-xmg" secondAttribute="trailing" id="vnh-Wh-E9A"/>
+                                                                                                    <constraint firstAttribute="bottom" secondItem="Jpj-a0-JRM" secondAttribute="bottom" constant="6" id="I22-O3-333"/>
+                                                                                                    <constraint firstAttribute="trailing" secondItem="Jpj-a0-JRM" secondAttribute="trailing" constant="10" id="NwH-nE-gSr"/>
+                                                                                                    <constraint firstItem="wP4-uJ-zT1" firstAttribute="centerX" secondItem="QGZ-PI-ZkX" secondAttribute="centerX" constant="-25" id="Xvo-Ga-1vd"/>
+                                                                                                    <constraint firstItem="wP4-uJ-zT1" firstAttribute="top" secondItem="QGZ-PI-ZkX" secondAttribute="top" constant="5" id="f8G-oi-V6E"/>
                                                                                                 </constraints>
                                                                                             </view>
                                                                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please provide the front facing id card photo." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hlj-aZ-5Wm">
@@ -466,31 +461,26 @@
                                                                                             <view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gml-Wj-fcR">
                                                                                                 <rect key="frame" x="110" y="8" width="203" height="116"/>
                                                                                                 <subviews>
-                                                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="NYP-Nh-mie">
-                                                                                                        <rect key="frame" x="0.0" y="32" width="203" height="52.5"/>
-                                                                                                        <subviews>
-                                                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ctu-95-Rc0">
-                                                                                                                <rect key="frame" x="0.0" y="0.0" width="53" height="17.5"/>
-                                                                                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
-                                                                                                                <color key="textColor" name="ThemeText"/>
-                                                                                                                <nil key="highlightedColor"/>
-                                                                                                            </label>
-                                                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U0s-mL-64k">
-                                                                                                                <rect key="frame" x="0.0" y="28.5" width="58" height="24"/>
-                                                                                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
-                                                                                                                <state key="normal" title="View Sample">
-                                                                                                                    <color key="titleColor" name="ThemeBlue"/>
-                                                                                                                </state>
-                                                                                                            </button>
-                                                                                                        </subviews>
-                                                                                                    </stackView>
+                                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ctu-95-Rc0">
+                                                                                                        <rect key="frame" x="50" y="5" width="53" height="17.5"/>
+                                                                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
+                                                                                                        <color key="textColor" name="ThemeText"/>
+                                                                                                        <nil key="highlightedColor"/>
+                                                                                                    </label>
+                                                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U0s-mL-64k">
+                                                                                                        <rect key="frame" x="135" y="86" width="58" height="24"/>
+                                                                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
+                                                                                                        <state key="normal" title="View Sample">
+                                                                                                            <color key="titleColor" name="ThemeBlue"/>
+                                                                                                        </state>
+                                                                                                    </button>
                                                                                                 </subviews>
                                                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                                 <constraints>
-                                                                                                    <constraint firstAttribute="trailing" secondItem="NYP-Nh-mie" secondAttribute="trailing" id="VIN-Qt-469"/>
-                                                                                                    <constraint firstItem="NYP-Nh-mie" firstAttribute="centerX" secondItem="gml-Wj-fcR" secondAttribute="centerX" id="cHN-3t-2xP"/>
-                                                                                                    <constraint firstItem="NYP-Nh-mie" firstAttribute="leading" secondItem="gml-Wj-fcR" secondAttribute="leading" id="eBK-We-Lu5"/>
-                                                                                                    <constraint firstItem="NYP-Nh-mie" firstAttribute="centerY" secondItem="gml-Wj-fcR" secondAttribute="centerY" id="wfj-gp-aLk"/>
+                                                                                                    <constraint firstItem="Ctu-95-Rc0" firstAttribute="centerX" secondItem="gml-Wj-fcR" secondAttribute="centerX" constant="-25" id="GKd-cG-bnA"/>
+                                                                                                    <constraint firstAttribute="bottom" secondItem="U0s-mL-64k" secondAttribute="bottom" constant="6" id="P36-rF-zhP"/>
+                                                                                                    <constraint firstItem="Ctu-95-Rc0" firstAttribute="top" secondItem="gml-Wj-fcR" secondAttribute="top" constant="5" id="iiI-WO-S54"/>
+                                                                                                    <constraint firstAttribute="trailing" secondItem="U0s-mL-64k" secondAttribute="trailing" constant="10" id="oRF-dF-iIm"/>
                                                                                                 </constraints>
                                                                                             </view>
                                                                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please provide the back facing id card photo." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A2F-am-DeT">
@@ -624,9 +614,9 @@
                                                                             <constraint firstItem="kn3-YB-OS0" firstAttribute="top" secondItem="D5K-nv-4xv" secondAttribute="top" id="yMU-5Q-ZAX"/>
                                                                         </constraints>
                                                                     </view>
-                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QBC-Fu-PsV">
+                                                                    <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QBC-Fu-PsV">
                                                                         <rect key="frame" x="0.0" y="383" width="315" height="45"/>
-                                                                        <color key="backgroundColor" name="ThemeRed"/>
+                                                                        <color key="backgroundColor" name="ThemeText"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="45" id="0FB-Ok-i85"/>
                                                                         </constraints>
@@ -716,6 +706,7 @@
             <point key="canvasLocation" x="-91" y="233"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="gps" width="20" height="20"/>
         <image name="ic_passport_picture" width="256" height="256"/>
@@ -735,5 +726,4 @@
             <color red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
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 4d557e47..83636d31 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	
@@ -637,8 +637,8 @@ class ExistingUserKycViewController: UIViewController {
         self.primaryDocLabel.text = "primaryIdDocuments_text".localized()
         self.frontIdLabel.text = "front_id_text".localized()
         self.backIdLabel.text = "backId_text".localized()
-        self.frontIdSample.setTitle("frontIdSample_text".localized(), for: .normal)
-        self.backIdSample.setTitle("backIdSample_text".localized(), for: .normal)
+        self.frontIdSample.setTitle("view_sample_text".localized(), for: .normal)
+        self.backIdSample.setTitle("view_sample_text".localized(), for: .normal)
     }
 }
 
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 806f5813..08fd3ec3 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -285,9 +285,9 @@
                                                                             </textField>
                                                                         </subviews>
                                                                     </stackView>
-                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IcD-pK-L7f">
+                                                                    <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IcD-pK-L7f">
                                                                         <rect key="frame" x="0.0" y="780" width="335" height="50"/>
-                                                                        <color key="backgroundColor" name="ThemeRed"/>
+                                                                        <color key="backgroundColor" name="ThemeText"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="50" id="xYG-Pj-I7Y"/>
                                                                         </constraints>
@@ -371,34 +371,29 @@
                                                                                             <view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uUj-PF-6di">
                                                                                                 <rect key="frame" x="110" y="8" width="223" height="116"/>
                                                                                                 <subviews>
-                                                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="0aD-sw-Qyj">
-                                                                                                        <rect key="frame" x="0.0" y="32" width="223" height="52.5"/>
-                                                                                                        <subviews>
-                                                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Front ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="udZ-3K-h3F">
-                                                                                                                <rect key="frame" x="0.0" y="0.0" width="54" height="17.5"/>
-                                                                                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
-                                                                                                                <color key="textColor" red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                                                                                <nil key="highlightedColor"/>
-                                                                                                            </label>
-                                                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7ar-IW-cpc">
-                                                                                                                <rect key="frame" x="0.0" y="28.5" width="58" height="24"/>
-                                                                                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
-                                                                                                                <state key="normal" title="View Sample">
-                                                                                                                    <color key="titleColor" name="ThemeBlue"/>
-                                                                                                                </state>
-                                                                                                                <connections>
-                                                                                                                    <action selector="showSampleButton:" destination="HSb-ou-7T5" eventType="touchUpInside" id="I30-GI-14e"/>
-                                                                                                                </connections>
-                                                                                                            </button>
-                                                                                                        </subviews>
-                                                                                                    </stackView>
+                                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Front ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="udZ-3K-h3F">
+                                                                                                        <rect key="frame" x="59.5" y="5" width="54" height="17.5"/>
+                                                                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
+                                                                                                        <color key="textColor" red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                                                        <nil key="highlightedColor"/>
+                                                                                                    </label>
+                                                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7ar-IW-cpc">
+                                                                                                        <rect key="frame" x="155" y="86" width="58" height="24"/>
+                                                                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
+                                                                                                        <state key="normal" title="View Sample">
+                                                                                                            <color key="titleColor" name="ThemeBlue"/>
+                                                                                                        </state>
+                                                                                                        <connections>
+                                                                                                            <action selector="showSampleButton:" destination="HSb-ou-7T5" eventType="touchUpInside" id="I30-GI-14e"/>
+                                                                                                        </connections>
+                                                                                                    </button>
                                                                                                 </subviews>
                                                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                                 <constraints>
-                                                                                                    <constraint firstItem="0aD-sw-Qyj" firstAttribute="centerY" secondItem="uUj-PF-6di" secondAttribute="centerY" id="9ZR-H4-YxZ"/>
-                                                                                                    <constraint firstAttribute="trailing" secondItem="0aD-sw-Qyj" secondAttribute="trailing" id="Eqf-z2-LGl"/>
-                                                                                                    <constraint firstItem="0aD-sw-Qyj" firstAttribute="centerX" secondItem="uUj-PF-6di" secondAttribute="centerX" id="cij-v4-PRJ"/>
-                                                                                                    <constraint firstItem="0aD-sw-Qyj" firstAttribute="leading" secondItem="uUj-PF-6di" secondAttribute="leading" id="dx4-fR-f0Q"/>
+                                                                                                    <constraint firstAttribute="bottom" secondItem="7ar-IW-cpc" secondAttribute="bottom" constant="6" id="8g0-bY-otn"/>
+                                                                                                    <constraint firstItem="udZ-3K-h3F" firstAttribute="top" secondItem="uUj-PF-6di" secondAttribute="top" constant="5" id="vau-eV-Gfy"/>
+                                                                                                    <constraint firstItem="udZ-3K-h3F" firstAttribute="centerX" secondItem="uUj-PF-6di" secondAttribute="centerX" constant="-25" id="wGM-Zg-v8l"/>
+                                                                                                    <constraint firstAttribute="trailing" secondItem="7ar-IW-cpc" secondAttribute="trailing" constant="10" id="xhU-0c-8zO"/>
                                                                                                 </constraints>
                                                                                             </view>
                                                                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please provide the front facing id card photo." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YR6-wu-ZPc">
@@ -464,34 +459,29 @@
                                                                                             <view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YgR-TV-HT5">
                                                                                                 <rect key="frame" x="110" y="8" width="223" height="116"/>
                                                                                                 <subviews>
-                                                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="gfc-2E-zZ3">
-                                                                                                        <rect key="frame" x="0.0" y="32" width="223" height="52.5"/>
-                                                                                                        <subviews>
-                                                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yOu-pI-8Mc">
-                                                                                                                <rect key="frame" x="0.0" y="0.0" width="53" height="17.5"/>
-                                                                                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
-                                                                                                                <color key="textColor" red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="calibratedRGB"/>
-                                                                                                                <nil key="highlightedColor"/>
-                                                                                                            </label>
-                                                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="grJ-Fd-QJ0">
-                                                                                                                <rect key="frame" x="0.0" y="28.5" width="58" height="24"/>
-                                                                                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
-                                                                                                                <state key="normal" title="View Sample">
-                                                                                                                    <color key="titleColor" name="ThemeBlue"/>
-                                                                                                                </state>
-                                                                                                                <connections>
-                                                                                                                    <action selector="showSampleButton:" destination="HSb-ou-7T5" eventType="touchUpInside" id="I4p-cj-dc7"/>
-                                                                                                                </connections>
-                                                                                                            </button>
-                                                                                                        </subviews>
-                                                                                                    </stackView>
+                                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yOu-pI-8Mc">
+                                                                                                        <rect key="frame" x="60" y="5" width="53" height="17.5"/>
+                                                                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
+                                                                                                        <color key="textColor" red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="calibratedRGB"/>
+                                                                                                        <nil key="highlightedColor"/>
+                                                                                                    </label>
+                                                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="grJ-Fd-QJ0">
+                                                                                                        <rect key="frame" x="155" y="86" width="58" height="24"/>
+                                                                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
+                                                                                                        <state key="normal" title="View Sample">
+                                                                                                            <color key="titleColor" name="ThemeBlue"/>
+                                                                                                        </state>
+                                                                                                        <connections>
+                                                                                                            <action selector="showSampleButton:" destination="HSb-ou-7T5" eventType="touchUpInside" id="I4p-cj-dc7"/>
+                                                                                                        </connections>
+                                                                                                    </button>
                                                                                                 </subviews>
                                                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                                 <constraints>
-                                                                                                    <constraint firstItem="gfc-2E-zZ3" firstAttribute="leading" secondItem="YgR-TV-HT5" secondAttribute="leading" id="VVi-pp-owb"/>
-                                                                                                    <constraint firstItem="gfc-2E-zZ3" firstAttribute="centerX" secondItem="YgR-TV-HT5" secondAttribute="centerX" id="bBT-M0-08c"/>
-                                                                                                    <constraint firstItem="gfc-2E-zZ3" firstAttribute="centerY" secondItem="YgR-TV-HT5" secondAttribute="centerY" id="lKF-Dt-jb9"/>
-                                                                                                    <constraint firstAttribute="trailing" secondItem="gfc-2E-zZ3" secondAttribute="trailing" id="r3I-IS-5tW"/>
+                                                                                                    <constraint firstAttribute="trailing" secondItem="grJ-Fd-QJ0" secondAttribute="trailing" constant="10" id="6zP-5e-3ED"/>
+                                                                                                    <constraint firstItem="yOu-pI-8Mc" firstAttribute="centerX" secondItem="YgR-TV-HT5" secondAttribute="centerX" constant="-25" id="D99-5D-jrf"/>
+                                                                                                    <constraint firstItem="yOu-pI-8Mc" firstAttribute="top" secondItem="YgR-TV-HT5" secondAttribute="top" constant="5" id="EFZ-5A-vVJ"/>
+                                                                                                    <constraint firstAttribute="bottom" secondItem="grJ-Fd-QJ0" secondAttribute="bottom" constant="6" id="pec-GP-Vqn"/>
                                                                                                 </constraints>
                                                                                             </view>
                                                                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please provide the back facing id card photo." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FtV-43-Pwf">
@@ -977,9 +967,9 @@
                                                                             <constraint firstAttribute="bottom" secondItem="CLi-8I-c3V" secondAttribute="bottom" id="gJt-LH-od5"/>
                                                                         </constraints>
                                                                     </view>
-                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ihx-de-v9r">
+                                                                    <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ihx-de-v9r">
                                                                         <rect key="frame" x="0.0" y="790" width="335" height="45"/>
-                                                                        <color key="backgroundColor" name="ThemeRed"/>
+                                                                        <color key="backgroundColor" name="ThemeText"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="45" id="pRc-Yd-oWl"/>
                                                                         </constraints>
@@ -1084,6 +1074,7 @@
             <point key="canvasLocation" x="-92" y="232.98350824587709"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="gps" width="20" height="20"/>
         <image name="ic_passport_picture" width="256" height="256"/>
@@ -1107,5 +1098,4 @@
             <color red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift
index 00e42c3a..08ee31e1 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift	
@@ -802,8 +802,8 @@ extension KYCVerifyStep1ViewController {
         self.additionalIdDocLabel.text = "extraIdDoc_text".localized()
         self.frontIdLabel.text = "front_id_text".localized()
         self.backIdLabel.text = "backId_text".localized()
-        self.frontIDSample.setTitle("frontIdSample_text".localized(), for: .normal)
-        self.backIDSample.setTitle("backIdSample_text".localized(), for: .normal)
+        self.frontIDSample.setTitle("view_sample_text".localized(), for: .normal)
+        self.backIDSample.setTitle("view_sample_text".localized(), for: .normal)
         self.additionalIdFrontLabel.text = "additional_id_front_txt".localized()
         self.additionalIdBackLabel.text = "additional_id_back_txt".localized()
     }
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegister.storyboard b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegister.storyboard
index cc217ce1..0323aff7 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegister.storyboard	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegister.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Icx-Ri-Xne">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Icx-Ri-Xne">
     <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -161,6 +161,7 @@
             <point key="canvasLocation" x="-92" y="232.53373313343329"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <namedColor name="ThemeBlue">
             <color red="0.047058823529411764" green="0.12941176470588237" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -175,5 +176,4 @@
             <color red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift b/GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift
index b2664d8d..a5e21553 100644
--- a/GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift	
@@ -94,7 +94,7 @@ class VerifyIDNumberViewController: UIViewController {
         idNumberTxtField.titleText = StringConstants().residenceIdTitle
         idNumberTxtField.placeholder = StringConstants().residenceIdPlaceholder
 //        idNumberTxtField.errorMessage = StringConstants().residenceIdError
-        idNumberTxtField.validCondition = { $0.count > 4}
+        idNumberTxtField.validCondition = { !$0.isEmpty}
         headerTitle.text = StringConstants().headerTitle
         verifyBttn.setTitle(StringConstants().verifyBtnTitle, for: .normal)