feat: handle proposing through Safe

snapshot-labs · Dec 10, 2024 · 1d95a6d · 1d95a6d
1 parent aae357a
commit 1d95a6d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 23 deletions.
diff --git a/...rc/components/Modal/VoteConfirmOnSafe.vue → ...ui/src/components/Modal/ConfirmOnSafe.vue b/...rc/components/Modal/VoteConfirmOnSafe.vue → ...ui/src/components/Modal/ConfirmOnSafe.vue
@@ -1,20 +1,16 @@
 <script setup lang="ts">
 type Messages = {
-  title?: string;
+  title: string;
   subtitle?: string;
 };
 
 withDefaults(
   defineProps<{
     open: boolean;
-    messages?: Messages;
+    messages: Messages;
     showIcon?: boolean;
   }>(),
   {
-    messages: () => ({
-      title: 'Confirm vote in Safe app',
-      subtitle: 'Go back to Safe app to confirm your vote'
-    }),
     showIcon: true
   }
 );
@@ -49,7 +45,7 @@ const emit = defineEmits<{
         >
           hash-verifier <IH-arrow-sm-right class="inline-block -rotate-45" />
         </AppLink>
-        to validate vote data.
+        to validate the data.
       </div>
     </div>
   </UiModal>

diff --git a/apps/ui/src/components/Modal/Vote.vue b/apps/ui/src/components/Modal/Vote.vue
@@ -255,8 +255,12 @@ watchEffect(async () => {
       }"
       @close="modalShareOpen = false"
     />
-    <ModalVoteConfirmOnSafe
+    <ModalConfirmOnSafe
       :open="modalValidateOnSafeOpen"
+      :messages="{
+        title: 'Confirm vote in Safe app',
+        subtitle: 'Go back to Safe app to confirm your vote'
+      }"
       @close="modalValidateOnSafeOpen = false"
     />
   </teleport>

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
@@ -299,7 +299,7 @@ export function useActions() {
 
     const network = getNetwork(space.network);
 
-    await wrapPromise(
+    const txHash = await wrapPromise(
       space.network,
       network.actions.propose(
         auth.web3,
@@ -321,7 +321,7 @@ export function useActions() {
       )
     );
 
-    return true;
+    return txHash;
   }
 
   async function updateProposal(

diff --git a/apps/ui/src/views/Space/Editor.vue b/apps/ui/src/views/Space/Editor.vue
@@ -60,6 +60,7 @@ const timestamp = useTimestamp({ interval: 1000 });
 
 const modalOpen = ref(false);
 const modalOpenTerms = ref(false);
+const modalValidateOnSafeOpen = ref(false);
 const previewEnabled = ref(false);
 const sending = ref(false);
 const enforcedVoteType = ref<VoteType | null>(null);
@@ -203,6 +204,24 @@ const proposalMaxEnd = computed(() => {
   );
 });
 
+function navigateToProposal() {
+  if (!proposal.value) return;
+
+  if (
+    proposal.value.proposalId &&
+    offchainNetworks.includes(props.space.network)
+  ) {
+    router.push({
+      name: 'space-proposal-overview',
+      params: {
+        proposal: proposal.value.proposalId
+      }
+    });
+  } else {
+    router.push({ name: 'space-proposals' });
+  }
+}
+
 async function handleProposeClick() {
   if (!proposal.value) return;
 
@@ -267,19 +286,9 @@ async function handleProposeClick() {
     if (result) {
       proposalsStore.reset(props.space.id, props.space.network);
 
-      if (
-        proposal.value.proposalId &&
-        offchainNetworks.includes(props.space.network)
-      ) {
-        router.push({
-          name: 'space-proposal-overview',
-          params: {
-            proposal: proposal.value.proposalId
-          }
-        });
-      } else {
-        router.push({ name: 'space-proposals' });
-      }
+      navigateToProposal();
+    } else {
+      modalValidateOnSafeOpen.value = true;
     }
   } finally {
     sending.value = false;
@@ -291,6 +300,11 @@ function handleAcceptTerms() {
   handleProposeClick();
 }
 
+function handleConfirmOnSafeClosed() {
+  modalValidateOnSafeOpen.value = false;
+  navigateToProposal();
+}
+
 function handleExecutionUpdated(
   strategyAddress: string,
   transactions: Transaction[]
@@ -628,6 +642,14 @@ watchEffect(() => {
         @add="handleTransactionAccept"
         @close="reset"
       />
+      <ModalConfirmOnSafe
+        :open="modalValidateOnSafeOpen"
+        :messages="{
+          title: 'Confirm proposal in Safe app',
+          subtitle: 'Go back to Safe app to confirm your proposal'
+        }"
+        @close="handleConfirmOnSafeClosed"
+      />
     </teleport>
   </div>
 </template>