From eb691e9815708dbecb7a5ff29619be39cb44844a Mon Sep 17 00:00:00 2001
From: Amrit <amritchang@gmail.com>
Date: Wed, 24 Jun 2020 20:34:19 +0545
Subject: [PATCH] step 3 line and button is hidden

---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 .../View/NewRegister.storyboard               |  35 ++++++++----------
 .../View/NewRegisterViewController.swift      |   2 +
 .../Wireframe/NewRegisterWireframe.swift      |   2 +
 .../View/NewRegisterStep1ViewController.swift |   2 +
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 51ed2a1f5b55ffe7b7c76eca5581ff8aa319da39..8ff775ea42a8cb9077ca1ecb4fa08189a00d2015 100644
GIT binary patch
delta 21
dcmZn(XbIS0C&9Gz?_>vw1B?$gGfFb^0{~vR2fhFR

delta 21
ccmZn(XbIS0C&4r~ak7KN0mciP86}zd0al?03IG5A

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 878b7f73..e02e08c4 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	
@@ -29,7 +29,7 @@
                                 <rect key="frame" x="0.0" y="44" width="320" height="110"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LIs-r4-vhW">
-                                        <rect key="frame" x="30" y="20" width="260" height="35"/>
+                                        <rect key="frame" x="84" y="20" width="152" height="35"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yuy-WN-CNw">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="35"/>
@@ -47,10 +47,10 @@
                                                 </connections>
                                             </button>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kaH-VB-BAK">
-                                                <rect key="frame" x="35" y="0.0" width="77.5" height="35"/>
+                                                <rect key="frame" x="35" y="0.0" width="82" height="35"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4dx-dw-3Tr">
-                                                        <rect key="frame" x="0.0" y="16.5" width="77.5" height="2"/>
+                                                        <rect key="frame" x="0.0" y="16.5" width="82" height="2"/>
                                                         <color key="backgroundColor" name="ThemeSeparate"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="2" id="9y0-PX-ZIs"/>
@@ -66,7 +66,7 @@
                                                 </constraints>
                                             </view>
                                             <button opaque="NO" tag="1" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="evZ-O2-BrJ">
-                                                <rect key="frame" x="112.5" y="0.0" width="35" height="35"/>
+                                                <rect key="frame" x="117" y="0.0" width="35" height="35"/>
                                                 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="20"/>
                                                 <state key="normal" title="2">
@@ -76,11 +76,11 @@
                                                     <action selector="touchStepButtom:" destination="HSb-ou-7T5" eventType="touchUpInside" id="nzi-Hd-zUQ"/>
                                                 </connections>
                                             </button>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rqk-dx-qaH">
-                                                <rect key="frame" x="147.5" y="0.0" width="77.5" height="35"/>
+                                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rqk-dx-qaH">
+                                                <rect key="frame" x="152" y="0.0" width="82" height="35"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zg2-UP-QLG">
-                                                        <rect key="frame" x="0.0" y="16.5" width="77.5" height="2"/>
+                                                        <rect key="frame" x="0.0" y="16.5" width="82" height="2"/>
                                                         <color key="backgroundColor" name="ThemeSeparate"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="2" id="r90-SF-6EX"/>
@@ -95,8 +95,8 @@
                                                     <constraint firstItem="Zg2-UP-QLG" firstAttribute="centerX" secondItem="rqk-dx-qaH" secondAttribute="centerX" id="dRp-QP-01B"/>
                                                 </constraints>
                                             </view>
-                                            <button opaque="NO" tag="2" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mK0-xl-sty">
-                                                <rect key="frame" x="225" y="0.0" width="35" height="35"/>
+                                            <button hidden="YES" opaque="NO" tag="2" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mK0-xl-sty">
+                                                <rect key="frame" x="177" y="0.0" width="35" height="35"/>
                                                 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="20"/>
                                                 <state key="normal" title="3">
@@ -108,27 +108,27 @@
                                             </button>
                                         </subviews>
                                         <constraints>
-                                            <constraint firstItem="kaH-VB-BAK" firstAttribute="width" secondItem="rqk-dx-qaH" secondAttribute="width" id="8Ti-BH-UjI"/>
+                                            <constraint firstItem="rqk-dx-qaH" firstAttribute="width" secondItem="kaH-VB-BAK" secondAttribute="width" id="1uX-VW-taP"/>
                                             <constraint firstItem="yuy-WN-CNw" firstAttribute="width" secondItem="mK0-xl-sty" secondAttribute="width" id="MfA-3P-LWf"/>
                                             <constraint firstItem="yuy-WN-CNw" firstAttribute="width" secondItem="evZ-O2-BrJ" secondAttribute="width" id="tkM-uJ-nzQ"/>
                                         </constraints>
                                     </stackView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Information" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="8f2-5L-Ga0">
-                                        <rect key="frame" x="5" y="60" width="85" height="30"/>
+                                        <rect key="frame" x="16.5" y="60" width="170" height="30"/>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                         <color key="textColor" name="ThemeText"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="seW-FC-zhm">
-                                        <rect key="frame" x="95" y="60" width="130" height="30"/>
+                                        <rect key="frame" x="191.5" y="60" width="54" height="30"/>
                                         <string key="text">Register
 Auto Debit</string>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                         <color key="textColor" name="ThemeText"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="BfC-V2-5BA">
-                                        <rect key="frame" x="230" y="60" width="85" height="30"/>
+                                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="BfC-V2-5BA">
+                                        <rect key="frame" x="250.5" y="60" width="55.5" height="30"/>
                                         <string key="text">Try to 
 Penny Test</string>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
@@ -139,7 +139,6 @@ Penny Test</string>
                                 <color key="backgroundColor" name="ThemeMainBackground"/>
                                 <constraints>
                                     <constraint firstItem="seW-FC-zhm" firstAttribute="top" secondItem="LIs-r4-vhW" secondAttribute="bottom" constant="5" id="0eS-NM-CBT"/>
-                                    <constraint firstAttribute="trailing" secondItem="LIs-r4-vhW" secondAttribute="trailing" constant="30" id="1Ov-zl-tQY"/>
                                     <constraint firstItem="8f2-5L-Ga0" firstAttribute="centerX" secondItem="yuy-WN-CNw" secondAttribute="centerX" id="2mI-d2-wZF"/>
                                     <constraint firstAttribute="bottom" secondItem="BfC-V2-5BA" secondAttribute="bottom" constant="20" id="6gM-lG-eMU"/>
                                     <constraint firstItem="LIs-r4-vhW" firstAttribute="centerX" secondItem="PtY-N9-vct" secondAttribute="centerX" id="Cbh-yA-rzf"/>
@@ -147,11 +146,9 @@ Penny Test</string>
                                     <constraint firstItem="BfC-V2-5BA" firstAttribute="height" secondItem="seW-FC-zhm" secondAttribute="height" id="FT1-UO-cnt"/>
                                     <constraint firstItem="BfC-V2-5BA" firstAttribute="centerX" secondItem="mK0-xl-sty" secondAttribute="centerX" id="FgP-1S-a6O"/>
                                     <constraint firstItem="seW-FC-zhm" firstAttribute="centerX" secondItem="evZ-O2-BrJ" secondAttribute="centerX" id="GI8-0k-OxH"/>
-                                    <constraint firstItem="LIs-r4-vhW" firstAttribute="leading" secondItem="PtY-N9-vct" secondAttribute="leading" constant="30" id="TDi-sI-Z6m"/>
+                                    <constraint firstItem="kaH-VB-BAK" firstAttribute="width" secondItem="PtY-N9-vct" secondAttribute="width" multiplier="0.25625" id="LPo-E5-0gJ"/>
                                     <constraint firstItem="LIs-r4-vhW" firstAttribute="top" secondItem="PtY-N9-vct" secondAttribute="top" constant="20" id="Tr6-pA-DBp"/>
                                     <constraint firstItem="BfC-V2-5BA" firstAttribute="height" secondItem="8f2-5L-Ga0" secondAttribute="height" id="WTx-vW-3ON"/>
-                                    <constraint firstItem="8f2-5L-Ga0" firstAttribute="leading" secondItem="PtY-N9-vct" secondAttribute="leading" constant="5" id="YNL-YU-ThZ"/>
-                                    <constraint firstAttribute="trailing" secondItem="BfC-V2-5BA" secondAttribute="trailing" constant="5" id="keW-Z8-FIx"/>
                                     <constraint firstItem="BfC-V2-5BA" firstAttribute="leading" secondItem="seW-FC-zhm" secondAttribute="trailing" constant="5" id="snw-je-QyH"/>
                                     <constraint firstAttribute="height" constant="110" id="tqI-7U-TqG"/>
                                     <constraint firstItem="8f2-5L-Ga0" firstAttribute="top" secondItem="LIs-r4-vhW" secondAttribute="bottom" constant="5" id="w7Q-2E-4RR"/>
@@ -176,7 +173,7 @@ Penny Test</string>
                         <viewLayoutGuide key="safeArea" id="O1T-1R-Sun"/>
                     </view>
                     <navigationItem key="navigationItem" id="Zkq-b2-U5b">
-                        <barButtonItem key="rightBarButtonItem" title="Item" id="NVw-pn-UlX">
+                        <barButtonItem key="rightBarButtonItem" id="NVw-pn-UlX">
                             <color key="tintColor" name="ThemeRed"/>
                         </barButtonItem>
                     </navigationItem>
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegisterViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegisterViewController.swift
index b25580b4..e4365c95 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegisterViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegisterViewController.swift	
@@ -57,6 +57,8 @@ class NewRegisterViewController: UIViewController {
     super.viewDidLoad()
     setup()
   }
+    
+     //In case you need step 2 and 3(old one) of NewRegistration step 3 is hidden in storyboard. currently step 2 is showing upload document which was step 1(NewRegisterStep1ViewController) before. Now step 1 and 2 both are triggered in NewRegisterStep1ViewController
   
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift
index ede422dd..76f25df3 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift	
@@ -213,9 +213,11 @@ extension NewRegisterWireframe: NewRegisterDelegate {
         nextStep: NewRegisterViewController.Step
     ) {
 //        stepper?.onNext(nextStep)
+         //In case you need step 2 and 3 of NewRegistration remove the next  line and uncomment the above line
         stepper?.onNext(.finish)
     }
     
+     //In case you need step 2 and 3 of NewRegistration remove function from delegate aslo remove .upload from enum
     func changeTopProgress(){
         print("Change Status")
         stepper?.onNext(.upload)
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/User Interface/View/NewRegisterStep1ViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/User Interface/View/NewRegisterStep1ViewController.swift
index 03576df7..0d235eab 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/User Interface/View/NewRegisterStep1ViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/User Interface/View/NewRegisterStep1ViewController.swift	
@@ -683,8 +683,10 @@ extension NewRegisterStep1ViewController {
             .distinctUntilChanged()
             .drive(onNext: {[weak self] isHidden in
                 self?.bankSaveButton.animateHidden(isHidden: isHidden, duration: 0.2) {
+                    //In case you need step 2 and 3 of NewRegistration remove the next 2 lines
                     self?.primaryInformationCHildStack.isHidden = isHidden
                     self?.personalInformationStack.isHidden = isHidden
+                    //
                     self?.uploadPicturesContainerView.isHidden = !isHidden
                     self?.delegate?.changeTopProgress()
                 }