aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-31 11:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Signing context cleanup (#2568)

Browse Source 
* Signing Context cleanup

Removes extra NBXSeedAvailable property in SigningContext, which got introduced in #2559. It is not needed since each view model involved already has it.

* Fix button in link
This commit is contained in:
d11n
2021-06-15 10:35:23 +02:00
committed by GitHub
parent c9869922f7
commit 70fcd053cd
5 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BTCPayServer/Controllers/WalletsController.PSBT.cs
View File

@@ -119,7 +119,6 @@ namespace BTCPayServer.Controllers
}
vm.PSBTHex = psbt.ToHex();
vm.SigningContext.NBXSeedAvailable = vm.NBXSeedAvailable;
var routeBack = new Dictionary<string, string>
{
{"action", nameof(WalletPSBT)}, {"walletId", walletId.ToString()}

3
BTCPayServer/Controllers/WalletsController.cs
View File

@@ -708,8 +708,7 @@ namespace BTCPayServer.Controllers
{
PayJoinBIP21 = vm.PayJoinBIP21,
EnforceLowR = psbtResponse.Suggestions?.ShouldEnforceLowR,
ChangeAddress = psbtResponse.ChangeAddress?.ToString(),
NBXSeedAvailable = vm.NBXSeedAvailable
ChangeAddress = psbtResponse.ChangeAddress?.ToString()
};
var routeBack = new Dictionary<string, string>

1
BTCPayServer/Models/WalletViewModels/SigningContextModel.cs
View File

@@ -17,6 +17,5 @@ namespace BTCPayServer.Models.WalletViewModels
public string PayJoinBIP21 { get; set; }
public bool? EnforceLowR { get; set; }
public string ChangeAddress { get; set; }
public bool NBXSeedAvailable { get; set; }
}
}

2
BTCPayServer/Views/Wallets/WalletPSBT.cshtml
View File

@@ -52,7 +52,7 @@
<input type="hidden" asp-for="PSBT"/>
<input type="hidden" asp-for="FileName"/>
<div class="d-flex">
<button type="submit" id="SignTransaction" name="command" value="@(Model.SigningContext.NBXSeedAvailable ? "nbx-seed" : "sign")" class="btn btn-primary">Sign transaction</button>
<button type="submit" id="SignTransaction" name="command" value="@(Model.NBXSeedAvailable ? "nbx-seed" : "sign")" class="btn btn-primary">Sign transaction</button>
<div class="ms-2 dropdown">
<button class="btn btn-secondary dropdown-toggle" type="button" id="OtherActionsDropdownToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Other actions...

2
BTCPayServer/Views/Wallets/WalletSigningOptions.cshtml
View File

@@ -65,7 +65,7 @@
Partially Signed Bitcoin Transaction
<small>
<a href="https://docs.btcpayserver.org/Wallet/#signing-with-a-wallet-supporting-psbt" target="_blank">
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
<span class="fa fa-question-circle-o text-secondary pe-none" title="More information..."></span>
</a>
</small>
</h4>