From dcd33ca155486f3bb155ae27536134bdd6e54c58 Mon Sep 17 00:00:00 2001 From: Dibya Malla Date: Thu, 27 Aug 2020 13:35:45 +0545 Subject: [PATCH] jme updated --- GME Remit.xcodeproj/project.pbxproj | 14 +- GME Remit/APIs/Router/APIRouter.swift | 16 +- GME Remit/APIs/UrlManager.swift | 2 +- .../Extensions/UIViewController+Ext.swift | 2 +- .../View/BiometricAuthentication.storyboard | 16 +- .../View/ExchangeRates.storyboard | 17 +- .../Home/User Interface/View/Home.storyboard | 14 +- .../View/LauncherScreen.storyboard | 10 +- .../User Interface/View/Login.storyboard | 4 +- GME Remit/Modules/Profile/Profile.storyboard | 18 +- .../ExistingUserRegistrationServiceType.swift | 1 + .../View/ExistingUserRegistration.storyboard | 2 +- .../UserRegistrationInteractor.swift | 2 + .../View/UserRegistration.storyboard | 15 +- .../View/UserRegistrationViewController.swift | 8 +- .../NewUserRegisterInteractor.swift | 2 + .../NewUserRegisterModuleInterface.swift | 1 + .../Presenter/NewUserRegisterPresenter.swift | 5 + .../View/NewUserRegister.storyboard | 11 +- .../View/NewUserRegisterViewController.swift | 5 + .../Wireframe/NewUserRegisterWireframe.swift | 7 + .../NewUserRegisterWireframeInput.swift | 1 + .../ExistingUserKycInteractor.swift | 2 - .../Service/ExistingUserKycService.swift | 4 +- .../Presenter/ExistingUserKycPresenter.swift | 60 ++-- .../View/ExistingUserKyc.storyboard | 266 +---------------- .../View/ExistingUserKycViewController.swift | 167 ++--------- .../Model/KYCInfoModel.swift | 4 +- .../Model/PersonalInfoModel.swift | 34 ++- .../Presenter/KYCVerifyStep1Presenter.swift | 45 ++- .../View/KYCVerifyStep1.storyboard | 2 +- .../View/KYCVerifyStep1ViewController.swift | 37 ++- .../Wireframe/NewRegisterWireframe.swift | 5 - .../View/InboundReceipt.storyboard | 10 +- .../PINView/PINKeyboardView.xib | 46 +-- .../View/SendMoneyReceipt.storyboard | 12 +- .../Modules/SideMenu/SideMenu.storyboard | 13 +- .../View/SplashScreen.storyboard | 40 +-- .../en.lproj/Localizable.strings | 22 +- .../id.lproj/Localizable.strings | 10 +- .../Supported Files/Assets.xcassets/.DS_Store | Bin 18436 -> 16388 bytes .../AppIcon.appiconset/100.png | Bin 0 -> 5977 bytes .../AppIcon.appiconset/1024.png | Bin 0 -> 76344 bytes .../AppIcon.appiconset/114.png | Bin 0 -> 7111 bytes .../AppIcon.appiconset/120.png | Bin 0 -> 7567 bytes .../AppIcon.appiconset/144.png | Bin 0 -> 9751 bytes .../AppIcon.appiconset/152.png | Bin 0 -> 10529 bytes .../AppIcon.appiconset/167.png | Bin 0 -> 12013 bytes .../AppIcon.appiconset/180.png | Bin 0 -> 13124 bytes .../Assets.xcassets/AppIcon.appiconset/20.png | Bin 0 -> 678 bytes .../Assets.xcassets/AppIcon.appiconset/29.png | Bin 0 -> 1087 bytes .../Assets.xcassets/AppIcon.appiconset/40.png | Bin 0 -> 1610 bytes .../Assets.xcassets/AppIcon.appiconset/50.png | Bin 0 -> 2148 bytes .../Assets.xcassets/AppIcon.appiconset/57.png | Bin 0 -> 2681 bytes .../Assets.xcassets/AppIcon.appiconset/58.png | Bin 0 -> 2820 bytes .../Assets.xcassets/AppIcon.appiconset/60.png | Bin 0 -> 2778 bytes .../Assets.xcassets/AppIcon.appiconset/72.png | Bin 0 -> 3758 bytes .../Assets.xcassets/AppIcon.appiconset/76.png | Bin 0 -> 4002 bytes .../Assets.xcassets/AppIcon.appiconset/80.png | Bin 0 -> 4313 bytes .../Assets.xcassets/AppIcon.appiconset/87.png | Bin 0 -> 4885 bytes .../AppIcon.appiconset/Contents.json | 282 ++++++++++-------- .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 553 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 1269 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 1930 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 847 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 1849 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 3001 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 1269 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 2730 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 4376 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 4376 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 6869 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 2570 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 5627 -> 0 bytes .../Icon-App-83.5x83.5@2x.png | Bin 6468 -> 0 bytes .../AppIcon.appiconset/ItunesArtwork@2x.png | Bin 18642 -> 0 bytes .../Contents.json | 3 +- .../PinSecurity.imageset/PinSecurity.pdf | Bin 0 -> 4184 bytes .../ccr/app logo.imageset/app logo-1.png | Bin 54779 -> 0 bytes .../ccr/app logo.imageset/app logo.png | Bin 54779 -> 0 bytes .../ic_logo_white_large 2-1.png | Bin 18889 -> 0 bytes .../ic_logo_white_large 2.png | Bin 18889 -> 0 bytes .../Contents.json | 3 +- .../ic_backspace.imageset/ic_backspace.pdf | Bin 0 -> 4766 bytes .../ic_gme_logo.imageset/Contents.json | 10 +- .../Contents.json | 23 ++ .../ic_logo_white_large.png | Bin 0 -> 16129 bytes .../ic_logo_white_large@2x.png | Bin 0 -> 37066 bytes .../ic_logo_white_large@3x.png | Bin 0 -> 43092 bytes .../ic_transaction.imageset/Contents.json | 21 ++ .../ic_transaction.imageset/Transaction.pdf | Bin 0 -> 4962 bytes .../jme_launch_icon.imageset/Contents.json | 12 + .../jme_launch_icon.imageset/jme.png | Bin 0 -> 13520 bytes .../Base.lproj/LaunchScreen.storyboard | 8 +- GME RemitTests/FunctionTest.swift | 6 +- 95 files changed, 578 insertions(+), 742 deletions(-) create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/100.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/1024.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/114.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/120.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/144.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/152.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/167.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/180.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/20.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/29.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/40.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/50.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/57.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/58.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/60.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/72.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/76.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/80.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/87.png mode change 100755 => 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png rename GME Remit/Supported Files/Assets.xcassets/{ccr/app logo.imageset => PinSecurity.imageset}/Contents.json (78%) create mode 100644 GME Remit/Supported Files/Assets.xcassets/PinSecurity.imageset/PinSecurity.pdf delete mode 100644 GME Remit/Supported Files/Assets.xcassets/ccr/app logo.imageset/app logo-1.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/ccr/app logo.imageset/app logo.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/ccr/ic_logo_white_large 2.imageset/ic_logo_white_large 2-1.png delete mode 100644 GME Remit/Supported Files/Assets.xcassets/ccr/ic_logo_white_large 2.imageset/ic_logo_white_large 2.png rename GME Remit/Supported Files/Assets.xcassets/{ccr/ic_logo_white_large 2.imageset => ic_backspace.imageset}/Contents.json (73%) create mode 100644 GME Remit/Supported Files/Assets.xcassets/ic_backspace.imageset/ic_backspace.pdf create mode 100644 GME Remit/Supported Files/Assets.xcassets/ic_logo_white_large.imageset/Contents.json create mode 100644 GME Remit/Supported Files/Assets.xcassets/ic_logo_white_large.imageset/ic_logo_white_large.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/ic_logo_white_large.imageset/ic_logo_white_large@2x.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/ic_logo_white_large.imageset/ic_logo_white_large@3x.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/ic_transaction.imageset/Contents.json create mode 100644 GME Remit/Supported Files/Assets.xcassets/ic_transaction.imageset/Transaction.pdf create mode 100644 GME Remit/Supported Files/Assets.xcassets/jme_launch_icon.imageset/Contents.json create mode 100644 GME Remit/Supported Files/Assets.xcassets/jme_launch_icon.imageset/jme.png diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 98c1568a..89946680 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -1209,7 +1209,7 @@ 918BAF4AE9452B044D51EB13 /* Pods_GME_Remit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GME_Remit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9F983C0B2024883D001DCB3F /* UIColor+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Ext.swift"; sourceTree = ""; }; 9FA00FBD1FEE69AF0049753E /* UIView+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Ext.swift"; sourceTree = ""; }; - 9FD260F41FD00458007A511D /* Fast Remit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Fast Remit.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9FD260F41FD00458007A511D /* JME Remit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "JME Remit.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 9FD260F71FD00458007A511D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 9FD260FC1FD00458007A511D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 9FD260FE1FD00458007A511D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -4664,7 +4664,7 @@ 9FD260F51FD00458007A511D /* Products */ = { isa = PBXGroup; children = ( - 9FD260F41FD00458007A511D /* Fast Remit.app */, + 9FD260F41FD00458007A511D /* JME Remit.app */, 9FD261081FD00458007A511D /* GMERemittanceTests.xctest */, 9FD261131FD00458007A511D /* GMERemittanceUITests.xctest */, 739F817A234ADA75003ABCF3 /* SnapshotUITest.xctest */, @@ -6053,7 +6053,7 @@ ); name = "GME Remit"; productName = GMERemittance; - productReference = 9FD260F41FD00458007A511D /* Fast Remit.app */; + productReference = 9FD260F41FD00458007A511D /* JME Remit.app */; productType = "com.apple.product-type.application"; }; 9FD261071FD00458007A511D /* GMERemittanceTests */ = { @@ -7500,8 +7500,8 @@ "$(OTHER_LDFLAGS)", "-ObjC", ); - PRODUCT_BUNDLE_IDENTIFIER = com.fast.fasteremit; - PRODUCT_NAME = "Fast Remit"; + PRODUCT_BUNDLE_IDENTIFIER = com.jme.jmeremit; + PRODUCT_NAME = "JME Remit"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "GME Remit/Supported Files/GMERemittance-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -7540,8 +7540,8 @@ "$(OTHER_LDFLAGS)", "-ObjC", ); - PRODUCT_BUNDLE_IDENTIFIER = com.fast.fasteremit; - PRODUCT_NAME = "Fast Remit"; + PRODUCT_BUNDLE_IDENTIFIER = com.jme.jmeremit; + PRODUCT_NAME = "JME Remit"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "GME Remit/Supported Files/GMERemittance-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; diff --git a/GME Remit/APIs/Router/APIRouter.swift b/GME Remit/APIs/Router/APIRouter.swift index 4ee6b8a7..fbf5a33e 100644 --- a/GME Remit/APIs/Router/APIRouter.swift +++ b/GME Remit/APIs/Router/APIRouter.swift @@ -43,6 +43,7 @@ enum APIRouter { // MARK: - Existing User Registration case oldUserAccessRequest(idNumber: String, mobileNumber: String, dob: String) case oldUserRegister(registerModel: OldUserRegisterRequestModel, firebaseToken: String) + case loadExistingUserInformation case submitExistingCustomerKYC(model: KYCSaveInformation) // MARK: - New User Registration @@ -457,13 +458,16 @@ extension APIRouter { return "\(baseUrl)/inbound/mobile/tranHistory/\(senderId)" case .loadKYCInformation: let userID = GMEDB.shared.user.string(.userId) ?? "" - return "\(baseUrlWithoutVersion)/v4/Mobile/loadform/\(userID)/kyc" + return "\(baseUrlWithoutVersion)v4/mobile/loadform/\(userID)/kyc" + case .loadExistingUserInformation: + let userID = GMEDB.shared.user.string(.userId) ?? "" + return "\(baseUrlWithoutVersion)v4/mobile/loadform/\(userID)/kycExistingCustomer" case .saveKYCInformation: return "\(baseUrlWithoutVersion)/v4/mobile/RegisterKyc" case .submitKYC: return "\(baseUrlWithoutVersion)v1/mobile/RegisterKyc" case .submitExistingCustomerKYC: - return "\(baseUrlWithoutVersion)v1/mobile/submitExistingCustomerKYC" + return "\(baseUrlWithoutVersion)v1/mobile/RegisterKycExistingCustomer" case .requestPennyTestAtRegister(let resend): let userID = GMEDB.shared.user.string(.userId) ?? "" return "\(baseUrl)/mobile/pennytest/start/\(userID)?reSendCode=\(resend)" @@ -554,6 +558,8 @@ extension APIRouter { return .post case .loadKYCInformation: return .get + case .loadExistingUserInformation: + return .get case .saveKYCInformation: return .post case .submitKYC: @@ -827,7 +833,7 @@ extension APIRouter { case .submitKYC(let model): return [ "type": "0", - "occupation": model.personalInformation?.occupation ?? "", + "employeerName": model.personalInformation?.employeerName ?? "", "sourceOfFund": model.personalInformation?.sourceOfFund ?? "", "monthlyIncome": model.personalInformation?.monthlyIncome ?? "", "businessType": model.personalInformation?.businessType ?? "", @@ -842,7 +848,7 @@ extension APIRouter { case .submitExistingCustomerKYC(let model): return [ "type": "0", - "occupation": model.personalInformation?.occupation ?? "", + "employeerName": model.personalInformation?.employeerName ?? "", "sourceOfFund": model.personalInformation?.sourceOfFund ?? "", "monthlyIncome": model.personalInformation?.monthlyIncome ?? "", "businessType": model.personalInformation?.businessType ?? "", @@ -850,7 +856,7 @@ extension APIRouter { "email": model.personalInformation?.email ?? "", "additionalAddress": model.personalInformation?.address ?? "", "idType": model.personalInformation?.idType ?? "", - "additionalIdType": model.personalInformation?.additionalIdType ?? "", + "visaStatus": model.personalInformation?.additionalIdType ?? "", "userId": GMEDB.shared.user.string(.userId) ?? "" ] diff --git a/GME Remit/APIs/UrlManager.swift b/GME Remit/APIs/UrlManager.swift index 702173dc..b1d01f92 100644 --- a/GME Remit/APIs/UrlManager.swift +++ b/GME Remit/APIs/UrlManager.swift @@ -17,7 +17,7 @@ class UrlManager { let baseSocialURL = "" - let liveServerUrl = "http://103.139.152.11:5555/api/" + let liveServerUrl = "http://203.223.132.110:9093/api/" let testUrl = "http://203.223.132.110:9093/api/" init() { diff --git a/GME Remit/Extensions/UIViewController+Ext.swift b/GME Remit/Extensions/UIViewController+Ext.swift index 58ad6293..8ee03845 100644 --- a/GME Remit/Extensions/UIViewController+Ext.swift +++ b/GME Remit/Extensions/UIViewController+Ext.swift @@ -41,7 +41,7 @@ extension UIViewController { let imageView = UIImageView(frame: CGRect(x: 0, y: 0, width: 125, height: 30)) imageView.contentMode = .scaleAspectFit - let image = UIImage(named: "ic_gme_new")?.withRenderingMode(.alwaysTemplate) + let image = UIImage(named: "ic_logo_white_large")?.withRenderingMode(.alwaysTemplate) imageView.image = image imageView.tintColor = .themeWhiteRed diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthentication.storyboard b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthentication.storyboard index 120a8a72..257af81d 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthentication.storyboard +++ b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthentication.storyboard @@ -1,9 +1,9 @@ - + - + @@ -34,8 +34,12 @@ - - + + + + + + @@ -75,9 +79,8 @@ - - + @@ -85,4 +88,5 @@ + diff --git a/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard b/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard index 25394eba..1260b63f 100644 --- a/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard +++ b/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard @@ -180,7 +180,7 @@ - + @@ -243,7 +243,7 @@ - diff --git a/GME Remit/Modules/Login/User Interface/View/Login.storyboard b/GME Remit/Modules/Login/User Interface/View/Login.storyboard index 8f9f036d..2ed91d41 100644 --- a/GME Remit/Modules/Login/User Interface/View/Login.storyboard +++ b/GME Remit/Modules/Login/User Interface/View/Login.storyboard @@ -107,7 +107,7 @@ - + @@ -205,8 +205,8 @@ Fast Remit - + diff --git a/GME Remit/Modules/Profile/Profile.storyboard b/GME Remit/Modules/Profile/Profile.storyboard index 41118cad..1564a885 100644 --- a/GME Remit/Modules/Profile/Profile.storyboard +++ b/GME Remit/Modules/Profile/Profile.storyboard @@ -29,7 +29,7 @@ - + @@ -315,7 +315,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -683,7 +683,7 @@ - + @@ -895,7 +895,7 @@ At least one capital letter, At least one number - + @@ -912,19 +912,19 @@ At least one capital letter, At least one number - + - + - + @@ -1016,7 +1016,7 @@ At least one capital letter, At least one number - + diff --git a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/Application Logic/Service/ExistingUserRegistrationServiceType.swift b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/Application Logic/Service/ExistingUserRegistrationServiceType.swift index d44210b1..db02bd6e 100644 --- a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/Application Logic/Service/ExistingUserRegistrationServiceType.swift +++ b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/Application Logic/Service/ExistingUserRegistrationServiceType.swift @@ -44,6 +44,7 @@ extension RegisterExistingUserService { let model = response.message ?? "" GMEDB.shared.register.set(response.data?.referenceId , .referenceId) GMEDB.shared.user.set(response.data?.userId, .userId) + success(model) } }, diff --git a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistration.storyboard b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistration.storyboard index 7866a9c9..5d5e5eae 100644 --- a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistration.storyboard +++ b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistration.storyboard @@ -37,7 +37,7 @@ - - + @@ -254,7 +254,7 @@ - + @@ -291,129 +291,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -444,7 +325,7 @@ - + @@ -679,133 +560,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -