IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

removed company carrier type for Powercall

pull/1/head
Jeongbae Kong 4 years ago
parent
97e84c425f
commit
77d781d09a
3 changed files with 33 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/Presenter/PhoneCardRechargePresenter.swift
  2. 62
      GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard
  3. 12
      GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift

25
GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/Presenter/PhoneCardRechargePresenter.swift
View File

@ -52,7 +52,6 @@ class PhoneCardRechargePresenter: ViewModelType {
let selectedMobile: Driver<String>
let contactOpenTap: Driver<Void>
let selectedRechargeType: Driver<RechargeType>
let selectedMobileCarrerType: Driver<MainCardInformation?>
let selectedAmountButtonTag: Driver<Int?>
let selectedCarrierType: Driver<MainCardInformation?>
let selectedCarrierPlan: Driver<CardInformation?>
@ -145,24 +144,21 @@ class PhoneCardRechargePresenter: ViewModelType {
getBalanceLinker.asObservable()
)
let combineSecondInput = input.selectedMobileCarrerType.asObservable()
let combineInput = Observable.combineLatest(combineFirstInput, combineSecondInput) {
($0.0, $0.1, $0.2, $0.3, $0.4, $0.5, $0.6, $0.7, $1)
}
// let combineInput = Observable.combineLatest(combineFirstInput, combineSecondInput) {
// ($0.0, $0.1, $0.2, $0.3, $0.4, $0.5, $0.6, $0.7, $1)
// }
let carrierPlanModel = input.selectedCarrierType.map { $0?.subCardInfo ?? [] }
let detailCarrierPlanModel = input.selectedCarrierPlan.map { $0?.planInfo }
let isEnableNext = combineInput
.map { balance, _, type, priceModel, carrierPlan, dataOnlyType, selectedPaymentType, autoDebitBalance, selectedMobileCarrier -> Status in
let isEnableNext = combineFirstInput
.map { balance, _, type, priceModel, carrierPlan, dataOnlyType, selectedPaymentType, autoDebitBalance -> Status in
if selectedPaymentType?.type == "wallet" {
switch type {
case .regular:
guard
let cardCode = selectedMobileCarrier?.cardCode,
let paymentAmount = priceModel?.price,
let amount = Int(paymentAmount) else { return (false, false) }
@ -221,8 +217,7 @@ class PhoneCardRechargePresenter: ViewModelType {
switch type {
case .regular:
guard
(priceModel?.price) != nil,
selectedMobileCarrier?.cardCode != nil
(priceModel?.price) != nil
else { return (false, false) }
case .fixed:
@ -238,8 +233,8 @@ class PhoneCardRechargePresenter: ViewModelType {
}
input.nextTap
.withLatestFrom(combineInput.asDriverOnErrorJustComplete()) {$1}
.map { ( _, mobile, type, priceModel, carrierPlan, dataOnlyType, selectPaymentType, _, selectedMobileCarrier) -> RechargeModel? in
.withLatestFrom(combineFirstInput.asDriverOnErrorJustComplete()) {$1}
.map { ( _, mobile, type, priceModel, carrierPlan, dataOnlyType, selectPaymentType, _ ) -> RechargeModel? in
switch type {
@ -252,8 +247,8 @@ class PhoneCardRechargePresenter: ViewModelType {
bankName: selectPaymentType?.bankName ?? "",
accountNumber: selectPaymentType?.accountNumMasked ?? "",
type: type.value,
chargeType: selectedMobileCarrier?.cardCode ?? "",
cardName: selectedMobileCarrier?.cardName ?? "",
chargeType: "",
cardName: "",
mobile: mobile,
price: priceModel?.price ?? "0",
isUseBiometric: KeyChain.shared.get(key: .biometricAuth) == "1" ? true : false

62
GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard
View File

@ -326,28 +326,13 @@
<rect key="frame" x="10" y="0.0" width="355" height="2422.6666666666665"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CmC-Q1-ZRq">
<rect key="frame" x="0.0" y="0.0" width="355" height="227.33333333333334"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="167.33333333333334"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="2jz-Oc-Za2">
<rect key="frame" x="10" y="0.0" width="335" height="222.33333333333334"/>
<rect key="frame" x="10" y="0.0" width="335" height="162.33333333333334"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Heq-dq-cQQ" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="335" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="tnp-33-JJD"/>
</constraints>
<color key="textColor" name="ThemeText"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
<textInputTraits key="textInputTraits"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isLineHidden" value="YES"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="isUseTitle" value="NO"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="isShowTitle" value="NO"/>
<userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Select Carrier Type"/>
</userDefinedRuntimeAttributes>
</textField>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="FVo-DL-jTj">
<rect key="frame" x="0.0" y="60" width="335" height="35"/>
<rect key="frame" x="0.0" y="0.0" width="335" height="35"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uxJ-Fa-1i9">
<rect key="frame" x="0.0" y="0.0" width="105" height="35"/>
@ -388,7 +373,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="LgA-9x-Nqk">
<rect key="frame" x="0.0" y="104.99999999999994" width="335" height="35"/>
<rect key="frame" x="0.0" y="45" width="335" height="35"/>
<subviews>
<button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eMU-67-9FG">
<rect key="frame" x="0.0" y="0.0" width="105" height="35"/>
@ -429,10 +414,10 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rti-Lb-GnJ" userLabel="Separate">
<rect key="frame" x="0.0" y="149.99999999999994" width="335" height="10.333333333333343"/>
<rect key="frame" x="0.0" y="90" width="335" height="10.333333333333329"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="B1e-En-fth">
<rect key="frame" x="-20" y="10" width="375" height="0.33333333333333393"/>
<rect key="frame" x="-20" y="9.9999999999999432" width="375" height="0.33333333333333393"/>
<color key="backgroundColor" name="ThemeSeparate"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="du6-Yr-bcj"/>
@ -448,7 +433,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zaA-jE-elw">
<rect key="frame" x="0.0" y="170.33333333333331" width="335" height="52"/>
<rect key="frame" x="0.0" y="110.33333333333331" width="335" height="52"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="yGM-TS-eua">
<rect key="frame" x="0.0" y="10" width="335" height="42"/>
@ -522,7 +507,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="irB-sa-xqC">
<rect key="frame" x="0.0" y="227.33333333333329" width="355" height="461.66666666666674"/>
<rect key="frame" x="0.0" y="167.33333333333329" width="355" height="461.66666666666674"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="fPQ-wq-qAt">
<rect key="frame" x="10" y="0.0" width="335" height="456.66666666666669"/>
@ -595,7 +580,7 @@
<rect key="frame" x="0.0" y="0.0" width="305" height="25"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Cell Phone" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ATr-GR-fdE">
<rect key="frame" x="0.0" y="0.0" width="68" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="63.666666666666664" height="25"/>
<constraints>
<constraint firstAttribute="height" constant="25" id="DmQ-fW-QTA"/>
</constraints>
@ -604,7 +589,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="01052850125" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="F3s-hq-mVr">
<rect key="frame" x="68" y="0.0" width="237" height="25"/>
<rect key="frame" x="63.666666666666671" y="0.0" width="241.33333333333331" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
@ -615,13 +600,13 @@
<rect key="frame" x="0.0" y="29" width="305" height="25"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Charge Type" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="592-jP-xgS">
<rect key="frame" x="0.0" y="0.0" width="78.666666666666671" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="74.333333333333329" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="mediaLog 11G(50,600)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="CiS-wv-umW">
<rect key="frame" x="78.666666666666671" y="0.0" width="226.33333333333331" height="25"/>
<rect key="frame" x="74.333333333333329" y="0.0" width="230.66666666666669" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
@ -632,13 +617,13 @@
<rect key="frame" x="0.0" y="58" width="305" height="25"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Data" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="798-HQ-YHW">
<rect key="frame" x="0.0" y="0.0" width="29.333333333333332" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="27.666666666666668" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="11GB + 3M Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="VyR-26-utb">
<rect key="frame" x="29.333333333333343" y="0.0" width="275.66666666666663" height="25"/>
<rect key="frame" x="27.666666666666657" y="0.0" width="277.33333333333337" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
@ -649,13 +634,13 @@
<rect key="frame" x="0.0" y="87" width="305" height="25"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Voice" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P5S-MB-7Q1">
<rect key="frame" x="0.0" y="0.0" width="34" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="33" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="EL5-jZ-vOn">
<rect key="frame" x="34" y="0.0" width="271" height="25"/>
<rect key="frame" x="33" y="0.0" width="272" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
@ -666,13 +651,13 @@
<rect key="frame" x="0.0" y="116" width="305" height="25"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="SMS" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ozC-cy-dC6">
<rect key="frame" x="0.0" y="0.0" width="30.666666666666668" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="26.666666666666668" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="OnW-ui-fSi">
<rect key="frame" x="30.666666666666657" y="0.0" width="274.33333333333337" height="25"/>
<rect key="frame" x="26.666666666666657" y="0.0" width="278.33333333333337" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
@ -685,13 +670,13 @@
<rect key="frame" x="0.0" y="145" width="305" height="25"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Payment Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wtY-Oq-MdK">
<rect key="frame" x="0.0" y="0.0" width="108.33333333333333" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="106" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeRed"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￦ 50,100" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="XLT-1R-BKf">
<rect key="frame" x="108.33333333333336" y="0.0" width="196.66666666666663" height="25"/>
<rect key="frame" x="106" y="0.0" width="199" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeRed"/>
<nil key="highlightedColor"/>
@ -727,7 +712,7 @@
<rect key="frame" x="0.0" y="222" width="335" height="84"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="z3d-G4-G07">
<rect key="frame" x="0.0" y="20.000000000000114" width="335" height="64"/>
<rect key="frame" x="0.0" y="20" width="335" height="64"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="dXa-Gh-kNs">
<rect key="frame" x="0.0" y="0.0" width="335" height="20"/>
@ -830,7 +815,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tcd-5I-gDG">
<rect key="frame" x="0.0" y="689" width="355" height="125.33333333333337"/>
<rect key="frame" x="0.0" y="629" width="355" height="125.33333333333337"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="CQZ-gn-EPy">
<rect key="frame" x="10" y="0.0" width="335" height="120.33333333333333"/>
@ -923,7 +908,7 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="100" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="euR-3e-5qe">
<rect key="frame" x="0.0" y="814.33333333333337" width="355" height="1608.333333333333"/>
<rect key="frame" x="0.0" y="754.33333333333337" width="355" height="1668.333333333333"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@ -1031,7 +1016,6 @@
<outlet property="paymentTypeDropDownImageView" destination="vG3-iU-w8w" id="els-nj-o0v"/>
<outlet property="paymentTypeDropDownTap" destination="0Eu-f1-GtD" id="RJG-4R-Yek"/>
<outlet property="realBalanceLabel" destination="gqm-PF-EqL" id="H89-Pt-I4o"/>
<outlet property="regularCarrierTypeTextField" destination="Heq-dq-cQQ" id="or7-px-8zu"/>
<outlet property="regularInformationLabel1" destination="IYY-b3-pG3" id="vpV-BH-ihE"/>
<outlet property="regularInformationLabel2" destination="0i8-dF-xEP" id="DsL-s2-cqd"/>
<outlet property="regularTypeButtonsStackView" destination="2jz-Oc-Za2" id="kM8-r5-a61"/>

12
GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift
View File

@ -61,7 +61,6 @@ class PhoneCardRechargeViewController: UIViewController {
// Regular Type
@IBOutlet private weak var regularTypeContainerView: UIView!
@IBOutlet private weak var regularTypeButtonsStackView: UIStackView!
@IBOutlet weak var regularCarrierTypeTextField: ValidationTextField!
@IBOutlet private weak var amountButton1: UIButton!
@IBOutlet private weak var amountButton2: UIButton!
@IBOutlet private weak var amountButton3: UIButton!
@ -200,7 +199,6 @@ extension PhoneCardRechargeViewController {
regularInformationLabel1.text = "regular_type_information_text_1".localized()
regularInformationLabel2.text = "regular_type_information_text_2".localized()
regularCarrierTypeTextField.placeholder = "selected_carrier_type_text".localized()
carrierTypeTextField.placeholder = "selected_carrier_type_text".localized()
carrierPlanTextField.placeholder = "selected_carrier_plan_text".localized()
@ -226,8 +224,6 @@ extension PhoneCardRechargeViewController {
let selectedRechargeType = typeSegment.rx.selectedSegmentIndex
.map { RechargeType(rawValue: $0) ?? .regular}.asDriverOnErrorJustComplete()
let selectedMobileCarrerType = regularCarrierTypeTextField.selectedItem.map { $0 as? MainCardInformation}
let selectedCarrierType = carrierTypeTextField.selectedItem.map {$0 as? MainCardInformation}
let selectedCarrierPlan = carrierPlanTextField.selectedItem.map {$0 as? CardInformation}
let selectedDataOnlyType = dataOnlyTypeTextField.selectedItem.map {$0 as? MainCardInformation}
@ -241,7 +237,6 @@ extension PhoneCardRechargeViewController {
selectedMobile: selectedMobile.asDriverOnErrorJustComplete(),
contactOpenTap: contactButton.rx.tap.asDriverOnErrorJustComplete(),
selectedRechargeType: selectedRechargeType,
selectedMobileCarrerType: selectedMobileCarrerType.asDriverOnErrorJustComplete(),
selectedAmountButtonTag: selectedAmountButton.asDriverOnErrorJustComplete(),
selectedCarrierType: selectedCarrierType.asDriverOnErrorJustComplete(),
selectedCarrierPlan: selectedCarrierPlan.asDriverOnErrorJustComplete(),
@ -353,13 +348,6 @@ extension PhoneCardRechargeViewController {
})
.disposed(by: disposeBag)
output.mobileCarrierModel.drive(onNext: { [weak self] in
guard let `self` = self else { return }
let configuration = TablePresenterConfiguration(presenterTitle: "select_type_text".localized())
self.regularCarrierTypeTextField.useAsDropDown(with: configuration, items: $0)
})
.disposed(by: disposeBag)
output.regularModel.drive(onNext: { [weak self] model in
guard let `self` = self, model.count == self.amountButtons.count else { return }

Write Preview
Loading…
Cancel
Save