diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs index f3e99162e..c6d4609c8 100644 --- a/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs @@ -518,10 +518,6 @@ namespace BTCPayServer.Controllers.Greenfield Outputs = outputs, AlwaysIncludeNonWitnessUTXO = true, InputSelection = request.SelectedInputs?.Any() is true, - AllowFeeBump = - !request.RBF.HasValue ? WalletSendModel.ThreeStateBool.Maybe : - request.RBF.Value ? WalletSendModel.ThreeStateBool.Yes : - WalletSendModel.ThreeStateBool.No, FeeSatoshiPerByte = request.FeeRate?.SatoshiPerByte, NoChange = request.NoChange }, diff --git a/BTCPayServer/Controllers/UIWalletsController.PSBT.cs b/BTCPayServer/Controllers/UIWalletsController.PSBT.cs index 50597afc2..0cdbf07b4 100644 --- a/BTCPayServer/Controllers/UIWalletsController.PSBT.cs +++ b/BTCPayServer/Controllers/UIWalletsController.PSBT.cs @@ -42,15 +42,7 @@ namespace BTCPayServer.Controllers psbtDestination.Amount = Money.Coins(transactionOutput.Amount.Value); psbtDestination.SubstractFees = transactionOutput.SubtractFeesFromOutput; } - - if (network.SupportRBF) - { - if (sendModel.AllowFeeBump is WalletSendModel.ThreeStateBool.Yes) - psbtRequest.RBF = true; - if (sendModel.AllowFeeBump is WalletSendModel.ThreeStateBool.No) - psbtRequest.RBF = false; - } - + psbtRequest.RBF = network.SupportRBF ? true : null; psbtRequest.AlwaysIncludeNonWitnessUTXO = sendModel.AlwaysIncludeNonWitnessUTXO; psbtRequest.FeePreference = new FeePreference(); diff --git a/BTCPayServer/Controllers/UIWalletsController.cs b/BTCPayServer/Controllers/UIWalletsController.cs index 8063e8ba7..e81ed7f7f 100644 --- a/BTCPayServer/Controllers/UIWalletsController.cs +++ b/BTCPayServer/Controllers/UIWalletsController.cs @@ -513,8 +513,6 @@ namespace BTCPayServer.Controllers recommendedFees.Select(tuple => tuple.GetAwaiter().GetResult()).Where(option => option != null).ToList(); model.FeeSatoshiPerByte = recommendedFees[1].GetAwaiter().GetResult()?.FeeRate; - model.SupportRBF = network.SupportRBF; - model.CryptoDivisibility = network.Divisibility; using (CancellationTokenSource cts = new CancellationTokenSource()) { @@ -570,7 +568,6 @@ namespace BTCPayServer.Controllers if (network == null || network.ReadonlyWallet) return NotFound(); - vm.SupportRBF = network.SupportRBF; vm.NBXSeedAvailable = await GetSeed(walletId, network) != null; if (!string.IsNullOrEmpty(bip21)) { diff --git a/BTCPayServer/Models/WalletViewModels/WalletSendModel.cs b/BTCPayServer/Models/WalletViewModels/WalletSendModel.cs index c87fa4122..e9c97da83 100644 --- a/BTCPayServer/Models/WalletViewModels/WalletSendModel.cs +++ b/BTCPayServer/Models/WalletViewModels/WalletSendModel.cs @@ -55,11 +55,8 @@ namespace BTCPayServer.Models.WalletViewModels public int CryptoDivisibility { get; set; } public string Fiat { get; set; } public string RateError { get; set; } - public bool SupportRBF { get; set; } [Display(Name = "Always include non-witness UTXO if available")] public bool AlwaysIncludeNonWitnessUTXO { get; set; } - [Display(Name = "Allow fee increase (RBF)")] - public ThreeStateBool AllowFeeBump { get; set; } public bool NBXSeedAvailable { get; set; } [Display(Name = "PayJoin BIP21")] diff --git a/BTCPayServer/Views/UIWallets/WalletSend.cshtml b/BTCPayServer/Views/UIWallets/WalletSend.cshtml index 09c2a881c..1b54c6d5b 100644 --- a/BTCPayServer/Views/UIWallets/WalletSend.cshtml +++ b/BTCPayServer/Views/UIWallets/WalletSend.cshtml @@ -271,20 +271,7 @@ - @if (Model.SupportRBF) - { -
- - - - - -
- } + @if (!string.IsNullOrEmpty(Model.PayJoinBIP21)) {