mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-22 22:25:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix statusMessage handling for the Receive wallet page

Browse source
This commit is contained in:
nicolas.dorier 2020-01-18 15:32:01 +09:00
parent 025da0261d
commit a2be7ee471
No known key found for this signature in database
GPG key ID: 6618763EF09186FE
2 changed files with 48 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
BTCPayServer/Controllers/WalletsController.cs
View file

@ -307,7 +307,7 @@ namespace BTCPayServer.Controllers
[HttpGet]
[Route("{walletId}/receive")]
public IActionResult WalletReceive([ModelBinder(typeof(WalletIdModelBinder))]
WalletId walletId, string statusMessage = null)
WalletId walletId)
{
if (walletId?.StoreId == null)
return NotFound();
@ -319,11 +319,6 @@ namespace BTCPayServer.Controllers
return NotFound();
var address = _WalletReceiveStateService.Get(walletId)?.Address;
if (!string.IsNullOrEmpty(statusMessage))
{
TempData[WellKnownTempData.SuccessMessage] = statusMessage;
}
return View(new WalletReceiveViewModel()
{
CryptoCode = walletId.CryptoCode,
@ -345,7 +340,6 @@ namespace BTCPayServer.Controllers
var network = this.NetworkProvider.GetNetwork<BTCPayNetwork>(walletId?.CryptoCode);
if (network == null)
return NotFound();
var statusMessage = string.Empty;
var wallet = _walletProvider.GetWallet(network);
switch (command)
{
@ -358,12 +352,12 @@ namespace BTCPayServer.Controllers
var address = cachedAddress.ScriptPubKey.GetDestinationAddress(network.NBitcoinNetwork);
ExplorerClientProvider.GetExplorerClient(network)
.CancelReservation(cachedAddress.DerivationStrategy, new[] {cachedAddress.KeyPath});
statusMessage = new StatusMessageModel()
this.TempData.SetStatusMessageModel(new StatusMessageModel()
{
AllowDismiss =true,
AllowDismiss = true,
Message = $"Address {address} was unreserved.",
Severity = StatusMessageModel.StatusSeverity.Success,
}.ToString();
});
_WalletReceiveStateService.Remove(walletId);
break;
case "generate-new-address":
@ -371,7 +365,7 @@ namespace BTCPayServer.Controllers
_WalletReceiveStateService.Set(walletId, reserve);
break;
}
return RedirectToAction(nameof(WalletReceive), new {walletId, statusMessage});
return RedirectToAction(nameof(WalletReceive), new {walletId});
}
[HttpGet]

78
BTCPayServer/Views/Wallets/WalletReceive.cshtml
View file

@ -5,13 +5,20 @@
ViewData["Title"] = "Manage wallet";
ViewData.SetActivePageAndTitle(WalletsNavPages.Receive);
}
@if (TempData.HasStatusMessage())
{
<div class="row">
<div class="col-md-12 text-center">
<partial name="_StatusMessage" />
</div>
</div>
}
<div class="row no-gutters">
<div class="col-lg-6 mx-auto my-auto ">
<form method="post" asp-action="WalletReceive" class="card text-center">
@if (string.IsNullOrEmpty(Model.Address))
{
<h2 class="card-title">Receive @Model.CryptoCode</h2>
<button class="btn btn-lg btn-primary m-2" type="submit" name="command" value="generate-new-address">Generate @Model.CryptoCode address</button>
}
@ -21,14 +28,14 @@
<noscript>
<div class="card-body m-sm-0 p-sm-0">
<div class="input-group">
<input type="text" class="form-control " readonly="readonly" asp-for="Address" id="address"/>
<input type="text" class="form-control " readonly="readonly" asp-for="Address" id="address" />
<div class="input-group-append">
<span class="input-group-text fa fa-copy"> </span>
</div>
</div>
<button type="submit" name="command" value="unreserve-current-address" class="btn btn-link">Unreserve this address</button>
<button type="submit" name="command" value="unreserve-current-address" class="btn btn-link">Unreserve this address</button>
</div>
</noscript>
<div class="only-for-js card-body m-sm-0 p-sm-0" id="app">
@ -38,17 +45,17 @@
</qrcode>
</div>
<div class="input-group copy" data-clipboard-target="#vue-address">
<input type="text" class=" form-control " readonly="readonly" :value="srvModel.address" id="vue-address"/>
<input type="text" class=" form-control " readonly="readonly" :value="srvModel.address" id="vue-address" />
<div class="input-group-append">
<span class="input-group-text fa fa-copy"> </span>
</div>
</div>
<button type="submit" name="command" value="unreserve-current-address" class="btn btn-link">Unreserve this address</button>
<button type="submit" name="command" value="unreserve-current-address" class="btn btn-link">Unreserve this address</button>
</div>
}
</form>
</div>
</div>
@ -56,7 +63,7 @@
@section HeadScripts
{
<script src="~/bundles/lightning-node-info-bundle.min.js" type="text/javascript"></script>
<script src="~/bundles/lightning-node-info-bundle.min.js" type="text/javascript"></script>
<script type="text/javascript">
var srvModel = @Safe.Json(Model);
window.onload = function() {
@ -92,30 +99,31 @@
}
</script>
<style>
<style>
.qr-icon {
height: 64px;
width: 64px;
position: absolute;
left: 0;
top: 0;
right: 0;
bottom: 0;
margin: auto;
height: 64px;
width: 64px;
position: absolute;
left: 0;
top: 0;
right: 0;
bottom: 0;
margin: auto;
}
.qr-container {
position: relative;
text-align: center;
}
.qr-container svg {
width: 256px;
height: 256px;
}
.qr-container {
position: relative;
text-align: center;
}
.qr-container svg {
width: 256px;
height: 256px;
}
.copy {
cursor: copy;
}
</style>
.copy {
cursor: copy;
}
</style>
}