home screen menu added

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
     }

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()
         }
     }
 }

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()

GME Remit/Modules/RegisterModules/MobileVerification/User Interface/View/MobileVerification.storyboard

@@ -29,16 +29,16 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="sJ6-6k-Wf9">
-                                <rect key="frame" x="46" y="10" width="283" height="113.5"/>
+                                <rect key="frame" x="46" y="10" width="283" height="130.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Verify Your Mobile Number" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nma-Ml-oFF">
-                                        <rect key="frame" x="0.0" y="0.0" width="283" height="57.5"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="283" height="56"/>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="24"/>
                                         <color key="textColor" name="ThemeRedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please provide us your mobile number to verify and proceed for registration" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Acu-Dz-xlE">
-                                        <rect key="frame" x="0.0" y="72.5" width="283" height="41"/>
+                                        <rect key="frame" x="0.0" y="71" width="283" height="59.5"/>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
                                         <color key="textColor" name="ThemeText"/>
                                         <nil key="highlightedColor"/>
@@ -46,7 +46,7 @@
                                 </subviews>
                             </stackView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nj0-cy-YNq">
-                                <rect key="frame" x="40" y="153.5" width="295" height="34"/>
+                                <rect key="frame" x="40" y="170.5" width="295" height="34"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="q2D-4F-RGK">
                                         <rect key="frame" x="0.0" y="0.0" width="295" height="34"/>
@@ -78,7 +78,7 @@
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5dA-VW-4uO">
-                                <rect key="frame" x="30" y="217.5" width="315" height="50"/>
+                                <rect key="frame" x="30" y="234.5" width="315" height="50"/>
                                 <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="Vgh-Tp-SGI"/>

GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/View/InboundReceiptViewController.swift

@@ -138,7 +138,7 @@ class InboundReceiptViewController: UIViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        title = (self.receiptType == .InBound) ? "inbound_receipt_text".localized() : "redeem_cast_pickup_text".localized()
+        title = (self.receiptType == .InBound) ? "inbound_receipt_text".localized() : "redeem_cash_pickup_text".localized()
     }
     
     override func viewWillDisappear(_ animated: Bool) {

GME Remit/MultiLanguages/en.lproj/Localizable.strings

@@ -826,7 +826,7 @@
 "complete_mobile_verification_subtitle" = "Please enter the 5-digits otp sent to your mobile number";
 
 //Redeem
-"redeem_cast_pickup_text" = "Redeem CashPickup";
+"redeem_cash_pickup_text" = "Redeem Cash Pickup";
 "redeem_text" = "Redeem";
 "search_text" = "Search";
 "control_number_text" = "Control No.";
@@ -842,3 +842,6 @@
 "bank_text" = "Bank";
 "amount_text" = "Amount";
 "account_number_text" = "Account Number";
+
+//Home Screen
+"bank_deposit_text" = "Bank Deposite";