diff --git a/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift b/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
index 05460435..fa4217c5 100644
--- a/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
+++ b/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
@@ -14,6 +14,7 @@ enum PaymentMode: String {
case bankDeposite = "2"
case homeDelivery = "12"
case mobileWallet = "13"
+ case cardPayment = "14"
}
class ExchangeRatesViewController: UIViewController {
@@ -659,10 +660,12 @@ extension ExchangeRatesViewController: UICollectionViewDataSource {
return configureCashDeliveryCell(collectionView: collectionView, indexPath: indexPath)
case .homeDelivery:
return configureHomeDeliveryCell(collectionView: collectionView, indexPath: indexPath)
-
case .mobileWallet:
return configureWalletDeliveryCell(collectionView: collectionView, indexPath: indexPath)
+ default:
+ return configureCashDeliveryCell(collectionView: collectionView, indexPath: indexPath)
}
+
}
func configureBankDepositeCell(
diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
index c96e4913..7a76091f 100644
--- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
+++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
@@ -77,6 +77,9 @@
+
+ Title
+
diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
index 92a95b1a..0098ca65 100644
--- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
+++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
@@ -398,7 +398,6 @@ extension SetupRecipientViewController {
switch keyboardType {
case "AN": textField.setKeyboardType(type: .an, isSendAction: false)
case "ANS": textField.setKeyboardType(type: .ans, isSendAction: false)
- case "N": textField.setKeyboardType(type: .n, isSendAction: false)
default: textField.setKeyboardType(type: .ans, isSendAction: false)
}
}).disposed(by: disposeBag)
diff --git a/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCode.storyboard b/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCode.storyboard
index 0cdfea24..e88d9f28 100644
--- a/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCode.storyboard
+++ b/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCode.storyboard
@@ -27,169 +27,157 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
diff --git a/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift b/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift
index 08c60fc8..df148adf 100644
--- a/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift
+++ b/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift
@@ -49,7 +49,7 @@ class SendMoneyCodeViewController: UIViewController {
var numberCipherString : String!
var presenter: SendMoneyCodeModuleInterface?
- var completion: ((String) -> ())?
+ var completion: ((String) -> Void)?
var encryptedNumber: String! {
didSet {
@@ -73,20 +73,18 @@ class SendMoneyCodeViewController: UIViewController {
super.viewDidDisappear(animated)
mNumberTransKeyView?.mTK_ClearDelegateSubviews()
- if isTranskeyShowing == false{
- mNumberTransKeyView?.delegate = nil;
+ if isTranskeyShowing == false {
+ mNumberTransKeyView?.delegate = nil
}
-
}
-
private func keyboardSetup() {
isShowNumber = false
isTranskeyShowing = false
setNumberTranskey()
}
- private func setNumberTranskey(){
+ private func setNumberTranskey() {
mNumberTransKeyView = TransKeyView()
mNumberTransKeyView?.mTK_Init(self)
mNumberTransKeyView?.delegate = self
@@ -95,8 +93,8 @@ class SendMoneyCodeViewController: UIViewController {
mNumberTransKeyView?.mTK_LicenseCheck("license_mtranskey")
}
- func showNumberTranskeyAction(){
- if mNumberTransKeyView?.isBeingPresented == false{
+ func showNumberTranskeyAction() {
+ if mNumberTransKeyView?.isBeingPresented == false {
isShowNumber = true
isTranskeyShowing = true
mNumberTransKeyView?.mTK_SetHint("password", font:UIFont(name:"Arial", size: 15.0))
@@ -107,15 +105,17 @@ class SendMoneyCodeViewController: UIViewController {
mNumberTransKeyView?.mTK_SetControlCenter(false)
mNumberTransKeyView?.mTK_UseAllDeleteButton(false)
mNumberTransKeyView?.mTK_Supported(byDeviceOrientation: SupportedByDevicePortraitAndLandscape)
- mNumberTransKeyView?.setKeyboardType(self,
- keypadType: TransKeyKeypadTypeText,
- mTK_inputType: 2,
- mTK_inputTitle: "password",
- mTK_cryptType: 0,
- mTK_maxLength: 16,
- mTK_minLength: 0,
- mTK_keypadUpper: false,
- mTK_languageType: Int(mTK_Language_English.rawValue))
+ mNumberTransKeyView?.setKeyboardType(
+ self,
+ keypadType: TransKeyKeypadTypeText,
+ mTK_inputType: 2,
+ mTK_inputTitle: "password",
+ mTK_cryptType: 0,
+ mTK_maxLength: 16,
+ mTK_minLength: 0,
+ mTK_keypadUpper: false,
+ mTK_languageType: Int(mTK_Language_English.rawValue)
+ )
if let mNumberTransKeyView = mNumberTransKeyView {
self.present(mNumberTransKeyView, animated: true, completion: nil)
}
@@ -143,9 +143,11 @@ class SendMoneyCodeViewController: UIViewController {
self.submitButton.setTitle("submit_text".localized(), for: .normal)
self.notNowButton.setTitle("not_now_text".localized(), for: .normal)
verificationCodeTextField.delegate = self
- self.backGourndBorderView.layer.borderWidth = 0.5
- self.backGourndBorderView.layer.borderColor = UIColor.init(hex: "#EBECED").cgColor
- self.backGourndBorderView.layer.cornerRadius = 5
+ submitButton.layer.cornerRadius = 5
+ submitButton.backgroundColor = .themeRed
+ resendButton.setTitleColor(.themeRed, for: .normal)
+ counterLabel.textColor = .themeRed
+
}
private func configureText() {
@@ -163,7 +165,6 @@ class SendMoneyCodeViewController: UIViewController {
self.showSampleImage()
}
-
@IBAction func resend(_ sender: Any) {
self.requestOtpCode()
}
@@ -187,10 +188,8 @@ class SendMoneyCodeViewController: UIViewController {
self.present(alertVC, animated: true, completion: nil)
}
-
// resend
-
private func requestOtpCode() {
// request otp
self.presenter?.viewIsReady()
@@ -199,7 +198,13 @@ class SendMoneyCodeViewController: UIViewController {
}
private func startTimer() {
- self.timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(self.updateCounter), userInfo: nil, repeats: true)
+ self.timer = Timer.scheduledTimer(
+ timeInterval: 1,
+ target: self,
+ selector: #selector(self.updateCounter),
+ userInfo: nil,
+ repeats: true
+ )
self.timer?.fire()
self.resendButton.isUserInteractionEnabled = false
self.counterStackView.isHidden = false
@@ -238,7 +243,6 @@ extension SendMoneyCodeViewController: SendMoneyCodeViewInterface {
}
}
-
extension SendMoneyCodeViewController: TransKeyViewDelegate {
func secureInputFinish(_ type: Int) {
@@ -266,9 +270,4 @@ extension SendMoneyCodeViewController: UITextFieldDelegate {
}
}
-
-
-extension SendMoneyCodeViewController: OtpCodeRequestApiService {
-
-}
-
+extension SendMoneyCodeViewController: OtpCodeRequestApiService {}
diff --git a/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewInterface.swift b/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewInterface.swift
index 54f4fa80..624a89d4 100644
--- a/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewInterface.swift
+++ b/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewInterface.swift
@@ -7,9 +7,9 @@
//
protocol SendMoneyCodeViewInterface: class {
- func showLoading()
- func hideLoading()
- func show(message: String)
- func show(error: String)
+ func showLoading()
+ func hideLoading()
+ func show(message: String)
+ func show(error: String)
func expiredError(error: Error)
}
diff --git a/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/Wireframe/SendMoneyCodeWireframe.swift b/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/Wireframe/SendMoneyCodeWireframe.swift
index 7cfd2931..4569b6d6 100644
--- a/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/Wireframe/SendMoneyCodeWireframe.swift
+++ b/GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/Wireframe/SendMoneyCodeWireframe.swift
@@ -9,34 +9,38 @@
import UIKit
class SendMoneyCodeWireframe {
- weak var view: UIViewController!
- var completion: ((String) -> ())?
- var request: SendMoneyRequestModel?
+ weak var view: UIViewController!
+ var completion: ((String) -> Void)?
+ var request: SendMoneyRequestModel?
}
extension SendMoneyCodeWireframe: SendMoneyCodeWireframeInput {
+
+ var storyboardName: String {return "SendMoneyCode"}
+
+ func getMainView() -> UIViewController {
+ let service = SendMoneyCodeService()
+ let interactor = SendMoneyCodeInteractor(service: service, request: self.request)
+ let presenter = SendMoneyCodePresenter()
+ let viewController = viewControllerFromStoryboard(of: SendMoneyCodeViewController.self)
+ viewController.completion = self.completion
+ viewController.presenter = presenter
+ interactor.output = presenter
+ presenter.interactor = interactor
+ presenter.wireframe = self
+ presenter.view = viewController
- var storyboardName: String {return "SendMoneyCode"}
-
- func getMainView() -> UIViewController {
- let service = SendMoneyCodeService()
- let interactor = SendMoneyCodeInteractor(service: service, request: self.request)
- let presenter = SendMoneyCodePresenter()
- let viewController = viewControllerFromStoryboard(of: SendMoneyCodeViewController.self)
- viewController.completion = self.completion
- viewController.presenter = presenter
- interactor.output = presenter
- presenter.interactor = interactor
- presenter.wireframe = self
- presenter.view = viewController
-
- self.view = viewController
- return viewController
- }
-
- func open(requestmodel: SendMoneyRequestModel?, completion: @escaping (String) -> (), source: UIViewController) {
- self.completion = completion
- self.request = requestmodel
- self.openMainView(source: source)
- }
+ self.view = viewController
+ return viewController
+ }
+
+ func open(
+ requestmodel: SendMoneyRequestModel?,
+ completion: @escaping (String) -> Void,
+ source: UIViewController
+ ) {
+ self.completion = completion
+ self.request = requestmodel
+ self.openMainView(source: source)
+ }
}
diff --git a/GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard b/GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
index 33726c3d..446f4d4a 100644
--- a/GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
+++ b/GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
@@ -344,11 +344,20 @@
+
diff --git a/GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift b/GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift
index 2362b604..b918eaab 100644
--- a/GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift
+++ b/GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift
@@ -352,6 +352,8 @@ extension SendMoneyPaymentModeViewController: UICollectionViewDataSource {
return configureHomeDeliveryCell(collectionView: collectionView, indexPath: indexPath)
case .mobileWallet:
return configureWalletDeliveryCell(collectionView: collectionView, indexPath: indexPath)
+ default:
+ return configureCashDeliveryCell(collectionView: collectionView, indexPath: indexPath)
}
}