diff --git a/GME Remit/APIs/Router/APIRouter.swift b/GME Remit/APIs/Router/APIRouter.swift index f56f40ff..9b358564 100644 --- a/GME Remit/APIs/Router/APIRouter.swift +++ b/GME Remit/APIs/Router/APIRouter.swift @@ -841,7 +841,9 @@ extension APIRouter { "UseBalancePrice" : model.useBalancePrice ?? "", "PassWord": model.password ?? "", "FintechUseNo": model.fintechUseNo ?? "", - "TranType": model.paymentType ?? "" + "TranType": model.paymentType ?? "", + "isUseBiometric": model.isUseBiometric ?? "", + "userId": GMEDB.shared.user.string(.userId) ?? "" ] case .fetchRechargeHistory(let from, let to): let senderID = GMEDB.shared.user.string(.senderId) ?? "" diff --git a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/Application Logic/Model/RechargeModel.swift b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/Application Logic/Model/RechargeModel.swift index b0aa921b..3cec99b6 100644 --- a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/Application Logic/Model/RechargeModel.swift +++ b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/Application Logic/Model/RechargeModel.swift @@ -21,6 +21,8 @@ struct RechargeModel { var receiptID: String? var orderNo: String? var password: String? + let isUseBiometric: Bool? + init( paymentType: String, @@ -32,7 +34,8 @@ struct RechargeModel { chargeType: String, cardName: String, mobile: String, - price: String + price: String, + isUseBiometric: Bool ) { self.paymentType = paymentType self.fintechUseNo = fintechUseNo @@ -45,6 +48,7 @@ struct RechargeModel { self.mobile = mobile self.productPrice = price self.useBalancePrice = price + self.isUseBiometric = isUseBiometric } mutating func addPassword(_ password: String) { diff --git a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/Presenter/PhoneCardRechargePresenter.swift b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/Presenter/PhoneCardRechargePresenter.swift index b1646b8b..fcd5f3f9 100644 --- a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/Presenter/PhoneCardRechargePresenter.swift +++ b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/Presenter/PhoneCardRechargePresenter.swift @@ -235,7 +235,8 @@ class PhoneCardRechargePresenter: ViewModelType { chargeType: "", cardName: "", mobile: mobile, - price: priceModel?.price ?? "0" + price: priceModel?.price ?? "0", + isUseBiometric: KeyChain.shared.get(key: .biometricAuth) == "1" ? true : false ) case .fixed: return RechargeModel( @@ -248,7 +249,8 @@ class PhoneCardRechargePresenter: ViewModelType { chargeType: carrierPlan?.cardType ?? "", cardName: carrierPlan?.cardName ?? "", mobile: mobile, - price: carrierPlan?.facePrice ?? "0" + price: carrierPlan?.facePrice ?? "0", + isUseBiometric: KeyChain.shared.get(key: .biometricAuth) == "1" ? true : false ) case .dataOnly: return RechargeModel( @@ -261,7 +263,8 @@ class PhoneCardRechargePresenter: ViewModelType { chargeType: dataOnlyType?.cardCode ?? "", cardName: dataOnlyType?.cardName ?? "", mobile: mobile, - price: dataOnlyType?.facePrice ?? "0" + price: dataOnlyType?.facePrice ?? "0", + isUseBiometric: KeyChain.shared.get(key: .biometricAuth) == "1" ? true : false ) } }.drive(onNext: {