Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 0 additions & 4 deletions GingerCommon/Crypto/Random/RandomExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace GingerCommon.Crypto.Random;

Expand Down
5 changes: 0 additions & 5 deletions GingerCommon/Static/HttpUtils.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http.Headers;
using System.Net.Http;
using System.Text;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using System.Net;
Expand Down
5 changes: 0 additions & 5 deletions GingerCommon/Static/JsonUtils.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;

namespace GingerCommon.Static;

Expand Down
4 changes: 0 additions & 4 deletions GingerCommon/Static/TypeUtils.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;

namespace GingerCommon.Static;

Expand Down
1 change: 0 additions & 1 deletion WalletWasabi.Backend/Extensions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using System.Linq;
Expand Down
2 changes: 0 additions & 2 deletions WalletWasabi.Backend/Global.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using GingerCommon.Logging;
using Microsoft.Extensions.Logging;
using NBitcoin;
using NBitcoin.Secp256k1;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
Expand All @@ -21,7 +20,6 @@
using WalletWasabi.WabiSabi;
using WalletWasabi.WabiSabi.Backend;
using WalletWasabi.WabiSabi.Backend.Banning;
using WalletWasabi.WabiSabi.Backend.Rounds;
using WalletWasabi.WabiSabi.Backend.Rounds.CoinJoinStorage;
using WalletWasabi.WabiSabi.Backend.Statistics;
using WalletWasabi.WabiSabi.Recommendation;
Expand Down
1 change: 0 additions & 1 deletion WalletWasabi.Daemon/BuySell/BuySellClient.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.Net.Http;
using System.Text;
using System.Text.Json;
Expand Down
1 change: 1 addition & 0 deletions WalletWasabi.Daemon/FeeRateProviders/FeeRateProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public void Initialize(RpcFeeRateProvider? rpcFeeRateProvider)
/// </summary>
public FeeRateProvider(WasabiHttpClientFactory httpClientFactory, Network network) : this(httpClientFactory, FeeRateProviderSource.BlockstreamInfo, network)
{
Initialize(null);
}

public AllFeeEstimate GetAllFeeEstimate()
Expand Down
10 changes: 10 additions & 0 deletions WalletWasabi.Daemon/PersistentConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,16 @@ static public bool Migrate(bool readFromWasabi, [NotNullWhen(true)] ref Persiste
};
}

// Previous imports from Wasabi could increase this to 100. We do want to check and change this, even if we are not readFromWasabi.
if (config.AbsoluteMinInputCount > Constants.DefaultAbsoluteMinInputCount)
{
hasChanged = true;
config = config with
{
AbsoluteMinInputCount = Constants.DefaultAbsoluteMinInputCount
};
}

if (readFromWasabi)
{
var torMode = Config.ObjectToTorMode(config.UseTor);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public AdvancedRecoveryOptionsViewModel(int minGapLimit)
private void ValidateMinGapLimit(IValidationErrors errors)
{
if (!int.TryParse(MinGapLimit, out var minGapLimit) ||
minGapLimit is < KeyManager.AbsoluteMinGapLimit or > KeyManager.MaxGapLimit)
minGapLimit is < KeyManager.AbsoluteMinGapLimit or > KeyManager.MaxGapLimit)
{
errors.Add(
ErrorSeverity.Error,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp

var nextCommandCanExecute =
confirmationWordsSourceList
.Connect()
.WhenValueChanged(x => x.IsConfirmed)
.Select(_ => confirmationWordsSourceList.Items.All(x => x.IsConfirmed));
.Connect()
.WhenValueChanged(x => x.IsConfirmed)
.Select(_ => confirmationWordsSourceList.Items.All(x => x.IsConfirmed));

NextCommand = ReactiveCommand.CreateFromTask(OnNextAsync, nextCommandCanExecute);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ public CreatePasswordDialogViewModel(string title, string caption = "", bool ena
this.RaisePropertyChanged(nameof(ConfirmPassword));

return IsDialogOpen &&
((enableEmpty && string.IsNullOrEmpty(Password) &&
string.IsNullOrEmpty(ConfirmPassword)) ||
(!string.IsNullOrEmpty(Password) && !string.IsNullOrEmpty(ConfirmPassword) &&
!Validations.Any));
((enableEmpty && string.IsNullOrEmpty(Password) &&
string.IsNullOrEmpty(ConfirmPassword)) ||
(!string.IsNullOrEmpty(Password) && !string.IsNullOrEmpty(ConfirmPassword) &&
!Validations.Any));
})
.ObserveOn(RxApp.MainThreadScheduler);

Expand Down
11 changes: 5 additions & 6 deletions WalletWasabi.Fluent/AddWallet/ViewModels/WelcomePageViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@ public WelcomePageViewModel()
_selectedDisplayLanguage = Settings.SelectedDisplayLanguage;

this.WhenAnyValue(x => x.SelectedIndex)
.Subscribe(
x =>
{
NextLabel = x < NumberOfPages - 1 ? Resources.Continue : Resources.GetStarted;
EnableNextKey = x < NumberOfPages - 1;
});
.Subscribe(x =>
{
NextLabel = x < NumberOfPages - 1 ? Resources.Continue : Resources.GetStarted;
EnableNextKey = x < NumberOfPages - 1;
});

this.WhenAnyValue(x => x.IsActive)
.Skip(1)
Expand Down
14 changes: 7 additions & 7 deletions WalletWasabi.Fluent/AddWallet/Views/AddWalletPageView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
EnableNext="False">
<Grid VerticalAlignment="Stretch" MaxHeight="320">
<Grid.RowDefinitions>
<RowDefinition Height="*" MaxHeight="80" MinHeight="60"/>
<RowDefinition Height="*" MaxHeight="80" MinHeight="60"/>
<RowDefinition Height="*" MaxHeight="80" MinHeight="60"/>
<RowDefinition Height="*" MaxHeight="80" MinHeight="60"/>
<RowDefinition Height="*" MaxHeight="80" MinHeight="60" />
<RowDefinition Height="*" MaxHeight="80" MinHeight="60" />
<RowDefinition Height="*" MaxHeight="80" MinHeight="60" />
<RowDefinition Height="*" MaxHeight="80" MinHeight="60" />
</Grid.RowDefinitions>
<Grid.Styles>
<Style Selector="TileButton">
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Margin" Value="0 5 0 5" />
<Setter Property="Width" Value="400"/>
<Setter Property="Width" Value="400" />
<Setter Property="Height">
<Setter.Value>
<system:Double>NaN</system:Double>
Expand All @@ -49,14 +49,14 @@
Height="{TemplateBinding IconSize}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0"/>
Margin="0" />
</Panel>
<TextBlock x:Name="PART_Text"
VerticalAlignment="Center"
HorizontalAlignment="Left"
Text="{TemplateBinding Text}"
Foreground="{TemplateBinding Foreground}"
Margin="0"/>
Margin="0" />
</DockPanel>

</Border>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
x:CompileBindings="True"
x:Class="WalletWasabi.Fluent.AddWallet.Views.AddedWalletPageView">
<ContentArea EnableNext="False"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
ScrollViewer.VerticalScrollBarVisibility="Disabled">
<views1:SuccessAnimationView VerticalAlignment="Center" />
</ContentArea>
</UserControl>
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
</Style>
</UserControl.Styles>
<ContentArea Title="{Binding Title}"
CancelContent="{x:Static lang:Resources.Cancel}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
EnableNext="True" NextContent="OK">
CancelContent="{x:Static lang:Resources.Cancel}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
EnableNext="True" NextContent="OK">
<StackPanel HorizontalAlignment="Center" Spacing="20" MinWidth="380">
<Label Content="{x:Static lang:Resources.AdvancedRecoveryOptionsViewModelMinimumGapLimit}" Target="TbGapLimit" />
<TextBox Name="TbGapLimit" Watermark="e.g., 63"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
xmlns:create="clr-namespace:WalletWasabi.Fluent.AddWallet.ViewModels.Create"
x:Class="WalletWasabi.Fluent.AddWallet.Views.Create.ConfirmRecoveryWordsView">
<ContentArea Title="{Binding Title}"
Caption="{Binding CurrentWord.Index, StringFormat='{x:Static lang:Resources.ConfirmRecoveryWordsViewModelClickRecovery}', FallbackValue=' '}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
EnableNext="True"
NextContent="{x:Static lang:Resources.Continue}"
EnableSkip="{Binding IsSkipEnabled}"
IsBusy="{Binding IsBusy}"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
Caption="{Binding CurrentWord.Index, StringFormat='{x:Static lang:Resources.ConfirmRecoveryWordsViewModelClickRecovery}', FallbackValue=' '}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
EnableNext="True"
NextContent="{x:Static lang:Resources.Continue}"
EnableSkip="{Binding IsSkipEnabled}"
IsBusy="{Binding IsBusy}"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
<Grid x:Name="Layout">
<Grid.RowDefinitions>
<RowDefinition MinHeight="70" Height="*" />
Expand Down Expand Up @@ -80,7 +80,8 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" Margin="50 0 50 0" Width="80">
<TextBlock Text="{Binding Index, Mode=OneWay, StringFormat={}{0}.}" Opacity="0.5" FontSize="{DynamicResource FontSizeH6}" Height="42" />
<TextBlock Text="{Binding Index, Mode=OneWay, StringFormat={}{0}.}" Opacity="0.5"
FontSize="{DynamicResource FontSizeH6}" Height="42" />
<TextBlock Text="{Binding SelectedWord}" FontWeight="SemiBold" Margin="5 0 0 0"
Classes.error="{Binding !IsConfirmed}" FontSize="{DynamicResource FontSizeH6}" Height="42" />
</StackPanel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
xmlns:create="clr-namespace:WalletWasabi.Fluent.AddWallet.ViewModels.Create"
x:Class="WalletWasabi.Fluent.AddWallet.Views.Create.RecoveryWordsView">
<ContentArea Title="{Binding Title}"
Caption="{x:Static lang:Resources.RecoveryWordsViewCaption}"
CancelContent="{x:Static lang:Resources.Cancel}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
EnableNext="True" NextContent="{x:Static lang:Resources.Continue}" FocusNext="True"
ScrollViewer.HorizontalScrollBarVisibility="Auto">
Caption="{x:Static lang:Resources.RecoveryWordsViewCaption}"
CancelContent="{x:Static lang:Resources.Cancel}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
EnableNext="True" NextContent="{x:Static lang:Resources.Continue}" FocusNext="True"
ScrollViewer.HorizontalScrollBarVisibility="Auto">
<Grid>
<Grid.RowDefinitions>
<RowDefinition MinHeight="70" Height="*" />
Expand Down Expand Up @@ -64,8 +64,8 @@
</Panel>

<InfoMessage Opacity="0.5"
HorizontalAlignment="Center"
Grid.Row="4">
HorizontalAlignment="Center"
Grid.Row="4">
<TextBlock Text="{x:Static lang:Resources.RecoveryWordsViewNotSeeAfter}" />
</InfoMessage>
</Grid>
Expand Down
22 changes: 14 additions & 8 deletions WalletWasabi.Fluent/AddWallet/Views/CreatePasswordDialogView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,25 @@
xmlns:viewModels="clr-namespace:WalletWasabi.Fluent.AddWallet.ViewModels"
x:Class="WalletWasabi.Fluent.AddWallet.Views.CreatePasswordDialogView">
<ContentArea Title="{Binding Title}"
Caption="{Binding Caption}"
CancelContent="{x:Static lang:Resources.Cancel}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
EnableNext="True" NextContent="{x:Static lang:Resources.Continue}"
Width="450">
Caption="{Binding Caption}"
CancelContent="{x:Static lang:Resources.Cancel}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
EnableNext="True" NextContent="{x:Static lang:Resources.Continue}"
Width="450">
<StackPanel HorizontalAlignment="Stretch" Spacing="10">
<CopyablePasswordTextBox Name="TbPassword" Watermark="{x:Static lang:Resources.CreatePasswordDialogTypePassphrase}" Text="{Binding Password}" PasswordChar="•" Classes="revealPasswordButton hasCheckMark copyablePasswordTextBox">
<CopyablePasswordTextBox Name="TbPassword"
Watermark="{x:Static lang:Resources.CreatePasswordDialogTypePassphrase}"
Text="{Binding Password}" PasswordChar="•"
Classes="revealPasswordButton hasCheckMark copyablePasswordTextBox">
<Interaction.Behaviors>
<FocusOnAttachedBehavior />
</Interaction.Behaviors>
</CopyablePasswordTextBox>
<CopyablePasswordTextBox Name="TbConfirmPassword" Watermark="{x:Static lang:Resources.CreatePasswordDialogConfirmPassphrase}" Text="{Binding ConfirmPassword}" PasswordChar="•" Classes="revealPasswordButton hasCheckMark copyablePasswordTextBox" />
<CopyablePasswordTextBox Name="TbConfirmPassword"
Watermark="{x:Static lang:Resources.CreatePasswordDialogConfirmPassphrase}"
Text="{Binding ConfirmPassword}" PasswordChar="•"
Classes="revealPasswordButton hasCheckMark copyablePasswordTextBox" />
</StackPanel>
</ContentArea>
</UserControl>
30 changes: 15 additions & 15 deletions WalletWasabi.Fluent/AddWallet/Views/RecoverWalletView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
xmlns:viewModels="clr-namespace:WalletWasabi.Fluent.AddWallet.ViewModels"
x:Class="WalletWasabi.Fluent.AddWallet.Views.RecoverWalletView">
<ContentArea x:Name="RecoveryPageRoot"
Title="{Binding Title}"
CancelContent="{x:Static lang:Resources.Cancel}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
EnableNext="True" NextContent="{x:Static lang:Resources.Continue}"
IsBusy="{Binding IsBusy}">
Title="{Binding Title}"
CancelContent="{x:Static lang:Resources.Cancel}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
EnableNext="True" NextContent="{x:Static lang:Resources.Continue}"
IsBusy="{Binding IsBusy}">
<DockPanel>
<DockPanel DockPanel.Dock="Top">
<PathIcon Name="IconCheckmark"
Expand All @@ -24,15 +24,15 @@
DockPanel.Dock="Right"
Opacity="{Binding IsMnemonicsValid}" />
<TagsBox DockPanel.Dock="Left"
ItemCountLimit="24"
SuggestionsAreCaseSensitive="False"
RestrictInputToSuggestions="True"
Items="{Binding Mnemonics}"
Suggestions="{Binding Suggestions}"
Watermark="{x:Static lang:Resources.TypeInYourRecoveryWords}"
AllowDuplication="True"
EnableCounter="True"
EnableDelete="False">
ItemCountLimit="24"
SuggestionsAreCaseSensitive="False"
RestrictInputToSuggestions="True"
Items="{Binding Mnemonics}"
Suggestions="{Binding Suggestions}"
Watermark="{x:Static lang:Resources.TypeInYourRecoveryWords}"
AllowDuplication="True"
EnableCounter="True"
EnableDelete="False">
<TagsBox.Styles>
<Style Selector="TagsBox AutoCompleteBox">
<Setter Property="MinimumPrefixLength" Value="0" />
Expand Down
11 changes: 6 additions & 5 deletions WalletWasabi.Fluent/AddWallet/Views/WalletNamePageView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
xmlns:viewModels="clr-namespace:WalletWasabi.Fluent.AddWallet.ViewModels"
x:Class="WalletWasabi.Fluent.AddWallet.Views.WalletNamePageView">
<ContentArea Title="{Binding Title}"
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
IsBusy="{Binding IsBusy}"
EnableNext="True" NextContent="{x:Static lang:Resources.Continue}">
EnableCancel="{Binding EnableCancel}"
EnableBack="{Binding EnableBack}"
IsBusy="{Binding IsBusy}"
EnableNext="True" NextContent="{x:Static lang:Resources.Continue}">
<StackPanel DockPanel.Dock="Top">
<TextBox MaxLength="{StaticResource WalletNameMaxLength}" Text="{Binding WalletName}" Watermark="{x:Static lang:Resources.TypeInWalletName}">
<TextBox MaxLength="{StaticResource WalletNameMaxLength}" Text="{Binding WalletName}"
Watermark="{x:Static lang:Resources.TypeInWalletName}">
<Interaction.Behaviors>
<FocusOnAttachedBehavior />
<TextBoxSelectAllTextBehavior />
Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Fluent/AddWallet/Views/WelcomePageView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
<DockPanel Grid.Row="1" VerticalAlignment="Center">
<TextBlock Text="{x:Static lang:Resources.WelcomeToGingerWallet}" FontSize="30" HorizontalAlignment="Center"
FontWeight="Bold"
DockPanel.Dock="Top"/>
DockPanel.Dock="Top" />
<TextBlock Margin="0 20 0 10" TextAlignment="Center" HorizontalAlignment="Center"
Text="{x:Static lang:Resources.SelectPreferredLanguage}"
DockPanel.Dock="Top"/>
DockPanel.Dock="Top" />
<ListBox MaxWidth="300" DockPanel.Dock="Bottom" HorizontalAlignment="Stretch"
ItemsSource="{Binding DisplayLanguagesList}"
SelectedItem="{Binding SelectedDisplayLanguage}">
Expand Down
5 changes: 3 additions & 2 deletions WalletWasabi.Fluent/Announcement/Views/AnnouncementIcon.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,11 @@
ToolTip.Tip="{x:Static lang:Resources.MarkAllAsRead}"
IsVisible="{Binding Announcements.HasUnreadAnnouncements^}"
Command="{Binding MarkAllAsReadCommand}">
<PathIcon Data="{StaticResource mark_all_read}" Opacity="0.6" Height="15" VerticalAlignment="Center"/>
<PathIcon Data="{StaticResource mark_all_read}" Opacity="0.6" Height="15" VerticalAlignment="Center" />
</Button>
</Grid>
<ListBox ItemsSource="{Binding Announcements.List}" SelectedItem="{Binding SelectedAnnouncement}" MaxHeight="400" Width="350" Margin="0 0 0 10">
<ListBox ItemsSource="{Binding Announcements.List}" SelectedItem="{Binding SelectedAnnouncement}"
MaxHeight="400" Width="350" Margin="0 0 0 10">
<ListBox.DataTemplates>

<DataTemplate DataType="{x:Type models1:AnnouncementModel}">
Expand Down
Loading
Loading