15.07

@@ -373,12 +373,12 @@
 			path = ResidentTableViewCell;
 			sourceTree = "<group>";
 		};
-		1764A05A28670B7200847A30 /* NetworkManager */ = {
+		1764A05A28670B7200847A30 /* AuthService */ = {
 			isa = PBXGroup;
 			children = (
 				1764A05B28670B9F00847A30 /* AuthService.swift */,
 			);
-			path = NetworkManager;
+			path = AuthService;
 			sourceTree = "<group>";
 		};
 		1774213A2866EDF4002730EE /* Models */ = {
@@ -508,7 +508,7 @@
 			isa = PBXGroup;
 			children = (
 				1721AEEC28704DBF00EC4FDB /* Extensions */,
-				1764A05A28670B7200847A30 /* NetworkManager */,
+				1764A05A28670B7200847A30 /* AuthService */,
 				1774213A2866EDF4002730EE /* Models */,
 				00A48B77285F8F6600EF0A08 /* Protocols */,
 				00E581B7284F71A700E779FB /* Common */,
@@ -865,7 +865,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 52KCA3JZ59;
+				DEVELOPMENT_TEAM = 4X46JG9W6V;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "InterQR-Internship/Info.plist";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -894,7 +894,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 52KCA3JZ59;
+				DEVELOPMENT_TEAM = 4X46JG9W6V;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "InterQR-Internship/Info.plist";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;

@@ -36,5 +36,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B21C0B63-1820-47D9-863A-585E52771DA2"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "InterQR-Internship/Modules/OneTimePasswordScreen/View/OTPView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "94"
+            endingLineNumber = "94"
+            landmarkName = "didTextFieldChanged(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7B1AC08C-6FFC-42BD-8C5C-4D6CE5CBD70C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "InterQR-Internship/Modules/OneTimePasswordScreen/ViewController/CodeVerificationViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "145"
+            endingLineNumber = "145"
+            landmarkName = "didFullCodeCompletion(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

@@ -74,6 +74,7 @@ class AddResidentsView: UIView {
         obj.placeholder = .Text.enterResidentName
         obj.font = .skModernist(type: .regular, ofSize: 14)
         obj.textPadding = UIEdgeInsets(top: 0, left: 22, bottom: 0, right: 22)
+        obj.returnKeyType = .done
         return obj
     }()
     
@@ -93,6 +94,7 @@ class AddResidentsView: UIView {
         obj.font = .skModernist(type: .regular, ofSize: 14)
         obj.textPadding = UIEdgeInsets(top: 0, left: 22, bottom: 0, right: 45)
         obj.placeholder = .Text.enterResidentNumber
+        obj.keyboardType = .phonePad
         return obj
     }()
     

@@ -32,6 +32,10 @@ class AddResidentsViewController: UIViewController {
         if let closeTap = self.closeTap {
             mainView.transparentView.addGestureRecognizer(closeTap)
         }
+        addDoneButtonOnKeyboard()
+        
+        mainView.nameTextField.delegate = self
+        mainView.mobileNumberTextField.delegate = self
         
         mainView.closeButton.addTarget(self, action: #selector(didTapCloseButton), for: .touchUpInside)
         mainView.managerButton.addTarget(self, action: #selector(didTapOnChangeableButtons(_:)), for: .touchUpInside)
@@ -49,6 +53,25 @@ class AddResidentsViewController: UIViewController {
         NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillHideNotification, object: nil)
     }
     
+    func addDoneButtonOnKeyboard() {
+            let doneToolbar: UIToolbar = UIToolbar(frame: CGRect.init(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 50))
+            doneToolbar.barStyle = .default
+
+            let flexSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
+            let done: UIBarButtonItem = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(self.doneButtonAction))
+
+            let items = [flexSpace, done]
+            doneToolbar.items = items
+            doneToolbar.sizeToFit()
+        
+        mainView.mobileNumberTextField.inputAccessoryView = doneToolbar
+        }
+
+        @objc func doneButtonAction(){
+            mainView.mobileNumberTextField.resignFirstResponder()
+            
+        }
+    
     func reloadView() {
         mainView.mobileNumberTextField.reloadInputViews()
     }
@@ -165,4 +188,17 @@ extension AddResidentsViewController: CNContactPickerDelegate {
         mainView.mobileNumberTextField.text = firstPhoneNumber.stringValue
     }
 }
-
+//MARK: - TextField delegate
+extension AddResidentsViewController: UITextFieldDelegate {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        guard let text = mainView.nameTextField.text else { return true }
+        if text.isEmpty{
+            let alert = UIAlertController(title: "Enter name field", message: "", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
+            present(alert, animated: true, completion: nil)
+        } else {
+            mainView.mobileNumberTextField.becomeFirstResponder()
+        }
+        return true
+    }
+}

@@ -90,7 +90,9 @@ class OTPView: UIView {
         guard var code = sender.text else {
             return
         }
-        if code.count > 4 {
+        if code.count == 0 {
+            delegate?.didFullCodeCompletion(self)
+        } else if code.count > 4 {
             code.removeLast()
         } else {
             if code.count == 4 {
@@ -98,7 +100,6 @@ class OTPView: UIView {
                 textField.resignFirstResponder()
             }
         }
-        
         digitViews.enumerated().forEach { index, item in
             item.text = (code.count-1 >= index ? String(code[code.index(code.startIndex, offsetBy: index)]) : "")
         }

@@ -8,12 +8,11 @@
 import UIKit
 
 class CodeVerificationViewController: UIViewController {
-//    var otp: String = ""
-    
     var isKeyboardAppear = false
     
     private let mainView = CodeVerificationView()
     private let networkManager = AuthService()
+    
     override func loadView() {
         view = mainView
     }
@@ -45,13 +44,14 @@ class CodeVerificationViewController: UIViewController {
             self.mainView.spinner.startAnimating()
         } fail: { error in
             print("3️⃣\(error)")
+            self.errorProcessing()
         }
     }
     
     func networkingLogin() {
         guard let loginModel = loginModelFilling() else { return }
         AuthService.share.loginRequest(model: loginModel) { response in
-            print("4️⃣\(response.message)4️⃣")
+            print("4️⃣\(String(describing: response.message))4️⃣")
             self.errorProcessing()
         } fail: { error in
             print("4️⃣⛔️\(error)⛔️")
@@ -144,5 +144,11 @@ extension CodeVerificationViewController: OTPViewDelegate {
     
     func didFullCodeCompletion(_ otpView: OTPView) {
         print("code -> \(String(describing: otpView.code))")
+        guard let code = otpView.code else { return }
+        if code.isEmpty {
+            mainView.otpView.isError.toggle()
+            otpView.reloadInputViews()
+        }
+        
     }
 }

@@ -52,6 +52,7 @@ class DisplayNameCell: UITableViewCell, Reusable {
     }
     
     private func setup() {
+        selectionStyle = .none
         contentView.addSubview(settingsIcon)
         contentView.addSubview(titleLabel)
         contentView.addSubview(descriptionLabel)

@@ -33,7 +33,7 @@ class SettingsViewController: UIViewController {
         mainView.logoutButton.addTarget(self, action: #selector(didLogoutAndShowVerificationVC), for: .touchUpInside)
     }
 }
-
+//MARK: - Delegate
 extension SettingsViewController {
     @objc private func didShowHomeVC() {
         navigationController?.popViewController(animated: true)
@@ -43,7 +43,6 @@ extension SettingsViewController {
         networking()
         let vc = VerificationViewController()
         navigationController?.pushViewController(vc, animated: true)
-        
     }
     
     func networking() {