From b1c6ef8f8f32613e76565107054ba9b2afd0f28e Mon Sep 17 00:00:00 2001 From: Dibya Malla Date: Fri, 5 May 2023 09:31:04 +0900 Subject: [PATCH 1/2] added didSelect options --- .../User Interface/View/BeneficiaryDetailViewController.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift index 34979263..78f031d3 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift @@ -93,6 +93,10 @@ extension BeneficiaryDetailViewController: UITableViewDataSource, UITableViewDel return UITableView.automaticDimension } + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } + } // MARK: BeneficiaryDetailViewInterface From dda8be82f06c1c6ebe0d24fe6ce25b897c4ef8bf Mon Sep 17 00:00:00 2001 From: Dibya Malla Date: Sat, 6 May 2023 12:57:11 +0900 Subject: [PATCH 2/2] [Updated] Fixed navigation issue --- .../BeneficiaryDetailModuleInterface.swift | 6 +- .../BeneficiaryDetailPresenter.swift | 15 +++ .../View/BeneficiaryDetail.storyboard | 83 ++++++------- .../View/BeneficiaryDetailHeaderView.swift | 11 ++ .../View/BeneficiaryDetailHeaderView.xib | 38 ++++-- .../BeneficiaryDetailViewController.swift | 30 ++++- .../View/BeneficiaryTableViewCell.swift | 12 +- .../BeneficiaryDetailWireframe.swift | 28 +++++ .../BeneficiaryDetailWireframeInput.swift | 5 +- .../View/Custom/HomeCarouselView.swift | 1 + .../Home/User Interface/View/Home.storyboard | 110 +++++++++++++----- .../View/HomeViewController.swift | 47 ++++---- .../Model/Recipient/PaymentMethodModel.swift | 7 +- .../Wireframe/SetupRecipientWireframe.swift | 17 +++ .../SendMoneyParentInteractor.swift | 4 +- .../Wireframe/SendMoneyParentWireframe.swift | 4 +- .../CustomUI/CustomPageControl.swift | 8 +- 17 files changed, 306 insertions(+), 120 deletions(-) diff --git a/GME Remit/Modules/BeneficiaryDetail/Module Interface/BeneficiaryDetailModuleInterface.swift b/GME Remit/Modules/BeneficiaryDetail/Module Interface/BeneficiaryDetailModuleInterface.swift index fc854c50..d61eafef 100644 --- a/GME Remit/Modules/BeneficiaryDetail/Module Interface/BeneficiaryDetailModuleInterface.swift +++ b/GME Remit/Modules/BeneficiaryDetail/Module Interface/BeneficiaryDetailModuleInterface.swift @@ -6,6 +6,10 @@ //Copyright © 2023 Gobal Money Express Co. Ltd. All rights reserved. // -protocol BeneficiaryDetailModuleInterface: class { +protocol BeneficiaryDetailModuleInterface: AnyObject { func makeApiRequest() + func didPressBack() + func gotoSendMoney(_ reciptent: Recipient?, + _ paymentMethod: PaymentMethodModel?) + func openEditRecipient(who recipient: Recipient) } diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/Presenter/BeneficiaryDetailPresenter.swift b/GME Remit/Modules/BeneficiaryDetail/User Interface/Presenter/BeneficiaryDetailPresenter.swift index 90caa856..666ec1e3 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/Presenter/BeneficiaryDetailPresenter.swift +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/Presenter/BeneficiaryDetailPresenter.swift @@ -26,6 +26,21 @@ extension BeneficiaryDetailPresenter: BeneficiaryDetailModuleInterface { self.view?.showLoading() self.interactor?.makeApiRequest() } + + func didPressBack() { + wireframe?.back() + } + + func gotoSendMoney(_ reciptent: Recipient?, + _ paymentMethod: PaymentMethodModel?) { + wireframe?.gotoSendMoney(reciptent, + paymentMethod) + + } + + func openEditRecipient(who recipient: Recipient) { + wireframe?.openEditRecipient(who: recipient) + } } // MARK: BeneficiaryDetail interactor output interface diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard index baef56c2..eb24cd25 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard @@ -59,42 +59,8 @@ - + - - - - - - - - - - - - - - - - - - - - @@ -109,9 +75,9 @@ - + - + @@ -204,17 +170,56 @@ + + + + + + + + + + + + + + + + + + + - + + + + @@ -233,7 +238,7 @@ - + diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.swift b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.swift index de7db151..655c0cc1 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.swift +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.swift @@ -1,9 +1,11 @@ // import UIKit +import SDWebImage class BeneficiaryDetailHeaderView: UITableViewHeaderFooterView { + var didPressUpdate: (() -> Void)? static var identifier: String { return String(describing: self) } @@ -17,6 +19,7 @@ class BeneficiaryDetailHeaderView: UITableViewHeaderFooterView { @IBOutlet weak var relationshipValueLabel: UILabel! @IBOutlet weak var locationTitleLabel: UILabel! @IBOutlet weak var locationValueLabel: UILabel! + @IBOutlet weak var profileImage: UIImageView! /* // Only override draw() if you perform custom drawing. // An empty implementation adversely affects performance during animation. @@ -26,8 +29,16 @@ class BeneficiaryDetailHeaderView: UITableViewHeaderFooterView { */ func commonSetup() { + let imagePath = GMEDB.shared.user.string(.profileImage) + let url = URL(string: imagePath ?? "") + profileImage.sd_setImage(with: url, placeholderImage: UIImage(named: "profile-1")) updateButton.set(cornerRadius: 10) updateButton.set(borderWidth: 2, of: .init(hex: "#2E89FF")) updateButton.setTitleColor(.init(hex: "#2E89FF"), for: .normal) } + + @IBAction func didPressUpdateButton(_ sender: Any) { + didPressUpdate?() + } + } diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib index ae6ed6eb..98873520 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib @@ -4,6 +4,7 @@ + @@ -24,7 +25,7 @@ - + @@ -44,6 +45,9 @@ + + + @@ -53,12 +57,14 @@ - - + + + + @@ -82,8 +88,9 @@ - - + + + @@ -111,8 +118,9 @@ - - + + + @@ -140,8 +148,9 @@ - - + + + @@ -175,7 +184,7 @@ - + @@ -196,6 +205,7 @@ + @@ -204,10 +214,16 @@ - + + + + + + + diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift index 78f031d3..09af107e 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift @@ -14,6 +14,7 @@ class BeneficiaryDetailViewController: UIViewController { var presenter: BeneficiaryDetailModuleInterface? var reciptent: Recipient? + var selectedPayments: PaymentMethodModel? // MARK: IBOutlets @@ -21,9 +22,6 @@ class BeneficiaryDetailViewController: UIViewController { @IBOutlet weak var continueButton: UIButton! //@IBOutlet weak var updateButton: UIButton! - @IBAction func backButton(_ sender: UIButton) { - self.navigationController?.popViewController(animated: true) - } // MARK: VC's Life cycle override func viewDidLoad() { @@ -45,6 +43,21 @@ class BeneficiaryDetailViewController: UIViewController { // MARK: IBActions + @IBAction func backButton(_ sender: UIButton) { + presenter?.didPressBack() + } + + + + + @IBAction func didPressContinueButton(_ sender: Any) { + guard let selectedPayments = selectedPayments else { + self.alertWithOk(message: "Please select Payment Method") + return + } + presenter?.gotoSendMoney(self.reciptent, selectedPayments) + } + // MARK: Other Functions private func setup() { @@ -55,6 +68,8 @@ class BeneficiaryDetailViewController: UIViewController { //updateButton.set(cornerRadius: 10) //updateButton.set(borderWidth: 2, of: .init(hex: "#2E89FF")) } + + } extension BeneficiaryDetailViewController: UITableViewDataSource, UITableViewDelegate { @@ -65,6 +80,8 @@ extension BeneficiaryDetailViewController: UITableViewDataSource, UITableViewDel func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { let cell = tableView.dequeueReusableCell(withIdentifier: BeneficiaryTableViewCell.identifier, for: indexPath) as! BeneficiaryTableViewCell + let status = (selectedPayments == reciptent?.paymentMethods?.elementAt(index: indexPath.row)) + cell.isSelected(status) cell.commonSetup(reciptent?.paymentMethods?.elementAt(index: indexPath.row)) return cell } @@ -80,6 +97,10 @@ extension BeneficiaryDetailViewController: UITableViewDataSource, UITableViewDel headerView.relationshipValueLabel.text = reciptent?.relationship headerView.mobileValueLabel.text = reciptent?.mobile headerView.locationValueLabel.text = reciptent?.address + headerView.didPressUpdate = { [weak self] in + guard let reciptent = self?.reciptent else { return } + self?.presenter?.openEditRecipient(who: reciptent) + } // headerView.sectionTitleLabel.text = "TableView Heder \(section)" return headerView @@ -94,7 +115,8 @@ extension BeneficiaryDetailViewController: UITableViewDataSource, UITableViewDel } func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - + selectedPayments = reciptent?.paymentMethods?.elementAt(index: indexPath.row) + self.tableView.reloadSections(IndexSet(integer: 0), with: .none) } } diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryTableViewCell.swift b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryTableViewCell.swift index c55f2e27..1a694898 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryTableViewCell.swift +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryTableViewCell.swift @@ -58,11 +58,15 @@ class BeneficiaryTableViewCell: UITableViewCell { } else { idNumberLabel.isHidden = true } - - if let isSelected = info?.isSelected, isSelected == true { - + } + + func isSelected(_ status:Bool) { + if status{ + indicatorButton.tintColor = .themeRed + indicatorButton.setImage(UIImage(systemName: "largecircle.fill.circle"), for: .normal) } else { - + indicatorButton.tintColor = .themeGray1 + indicatorButton.setImage(UIImage(systemName: "circle"), for: .normal) } } diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/Wireframe/BeneficiaryDetailWireframe.swift b/GME Remit/Modules/BeneficiaryDetail/User Interface/Wireframe/BeneficiaryDetailWireframe.swift index ccbbbb51..faf39312 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/Wireframe/BeneficiaryDetailWireframe.swift +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/Wireframe/BeneficiaryDetailWireframe.swift @@ -32,4 +32,32 @@ extension BeneficiaryDetailWireframe: BeneficiaryDetailWireframeInput { self.view = viewController return viewController } + + func back() { + self.view.navigationController?.popViewController(animated: true) + } + + func gotoSendMoney(_ reciptent: Recipient?, + _ paymentMethod: PaymentMethodModel?) { + + guard let navigationVC = view.navigationController else { + return + } + + guard let reciptented = reciptent else { + return + } + + let wireframe = SendMoneyParentWireframe() + wireframe.paymentMethod = paymentMethod + wireframe.open(for: reciptented, in: navigationVC) + + } + + func openEditRecipient(who recipient: Recipient) { + SetupRecipientWireframe().openEditFromBeneficeris(using: recipient, on: view) { + //self.output?.openedSetupRecipient() + } + } + } diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/Wireframe/BeneficiaryDetailWireframeInput.swift b/GME Remit/Modules/BeneficiaryDetail/User Interface/Wireframe/BeneficiaryDetailWireframeInput.swift index fecceda2..64706fe9 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/Wireframe/BeneficiaryDetailWireframeInput.swift +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/Wireframe/BeneficiaryDetailWireframeInput.swift @@ -9,5 +9,8 @@ import Foundation protocol BeneficiaryDetailWireframeInput: WireframeInput { - + func back() + func gotoSendMoney(_ reciptent: Recipient?, + _ paymentMethod: PaymentMethodModel?) + func openEditRecipient(who recipient: Recipient) } diff --git a/GME Remit/Modules/Home/User Interface/View/Custom/HomeCarouselView.swift b/GME Remit/Modules/Home/User Interface/View/Custom/HomeCarouselView.swift index 767689cb..0eebf21f 100644 --- a/GME Remit/Modules/Home/User Interface/View/Custom/HomeCarouselView.swift +++ b/GME Remit/Modules/Home/User Interface/View/Custom/HomeCarouselView.swift @@ -25,6 +25,7 @@ class HomeCarouselView: UIView { private let pageControl: CustomPageControl = { let view = CustomPageControl(frame: .zero) + view.backgroundColor = .themeWhite view.currentPageIndicatorTintColor = .themeBlack view.pageIndicatorTintColor = .themeGray2 view.translatesAutoresizingMaskIntoConstraints = false diff --git a/GME Remit/Modules/Home/User Interface/View/Home.storyboard b/GME Remit/Modules/Home/User Interface/View/Home.storyboard index ee5e19ae..8e6beb7e 100644 --- a/GME Remit/Modules/Home/User Interface/View/Home.storyboard +++ b/GME Remit/Modules/Home/User Interface/View/Home.storyboard @@ -29,7 +29,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -108,11 +108,15 @@ + - + + + + - + @@ -173,37 +177,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + @@ -218,15 +266,15 @@ - - + + - + - + @@ -242,7 +290,7 @@ - + @@ -258,10 +306,12 @@ - - + + + + diff --git a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift index 28ab6bb6..4f2ee718 100644 --- a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift +++ b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift @@ -10,6 +10,7 @@ import UIKit import Localize_Swift import LGSideMenuController import SafariServices +import SDWebImage #if DEBUG import FLEX @@ -55,14 +56,13 @@ class HomeViewController: UIViewController { return view }() - @IBOutlet weak var accountDetailView: UIView! - @IBOutlet weak var notificationItem: UIBarButtonItem! - @IBOutlet weak var profileImageButton: UIBarButtonItem! - @IBOutlet weak var userName: UIBarButtonItem! + @IBOutlet weak var notificationItem: UIButton! + @IBOutlet weak var profileImage: UIImageView! + @IBOutlet weak var userName: UILabel! @IBOutlet weak var scrollView: UIScrollView! // MARK: IBOutlets - @IBOutlet private weak var supportBarButton: UIBarButtonItem! + @IBOutlet private weak var supportBarButton: UIButton! //@IBOutlet private weak var tableView: UITableView! @IBOutlet private weak var messageViewHeightConstraint: NSLayoutConstraint! @@ -258,11 +258,9 @@ class HomeViewController: UIViewController { self.setup() let sideMenuVC = (MainWireframe.shared?.window?.rootViewController as? LGSideMenuController)? .leftViewController as? SideMenuViewController - + presenter?.viewIsReady() sideMenuVC?.sideMenuDelegate = self setupNotificationBadge() - let supportImage = UIImage(named: "customer_support_new")?.withRenderingMode(.alwaysOriginal) - supportBarButton.image = supportImage NotificationCenter.default.addObserver( self, selector: #selector(self.getYearlyLimitNotificationName), @@ -280,8 +278,9 @@ class HomeViewController: UIViewController { name: NSNotification.Name(LCLLanguageChangeNotification), object: nil ) + + self.navigationController?.isNavigationBarHidden = true; setNavBar(isUseMenu: false) - presenter?.viewIsReady() if user?.redirectTo == "EKYC" { self.initializeSDK() } @@ -299,6 +298,7 @@ class HomeViewController: UIViewController { blobView.removeFromSuperview() MainWireframe.shared?.isUseSwipeGesture = false navigationController?.interactivePopGestureRecognizer?.isEnabled = true + self.navigationController?.isNavigationBarHidden = false; } override func viewDidAppear(_ animated: Bool) { @@ -317,15 +317,13 @@ class HomeViewController: UIViewController { setupDelegates() setupNotifications() addRefreshControlTableView() - - userName.setTitleTextAttributes([ - NSAttributedString.Key.font : UIFont.sanfrancisco(.bold, size: 20), - NSAttributedString.Key.foregroundColor : UIColor.themeBlack, - ], for: .normal) } private func setupHierachy() { + notificationItem.setTitle("", for: .normal) + supportBarButton.setTitle("", for: .normal) + accountDetailView.setupCornerRadius(20,maskedCorners: [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]) accountDetailView.layer.addShadow(with: UIColor.gray, shadowRadius: 10.0, shadowOffset: CGSize(width: 0, height: 1)) @@ -364,8 +362,6 @@ class HomeViewController: UIViewController { func setupNotificationBadge() { //var badgeAppearance = BadgeAppearance() //badgeAppearance.textColor = UIColor.red - let notificationImage = UIImage(named: "ic_notification_dot_new")?.withRenderingMode(.alwaysOriginal) - notificationItem.image = notificationImage // notificationItem.badge(text: "\(notificationCount)", appearance: badgeAppearance) } @@ -459,11 +455,9 @@ class HomeViewController: UIViewController { walletNumberLabel.text = walletNumber == "" ? "N/A" : walletNumber copyButton.setTitle("", for: .normal) mainContainerView.setupCornerRadius(20,maskedCorners: [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]) - if let user = GMEDB.shared.user.string(.userId) , user.count > 9 { - userName.title = "\(user.prefix(9)).." - } else { - userName.title = "HI" + " " + (GMEDB.shared.user.string(.userId) ?? "") - } + userName.text = "HI" + " " + (GMEDB.shared.user.string(.userId) ?? "") + let url = URL(string: GMEDB.shared.user.string(.profileImage) ?? "") + profileImage.sd_setImage(with: url, placeholderImage: UIImage(named: "profile-1")) self.homeCarouselView.update(bannerImage) } @@ -479,10 +473,10 @@ class HomeViewController: UIViewController { presenter?.openNotification() } - @IBAction func customerSupport(_ sender: UIBarButtonItem) { + @IBAction func customerSupport(_ sender: Any) { let actionArray = [ActionSheetElement(title: "Facebook", id: "https://www.facebook.com/jmeremit/", icon: "Facebook"), ActionSheetElement(title: "03-5475-3913", id: "tel://0354753913", icon: "contact")] if UIDevice.current.userInterfaceIdiom == .pad { - ActionSheetHelper.shared.openWith(parentVc: self, button: self.supportBarButton, title: "help_you_text".localized(), values: actionArray) { (element) in + ActionSheetHelper.shared.openWith(parentVc: self, button: nil, title: "help_you_text".localized(), values: actionArray) { (element) in UIApplication.tryURL(url: element.id) } } else { @@ -492,6 +486,13 @@ class HomeViewController: UIViewController { } } + @IBAction func didPressCopyButton(_ sender: Any) { + let copyString = "Account number: \(walletNumberLabel.text ?? "")" + UIPasteboard.general.string = copyString + self.alertWithOk(message: "Account Number Copied") + } + + @objc private func refresh() { presenter?.refreshData() } diff --git a/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/PaymentMethodModel.swift b/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/PaymentMethodModel.swift index 61513476..89f57644 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/PaymentMethodModel.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/PaymentMethodModel.swift @@ -8,7 +8,7 @@ import ObjectMapper -struct PaymentMethodModel: Mappable, RecipientCommonType { +struct PaymentMethodModel: Equatable, Mappable, RecipientCommonType { var id: String? var name: String? var currency: [String]? @@ -28,6 +28,11 @@ struct PaymentMethodModel: Mappable, RecipientCommonType { self.name = name self.localizedName = localizedName } + + static func == (lhs: PaymentMethodModel, rhs: PaymentMethodModel) -> Bool { + return (lhs.receiverId == rhs.receiverId + && lhs.id == rhs.id) + } init?(map: Map) {} diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift index fae9a15b..7f256a25 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift @@ -59,6 +59,23 @@ extension SetupRecipientWireframe: SetupRecipientWireframeInput { navigationController.modalPresentationStyle = .overFullScreen base.present(navigationController, animated: true, completion: completion) } + + + func openEditFromBeneficeris( + using model: Recipient, + on base: UIViewController, + completion: (() -> Void)? = nil + ) { + recipient = model + let viewcontroller = getMainView() + let navigationController = UINavigationController( + rootViewController: viewcontroller + ) + navigationController.hero.isEnabled = true + navigationController.modalPresentationStyle = .overFullScreen + base.present(navigationController, animated: true, completion: completion) + } + func openNew( with delegate: SetupRecipientDelegate, diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/Application Logic/Interactor/SendMoneyParentInteractor.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/Application Logic/Interactor/SendMoneyParentInteractor.swift index 08e08a03..8ba55092 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/Application Logic/Interactor/SendMoneyParentInteractor.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/Application Logic/Interactor/SendMoneyParentInteractor.swift @@ -15,10 +15,12 @@ class SendMoneyParentInteractor { weak var output: SendMoneyParentInteractorOutput? private let service: SendMoneyParentServiceType var reciepient: Recipient? + var paymentMethod: PaymentMethodModel? // MARK: Initialization - init(service: SendMoneyParentServiceType, reciepient: Recipient?) { + init(service: SendMoneyParentServiceType, reciepient: Recipient?, paymentMethod: PaymentMethodModel?) { + self.paymentMethod = paymentMethod self.service = service self.reciepient = reciepient } diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/Wireframe/SendMoneyParentWireframe.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/Wireframe/SendMoneyParentWireframe.swift index 38bd54b2..95a46e42 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/Wireframe/SendMoneyParentWireframe.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/Wireframe/SendMoneyParentWireframe.swift @@ -11,6 +11,7 @@ import UIKit class SendMoneyParentWireframe { weak var view: UIViewController! var reciepient: Recipient? + var paymentMethod: PaymentMethodModel? } extension SendMoneyParentWireframe: SendMoneyParentWireframeInput { @@ -21,7 +22,8 @@ extension SendMoneyParentWireframe: SendMoneyParentWireframeInput { let service = SendMoneyParentService() let interactor = SendMoneyParentInteractor( service: service, - reciepient: reciepient + reciepient: reciepient, + paymentMethod: paymentMethod ) let presenter = SendMoneyParentPresenter() diff --git a/GME Remit/Utilities/CustomUI/CustomPageControl.swift b/GME Remit/Utilities/CustomUI/CustomPageControl.swift index fe384c8f..1cce5f1e 100644 --- a/GME Remit/Utilities/CustomUI/CustomPageControl.swift +++ b/GME Remit/Utilities/CustomUI/CustomPageControl.swift @@ -115,10 +115,10 @@ class CustomPageControl: UIControl { //MARK: Helper methods... private func getDotView() -> UIView { - let dot = UIView() - self.setupDotAppearance(dot: dot) - dot.translatesAutoresizingMaskIntoConstraints = false - return dot + let dot = UIView() + dot.translatesAutoresizingMaskIntoConstraints = false + self.setupDotAppearance(dot: dot) + return dot } private func setupDotAppearance(dot: UIView) {