Browse Source

changed service fee as selected debit-account

pull/1/head
InKwon James Kim 5 years ago
parent
commit
6ec6042756
  1. BIN
      .DS_Store
  2. 4
      GME Remit.xcodeproj/project.pbxproj
  3. 22
      GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme
  4. 3
      GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift

BIN
.DS_Store

4
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;

22
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"

3
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

Loading…
Cancel
Save