From 68af46125f47ce1db3266fd881cc1c0f29994a1b Mon Sep 17 00:00:00 2001 From: InKwon James Kim Date: Thu, 19 Dec 2019 18:24:10 +0900 Subject: [PATCH] edit payoutPartner logic --- GME Remit.xcodeproj/project.pbxproj | 8 ++++---- .../View/ViewModel/SetupRecipientViewModel.swift | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 9e05e1e4..21605f98 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -16576,7 +16576,7 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 5QB497ZAGT; ENABLE_BITCODE = NO; @@ -16591,7 +16591,7 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 2.9.0; + MARKETING_VERSION = 2.9.1; PRODUCT_BUNDLE_IDENTIFIER = com.gme.gmeremit; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -16611,7 +16611,7 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 5QB497ZAGT; ENABLE_BITCODE = NO; @@ -16627,7 +16627,7 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 2.9.0; + MARKETING_VERSION = 2.9.1; PRODUCT_BUNDLE_IDENTIFIER = com.gme.gmeremit; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift index c1abe99c..80444b19 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift @@ -378,7 +378,11 @@ extension SetupRecipientViewModel: SetupRecipientViewModelInterface { case .bank: guard let model = model as? SendMoneyBank else { return } selectedBankLinker.onNext(model) - payoutPartner = model.payoutPartner + + if let code = model.payoutPartner { + payoutPartner = code + } + if model.branchRequired?.lowercased() == "true" { selectedBranchLinker.onNext(nil) }