wip(gov): refactor

vitwit · Nov 25, 2023 · c93a206 · c93a206
1 parent 6e3bfd0
commit c93a206
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 17 deletions.
diff --git a/frontend/src/store/features/gov/govService.ts b/frontend/src/store/features/gov/govService.ts
@@ -1,5 +1,6 @@
 import Axios, { AxiosResponse } from 'axios';
 import { convertPaginationToParams, cleanURL } from '../../../utils/util';
+import { GetProposalsInVotingResponse, ProposalVote } from '@/types/gov';
 
 const proposalsURL = '/cosmos/gov/v1beta1/proposals';
 const proposalTallyURL = (id: string): string =>
@@ -32,7 +33,7 @@ const fetchProposalTally = (
   baseURL: string,
   proposalId: string
 ): Promise<AxiosResponse> => {
-  let uri = `${cleanURL(baseURL)}${proposalTallyURL(proposalId)}`;
+  const uri = `${cleanURL(baseURL)}${proposalTallyURL(proposalId)}`;
   return Axios.get(uri);
 };
 

diff --git a/frontend/src/store/features/gov/govSlice.ts b/frontend/src/store/features/gov/govSlice.ts
@@ -6,10 +6,18 @@ import { cloneDeep } from 'lodash';
 import { AxiosError } from 'axios';
 import { ERR_UNKNOWN } from '@/utils/errors';
 import { TxStatus } from '@/types/enums';
+import {
+  ActiveProposal,
+  GetProposalTallyInputs,
+  GetProposalsInVotingInputs,
+  GetVotesInputs,
+  ProposalTallyData,
+  VotesData,
+} from '@/types/gov';
 
 interface Chain {
   active: {
-    status: string;
+    status: TxStatus;
     errMsg: string;
     proposals: ActiveProposal[];
   };
@@ -140,23 +148,32 @@ export const govSlice = createSlice({
       .addCase(getProposalsInVoting.fulfilled, (state, action) => {
         const chainID = action.payload?.chainID || '';
         if (chainID.length > 0) {
-          let result = {
-            status: 'idle',
+          const result = {
+            status: TxStatus.IDLE,
             errMsg: '',
             proposals: action.payload?.data?.proposals,
           };
           state.chains[chainID].active = result;
         }
       })
-      .addCase(getProposalsInVoting.rejected, (state, action) => {});
+      .addCase(getProposalsInVoting.rejected, (state, action) => {
+        const chainID = action.meta?.arg?.chainID;
+        const chainProposals = state.chains[chainID].active.proposals || {};
+        const result = {
+          status: TxStatus.REJECTED,
+          errMsg: action.error.message || '',
+          proposals: chainProposals,
+        };
+        state.chains[chainID].active = result;
+      });
 
     // votes
     builder
       .addCase(getVotes.pending, () => {})
       .addCase(getVotes.fulfilled, (state, action) => {
         const chainID = action.payload.chainID;
-        let result: VotesData = {
-          status: 'idle',
+        const result: VotesData = {
+          status: TxStatus.IDLE,
           errMsg: '',
           proposals: state.chains[chainID].votes?.proposals || {},
         };
@@ -173,8 +190,8 @@ export const govSlice = createSlice({
       .addCase(getProposalTally.pending, () => {})
       .addCase(getProposalTally.fulfilled, (state, action) => {
         const chainID = action.payload.chainID;
-        let result = {
-          status: 'idle',
+        const result = {
+          status: TxStatus.IDLE,
           errMsg: '',
           proposalTally: state.chains[chainID].tally?.proposalTally || {},
         };

diff --git a/frontend/src/types/gov.d.ts b/frontend/src/types/gov.d.ts
@@ -1,3 +1,5 @@
+import { TxStatus } from "./enums";
+
 interface ActiveProposal {
   proposal_id: string;
   content: {
@@ -27,12 +29,6 @@ interface ActiveProposal {
   voting_end_time: string;
 }
 
-interface CosmosHubProposal {
-  status: string;
-  errMsg: string;
-  proposals: ActiveProposal[];
-}
-
 interface GovPagination {
   next_key: string | undefined;
   total: string;
@@ -60,7 +56,7 @@ interface ProposalVote {
 }
 
 interface VotesData {
-  status: string;
+  status: TxStatus;
   errMsg: string;
   proposals: {
     [key: string]: ProposalVote;
@@ -87,7 +83,7 @@ interface GetProposalTallyResponse {
 }
 
 interface ProposalTallyData {
-  status: string;
+  status: TxStatus;
   errMsg: string;
   proposalTally: ProposalTally;
 }