remove prototype txn address view
MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/BuildTransactionDetails.xaml
WalletWasabi.Gui/Controls/WalletExplorer/BuildTransactionDetails.xaml
<converters:LurkingWifeModeStringConverter x:Key="LurkingWifeModeStringConverter" />
<converters:MoneyBrushConverter x:Key="MoneyBrushConverter" />
</UserControl.Resources>
- <DockPanel LastChildFill="True">
- <StackPanel DockPanel.Dock="Top">
+ <Panel>
+ <StackPanel>
<Grid ColumnDefinitions="170, *">
<TextBlock Classes="monospaceFont" Text="Transaction Id:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding TransactionId, ConverterParameter=50, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" />
<TextBlock Classes="monospaceFont" Text="Output Amount (BTC):" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding TotalOutputValue}" Foreground="{Binding TotalOutputValue, Converter={StaticResource MoneyBrushConverter}}" />
</Grid>
+ <Grid ColumnDefinitions="170, *">
+ <TextBlock Classes="monospaceFont" Text="Input Count:" />
+ <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Path=InputCount, StringFormat=\{0\} Input(s)}" />
+ </Grid>
+ <Grid ColumnDefinitions="170, *">
+ <TextBlock Classes="monospaceFont" Text="Output Count:" />
+ <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Path=OutputCount, StringFormat=\{0\} Outputs(s)}" />
+ </Grid>
<Grid ColumnDefinitions="170, *">
<TextBlock Classes="monospaceFont" Text="Transaction Date:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Path=DateTime, StringFormat=\{0:yyyy-MM-dd HH:mm\}}" />
</Grid>
</StackPanel>
- <controls:ExtendedListBox Items="{Binding CombinedTXOInfo}">
- <controls:ExtendedListBox.DataTemplates>
- <DataTemplate DataType="local:BuildTransactionDetailsCoinViewHeader">
- <Grid ColumnDefinitions="*,*">
- <Border Grid.Column="0" Padding="7" BorderThickness="1" BorderBrush="{DynamicResource ApplicationAccentForegroundBrush}">
- <TextBlock Classes="FontSizeNormal" Text="Inputs" Foreground="White" />
- </Border>
- <Border Grid.Column="1" Padding="7" BorderThickness="1" BorderBrush="{DynamicResource ApplicationAccentForegroundBrush}">
- <TextBlock Classes="FontSizeNormal" Text="Outputs" Foreground="White" />
- </Border>
- </Grid>
- </DataTemplate>
- <DataTemplate DataType="local:InOutInfoTuple">
- <Grid ColumnDefinitions="*,*">
- <Border Padding="1" Grid.Column="0" Background="DarkGreen" BorderBrush="Green" HorizontalAlignment="Left" BorderThickness="1" CornerRadius="6">
- <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Input.Address}" Foreground="White" />
- </Border>
- <Border Padding="1" Grid.Column="1" Background="DarkGreen" BorderBrush="Green" HorizontalAlignment="Left" BorderThickness="1" CornerRadius="6">
- <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Output.Address}" Foreground="White" />
- </Border>
- </Grid>
- </DataTemplate>
- </controls:ExtendedListBox.DataTemplates>
- </controls:ExtendedListBox>
- </DockPanel>
+ </Panel>
</UserControl>

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/TransactionInfo.cs
WalletWasabi.Gui/Controls/WalletExplorer/TransactionInfo.cs
@@ -19,11 +19,10 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
private string _label;
private int _blockHeight;
private string _transactionId;
- private IList<AddressMoneyTuple> _inputsInfo;
- private IList<AddressMoneyTuple> _outputsInfo;
private string _totalInputValue;
private string _totalOutputValue;
- private List<object> _combinedTxOInfo;
+ private int _inputCount;
+ private int _outputCount;
public DateTimeOffset DateTime
{
@@ -67,24 +66,6 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
set => this.RaiseAndSetIfChanged(ref _transactionId, value);
}
- public IList<AddressMoneyTuple> InputsInfo
- {
- get => _inputsInfo;
- set => this.RaiseAndSetIfChanged(ref _inputsInfo, value);
- }
-
- public IList<AddressMoneyTuple> OutputsInfo
- {
- get => _outputsInfo;
- set => this.RaiseAndSetIfChanged(ref _outputsInfo, value);
- }
-
- public List<object> CombinedTXOInfo
- {
- get => _combinedTxOInfo;
- set => this.RaiseAndSetIfChanged(ref _combinedTxOInfo, value);
- }
-
public string TotalInputValue
{
get => _totalInputValue;
@@ -96,6 +77,17 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
get => _totalOutputValue;
set => this.RaiseAndSetIfChanged(ref _totalOutputValue, value);
}
+ public int InputCount
+ {
+ get => _inputCount;
+ set => this.RaiseAndSetIfChanged(ref _inputCount, value);
+ }
+
+ public int OutputCount
+ {
+ get => _outputCount;
+ set => this.RaiseAndSetIfChanged(ref _outputCount, value);
+ }
public static TransactionInfo FromBuildTxnResult(BuildTransactionResult result)
{
@@ -125,28 +117,15 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
var totalInValue = inputAddrMoney.Select(x => x.Amount).Sum().ToString();
var totalOutValue = outputAddrMoney.Select(x => x.Amount).Sum().ToString();
- var maxItems = Math.Max(inputAddrMoney.Count(), outputAddrMoney.Count());
- var combList = new List<object>();
-
- combList.Add(new BuildTransactionDetailsCoinViewHeader());
-
- for (int i = 0; i < maxItems; i++)
- {
- var input = inputAddrMoney.ElementAtOrDefault(i);
- var output = outputAddrMoney.ElementAtOrDefault(i);
- combList.Add(new InOutInfoTuple(input, output));
- }
-
return new TransactionInfo()
{
TransactionId = result.Transaction.GetHash().ToString(),
Confirmed = false,
DateTime = result.Transaction.FirstSeen,
- InputsInfo = inputAddrMoney,
- OutputsInfo = outputAddrMoney,
+ InputCount = inputAddrMoney.Count(),
+ OutputCount = outputAddrMoney.Count(),
TotalInputValue = totalInValue,
TotalOutputValue = totalOutValue,
- CombinedTXOInfo = combList
};
}
}

remove prototype txn address view