diff --git a/GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift b/GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift index 97bb3507..d95937ac 100644 --- a/GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift +++ b/GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift @@ -38,15 +38,9 @@ class HomeCollectionTableViewCell: UITableViewCell, UICollectionViewDelegateFlow enum CollectionMenus: Int { case sendMoney = 0 - case mobileRecharge case todaysRate - case walletStatement - case resend - case walletToWallet - case demosticRemit - case localTopup - case internationTopup case transactionReport + case walletToWallet } @IBOutlet weak var collectionView: UICollectionView! @@ -89,54 +83,23 @@ class HomeCollectionTableViewCell: UITableViewCell, UICollectionViewDelegateFlow let text = "send_money_text".localized() sendMoneyMenu.title = text sendMoneyMenu.icon = #imageLiteral(resourceName: "send-money") - - let mobileRechargeMenu = HomeCollectionModel() - mobileRechargeMenu.index = 1 - mobileRechargeMenu.title = "Mobile Recharge" - mobileRechargeMenu.icon = #imageLiteral(resourceName: "mobile-recharge") - + let toadaysRateMenu = HomeCollectionModel() - toadaysRateMenu.index = 2 + toadaysRateMenu.index = 1 toadaysRateMenu.title = "todays_rate_text".localized() toadaysRateMenu.icon = #imageLiteral(resourceName: "rate-today") - let trackTransferMenu = HomeCollectionModel() - trackTransferMenu.index = 3 - trackTransferMenu.title = "gme_wallet_statement_text".localized() - let walletImage = UIImage.init(named: "ic_menu_wallet") - trackTransferMenu.icon = walletImage - let transactionStatementMenu = HomeCollectionModel() - transactionStatementMenu.index = 4 - transactionStatementMenu.title = "resend_money_text".localized() - let image = UIImage.init(named: "ic_menu_sendmoney") - transactionStatementMenu.icon = image + let transactionReportMenu = HomeCollectionModel() + transactionReportMenu.index = 2 + transactionReportMenu.title = "transaction_report_text".localized() + transactionReportMenu.icon = #imageLiteral(resourceName: "track-transfer") let walletToWalletMenu = HomeCollectionModel() - walletToWalletMenu.index = 5 + walletToWalletMenu.index = 3 walletToWalletMenu.title = "Wallet to Wallet Transfer" walletToWalletMenu.icon = #imageLiteral(resourceName: "wallet-transfer") - let domesticRemitMenu = HomeCollectionModel() - domesticRemitMenu.index = 6 - domesticRemitMenu.title = "local_transfer_text".localized() - domesticRemitMenu.icon = #imageLiteral(resourceName: "ic_menu_domestic") - - let prepaidPhoneRecharge = HomeCollectionModel() - prepaidPhoneRecharge.index = 7 - prepaidPhoneRecharge.title = "local_top_up_text".localized() - prepaidPhoneRecharge.icon = #imageLiteral(resourceName: "ic_local_topup") - - let cardRecharge = HomeCollectionModel() - cardRecharge.index = 8 - cardRecharge.title = "Int'l Topup" - cardRecharge.icon = #imageLiteral(resourceName: "ic_int_topup") - - let transactionReportMenu = HomeCollectionModel() - transactionReportMenu.index = 9 - transactionReportMenu.title = "transaction_report_text".localized() - transactionReportMenu.icon = #imageLiteral(resourceName: "track-transfer") - // FIXME: Check Menues. let menus = [sendMoneyMenu, toadaysRateMenu, transactionReportMenu, walletToWalletMenu] diff --git a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift index 5b592d1a..945b5e56 100644 --- a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift +++ b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift @@ -401,53 +401,10 @@ extension HomeViewController { } } - private func showDomesticRemit() { - let kycSubmited = user?.kyc ?? false - let pennyTestComplete = Utility.pennyTestVerified() - - if kycSubmited == true && pennyTestComplete == false { - self.show(error: StringConstants().pennyTestPrimaryBankText) - return - } - - if isUserVerified { - DomesticRemitWireframe().open(on: self) - } else { - self.showUnVerifiedMessage() - } - } - - private func showResendMoney() { - } - - private func showMobileRecharge() { - let kycSubmited = user?.kyc ?? false - let pennyTestComplete = Utility.pennyTestVerified() - - if kycSubmited == true && pennyTestComplete == false { - self.show(error: StringConstants().pennyTestPrimaryBankText) - return - } - - self.alert(type: .error, message: "This feature is coming soon") - } - private func showTodaysRate() { presenter?.openTodaysRate() } - private func showTrackYourTransfer() { - let kycSubmited = user?.kyc ?? false - let pennyTestComplete = Utility.pennyTestVerified() - - if kycSubmited == true && pennyTestComplete == false { - self.show(error: StringConstants().pennyTestPrimaryBankText) - return - } - - isUserVerified ? (presenter?.openTrackYourTransfer()) : (self.showUnVerifiedMessage()) - - } private func showTransactionStatement() { let kycSubmited = user?.kyc ?? false @@ -724,28 +681,9 @@ extension HomeViewController: HomeCollectionDelegate { ) { switch didSelectMenu { case .sendMoney: showSendMoney() - case .mobileRecharge: showMobileRecharge() case .todaysRate: presenter?.openTodaysRate() - case .walletStatement: showTrackYourTransfer() - case .resend: showResendMoney() - case .walletToWallet: showWalletToWallet() - case .demosticRemit: showDomesticRemit() - case .localTopup: - let kycSubmited = user?.kyc ?? false - let pennyTestComplete = Utility.pennyTestVerified() - - if kycSubmited == true && pennyTestComplete == false { - self.show(error: StringConstants().pennyTestPrimaryBankText) - return - } - - if isUserVerified { - PhoneCardRechargeWireframe().pushMainView(on: self) - } else { - self.showUnVerifiedMessage() - } case .transactionReport: showTransactionReport() - case .internationTopup: InternationalTopupWireframe().pushMainView(on: self) + case .walletToWallet: showWalletToWallet() } } }