From 405eaf9c38b007b7c95d1e276dd161ef3546d5bd Mon Sep 17 00:00:00 2001 From: Ashmita Date: Fri, 25 Feb 2022 19:55:28 +0545 Subject: [PATCH 1/4] fixes on monthly income inKYCVerifyStep1ViewController --- .../User Interface/View/KYCVerifyStep1ViewController.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 56959d08..9a3e5832 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 @@ -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) From d2282f8b53733005fd791bae2c154137059a778e Mon Sep 17 00:00:00 2001 From: Ashmita Date: Fri, 25 Feb 2022 21:26:28 +0545 Subject: [PATCH 2/4] fixes on text localization on tab bar --- .../View/GmeContactsViewController.swift | 4 ++-- GME Remit/Modules/Profile/ProfileViewController.swift | 4 ++-- .../User Interface/View/RecipientsViewController.swift | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/GME Remit/Modules/GmeContacts/User Interface/View/GmeContactsViewController.swift b/GME Remit/Modules/GmeContacts/User Interface/View/GmeContactsViewController.swift index b955b7ab..9ef565a2 100644 --- a/GME Remit/Modules/GmeContacts/User Interface/View/GmeContactsViewController.swift +++ b/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 diff --git a/GME Remit/Modules/Profile/ProfileViewController.swift b/GME Remit/Modules/Profile/ProfileViewController.swift index e55395d4..36062cd2 100644 --- a/GME Remit/Modules/Profile/ProfileViewController.swift +++ b/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) { diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift index 4a5e6a69..0f4e97f3 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift @@ -48,11 +48,11 @@ 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") +// ) setupNormalNavigation() configureLanguage() } From 2379b4451e3123b175fcf352588d86a2e9a8aa35 Mon Sep 17 00:00:00 2001 From: Ashmita Date: Sat, 26 Feb 2022 20:55:22 +0545 Subject: [PATCH 3/4] fixes on terms and condition localization --- .../View/TermsAndCondition.storyboard | 19 ++++++------------- .../TermsAndConditionViewController.swift | 1 + .../bn.lproj/Localizable.strings | 2 ++ .../en.lproj/Localizable.strings | 2 ++ .../ja.lproj/Localizable.strings | 2 ++ .../ne.lproj/Localizable.strings | 2 ++ .../vi-VN.lproj/Localizable.strings | 2 ++ 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndCondition.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndCondition.storyboard index bd0ada6a..b8dae94c 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndCondition.storyboard +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndCondition.storyboard @@ -1,9 +1,9 @@ - + - + @@ -39,21 +39,14 @@ -