Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some indentation #2173

Merged
merged 2 commits into from Aug 27, 2019
Merged

Fix some indentation #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
528ad03
Fix some indentation
yahiheb Aug 26, 2019
d787cde
Add punctuation
yahiheb Aug 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 28 additions & 28 deletions WalletWasabi.Gui/Controls/WalletExplorer/CoinListViewModel.cs
View file
Open in desktop
Expand Up @@ -234,50 +234,50 @@ public CoinListViewModel(Global global, CoinListContainerType coinListContainerT
this.WhenAnyValue(x => x.AmountSortDirection)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(x =>
{
if (x != SortOrder.None)
{
PrivacySortDirection = SortOrder.None;
StatusSortDirection = SortOrder.None;
ClustersSortDirection = SortOrder.None;
}
});
if (x != SortOrder.None)
{
PrivacySortDirection = SortOrder.None;
StatusSortDirection = SortOrder.None;
ClustersSortDirection = SortOrder.None;
}
});

this.WhenAnyValue(x => x.ClustersSortDirection)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(x =>
{
if (x != SortOrder.None)
{
AmountSortDirection = SortOrder.None;
StatusSortDirection = SortOrder.None;
PrivacySortDirection = SortOrder.None;
}
});
if (x != SortOrder.None)
{
AmountSortDirection = SortOrder.None;
StatusSortDirection = SortOrder.None;
PrivacySortDirection = SortOrder.None;
}
});

this.WhenAnyValue(x => x.StatusSortDirection)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(x =>
{
if (x != SortOrder.None)
{
AmountSortDirection = SortOrder.None;
PrivacySortDirection = SortOrder.None;
ClustersSortDirection = SortOrder.None;
}
});
if (x != SortOrder.None)
{
AmountSortDirection = SortOrder.None;
PrivacySortDirection = SortOrder.None;
ClustersSortDirection = SortOrder.None;
}
});

this.WhenAnyValue(x => x.PrivacySortDirection)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(x =>
{
if (x != SortOrder.None)
{
AmountSortDirection = SortOrder.None;
StatusSortDirection = SortOrder.None;
ClustersSortDirection = SortOrder.None;
}
});
if (x != SortOrder.None)
{
AmountSortDirection = SortOrder.None;
StatusSortDirection = SortOrder.None;
ClustersSortDirection = SortOrder.None;
}
});

EnqueueCoin = ReactiveCommand.Create(() =>
{
Expand Down
8 changes: 4 additions & 4 deletions WalletWasabi.Gui/Controls/WalletExplorer/CoinViewModel.cs
View file
Open in desktop
Expand Up @@ -100,10 +100,10 @@ public void SubscribeEvents()
Global.UiConfig.WhenAnyValue(x => x.LurkingWifeMode)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ =>
{
this.RaisePropertyChanged(nameof(AmountBtc));
this.RaisePropertyChanged(nameof(Clusters));
}).DisposeWith(Disposables);
{
this.RaisePropertyChanged(nameof(AmountBtc));
this.RaisePropertyChanged(nameof(Clusters));
}).DisposeWith(Disposables);
}

public void UnsubscribeEvents()
Expand Down
2 changes: 1 addition & 1 deletion WalletWasabi.Gui/Controls/WalletExplorer/PinPadViewModel.cs
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@ public PinPadViewModel(Global global) : base(global, "Pin Pad")
DialogResult = true;
OnClose();
},
this.WhenAny(x => x.MaskedPin, (maskedPin) => (!string.IsNullOrWhiteSpace(maskedPin.Value))));
this.WhenAny(x => x.MaskedPin, (maskedPin) => !string.IsNullOrWhiteSpace(maskedPin.Value)));

KeyPadCommand = ReactiveCommand.Create<string>((arg) =>
{
Expand Down
12 changes: 6 additions & 6 deletions WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
View file
Open in desktop
Expand Up @@ -170,16 +170,16 @@ public SendTabViewModel(WalletViewModel walletViewModel, bool isTransactionBuild
this.WhenAnyValue(x => x.IsBusy)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ =>
{
SetSendText();
});
{
SetSendText();
});

this.WhenAnyValue(x => x.IsHardwareBusy)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ =>
{
SetSendText();
});
{
SetSendText();
});

this.WhenAnyValue(x => x.Label)
.ObserveOn(RxApp.MainThreadScheduler)
Expand Down
14 changes: 7 additions & 7 deletions WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewerViewModel.cs
View file
Open in desktop
Expand Up @@ -110,13 +110,13 @@ public override void OnOpen()
Global.UiConfig.WhenAnyValue(x => x.LurkingWifeMode)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ =>
{
this.RaisePropertyChanged(nameof(IsLurkingWifeMode));
this.RaisePropertyChanged(nameof(TxId));
this.RaisePropertyChanged(nameof(PsbtJsonText));
this.RaisePropertyChanged(nameof(TransactionHexText));
this.RaisePropertyChanged(nameof(PsbtBase64Text));
}).DisposeWith(Disposables);
{
this.RaisePropertyChanged(nameof(IsLurkingWifeMode));
this.RaisePropertyChanged(nameof(TxId));
this.RaisePropertyChanged(nameof(PsbtJsonText));
this.RaisePropertyChanged(nameof(TransactionHexText));
this.RaisePropertyChanged(nameof(PsbtBase64Text));
}).DisposeWith(Disposables);
}

public override bool OnClose()
Expand Down
10 changes: 5 additions & 5 deletions WalletWasabi.Gui/Controls/WalletExplorer/WalletViewModel.cs
View file
Open in desktop
Expand Up @@ -101,12 +101,12 @@ public void OnWalletOpened()
.ObserveOn(RxApp.MainThreadScheduler);

observed.Subscribe(_ =>
{
Money balance = Enumerable.Where(WalletService.Coins, c => c.Unspent && !c.SpentAccordingToBackend).Sum(c => (long?)c.Amount) ?? 0;
{
Money balance = Enumerable.Where(WalletService.Coins, c => c.Unspent && !c.SpentAccordingToBackend).Sum(c => (long?)c.Amount) ?? 0;

Title = $"{Name} ({(Global.UiConfig.LurkingWifeMode ? "#########" : balance.ToString(false, true))} BTC)";
})
.DisposeWith(Disposables);
Title = $"{Name} ({(Global.UiConfig.LurkingWifeMode ? "#########" : balance.ToString(false, true))} BTC)";
})
.DisposeWith(Disposables);

observed.Next();

Expand Down
6 changes: 3 additions & 3 deletions WalletWasabi/Gma/QrCodeNet/Encoding/DataEncodation/CharCountIndicatorTable.cs
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ public static class CharCountIndicatorTable
public static int[] GetCharCountIndicatorSet()
{
return new int[] { 8, 16, 16 };
} //
}

public static int GetBitCountInCharCountIndicator(int version)
{
Expand All @@ -26,7 +26,7 @@ private static int GetVersionGroup(int version)
{
if (version > 40)
{
throw new InvalidOperationException($"Unexpected version: {version}");
throw new InvalidOperationException($"Unexpected version: {version}.");
}
else if (version >= 27)
{
Expand All @@ -42,7 +42,7 @@ private static int GetVersionGroup(int version)
}
else
{
throw new InvalidOperationException($"Unexpected version: {version}");
throw new InvalidOperationException($"Unexpected version: {version}.");
}
}
}
Expand Down