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

Do not ask for address confirmation if a new wallet is generated

Browse source
This commit is contained in:
nicolas.dorier 2020-04-13 12:18:02 +09:00
parent b0073af5aa
commit 9efe6267d3
No known key found for this signature in database
GPG key ID: 6618763EF09186FE
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BTCPayServer.Tests/SeleniumTester.cs
View file

@ -138,8 +138,6 @@ namespace BTCPayServer.Tests
{
seed = Driver.FindElements(By.ClassName("alert-success")).First().FindElement(By.TagName("code")).Text;
}
Driver.FindElement(By.Id("Confirm")).ForceClick();
AssertHappyMessage();
return new Mnemonic(seed);
}

30
BTCPayServer/Controllers/StoresController.BTCLike.cs
View file

@ -350,7 +350,7 @@ namespace BTCPayServer.Controllers
Severity = StatusMessageModel.StatusSeverity.Error,
Html = "There was an error generating your wallet. Is your node available?"
});
return RedirectToAction("AddDerivationScheme", new {storeId, cryptoCode});
return RedirectToAction(nameof(AddDerivationScheme), new {storeId, cryptoCode});
}
Logs.Events.LogInformation($"GenerateNBXWallet after GenerateWalletAsync");
@ -359,7 +359,7 @@ namespace BTCPayServer.Controllers
var result = await AddDerivationScheme(storeId,
new DerivationSchemeViewModel()
{
Confirmation = false,
Confirmation = string.IsNullOrEmpty(request.ExistingMnemonic),
Network = network,
RootFingerprint = response.AccountKeyPath.MasterFingerprint.ToString(),
RootKeyPath = network.GetRootKeyPath(),
@ -372,15 +372,25 @@ namespace BTCPayServer.Controllers
Enabled = !store.GetStoreBlob()
.IsExcluded(new PaymentMethodId(cryptoCode, PaymentTypes.BTCLike))
}, cryptoCode);
TempData.SetStatusMessageModel(new StatusMessageModel()
if (!ModelState.IsValid || !(result is RedirectToActionResult))
return result;
TempData.Clear();
if (string.IsNullOrEmpty(request.ExistingMnemonic))
{
Severity = StatusMessageModel.StatusSeverity.Success,
Html = !string.IsNullOrEmpty(request.ExistingMnemonic)
? "Your wallet has been imported."
: $"Your wallet has been generated. Please store your seed securely! <br/><code>{response.Mnemonic}</code>"
});
TempData.SetStatusMessageModel(new StatusMessageModel()
{
Severity = StatusMessageModel.StatusSeverity.Success,
Html = $"Your wallet has been generated. Please store your seed securely! <br/><code>{response.Mnemonic}</code>"
});
}
else
{
TempData.SetStatusMessageModel(new StatusMessageModel()
{
Severity = StatusMessageModel.StatusSeverity.Warning,
Html = "Please check your addresses and confirm"
});
}
Logs.Events.LogInformation($"GenerateNBXWallet returning success result");
return result;
}