From aedc38a1f5c50a75fdb54c96db3a2839a5ade8e0 Mon Sep 17 00:00:00 2001
From: Jeongbae Kong <jubakong1@gmail.com>
Date: Thu, 5 Mar 2020 15:37:10 +0900
Subject: [PATCH] restore 1

---
 .../View/ExchangeRates.storyboard             | 14 ++---
 .../PhoneCardRechargePresenter.swift          | 53 +++++++++++--------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard b/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard
index 2c1a37ab..73f95082 100644
--- a/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard	
+++ b/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard	
@@ -156,7 +156,7 @@
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You Send" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xpj-lv-YQd">
-                                                                                        <rect key="frame" x="0.0" y="6.5" width="222" height="14"/>
+                                                                                        <rect key="frame" x="0.0" y="6" width="222" height="14.5"/>
                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                                         <color key="textColor" name="ThemeText"/>
                                                                                         <nil key="highlightedColor"/>
@@ -178,7 +178,7 @@
                                                                                 <rect key="frame" x="222" y="0.0" width="125" height="60.5"/>
                                                                                 <subviews>
                                                                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="jYO-er-b2S">
-                                                                                        <rect key="frame" x="24" y="17.5" width="77" height="26"/>
+                                                                                        <rect key="frame" x="25.5" y="17.5" width="74" height="26"/>
                                                                                         <subviews>
                                                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Korea" translatesAutoresizingMaskIntoConstraints="NO" id="9Oe-hg-7XR">
                                                                                                 <rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
@@ -188,7 +188,7 @@
                                                                                                 </constraints>
                                                                                             </imageView>
                                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="KRW" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="HcJ-nJ-muV">
-                                                                                                <rect key="frame" x="36" y="0.0" width="41" height="26"/>
+                                                                                                <rect key="frame" x="36" y="0.0" width="38" height="26"/>
                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="18"/>
                                                                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                                 <nil key="highlightedColor"/>
@@ -317,7 +317,7 @@
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Recepient Gets" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZLj-5v-cJU">
-                                                                                        <rect key="frame" x="0.0" y="6.5" width="222" height="14"/>
+                                                                                        <rect key="frame" x="0.0" y="6" width="222" height="14.5"/>
                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                                         <color key="textColor" name="ThemeText"/>
                                                                                         <nil key="highlightedColor"/>
@@ -341,7 +341,7 @@
                                                                                         <rect key="frame" x="0.0" y="0.0" width="125" height="60.5"/>
                                                                                         <subviews>
                                                                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="i9R-m1-avp">
-                                                                                                <rect key="frame" x="6" y="17.5" width="113" height="26"/>
+                                                                                                <rect key="frame" x="7.5" y="17.5" width="110" height="26"/>
                                                                                                 <subviews>
                                                                                                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Korea" translatesAutoresizingMaskIntoConstraints="NO" id="rbh-s6-5yG">
                                                                                                         <rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
@@ -351,13 +351,13 @@
                                                                                                         </constraints>
                                                                                                     </imageView>
                                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="KRW" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="Tu7-d6-vev">
-                                                                                                        <rect key="frame" x="36" y="0.0" width="41" height="26"/>
+                                                                                                        <rect key="frame" x="36" y="0.0" width="38" height="26"/>
                                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="18"/>
                                                                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                                         <nil key="highlightedColor"/>
                                                                                                     </label>
                                                                                                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_dropdownSmall" translatesAutoresizingMaskIntoConstraints="NO" id="buU-Ck-s8m">
-                                                                                                        <rect key="frame" x="87" y="0.0" width="26" height="26"/>
+                                                                                                        <rect key="frame" x="84" y="0.0" width="26" height="26"/>
                                                                                                         <color key="tintColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                                         <constraints>
                                                                                                             <constraint firstAttribute="height" constant="26" id="lDj-76-8TX"/>
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 538cd5d3..c7c1c254 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	
@@ -133,42 +133,48 @@ class PhoneCardRechargePresenter: ViewModelType {
       },
       input.selectedCarrierType.asObservable(),
       input.selectedCarrierPlan.asObservable(),
-      input.selectedDataOnlyType.asObservable()
+      input.selectedDataOnlyType.asObservable(),
+      selectedPaymentMode.asObservable()
     )
     
     let carrierPlanModel = input.selectedCarrierType.map { $0?.subCardInfo ?? [] }
     let detailCarrierPlanModel = input.selectedCarrierPlan.map { $0?.planInfo }
     
     let isEnableNext = combinedInput
-      .map { balance, _, type, priceModel, _, carrierPlan, dataOnlyType -> Status in
+      .map { balance, _, type, priceModel, _, carrierPlan, dataOnlyType, selectPaymentType -> Status in
         
-        switch type {
-        case .regular:
-          guard
-            let paymentAmount = priceModel?.price,
-            let amount = Int(paymentAmount) else { return (false, false) }
-          
-          return (true, amount <= balance)
-          
-        case .fixed:
-          guard
-            let paymentAmount = carrierPlan?.facePrice,
-            let amount = Int(paymentAmount) else { return (false, false) }
-          
-          return (true, amount <= balance)
-          
-        case .dataOnly:
-          guard
-            let paymentAmount = dataOnlyType?.facePrice,
-            let amount = Int(paymentAmount) else { return (false, false) }
+        
+        if selectPaymentType?.type == "wallet" {
           
-          return (true, amount <= balance)
+          switch type {
+          case .regular:
+            guard
+              let paymentAmount = priceModel?.price,
+              let amount = Int(paymentAmount) else { return (false, false) }
+            
+            return (true, amount <= balance)
+            
+          case .fixed:
+            guard
+              let paymentAmount = carrierPlan?.facePrice,
+              let amount = Int(paymentAmount) else { return (false, false) }
+            
+            return (true, amount <= balance)
+            
+          case .dataOnly:
+            guard
+              let paymentAmount = dataOnlyType?.facePrice,
+              let amount = Int(paymentAmount) else { return (false, false) }
+            
+            return (true, amount <= balance)
+          }
         }
+        return (true, true)
     }
     
     input.nextTap
       .withLatestFrom(combinedInput.asDriverOnErrorJustComplete()) {$1}
-      .map { ( _, mobile, type, priceModel, _, carrierPlan, dataOnlyType) -> RechargeModel? in
+      .map { ( _, mobile, type, priceModel, _, carrierPlan, dataOnlyType, _) -> RechargeModel? in
         
         switch type {
           
@@ -274,6 +280,7 @@ extension PhoneCardRechargePresenter: PhoneCardRechargeInteractorOutput {
 // MARK: PhoneCardRecharge wireframe output interface
 extension PhoneCardRechargePresenter: PhoneCardRechargeWireframeOutput {
   func setSelectedAccount(_ selectedAccount: Account) {
+    accounts = selectedAccount
     selectedPaymentMode.onNext(selectedAccount)
   }
 }