reset inside store instead of composibles

snapshot-labs · Jan 8, 2025 · fe90b0a · fe90b0a
1 parent ea3866e
commit fe90b0a
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 70 deletions.
diff --git a/apps/ui/src/components/Modal/Vote.vue b/apps/ui/src/components/Modal/Vote.vue
@@ -26,11 +26,7 @@ const emit = defineEmits<{
 
 const { vote } = useActions();
 const { web3 } = useWeb3();
-const {
-  get: getVotingPower,
-  fetch: fetchVotingPower,
-  reset: resetVotingPower
-} = useVotingPower();
+const { get: getVotingPower, fetch: fetchVotingPower } = useVotingPower();
 const proposalsStore = useProposalsStore();
 const { loadVotes, votes } = useAccount();
 const route = useRoute();
@@ -138,7 +134,6 @@ watch(
 
     if (fromAccount && toAccount && fromAccount !== toAccount) {
       loading.value = true;
-      resetVotingPower();
       form.value.reason = '';
       await loadVotes(props.proposal.network, [props.proposal.space.id]);
     }

diff --git a/apps/ui/src/composables/usePropositionPower.ts b/apps/ui/src/composables/usePropositionPower.ts
@@ -25,16 +25,5 @@ export function usePropositionPower() {
     );
   }
 
-  function reset() {
-    votingPowersStore.reset();
-  }
-
-  watch(
-    () => web3.value.account,
-    account => {
-      if (!account) reset();
-    }
-  );
-
-  return { fetch, get, reset };
+  return { fetch, get };
 }
diff --git a/apps/ui/src/composables/useVotingPower.ts b/apps/ui/src/composables/useVotingPower.ts
@@ -46,16 +46,5 @@ export function useVotingPower() {
     );
   }
 
-  function reset() {
-    votingPowersStore.reset();
-  }
-
-  watch(
-    () => web3.value.account,
-    account => {
-      if (!account) reset();
-    }
-  );
-
-  return { get, fetch, reset };
+  return { get, fetch };
 }
diff --git a/apps/ui/src/stores/votingPowers.ts b/apps/ui/src/stores/votingPowers.ts
@@ -15,7 +15,6 @@ export type VotingPowerItem = {
   error: utils.errors.VotingPowerDetailsError | null;
   canPropose: boolean;
   canVote: boolean;
-  account: string;
 };
 
 export function getIndex(space: SpaceDetails, block: number | null): string {
@@ -45,6 +44,8 @@ function isSpaceMember(space: Space, account: string): boolean {
 }
 
 export const useVotingPowersStore = defineStore('votingPowers', () => {
+  const { web3 } = useWeb3();
+
   const votingPowers = reactive<Map<string, VotingPowerItem>>(new Map());
 
   async function fetch(
@@ -65,8 +66,7 @@ export const useVotingPowersStore = defineStore('votingPowers', () => {
       symbol: space.voting_power_symbol,
       error: null,
       canPropose: false,
-      canVote: false,
-      account
+      canVote: false
     };
 
     if (existingVotingPower) {
@@ -135,6 +135,18 @@ export const useVotingPowersStore = defineStore('votingPowers', () => {
     votingPowers.clear();
   }
 
+  watch(
+    () => web3.value.account,
+    (fromAccount, toAccount) => {
+      if (
+        !toAccount ||
+        (fromAccount && toAccount && fromAccount !== toAccount)
+      ) {
+        reset();
+      }
+    }
+  );
+
   return {
     votingPowers,
     fetch,

diff --git a/apps/ui/src/views/Proposal.vue b/apps/ui/src/views/Proposal.vue
@@ -11,11 +11,7 @@ const props = defineProps<{
 
 const route = useRoute();
 const proposalsStore = useProposalsStore();
-const {
-  get: getVotingPower,
-  fetch: fetchVotingPower,
-  reset: resetVotingPower
-} = useVotingPower();
+const { get: getVotingPower, fetch: fetchVotingPower } = useVotingPower();
 const { setTitle } = useTitle();
 const { web3 } = useWeb3();
 const { modalAccountOpen } = useModal();
@@ -128,12 +124,8 @@ function handleFetchVotingPower() {
 
 watch(
   [proposal, () => web3.value.account, () => web3.value.authLoading],
-  ([toProposal, toAccount, toAuthLoading], [, fromAccount]) => {
-    if (fromAccount && toAccount && fromAccount !== toAccount) {
-      resetVotingPower();
-    }
-
-    if (toAuthLoading || !toProposal || !toAccount) return;
+  ([proposal, account, authLoading]) => {
+    if (authLoading || !proposal || !account) return;
 
     handleFetchVotingPower();
   },

diff --git a/apps/ui/src/views/Space/Editor.vue b/apps/ui/src/views/Space/Editor.vue
@@ -49,11 +49,8 @@ const {
   reset
 } = useWalletConnectTransaction();
 const proposalsStore = useProposalsStore();
-const {
-  get: getPropositionPower,
-  fetch: fetchPropositionPower,
-  reset: resetPropositionPower
-} = usePropositionPower();
+const { get: getPropositionPower, fetch: fetchPropositionPower } =
+  usePropositionPower();
 const { strategiesWithTreasuries } = useTreasuries(props.space);
 const termsStore = useTermsStore();
 const timestamp = useTimestamp({ interval: 1000 });
@@ -327,15 +324,8 @@ function handleFetchPropositionPower() {
 
 watch(
   [() => web3.value.account, () => web3.value.authLoading],
-  ([toAccount, toAuthLoading], [fromAccount]) => {
-    if (
-      (fromAccount && toAccount && fromAccount !== toAccount) ||
-      propositionPower.value?.account !== toAccount
-    ) {
-      resetPropositionPower();
-    }
-
-    if (toAuthLoading || !toAccount) return;
+  ([account, authLoading]) => {
+    if (!account || authLoading) return;
 
     handleFetchPropositionPower();
   },
@@ -410,7 +400,7 @@ watchEffect(() => {
           !!web3.account &&
           (sending ||
             !propositionPower ||
-            propositionPower.status === 'loading')
+            propositionPower?.status === 'loading')
         "
         :disabled="!canSubmit"
         @click="handleProposeClick"

diff --git a/apps/ui/src/views/Space/Proposals.vue b/apps/ui/src/views/Space/Proposals.vue
@@ -7,11 +7,7 @@ import { Space } from '@/types';
 const props = defineProps<{ space: Space }>();
 
 const { setTitle } = useTitle();
-const {
-  get: getVotingPower,
-  fetch: fetchVotingPower,
-  reset: resetVotingPower
-} = useVotingPower();
+const { get: getVotingPower, fetch: fetchVotingPower } = useVotingPower();
 const { web3 } = useWeb3();
 const router = useRouter();
 const route = useRoute();
@@ -97,12 +93,8 @@ watch(
 
 watch(
   [props.space, () => web3.value.account, () => web3.value.authLoading],
-  ([toSpace, toAccount, toAuthLoading], [, fromAccount]) => {
-    if (fromAccount && toAccount && fromAccount !== toAccount) {
-      resetVotingPower();
-    }
-
-    if (toAuthLoading || !toSpace || !toAccount) return;
+  ([proposal, account, authLoading]) => {
+    if (authLoading || !proposal || !account) return;
 
     handleFetchVotingPower();
   },