in-app browser linked

GME Remit.xcodeproj/project.pbxproj

@@ -7480,7 +7480,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = XQRV22K6DC;
 				ENABLE_BITCODE = NO;
@@ -7519,7 +7519,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = XQRV22K6DC;
 				ENABLE_BITCODE = NO;

GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift

@@ -96,7 +96,7 @@ class HomeCollectionTableViewCell: UITableViewCell, UICollectionViewDelegateFlow
 //        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()
@@ -114,10 +114,15 @@ class HomeCollectionTableViewCell: UITableViewCell, UICollectionViewDelegateFlow
         let walletImage = UIImage.init(named: "ic_menu_wallet")
         trackTransferMenu.icon = walletImage
         
+        let noticeMenu = HomeCollectionModel()
+        noticeMenu.index = 6
+        noticeMenu.title = "Notice"
+        noticeMenu.icon = #imageLiteral(resourceName: "track-transfer")
+        
         
         // FIXME: Check Menues.
 //        let menus = [sendMoneyMenu, toadaysRateMenu, withdrawMenu, redeemMenu, transactionReportMenu, trackTransferMenu]
-        let menus = [sendMoneyMenu, toadaysRateMenu, transactionReportMenu, trackTransferMenu]
+        let menus = [sendMoneyMenu, toadaysRateMenu, transactionReportMenu, trackTransferMenu, noticeMenu]
         
         return menus
     }

GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift

@@ -135,13 +135,13 @@ class ExistingUserRegistrationViewController: UIViewController {
         validDic["dob"] = dobTxtField.isValid
       case mobNoTxtField:
         textField.removeNonASCII()
-//        if textField.text?.prefix(3) != "+81" {
-//            if textField.text?.count == 1 {
-//                textField.text = "+81" + (textField.text ?? "")
-//            } else {
-//                textField.text = "+81"
-//            }
-//        }
+        if textField.text?.prefix(3) != "+81" {
+            if textField.text?.count == 1 {
+                textField.text = "+81" + (textField.text ?? "")
+            } else {
+                textField.text = "+81"
+            }
+        }
         validDic["mobNum"] = mobNoTxtField.isValid
         
       default: ()
@@ -163,7 +163,7 @@ class ExistingUserRegistrationViewController: UIViewController {
         mobNoTxtField.titleText = StringConstants().mobileNumberTitle
         mobNoTxtField.placeholder = StringConstants().mobilePlaceholder
         mobNoTxtField.errorMessage = StringConstants().mobileNumberError
-      //  mobNoTxtField.validCondition = { $0.count == 11}
+        mobNoTxtField.validCondition = { $0.count == 13}
         
         userVerificationHeader.text = StringConstants().verifyHeaderTitle
         existingUserDescription.text = StringConstants().existingUserDesc

GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift

@@ -195,7 +195,7 @@ class ExistingUserKycViewController: UIViewController {
         sideIdButton.layer.borderColor = UIColor.themeText.cgColor
         
         sourceOfFund.validCondition = {!$0.isEmpty}
-     //   occupationTextField.validCondition = {!$0.isEmpty}
+        occupationTextField.validCondition = {!$0.isEmpty}
         monthlyIncome.validCondition = {!$0.isEmpty}
         mobileNumber.validCondition = {!$0.isEmpty && $0.count > 8}
         businessType.validCondition = {!$0.isEmpty}

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

@@ -254,9 +254,9 @@ extension KYCVerifyStep1ViewController {
         sideIDImageButton.layer.borderColor = UIColor.themeText.cgColor
         
         sourceOfFundTextField.validCondition = {!$0.isEmpty}
-     //   occupationTxtField.validCondition = {!$0.isEmpty}
+        occupationTxtField.validCondition = {!$0.isEmpty}
         monthlyIncomeTextField.validCondition = {!$0.isEmpty}
-        mobileNumberTextField.validCondition = {!$0.isEmpty && $0.count == 11}
+        mobileNumberTextField.validCondition = {!$0.isEmpty && $0.count == 13}
         businessTypeTextField.validCondition = {!$0.isEmpty}
         emailTextField.validCondition = {$0.isEmail()}
         addressTextField.validCondition = {!$0.isEmpty && $0.count < 50}
@@ -663,6 +663,8 @@ extension KYCVerifyStep1ViewController {
             self?.employerNameTxtField.text = personalInformation.employeerName
             self?.employerNameTxtField.sendActions(for: .editingChanged)
             
+            print("source of fund is:: \(personalInformation.sourceOfFund)")
+            
             self?.sourceOfFundTextField.didSelect(
                 item: model.sourceOfFund?.first {$0.id == personalInformation.sourceOfFund}
             )

GME Remit/Modules/SideMenu/AboutGMEViewController.swift

@@ -7,107 +7,128 @@
 //
 
 import UIKit
+import SafariServices
+
 
 class AboutGMEViewController: UIViewController {
-  
-  struct StringConstants {
-    let descriptionText = "about_me_description_text".localized()
-    let appVersionText = "app_version_text".localized()
-    let followText = "follow_us_text".localized()
-    let aboutGme = "about_gme_text".localized()
-  }
-  
-  // language
-  @IBOutlet weak var versionLabel: UILabel!
-  @IBOutlet weak var descriptionLabel: UILabel!
-  @IBOutlet weak var followUsTitleText: UILabel!
-  @IBOutlet weak var versionTitleLabel: UILabel!
-  
-  
-  let facebookUrls: [String: String] = [
-    "np" : "",
-    "kh" : "",
-    "lk" : "",
-    "vn" : "",
-    "ph" : "",
-    "bd" : "",
-    "id" : "",
-    "th" : "",
-    "mn" : "",
-    "uz" : "",
-    "in" : "",
-    "pk" : "",
-    "mm" : ""
-  ]
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    self.versionLabel.text = Utility.getAppVersion()
-    configureLanguage()
     
-    versionTitleLabel.textColor = .themeRed
-    followUsTitleText.textColor = .themeRed
-  }
-  
-  override func viewWillAppear(_ animated: Bool) {
-    super.viewWillAppear(animated)
-    setupNormalNavigation(color: .themeRedDark)
-    setupNavigationShadow(isUse: false)
-  }
-  
-  override func viewWillDisappear(_ animated: Bool) {
-    super.viewWillDisappear(animated)
-    setupNavigationShadow(isUse: true)
-  }
-  
-  override func didReceiveMemoryWarning() {
-    super.didReceiveMemoryWarning()
-    // Dispose of any resources that can be recreated.
-  }
-  
-  func configureLanguage() {
-    self.descriptionLabel.text = StringConstants().descriptionText
-    self.followUsTitleText.text = StringConstants().followText
-    self.versionTitleLabel.text = StringConstants().appVersionText
-  }
-  
-  @IBAction func checkForUpdate(_ sender: Any) {
-  }
-  
-  @IBAction func openLinkedIn(_ sender: Any) {
-  
-  }
-  
-  @IBAction func openFacebook(_ sender: Any) {
-    // Based on native country
-    guard let nativeCountry = GMEDB.shared.user.string(.countryCode)?.lowercased() else {
-      return
+    struct StringConstants {
+        let descriptionText = "about_me_description_text".localized()
+        let appVersionText = "app_version_text".localized()
+        let followText = "follow_us_text".localized()
+        let aboutGme = "about_gme_text".localized()
+    }
+    
+    // language
+    @IBOutlet weak var versionLabel: UILabel!
+    @IBOutlet weak var descriptionLabel: UILabel!
+    @IBOutlet weak var followUsTitleText: UILabel!
+    @IBOutlet weak var versionTitleLabel: UILabel!
+    
+    let facebookUrls: [String: String] = [
+        "np" : "",
+        "kh" : "",
+        "lk" : "",
+        "vn" : "",
+        "ph" : "",
+        "bd" : "",
+        "id" : "",
+        "th" : "",
+        "mn" : "",
+        "uz" : "",
+        "in" : "",
+        "pk" : "",
+        "mm" : ""
+    ]
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.versionLabel.text = Utility.getAppVersion()
+        configureLanguage()
+        
+        versionTitleLabel.textColor = .themeRed
+        followUsTitleText.textColor = .themeRed
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        setupNormalNavigation(color: .themeRedDark)
+        setupNavigationShadow(isUse: false)
+    }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        setupNavigationShadow(isUse: true)
+    }
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+    func configureLanguage() {
+        self.descriptionLabel.text = StringConstants().descriptionText
+        self.followUsTitleText.text = StringConstants().followText
+        self.versionTitleLabel.text = StringConstants().appVersionText
+    }
+    
+    @IBAction func checkForUpdate(_ sender: Any) {
+    }
+    
+    @IBAction func openLinkedIn(_ sender: Any) {
+        
+    }
+    
+    @IBAction func openFacebook(_ sender: Any) {
+        // Based on native country
+        guard let nativeCountry = GMEDB.shared.user.string(.countryCode)?.lowercased() else {
+            return
+        }
+        
+        UIApplication.tryURL(
+            url: self.facebookUrls[nativeCountry.lowercased()] ?? "https://www.facebook.com/"
+        )
+    }
+    
+    @IBAction func termsAndCondition(_ sender: UIButton) {
+        let urlString = "https://www.japanremit.com/Website/TermsAndConditions"
+        showTutorial(url: urlString)
+    }
+    
+    @IBAction func privacyPolicy(_ sender: UIButton) {
+        let urlString = "https://www.japanremit.com/Website/PrivacyPolicy"
+        showTutorial(url: urlString)
+    }
+    
+    func showTutorial(url: String) {
+        if let url = URL(string: url) {
+            let config = SFSafariViewController.Configuration()
+            config.entersReaderIfAvailable = false
+
+            let vc = SFSafariViewController(url: url, configuration: config)
+            present(vc, animated: true)
+        }
     }
     
-    UIApplication.tryURL(
-      url: self.facebookUrls[nativeCountry.lowercased()] ?? "https://www.facebook.com/"
-    )
-  }
-  
 }
 
 extension UIApplication {
-  class func tryURL(url: String) {
-    let application = UIApplication.shared
-    if let url = URL(string: url), application.canOpenURL(url) {
-      application.open(
-        url,
-        options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]),
-        completionHandler: nil
-      )
+    class func tryURL(url: String) {
+        let application = UIApplication.shared
+        if let url = URL(string: url), application.canOpenURL(url) {
+            application.open(
+                url,
+                options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]),
+                completionHandler: nil
+            )
+        }
+    }
+    
+    // Helper function inserted by Swift 4.2 migrator.
+    class func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(
+        _ input: [String: Any]
+    ) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
+        return Dictionary(uniqueKeysWithValues: input.map { key, value in
+            (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)
+        })
     }
-  }
-  
-  // Helper function inserted by Swift 4.2 migrator.
-  class func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(
-    _ input: [String: Any]
-  ) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
-    return Dictionary(uniqueKeysWithValues: input.map { key, value in
-      (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)
-    })
-  }
 }

GME Remit/Modules/SideMenu/SideMenu.storyboard

@@ -402,7 +402,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="667" translatesAutoresizingMaskIntoConstraints="NO" id="iFf-7f-Hxa">
-                                        <rect key="frame" x="0.0" y="0.0" width="414" height="678.33333333333337"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="414" height="800"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6iy-En-3n0">
                                                 <rect key="frame" x="0.0" y="0.0" width="414" height="116"/>
@@ -419,33 +419,33 @@
                                                 </constraints>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AYM-92-crE">
-                                                <rect key="frame" x="34" y="148" width="346" height="112"/>
+                                                <rect key="frame" x="34" y="148" width="346" height="163.33333333333337"/>
                                                 <string key="text">We are licensed by Ministry of Strategy &amp; Finance to operate as the first Non-Bank Remittance Service providers in South Korea. Meeting all compliance regulations set forward by the regulators was a tough journey but today we feel proud about what we have achieved and how robust our operations are as a result of the hard work completed earlier. We are now ready with a 100% compliant and secured system that guarantees your money will arrive safely in right hands every single time.</string>
-                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
+                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                 <color key="textColor" name="ThemeText"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BjH-0j-TVc" userLabel="Border">
-                                                <rect key="frame" x="0.0" y="280.66666666666669" width="414" height="0.33333333333331439"/>
+                                                <rect key="frame" x="0.0" y="416.66666666666669" width="414" height="0.66666666666668561"/>
                                                 <color key="backgroundColor" name="ThemeSeparate"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="0.5" id="K7M-cd-xsc"/>
                                                 </constraints>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="App Version" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E3H-nn-Nvh">
-                                                <rect key="frame" x="34" y="294" width="346" height="14"/>
+                                                <rect key="frame" x="34" y="430.33333333333331" width="346" height="14"/>
                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="12"/>
                                                 <color key="textColor" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1.0.1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cKU-hx-ROy">
-                                                <rect key="frame" x="34" y="315" width="346" height="14"/>
+                                                <rect key="frame" x="34" y="451.33333333333331" width="346" height="14"/>
                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                 <color key="textColor" name="ThemeText"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oak-ca-Ggm" userLabel="Border">
-                                                <rect key="frame" x="0.0" y="352.66666666666669" width="414" height="0.33333333333331439"/>
+                                                <rect key="frame" x="0.0" y="488.66666666666669" width="414" height="0.66666666666668561"/>
                                                 <color key="backgroundColor" name="ThemeSeparate"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="0.5" id="Xei-YO-zkT"/>
@@ -453,13 +453,13 @@
                                                 </constraints>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Follow us on" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bfv-Bk-7vq">
-                                                <rect key="frame" x="34" y="364" width="346" height="14"/>
+                                                <rect key="frame" x="34" y="500.33333333333331" width="346" height="13.999999999999943"/>
                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="12"/>
                                                 <color key="textColor" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kyg-Lw-v7u">
-                                                <rect key="frame" x="279" y="312" width="117" height="25"/>
+                                                <rect key="frame" x="279" y="448.33333333333331" width="117" height="25"/>
                                                 <color key="backgroundColor" red="0.90588235289999997" green="0.92941176469999998" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="117" id="Bly-5e-PN8"/>
@@ -479,7 +479,7 @@
                                                 </connections>
                                             </button>
                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="IFe-rR-lRI">
-                                                <rect key="frame" x="34" y="388.66666666666669" width="25" height="25"/>
+                                                <rect key="frame" x="34" y="524.66666666666663" width="25" height="25"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j8X-Fa-EPV">
                                                         <rect key="frame" x="0.0" y="0.0" width="25" height="25"/>
@@ -505,74 +505,72 @@
                                                     </button>
                                                 </subviews>
                                             </stackView>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6XL-Mh-jWw" userLabel="Border">
-                                                <rect key="frame" x="0.0" y="433.66666666666669" width="414" height="0.33333333333331439"/>
-                                                <color key="backgroundColor" name="ThemeSeparate"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="0.5" id="ZAa-Hn-jIp"/>
-                                                    <constraint firstAttribute="height" constant="0.5" id="cuL-XT-Nd9"/>
-                                                </constraints>
-                                            </view>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Terms &amp; Conditions" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7CU-EE-Vpk">
-                                                <rect key="frame" x="34" y="454" width="346" height="14"/>
-                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="12"/>
-                                                <color key="textColor" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hya-ef-Fdy" userLabel="Border">
-                                                <rect key="frame" x="0.0" y="488" width="414" height="0.66666666666668561"/>
-                                                <color key="backgroundColor" name="ThemeSeparate"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="0.5" id="ZFO-6e-ASd"/>
-                                                    <constraint firstAttribute="height" constant="0.5" id="zau-KR-dYm"/>
-                                                </constraints>
-                                            </view>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Privacy Policy" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kxp-cg-bO6">
-                                                <rect key="frame" x="34" y="508.66666666666674" width="346" height="14"/>
-                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="12"/>
-                                                <color key="textColor" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Yn-Ri-dPJ">
+                                                <rect key="frame" x="34" y="331.33333333333331" width="127" height="28.666666666666686"/>
+                                                <state key="normal">
+                                                    <attributedString key="attributedTitle">
+                                                        <fragment content="Terms &amp; Conditions">
+                                                            <attributes>
+                                                                <color key="NSColor" name="ThemeBlue"/>
+                                                                <font key="NSFont" metaFont="menu" size="14"/>
+                                                                <integer key="NSUnderline" value="1"/>
+                                                            </attributes>
+                                                        </fragment>
+                                                    </attributedString>
+                                                </state>
+                                                <connections>
+                                                    <action selector="termsAndCondition:" destination="Yhd-pK-olD" eventType="touchUpInside" id="cpG-KG-rpk"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="c1W-1U-xTi">
+                                                <rect key="frame" x="34" y="368" width="90" height="28.666666666666686"/>
+                                                <state key="normal">
+                                                    <attributedString key="attributedTitle">
+                                                        <fragment content="Privacy Policy">
+                                                            <attributes>
+                                                                <color key="NSColor" name="ThemeBlue"/>
+                                                                <font key="NSFont" metaFont="menu" size="14"/>
+                                                                <integer key="NSUnderline" value="1"/>
+                                                            </attributes>
+                                                        </fragment>
+                                                    </attributedString>
+                                                </state>
+                                                <connections>
+                                                    <action selector="privacyPolicy:" destination="Yhd-pK-olD" eventType="touchUpInside" id="WDE-Dl-ZEc"/>
+                                                </connections>
+                                            </button>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="trailing" secondItem="AYM-92-crE" secondAttribute="trailing" constant="34" id="1mv-60-rxK"/>
-                                            <constraint firstAttribute="trailing" secondItem="7CU-EE-Vpk" secondAttribute="trailing" constant="34" id="2Jb-hm-7w7"/>
                                             <constraint firstItem="Oak-ca-Ggm" firstAttribute="top" secondItem="Kyg-Lw-v7u" secondAttribute="bottom" constant="15.5" id="3xz-Vg-ga2"/>
-                                            <constraint firstItem="7CU-EE-Vpk" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" constant="34" id="4WI-eA-JPl"/>
                                             <constraint firstItem="Oak-ca-Ggm" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" id="4c5-sC-M7w"/>
                                             <constraint firstItem="IFe-rR-lRI" firstAttribute="top" secondItem="bfv-Bk-7vq" secondAttribute="bottom" constant="10.5" id="6Fa-c4-Taw"/>
-                                            <constraint firstItem="kxp-cg-bO6" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" constant="34" id="7as-pE-EtP"/>
-                                            <constraint firstItem="hya-ef-Fdy" firstAttribute="top" secondItem="7CU-EE-Vpk" secondAttribute="bottom" constant="20" id="9iQ-WP-cKv"/>
                                             <constraint firstAttribute="trailing" secondItem="E3H-nn-Nvh" secondAttribute="trailing" constant="34" id="CS4-OV-Tuy"/>
                                             <constraint firstItem="6iy-En-3n0" firstAttribute="top" secondItem="iFf-7f-Hxa" secondAttribute="top" id="CYO-ed-1fp"/>
-                                            <constraint firstItem="hya-ef-Fdy" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" id="F9n-JQ-5qx"/>
                                             <constraint firstItem="bfv-Bk-7vq" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" constant="34" id="HHU-8L-HMa"/>
                                             <constraint firstItem="cKU-hx-ROy" firstAttribute="trailing" secondItem="E3H-nn-Nvh" secondAttribute="trailing" id="HS4-mN-SPQ"/>
                                             <constraint firstAttribute="trailing" secondItem="bfv-Bk-7vq" secondAttribute="trailing" constant="34" id="KGh-aV-kaJ"/>
                                             <constraint firstItem="BjH-0j-TVc" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" id="L04-Ez-EwA"/>
-                                            <constraint firstAttribute="trailing" secondItem="hya-ef-Fdy" secondAttribute="trailing" id="Mdk-2h-zaR"/>
                                             <constraint firstItem="AYM-92-crE" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" constant="34" id="OL5-bX-QFG"/>
-                                            <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="kxp-cg-bO6" secondAttribute="bottom" constant="155.66666666666669" id="OU2-ns-7iO"/>
                                             <constraint firstAttribute="trailing" secondItem="BjH-0j-TVc" secondAttribute="trailing" id="Oku-tj-QHB"/>
                                             <constraint firstItem="IFe-rR-lRI" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" constant="34" id="PGa-lm-0Ea"/>
+                                            <constraint firstItem="c1W-1U-xTi" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" constant="34" id="Qub-LV-3G5"/>
                                             <constraint firstItem="AYM-92-crE" firstAttribute="top" secondItem="6iy-En-3n0" secondAttribute="bottom" constant="32" id="Rxq-gB-1UD"/>
                                             <constraint firstItem="bfv-Bk-7vq" firstAttribute="top" secondItem="Oak-ca-Ggm" secondAttribute="bottom" constant="11" id="Uhq-cy-6Lf"/>
                                             <constraint firstItem="E3H-nn-Nvh" firstAttribute="top" secondItem="BjH-0j-TVc" secondAttribute="bottom" constant="13" id="W0A-td-kWH"/>
-                                            <constraint firstItem="6XL-Mh-jWw" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" id="WRl-ym-XY4"/>
                                             <constraint firstItem="6iy-En-3n0" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" id="X4x-jD-ZRv"/>
+                                            <constraint firstItem="c1W-1U-xTi" firstAttribute="top" secondItem="5Yn-Ri-dPJ" secondAttribute="bottom" constant="8" id="ayU-vr-JLC"/>
                                             <constraint firstItem="Kyg-Lw-v7u" firstAttribute="top" secondItem="BjH-0j-TVc" secondAttribute="bottom" constant="31" id="c6W-q3-ibE"/>
-                                            <constraint firstItem="6XL-Mh-jWw" firstAttribute="top" secondItem="IFe-rR-lRI" secondAttribute="bottom" constant="20" id="csd-l8-u24"/>
-                                            <constraint firstAttribute="trailing" secondItem="kxp-cg-bO6" secondAttribute="trailing" constant="34" id="dzD-Wg-a3A"/>
+                                            <constraint firstItem="5Yn-Ri-dPJ" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" constant="34" id="dDB-kC-zbg"/>
                                             <constraint firstAttribute="trailing" secondItem="6iy-En-3n0" secondAttribute="trailing" id="eHB-Ww-9sE"/>
                                             <constraint firstAttribute="trailing" secondItem="Oak-ca-Ggm" secondAttribute="trailing" id="fMf-FH-sza"/>
-                                            <constraint firstAttribute="trailing" secondItem="6XL-Mh-jWw" secondAttribute="trailing" id="jrR-aJ-2Ki"/>
+                                            <constraint firstItem="BjH-0j-TVc" firstAttribute="top" secondItem="c1W-1U-xTi" secondAttribute="bottom" constant="20" id="g9e-yt-Jzx"/>
                                             <constraint firstAttribute="trailing" secondItem="Kyg-Lw-v7u" secondAttribute="trailing" constant="18" id="nLb-nA-IJo"/>
-                                            <constraint firstItem="7CU-EE-Vpk" firstAttribute="top" secondItem="6XL-Mh-jWw" secondAttribute="bottom" constant="20" id="pWF-t1-UgQ"/>
-                                            <constraint firstItem="BjH-0j-TVc" firstAttribute="top" secondItem="AYM-92-crE" secondAttribute="bottom" constant="20.5" id="q2E-UG-TsY"/>
+                                            <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="IFe-rR-lRI" secondAttribute="bottom" constant="250.33000000000001" id="qjb-nA-BJp"/>
                                             <constraint firstItem="E3H-nn-Nvh" firstAttribute="leading" secondItem="iFf-7f-Hxa" secondAttribute="leading" constant="34" id="r4e-t4-b8z"/>
+                                            <constraint firstItem="5Yn-Ri-dPJ" firstAttribute="top" secondItem="AYM-92-crE" secondAttribute="bottom" constant="20" id="sF3-ba-rY4"/>
                                             <constraint firstItem="cKU-hx-ROy" firstAttribute="leading" secondItem="E3H-nn-Nvh" secondAttribute="leading" id="tgS-jm-d7h"/>
-                                            <constraint firstItem="kxp-cg-bO6" firstAttribute="top" secondItem="hya-ef-Fdy" secondAttribute="bottom" constant="20" id="yHJ-DE-ReB"/>
                                             <constraint firstItem="cKU-hx-ROy" firstAttribute="top" secondItem="E3H-nn-Nvh" secondAttribute="bottom" constant="7" id="zME-Po-QPA"/>
                                         </constraints>
                                     </view>
@@ -617,6 +615,9 @@
         <image name="settingsLinkedin" width="25" height="25"/>
         <image name="settingsLogout" width="15" height="13"/>
         <image name="settingsSetting" width="15" height="16"/>
+        <namedColor name="ThemeBlue">
+            <color red="0.18823529411764706" green="0.24313725490196078" blue="0.62352941176470589" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <namedColor name="ThemeMainBackground">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

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

@@ -103,7 +103,7 @@
 "placeholder_enter_receiver_address_text" = "Enter receiver's address";
 "relation_text" = "Relation";
 "placeholder_select_relation_text" = " Select relation";
-"mobile_number_text" = "Mobile number should be of 11 digits";
+"mobile_number_text" = "Mobile number should be of 10 digits";
 "mobile_number_title" = "Mobile No.";
 "placeholder_enter_reciever_mobile_number_text" = "Enter receiver's mobile number";
 "state_text" = "State/Province";