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 6c1e6ea3..614af604 100644
--- a/GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift
+++ b/GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift
@@ -39,10 +39,10 @@ class HomeCollectionTableViewCell: UITableViewCell, UICollectionViewDelegateFlow
enum CollectionMenus: Int {
case sendMoney = 0
case todaysRate
+ case withdraw
+ case redeem
case transactionReport
case walletStatement
- case redeem
- case withdraw
}
@IBOutlet weak var collectionView: UICollectionView!
@@ -92,31 +92,33 @@ class HomeCollectionTableViewCell: UITableViewCell, UICollectionViewDelegateFlow
toadaysRateMenu.icon = #imageLiteral(resourceName: "rate-today")
+ let withdrawMenu = HomeCollectionModel()
+ withdrawMenu.index = 2
+ withdrawMenu.title = "bank_deposit_text".localized()
+ let withdrawImage = UIImage.init(named: "ic_bank")
+ withdrawMenu.icon = withdrawImage
+
+ let redeemMenu = HomeCollectionModel()
+ redeemMenu.index = 3
+ redeemMenu.title = "redeem_cash_pickup_text".localized()
+ let redeemImage = UIImage.init(named: "track-transfer")
+ redeemMenu.icon = redeemImage
+
+
let transactionReportMenu = HomeCollectionModel()
- transactionReportMenu.index = 2
+ transactionReportMenu.index = 4
transactionReportMenu.title = "transaction_report_text".localized()
transactionReportMenu.icon = #imageLiteral(resourceName: "track-transfer")
let trackTransferMenu = HomeCollectionModel()
- trackTransferMenu.index = 3
+ trackTransferMenu.index = 5
trackTransferMenu.title = "gme_wallet_statement_text".localized()
let walletImage = UIImage.init(named: "ic_menu_wallet")
trackTransferMenu.icon = walletImage
- let redeemMenu = HomeCollectionModel()
- redeemMenu.index = 4
- redeemMenu.title = "Redeem Cash PickUp".localized()
- let redeemImage = UIImage.init(named: "ic_menu_wallet")
- redeemMenu.icon = redeemImage
-
- let withdrawMenu = HomeCollectionModel()
- withdrawMenu.index = 5
- withdrawMenu.title = "Withdraw".localized()
- let withdrawImage = UIImage.init(named: "ic_menu_wallet")
- withdrawMenu.icon = withdrawImage
// FIXME: Check Menues.
- let menus = [sendMoneyMenu, toadaysRateMenu, transactionReportMenu, trackTransferMenu, redeemMenu, withdrawMenu]
+ let menus = [sendMoneyMenu, toadaysRateMenu, withdrawMenu, redeemMenu, transactionReportMenu, trackTransferMenu]
return menus
}
diff --git a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
index 03176137..523ec357 100644
--- a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
+++ b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
@@ -536,10 +536,10 @@ extension HomeViewController: HomeCollectionDelegate {
switch didSelectMenu {
case .sendMoney: showSendMoney()
case .todaysRate: presenter?.openTodaysRate()
+ case .withdraw: self.presenter?.openWithdraw()
+ case .redeem: self.presenter?.openRedeemCashPayment()
case .transactionReport: showTransactionReport()
case .walletStatement: showTrackYourTransfer()
- case .redeem: self.presenter?.openRedeemCashPayment()
- case .withdraw: self.presenter?.openWithdraw()
}
}
}
diff --git a/GME Remit/Modules/RedeemCashPickUp/User Interface/View/RedeemCashPickUpViewController.swift b/GME Remit/Modules/RedeemCashPickUp/User Interface/View/RedeemCashPickUpViewController.swift
index 5de6d983..003571bb 100644
--- a/GME Remit/Modules/RedeemCashPickUp/User Interface/View/RedeemCashPickUpViewController.swift
+++ b/GME Remit/Modules/RedeemCashPickUp/User Interface/View/RedeemCashPickUpViewController.swift
@@ -11,7 +11,7 @@ import UIKit
class RedeemCashPickUpViewController: UIViewController {
struct StringConstants {
- let titleText = "redeem_cast_pickup_text".localized()
+ let titleText = "redeem_cash_pickup_text".localized()
let searchText = "search_text".localized()
let redeemSubtitle = "redeem_description".localized()
let controlNumberPlaceholder = "control_number_text".localized()
diff --git a/GME Remit/Modules/RegisterModules/MobileVerification/User Interface/View/MobileVerification.storyboard b/GME Remit/Modules/RegisterModules/MobileVerification/User Interface/View/MobileVerification.storyboard
index a510f37e..3c334c64 100644
--- a/GME Remit/Modules/RegisterModules/MobileVerification/User Interface/View/MobileVerification.storyboard
+++ b/GME Remit/Modules/RegisterModules/MobileVerification/User Interface/View/MobileVerification.storyboard
@@ -29,16 +29,16 @@
-
+
-
+
@@ -78,7 +78,7 @@