diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj
index 3a707ee7..520dec35 100644
--- a/GME Remit.xcodeproj/project.pbxproj
+++ b/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;
diff --git a/GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift b/GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift
index 18fc1728..54c111b8 100644
--- a/GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift
+++ b/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
}
diff --git a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift
index 0952a35e..4fd72d2b 100644
--- a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift
+++ b/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
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 1c33db81..5b40132c 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
@@ -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}
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 0c3d405c..ecd7995f 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
@@ -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}
)
diff --git a/GME Remit/Modules/SideMenu/AboutGMEViewController.swift b/GME Remit/Modules/SideMenu/AboutGMEViewController.swift
index 261450c1..f38a5512 100644
--- a/GME Remit/Modules/SideMenu/AboutGMEViewController.swift
+++ b/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)
- })
- }
}
diff --git a/GME Remit/Modules/SideMenu/SideMenu.storyboard b/GME Remit/Modules/SideMenu/SideMenu.storyboard
index 7a729869..cc7bd6c3 100644
--- a/GME Remit/Modules/SideMenu/SideMenu.storyboard
+++ b/GME Remit/Modules/SideMenu/SideMenu.storyboard
@@ -402,7 +402,7 @@
-
+
@@ -419,33 +419,33 @@
-
+
-
+
@@ -453,13 +453,13 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
-
+
-
-
+
-
+
-
-
+
+
-
@@ -617,6 +615,9 @@
+
+
+
diff --git a/GME Remit/MultiLanguages/en.lproj/Localizable.strings b/GME Remit/MultiLanguages/en.lproj/Localizable.strings
index 54fc87bd..680495da 100644
--- a/GME Remit/MultiLanguages/en.lproj/Localizable.strings
+++ b/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";