add details button
MODIFY
WalletWasabi.Fluent/Icons/Icons.axaml
WalletWasabi.Fluent/Icons/Icons.axaml
<StreamGeometry x:Key="block_height">M 15.75 -2 C 16.9926 -2 18 -3.0074 18 -4.25 L 18 -19.75 C 18 -20.9926 16.9926 -22 15.75 -22 L 8.25 -22 C 7.0074 -22 6 -20.9926 6 -19.75 L 6 -4.25 C 6 -3.0074 7.0074 -2 8.25 -2 L 15.75 -2 Z M 15.75 -3.5 L 8.25 -3.5 C 7.8358 -3.5 7.5 -3.8358 7.5 -4.25 L 7.5 -19.75 C 7.5 -20.1642 7.8358 -20.5 8.25 -20.5 L 15.75 -20.5 C 16.1642 -20.5 16.5 -20.1642 16.5 -19.75 L 16.5 -4.25 C 16.5 -3.8358 16.1642 -3.5 15.75 -3.5 Z M 12 -7.0309 C 12.3797 -7.0309 12.6935 -7.3131 12.7432 -7.6791 L 12.75 -7.7809 L 12.7493 -14.4919 L 13.7113 -13.5308 C 13.9776 -13.2645 14.3943 -13.2403 14.6879 -13.4582 L 14.772 -13.5308 C 15.0383 -13.7971 15.0625 -14.2137 14.8446 -14.5073 L 14.772 -14.5915 L 12.5303 -16.8331 L 12.4921 -16.8688 L 12.4296 -16.9177 L 12.3631 -16.9592 L 12.3026 -16.9893 L 12.2019 -17.0253 L 12.1393 -17.0398 L 12.0468 -17.0514 L 11.9532 -17.0514 L 11.8615 -17.04 L 11.7651 -17.0153 L 11.6535 -16.9682 L 11.5767 -16.922 L 11.4697 -16.8331 L 11.4697 -16.8331 L 9.228 -14.5915 C 8.9351 -14.2986 8.9351 -13.8237 9.228 -13.5308 C 9.4943 -13.2645 9.9109 -13.2403 10.2045 -13.4582 L 10.2887 -13.5308 L 11.2493 -14.4919 L 11.25 -7.7809 C 11.25 -7.4357 11.4832 -7.145 11.8006 -7.0577 L 11.8982 -7.0378 L 12 -7.0309 Z</StreamGeometry>
<StreamGeometry x:Key="transaction_id">M7 10H17C17.5523 10 18 10.3358 18 10.75C18 11.1297 17.6238 11.4435 17.1357 11.4932L17 11.5H7C6.44772 11.5 6 11.1642 6 10.75C6 10.3703 6.37621 10.0565 6.86431 10.0068L7 10Z M17 13H7L6.86431 13.0068C6.37621 13.0565 6 13.3703 6 13.75C6 14.1642 6.44772 14.5 7 14.5H17L17.1357 14.4932C17.6238 14.4435 18 14.1297 18 13.75C18 13.3358 17.5523 13 17 13Z M21 5.75C21 4.23122 19.7688 3 18.25 3H5.75C4.23122 3 3 4.23122 3 5.75V18.25C3 19.7688 4.23122 21 5.75 21H18.25C19.7688 21 21 19.7688 21 18.25V5.75ZM5.75 4.5H18.25C18.9404 4.5 19.5 5.05964 19.5 5.75V18.25C19.5 18.9404 18.9404 19.5 18.25 19.5H5.75C5.05964 19.5 4.5 18.9404 4.5 18.25V5.75C4.5 5.05964 5.05964 4.5 5.75 4.5Z</StreamGeometry>
<StreamGeometry x:Key="people_regular">M4,16 L15,16.001 C16.0538182,16.001 16.9181157,16.8164855 16.9945109,17.8516842 L17,18.001 L17,20.5 C16.999,24.7 12.713,26 9.5,26 C6.35126,26 2.1710504,24.75148 2.00510151,20.7485328 L2,20.5 L2,18 C2,16.9461818 2.81639669,16.0818843 3.85080841,16.0054891 L4,16 Z M24,16 L24.1491916,16.0054891 C25.1318827,16.0780645 25.9178153,16.8617218 25.9939518,17.8434235 L26,18 L26,20 C25.999,23.759 22.57,25 20,25 C18.942,25 17.741,24.785 16.691,24.275 C17.009,23.897 17.278,23.477 17.488,23.007 C18.4456,23.427 19.4789867,23.4924578 19.9157784,23.4993188 L20.2043433,23.4963225 C21.2400556,23.4606629 24.334766,23.1116572 24.4936471,20.2325914 L24.5,20 L24.5,18 C24.5,17.7546667 24.3222222,17.5504198 24.0895748,17.5080604 L24,17.5 L17.949,17.501 C17.865,16.999625 17.6554375,16.5434219 17.3544785,16.1605273 L17.22,16.001 L24,16 Z M4,17.5 L3.899344,17.51 C3.77496,17.53528 3.69,17.6028 3.646,17.646 C3.6028,17.69 3.53528,17.77432 3.51,17.89896 L3.5,18 L3.5,20.5 C3.5,21.839 4.087,22.829 5.295,23.525 C6.29135714,24.1007143 7.68434694,24.4479337 9.15851093,24.4945991 L9.5,24.5 L9.93487113,24.4897846 C11.4554554,24.4219073 15.3140372,23.9331951 15.4935181,20.7322803 L15.5,20.499 L15.5,18.001 C15.5,17.7565556 15.3222222,17.5516173 15.0895748,17.5090933 L15,17.501 L4,17.5 Z M9.5,3 C12.538,3 15,5.463 15,8.5 C15,11.537 12.538,14 9.5,14 C6.462,14 4,11.537 4,8.5 C4,5.463 6.462,3 9.5,3 Z M20.5,5 C22.985,5 25,7.015 25,9.5 C25,11.985 22.985,14 20.5,14 C18.015,14 16,11.985 16,9.5 C16,7.015 18.015,5 20.5,5 Z M9.5,4.5 C7.294,4.5 5.5,6.294 5.5,8.5 C5.5,10.706 7.294,12.5 9.5,12.5 C11.706,12.5 13.5,10.706 13.5,8.5 C13.5,6.294 11.706,4.5 9.5,4.5 Z M20.5,6.5 C18.846,6.5 17.5,7.846 17.5,9.5 C17.5,11.154 18.846,12.5 20.5,12.5 C22.154,12.5 23.5,11.154 23.5,9.5 C23.5,7.846 22.154,6.5 20.5,6.5 Z</StreamGeometry>
+ <StreamGeometry x:Key="details_regular">M25,21.75 C25,23.5449254 23.5449254,25 21.75,25 L6.25,25 C4.45507456,25 3,23.5449254 3,21.75 L3,6.25 C3,4.45507456 4.45507456,3 6.25,3 L21.75,3 C23.5449254,3 25,4.45507456 25,6.25 L25,21.75 Z M23.5,21.75 L23.5,6.25 C23.5,5.28350169 22.7164983,4.5 21.75,4.5 L6.25,4.5 C5.28350169,4.5 4.5,5.28350169 4.5,6.25 L4.5,21.75 C4.5,22.7164983 5.28350169,23.5 6.25,23.5 L21.75,23.5 C22.7164983,23.5 23.5,22.7164983 23.5,21.75 Z M19.75,14 C19.75,14.3796958 19.4678461,14.693491 19.1017706,14.7431534 L19,14.75 L9,14.75 C8.58578644,14.75 8.25,14.4142136 8.25,14 C8.25,13.6203042 8.53215388,13.306509 8.89822944,13.2568466 L9,13.25 L19,13.25 C19.4142136,13.25 19.75,13.5857864 19.75,14 Z M19.75,19.25 C19.75,19.6296958 19.4678461,19.943491 19.1017706,19.9931534 L19,20 L9,20 C8.58578644,20 8.25,19.6642136 8.25,19.25 C8.25,18.8703042 8.53215388,18.556509 8.89822944,18.5068466 L9,18.5 L19,18.5 C19.4142136,18.5 19.75,18.8357864 19.75,19.25 Z M19.75,8.75 C19.75,9.12969577 19.4678461,9.44349096 19.1017706,9.49315338 L19,9.5 L9,9.5 C8.58578644,9.5 8.25,9.16421356 8.25,8.75 C8.25,8.37030423 8.53215388,8.05650904 8.89822944,8.00684662 L9,8 L19,8 C19.4142136,8 19.75,8.33578644 19.75,8.75 Z</StreamGeometry>
<DrawingGroup x:Key="placeholder_graphics_legal">
<GeometryDrawing Brush="#FFEF261A"

MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/Home/History/HistoryItemViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/Home/History/HistoryItemViewModel.cs
using System;
+using System.Reactive;
+using System.Windows.Input;
using NBitcoin;
+using ReactiveUI;
using WalletWasabi.Blockchain.Transactions;
using WalletWasabi.Models;
-using WalletWasabi.Stores;
+using WalletWasabi.Wallets;
namespace WalletWasabi.Fluent.ViewModels.Wallets.Home.History
{
public class HistoryItemViewModel
{
- public HistoryItemViewModel(int orderIndex, TransactionSummary transactionSummary, BitcoinStore bitcoinStore, Money balance)
+ public HistoryItemViewModel(int orderIndex, TransactionSummary transactionSummary, Wallet wallet, Money balance, IObservable<Unit> updateTrigger)
{
TransactionSummary = transactionSummary;
Date = transactionSummary.DateTime.ToLocalTime();
@@ -16,7 +19,7 @@ namespace WalletWasabi.Fluent.ViewModels.Wallets.Home.History
OrderIndex = orderIndex;
Balance = balance;
- var confirmations = transactionSummary.Height.Type == HeightType.Chain ? (int)bitcoinStore.SmartHeaderChain.TipHeight - transactionSummary.Height.Value + 1 : 0;
+ var confirmations = transactionSummary.Height.Type == HeightType.Chain ? (int) wallet.BitcoinStore.SmartHeaderChain.TipHeight - transactionSummary.Height.Value + 1 : 0;
IsConfirmed = confirmations > 0;
var amount = transactionSummary.Amount;
@@ -28,7 +31,17 @@ namespace WalletWasabi.Fluent.ViewModels.Wallets.Home.History
{
IncomingAmount = amount;
}
+
+ ShowDetailsCommand = ReactiveCommand.Create(() =>
+ {
+ if (MainViewModel.Instance?.DialogScreen is { } navStack)
+ {
+ navStack.To(new TransactionDetailsViewModel(transactionSummary, wallet, updateTrigger));
}
+ });
+ }
+
+ public ICommand ShowDetailsCommand { get; }
public TransactionSummary TransactionSummary { get; }

MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/Home/History/HistoryViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/Home/History/HistoryViewModel.cs
@@ -94,7 +94,7 @@ namespace WalletWasabi.Fluent.ViewModels.Wallets.Home.History
{
var transactionSummary = txRecordList[i];
balance += transactionSummary.Amount;
- _transactionSourceList.Add(new HistoryItemViewModel(i, transactionSummary, _wallet.BitcoinStore, balance));
+ _transactionSourceList.Add(new HistoryItemViewModel(i, transactionSummary, _wallet, balance, _updateTrigger));
}
}
catch (Exception ex)

MODIFY
WalletWasabi.Fluent/Views/Wallets/Home/History/HistoryTable.axaml
WalletWasabi.Fluent/Views/Wallets/Home/History/HistoryTable.axaml
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
+
+ <!-- Status -->
+ <DataGridTemplateColumn Width="Auto"
+ CanUserSort="False">
+ <DataGridTemplateColumn.CellTemplate>
+ <DataTemplate>
+ <Button x:DataType="history:HistoryItemViewModel" Classes="plain" ToolTip.Tip="Details"
+ Command="{Binding ShowDetailsCommand}">
+ <PathIcon Data="{StaticResource details_regular}" Opacity="0.6" />
+ </Button>
+ </DataTemplate>
+ </DataGridTemplateColumn.CellTemplate>
+ </DataGridTemplateColumn>
+
</DataGrid.Columns>
</DataGrid>
</DockPanel>

add details button