Improve the import window

Author: Coding-Enthusiast

WatchOnlyBitcoinWallet/App.axaml

@@ -18,12 +18,17 @@
     <DataTemplate DataType="{x:Type vm:AddEditViewModel}">
       <views:AddEditView/>
     </DataTemplate>
+    <DataTemplate DataType="{x:Type vm:ImportViewModel}">
+      <views:ImportView/>
+    </DataTemplate>
     <DataTemplate DataType="{x:Type vm:SettingsViewModel}">
       <views:SettingsView/>
     </DataTemplate>
   </Application.DataTemplates>
 
-  <Application.Resources>
-
-  </Application.Resources>
+  <Application.Styles>
+    <Style Selector="Button">
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+    </Style>
+  </Application.Styles>
 </Application>

WatchOnlyBitcoinWallet/Assets/Import.png

@@ -12,7 +12,7 @@
         x:CompileBindings="True"
         x:DataType="vm:MainWindowViewModel"
         Title="Watch Only Bitcoin Wallet - Version 4"
-        Height="340" Width="740"
+        Height="370" Width="740"
         CanResize="False"
         Icon="/Assets/Icon.png"
         WindowStartupLocation="CenterScreen" FontSize="14">
@@ -51,11 +51,8 @@
                   InputGesture="Alt+F4"/>
       </MenuItem>
       <MenuItem Header="_Import">
-        <MenuItem Header="From _text"
-                  Command="{Binding ImportFromTextCommand}"/>
-        <MenuItem Header="From _file"
-                  Command="{Binding ImportFromFileCommand}"
-                  ToolTip.Tip="Addresses in the file should be separated by a new line."/>
+        <MenuItem Header="From _text or file"
+                  Command="{Binding ImportCommand}"/>
       </MenuItem>
     </Menu>
 
@@ -147,6 +144,9 @@
           </Style>
         </StackPanel.Styles>
 
+        <Button ToolTip.Tip="Import (multi)" Command="{Binding ImportCommand}">
+          <Image Source="/Assets/Import.png"/>
+        </Button>
         <Button ToolTip.Tip="Add New" Command="{Binding AddCommand}">
           <Image Source="/Assets/Add.png"/>
         </Button>

WatchOnlyBitcoinWallet/MainWindow.axaml

@@ -5,63 +5,65 @@
 
 using Newtonsoft.Json;
 using System.Collections.Generic;
-using WatchOnlyBitcoinWallet.ViewModels;
+using WatchOnlyBitcoinWallet.MVVM;
 
 namespace WatchOnlyBitcoinWallet.Models
 {
-    public class BitcoinAddress : ValidatableBase
+    public class BitcoinAddress : InpcBase
     {
-        private string name;
+        public BitcoinAddress()
+        {
+        }
+
+        public BitcoinAddress(string addr, string tag)
+        {
+            Address = addr;
+            Name = tag;
+        }
+
+        private string _name = string.Empty;
         /// <summary>
         /// Name acts as a tag for the address
         /// </summary>
         public string Name
         {
-            get { return name; }
-            set { SetField(ref name, value); }
+            get => _name;
+            set => SetField(ref _name, value);
         }
 
-        private string address;
+        private string _address = string.Empty;
         public string Address
         {
-            get { return address; }
-            set
-            {
-                if (SetField(ref address, value))
-                {
-                    Validate(value);
-                }
-            }
+            get => _address;
+            set => SetField(ref _address, value);
         }
 
-        private decimal balance;
+        private decimal _balance;
         public decimal Balance
         {
-            get { return balance; }
-            set { SetField(ref balance, value); }
+            get => _balance;
+            set => SetField(ref _balance, value);
         }
 
-        private decimal difference;
+        private decimal _diff;
         [JsonIgnore]
         public decimal Difference
         {
-            get { return difference; }
-            set { SetField(ref difference, value); }
+            get => _diff;
+            set => SetField(ref _diff, value);
         }
 
-        private decimal forkBalance;
+        private decimal _forkBalance;
         /// <summary>
         /// Total balance that was available by the time of fork
         /// </summary>
         [JsonIgnore]
         public decimal ForkBalance
         {
-            get { return forkBalance; }
-            set { SetField(ref forkBalance, value); }
+            get => _forkBalance;
+            set => SetField(ref _forkBalance, value);
         }
 
-
-        public List<Transaction> TransactionList { get; set; }
-
+        public List<Transaction> TransactionList { get; set; } = new();
     }
 }

WatchOnlyBitcoinWallet/Models/BitcoinAddress.cs

@@ -63,20 +63,4 @@ public Task ShowDialog(ViewModelBase vm)
             throw new NotImplementedException();
         }
     }
-
-    public class ImportWindowManager : IWindowManager
-    {
-        public void Show(ViewModelBase ViewModel)
-        {
-            ImportWindow myWin = new ImportWindow();
-            myWin.DataContext = ViewModel;
-            ((ImportViewModel)ViewModel).ClosingRequest += (sender, e) => myWin.Close();
-            //myWin.Owner = Application.Current.MainWindow;
-            //myWin.ShowDialog();
-        }
-        public Task ShowDialog(ViewModelBase vm)
-        {
-            throw new NotImplementedException();
-        }
-    }
 }

WatchOnlyBitcoinWallet/Services/WindowManager.cs

@@ -3,40 +3,43 @@
 // Distributed under the MIT software license, see the accompanying
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
+using Autarkysoft.Bitcoin;
+using Autarkysoft.Bitcoin.Encoders;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using WatchOnlyBitcoinWallet.Models;
 using WatchOnlyBitcoinWallet.MVVM;
-using WatchOnlyBitcoinWallet.Services;
 
 namespace WatchOnlyBitcoinWallet.ViewModels
 {
     public class ImportViewModel : ViewModelBase
     {
-        public ImportViewModel()
+        /// <summary>
+        /// Make designer happy!
+        /// </summary>
+        public ImportViewModel() : this(Array.Empty<BitcoinAddress>())
         {
-            ImportCommand = new BindableCommand(CheckAndImport);
         }
 
-
-        public string Note
+        public ImportViewModel(IList<BitcoinAddress> addrList)
         {
-            get
-            {
-                return "Note: 1 address per line (seperated by a new line).";
-            }
+            addresses = addrList;
+            ImportCommand = new BindableCommand(CheckAndImport);
         }
 
 
-        public List<BitcoinAddress> AddressList { get; set; }
+        public static string Note => $"Enter 1 address per line.{Environment.NewLine}" +
+                                     $"Add the optional name at the end separated by comma.{Environment.NewLine}" +
+                                     $"Example: address,name";
 
 
-        private string importText;
-        public string ImportText
-        {
-            get { return importText; }
-            set { SetField(ref importText, value); }
-        }
+        private readonly IList<BitcoinAddress> addresses;
+        public bool IsChanged { get; private set; } = false;
+        public List<BitcoinAddress> Result { get; } = new();
+
+
+        public string ImportText { get; set; } = string.Empty;
 
 
         public BindableCommand ImportCommand { get; private set; }
@@ -49,52 +52,32 @@ private void CheckAndImport()
             }
             else
             {
-                List<BitcoinAddress> temp = new List<BitcoinAddress>();
-                int lineNum = 0;
-                foreach (var item in ImportText.SplitToLines())
+                string[] lines = ImportText.ReplaceLineEndings()
+                                           .Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+                for (int i = 0; i < lines.Length; i++)
                 {
-                    lineNum++;
-                    VerificationResult vr = ValidateAddr(item);
-                    if (vr.IsVerified)
+                    int index = lines[i].IndexOf(',');
+                    string addr = lines[i].Substring(0, index > 0 ? index : lines[i].Length);
+                    string name = index > 0 ? lines[i].Substring(index + 1).Trim() : string.Empty;
+
+                    AddressType type = Address.GetAddressType(addr, NetworkType.MainNet);
+                    if (type is AddressType.Unknown or AddressType.Invalid)
                     {
-                        temp.Add(new BitcoinAddress() { Address = item });
+                        Errors = $"Address on the {(i + 1).ToOrdinal()} line ({addr}) is invalid.";
+                        return;
                     }
-                    else
+                    else if (addresses.Any(x => x.Address == addr))
                     {
-                        Errors = string.Format("Invalid address on line {0}: {1}", lineNum, vr.Error);
-                        break;
+                        Errors = $"Wallet already contains the address on the {(i + 1).ToOrdinal()} line ({addr}).";
+                        return;
                     }
-                }
-                if (string.IsNullOrEmpty(Errors))
-                {
-                    AddressList = temp;
-                    OnClosingRequest();
-                }
-            }
-        }
-        private VerificationResult ValidateAddr(string addr)
-        {
-            VerificationResult vr = new VerificationResult();
-            if (addr.StartsWith("bc1"))
-            {
-                vr = SegWitAddress.Verify(addr, SegWitAddress.NetworkType.MainNet);
-            }
-            else
-            {
-                vr = Base58.Verify(addr);
-            }
-            return vr;
-        }
 
-        public event EventHandler ClosingRequest;
+                    Result.Add(new BitcoinAddress(addr, name));
+                }
 
-        protected void OnClosingRequest()
-        {
-            if (ClosingRequest != null)
-            {
-                ClosingRequest(this, EventArgs.Empty);
+                IsChanged = true;
+                RaiseCloseEvent();
             }
         }
-
     }
 }