IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'ocrLive' of http://202.166.220.79:3000/JME-JAPAN/JME-IOS into external/dev

v0.17
shakun 1 year ago
parent
bb56b35adb 7a6b09a061
commit
807cfc0012
15 changed files with 96 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      GME Remit.xcodeproj/project.pbxproj
  2. 2
      GME Remit/Modules/Home/Module Interface/HomeModuleInterface.swift
  3. 4
      GME Remit/Modules/Home/User Interface/Presenter/HomePresenter.swift
  4. 27
      GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
  5. 3
      GME Remit/Modules/Home/User Interface/Wireframe/HomeWireframe.swift
  6. 2
      GME Remit/Modules/Home/User Interface/Wireframe/HomeWireframeInput.swift
  7. 41
      GME Remit/Modules/Profile/Profile.storyboard
  8. 35
      GME Remit/Modules/Profile/ProfileChangePinViewController.swift
  9. 1
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift
  10. 3
      GME Remit/MultiLanguages/bn.lproj/Localizable.strings
  11. 4
      GME Remit/MultiLanguages/en.lproj/Localizable.strings
  12. 3
      GME Remit/MultiLanguages/ja.lproj/Localizable.strings
  13. 3
      GME Remit/MultiLanguages/ne.lproj/Localizable.strings
  14. 2
      GME Remit/MultiLanguages/si.lproj/Localizable.strings
  15. 3
      GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings

4
GME Remit.xcodeproj/project.pbxproj
View File

@ -8303,7 +8303,7 @@
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
);
MARKETING_VERSION = 1.5.2;
MARKETING_VERSION = 1.5.5;
"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der";
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
@ -8348,7 +8348,7 @@
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
);
MARKETING_VERSION = 1.5.2;
MARKETING_VERSION = 1.5.5;
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
"-ObjC",

2
GME Remit/Modules/Home/Module Interface/HomeModuleInterface.swift
View File

@ -16,7 +16,7 @@ protocol HomeModuleInterface: class {
func openTrackYourTransfer()
func showAgreement()
func showKyc(step: NewRegisterViewController.Step, useNFC: String, redirectTo: String, trustDockModel: TrustDockResponse, customerType: String)
func showKyc(step: NewRegisterViewController.Step, redirectTo: String)
func showKyc(step: NewRegisterViewController.Step, redirectTo: String, customerType: String)
func refreshData()
func viewIsReady()
func showAppUpdate(message: String)

4
GME Remit/Modules/Home/User Interface/Presenter/HomePresenter.swift
View File

@ -57,8 +57,8 @@ extension HomePresenter: HomeModuleInterface {
self.wireframe?.openAgreement()
}
func showKyc(step: NewRegisterViewController.Step, redirectTo: String) {
self.wireframe?.openKyc(step: step, redirectTo: redirectTo)
func showKyc(step: NewRegisterViewController.Step, redirectTo: String, customerType: String) {
self.wireframe?.openKyc(step: step, redirectTo: redirectTo, customerType: customerType)
}
func showKyc(step: NewRegisterViewController.Step, useNFC: String, redirectTo: String, trustDockModel: TrustDockResponse, customerType: String) {

27
GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
View File

@ -94,7 +94,7 @@ class HomeViewController: UIViewController {
self.tableView.reloadData()
updateBalance()
if hasUpdatedDefaultCredentials == 1 || hasUpdatedDefaultCredentials == 2 || hasUpdatedDefaultCredentials == 3 || hasUpdatedDefaultCredentials == 4 || hasVerifiedOTP == false || !didSubmitKycAndVerified {
if hasUpdatedDefaultCredentials == 1 || hasUpdatedDefaultCredentials == 2 || hasUpdatedDefaultCredentials == 3 || hasUpdatedDefaultCredentials == 4 || hasUpdatedDefaultCredentials == 5 || hasVerifiedOTP == false || !didSubmitKycAndVerified {
self.addDimView()
} else {
self.removeDimView()
@ -431,6 +431,8 @@ extension HomeViewController {
case 4:
changeTxnPinMessage()
case 5:
setupTxnPinMessage()
default:
break
@ -459,6 +461,17 @@ extension HomeViewController {
messageView.addGestureRecognizer(tap)
}
private func setupTxnPinMessage() {
blobView.removeFromSuperview()
showMessageView(isHidden: false)
self.messageViewHeightConstraint.constant = 80
messageTitleLabel.text = "setup_new_pin_title".localized()
messageLabel.text = "setup_new_pin_body".localized()
messageLeftImageview.image = UIImage(named: "Documents")
let tap = UITapGestureRecognizer(target: self, action: #selector(self.setupTxnPin(_:)))
messageView.addGestureRecognizer(tap)
}
private func changePinAndPasswordMessage() {
blobView.removeFromSuperview()
showMessageView(isHidden: false)
@ -521,7 +534,7 @@ extension HomeViewController {
if let trustDockResponse = trustDockResponse {
self.presenter?.showKyc(step: .first, useNFC: user?.useNFC ?? "", redirectTo: user?.redirectTo ?? "", trustDockModel: trustDockResponse, customerType: user?.residenceType ?? "")
} else {
self.presenter?.showKyc(step: .first, redirectTo: user?.redirectTo ?? "")
self.presenter?.showKyc(step: .first, redirectTo: user?.redirectTo ?? "", customerType: user?.residenceType ?? "")
}
}
@ -534,6 +547,16 @@ extension HomeViewController {
}
@objc func setupTxnPin(_ sender: UITapGestureRecognizer? = nil) {
guard let viewController = UIStoryboard(name: "Profile", bundle: nil)
.instantiateViewController(withIdentifier: "changePin") as? ProfileChangePinViewController else {
return
}
viewController.hasUpdatedDefaultCredentials = hasUpdatedDefaultCredentials
self.push(viewController, animated: true)
}
@objc func changePassword(_ sender: UITapGestureRecognizer? = nil) {
guard let viewController = UIStoryboard(name: "Profile", bundle: nil)
.instantiateViewController(withIdentifier: "changePassword") as? ProfileChangePasswordViewController else {

3
GME Remit/Modules/Home/User Interface/Wireframe/HomeWireframe.swift
View File

@ -83,8 +83,9 @@ extension HomeWireframe: HomeWireframeInput {
newRegisterWireFrame.open(on: view, step: step)
}
func openKyc(step: NewRegisterViewController.Step, redirectTo: String) {
func openKyc(step: NewRegisterViewController.Step, redirectTo: String, customerType: String) {
let newRegisterWireFrame = NewRegisterWireframe()
newRegisterWireFrame.customerType = customerType
newRegisterWireFrame.redirectTo = redirectTo
newRegisterWireFrame.useNFC = "N"
newRegisterWireFrame.open(on: view, step: step)

2
GME Remit/Modules/Home/User Interface/Wireframe/HomeWireframeInput.swift
View File

@ -16,7 +16,7 @@ protocol HomeWireframeInput: WireframeInput {
func openRedeemCashPayment()
func openWithdraw()
func openTrackYourTransfer()
func openKyc(step: NewRegisterViewController.Step, redirectTo: String)
func openKyc(step: NewRegisterViewController.Step, redirectTo: String, customerType: String)
func openKyc(step: NewRegisterViewController.Step, useNFC: String, redirectTo: String, trustDockModel: TrustDockResponse, customerType: String)
func openAgreement()
func logOut()

41
GME Remit/Modules/Profile/Profile.storyboard
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ift-aL-bsv">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ift-aL-bsv">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<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"/>
@ -39,7 +39,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<navigationBar contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sBt-ud-zLz">
<rect key="frame" x="0.0" y="44" width="375" height="44"/>
<rect key="frame" x="0.0" y="47" width="375" height="44"/>
<items>
<navigationItem title="Edit Profile" id="QC0-4e-aDb"/>
</items>
@ -52,7 +52,7 @@
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="2Uo-Po-w4d">
<rect key="frame" x="55" y="118.00000000000001" width="265" height="158.33333333333337"/>
<rect key="frame" x="55" y="121.00000000000001" width="265" height="158.33333333333337"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="3nK-Td-qlP">
<rect key="frame" x="0.0" y="0.0" width="265" height="15.666666666666666"/>
@ -172,13 +172,13 @@
</subviews>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Home Address" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Tx-u5-xai">
<rect key="frame" x="55" y="366" width="265" height="18"/>
<rect key="frame" x="55" y="369" width="265" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" spacing="142" translatesAutoresizingMaskIntoConstraints="NO" id="YZc-yy-ZOQ">
<rect key="frame" x="55" y="406" width="265" height="15.666666666666686"/>
<rect key="frame" x="55" y="409" width="265" height="15.666666666666686"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="City Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sGN-Qu-Y8g">
<rect key="frame" x="0.0" y="0.0" width="63" height="15.666666666666666"/>
@ -195,14 +195,14 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Za5-hE-zR0">
<rect key="frame" x="55" y="385" width="265" height="1"/>
<rect key="frame" x="55" y="388" width="265" height="1"/>
<color key="backgroundColor" name="ThemeSeparate"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="6fV-kE-pbF"/>
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="8Fa-Bk-v38">
<rect key="frame" x="55" y="296.33333333333331" width="265" height="15.666666666666686"/>
<rect key="frame" x="55" y="299.33333333333331" width="265" height="15.666666666666686"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Password" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dAZ-Lx-WoE">
<rect key="frame" x="0.0" y="0.0" width="58.333333333333336" height="15.666666666666666"/>
@ -219,7 +219,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" spacing="63" translatesAutoresizingMaskIntoConstraints="NO" id="CQw-qh-hMc">
<rect key="frame" x="55" y="442" width="264.66666666666669" height="15.666666666666686"/>
<rect key="frame" x="55" y="445" width="264.66666666666669" height="15.666666666666686"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Address Detail" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gl5-dT-LyW">
<rect key="frame" x="0.0" y="0.0" width="88" height="15.666666666666666"/>
@ -236,14 +236,14 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OVC-wY-Mqi">
<rect key="frame" x="55" y="431.66666666666669" width="265" height="1"/>
<rect key="frame" x="55" y="434.66666666666669" width="265" height="1"/>
<color key="backgroundColor" name="ThemeSeparate"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="24k-4V-4tJ"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dWH-K6-RjM">
<rect key="frame" x="55" y="467.66666666666669" width="263" height="1"/>
<rect key="frame" x="55" y="470.66666666666669" width="263" height="1"/>
<color key="backgroundColor" name="ThemeSeparate"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="jHI-nc-btH"/>
@ -340,7 +340,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2hZ-Or-uk8">
<rect key="frame" x="0.0" y="44" width="375" height="734"/>
<rect key="frame" x="0.0" y="47" width="375" height="731"/>
<subviews>
<view contentMode="scaleToFill" placeholderIntrinsicWidth="320" placeholderIntrinsicHeight="568" translatesAutoresizingMaskIntoConstraints="NO" id="59d-1R-egH">
<rect key="frame" x="0.0" y="0.0" width="375" height="608"/>
@ -652,14 +652,14 @@
<objects>
<viewController storyboardIdentifier="changePassword" useStoryboardIdentifierAsRestorationIdentifier="YES" id="4vv-1X-cU7" customClass="ProfileChangePasswordViewController" customModule="JME_Remit" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="7Pk-Ju-HzD" customClass="ProfileCh">
<rect key="frame" x="0.0" y="0.0" width="375" height="758"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="755"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="Nsu-tc-uey">
<rect key="frame" x="0.0" y="44" width="375" height="714"/>
<rect key="frame" x="0.0" y="47" width="375" height="708"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ETk-mR-KK0">
<rect key="frame" x="0.0" y="0.0" width="375" height="714"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="708"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LU1-7H-4oT">
<rect key="frame" x="20" y="20" width="335" height="230"/>
@ -855,7 +855,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="3cp-9Y-j10">
<rect key="frame" x="0.0" y="44" width="375" height="734"/>
<rect key="frame" x="0.0" y="47" width="375" height="731"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZGq-YR-tsm">
<rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
@ -1037,6 +1037,7 @@
<outlet property="confirmPinTxtField" destination="Yc1-rZ-6DK" id="IZ6-bK-Spl"/>
<outlet property="currentPinToggleButton" destination="7LP-PG-jB4" id="tNy-EH-3Ea"/>
<outlet property="currentPinTxtField" destination="F2k-F0-UYs" id="Fdp-AT-Hst"/>
<outlet property="currentPinView" destination="8Rz-Db-wfE" id="qmG-pj-fj9"/>
<outlet property="newPinToggleButton" destination="goF-h3-E2r" id="NcE-Lu-B5b"/>
<outlet property="newPinTxtField" destination="Eiz-rR-0nN" id="kcC-Vm-RM8"/>
</connections>
@ -1054,7 +1055,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="ujk-Do-7RW">
<rect key="frame" x="0.0" y="44" width="375" height="734"/>
<rect key="frame" x="0.0" y="47" width="375" height="731"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f0J-bo-UPi">
<rect key="frame" x="0.0" y="0.0" width="375" height="903"/>
@ -1358,7 +1359,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Aa1-aR-hf1">
<rect key="frame" x="0.0" y="44" width="375" height="734"/>
<rect key="frame" x="0.0" y="47" width="375" height="731"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Withdraw Amount" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lJH-tG-q4a">
<rect key="frame" x="16" y="72" width="343" height="43"/>
@ -1375,7 +1376,7 @@
</userDefinedRuntimeAttributes>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Let us know your reason for withdraw." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2gL-Zv-Fug">
<rect key="frame" x="33.333333333333343" y="27" width="308.66666666666663" height="21"/>
<rect key="frame" x="34.333333333333343" y="27" width="306.66666666666663" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="rfm-0C-Wkc"/>
</constraints>
@ -1399,7 +1400,7 @@
</userDefinedRuntimeAttributes>
</textView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note: 1000 JPY will be charged for per request." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BXg-eg-tI4">
<rect key="frame" x="49.333333333333343" y="286" width="276.66666666666663" height="17"/>
<rect key="frame" x="39.333333333333343" y="286" width="296.66666666666663" height="17"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="3oQ-JO-qXk"/>
</constraints>

35
GME Remit/Modules/Profile/ProfileChangePinViewController.swift
View File

@ -18,7 +18,7 @@ class ProfileChangePinViewController: UIViewController {
struct StringConstants {
let passwordErrorText = "password_error_text".localized()
let setupTransactionPin = "setup_new_pin_title".localized()
let newPinTitleText = "New PIN"
let currentPinTitleText = "Current PIN"
let confirmPinTitleText = "Confirm PIN"
@ -38,7 +38,9 @@ class ProfileChangePinViewController: UIViewController {
@IBOutlet weak var currentPinToggleButton: UIButton!
@IBOutlet weak var newPinToggleButton: UIButton!
@IBOutlet weak var confirmPinToggleButton: UIButton!
var hasUpdatedDefaultCredentials: Int = 0
@IBOutlet weak var currentPinView: UIView!
@IBAction func changePinBttnPressed(_ sender: UIButton) {
let currentPassword = self.encryptedOldPassword
@ -58,8 +60,9 @@ class ProfileChangePinViewController: UIViewController {
"UserId" : userId,
"CurrentPin": currentPassword,
"NewPin": newPassword,
"ConfirmNewPin": confirmPassword
]
"ConfirmNewPin": confirmPassword,
"Type": hasUpdatedDefaultCredentials
] as [String : Any]
self.updatePassword(param: param)
}else {
@ -80,7 +83,7 @@ class ProfileChangePinViewController: UIViewController {
confirmPinTxtField.isSecureTextEntry ? confirmPinToggleButton.setImage(UIImage(named: "Show"), for: .normal) : confirmPinToggleButton.setImage(UIImage(named: "Hide"), for: .normal)
}
func updatePassword(param: [String: String]) {
func updatePassword(param: [String: Any]) {
self.updatePin(
params: param,
success: { (message) in
@ -140,7 +143,10 @@ class ProfileChangePinViewController: UIViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillDisappear(animated)
self.navigationItem.title = StringConstants().titleText
self.navigationItem.title = hasUpdatedDefaultCredentials == 5 ? StringConstants().setupTransactionPin : StringConstants().titleText
if self.hasUpdatedDefaultCredentials == 5{
self.currentPinView.isHidden = true
}
}
override func viewWillDisappear(_ animated: Bool) {
@ -175,7 +181,11 @@ class ProfileChangePinViewController: UIViewController {
default:
break
}
self.isValid = (encryptedOldPassword != "" && encryptedPassword != "" && encryptedConfirmPassword != "")
if hasUpdatedDefaultCredentials == 5 {
self.isValid = (encryptedOldPassword == "" && encryptedPassword != "" && encryptedConfirmPassword != "")
} else {
self.isValid = (encryptedOldPassword != "" && encryptedPassword != "" && encryptedConfirmPassword != "")
}
}
}
@ -206,10 +216,11 @@ extension ProfileChangePinViewController {
var error = ""
var isValid = true
// user name
if currentPassword.isEmpty {
error = "\(error)\n\(StringConstants().emptyPasswordError)"
isValid = false
if self.hasUpdatedDefaultCredentials != 5{
if currentPassword.isEmpty {
error = "\(error)\n\(StringConstants().emptyPasswordError)"
isValid = false
}
}
let result = self.isValidPasword(password: password, confirmPassword: confirmPassword)
@ -236,7 +247,7 @@ extension ProfileChangePinViewController: UpdatePinService {
protocol UpdatePinService: ApiServiceType {
func updatePin(
params: [String: String],
params: [String: Any],
success: @escaping (String?) -> Void,
failure: @escaping (Error) -> Void
)
@ -244,7 +255,7 @@ protocol UpdatePinService: ApiServiceType {
extension UpdatePinService {
func updatePin(
params: [String: String],
params: [String: Any],
success: @escaping (String?) -> Void,
failure: @escaping (Error) -> Void
) {

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

@ -1177,6 +1177,7 @@ extension KYCVerifyStep1ViewController: TrustdockVerificationDelegate {
leftButtonTitle: "NO", rightButtonAction: {
self.initializeSDK()
}, leftButtonAction: {
self.presenter.callCustomerInfoAgreement(flag: false)
self.delegate?.newRegister(self, isFromNo: true, currentStep: .upload, nextStep: .finish)
})
}

3
GME Remit/MultiLanguages/bn.lproj/Localizable.strings
View File

@ -1414,3 +1414,6 @@
"id_number_hint_text" = "আইডি নম্বর";
"driver_license_hint_text" = "ড্রাইভিং লাইসেন্স/পাসপোর্ট";
"invalid_driver_license_text" = "ইনভ্যালিড ড্রাইভিং লাইসেন্স";
"setup_new_pin_title" = "লেনদেন পিন সেটআপ করুন";
"setup_new_pin_body" = "নতুন লেনদেন পিন সেটআপ করতে এখানে ক্লিক করুন";

4
GME Remit/MultiLanguages/en.lproj/Localizable.strings
View File

@ -998,3 +998,7 @@
"id_number_hint_text" = "ID Number";
"driver_license_hint_text" = "Driving License/ Passport";
"invalid_driver_license_text" = "Invalid Driving License";
"setup_new_pin_title" = "Setup Transaction PIN";
"setup_new_pin_body" = "Please click here to setup new Transaction Pin";

3
GME Remit/MultiLanguages/ja.lproj/Localizable.strings
View File

@ -996,3 +996,6 @@
"scan_driver_license_text" = "運転免許証番号";
"id_number_hint_text" = "本人確認書類番号";
"invalid_driver_license_text" = "無効な運転免許証";
"setup_new_pin_title" = "取引暗証番号の設定";
"setup_new_pin_body" = "新しいトランザクション PIN を設定するには、ここをクリックしてください";

3
GME Remit/MultiLanguages/ne.lproj/Localizable.strings
View File

@ -1427,3 +1427,6 @@
"scan_driver_license_text" = "चालक लाइसेन्स कार्ड";
"driver_license_hint_text" = "ड्राइभिङ लाइसेन्स / राहदानी ";
"invalid_driver_license_text" = "अवैध ड्राइभिङ लाइसेन्स";
"setup_new_pin_title" = "PIN सेटअप गर्नुहोस्";
"setup_new_pin_body" = "कृपया नयाँ पिन सेटअप गर्न यहाँ क्लिक गर्नुहोस्";

2
GME Remit/MultiLanguages/si.lproj/Localizable.strings
View File

@ -669,3 +669,5 @@
"invalid_driver_license_text" = "වලංගු නොවන රියදුරු බලපත්‍රය";
"full_name_placeholder_text" = "සම්පූර්ණ නම";
"setup_new_pin_title" = "ගනුදෙනු PIN සකසන්න";
"setup_new_pin_body" = "කරුණාකර නව ගනුදෙනු පින් පිහිටුවීමට මෙතන ක්ලික් කරන්න";

3
GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings
View File

@ -1421,3 +1421,6 @@ Chúng tôi đang xác minh thông tin của bạn.";
"scan_driver_license_text" = "Mã số bằng lái xe";
"id_number_hint_text" = "Mã số thẻ ngoại kiều";
"invalid_driver_license_text" = "Giấy phép lái xe không hợp lệ";
"setup_new_pin_title" = "Thiết lập mã PIN giao dịch";
"setup_new_pin_body" = "Vui lòng nhấp vào đây để thiết lập Pin giao dịch mới";
Write Preview
Loading…
Cancel
Save