Merge pull request '#566' (#24) from #566 into feature/bugfixes

Reviewed-on: http://202.166.220.79:3000/JME-JAPAN/JME-IOS/pulls/24

GME Remit/Modules/GmeContacts/User Interface/View/GmeContactsViewController.swift

@@ -52,8 +52,8 @@ class GmeContactsViewController: UIViewController {
     if self.presentingViewController == nil {
       self.navigationItem.leftBarButtonItem = nil
     }
-    let image = UIImage.init(named: "branch")
-    self.tabBarItem = UITabBarItem(title: "branch_text".localized(), image: image, selectedImage: UIImage(named: "branch_selected"))
+//    let image = UIImage.init(named: "branch")
+//    self.tabBarItem = UITabBarItem(title: "branch_text".localized(), image: image, selectedImage: UIImage(named: "branch_selected"))
   }
   
   // MARK: IBActions

GME Remit/Modules/Main/User Interface/View/MainViewController.swift

@@ -32,6 +32,15 @@ class MainViewController: UITabBarController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.navigationController?.setNavigationBarHidden(true, animated: animated)
+        tabBar.items?[0].title = "home_text".localized()
+        tabBar.items?[1].title = "send_money_text".localized()
+        tabBar.items?[2].title = "branch_text".localized()
+        
+        guard UIStoryboard(name: "Profile", bundle: nil)
+                .instantiateViewController(withIdentifier: "ProfileViewController") is ProfileViewController else {
+            return
+        }
+        tabBar.items?[3].title = "profile_text".localized()
     }
     
     override func viewWillDisappear(_ animated: Bool) {

GME Remit/Modules/Profile/ProfileViewController.swift

@@ -37,8 +37,8 @@ class ProfileViewController: UIViewController {
         self.setupNormalNavigation()
         self.navigationItem.title = StringConstants().profileText
         show()
-        let image = UIImage.init(named: "profile")
-        self.tabBarItem = UITabBarItem(title: "profile_text".localized(), image: image, selectedImage: UIImage(named: "profile_selected"))
+//        let image = UIImage.init(named: "profile")
+//        self.tabBarItem = UITabBarItem(title: "profile_text".localized(), image: image, selectedImage: UIImage(named: "profile_selected"))
     }
     
     override func viewWillDisappear(_ animated: Bool) {

GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift

@@ -48,11 +48,12 @@ class RecipientsViewController: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.navigationItem.title = (self.parentType == .sendmoney) ? "recipient_listing_title_text".localized() :  "recipient_text".localized()
-        let image = UIImage.init(named: "send_money_tab")
-        self.tabBarItem = UITabBarItem(
-            title: "send_money_text".localized(),
-            image: image, selectedImage: UIImage(named: "send_money_selected")
-        )
+//        let image = UIImage.init(named: "send_money_tab")
+//        self.tabBarItem = UITabBarItem(
+//            title: "send_money_text".localized(),
+//            image: image, selectedImage: UIImage(named: "send_money_selected")
+//        )
+        updateTabBarTitle()
         setupNormalNavigation()
         configureLanguage()
     }
@@ -74,6 +75,10 @@ class RecipientsViewController: UIViewController {
             vertical: UI_USER_INTERFACE_IDIOM() == .pad ? 2 : -2
         )
     }
+    
+    @objc func updateTabBarTitle() {
+        self.tabBarItem.title = "send_money_text".localized()
+    }
 }
 
 // MARK: Other Functions

GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift

@@ -797,7 +797,8 @@ extension KYCVerifyStep1ViewController {
             self?.mobileNumberTextField.text = personalInformation.mobile
             self?.mobileNumberTextField.sendActions(for: .editingChanged)
             
-         //   self?.monthlyIncomeTextField.sendActions(for: .editingChanged)//
+            self?.monthlyIncomeTextField.text = personalInformation.monthlyIncome
+            self?.monthlyIncomeTextField.sendActions(for: .editingChanged)
             
             self?.employerNameTxtField.text = personalInformation.employeerName
             self?.employerNameTxtField.sendActions(for: .editingChanged)

GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndCondition.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -39,21 +39,14 @@
                                     <action selector="continueClicked:" destination="HSb-ou-7T5" eventType="touchUpInside" id="sW2-ig-P6o"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gc6-FE-BpC">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gc6-FE-BpC">
                                 <rect key="frame" x="16" y="549" width="343" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="Nnn-HT-gVL"/>
                                 </constraints>
-                                <state key="normal" image="uncheck">
-                                    <attributedString key="attributedTitle">
-                                        <fragment content="I have read and agree to JME Terms &amp; Conditions.">
-                                            <attributes>
-                                                <color key="NSColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                <font key="NSFont" metaFont="cellTitle"/>
-                                                <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" firstLineHeadIndent="10" tighteningFactorForTruncation="0.0"/>
-                                            </attributes>
-                                        </fragment>
-                                    </attributedString>
+                                <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="12"/>
+                                <state key="normal" title="I have read and agree to JME Terms &amp; Conditions." image="uncheck">
+                                    <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
                                 <connections>
                                     <action selector="agreementClicked:" destination="HSb-ou-7T5" eventType="touchUpInside" id="CJ7-m4-QxQ"/>

GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift

@@ -72,6 +72,7 @@ class TermsAndConditionViewController: UIViewController {
         self.setup()
         self.setWebViewDelegate()
         self.continueButton.setTitle("send_money_text".localized(), for: .normal)
+        self.agreementButton.setTitle("i_have_read_to_text_consent_text".localized(), for: .normal)
     }
     
     override func viewDidDisappear(_ animated: Bool) {

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

@@ -1341,3 +1341,5 @@
 "goods_type_text" = "পন্যের ধরন প্রবেশ করান";
 "port_of_shipment_text" = "কোন বন্দর থেকে শিপমেন্ট করা হয়েছে প্রবেশ করান";
 "memberShipId_text" = "Membership ID";
+
+"i_have_read_to_text_consent_text" = "   আমি JME শর্তাবলী পড়েছি এবং সম্মত হয়েছি";

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

@@ -940,3 +940,5 @@
 "goods_type_text" = "Enter Goods Type";
 "port_of_shipment_text" = "Enter Port of Shipment";
 "memberShipId_text" = "Membership ID";
+
+"i_have_read_to_text_consent_text" = "   I have read and agree to JME Terms & Conditions";

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

@@ -940,3 +940,5 @@
 "goods_type_text" = "商品。";
 "port_of_shipment_text" = "船積地。";
 "memberShipId_text" = "会員ID";
+
+"i_have_read_to_text_consent_text" = "   JMEの利用規約を読み、同意します。";

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

@@ -1362,3 +1362,5 @@
 "goods_type_text" = "सामानको प्रकार प्रविष्ट गर्नुहोस्";
 "port_of_shipment_text" = "ढुवानी पोर्ट प्रविष्ट गर्नुहोस्";
 "memberShipId_text" = "सदस्यता आईडी";
+
+"i_have_read_to_text_consent_text" = "   मैले JME का नियम तथा सर्तहरू पढेको छु र सहमत छु";

GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings

@@ -1348,3 +1348,5 @@ Chúng tôi đang xác minh thông tin của bạn.";
 "goods_type_text" = "NHẬP LOẠI HÀNG HÓA";
 "port_of_shipment_text" = "NHẬP CẢNG GỬI HÀNG";
 "memberShipId_text" = "Membership ID";
+
+"i_have_read_to_text_consent_text" = "   Tôi đã đọc và đồng ý với Điều khoản và Điều kiện của JME";