diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift index 9aaab3d0..680db95a 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift @@ -156,7 +156,7 @@ extension BeneficiaryDetailViewController: UITableViewDataSource, UITableViewDel headerView.relationshipValueLabel.text = data?.relationship headerView.mobileValueLabel.text = data?.mobile headerView.locationValueLabel.text = data?.country - self?.tableView.reloadData() +// self?.tableView.reloadData() }) } else { let termsViewController = TermsAndConditionWireframe().getMainView() as? TermsAndConditionViewController diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Cell/TransferListTableViewCell.swift b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Cell/TransferListTableViewCell.swift index 8b9d9d54..22a508f5 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Cell/TransferListTableViewCell.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Cell/TransferListTableViewCell.swift @@ -73,24 +73,24 @@ class TransferListTableViewCell: UITableViewCell { if displayStatus == DisplayOption.reject.rawValue { editButton.isHidden = true resendButton.isHidden = false - resendButton.setTitle("Cancel Transaction", for: .normal) + resendButton.setTitle("cancel_transaction".localized(), for: .normal) }else if displayStatus == DisplayOption.cancel.rawValue { editButton.isHidden = true resendButton.isHidden = false - resendButton.setTitle("Request to Cancel", for: .normal) + resendButton.setTitle("request_to_cancel_text".localized(), for: .normal) }else if displayStatus == DisplayOption.amend.rawValue { editButton.isHidden = true resendButton.isHidden = false - resendButton.setTitle("Edit Detail", for: .normal) + resendButton.setTitle("edit_detail".localized(), for: .normal) }else if displayStatus == DisplayOption.cancelamend.rawValue { editButton.isHidden = false resendButton.isHidden = false - editButton.setTitle("Edit Detail", for: .normal) - resendButton.setTitle("Request to Cancel", for: .normal) + editButton.setTitle("edit_detail".localized(), for: .normal) + resendButton.setTitle("request_to_cancel_text".localized(), for: .normal) }else { resendButton.isHidden = true editButton.isHidden = false - editButton.setTitle("View Status", for: .normal) + editButton.setTitle("view_status".localized(), for: .normal) } self.initialsLabel.text = nameInitials diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift index 7ad69235..167b0e8c 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift @@ -149,10 +149,26 @@ extension SetupRecipientViewController { self.selectedPayment = receiver?.paymentMethod?.name ?? "" self.bankTextField.text = receiver?.paymentMethod?.agent?.name ?? "" self.accountTextField.text = receiver?.paymentMethod?.agent?.accountNumber ?? "" - + +// if !(receiver?.paymentMethod?.id?.isEmpty ?? false) { +// var selBank = SendMoneyBank() +// +// selBank.name = receiver?.paymentMethod?.agent?.name +//// selBank.branches = receiver?.paymentMethod?.agent?.branch +// selBank.id = receiver?.paymentMethod?.agent?.id +//// let selectedBank = model.banks?.filter({$0.id == recipient.agent?.id}).first +// viewModel?.setSelectedData(with: selBank, type: .bank) +// +// } + setUI() setMultiLanguage() setBinding() + + + + + // if let paymentId = viewModel, !((paymentId ?? "").isEmpty) { // self.selectedPayment = paymentId // @@ -420,9 +436,7 @@ extension SetupRecipientViewController { self.countryTextField.text = country.countryName self.countryTextField.setCountry(with: country.countryCode, isShowCode: false) self.countryTextField.sendActions(for: .editingChanged) - self.mobileTextField.setCountry(with: country.countryCode) - self.paymentModeTextField.animateHidden(isHidden: false, duration: 0.5) self.paymentDropdown.animateHidden(isHidden: false, duration: 0.5) self.recipientBankInfomationContainerView.animateHidden(isHidden: true, duration: 0.5) 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 3e4f85aa..1bc0ecd8 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 @@ -72,8 +72,8 @@ class SetupRecipientViewModel: ViewModelType { private let selectedRecipientLinker = BehaviorSubject(value: nil) private let selectedCountryServicesLinker = BehaviorSubject(value: nil) private let selectedPaymentModeTypesLinker = BehaviorSubject(value: nil) - private let selectedBankLinker = BehaviorSubject(value: nil) - private let selectedBranchLinker = BehaviorSubject(value: nil) + let selectedBankLinker = BehaviorSubject(value: nil) + let selectedBranchLinker = BehaviorSubject(value: nil) private let selectedIDTypeLinker = BehaviorSubject(value: nil) private let selectedStateProvinceLinker = BehaviorSubject(value: nil) private let selectedDistrictLinker = BehaviorSubject(value: nil) @@ -81,6 +81,8 @@ class SetupRecipientViewModel: ViewModelType { private let selectedReasonLinker = BehaviorSubject(value: nil) private let selectedNativeCountryLinker = BehaviorSubject(value: nil) + + // Properties var presenter: SetupRecipientModuleInterface? var isFirst = true @@ -310,6 +312,7 @@ extension SetupRecipientViewModel: SetupRecipientViewModelInterface { with: selectedCountry?.availableServices?.filter({$0.id == recipient.paymentMethod?.id}).first, type: .paymentMode ) + } func setDynamicFields(with model: DynamicFieldModel, nativeCountires: [NativeCountryModel]) { @@ -331,7 +334,7 @@ extension SetupRecipientViewModel: SetupRecipientViewModelInterface { guard let recipient = try? selectedRecipientLinker.value() else { return } - let selectedBank = model.banks?.filter({$0.id == recipient.agent?.id}).first + let selectedBank = model.banks?.filter({$0.name == recipient.paymentMethod?.agent?.name}).first // let selectedBranch = selectedBank?.branches?.filter({$0.id == recipient.agent?.branch?.id}).first let selectedIDType = model.idTypes?.filter({$0.id == recipient.idType}).first let selectedStateProvince = model.provinces?.filter({$0.id == recipient.stateID}).first @@ -340,8 +343,12 @@ extension SetupRecipientViewModel: SetupRecipientViewModelInterface { // let selectedReason = model.transferReasons?.filter({$0.title == recipient.purposeOfRemitID}).first let selectedNativeCountry = nativeCountires.filter({$0.text == recipient.nativeCountry}).first + let selbank = recipient.paymentMethod?.agent + let toBranch = SendMoneyBankBranch(id: selbank?.branch?.id ?? "", name: selbank?.branch?.name ?? "", code: selbank?.branch?.code ?? "", localizedName: selbank?.branch?.localizedName ?? "") + + setSelectedData(with: selectedBank, type: .bank) - setSelectedData(with: recipient.agent?.branch?.toSendMoneyBankBranch(), type: .branch) + setSelectedData(with: toBranch, type: .branch) setSelectedData(with: selectedIDType, type: .idType) setSelectedData(with: selectedStateProvince, type: .stateProvince) setSelectedData(with: selectedDistrict, type: .district) @@ -376,7 +383,7 @@ extension SetupRecipientViewModel: SetupRecipientViewModelInterface { selectedRecipientLinker.onNext(selectedRecipient) } - + case .paymentMode: guard let model = model as? PaymentServiceType else { return } selectedPaymentModeTypesLinker.onNext(model) diff --git a/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/MessageCompose/User Interface/View/MessageComposeViewController.swift b/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/MessageCompose/User Interface/View/MessageComposeViewController.swift index fea2cb9c..19c1f61c 100644 --- a/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/MessageCompose/User Interface/View/MessageComposeViewController.swift +++ b/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/MessageCompose/User Interface/View/MessageComposeViewController.swift @@ -90,7 +90,7 @@ class MessageComposeViewController: UIViewController { case .edit: self.textFieldSubject.text = "request_for_amendment_text".localized() case .pending: - self.textFieldSubject.text = "request_for_cancellation_text".localized() + self.textFieldSubject.text = "cancel_transaction".localized() } } diff --git a/GME Remit/MultiLanguages/en.lproj/Localizable.strings b/GME Remit/MultiLanguages/en.lproj/Localizable.strings index 4b1e678b..06d126a7 100644 --- a/GME Remit/MultiLanguages/en.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/en.lproj/Localizable.strings @@ -1022,3 +1022,8 @@ "current_exchange_rate" = "Current Exchange Rate"; "country" = "Country"; "copied" = "Copied"; + +"cancel_transaction" = "Cancel Transaction"; +"edit_detail" = "Edit Detail"; +"view_status" = "View Status"; +