Merge remote-tracking branch 'upstream/master' into add-osnap-plugin

UMAprotocol · Nov 28, 2023 · 994f55f · 994f55f
2 parents 6c0a1fd + f83c1c1
commit 994f55f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/components/SettingsVotingBlock.vue b/src/components/SettingsVotingBlock.vue
@@ -32,7 +32,7 @@ const { form } = useFormSpaceSettings(props.context);
           :label="$t('settings.quorum.label')"
           :hint="$t('settings.quorum.information')"
           :disabled="isViewOnly"
-          placeholder="1000"
+          placeholder="0"
           type="number"
           @update:model-value="value => (form.voting.quorum = Number(value))"
         />

diff --git a/src/components/SpaceCreateWarnings.vue b/src/components/SpaceCreateWarnings.vue
@@ -5,6 +5,7 @@ const props = defineProps<{
   space: ExtendedSpace;
   validationFailed: boolean;
   isValidAuthor: boolean;
+  isValidSpace: boolean;
   validationName: string;
   containsShortUrl: boolean;
 }>();
@@ -43,6 +44,12 @@ const strategySymbolsString = computed(() => {
   <div class="mb-4 space-y-2">
     <MessageWarningHibernated v-if="space.hibernated" :space="space" />
 
+    <BaseMessageBlock v-else-if="!isValidSpace" level="warning">
+      Proposal creation is blocked due to invalid space settings. Please contact
+      a space admin or if you are an admin head over to the settings page and
+      save them again.
+    </BaseMessageBlock>
+
     <MessageWarningGnosisNetwork
       v-else-if="isGnosisAndNotSpaceNetwork"
       :space="space"

diff --git a/src/composables/useProposals.ts b/src/composables/useProposals.ts
@@ -54,7 +54,7 @@ export function useProposals() {
 
   const { apolloQuery } = useApolloQuery();
   async function getUserVotedProposalIds(voter: string, proposals: string[]) {
-    if (!voter || !proposals) return;
+    if (!voter || !proposals?.length) return;
     const votes = await apolloQuery(
       {
         query: USER_VOTED_PROPOSAL_IDS_QUERY,

diff --git a/src/views/SpaceCreate.vue b/src/views/SpaceCreate.vue
@@ -47,6 +47,8 @@ const { isGnosisAndNotSpaceNetwork } = useGnosis(props.space);
 const { isSnapshotLoading } = useSnapshot();
 const { apolloQuery, queryLoading } = useApolloQuery();
 const { containsShortUrl } = useShortUrls();
+const { isValid: isValidSpaceSettings, populateForm } =
+  useFormSpaceSettings('settings');
 
 const {
   form,
@@ -413,6 +415,8 @@ onBeforeRouteLeave(async () => {
     resetForm();
   }
 });
+
+onMounted(() => populateForm(props.space));
 </script>
 
 <template>
@@ -433,6 +437,7 @@ onBeforeRouteLeave(async () => {
         :space="space"
         :validation-failed="hasAuthorValidationFailed"
         :is-valid-author="isValidAuthor"
+        :is-valid-space="isValidSpaceSettings"
         :validation-name="validationName"
         :contains-short-url="formContainsShortUrl"
         data-testid="create-proposal-connect-wallet-warning"
@@ -505,7 +510,8 @@ onBeforeRouteLeave(async () => {
             hasAuthorValidationFailed ||
             validationLoading ||
             isGnosisAndNotSpaceNetwork ||
-            space.hibernated
+            space.hibernated ||
+            !isValidSpaceSettings
           "
           primary
           :data-testid="