From e99de7b4cb7fac0d5da2675e7a266fb38b9becb4 Mon Sep 17 00:00:00 2001
From: gme_2 <sis.ccr@gmail.com>
Date: Wed, 27 Feb 2019 16:48:15 +0900
Subject: [PATCH] bug fixed. type checked to open password or otp

---
 .../View/Cells/PaymentSelectionTableViewCell.swift  |  6 +++---
 .../View/PaymentSelectionViewController.swift       |  6 +++---
 .../View/SendMoneyVerificationViewController.swift  | 13 +++++--------
 .../RecipientListViewController.storyboard          |  5 +++--
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/GMERemittance/Module/PaymentSelection/User Interface/View/Cells/PaymentSelectionTableViewCell.swift b/GMERemittance/Module/PaymentSelection/User Interface/View/Cells/PaymentSelectionTableViewCell.swift
index 0a9a19f3..3b151b56 100644
--- a/GMERemittance/Module/PaymentSelection/User Interface/View/Cells/PaymentSelectionTableViewCell.swift	
+++ b/GMERemittance/Module/PaymentSelection/User Interface/View/Cells/PaymentSelectionTableViewCell.swift	
@@ -13,7 +13,7 @@ class PaymentSelectionTableViewCell: UITableViewCell {
     @IBOutlet weak var titlelabel: UILabel!
     @IBOutlet weak var accountLabel: UILabel!
     
-    var cunt: Account?
+    var acunt: Account?
     
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -21,7 +21,7 @@ class PaymentSelectionTableViewCell: UITableViewCell {
     }
     
     func setup() {
-        titlelabel.text = cunt?.bankName
-        accountLabel.text = cunt?.accountNumMasked
+        titlelabel.text = acunt?.bankName
+        accountLabel.text = acunt?.accountNumMasked
     }
 }
diff --git a/GMERemittance/Module/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift b/GMERemittance/Module/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift
index b79ad5f0..8aefa2a7 100644
--- a/GMERemittance/Module/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift	
+++ b/GMERemittance/Module/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift	
@@ -65,9 +65,9 @@ extension PaymentSelectionViewController: PaymentSelectionViewInterface {
 
 extension PaymentSelectionViewController: UITableViewDelegate {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if let cunt = self.accounts?.elementAt(index: indexPath.row) {
+        if let accunt = self.accounts?.elementAt(index: indexPath.row) {
             self.dismiss(animated: true) {
-                self.onSelection?(cunt)
+                self.onSelection?(accunt)
             }
         }
     }
@@ -80,7 +80,7 @@ extension PaymentSelectionViewController: UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let model = tableView.dequeueReusableCell(withIdentifier: "PaymentSelectionTableViewCell") as! PaymentSelectionTableViewCell
-        model.cunt = accounts?.elementAt(index: indexPath.row)
+        model.acunt = accounts?.elementAt(index: indexPath.row)
         model.setup()
         return model
     }
diff --git a/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift
index 5624e523..7a9b3dda 100644
--- a/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift	
+++ b/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift	
@@ -211,14 +211,11 @@ class SendMoneyVerificationViewController: UITableViewController {
     }
     
     func askPassword() {
-        if let _ = self.requestModel?.autoDebitAccount?.kftcLogId {
-//            showNumberTranskeyAction()
-            SendMoneyCodeWireframe().open(completion: self.otpEntered, source: self)
-//            self.present(SendMoneyCodeWireframe().getMainView(), animated: true, completion: nil)
+        if (self.requestModel?.autoDebitAccount?.type ?? "").lowercased() == "wallet" {
+            showQwertyTranskeyAction()
             return
         }
-//        SendMoneyCodeWireframe().open(completion: self.otpEntered, source: self)
-//        showQwertyTranskeyAction()
+        SendMoneyCodeWireframe().open(completion: self.otpEntered, source: self)
     }
     
     func otpEntered(otp: String) {
@@ -231,10 +228,10 @@ class SendMoneyVerificationViewController: UITableViewController {
             isShowQwerty = true
             isTranskeyShowing = true
             
-            let hintStr = String(format:"%d자리 이상 입력해주세요.", 0)
+            let hintStr = String(format:"pasword", 0)
             let font = UIFont(name: "Arial", size: 15)
             mQwertyTransKeyView?.mTK_SetHint(hintStr, font: font)
-            mQwertyTransKeyView?.mTK_ShowMessageIfMaxLength("16자리 입력이 초과되었습니다.")
+//            mQwertyTransKeyView?.mTK_ShowMessageIfMaxLength("16자리 입력이 초과되었습니다.")i
             mQwertyTransKeyView?.mTK_UseCursor(true)
             mQwertyTransKeyView?.mTK_UseAllDeleteButton(true)
             mQwertyTransKeyView?.mTK_UseNavigationBar(true)
diff --git a/GMERemittance/Recipient/RecipientListViewController.storyboard b/GMERemittance/Recipient/RecipientListViewController.storyboard
index 847a9952..5c01ffbc 100644
--- a/GMERemittance/Recipient/RecipientListViewController.storyboard
+++ b/GMERemittance/Recipient/RecipientListViewController.storyboard
@@ -45,8 +45,8 @@
                                             <constraint firstAttribute="height" constant="40" id="eCH-dC-n1s"/>
                                         </constraints>
                                     </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Recipient" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CzJ-tS-E8E">
-                                        <rect key="frame" x="77" y="30" width="105" height="20"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Recipient" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CzJ-tS-E8E">
+                                        <rect key="frame" x="77" y="30" width="261" height="20.5"/>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
                                         <color key="textColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -60,6 +60,7 @@
                                     <constraint firstItem="u8d-U1-kcp" firstAttribute="centerY" secondItem="1Ws-70-qw9" secondAttribute="centerY" id="Ogv-uH-fdf"/>
                                     <constraint firstItem="u8d-U1-kcp" firstAttribute="leading" secondItem="1Ws-70-qw9" secondAttribute="leading" constant="20" id="P3q-yy-xG5"/>
                                     <constraint firstAttribute="bottom" secondItem="u8d-U1-kcp" secondAttribute="bottom" constant="20" id="dE3-v8-vsr"/>
+                                    <constraint firstAttribute="trailing" secondItem="CzJ-tS-E8E" secondAttribute="trailing" constant="17" id="jAk-ib-YZw"/>
                                     <constraint firstItem="CzJ-tS-E8E" firstAttribute="leading" secondItem="u8d-U1-kcp" secondAttribute="trailing" constant="17" id="jkD-yR-Pev"/>
                                     <constraint firstItem="CzJ-tS-E8E" firstAttribute="centerY" secondItem="1Ws-70-qw9" secondAttribute="centerY" id="wTy-DU-tY2"/>
                                 </constraints>