From e693e40d1f881e80cec466b42d7355ce1066e619 Mon Sep 17 00:00:00 2001
From: Atatakai <atatakai@Atatakais-MacBook-Pro.local>
Date: Thu, 1 Aug 2024 10:58:24 +0400
Subject: [PATCH 1/2] (govern) fix: update state after voting, fix rollover
 pool sorting, add next week explanation

---
 apps/govern/common-util/constants/scopeKeys.ts   |  2 ++
 .../components/Contracts/ContractsList.tsx       | 10 ++--------
 .../Contracts/EditVotes/index.spec.tsx           |  3 ++-
 .../components/Contracts/EditVotes/index.tsx     |  4 +++-
 .../Contracts/MyVotingWeight/Votes.tsx           | 10 +++-------
 apps/govern/components/NextWeekTooltip.tsx       | 16 ++++++++++++++--
 .../govern/hooks/useFetchStakingContractsList.ts |  3 ++-
 apps/govern/store/govern.ts                      |  4 +---
 8 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/apps/govern/common-util/constants/scopeKeys.ts b/apps/govern/common-util/constants/scopeKeys.ts
index 56095b15..495444d3 100644
--- a/apps/govern/common-util/constants/scopeKeys.ts
+++ b/apps/govern/common-util/constants/scopeKeys.ts
@@ -3,6 +3,7 @@ export const VOTE_USER_POWER_KEY = 'voteUserPower';
 export const NEXT_USERS_SLOPES_KEY = 'nextUserSlopes';
 export const NEXT_RELATIVE_WEIGHTS_KEY = 'nextRelativeWeights';
 export const LATEST_BLOCK_KEY = 'latestBlock';
+export const TIME_SUM_KEY = 'timeSum';
 
 export const INVALIDATE_AFTER_UPDATE_KEYS = [
   LAST_USER_VOTE_KEY,
@@ -10,6 +11,7 @@ export const INVALIDATE_AFTER_UPDATE_KEYS = [
   NEXT_USERS_SLOPES_KEY,
   NEXT_RELATIVE_WEIGHTS_KEY,
   LATEST_BLOCK_KEY,
+  TIME_SUM_KEY,
 ];
 
 export const INVALIDATE_AFTER_ACCOUNT_CHANGE = [
diff --git a/apps/govern/components/Contracts/ContractsList.tsx b/apps/govern/components/Contracts/ContractsList.tsx
index 5e7870b2..4c0249bb 100644
--- a/apps/govern/components/Contracts/ContractsList.tsx
+++ b/apps/govern/components/Contracts/ContractsList.tsx
@@ -1,11 +1,10 @@
-import { CheckOutlined, InfoCircleOutlined, PlusOutlined } from '@ant-design/icons';
+import { CheckOutlined, PlusOutlined } from '@ant-design/icons';
 import { Button, Card as CardAntd, Space, Table, Typography } from 'antd';
 import { ColumnsType } from 'antd/es/table';
 import styled from 'styled-components';
 import { Allocation, StakingContract } from 'types';
 import { useAccount } from 'wagmi';
 
-import { COLOR } from 'libs/ui-theme/src';
 import { CHAIN_NAMES } from 'libs/util-constants/src';
 
 import { formatWeiBalance } from 'common-util/functions/balance';
@@ -65,12 +64,7 @@ const getColumns = ({
       ),
     },
     {
-      title: (
-        <NextWeekTooltip>
-          Next week&apos;s weight
-          <InfoCircleOutlined className="ml-8" style={{ color: COLOR.GREY_2 }} />
-        </NextWeekTooltip>
-      ),
+      title: <NextWeekTooltip>Next week&apos;s weight</NextWeekTooltip>,
       key: 'nextWeight',
       dataIndex: 'nextWeight',
       render: (nextWeight) => (
diff --git a/apps/govern/components/Contracts/EditVotes/index.spec.tsx b/apps/govern/components/Contracts/EditVotes/index.spec.tsx
index c5ee8b44..10e46f26 100644
--- a/apps/govern/components/Contracts/EditVotes/index.spec.tsx
+++ b/apps/govern/components/Contracts/EditVotes/index.spec.tsx
@@ -88,8 +88,9 @@ describe('<EditVotes />', () => {
     expect(screen.getByText('My voting weight')).toBeInTheDocument();
 
     expect(
-      screen.getByText(/New voting weight will take effect at the beginning of the next week./),
+      screen.getByText(/Updated voting weights will take effect at the start of/),
     ).toBeInTheDocument();
+    expect(screen.getByText(/next Unix time week./)).toBeInTheDocument();
   });
 
   describe('Voting contract row', () => {
diff --git a/apps/govern/components/Contracts/EditVotes/index.tsx b/apps/govern/components/Contracts/EditVotes/index.tsx
index b1f5e488..2789bcb2 100644
--- a/apps/govern/components/Contracts/EditVotes/index.tsx
+++ b/apps/govern/components/Contracts/EditVotes/index.tsx
@@ -13,6 +13,7 @@ import { RETAINER_ADDRESS } from 'common-util/constants/addresses';
 import { INVALIDATE_AFTER_UPDATE_KEYS } from 'common-util/constants/scopeKeys';
 import { getBytes32FromAddress } from 'common-util/functions/addresses';
 import { voteForNomineeWeights } from 'common-util/functions/requests';
+import { NextWeekTooltip } from 'components/NextWeekTooltip';
 import { queryClient } from 'context/Web3ModalProvider';
 import { clearState } from 'store/govern';
 import { useAppDispatch, useAppSelector } from 'store/index';
@@ -218,7 +219,8 @@ export const EditVotes = ({ allocations, setAllocations, setIsUpdating }: EditVo
       />
 
       <Paragraph type="secondary" className="text-end">
-        New voting weight will take effect at the beginning of the next week.
+        Updated voting weights will take effect at the start of&nbsp;
+        <NextWeekTooltip hideDescription>next Unix time week.</NextWeekTooltip>
       </Paragraph>
       <Flex gap={12} justify="flex-end">
         <Button size="large" onClick={onCancel}>
diff --git a/apps/govern/components/Contracts/MyVotingWeight/Votes.tsx b/apps/govern/components/Contracts/MyVotingWeight/Votes.tsx
index a0389197..64fa841c 100644
--- a/apps/govern/components/Contracts/MyVotingWeight/Votes.tsx
+++ b/apps/govern/components/Contracts/MyVotingWeight/Votes.tsx
@@ -77,11 +77,7 @@ const columns: ColumnsType<MyVote> = [
     render: (currentWeight) => <Text>{`${currentWeight}%`}</Text>,
   },
   {
-    title: (
-      <NextWeekTooltip>
-        My updated weight <InfoCircleOutlined className="ml-8" style={{ color: COLOR.GREY_2 }} />
-      </NextWeekTooltip>
-    ),
+    title: <NextWeekTooltip>My updated weight</NextWeekTooltip>,
     key: 'nextWeight',
     dataIndex: 'nextWeight',
     render: (nextWeight) => <Text>{`${nextWeight}%`}</Text>,
@@ -155,8 +151,8 @@ export const Votes = ({ setIsUpdating, setAllocations }: VotesProps) => {
         });
       }
       return res.sort((item) =>
-        // put Rollover address at the end
-        item.address === getBytes32FromAddress(RETAINER_ADDRESS) ? 1 : -1,
+        // put Rollover pool at the end
+        item.isRetainer ? 1 : -1,
       );
     }, []);
   }, [userVotes, stakingContracts]);
diff --git a/apps/govern/components/NextWeekTooltip.tsx b/apps/govern/components/NextWeekTooltip.tsx
index 60f5cc55..2c1716b2 100644
--- a/apps/govern/components/NextWeekTooltip.tsx
+++ b/apps/govern/components/NextWeekTooltip.tsx
@@ -1,3 +1,4 @@
+import { InfoCircleOutlined } from '@ant-design/icons';
 import { Space, Tooltip, Typography } from 'antd';
 import { ReactNode } from 'react';
 import { mainnet } from 'viem/chains';
@@ -10,14 +11,24 @@ const { Text } = Typography;
 
 const TOOLTIP_STYLE = { maxWidth: '350px' };
 
-export const NextWeekTooltip = ({ children }: { children: ReactNode }) => {
+export const NextWeekTooltip = ({
+  children,
+  hideDescription = false,
+}: {
+  children: ReactNode;
+  hideDescription?: boolean;
+}) => {
   return (
     <Tooltip
       color={COLOR.WHITE}
       overlayStyle={TOOLTIP_STYLE}
       title={
         <Space direction="vertical">
-          <Text>Updated voting weights will take effect at the start of next week Unix time.</Text>
+          {!hideDescription && (
+            <Text>
+              Updated voting weights will take effect at the start of next Unix time week.
+            </Text>
+          )}
           <a
             href={`https://etherscan.io/address/${
               VOTE_WEIGHTING.addresses[mainnet.id]
@@ -31,6 +42,7 @@ export const NextWeekTooltip = ({ children }: { children: ReactNode }) => {
       }
     >
       {children}
+      <InfoCircleOutlined className="ml-8" style={{ color: COLOR.GREY_2 }} />
     </Tooltip>
   );
 };
diff --git a/apps/govern/hooks/useFetchStakingContractsList.ts b/apps/govern/hooks/useFetchStakingContractsList.ts
index df8d80da..8c779ce0 100644
--- a/apps/govern/hooks/useFetchStakingContractsList.ts
+++ b/apps/govern/hooks/useFetchStakingContractsList.ts
@@ -7,7 +7,7 @@ import { useReadContract } from 'wagmi';
 import { VOTE_WEIGHTING } from 'libs/util-contracts/src/lib/abiAndAddresses';
 
 import { RETAINER_ADDRESS } from 'common-util/constants/addresses';
-import { NEXT_RELATIVE_WEIGHTS_KEY } from 'common-util/constants/scopeKeys';
+import { NEXT_RELATIVE_WEIGHTS_KEY, TIME_SUM_KEY } from 'common-util/constants/scopeKeys';
 import { getBytes32FromAddress } from 'common-util/functions';
 import { setStakingContracts } from 'store/govern';
 import { useAppDispatch, useAppSelector } from 'store/index';
@@ -39,6 +39,7 @@ export const useFetchStakingContractsList = () => {
     abi: VOTE_WEIGHTING.abi,
     chainId: mainnet.id,
     functionName: 'timeSum',
+    scopeKey: TIME_SUM_KEY,
     query: {
       select: (data) => Number(data),
     },
diff --git a/apps/govern/store/govern.ts b/apps/govern/store/govern.ts
index 114af2a1..2d6f79e3 100644
--- a/apps/govern/store/govern.ts
+++ b/apps/govern/store/govern.ts
@@ -34,9 +34,7 @@ export const governSlice = createSlice({
     setLastUserVote: (state, action: PayloadAction<GovernState['lastUserVote']>) => {
       state.lastUserVote = action.payload;
     },
-    clearState: (state) => {
-      state = { ...initialState };
-    },
+    clearState: () => initialState,
     clearUserState: (state) => {
       state.userVotes = initialState.userVotes;
       state.isUserVotesLoading = true;

From 1321d5b2e3ac94ea0e24dc4d42d3ca8b57369fbc Mon Sep 17 00:00:00 2001
From: Atatakai <atatakai@Atatakais-MacBook-Pro.local>
Date: Thu, 1 Aug 2024 13:03:14 +0400
Subject: [PATCH 2/2] (govern) fix: review fixes

---
 .../Contracts/EditVotes/index.spec.tsx          |  5 +++--
 .../components/Contracts/EditVotes/index.tsx    |  4 +---
 apps/govern/components/NextWeekTooltip.tsx      | 17 +++++------------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/apps/govern/components/Contracts/EditVotes/index.spec.tsx b/apps/govern/components/Contracts/EditVotes/index.spec.tsx
index 10e46f26..363a102c 100644
--- a/apps/govern/components/Contracts/EditVotes/index.spec.tsx
+++ b/apps/govern/components/Contracts/EditVotes/index.spec.tsx
@@ -88,9 +88,10 @@ describe('<EditVotes />', () => {
     expect(screen.getByText('My voting weight')).toBeInTheDocument();
 
     expect(
-      screen.getByText(/Updated voting weights will take effect at the start of/),
+      screen.getByText(
+        /Updated voting weights will take effect at the start of next week \(according to Unix time\)./,
+      ),
     ).toBeInTheDocument();
-    expect(screen.getByText(/next Unix time week./)).toBeInTheDocument();
   });
 
   describe('Voting contract row', () => {
diff --git a/apps/govern/components/Contracts/EditVotes/index.tsx b/apps/govern/components/Contracts/EditVotes/index.tsx
index 2789bcb2..f04a278b 100644
--- a/apps/govern/components/Contracts/EditVotes/index.tsx
+++ b/apps/govern/components/Contracts/EditVotes/index.tsx
@@ -13,7 +13,6 @@ import { RETAINER_ADDRESS } from 'common-util/constants/addresses';
 import { INVALIDATE_AFTER_UPDATE_KEYS } from 'common-util/constants/scopeKeys';
 import { getBytes32FromAddress } from 'common-util/functions/addresses';
 import { voteForNomineeWeights } from 'common-util/functions/requests';
-import { NextWeekTooltip } from 'components/NextWeekTooltip';
 import { queryClient } from 'context/Web3ModalProvider';
 import { clearState } from 'store/govern';
 import { useAppDispatch, useAppSelector } from 'store/index';
@@ -219,8 +218,7 @@ export const EditVotes = ({ allocations, setAllocations, setIsUpdating }: EditVo
       />
 
       <Paragraph type="secondary" className="text-end">
-        Updated voting weights will take effect at the start of&nbsp;
-        <NextWeekTooltip hideDescription>next Unix time week.</NextWeekTooltip>
+        Updated voting weights will take effect at the start of next week (according to Unix time).
       </Paragraph>
       <Flex gap={12} justify="flex-end">
         <Button size="large" onClick={onCancel}>
diff --git a/apps/govern/components/NextWeekTooltip.tsx b/apps/govern/components/NextWeekTooltip.tsx
index 2c1716b2..a09526cc 100644
--- a/apps/govern/components/NextWeekTooltip.tsx
+++ b/apps/govern/components/NextWeekTooltip.tsx
@@ -11,24 +11,17 @@ const { Text } = Typography;
 
 const TOOLTIP_STYLE = { maxWidth: '350px' };
 
-export const NextWeekTooltip = ({
-  children,
-  hideDescription = false,
-}: {
-  children: ReactNode;
-  hideDescription?: boolean;
-}) => {
+export const NextWeekTooltip = ({ children }: { children: ReactNode }) => {
   return (
     <Tooltip
       color={COLOR.WHITE}
       overlayStyle={TOOLTIP_STYLE}
       title={
         <Space direction="vertical">
-          {!hideDescription && (
-            <Text>
-              Updated voting weights will take effect at the start of next Unix time week.
-            </Text>
-          )}
+          <Text>
+            Updated voting weights will take effect at the start of next week (according to Unix
+            time).
+          </Text>
           <a
             href={`https://etherscan.io/address/${
               VOTE_WEIGHTING.addresses[mainnet.id]