From 6ec604275651a45144b2621f6b9562372110ffbe Mon Sep 17 00:00:00 2001
From: InKwon James Kim <devikkim@gmail.com>
Date: Mon, 7 Oct 2019 10:34:46 +0900
Subject: [PATCH] changed service fee as selected debit-account

---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 GME Remit.xcodeproj/project.pbxproj           |   4 ++--
 .../xcshareddata/xcschemes/GME Remit.xcscheme |  22 +++++++-----------
 .../ViewModel/DomesticRemitViewModel.swift    |   3 +--
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index a988b73e7d5e646678e4a086f00c4784fe2a0aa0..73a62ce62ce42cb18b54f715d499941bf274af26 100644
GIT binary patch
delta 500
zcmZn(XbG6$FDlKzz`)4BAi%(o!;r|3$B>#-UR<zQP+~FrW_Au14zN52LmE)7n4tuw
zW^#x?zlepQg^q%WiFvJ#LbbWM0g!EMHu<}NsVs)_vf!e;ocz3WkX4iI1jIHg30z`k
z7Oi!fyjNIDBsbs1B`GIA2`I~P!(v|D<i!Uap%N)rB__v<@G^;R*qkRK&dew<`Jk}y
z<VbPe$!6mGlUv36>bZd~O=c)!NCm<?AUlI0AL#Ppf|4Yk(&CaLpfwf@p+NCepqgR^
zeTEbutBfI&Asfhc0jf=AC}qe6>jmlpij@P!ih#1k3<bbYNCwL2Gb91k6a)1D!wX1*
zRJk+wGPnZilmM`C`V8q{Lo$JyLDCEixSiz(brud48w=O5Ze~~b%`$nvum&Ze<<A5F
Ddxd~c

delta 121
zcmZn(XbG6$FDlBwz`)4BAi%&7#E{C6%aF-X;+eCta2or>2Hwr=94s7+qMJnpUobO^
z99cR^)Qsc$!n|!SD-SwOZV=JpFUT+qPR`FQ0Gh$TAo5}Ie^LF-PeflZP5vX%x3O#@
Y(2V5G><YhGCLa`4-kc+r0FtN&0C<=v$N&HU

diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj
index a5f48cce..d61ec560 100644
--- a/GME Remit.xcodeproj/project.pbxproj	
+++ b/GME Remit.xcodeproj/project.pbxproj	
@@ -15206,7 +15206,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 5QB497ZAGT;
 				ENABLE_BITCODE = NO;
@@ -15241,7 +15241,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 5QB497ZAGT;
 				ENABLE_BITCODE = NO;
diff --git a/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme b/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme
index 2f14ec94..57d7d6db 100644
--- a/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme	
+++ b/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme	
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FD260F31FD00458007A511D"
+            BuildableName = "GME Remit.app"
+            BlueprintName = "GME Remit"
+            ReferencedContainer = "container:GME Remit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "9FD260F31FD00458007A511D"
-            BuildableName = "GME Remit.app"
-            BlueprintName = "GME Remit"
-            ReferencedContainer = "container:GME Remit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
             ReferencedContainer = "container:GME Remit.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift b/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift
index d4bc2f55..61b4caf3 100644
--- a/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift	
+++ b/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift	
@@ -153,8 +153,7 @@ class DomesticRemitViewModel: ViewModelType {
     .disposed(by: disposeBag)
     
     let balance = getBalanceLinker.flatMap {Observable.just($0?.balance)}.asDriverOnErrorJustComplete()
-    let serviceFee = getInitialDataLinker.flatMap {Observable.just($0?.serviceFee)}
-      .asDriverOnErrorJustComplete()
+    let serviceFee = selectedServiceFeeLinker.asDriverOnErrorJustComplete()
     
     let isAvailableRemit = Driver
       .combineLatest(input.amount, serviceFee, balance) { (amountText, serviceFeeText, balanceText) -> Bool in