Wallet settings merge (#3072)

* Wallet settings merge

Merges both wallet settings screen from the wallets and the store section. Closes #2626.

* Improve wallet transactions view

* Remove unnecessary row/col construct
This commit is contained in:
d11n
2021-11-11 06:30:19 +01:00
committed by GitHub
parent be7cef29d8
commit 28694859c9
16 changed files with 641 additions and 592 deletions

View File

@@ -1,10 +1,13 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using BTCPayServer.Client.Models;
using Newtonsoft.Json;
namespace BTCPayServer.Models.StoreViewModels
{
public class WalletSettingsViewModel : DerivationSchemeViewModel
{
public WalletId WalletId { get; set; }
public string StoreId { get; set; }
public bool IsHotWallet { get; set; }
public bool CanUsePayJoin { get; set; }
@@ -25,5 +28,30 @@ namespace BTCPayServer.Models.StoreViewModels
[Display(Name = "Consider the invoice confirmed when the payment transaction …")]
public SpeedPolicy SpeedPolicy { get; set; }
public string Label { get; set; }
public string DerivationSchemeInput { get; set; }
[Display(Name = "Is signing key")]
public string SelectedSigningKey { get; set; }
public bool IsMultiSig => AccountKeys.Count > 1;
public List<WalletSettingsAccountKeyViewModel> AccountKeys { get; set; } = new List<WalletSettingsAccountKeyViewModel>();
public bool NBXSeedAvailable { get; set; }
public string StoreName { get; set; }
public string UriScheme { get; set; }
}
public class WalletSettingsAccountKeyViewModel
{
[JsonProperty("ExtPubKey")]
[Display(Name = "Account key")]
public string AccountKey { get; set; }
[Display(Name = "Master fingerprint")]
[Validation.HDFingerPrintValidator]
public string MasterFingerprint { get; set; }
[Display(Name = "Account key path")]
[Validation.KeyPathValidator]
public string AccountKeyPath { get; set; }
}
}