Некоторые изменения и дополнения

x42Gui/Classes/ApiClient.cs

@@ -91,6 +91,21 @@ public async Task<IEnumerable<string>> GetAccountsInWallet(string walletName)
             }
         }
 
+        internal async Task<long> GetBlockCount()
+        {
+            try
+            {
+                Error = String.Empty;
+                Url url = new Url(ApiUrl).AppendPathSegments("blockstore/getblockcount");
+                return await url.GetJsonAsync<long>();
+            }
+            catch (Exception ex)
+            {
+                Error = ex.Message;
+                return -1;
+            }
+        }
+
         internal async Task<WalletHistoryModel> GetHistory(string walletName, string accountName = null)
         {
             try

x42Gui/Classes/Common.cs

@@ -6,12 +6,15 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using x42Gui.Models;
 
 namespace x42Gui.Classes
 {
     public class Common
     {
+
+
         internal static UserSettings CurrentSettings = null;
 
         internal static string LastError;
@@ -30,6 +33,54 @@ public class Common
         /// </summary>
         internal static List<AddressesModel> Addresses = null;
 
+        internal static string NetworkFolder
+        {
+            get
+            {
+                string name = "x42";
+
+                if (CurrentSettings.IsStratis)
+                {
+                    name = "Stratis";
+                }
+
+                if (CurrentSettings.Mainnet)
+                {
+                    name += "Main";
+                }
+                else
+                {
+                    name += "Test";
+                }
+
+                string path = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), name);
+
+                if (!Directory.Exists(path))
+                {
+                    Directory.CreateDirectory(path);
+                }
+
+                return path;
+            }
+        }
+
+        internal static string AddressesFile
+        {
+            get
+            {
+                return Path.Combine(Common.NetworkFolder, Constants.AddressesFileName);
+            }
+        }
+
+        internal static string WalletHistoryFile
+        {
+            get
+            {
+                return Path.Combine(Common.NetworkFolder, Constants.HistoryFileName);
+            }
+        }
+
+
         internal static async Task<bool> LoadLocalWallets()
         {
             LastError = String.Empty;

x42Gui/Forms/OptionsForm.resx

@@ -140,9 +140,6 @@
         LBJPBwODCRerKaiRfzKZv4evJLxyK100AAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="buttonFromX42.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL

x42Gui/Forms/TransactionDetailsForm.cs

@@ -12,13 +12,28 @@ public partial class TransactionDetailsForm : Form
         string Status;
         Money Fee;
 
-        public TransactionDetailsForm(HistoryRecord trans)
+        public TransactionDetailsForm(HistoryRecord trans, long blockCount)
         {
             InitializeComponent();
 
+            string confirmation=String.Empty;
+
             StringBuilder sb = new StringBuilder();
             //TODO это не число подтверждений а в каком блоке включена транзакция
-            Status = trans.ConfirmedInBlock == null ? "not in block" : $"in {trans.ConfirmedInBlock} block";
+            // Status = trans.ConfirmedInBlock == null ? "not in block" : $"in {trans.ConfirmedInBlock} block";
+            if (trans.ConfirmedInBlock == null)
+            {
+                Status = "not in block";
+            }
+            else
+            {
+                if (blockCount > 0)
+                {
+                    confirmation =$", {blockCount - (long)trans.ConfirmedInBlock} confirmations";
+                }
+
+                Status = $"in {trans.ConfirmedInBlock} block {confirmation}";
+            }
 
             sb.AppendLine($"Status: {Status}");
             sb.AppendLine($"Date: {trans.Timestamp.DateTime}");