Browse Source

change error message when add, edit recipient

pull/1/head
InKwon James Kim 5 years ago
parent
commit
4b8307d619
  1. 1
      GME Remit/Models/Response/SendMoneyReciept.swift
  2. 12
      GME Remit/Modules/RecipientModules/SetupRecipient/Application Logic/Service/SetupRecipientService.swift
  3. 10
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift
  4. 6
      GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift

1
GME Remit/Models/Response/SendMoneyReciept.swift

@ -9,7 +9,6 @@
import Foundation import Foundation
import ObjectMapper import ObjectMapper
class SendMoneyReciept: Mappable { class SendMoneyReciept: Mappable {
var controNo: String? var controNo: String?
var rFirstName: String? var rFirstName: String?

12
GME Remit/Modules/RecipientModules/SetupRecipient/Application Logic/Service/SetupRecipientService.swift

@ -44,7 +44,11 @@ class SetupRecipientService: SetupRecipientServiceType {
.request( .request(
success: {(response: ResponseContainerObject<Recipient>) in success: {(response: ResponseContainerObject<Recipient>) in
if response.errorCode != "0" { if response.errorCode != "0" {
let error = NSError(domain: "Network", code: 0, message: "Failed Add Recipient")
let error = NSError(
domain: "Network",
code: 0,
message: response.message ?? "Failed Add Recipient"
)
failure(error) failure(error)
} }
success(response) success(response)
@ -64,7 +68,11 @@ class SetupRecipientService: SetupRecipientServiceType {
.request( .request(
success: {(response: ResponseContainerObject<Recipient>) in success: {(response: ResponseContainerObject<Recipient>) in
if response.errorCode != "0" { if response.errorCode != "0" {
let error = NSError(domain: "Network", code: 0, message: "Failed Edit Recipient")
let error = NSError(
domain: "Network",
code: 0,
message: response.message ?? "Failed Edit Recipient"
)
failure(error) failure(error)
} }
success(response) success(response)

10
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift

@ -46,20 +46,22 @@ extension SetupRecipientWireframe: SetupRecipientWireframeInput {
self.delegate = delegate self.delegate = delegate
let viewcontroller = getMainView() let viewcontroller = getMainView()
let navigationViewController = UINavigationController(
let navigationController = UINavigationController(
rootViewController: viewcontroller rootViewController: viewcontroller
) )
base.present(navigationViewController, animated: true, completion: nil)
base.present(navigationController, animated: true, completion: nil)
} }
func openNew(with delegate: SetupRecipientDelegate, on base: UIViewController) { func openNew(with delegate: SetupRecipientDelegate, on base: UIViewController) {
self.delegate = delegate self.delegate = delegate
let viewcontroller = getMainView() let viewcontroller = getMainView()
let navigationViewController = UINavigationController(
let navigationController = UINavigationController(
rootViewController: viewcontroller rootViewController: viewcontroller
) )
base.present(navigationViewController, animated: true, completion: nil)
base.present(navigationController, animated: true, completion: nil)
} }
func openSelectMode(with model: [TablePresenterProtocol], type: SetupOpenType) { func openSelectMode(with model: [TablePresenterProtocol], type: SetupOpenType) {

6
GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift

@ -7,6 +7,7 @@
// //
import UIKit import UIKit
import Hero
class SendMoneyExchangeRateCurrencyViewModel { class SendMoneyExchangeRateCurrencyViewModel {
var countryCode: String? var countryCode: String?
@ -171,8 +172,8 @@ class SendMoneyExchangeRateViewController: UIViewController {
super.viewDidAppear(animated) super.viewDidAppear(animated)
if isFirst { if isFirst {
senderTextField.becomeFirstResponder()
isFirst = false
self.senderTextField.becomeFirstResponder()
self.isFirst = false
} }
} }
@ -192,6 +193,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
// MARK: Other Functions // MARK: Other Functions
private func setup() { private func setup() {
// all setup should be done here // all setup should be done here
setupTargets() setupTargets()
action = .calculate action = .calculate
senderTextField.delegate = self senderTextField.delegate = self

Loading…
Cancel
Save