Remove terms from Recover
MODIFY
WalletWasabi.Gui/Tabs/WalletManager/RecoverWalletView.xaml
WalletWasabi.Gui/Tabs/WalletManager/RecoverWalletView.xaml
</Grid>
</controls:GroupBox>
<DockPanel LastChildFill="True">
- <CheckBox IsChecked="{Binding TermsAccepted, Mode=TwoWay}" TextBlock.FontSize="10">
- <StackPanel Orientation="Horizontal">
- <TextBlock Text="I agree to the " />
- <Button Content="Terms and Conditions" Classes="activeHyperLink" Command="{Binding OnTermsClicked}" />
- <TextBlock Text=", " />
- <Button Content="Privacy Policy" Classes="activeHyperLink" Command="{Binding OnPrivacyClicked}" />
- <TextBlock Text=" and " />
- <Button Content="Legal Issues" Classes="activeHyperLink" Command="{Binding OnLegalClicked}" />
- <TextBlock Text=" documents." />
- </StackPanel>
- </CheckBox>
<Button Content="Recover" Command="{Binding RecoverCommand}" DockPanel.Dock="Right" />
<Grid></Grid>
</DockPanel>

MODIFY
WalletWasabi.Gui/Tabs/WalletManager/RecoverWalletViewModel.cs
WalletWasabi.Gui/Tabs/WalletManager/RecoverWalletViewModel.cs
@@ -23,7 +23,6 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
private string _password;
private string _mnemonicWords;
private string _walletName;
- private bool _termsAccepted;
private string _validationMessage;
private ObservableCollection<SuggestionViewModel> _suggestions;
@@ -39,11 +38,7 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
string walletFilePath = Path.Combine(Global.WalletsDir, $"{WalletName}.json");
- if (TermsAccepted == false)
- {
- ValidationMessage = "Terms are not accepted.";
- }
- else if (string.IsNullOrWhiteSpace(WalletName))
+ if (string.IsNullOrWhiteSpace(WalletName))
{
ValidationMessage = $"The name {WalletName} is not valid.";
}
@@ -70,8 +65,7 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
Logger.LogError<LoadWalletViewModel>(ex);
}
}
- },
- this.WhenAnyValue(x => x.TermsAccepted));
+ });
this.WhenAnyValue(x => x.MnemonicWords).Subscribe(x => UpdateSuggestions(x));
this.WhenAnyValue(x => x.Password).Subscribe(x =>
{
@@ -120,12 +114,6 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
set { this.RaiseAndSetIfChanged(ref _walletName, value); }
}
- public bool TermsAccepted
- {
- get { return _termsAccepted; }
- set { this.RaiseAndSetIfChanged(ref _termsAccepted, value); }
- }
-
public string ValidationMessage
{
get { return _validationMessage; }
@@ -162,7 +150,6 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
Password = null;
MnemonicWords = "";
WalletName = Utils.GetNextWalletName();
- TermsAccepted = false;
ValidationMessage = null;
}

Remove terms from Recover