- Fixing the Amount ordering at history tab

WalletWasabi · Dec 15, 2018 · 52a556a · 52a556a
1 parent 3d43b82
commit 52a556a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabViewModel.cs b/WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabViewModel.cs
@@ -260,11 +260,11 @@ private void RefreshOrdering()
 				switch (AmountSortDirection)
 				{
 					case SortOrder.Increasing:
-						Transactions = new ObservableCollection<TransactionViewModel>(_transactions.OrderBy(t => t.AmountBtc));
+						Transactions = new ObservableCollection<TransactionViewModel>(_transactions.OrderBy(t => t.Amount));
 						break;
 
 					case SortOrder.Decreasing:
-						Transactions = new ObservableCollection<TransactionViewModel>(_transactions.OrderByDescending(t => t.AmountBtc));
+						Transactions = new ObservableCollection<TransactionViewModel>(_transactions.OrderByDescending(t => t.Amount));
 						break;
 				}
 			}

diff --git a/WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewModel.cs b/WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewModel.cs
@@ -1,4 +1,5 @@
-using ReactiveUI;
+using NBitcoin;
+using ReactiveUI;
 using System;
 using System.Globalization;
 using WalletWasabi.Gui.ViewModels;
@@ -33,6 +34,11 @@ public string AmountBtc
 			get => _model.AmountBtc;
 		}
 
+		public Money Amount
+		{
+			get => Money.TryParse(_model.AmountBtc, out Money money) ? money : Money.Zero;
+		}
+
 		public string Label
 		{
 			get => _model.Label;