update client to v1.0.16

atomex-me · Dec 9, 2019 · 430dbc6 · 430dbc6
1 parent 2eb2b18
commit 430dbc6
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 13 deletions.
diff --git a/Atomex.Client.Wpf.Installer/Product.wxs b/Atomex.Client.Wpf.Installer/Product.wxs
@@ -3,7 +3,7 @@
 <?define Name = "Atomex Client" ?>
 <?define Manufacturer = "Atomex.me" ?>
 <?define Description = "Multicurrency HD wallet with built-in hybrid exchange based on atomic swap." ?>
-<?define Version = "1.0.15" ?>
+<?define Version = "1.0.16" ?>
 <?define UpgradeCode = "DB7FCF8D-E0C6-4C99-A6B1-3FB6D703F97E" ?>
 <?define ExeName = "Atomex.Client.Wpf.exe" ?>
 

diff --git a/Atomex.Client.Wpf/ViewModels/SendViewModels/DelegateViewModel.cs b/Atomex.Client.Wpf/ViewModels/SendViewModels/DelegateViewModel.cs
@@ -22,6 +22,17 @@
 
 namespace Atomex.Client.Wpf.ViewModels.SendViewModels
 {
+    public class WalletAddressViewModel
+    {
+        public WalletAddress WalletAddress { get; set; }
+
+        public string Address => WalletAddress.Address;
+        public decimal AvailableBalance => WalletAddress.AvailableBalance();
+
+        public WalletAddressViewModel(WalletAddress walletAddress) =>
+            WalletAddress = walletAddress;
+    }
+
     public class DelegateViewModel : BaseViewModel
     {
         private IAtomexApp App { get; }
@@ -54,16 +65,16 @@ private set
             }
         }
 
-        private List<WalletAddress> _fromAddressList;
-        public List<WalletAddress> FromAddressList
+        private List<WalletAddressViewModel> _fromAddressList;
+        public List<WalletAddressViewModel> FromAddressList
         {
             get => _fromAddressList;
             private set 
             {
                 _fromAddressList = value;
                 OnPropertyChanged(nameof(FromAddressList));
 
-                WalletAddress = FromAddressList.FirstOrDefault();
+                WalletAddress = FromAddressList.FirstOrDefault().WalletAddress;
             }
         }
 
@@ -295,6 +306,7 @@ private async Task PrepareWallet(CancellationToken cancellationToken = default)
             FromAddressList = (await App.Account
                 .GetUnspentAddressesAsync(_tezos, cancellationToken).ConfigureAwait(false))
                 .OrderByDescending(x => x.Balance)
+                .Select(w => new WalletAddressViewModel(w))
                 .ToList();
 
             if (!FromAddressList?.Any() ?? false)
@@ -303,7 +315,7 @@ private async Task PrepareWallet(CancellationToken cancellationToken = default)
                 return;
             }
 
-            WalletAddress = FromAddressList.FirstOrDefault();
+            WalletAddress = FromAddressList.FirstOrDefault().WalletAddress;
         }
 
         private async Task<Result<string>> SendDelegation(CancellationToken cancellationToken = default)

diff --git a/Atomex.Client.Wpf/Views/SendViews/DelegatePage.xaml b/Atomex.Client.Wpf/Views/SendViews/DelegatePage.xaml
@@ -14,15 +14,16 @@
       UseLayoutRounding="True"
       Focusable="False"
       d:DesignHeight="500"
-      d:DesignWidth="560"   
+      d:DesignWidth="600"
       d:DataContext="{d:DesignInstance Type=viewModels:DelegateViewModel, IsDesignTimeCreatable=True}">
     <Page.Resources>
+        <SolidColorBrush x:Key="AmountBrush" Color="#ffa500"/>
         <converters:InverseBooleanConverter x:Key="InverseBooleanConverter" />
         <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" FalseEquivalent="Collapsed" />
     </Page.Resources>
 
     <StackPanel Orientation="Vertical"
-                Width="560">
+                Width="600">
 
         <Border Margin="0 10 0 10"
                 Height="33"
@@ -45,7 +46,7 @@
                    TextWrapping="Wrap"
                    HorizontalAlignment="Center"/>
 
-        <ComboBox Width="480"
+        <ComboBox Width="510"
                   MinHeight="68"
                   Margin="0 5 0 5"
                   ItemsSource="{Binding FromBakersList}"
@@ -64,13 +65,14 @@
                            VerticalAlignment="Center"
                            HorizontalAlignment="Right"/>
             </Border>
-            <TextBox Width="380"
+            <TextBox Width="410"
                      Height="40"
                      Margin="0 5 0 5"
                      Text="{Binding Address, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                      Background="{StaticResource DefaultSubstrateBrush}"
                      Foreground="{StaticResource DefaultForegroundBrush}"
                      helpers:TextBoxHelper.CornerRadius="0 20 20 0"
+                     FontFamily="Roboto"
                      Style="{StaticResource CustomTextBox}"/>
         </StackPanel>
 
@@ -85,16 +87,38 @@
                            VerticalAlignment="Center"
                            HorizontalAlignment="Right"/>
             </Border>
-            <ComboBox Width="380"
+            <ComboBox Width="410"
                      Height="40"
                      Margin="0 5 0 5"
                      ItemsSource="{Binding FromAddressList}"
-                     DisplayMemberPath="Address"
+                     SelectedValuePath="WalletAddress"
                      SelectedValue="{Binding WalletAddress, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
                      Background="{StaticResource DefaultSubstrateBrush}"
                      Foreground="{StaticResource DefaultForegroundBrush}"
                      helpers:ComboBoxHelper.CornerRadius="0 20 20 0"
-                     Style="{StaticResource CustomComboBox}"/>
+                     Style="{StaticResource CustomComboBox}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate DataType="{x:Type ComboBoxItem}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="3 0 0 0"
+                                Text="{Binding Address}"
+                                Foreground="{StaticResource DefaultForegroundBrush}"
+                                FontSize="12"
+                                FontFamily="{StaticResource Roboto}"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"/>
+                            <TextBlock
+                                Margin="10 0 0 0"
+                                Text="{Binding AvailableBalance, StringFormat=0.000000}"
+                                Foreground="{StaticResource AmountBrush}"
+                                FontSize="12"
+                                FontFamily="{StaticResource Roboto}"
+                                 VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
         </StackPanel>
 
         <StackPanel Orientation="Horizontal"
@@ -114,7 +138,7 @@
                            HorizontalAlignment="Right"/>
             </Border>
 
-            <TextBox Width="380"
+            <TextBox Width="410"
                      Height="40"
                      Margin="0 5 0 5"
                      FontSize="18"