From 833dd45d15603b89b33ce23de32514dab1ac741b Mon Sep 17 00:00:00 2001
From: Jeongbae Kong <jubakong1@gmail.com>
Date: Thu, 5 Mar 2020 15:44:29 +0900
Subject: [PATCH] Changed UI, need to update for when balance shows

---
 .../View/RechargePayment.storyboard              |  2 ++
 .../View/RechargePaymentViewController.swift     | 16 ++++++++++------
 .../MultiLanguages/en.lproj/Localizable.strings  |  4 ++--
 .../MultiLanguages/ko.lproj/Localizable.strings  |  4 ++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePayment.storyboard b/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePayment.storyboard
index 4dc310ad..685a0c12 100644
--- a/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePayment.storyboard	
+++ b/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePayment.storyboard	
@@ -269,6 +269,8 @@ Balance</string>
                     <connections>
                         <outlet property="balanceLabel" destination="sVm-np-EVy" id="noT-sF-BtH"/>
                         <outlet property="balanceTitleLabel" destination="hXj-jC-Rzc" id="aXY-Th-QEt"/>
+                        <outlet property="expectedWalletStackView" destination="Rid-0B-kk2" id="PVj-dO-ykZ"/>
+                        <outlet property="gmeWalletStackView" destination="AMo-yX-AN5" id="eTb-nH-356"/>
                         <outlet property="gmeWalletTitleLabel" destination="BbA-cc-yhb" id="cvc-SF-AZc"/>
                         <outlet property="keybardHeight" destination="Q9N-TB-mFf" id="4XZ-zk-JmS"/>
                         <outlet property="mainView" destination="l8P-RE-lSE" id="2D8-fU-Zng"/>
diff --git a/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePaymentViewController.swift b/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePaymentViewController.swift
index c0441a8d..bd8756b1 100644
--- a/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePaymentViewController.swift	
+++ b/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePaymentViewController.swift	
@@ -51,6 +51,10 @@ class RechargePaymentViewController: UIViewController {
   @IBOutlet private weak var paymentAmountTitleLable: UILabel!
   @IBOutlet private weak var balanceTitleLabel: UILabel!
   
+  @IBOutlet weak var gmeWalletStackView: UIStackView!
+  @IBOutlet weak var expectedWalletStackView: UIStackView!
+  
+  
   // MARK: VC's Life cycle
   override func viewDidLoad() {
     super.viewDidLoad()
@@ -167,13 +171,13 @@ extension RechargePaymentViewController {
       }
       //let message = "possessed_coupon_number_text".localized().replacingOccurrences(of: "xxx", with: "\(couponList?.count ?? 0)")
       if model.paymentType == "autodebit" {
-        guard let account = model.accountNumber else {
-          return self.gmeWalletTitleLabel.text = model.bankName
-        }
-        self.gmeWalletTitleLabel.text = "\(model.bankName ?? "") \(account)"
-        self.balanceTitleLabel.text = "expected_autodebit_balance_text".localized().replacingOccurrences(of: "XX Bank", with: "\(model.bankName ?? "")")
-        self.rechargeButton.setTitle("pay_using_autodebit_account_text".localized().replacingOccurrences(of: "XX Bank", with: "\(model.bankName ?? "")"), for: .normal)
+        self.gmeWalletStackView.isHidden = true
+        self.expectedWalletStackView.isHidden = true
+        
+        self.rechargeButton.setTitle("pay_using_autodebit_account_text".localized().replacingOccurrences(of: "XX", with: "\(model.bankName ?? "")"), for: .normal)
       } else {
+        self.gmeWalletStackView.isHidden = false
+        self.expectedWalletStackView.isHidden = false
         self.gmeWalletTitleLabel.text = "gme_wallet_text".localized()
         self.balanceTitleLabel.text = "expected_gme_wallet_balance_text".localized()
         self.rechargeButton.setTitle("pay_using_gme_wallet_text".localized(), for: .normal)
diff --git a/GME Remit/MultiLanguages/en.lproj/Localizable.strings b/GME Remit/MultiLanguages/en.lproj/Localizable.strings
index b6eb275c..74eb5a4c 100644
--- a/GME Remit/MultiLanguages/en.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/en.lproj/Localizable.strings	
@@ -720,8 +720,8 @@
 "failure_uppercase_text" = "FAILURE";
 "waiting_uppercase_text" = "WAITING";
 "recharge_history_text" = "Recharge History";
-"expected_autodebit_balance_text" = "Expeted XX Bank Balance";
-"pay_using_autodebit_account_text" = "Pay using XX Bank Account";
+"expected_autodebit_balance_text" = "Expeted XX Balance";
+"pay_using_autodebit_account_text" = "Pay using XX Account";
 
 // Manage Agreement
 "terms_and_conditions_text" = "Terms And Conditions";
diff --git a/GME Remit/MultiLanguages/ko.lproj/Localizable.strings b/GME Remit/MultiLanguages/ko.lproj/Localizable.strings
index e49329a8..b7acd76a 100644
--- a/GME Remit/MultiLanguages/ko.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ko.lproj/Localizable.strings	
@@ -716,8 +716,8 @@
 "failure_uppercase_text" = "실패";
 "waiting_uppercase_text" = "대기";
 "recharge_history_text" = "충전 내역";
-"expected_autodebit_balance_text" = "XX Bank 예상 잔액";
-"pay_using_autodebit_account_text" = "XX Bank 계좌를 사용하여 결제";
+"expected_autodebit_balance_text" = "XX 예상 잔액";
+"pay_using_autodebit_account_text" = "XX 계좌를 사용하여 결제";
 
 // Manage Agreement
 "terms_and_conditions_text" = "이용약관";