From bebb5ee69202af6767f1fba41e06f470fbb1a333 Mon Sep 17 00:00:00 2001
From: Michael Shabanov <shabanov.mikhail@gmail.com>
Date: Mon, 25 Oct 2021 15:44:06 +0300
Subject: [PATCH] fix: utc time to local time

---
 .../Helpers/DateDifferenceHelper.cs                  | 12 ++++++++++++
 .../Pages/PlayerInfoLayout.razor                     |  2 +-
 WotBlitzStatisticsPro.Blazor/Program.cs              |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/WotBlitzStatisticsPro.Blazor/Helpers/DateDifferenceHelper.cs b/WotBlitzStatisticsPro.Blazor/Helpers/DateDifferenceHelper.cs
index 639c02f..d8898c0 100644
--- a/WotBlitzStatisticsPro.Blazor/Helpers/DateDifferenceHelper.cs
+++ b/WotBlitzStatisticsPro.Blazor/Helpers/DateDifferenceHelper.cs
@@ -6,6 +6,12 @@ namespace WotBlitzStatisticsPro.Blazor.Helpers
 {
     public static class DateDifferenceHelper
     {
+        public static DateTime ConvertToLocalTime(this DateTimeOffset dateToConvert)
+        {
+            var specifiedTimeConvert = DateTime.SpecifyKind(dateToConvert.DateTime, DateTimeKind.Utc);
+            return specifiedTimeConvert.ToLocalTime();
+        }
+
         public static string SinceTime(this int timeInLinuxTimeStamp, IStringLocalizer<App> localizer)
         {
             var currentDate = DateTime.Now;
@@ -25,6 +31,11 @@ namespace WotBlitzStatisticsPro.Blazor.Helpers
         }
 
         public static string SinceTime(this DateTimeOffset time, IStringLocalizer<App> localizer)
+        {
+            return time.DateTime.SinceTime(localizer);
+        }
+
+        public static string SinceTime(this DateTime time, IStringLocalizer<App> localizer)
         {
             var currentDate = DateTime.Now;
 
@@ -41,6 +52,7 @@ namespace WotBlitzStatisticsPro.Blazor.Helpers
             return $"{difference.value} {ago}";
         }
 
+
         public static (int value, TimeInterval interval) ParseTheDifference(TimeSpan difference)
         {
             if (difference.TotalHours < 1)
diff --git a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor
index 81356f6..dfaa1a4 100644
--- a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor
+++ b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor
@@ -17,7 +17,7 @@
             <small>@Localize["Created"]: <b>@AccountInfo.CreatedAt.ToString("d") | @AccountInfo.CreatedAt.SinceTime(Localize)</b></small>
         </div>
         <div>
-            @Localize["Last battle"]: <b>@AccountInfo.LastBattleTime.ToString("g") | @AccountInfo.LastBattleTime.SinceTime(Localize)</b>
+            @Localize["Last battle"]: <b>@AccountInfo.LastBattleTime.ConvertToLocalTime().ToString("g") | @AccountInfo.LastBattleTime.ConvertToLocalTime().SinceTime(Localize)</b>
         </div>
     </div>
     <RadzenTabs >
diff --git a/WotBlitzStatisticsPro.Blazor/Program.cs b/WotBlitzStatisticsPro.Blazor/Program.cs
index 1bd9636..e9d8343 100644
--- a/WotBlitzStatisticsPro.Blazor/Program.cs
+++ b/WotBlitzStatisticsPro.Blazor/Program.cs
@@ -51,11 +51,11 @@ namespace WotBlitzStatisticsPro.Blazor
             //var useMock = Environment.GetEnvironmentVariable("USE_GRAPH_QL_MOCK");
             //if (useMock != null && useMock == "true")
             //{
-            //builder.Services.AddTransient<IGraphQlBackendService, GraphQlBackendMockService>();
+            builder.Services.AddTransient<IGraphQlBackendService, GraphQlBackendMockService>();
             //}
             //else
             //{
-            builder.Services.AddTransient<IGraphQlBackendService, GraphQlBackendService>();
+            //builder.Services.AddTransient<IGraphQlBackendService, GraphQlBackendService>();
             //}
 
             var host = builder.Build();