diff --git a/GME Remit/Modules/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift b/GME Remit/Modules/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift
index 4f6e77bc..da8d7eb7 100644
--- a/GME Remit/Modules/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift
+++ b/GME Remit/Modules/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift
@@ -25,14 +25,9 @@ class HomeRemainingLimitTableViewCell: UITableViewCell {
@IBOutlet weak var rewardTapGesture: UITapGestureRecognizer!
-// @IBOutlet weak var withdrawButton: UIButton!
- @IBOutlet weak var walletNumberTitleLabel: UILabel!
@IBOutlet weak var walletNumberLabel: UILabel!
@IBOutlet weak var walletBankCodeLabel: UILabel!
- @IBOutlet weak var limitTitleLabel: UILabel!
- @IBOutlet weak var limitLabel: UILabel!
-
var user: User?
weak var sideMenuDelegate: SideMenuDelegate?
@@ -66,14 +61,8 @@ class HomeRemainingLimitTableViewCell: UITableViewCell {
pointContainerView.layer.cornerRadius = 5
pointBackgroundView.hero.id = "pointsView"
- walletNumberTitleLabel.text = "gme_wallet_no_text".localized()
- walletNumberLabel.text = GMEDB.shared.user.string(.walletNumber)
+ walletNumberLabel.text = GMEDB.shared.user.string(.walletNumber) ?? "N/A"
walletBankCodeLabel.text = GMEDB.shared.user.string(.primaryBankName)
-
- limitTitleLabel.text = "remaining_limit_text".localized()
- limitLabel.textColor = .themeRed
- let yearlyLimit = GMEDB.shared.user.string(.yearlyLimit)
- limitLabel.text = Utility.getCommaSeperatedString(numberString: yearlyLimit ?? "")
}
@objc
diff --git a/GME Remit/Modules/Home/User Interface/View/Home.storyboard b/GME Remit/Modules/Home/User Interface/View/Home.storyboard
index 2fe89927..ede53003 100644
--- a/GME Remit/Modules/Home/User Interface/View/Home.storyboard
+++ b/GME Remit/Modules/Home/User Interface/View/Home.storyboard
@@ -89,54 +89,20 @@
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -178,28 +144,19 @@
-
+
-
-
+
-
+
@@ -345,21 +302,18 @@
-
-
-
-
-
+
+
-
+
diff --git a/GME Remit/Modules/ManageAgreement/User Interface/Wireframe/ManageAgreementWireframe.swift b/GME Remit/Modules/ManageAgreement/User Interface/Wireframe/ManageAgreementWireframe.swift
index 15c20bad..1756e23e 100644
--- a/GME Remit/Modules/ManageAgreement/User Interface/Wireframe/ManageAgreementWireframe.swift
+++ b/GME Remit/Modules/ManageAgreement/User Interface/Wireframe/ManageAgreementWireframe.swift
@@ -44,4 +44,10 @@ extension ManageAgreementWireframe: ManageAgreementWireframeInput {
let pdfVC = PDFViewController(nibName: "PDFViewController", bundle: nil)
view.navigationController?.pushViewController(pdfVC, animated: true)
}
+
+ func goNewRegistration() {
+ if let navigation = self.view.navigationController {
+ NewRegisterWireframe().pushMainView(in: navigation)
+ }
+ }
}
diff --git a/GME Remit/Modules/ManageAgreement/User Interface/Wireframe/ManageAgreementWireframeInput.swift b/GME Remit/Modules/ManageAgreement/User Interface/Wireframe/ManageAgreementWireframeInput.swift
index 58d01efa..8c43c35c 100644
--- a/GME Remit/Modules/ManageAgreement/User Interface/Wireframe/ManageAgreementWireframeInput.swift
+++ b/GME Remit/Modules/ManageAgreement/User Interface/Wireframe/ManageAgreementWireframeInput.swift
@@ -10,4 +10,5 @@ import Foundation
protocol ManageAgreementWireframeInput: WireframeInput {
func goAgreementPDF(type: PDFType)
+ func goNewRegistration()
}
diff --git a/GME Remit/Modules/RegisterModules/Register/User Interface/Wireframe/RegisterWireframe.swift b/GME Remit/Modules/RegisterModules/Register/User Interface/Wireframe/RegisterWireframe.swift
index a1c607b6..f2e68d4e 100644
--- a/GME Remit/Modules/RegisterModules/Register/User Interface/Wireframe/RegisterWireframe.swift
+++ b/GME Remit/Modules/RegisterModules/Register/User Interface/Wireframe/RegisterWireframe.swift
@@ -51,9 +51,6 @@ extension RegisterWireframe: RegisterWireframeInput {
func showKyc() {
// view.navigationController?.pushViewController(KycWireframe().getMainView(), animated: true)
-
- if let navigation = self.view.navigationController {
- NewRegisterWireframe().pushMainView(in: navigation)
- }
+ ManageAgreementWireframe().pushWithNavigation(on: view)
}
}
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/Application Logic/Interactor/NewRegisterStep1Interactor.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/Application Logic/Interactor/NewRegisterStep1Interactor.swift
index 153aad2a..748f49a0 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/Application Logic/Interactor/NewRegisterStep1Interactor.swift
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/Application Logic/Interactor/NewRegisterStep1Interactor.swift
@@ -47,10 +47,16 @@ extension NewRegisterStep1Interactor: NewRegisterStep1InteractorInput {
if model.type == 1 { // primary information
if let bankCode = model.primaryInformation?.bankID,
let bankAccount = model.primaryInformation?.bankAccount,
- let bankName = model.primaryInformation?.bankName {
+ let bankName = model.primaryInformation?.bankName,
+ let storedAccount = KeyChain.shared.get(key: .bankAccount) {
+
KeyChain.shared.save(data: bankCode, key: .bankCode)
KeyChain.shared.save(data: bankAccount, key: .bankAccount)
KeyChain.shared.save(data: bankName, key: .bankName)
+
+ if storedAccount != bankAccount {
+ GMEDB.shared.user.set("0", .pennyTestStatusCode)
+ }
}
}
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep3/Application Logic/Service/NewRegisterStep3Service.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep3/Application Logic/Service/NewRegisterStep3Service.swift
index 6673ff2e..453a1ec7 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep3/Application Logic/Service/NewRegisterStep3Service.swift
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep3/Application Logic/Service/NewRegisterStep3Service.swift
@@ -15,17 +15,17 @@ class NewRegisterStep3Service: NewRegisterStep3ServiceType {
success: @escaping (SuccessMessage) -> Void,
failure: @escaping (Error) -> Void
) {
-// APIRouter.pennyTestSubmitAtRegister(
-// accountNumber: account,
-// certNumber: number
-// ).json(success: success, failure: failure)
+ APIRouter.pennyTestSubmitAtRegister(
+ accountNumber: account,
+ certNumber: number
+ ).json(success: success, failure: failure)
// FIXME: Test
- let message = SuccessMessage()
+// let message = SuccessMessage()
// FIXME: -success
- success(message)
+// success(message)
// FIXME: -failrue
// failure(NSError(domain: "error", code: 0, message: "ERROR!"))
diff --git a/GME Remit/Modules/SplashScreen/User Interface/Wireframe/SplashScreenWireframe.swift b/GME Remit/Modules/SplashScreen/User Interface/Wireframe/SplashScreenWireframe.swift
index 3580ea48..44d04c3b 100644
--- a/GME Remit/Modules/SplashScreen/User Interface/Wireframe/SplashScreenWireframe.swift
+++ b/GME Remit/Modules/SplashScreen/User Interface/Wireframe/SplashScreenWireframe.swift
@@ -41,10 +41,8 @@ extension SplashScreenWireframe: SplashScreenWireframeInput {
}
func register() {
-// if let navigation = self.view.navigationController {
-// registerWireFrame.openRegistrationFromSplash(source: navigation)
-// }
- //FIXME: for agreement
- ManageAgreementWireframe().pushWithNavigation(on: view)
+ if let navigation = self.view.navigationController {
+ registerWireFrame.openRegistrationFromSplash(source: navigation)
+ }
}
}