From 136bc7159016f3d0c1790e466bf053836cd277ae Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Tue, 13 Aug 2024 18:55:48 +0900
Subject: [PATCH] fix: move post vote actions to the vote modal (#609)

---
 apps/ui/src/components/Modal/Vote.vue | 19 +++++++++++++++++--
 apps/ui/src/views/Proposal.vue        | 17 +----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/ui/src/components/Modal/Vote.vue b/apps/ui/src/components/Modal/Vote.vue
index e634227be..6936a4384 100644
--- a/apps/ui/src/components/Modal/Vote.vue
+++ b/apps/ui/src/components/Modal/Vote.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { getChoiceText, getFormattedVotingPower } from '@/helpers/utils';
 import { getValidator } from '@/helpers/validation';
+import { offchainNetworks } from '@/networks';
 import { Choice, Proposal } from '@/types';
 
 const REASON_DEFINITION = {
@@ -29,6 +30,7 @@ const {
   fetch: fetchVotingPower,
   reset: resetVotingPower
 } = useVotingPower();
+const proposalsStore = useProposalsStore();
 const { loadVotes, votes } = useAccount();
 
 const loading = ref(false);
@@ -66,8 +68,21 @@ async function handleSubmit() {
 
   try {
     await vote(props.proposal, props.choice, form.value.reason);
-    emit('voted');
-    emit('close');
+
+    try {
+      // TODO: Quick fix only for offchain proposals, need a more complete solution for onchain proposals
+      if (offchainNetworks.includes(props.proposal.network)) {
+        proposalsStore.fetchProposal(
+          props.proposal.space.id,
+          props.proposal.id,
+          props.proposal.network
+        );
+        await loadVotes(props.proposal.network, [props.proposal.space.id]);
+      }
+    } finally {
+      emit('voted');
+      emit('close');
+    }
   } finally {
     loading.value = false;
   }
diff --git a/apps/ui/src/views/Proposal.vue b/apps/ui/src/views/Proposal.vue
index 593e81b72..71bdce6bf 100644
--- a/apps/ui/src/views/Proposal.vue
+++ b/apps/ui/src/views/Proposal.vue
@@ -73,23 +73,8 @@ async function handleVoteClick(choice: Choice) {
 }
 
 async function handleVoteSubmitted() {
-  if (!proposal.value) return;
-
   selectedChoice.value = null;
-
-  try {
-    // TODO: Quick fix only for offchain proposals, need a more complete solution for onchain proposals
-    if (offchainNetworks.includes(proposal.value.network)) {
-      proposalsStore.fetchProposal(
-        spaceAddress.value!,
-        id.value,
-        networkId.value!
-      );
-      await loadVotes(proposal.value.network, [proposal.value.space.id]);
-    }
-  } finally {
-    editMode.value = false;
-  }
+  editMode.value = false;
 }
 
 function handleFetchVotingPower() {