no message

Kitty_Fall/Kitty_Fall/Kitty_Fall.Cms/Views/MonthlyWinner/Index.cshtml

@@ -120,7 +120,7 @@
                                             }
                                             @if (winner.Status != 3)
                                             {
-                                                <button onclick="updateWinnerStatus(@winner.WinnerId, 3)" class="font-semibold text-red-600 hover:text-red-800">Cancel</button>
+                                                <button type="button" onclick="updateWinnerStatus(@winner.WinnerId, 3)" class="font-semibold text-red-600 hover:text-red-800">Cancel</button>
                                             }
                                         </td>
                                     </tr>
@@ -161,7 +161,7 @@
                                         data-winner='@Json.Serialize(winner)'>Edit</button>
                                 <button onclick="updateWinnerStatus(@winner.WinnerId, 1)" class="font-semibold text-blue-600">Announce</button>
                                 <button onclick="updateWinnerStatus(@winner.WinnerId, 2)" class="font-semibold text-emerald-600">Paid</button>
-                                <button onclick="updateWinnerStatus(@winner.WinnerId, 3)" class="font-semibold text-red-600">Cancel</button>
+                                <button type="button" onclick="updateWinnerStatus(@winner.WinnerId, 3)" class="font-semibold text-red-600">Cancel</button>
                             </div>
                         </div>
                     }
@@ -290,6 +290,7 @@
 
         function updateWinnerStatus(winnerId, status) {
             const label = status === 1 ? 'announce this winner' : status === 2 ? 'mark this winner as paid' : 'cancel this winner';
+            const isCancel = status === 3;
             showConfirm(
                 'Update Winner Status',
                 'Are you sure you want to ' + label + '?',
@@ -307,7 +308,8 @@
                             }
                         }
                     });
-                }
+                },
+                isCancel ? { variant: 'danger', okText: 'Cancel winner' } : undefined
             );
         }
     </script>

Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/DailyWinners/Index.cshtml

@@ -4,7 +4,7 @@
     var profile = Model?.profile ?? new Common.Http.Apis.Request.UserGameActivityProfile();
     var profilePicture = string.IsNullOrWhiteSpace(profile.picture)
         ? Url.Content("~/kitty/assets/kitty-fall/default.png")
-        : Url.Content("~/kitty/assets/kitty-fall/avatar/") + profile.picture;
+        : Url.Content("~/kitty/assets/kitty-fall/") + profile.picture;
     var selectedDate = Model?.selectedDate ?? "";
     var calendarMinDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).ToString("yyyy-MM-dd");
     var calendarMaxDate = DateTime.Now.ToString("yyyy-MM-dd");

Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Guide/Index.cshtml

@@ -4,7 +4,7 @@
     var profile = Model ?? new Common.Http.Apis.Request.UserGameActivityProfile();
     var profilePicture = string.IsNullOrWhiteSpace(profile.picture)
         ? Url.Content("~/kitty/assets/kitty-fall/default.png")
-        : Url.Content("~/kitty/assets/kitty-fall/avatar/") + profile.picture;
+        : Url.Content("~/kitty/assets/kitty-fall/") + profile.picture;
 }
 
 <main class="kitty-app is-winner-screen is-guide-screen" aria-label="@Lang.GuideAriaLabel">

Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/History/Index.cshtml

@@ -4,7 +4,7 @@
     var profile = Model?.profile ?? new Common.Http.Apis.Request.UserGameActivityProfile();
     var profilePicture = string.IsNullOrWhiteSpace(profile.picture)
         ? Url.Content("~/kitty/assets/kitty-fall/default.png")
-        : Url.Content("~/kitty/assets/kitty-fall/avatar/") + profile.picture;
+        : Url.Content("~/kitty/assets/kitty-fall/") + profile.picture;
     var pageNumber = Model?.pageNumber > 0 ? Model.pageNumber : 1;
     var totalPage = Model?.totalPage ?? 0;
     var fromDate = Model?.fromDate ?? "";

Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Home/Index.cshtml

@@ -3,7 +3,7 @@
     var msisdn = ViewBag.Msisdn as string;
     var profilePicture = ViewBag.ProfilePicture as string;
     var fullName = ViewBag.FullName as string;
-    var avatarUrl = string.IsNullOrWhiteSpace(profilePicture) ? Url.Content("~/kitty/assets/kitty-fall/default.png") : Url.Content("~/kitty/assets/kitty-fall/avatar/") + profilePicture;
+    var avatarUrl = string.IsNullOrWhiteSpace(profilePicture) ? Url.Content("~/kitty/assets/kitty-fall/default.png") : Url.Content("~/kitty/assets/kitty-fall/") + profilePicture;
     var totalPoint = ViewBag.TotalPoint is null ? 0L : Convert.ToInt64(ViewBag.TotalPoint);
     var totalTurn = ViewBag.TotalTurn is null ? 0L : Convert.ToInt64(ViewBag.TotalTurn);
     var packageFee = ViewBag.PackageFee is null ? 179M : Convert.ToDecimal(ViewBag.PackageFee);

Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Leaderboard/Index.cshtml

@@ -5,7 +5,7 @@
     var currentUser = Model?.currentUser ?? new Common.Http.Apis.Request.UserLeaderboardCurrentUser();
     var profilePicture = string.IsNullOrWhiteSpace(profile.picture)
         ? Url.Content("~/kitty/assets/kitty-fall/default.png")
-        : Url.Content("~/kitty/assets/kitty-fall/avatar/") + profile.picture;
+        : Url.Content("~/kitty/assets/kitty-fall/") + profile.picture;
     var pageNumber = Model?.pageNumber > 0 ? Model.pageNumber : 1;
     var totalPage = Model?.totalPage ?? 0;
     var startPage = totalPage <= 5 ? 1 : Math.Max(1, Math.Min(pageNumber - 2, totalPage - 4));

Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/MonthlyWinners/Index.cshtml

@@ -4,7 +4,7 @@
     var profile = Model?.profile ?? new Common.Http.Apis.Request.UserGameActivityProfile();
     var profilePicture = string.IsNullOrWhiteSpace(profile.picture)
         ? Url.Content("~/kitty/assets/kitty-fall/default.png")
-        : Url.Content("~/kitty/assets/kitty-fall/avatar/") + profile.picture;
+        : Url.Content("~/kitty/assets/kitty-fall/") + profile.picture;
 }
 
 <main class="kitty-app is-winner-screen is-monthly-winner-screen" aria-label="@Lang.MonthlyWinnerList">

Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Play/Index.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Kitty Fall - Play";
     var avatarUrl = string.IsNullOrWhiteSpace(Model.ProfilePicture)
         ? Url.Content("~/kitty/assets/kitty-fall/default.png")
-        : Url.Content("~/kitty/assets/kitty-fall/avatar/") + Model.ProfilePicture;
+        : Url.Content("~/kitty/assets/kitty-fall/") + Model.ProfilePicture;
 }
 
 <main class="kitty-app is-play-screen" aria-label="Kitty Fall play screen"

Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Shared/_Layout.cshtml

@@ -31,7 +31,7 @@
     var accountFullName = Context.Session.GetComplexData<string>("fullName") ?? "";
     var accountAvatar = string.IsNullOrWhiteSpace(accountProfilePicture)
         ? Url.Content("~/kitty/assets/kitty-fall/default.png")
-        : Url.Content("~/kitty/assets/kitty-fall/avatar/") + accountProfilePicture;
+        : Url.Content("~/kitty/assets/kitty-fall/") + accountProfilePicture;
     var accountScore = Context.Session.GetComplexData<long?>("totalPoint") ?? 0;
     var accountDataMb = Context.Session.GetComplexData<decimal?>("totalDataMb") ?? 0;
     var accountLoyalty = Context.Session.GetComplexData<decimal?>("totalLoyaltyPoints") ?? 0;

Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Winner/Index.cshtml

@@ -4,7 +4,7 @@
     var profile = Model ?? new Common.Http.Apis.Request.UserGameActivityProfile();
     var profilePicture = string.IsNullOrWhiteSpace(profile.picture)
         ? Url.Content("~/kitty/assets/kitty-fall/default.png")
-        : Url.Content("~/kitty/assets/kitty-fall/avatar/") + profile.picture ;
+        : Url.Content("~/kitty/assets/kitty-fall/") + profile.picture ;
 }
 
 <main class="kitty-app is-winner-screen" aria-label="@Lang.WinnerList">