From 4b5bfba4eb49c89648745fbaff00492378bb8a08 Mon Sep 17 00:00:00 2001
From: Mac <mac@Macs-Mac-mini.local>
Date: Fri, 21 Jan 2022 23:43:39 +0545
Subject: [PATCH] Terms and Condition Changes, #460 Changes, #459 Changes and
 other bug fixing

---
 GME Remit.xcodeproj/project.pbxproj                   |  4 ++--
 .../Login/User Interface/View/Login.storyboard        | 11 ++++-------
 .../User Interface/View/LoginViewController.swift     |  2 ++
 .../View/SetupRecipientViewController.swift           |  4 ++--
 .../View/ExistingUserKycViewController.swift          |  2 +-
 .../View/KYCVerifyStep1ViewController.swift           |  2 +-
 .../User Interface/View/CDDIViewController.storyboard |  6 +++---
 .../View/TermsAndConditionViewController.swift        |  4 ++--
 GME Remit/MultiLanguages/bn.lproj/Localizable.strings |  1 +
 GME Remit/MultiLanguages/en.lproj/Localizable.strings |  1 +
 GME Remit/MultiLanguages/ja.lproj/Localizable.strings |  1 +
 GME Remit/MultiLanguages/ne.lproj/Localizable.strings |  1 +
 .../MultiLanguages/vi-VN.lproj/Localizable.strings    |  1 +
 13 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj
index cd4eb6b4..2c1aff95 100644
--- a/GME Remit.xcodeproj/project.pbxproj	
+++ b/GME Remit.xcodeproj/project.pbxproj	
@@ -7568,7 +7568,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 23;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 68KRG7GPAV;
 				ENABLE_BITCODE = NO;
@@ -7609,7 +7609,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 23;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 68KRG7GPAV;
 				ENABLE_BITCODE = NO;
diff --git a/GME Remit/Modules/Login/User Interface/View/Login.storyboard b/GME Remit/Modules/Login/User Interface/View/Login.storyboard
index c6fb317b..76a9670c 100644
--- a/GME Remit/Modules/Login/User Interface/View/Login.storyboard	
+++ b/GME Remit/Modules/Login/User Interface/View/Login.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -192,7 +192,7 @@ JME</string>
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yYl-oW-RDD">
-                                <rect key="frame" x="40.5" y="431" width="239.5" height="40"/>
+                                <rect key="frame" x="122" y="431" width="76" height="40"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fingerprint" translatesAutoresizingMaskIntoConstraints="NO" id="2x6-yn-YbR">
                                         <rect key="frame" x="0.0" y="0.0" width="30" height="40"/>
@@ -202,14 +202,11 @@ JME</string>
                                         </constraints>
                                     </imageView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3jD-aL-2QY">
-                                        <rect key="frame" x="30" y="0.0" width="209.5" height="40"/>
+                                        <rect key="frame" x="30" y="0.0" width="46" height="40"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="40" id="fzR-FF-AjI"/>
                                         </constraints>
                                         <state key="normal" title="Button"/>
-                                        <buttonConfiguration key="configuration" style="plain" title="Tap to login using fingerprint">
-                                            <color key="baseForegroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        </buttonConfiguration>
                                         <connections>
                                             <action selector="fingerprintLogin:" destination="z4C-iC-QQa" eventType="touchUpInside" id="xGn-qm-COr"/>
                                         </connections>
diff --git a/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift b/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift
index faa1c3ed..5cd11546 100644
--- a/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift	
+++ b/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift	
@@ -25,6 +25,7 @@ class LoginViewController: UIViewController {
         let newToGmeText = "new_to_gme_text".localized()
         let registerHereText = "login_register_here_text".localized()
         let loginText = "login_text".localized()
+        let fingerPrintText = "tap_to_login_using_finger_text".localized()
     }
     
     // MARK: IBOutlets
@@ -197,6 +198,7 @@ class LoginViewController: UIViewController {
         newToGmeLabel.text = StringConstants().newToGmeText
         registerHereButton.setTitle(StringConstants().registerHereText, for: .normal)
         loginButton.setTitle(StringConstants().loginText, for: .normal)
+        fingerprintLogin.setTitle(StringConstants().fingerPrintText, for: .normal)
         headerTitle.text = StringConstants().headerTitle
     }
     
diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
index 9494e891..ee0d7a20 100644
--- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift	
+++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift	
@@ -456,9 +456,9 @@ extension SetupRecipientViewController {
         }).disposed(by: disposeBag)
         
         output.selectedRelation.drive(onNext: { [weak self] in guard let `self` = self else { return }
-            if $0?.title == "Others" {
+            if $0?.title == "Others" || $0?.title == "Other (please specify)" {
                 DispatchQueue.main.async {
-                    let alert = UIAlertController(title: "Specify Occupation", message: "", preferredStyle: .alert)
+                    let alert = UIAlertController(title: "specifyYourRelation_text".localized(), message: "", preferredStyle: .alert)
                     alert.addTextField(configurationHandler: nil)
                     alert.addAction(UIAlertAction(title: "Submit", style: .default, handler: { [weak alert] (_) in
                         guard let textField = alert?.textFields?.first else { return }
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift
index f5c7cdbe..d9a5bc15 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift	
@@ -102,7 +102,7 @@ class ExistingUserKycViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.isFirst = (self.step == .first)
-        let url = URL(string: "https://mobile.japanremit.com:8443/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html")!
+        let url = URL(string: "https://japanremit.com/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html")!
         self.termsWebView.load(URLRequest(url: url))
         self.termsWebView.scrollView.bounces = false
         setup()
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift
index abe4c3ff..e93455ca 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift	
@@ -266,7 +266,7 @@ class KYCVerifyStep1ViewController: UIViewController {
 extension KYCVerifyStep1ViewController {
     
     private func setup() {
-        let url = URL(string: "https://mobile.japanremit.com:8443/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html")!
+        let url = URL(string: "https://japanremit.com/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html")!
         self.termsWebView.load(URLRequest(url: url))
         self.termsWebView.scrollView.bounces = false
         
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewController.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewController.storyboard
index 7380a9fe..6e0710a3 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewController.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewController.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" 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="17701" 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="19144"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -118,7 +118,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="8je-5K-XuW" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-15" y="228"/>
+            <point key="canvasLocation" x="-199" y="228"/>
         </scene>
     </scenes>
     <designables>
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift
index f1723300..3931ff03 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift	
@@ -61,10 +61,10 @@ class TermsAndConditionViewController: UIViewController {
         var url: URL?
         if fromBeneficiary == true {
             self.showLoading()
-            url = URL(string: "https://mobile.japanremit.com:8443/Document/TermsAndConditions/BeneReg_TermsAndConditions.html")!
+            url = URL(string: "https://japanremit.com/Document/TermsAndConditions/BeneReg_TermsAndConditions.html")!
         } else {
             self.showLoading()
-            url = URL(string: "https://mobile.japanremit.com:8443/Document/TermsAndConditions/Trx_TermsAndConditions.html")!
+            url = URL(string: "https://japanremit.com/Document/TermsAndConditions/Trx_TermsAndConditions.html")!
         }
         self.webView.load(URLRequest(url: url!))
 
diff --git a/GME Remit/MultiLanguages/bn.lproj/Localizable.strings b/GME Remit/MultiLanguages/bn.lproj/Localizable.strings
index 75ffc4ae..2feab6d8 100644
--- a/GME Remit/MultiLanguages/bn.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/bn.lproj/Localizable.strings	
@@ -1003,6 +1003,7 @@
 "use_fingerprint_text"="আঙুলের ছাপ ব্যবহার করুন";
 "login_title_text"="স্বাগতম জাপান মানি এক্সপ্রেসে";
 "login_text"="প্রবেশ করুণ";
+"tap_to_login_using_finger_text" = "আঙ্গুলের ছাপসহ লগইনে চাপ দিন";
 "forgot_password_text"="পাসওয়ার্ড ভুলে গেছেন";
 "new_to_jme_text"="জাপান মানি এক্সপ্রেস এ নতুন?";
 "login_register_here_text"="এখানে নিবন্ধন করুন";
diff --git a/GME Remit/MultiLanguages/en.lproj/Localizable.strings b/GME Remit/MultiLanguages/en.lproj/Localizable.strings
index 3a39bf9b..325d6556 100644
--- a/GME Remit/MultiLanguages/en.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/en.lproj/Localizable.strings	
@@ -1,5 +1,6 @@
 
 "login_text" = "Login";
+"tap_to_login_using_finger_text" = "Tap to login with fingerprint";
 "new_user_text" = "New User";
 "hassle_free_transfer_text" = "Hassle free money transfer to your loved ones";
 "connect_local_community_text" = "Connect to local community";
diff --git a/GME Remit/MultiLanguages/ja.lproj/Localizable.strings b/GME Remit/MultiLanguages/ja.lproj/Localizable.strings
index 3246b354..4997a6f3 100644
--- a/GME Remit/MultiLanguages/ja.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ja.lproj/Localizable.strings	
@@ -1,5 +1,6 @@
 
 "login_text" = "ログイン";
+"tap_to_login_using_finger_text" = "指紋にてログインするためにタップしてください。";
 "new_user_text" = "新規ユーザー";
 "hassle_free_transfer_text" = "大切な人にお金を送る";
 "connect_local_community_text" = "地域社会とつながる";
diff --git a/GME Remit/MultiLanguages/ne.lproj/Localizable.strings b/GME Remit/MultiLanguages/ne.lproj/Localizable.strings
index e96a3bb9..8122bfa1 100644
--- a/GME Remit/MultiLanguages/ne.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ne.lproj/Localizable.strings	
@@ -1,4 +1,5 @@
 "login_text" = "लग इन ";
+"tap_to_login_using_finger_text" = "फिंगरप्रिन्टको साथ लग इन गर्न ट्याप गर्नुहोस्";
 "new_user_text" = "नयाँ युजर ";
 "hassle_free_transfer_text" = "बिना झनझट आफ्नो मान्छेलाई पैसा पठाउनुहोस ";
 "connect_local_community_text" = "आफ्नो समुदाय सँग जोडिनुहोस ";
diff --git a/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings b/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings
index 56c9f3bc..a9bfd49e 100644
--- a/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings	
@@ -1,4 +1,5 @@
 "login_text" = "Đăng nhập";
+"tap_to_login_using_finger_text" = "Nhấn để đăng nhập bằng vân tay";
 "new_user_text" = "Người dùng mới ";
 "hassle_free_transfer_text" = "Cùng chuyển tiền đến người yêu thương";
 "connect_local_community_text" = "Kết nối cộng đồng";