From 6c27e18b7921ae11c4d22d9e54c0de94c2ce8d4c Mon Sep 17 00:00:00 2001
From: songwongtp <16089160+songwongtp@users.noreply.github.com>
Date: Wed, 17 Apr 2024 15:12:27 +0700
Subject: [PATCH 1/3] fix: voted proposal freeze columns

---
 CHANGELOG.md                                             | 1 +
 .../tables/voted-proposals/VotedProposalsRow.tsx         | 9 ++++++---
 .../tables/voted-proposals/VotedProposalsTableBody.tsx   | 4 +---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c7827bf0..6ec355fbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -136,6 +136,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#885](https://github.com/alleslabs/celatone-frontend/pull/885) Fix voted proposals freeze columns
 - [#881](https://github.com/alleslabs/celatone-frontend/pull/881) Fix abi option boolean problem
 - [#877](https://github.com/alleslabs/celatone-frontend/pull/877) Fix validator list/details bug bash
 - [#874](https://github.com/alleslabs/celatone-frontend/pull/874) Fix minor proposal and validator bugs
diff --git a/src/lib/pages/validator-details/components/tables/voted-proposals/VotedProposalsRow.tsx b/src/lib/pages/validator-details/components/tables/voted-proposals/VotedProposalsRow.tsx
index 2caba5ee3..b7b8c3803 100644
--- a/src/lib/pages/validator-details/components/tables/voted-proposals/VotedProposalsRow.tsx
+++ b/src/lib/pages/validator-details/components/tables/voted-proposals/VotedProposalsRow.tsx
@@ -43,13 +43,16 @@ export const VotedProposalsTableRow = ({
       className="copier-wrapper"
       templateColumns={templateColumns}
       onClick={() => onRowSelect(votedProposal.proposalId)}
+      minW="min-content"
+      cursor="pointer"
       _hover={{
         "> div": {
-          bgColor: "gray.900",
+          bgColor:
+            votedProposal.isExpedited && isDepositOrVoting
+              ? "primary.background"
+              : "gray.900",
         },
       }}
-      transition="all 0.25s ease-in-out"
-      cursor="pointer"
     >
       <TableRowFreeze left="0">
         <ExplorerLink
diff --git a/src/lib/pages/validator-details/components/tables/voted-proposals/VotedProposalsTableBody.tsx b/src/lib/pages/validator-details/components/tables/voted-proposals/VotedProposalsTableBody.tsx
index d87222f5e..a6bd223f3 100644
--- a/src/lib/pages/validator-details/components/tables/voted-proposals/VotedProposalsTableBody.tsx
+++ b/src/lib/pages/validator-details/components/tables/voted-proposals/VotedProposalsTableBody.tsx
@@ -1,9 +1,7 @@
-import { TableContainer } from "@chakra-ui/react";
-
 import { useMobile } from "lib/app-provider";
 import { Loading } from "lib/components/Loading";
 import { EmptyState, ErrorFetching } from "lib/components/state";
-import { MobileTableContainer } from "lib/components/table";
+import { MobileTableContainer, TableContainer } from "lib/components/table";
 import type { ValidatorVotedProposalsResponse } from "lib/services/validator";
 import type { Option } from "lib/types";
 

From d1a862a3012fea75d62a50295e7cebcd0eb99860 Mon Sep 17 00:00:00 2001
From: songwongtp <16089160+songwongtp@users.noreply.github.com>
Date: Wed, 17 Apr 2024 16:02:12 +0700
Subject: [PATCH 2/3] fix: no refresh after countdown to 0

---
 .../components/proposal-overview/status-summary/Countdown.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/pages/proposal-details/components/proposal-overview/status-summary/Countdown.tsx b/src/lib/pages/proposal-details/components/proposal-overview/status-summary/Countdown.tsx
index b6805b650..49b453330 100644
--- a/src/lib/pages/proposal-details/components/proposal-overview/status-summary/Countdown.tsx
+++ b/src/lib/pages/proposal-details/components/proposal-overview/status-summary/Countdown.tsx
@@ -51,7 +51,7 @@ export const Countdown = ({ endTime, isString }: CountdownProps) => {
           </span>
         </>
       );
-      if (diffTime === 0) router.reload();
+      if (diffTime === 0) clearInterval(intervalId);
       setTime(timestamp);
     }, 1000);
     return () => clearInterval(intervalId);

From a0ba85d6f1810ffadadbe0a765457c53daf50d51 Mon Sep 17 00:00:00 2001
From: songwongtp <16089160+songwongtp@users.noreply.github.com>
Date: Wed, 17 Apr 2024 16:03:12 +0700
Subject: [PATCH 3/3] fix: reorder

---
 .../components/proposal-overview/status-summary/Countdown.tsx  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/pages/proposal-details/components/proposal-overview/status-summary/Countdown.tsx b/src/lib/pages/proposal-details/components/proposal-overview/status-summary/Countdown.tsx
index 49b453330..e5013ec7c 100644
--- a/src/lib/pages/proposal-details/components/proposal-overview/status-summary/Countdown.tsx
+++ b/src/lib/pages/proposal-details/components/proposal-overview/status-summary/Countdown.tsx
@@ -51,8 +51,9 @@ export const Countdown = ({ endTime, isString }: CountdownProps) => {
           </span>
         </>
       );
-      if (diffTime === 0) clearInterval(intervalId);
       setTime(timestamp);
+
+      if (diffTime === 0) clearInterval(intervalId);
     }, 1000);
     return () => clearInterval(intervalId);
   }, [endTime, isString, router]);