diff --git a/GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformation.storyboard b/GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformation.storyboard index a199dbd0..064c4f6c 100644 --- a/GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformation.storyboard +++ b/GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformation.storyboard @@ -1,9 +1,9 @@ - + - + @@ -26,13 +26,13 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard index 71907dc2..fec61f94 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard @@ -1,9 +1,9 @@ - + - + @@ -242,7 +242,7 @@ - + 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 b762d4e5..6e34e2b9 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift @@ -520,7 +520,7 @@ extension SetupRecipientViewController { let max = property.maxLength, let keyboardType = property.keyBoardType else { return } - textField.errorMessage = "min_length_error_text".localized().replacingOccurrences( + textField.errorMessage = "mobile_number_text".localized().replacingOccurrences( of: "xxx", with: "\(min)" ).replacingOccurrences(of: "ooo", with: "\(max)") 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 979b38cf..3e6f0bd7 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 @@ -415,7 +415,7 @@ class ExistingUserKycViewController: UIViewController { }).disposed(by: disposeBag) emailAddress.rx.filterBy(.alphabetNumbericSpecial).disposed(by: disposeBag) - address.rx.filterBy(.alphabet, isUppercase: true).disposed(by: disposeBag) + address.rx.filterBy(.alphabetNumbericSpecial, isUppercase: true).disposed(by: disposeBag) } 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 beb19054..abe4c3ff 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 @@ -579,7 +579,7 @@ extension KYCVerifyStep1ViewController { }).disposed(by: disposeBag) // emailTextField.rx.filterBy(.alphabetNumbericSpecial).disposed(by: disposeBag) - addressTextField.rx.filterBy(.alphabet, isUppercase: true).disposed(by: disposeBag) + addressTextField.rx.filterBy(.alphabetNumbericSpecial, isUppercase: true).disposed(by: disposeBag) } @@ -998,6 +998,7 @@ extension KYCVerifyStep1ViewController: WKNavigationDelegate, UIScrollViewDelega termsWebView.scrollView.delegate = self termsWebView.navigationDelegate = self checkButton.isEnabled = false + self.checkButton.isHidden = true } func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { @@ -1010,8 +1011,10 @@ extension KYCVerifyStep1ViewController: WKNavigationDelegate, UIScrollViewDelega if isURLLoaded { if scrollView.contentOffset.y >= (scrollView.contentSize.height - scrollView.frame.size.height) { checkButton.isEnabled = true + checkButton.isHidden = false } else if scrollView.contentOffset.y < scrollView.contentSize.height { checkButton.isEnabled = false + checkButton.isHidden = true } } } diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift index 1103e8f0..ad8a7752 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift @@ -44,13 +44,19 @@ class CDDIViewControllerViewController: UIViewController { // MARK: IBActions @IBAction func continueButton(_ sender: UIButton) { view.endEditing(true) + if self.sourceOfFund.text?.isEmpty ?? true || self.sourceOfFund.text == "" { + self.alert(message: "specifySourceOfFund_text".localized()) + } + if self.purposeOfRemit.text?.isEmpty ?? true || self.purposeOfRemit.text == "" { + self.alert(message: "select_transfer_reason_text".localized()) + } if self.sourceOfFund.text == "Others (please specify)" { self.alert(message: "Please Enter Others Source of Fund") } if self.purposeOfRemit.text == "Other (please specify)" { self.alert(message: "Please Enter Others Purpose of Remit") } - else if self.sourceOfFund.text != "Others (please specify)" && self.purposeOfRemit.text != "Other (please specify)" { + else if self.sourceOfFund.text != "Others (please specify)" && self.purposeOfRemit.text != "Other (please specify)" && self.sourceOfFund.text != "" && self.purposeOfRemit.text != "" { let model = CDDIRequestData(sourceOfFund: fund, purposeOfRemittance: purpose) actionDelegate?.continueToVerificationAction(model: model) } @@ -143,7 +149,7 @@ class CDDIViewControllerViewController: UIViewController { ).disposed(by: disposeBag) output.purposes.drive(onNext: {[weak self] in - let configure = TablePresenterConfiguration(presenterTitle: "select_purpose_of_registration_text".localized()) + let configure = TablePresenterConfiguration(presenterTitle: "select_transfer_reason_text".localized()) self?.purposeOfRemit.useAsDropDown(with: configure, items: $0) }).disposed(by: disposeBag) diff --git a/GME Remit/MultiLanguages/bn.lproj/Localizable.strings b/GME Remit/MultiLanguages/bn.lproj/Localizable.strings index 0e67e3da..ffc24e89 100644 --- a/GME Remit/MultiLanguages/bn.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/bn.lproj/Localizable.strings @@ -757,7 +757,7 @@ "penny_test_code_error_text" = "রেফারেন্স কোড অবশ্যই 4 ডিজিটের হতে হবে"; "step2_content_text" = "আপনার ফোন নাম্বারটি কি আপনার নিজ নামে ও আপনার এলিয়েন কার্ড দিয়ে নিবন্ধিত আছে?"; "move_step2_to_step3_text" = "আপনার ব্যাংক অ্যাকাউন্ট ভেরিফাই করতে শেষ ধাপ পেনি টেস্টে যান"; -"registration_success_message_text" = "GME তে নিবন্ধনের জন্য আপনাকে ধন্যবাদ। আমরা আপনার তথ্য যাচাই করছি। অনুমোদিত হয়ে গেলে আপনি এসএমএস পাবেন।"; +"registration_success_message_text" = "JME এর সাথে নিবন্ধনের জন্য আপনাকে ধন্যবাদ। আমরা আপনার তথ্য যাচাই করা হয়।"; "gps_off_text" = "জিপিএস চালু নেই।"; "grant_permission_text" = "প্রয়োজনীয় অনুমতি প্রদান করুন"; "location_not_available" = "এই মুহুর্তে অবস্থান নির্ণয় করা যাচ্ছে না। পরে আবার চেষ্টা করুন।"; @@ -995,7 +995,7 @@ "additional_id_back_txt"="অতিরিক্ত আইডি পেছনের অংশ"; "selectAdditionalBackPhoto_text"="আপনি পূর্ববর্তী স্ক্রীন থেকে নির্বাচিত অতিরিক্ত আইডি কার্ডের ফিরে ফটো সরবরাহ করুন"; "confirm_password_policy_text"="নিশ্চিত পাসওয়ার্ড অন্তত 6 অক্ষর হতে হবে"; -"kycSubmitSucessMessage_text"="জাপান মানি এক্সপ্রেস জন্য রেজিস্টার করতে জন্য আপনাকে ধন্যবাদ। আমরা আপনার তথ্য যাচাই করছেন অনুমোদিত হলে, আপনি এসএমএস পাবেন"; +"kycSubmitSucessMessage_text"="JME এর সাথে নিবন্ধনের জন্য আপনাকে ধন্যবাদ। আমরা আপনার তথ্য যাচাই করা হয়।"; "user_id_empty_error"="ব্যবহারকারীর আইডি খালি থাকতে পারে না"; "password_empty_error"="পাসওয়ার্ড খালি থাকতে পারেনা"; diff --git a/GME Remit/MultiLanguages/en.lproj/Localizable.strings b/GME Remit/MultiLanguages/en.lproj/Localizable.strings index fc477dec..e3a1b247 100644 --- a/GME Remit/MultiLanguages/en.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/en.lproj/Localizable.strings @@ -840,7 +840,7 @@ "select_city_text" = "Select City"; "step2_content_text" = "Do you have a phone number registered with Alien Registration Card under your name?"; "move_step2_to_step3_text" = "To verify your bank account, move to the last step, the penny test"; -"registration_success_message_text" = "Thank you for registering for Japan Money\nExpress.We are verifying your information.\nOnce approved, you will receive SMS."; +"registration_success_message_text" = "Thank you for registering for JME.We are verifying your information."; //Profile "change_personal_information_title_text" = "Personal Information"; diff --git a/GME Remit/MultiLanguages/ne.lproj/Localizable.strings b/GME Remit/MultiLanguages/ne.lproj/Localizable.strings index fd4ec3e2..14181738 100644 --- a/GME Remit/MultiLanguages/ne.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/ne.lproj/Localizable.strings @@ -765,7 +765,7 @@ "penny_test_code_error_text" = "Reference कोड ४ अंकको हुनुपर्दछ"; "step2_content_text" = "के तपाइँको फोन नम्बर तपाईंको एलियन कार्ड र तपाई कै नाममा दर्ता गरिएको छ ?"; "move_step2_to_step3_text" = "तपाईंको बैंक खाता प्रमाणित गर्न, अन्तिम चरण एक-वोन परीक्षणमा जानुहोस्"; -"registration_success_message_text" = "GME मा दर्ता गर्नुभएकोमा धन्यबाद हामी तपाईंको दर्ता प्रक्रिया प्रमाणित गर्दैछौं। एक पटक प्रमाणित भएपछि, तपाईंले SMS प्राप्त गर्नुहुनेछ।"; +"registration_success_message_text" = "हामीसँग दर्ता गर्नु भएकोमा धन्यवाद । हामी हजुरको दर्ता अनुरोध जाच्ँ गर्दैछौं ।"; "gps_off_text" = "GPS चालू गरिएको छैन"; "grant_permission_text" = "कृपया आवश्यक अनुमतिहरू प्रदान गर्नुहोस्"; "location_not_available" = "अहिले तपाईको स्थान पत्ता लग्न सकेन। पछि पुन: प्रयास गर्नुहोस्।"; @@ -1004,7 +1004,7 @@ "additional_id_back_txt"="अतिरिक्त परिचय पत्रको पछाडीको तस्बिर"; "selectAdditionalBackPhoto_text"="कृपया थप परिचय पत्रको पछाडीको फोटो प्रदान गर्नुहोस् जुन तपाईंले अघिल्लो स्क्रिनबाट चयन गर्नुभयो।"; "confirm_password_policy_text"="निश्चित पासवर्ड कम्तिमा 6 अक्षर हुनुपर्छ"; -"kycSubmitSucessMessage_text"="जापान मनी एक्सप्रेस दर्ताको लागि धन्यवाद। हामी तपाईंको जानकारी प्रमाणिकरण भएपछि स्वीकृत, तपाईं एसएमएस प्राप्त गर्नेछ"; +"kycSubmitSucessMessage_text"="हामीसँग दर्ता गर्नु भएकोमा धन्यवाद । हामी हजुरको दर्ता अनुरोध जाच्ँ गर्दैछौं ।"; "user_id_empty_error"="प्रयोगकर्ता आईडी खाली हुन सक्दैन"; "password_empty_error"="पासवर्ड खाली हुन सक्दैन"; diff --git a/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings b/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings index 118098f1..63880ec1 100644 --- a/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings @@ -758,7 +758,8 @@ "penny_test_code_error_text" = "Mã giới thiệu phải bao gồm 4 ký tự"; "step2_content_text" = "Bạn có số điện thoại chính chủ được đăng ký dưới giấy tờ tùy thân và tên của bạn không?"; "move_step2_to_step3_text" = "Để xác thực lại số tài khoản, vui lòng đi đến bước cuối cùng, xác nhận mã penny code"; -"registration_success_message_text" = "Cám ơn bạn đã đăng ký tài khoản tại GME. Chúng tôi đang tiền hành xác minh thông tin của bạn Sau khi tài khoản được xác thực, bạn sẽ nhận được tin nhắn xác nhận."; +"registration_success_message_text" = "Cảm ơn bạn đã đăng ký tài khoản tại JME. +Chúng tôi đang xác minh thông tin của bạn."; "gps_off_text" = "Định vị chưa được bật."; "grant_permission_text" = "Vui lòng cung cấp các yêu cầu cần thiết"; "location_not_available" = "Không thể định vị địa điểm ngay lúc nào. Hãy thử lại một lần nữa."; @@ -997,7 +998,8 @@ "additional_id_back_txt"="Thêm mặt sau ID"; "selectAdditionalBackPhoto_text"="Vui lòng cung cấp thêm ảnh mặt sau ID mà bạn đã chọn từ màn hình trước đó"; "confirm_password_policy_text"="Xác nhận mật khẩu phải có ít nhất 6 ký tự"; -"kycSubmitSucessMessage_text"="Cảm ơn bạn đã đăng ký đối với Nhật Bản Money Express. Chúng tôi đang xác minh thông tin của bạn Khi được chấp nhận, bạn sẽ nhận được tin nhắn SMS"; +"kycSubmitSucessMessage_text"="Cảm ơn bạn đã đăng ký tài khoản tại JME. +Chúng tôi đang xác minh thông tin của bạn."; "user_id_empty_error"="Id người dùng không được để trống"; "password_empty_error"="Mật khẩu không được để trống";