From 5055997c998c103bf463a4badd1fc0b4c9b2265f Mon Sep 17 00:00:00 2001
From: Jeongbae Kong <jubakong1@gmail.com>
Date: Mon, 2 Mar 2020 14:51:57 +0900
Subject: [PATCH] Powercall Wallet/Autodebit Multilanguage setup is done/ Need
 to Test

---
 .../Model/RechargeModel.swift                 |  3 ++
 .../PhoneCardRechargePresenter.swift          |  3 ++
 .../View/PhoneCardRecharge.storyboard         | 24 ++++++-------
 .../PhoneCardRechargeViewController.swift     | 34 ++++++++++++++-----
 .../View/RechargePaymentViewController.swift  | 20 +++++++----
 .../View/WalletStatement.storyboard           | 10 +++---
 .../en.lproj/Localizable.strings              |  2 ++
 .../ko.lproj/Localizable.strings              |  2 ++
 .../WebLinks/WkWebView/WKWebView.storyboard   |  5 ---
 9 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/Application Logic/Model/RechargeModel.swift b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/Application Logic/Model/RechargeModel.swift
index 6b36789f..2d9aab1e 100644
--- a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/Application Logic/Model/RechargeModel.swift	
+++ b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/Application Logic/Model/RechargeModel.swift	
@@ -10,6 +10,7 @@ struct RechargeModel {
   let paymentType: String?
   let fintechUseNo: String?
   let bankName: String?
+  let accountNumber: String?
   let type: String
   let chargeType: String
   let cardName: String
@@ -24,6 +25,7 @@ struct RechargeModel {
     paymentType: String,
     fintechUseNo: String,
     bankName: String,
+    accountNumber: String,
     type: String,
     chargeType: String,
     cardName: String,
@@ -34,6 +36,7 @@ struct RechargeModel {
     self.fintechUseNo = fintechUseNo
     self.bankName = bankName
     self.type = type
+    self.accountNumber = accountNumber
     self.chargeType = chargeType
     self.cardName = cardName
     self.mobile = mobile
diff --git a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/Presenter/PhoneCardRechargePresenter.swift b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/Presenter/PhoneCardRechargePresenter.swift
index ed7b61fe..538cd5d3 100644
--- a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/Presenter/PhoneCardRechargePresenter.swift	
+++ b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/Presenter/PhoneCardRechargePresenter.swift	
@@ -178,6 +178,7 @@ class PhoneCardRechargePresenter: ViewModelType {
             paymentType: self.accounts?.type ?? "",
             fintechUseNo: self.accounts?.fintechUseNumber ?? "",
             bankName: self.accounts?.bankName ?? "",
+            accountNumber: self.accounts?.accountNumMasked ?? "",
             type: type.value,
             chargeType: "",
             cardName: "",
@@ -189,6 +190,7 @@ class PhoneCardRechargePresenter: ViewModelType {
             paymentType: self.accounts?.type ?? "",
             fintechUseNo: self.accounts?.fintechUseNumber ?? "",
             bankName: self.accounts?.bankName ?? "",
+            accountNumber: self.accounts?.accountNumMasked ?? "",
             type: type.value,
             chargeType: carrierPlan?.cardType ?? "",
             cardName: carrierPlan?.cardName ?? "",
@@ -200,6 +202,7 @@ class PhoneCardRechargePresenter: ViewModelType {
             paymentType: self.accounts?.type ?? "",
             fintechUseNo: self.accounts?.fintechUseNumber ?? "",
             bankName: self.accounts?.bankName ?? "",
+            accountNumber: self.accounts?.accountNumMasked ?? "",
             type: type.value,
             chargeType: dataOnlyType?.cardCode ?? "",
             cardName: dataOnlyType?.cardName ?? "",
diff --git a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard
index 1ad22e1d..5984a039 100644
--- a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard	
+++ b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard	
@@ -470,7 +470,7 @@
                                                                                                                                         <rect key="frame" x="0.0" y="0.0" width="305" height="25"/>
                                                                                                                                         <subviews>
                                                                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Cell Phone" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ATr-GR-fdE">
-                                                                                                                                                <rect key="frame" x="0.0" y="0.0" width="68" height="25"/>
+                                                                                                                                                <rect key="frame" x="0.0" y="0.0" width="64" height="25"/>
                                                                                                                                                 <constraints>
                                                                                                                                                     <constraint firstAttribute="height" constant="25" id="DmQ-fW-QTA"/>
                                                                                                                                                 </constraints>
@@ -479,7 +479,7 @@
                                                                                                                                                 <nil key="highlightedColor"/>
                                                                                                                                             </label>
                                                                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="01052850125" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="F3s-hq-mVr">
-                                                                                                                                                <rect key="frame" x="68" y="0.0" width="237" height="25"/>
+                                                                                                                                                <rect key="frame" x="64" y="0.0" width="241" height="25"/>
                                                                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
                                                                                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                                                                                 <nil key="highlightedColor"/>
@@ -490,13 +490,13 @@
                                                                                                                                         <rect key="frame" x="0.0" y="29" width="305" height="25"/>
                                                                                                                                         <subviews>
                                                                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Charge Type" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="592-jP-xgS">
-                                                                                                                                                <rect key="frame" x="0.0" y="0.0" width="78.5" height="25"/>
+                                                                                                                                                <rect key="frame" x="0.0" y="0.0" width="74.5" height="25"/>
                                                                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                                                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                                                                                 <nil key="highlightedColor"/>
                                                                                                                                             </label>
                                                                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="mediaLog 11G(50,600)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="CiS-wv-umW">
-                                                                                                                                                <rect key="frame" x="78.5" y="0.0" width="226.5" height="25"/>
+                                                                                                                                                <rect key="frame" x="74.5" y="0.0" width="230.5" height="25"/>
                                                                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
                                                                                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                                                                                 <nil key="highlightedColor"/>
@@ -507,13 +507,13 @@
                                                                                                                                         <rect key="frame" x="0.0" y="58" width="305" height="25"/>
                                                                                                                                         <subviews>
                                                                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Data" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="798-HQ-YHW">
-                                                                                                                                                <rect key="frame" x="0.0" y="0.0" width="29.5" height="25"/>
+                                                                                                                                                <rect key="frame" x="0.0" y="0.0" width="28" height="25"/>
                                                                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                                                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                                                                                 <nil key="highlightedColor"/>
                                                                                                                                             </label>
                                                                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="11GB + 3M Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="VyR-26-utb">
-                                                                                                                                                <rect key="frame" x="29.5" y="0.0" width="275.5" height="25"/>
+                                                                                                                                                <rect key="frame" x="28" y="0.0" width="277" height="25"/>
                                                                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
                                                                                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                                                                                 <nil key="highlightedColor"/>
@@ -524,13 +524,13 @@
                                                                                                                                         <rect key="frame" x="0.0" y="87" width="305" height="25"/>
                                                                                                                                         <subviews>
                                                                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Voice" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P5S-MB-7Q1">
-                                                                                                                                                <rect key="frame" x="0.0" y="0.0" width="34" height="25"/>
+                                                                                                                                                <rect key="frame" x="0.0" y="0.0" width="33" height="25"/>
                                                                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                                                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                                                                                 <nil key="highlightedColor"/>
                                                                                                                                             </label>
                                                                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="EL5-jZ-vOn">
-                                                                                                                                                <rect key="frame" x="34" y="0.0" width="271" height="25"/>
+                                                                                                                                                <rect key="frame" x="33" y="0.0" width="272" height="25"/>
                                                                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
                                                                                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                                                                                 <nil key="highlightedColor"/>
@@ -541,13 +541,13 @@
                                                                                                                                         <rect key="frame" x="0.0" y="116" width="305" height="25"/>
                                                                                                                                         <subviews>
                                                                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="SMS" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ozC-cy-dC6">
-                                                                                                                                                <rect key="frame" x="0.0" y="0.0" width="30.5" height="25"/>
+                                                                                                                                                <rect key="frame" x="0.0" y="0.0" width="26.5" height="25"/>
                                                                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                                                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                                                                                 <nil key="highlightedColor"/>
                                                                                                                                             </label>
                                                                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="OnW-ui-fSi">
-                                                                                                                                                <rect key="frame" x="30.5" y="0.0" width="274.5" height="25"/>
+                                                                                                                                                <rect key="frame" x="26.5" y="0.0" width="278.5" height="25"/>
                                                                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
                                                                                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                                                                                 <nil key="highlightedColor"/>
@@ -560,13 +560,13 @@
                                                                                                                                 <rect key="frame" x="0.0" y="145" width="305" height="25"/>
                                                                                                                                 <subviews>
                                                                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Payment Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wtY-Oq-MdK">
-                                                                                                                                        <rect key="frame" x="0.0" y="0.0" width="108.5" height="25"/>
+                                                                                                                                        <rect key="frame" x="0.0" y="0.0" width="106" height="25"/>
                                                                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
                                                                                                                                         <color key="textColor" name="ThemeRed"/>
                                                                                                                                         <nil key="highlightedColor"/>
                                                                                                                                     </label>
                                                                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￦ 50,100" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="XLT-1R-BKf">
-                                                                                                                                        <rect key="frame" x="108.5" y="0.0" width="196.5" height="25"/>
+                                                                                                                                        <rect key="frame" x="106" y="0.0" width="199" height="25"/>
                                                                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
                                                                                                                                         <color key="textColor" name="ThemeRed"/>
                                                                                                                                         <nil key="highlightedColor"/>
diff --git a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift
index e8ab6720..32ba87da 100644
--- a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift	
+++ b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift	
@@ -12,6 +12,11 @@ import RxCocoa
 
 import ContactsUI
 
+enum WalletType: String {
+  case autodebit = "autodebit"
+  case wallet = "wallet"
+}
+
 class PhoneCardRechargeViewController: UIViewController {
   
   // MARK: Properties
@@ -293,11 +298,11 @@ extension PhoneCardRechargeViewController {
         self?.balanceCheckButton.titleLabel?.minimumScaleFactor = 0.1
         self?.balanceCheckButton.titleLabel?.adjustsFontSizeToFitWidth = true
         self?.balanceStackView.isHidden = true
-        guard let account = model.accountNumMasked else {
-          self?.mycashAmountLabel.text = "\(model.bankName ?? "")"
-          return
-        }
-        self?.mycashAmountLabel.text = "\(model.bankName ?? "") (\(account))"
+//        guard let account = model.accountNumMasked else {
+//          self?.mycashAmountLabel.text = "\(model.bankName ?? "")"
+//          return
+//        }
+//        self?.mycashAmountLabel.text = "\(model.bankName ?? "") (\(account))"
       }
     }).disposed(by: disposeBag)
     
@@ -340,9 +345,22 @@ extension PhoneCardRechargeViewController {
       .drive(detailVoiceContentLabel.rx.text)
       .disposed(by: disposeBag)
     
-    output.selectedPaymentMode.map {$0?.walletName}
-      .drive(walletOrAutoDebitLabel.rx.text)
-      .disposed(by: disposeBag)
+    output.selectedPaymentMode.drive(onNext: {[weak self] in
+      guard let `self` = self else { return }
+      
+      guard let model = $0 else {
+        return self.walletOrAutoDebitLabel.text = ""
+      }
+      
+      if model.type == "wallet" {
+        self.walletOrAutoDebitLabel.text = model.walletName
+      } else {
+        guard let account = model.accountNumMasked else {
+          return self.walletOrAutoDebitLabel.text = model.bankName
+        }
+        self.walletOrAutoDebitLabel.text = "\(model.bankName ?? "") (\(account)) "
+      }
+    }).disposed(by: disposeBag)
     
     selectedMobile.asDriver(onErrorJustReturn: "")
       .drive(detailCellphoneContentLabel.rx.text)
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 598df4f3..c0441a8d 100644
--- a/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePaymentViewController.swift	
+++ b/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePaymentViewController.swift	
@@ -161,14 +161,22 @@ extension RechargePaymentViewController {
       guard let model = $0 else {
         return
       }
+      guard let `self` = self else {
+        return
+        
+      }
+      //let message = "possessed_coupon_number_text".localized().replacingOccurrences(of: "xxx", with: "\(couponList?.count ?? 0)")
       if model.paymentType == "autodebit" {
-        self?.gmeWalletTitleLabel.text = model.bankName
-        self?.balanceTitleLabel.text = "Expected \(model.bankName ?? "") Balance"
-        self?.rechargeButton.setTitle("pay using Autodebit account", for: .normal)
+        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)
       } else {
-        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)
+        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)
       }
     }).disposed(by: disposeBag)
     
diff --git a/GME Remit/Modules/WalletStatement/User Interface/View/WalletStatement.storyboard b/GME Remit/Modules/WalletStatement/User Interface/View/WalletStatement.storyboard
index cb0cf85b..0ab3ec1b 100644
--- a/GME Remit/Modules/WalletStatement/User Interface/View/WalletStatement.storyboard	
+++ b/GME Remit/Modules/WalletStatement/User Interface/View/WalletStatement.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -228,13 +228,13 @@
     </scenes>
     <resources>
         <namedColor name="ThemeMainBackground">
-            <color red="0.14901960784313725" green="0.14901960784313725" blue="0.14901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="ThemeSeparate">
-            <color white="0.5" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color red="0.82400000095367432" green="0.82400000095367432" blue="0.82400000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="ThemeText">
-            <color white="0.80256043313300773" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
     <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/GME Remit/MultiLanguages/en.lproj/Localizable.strings b/GME Remit/MultiLanguages/en.lproj/Localizable.strings
index 26723493..b6eb275c 100644
--- a/GME Remit/MultiLanguages/en.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/en.lproj/Localizable.strings	
@@ -720,6 +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";
 
 // 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 596fe823..e49329a8 100644
--- a/GME Remit/MultiLanguages/ko.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ko.lproj/Localizable.strings	
@@ -716,6 +716,8 @@
 "failure_uppercase_text" = "실패";
 "waiting_uppercase_text" = "대기";
 "recharge_history_text" = "충전 내역";
+"expected_autodebit_balance_text" = "XX Bank 예상 잔액";
+"pay_using_autodebit_account_text" = "XX Bank 계좌를 사용하여 결제";
 
 // Manage Agreement
 "terms_and_conditions_text" = "이용약관";
diff --git a/GME Remit/Utilities/WebLinks/WkWebView/WKWebView.storyboard b/GME Remit/Utilities/WebLinks/WkWebView/WKWebView.storyboard
index c37c2029..49fad49d 100644
--- a/GME Remit/Utilities/WebLinks/WkWebView/WKWebView.storyboard	
+++ b/GME Remit/Utilities/WebLinks/WkWebView/WKWebView.storyboard	
@@ -26,11 +26,6 @@
                                 <action selector="touchCloseButton:" destination="5lk-h3-UEb" id="qBz-nF-Q8Y"/>
                             </connections>
                         </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" title="hhhhh" id="xJS-bw-OH2">
-                            <connections>
-                                <action selector="touchCertTest:" destination="5lk-h3-UEb" id="AKG-5B-Oi3"/>
-                            </connections>
-                        </barButtonItem>
                     </navigationItem>
                     <connections>
                         <outlet property="closeButton" destination="dbg-t3-cjc" id="06R-77-ZtT"/>