refactor: use single fetch and get functions

snapshot-labs · Nov 29, 2024 · f0645e0 · f0645e0
1 parent 6323779
commit f0645e0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 33 deletions.
diff --git a/apps/ui/src/components/Modal/Vote.vue b/apps/ui/src/components/Modal/Vote.vue
@@ -27,8 +27,8 @@ const emit = defineEmits<{
 const { vote } = useActions();
 const { web3 } = useWeb3();
 const {
-  getProposalVp,
-  fetchProposalVp,
+  get: getVotingPower,
+  fetch: fetchVotingPower,
   reset: resetVotingPower
 } = useVotingPower();
 const proposalsStore = useProposalsStore();
@@ -55,7 +55,9 @@ const formValidator = getValidator({
   }
 });
 
-const votingPower = computed(() => getProposalVp(props.proposal));
+const votingPower = computed(() =>
+  getVotingPower(props.proposal.space, props.proposal)
+);
 
 const formattedVotingPower = computed(() =>
   getFormattedVotingPower(votingPower.value)
@@ -126,7 +128,7 @@ async function handleConfirmed(tx?: string | null) {
 }
 
 function handleFetchVotingPower() {
-  fetchProposalVp(props.proposal);
+  fetchVotingPower(props.proposal.space, props.proposal);
 }
 
 watch(

diff --git a/apps/ui/src/composables/useVotingPower.ts b/apps/ui/src/composables/useVotingPower.ts
@@ -18,35 +18,22 @@ export function useVotingPower() {
     );
   }
 
-  function fetchProposalVp(proposal: Proposal) {
+  function fetch(space: Space, proposal?: Proposal) {
     if (!web3.value.account) return;
 
     votingPowersStore.fetch(
-      proposal,
+      proposal || space,
       web3.value.account,
-      proposalSnapshot(proposal)
+      proposal ? proposalSnapshot(proposal) : latestBlock(space.network)
     );
   }
 
-  function fetchSpaceVp(space: Space) {
-    if (!web3.value.account) return;
-
-    votingPowersStore.fetch(
-      space,
-      web3.value.account,
-      latestBlock(space.network)
-    );
-  }
-
-  function getProposalVp(proposal: Proposal) {
-    return votingPowersStore.votingPowers.get(
-      getIndex(proposal.space, proposalSnapshot(proposal))
-    );
-  }
-
-  function getSpaceVp(space: Space) {
+  function get(space: Space, proposal?: Proposal) {
     return votingPowersStore.votingPowers.get(
-      getIndex(space, latestBlock(space.network))
+      getIndex(
+        proposal ? proposal.space : space,
+        proposal ? proposalSnapshot(proposal) : latestBlock(space.network)
+      )
     );
   }
 
@@ -61,5 +48,5 @@ export function useVotingPower() {
     }
   );
 
-  return { getProposalVp, getSpaceVp, fetchProposalVp, fetchSpaceVp, reset };
+  return { get, fetch, reset };
 }
diff --git a/apps/ui/src/views/Proposal.vue b/apps/ui/src/views/Proposal.vue
@@ -11,8 +11,8 @@ const props = defineProps<{
 const route = useRoute();
 const proposalsStore = useProposalsStore();
 const {
-  getProposalVp,
-  fetchProposalVp,
+  get: getVotingPower,
+  fetch: fetchVotingPower,
   reset: resetVotingPower
 } = useVotingPower();
 const { setTitle } = useTitle();
@@ -45,7 +45,7 @@ const discussion = computed(() => {
 const votingPower = computed(() => {
   if (!proposal.value) return;
 
-  return getProposalVp(proposal.value);
+  return getVotingPower(props.space, proposal.value);
 });
 
 const votingPowerDecimals = computed(() => {
@@ -93,7 +93,7 @@ async function handleVoteSubmitted() {
 function handleFetchVotingPower() {
   if (!proposal.value) return;
 
-  fetchProposalVp(proposal.value);
+  fetchVotingPower(props.space, proposal.value);
 }
 
 watch(

diff --git a/apps/ui/src/views/Space/Proposals.vue b/apps/ui/src/views/Space/Proposals.vue
@@ -7,7 +7,11 @@ import { Space } from '@/types';
 const props = defineProps<{ space: Space }>();
 
 const { setTitle } = useTitle();
-const { getSpaceVp, fetchSpaceVp, reset: resetVotingPower } = useVotingPower();
+const {
+  get: getVotingPower,
+  fetch: fetchVotingPower,
+  reset: resetVotingPower
+} = useVotingPower();
 const { web3 } = useWeb3();
 const router = useRouter();
 const route = useRoute();
@@ -24,7 +28,7 @@ const proposalsRecord = computed(
   () => proposalsStore.proposals[`${props.space.network}:${props.space.id}`]
 );
 
-const votingPower = computed(() => getSpaceVp(props.space));
+const votingPower = computed(() => getVotingPower(props.space));
 
 const spaceLabels = computed(() => {
   if (!props.space.labels) return {};
@@ -44,7 +48,7 @@ async function handleEndReached() {
 }
 
 function handleFetchVotingPower() {
-  fetchSpaceVp(props.space);
+  fetchVotingPower(props.space);
 }
 
 watchThrottled(