From 7c702435920004966934d7e66d4283aa2b0a9a38 Mon Sep 17 00:00:00 2001
From: Santiago Gonzalez <hernangt12re3@gmail.com>
Date: Tue, 10 Oct 2023 22:25:58 -0500
Subject: [PATCH 1/7] feat(passport-gated): stamps as optional parameter

---
 src/components/MessageWarningValidation.vue | 4 ++--
 src/components/ModalValidation.vue          | 7 +++++--
 src/components/ModalVoteValidation.vue      | 7 +++++--
 src/locales/default.json                    | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/MessageWarningValidation.vue b/src/components/MessageWarningValidation.vue
index f5f442ec9105..30bb4e9b0920 100644
--- a/src/components/MessageWarningValidation.vue
+++ b/src/components/MessageWarningValidation.vue
@@ -37,8 +37,8 @@ const tPath = computed(() => {
       <template v-if="validationName === 'passport-gated'">
         {{
           $t(`${tPath}.passport-gated.invalidMessage`, {
-            operator: validationParams?.operator === 'AND' ? 'all' : 'one',
-            stamps: validationParams?.stamps.join(', '),
+            operator: validationParams?.operator === 'AND' ? 'all' : 'any',
+            stamps: validationParams?.stamps.length === 0 ? 'any valid Stamp' : validationParams?.stamps.join(', '),
             scoreThreshold: validationParams?.scoreThreshold || 0
           })
         }}
diff --git a/src/components/ModalValidation.vue b/src/components/ModalValidation.vue
index 6425d29fb824..4692fd3ec9ea 100644
--- a/src/components/ModalValidation.vue
+++ b/src/components/ModalValidation.vue
@@ -75,8 +75,11 @@ function handleSelect(n: string) {
     }
   }
 
-  if (n === 'passport-gated' && !input.value.params.operator) {
-    input.value.params.operator = 'OR';
+  if (n === 'passport-gated') {
+    if (!input.value.params.operator)
+      input.value.params.operator = '';
+    if (input.value.params.stamps?.[0] === undefined)
+      input.value.params.stamps = [];
   }
 }
 
diff --git a/src/components/ModalVoteValidation.vue b/src/components/ModalVoteValidation.vue
index 649784535dc2..3a2a20d7fe2a 100644
--- a/src/components/ModalVoteValidation.vue
+++ b/src/components/ModalVoteValidation.vue
@@ -73,8 +73,11 @@ function select(n: string) {
     }
   }
 
-  if (n === 'passport-gated' && !input.value.params.operator) {
-    input.value.params.operator = 'OR';
+  if (n === 'passport-gated') {
+    if (!input.value.params.operator)
+      input.value.params.operator = '';
+    if (input.value.params.stamps?.[0] === undefined)
+      input.value.params.stamps = [];
   }
 }
 
diff --git a/src/locales/default.json b/src/locales/default.json
index 24374076b690..be1b0f550bd8 100644
--- a/src/locales/default.json
+++ b/src/locales/default.json
@@ -741,7 +741,7 @@
     "passport-gated": {
       "label": "Gitcoin Passport gated",
       "description": "Protect your space from spam by requiring users to have a Gitcoin Passport to create a proposal.",
-      "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold} and {operator} of the following stamps to vote on this proposal: {stamps}. "
+      "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold} and {operator} of the following stamps to create a proposal: {stamps}. "
     },
     "arbitrum": {
       "label": "Arbitrum DAO votable supply",

From bd11615e6e8f080bb988af9817103ca8b63fb9df Mon Sep 17 00:00:00 2001
From: Sam <samuv.eth@gmail.com>
Date: Fri, 17 Nov 2023 18:46:59 +0700
Subject: [PATCH 2/7] fix: Operator

---
 src/components/MessageWarningValidation.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/MessageWarningValidation.vue b/src/components/MessageWarningValidation.vue
index 30bb4e9b0920..8498b73e047c 100644
--- a/src/components/MessageWarningValidation.vue
+++ b/src/components/MessageWarningValidation.vue
@@ -16,6 +16,17 @@ const tPath = computed(() => {
   }
   return 'proposalValidation';
 });
+
+const operatorGitcoin = computed(() => {
+  switch (props.validationParams?.operator) {
+    case 'AND':
+      return 'all';
+    case 'OR':
+      return 'one';
+    default:
+      return 'any';
+  }
+});
 </script>
 
 <template>
@@ -37,8 +48,11 @@ const tPath = computed(() => {
       <template v-if="validationName === 'passport-gated'">
         {{
           $t(`${tPath}.passport-gated.invalidMessage`, {
-            operator: validationParams?.operator === 'AND' ? 'all' : 'any',
-            stamps: validationParams?.stamps.length === 0 ? 'any valid Stamp' : validationParams?.stamps.join(', '),
+            operator: operatorGitcoin,
+            stamps:
+              validationParams?.stamps.length === 0
+                ? 'any valid Stamp'
+                : validationParams?.stamps.join(', '),
             scoreThreshold: validationParams?.scoreThreshold || 0
           })
         }}

From c502ec5c921b2698db4ef8237c5bc1c9e207a878 Mon Sep 17 00:00:00 2001
From: Sam <samuv.eth@gmail.com>
Date: Fri, 17 Nov 2023 20:18:57 +0700
Subject: [PATCH 3/7] Fixes

---
 src/components/ModalValidation.vue     | 31 ++++++++++++++++++++------
 src/components/ModalVoteValidation.vue | 31 ++++++++++++++++++++------
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/components/ModalValidation.vue b/src/components/ModalValidation.vue
index 4692fd3ec9ea..23a10210178d 100644
--- a/src/components/ModalValidation.vue
+++ b/src/components/ModalValidation.vue
@@ -41,12 +41,23 @@ type Validations = Record<
 >;
 
 const validationDefinition = computed(() => {
-  return (
+  const definition =
     validations.value?.[input.value.name]?.schema?.definitions?.Validation ||
-    null
-  );
+    null;
+
+  if (input.value.name === 'passport-gated')
+    return definePassportGated(clone(definition));
+
+  return definition;
 });
 
+function definePassportGated(definition: any) {
+  if (input.value.params.operator === 'NONE')
+    delete definition.properties.stamps;
+
+  return definition;
+}
+
 const validationErrors = computed(() => {
   return validateForm(validationDefinition.value || {}, input.value.params);
 });
@@ -76,14 +87,13 @@ function handleSelect(n: string) {
   }
 
   if (n === 'passport-gated') {
-    if (!input.value.params.operator)
-      input.value.params.operator = '';
-    if (input.value.params.stamps?.[0] === undefined)
-      input.value.params.stamps = [];
+    if (!input.value.params.operator) input.value.params.operator = 'NONE';
   }
 }
 
 function handleSubmit() {
+  if (input.value.name === 'passport-gated') handlePassportGated();
+
   if (!isValid.value || !isValidParams.value) {
     strategiesFormRef.value?.forceShowError();
     formRef?.value?.forceShowError();
@@ -94,6 +104,13 @@ function handleSubmit() {
   emit('close');
 }
 
+function handlePassportGated() {
+  if (!input.value.params.stamps?.[0]) input.value.params.stamps = undefined;
+  if (input.value.params.operator === 'NONE') {
+    input.value.params.stamps = undefined;
+  }
+}
+
 function removeVoteValidationOnly(validations: Validations) {
   Object.keys(validations).forEach(key => {
     if (validations[key]?.voteValidationOnly) {
diff --git a/src/components/ModalVoteValidation.vue b/src/components/ModalVoteValidation.vue
index 3a2a20d7fe2a..c41eea89a94e 100644
--- a/src/components/ModalVoteValidation.vue
+++ b/src/components/ModalVoteValidation.vue
@@ -42,12 +42,23 @@ const isValidationsLoaded = ref(false);
 const updateIndex = ref(0);
 
 const validationDefinition = computed(() => {
-  return (
+  const definition =
     validations.value?.[input.value.name]?.schema?.definitions?.Validation ||
-    null
-  );
+    null;
+
+  if (input.value.name === 'passport-gated')
+    return definePassportGated(clone(definition));
+
+  return definition;
 });
 
+function definePassportGated(definition: any) {
+  if (input.value.params.operator === 'NONE')
+    delete definition.properties.stamps;
+
+  return definition;
+}
+
 const validationErrors = computed(() => {
   return validateForm(validationDefinition.value || {}, input.value.params);
 });
@@ -74,14 +85,13 @@ function select(n: string) {
   }
 
   if (n === 'passport-gated') {
-    if (!input.value.params.operator)
-      input.value.params.operator = '';
-    if (input.value.params.stamps?.[0] === undefined)
-      input.value.params.stamps = [];
+    if (!input.value.params.operator) input.value.params.operator = 'NONE';
   }
 }
 
 function handleSubmit() {
+  if (input.value.name === 'passport-gated') handlePassportGatedNoneOperator();
+
   if (!isValid.value || !isValidParams.value) {
     strategiesFormRef.value?.forceShowError();
     formRef?.value?.forceShowError();
@@ -92,6 +102,13 @@ function handleSubmit() {
   emit('close');
 }
 
+function handlePassportGatedNoneOperator() {
+  if (!input.value.params.stamps?.[0]) input.value.params.stamps = undefined;
+  if (input.value.params.operator === 'NONE') {
+    input.value.params.stamps = undefined;
+  }
+}
+
 function removeProposalValidationOnly(validations: Validations) {
   Object.keys(validations).forEach(key => {
     if (validations[key]?.proposalValidationOnly) {

From fe3f9b24c257d45587c1dfc796055e55d5070508 Mon Sep 17 00:00:00 2001
From: Sam <samuv.eth@gmail.com>
Date: Fri, 17 Nov 2023 20:33:57 +0700
Subject: [PATCH 4/7] Fix messaged

---
 src/components/MessageWarningValidation.vue | 31 ++++++++-------------
 src/locales/default.json                    |  6 ++--
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/components/MessageWarningValidation.vue b/src/components/MessageWarningValidation.vue
index 8498b73e047c..6d5189ad3e0e 100644
--- a/src/components/MessageWarningValidation.vue
+++ b/src/components/MessageWarningValidation.vue
@@ -16,17 +16,6 @@ const tPath = computed(() => {
   }
   return 'proposalValidation';
 });
-
-const operatorGitcoin = computed(() => {
-  switch (props.validationParams?.operator) {
-    case 'AND':
-      return 'all';
-    case 'OR':
-      return 'one';
-    default:
-      return 'any';
-  }
-});
 </script>
 
 <template>
@@ -44,16 +33,20 @@ const operatorGitcoin = computed(() => {
       </BaseLink>
     </template>
 
-    <template v-else-if="validationName === 'passport-gated'">
-      <template v-if="validationName === 'passport-gated'">
+    <template v-if="validationName === 'passport-gated'">
+      {{
+        $t(`${tPath}.passport-gated.invalidMessage`, {
+          scoreThreshold: validationParams?.scoreThreshold || 0
+        })
+      }}
+
+      <template v-if="props.validationParams?.operator !== 'NONE'">
         {{
-          $t(`${tPath}.passport-gated.invalidMessage`, {
-            operator: operatorGitcoin,
+          $t(`${tPath}.passport-gated.invalidMessageStamps`, {
+            operator:
+              props.validationParams?.operator === 'AND' ? 'all' : 'one',
             stamps:
-              validationParams?.stamps.length === 0
-                ? 'any valid Stamp'
-                : validationParams?.stamps.join(', '),
-            scoreThreshold: validationParams?.scoreThreshold || 0
+              validationParams.stamps && validationParams.stamps.join(', ')
           })
         }}
       </template>
diff --git a/src/locales/default.json b/src/locales/default.json
index 9c35893369f5..0b4de441b43c 100644
--- a/src/locales/default.json
+++ b/src/locales/default.json
@@ -749,7 +749,8 @@
     "passport-gated": {
       "label": "Gitcoin Passport gated",
       "description": "Protect your space from spam by requiring users to have a Gitcoin Passport to create a proposal.",
-      "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold} and {operator} of the following stamps to create a proposal: {stamps}. "
+      "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold}",
+      "invalidMessageStamps": "and {operator} of the following stamps to create a proposal: {stamps} "
     },
     "arbitrum": {
       "label": "Arbitrum DAO votable supply",
@@ -782,7 +783,8 @@
     "passport-gated": {
       "label": "Gitcoin Passport gated",
       "description": "Protect your proposals from spam and vote manipulation by requiring users to have a Gitcoin Passport.",
-      "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold} and {operator} of the following stamps to vote on this proposal: {stamps}. "
+      "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold}",
+      "invalidMessageStamps": "and {operator} of the following stamps to vote on this proposal: {stamps} "
     }
   },
   "safeSnap": {

From cbf00b0b36a61268429197b91722a725febfab33 Mon Sep 17 00:00:00 2001
From: Sam <samuv.eth@gmail.com>
Date: Sat, 18 Nov 2023 10:03:36 +0700
Subject: [PATCH 5/7] Fix message

---
 src/components/MessageWarningValidation.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MessageWarningValidation.vue b/src/components/MessageWarningValidation.vue
index 6d5189ad3e0e..5d1d9f2ac865 100644
--- a/src/components/MessageWarningValidation.vue
+++ b/src/components/MessageWarningValidation.vue
@@ -38,9 +38,9 @@ const tPath = computed(() => {
         $t(`${tPath}.passport-gated.invalidMessage`, {
           scoreThreshold: validationParams?.scoreThreshold || 0
         })
-      }}
+      }}<span v-if="props.validationParams?.operator === 'NONE'">. </span>
 
-      <template v-if="props.validationParams?.operator !== 'NONE'">
+      <template v-else>
         {{
           $t(`${tPath}.passport-gated.invalidMessageStamps`, {
             operator:

From d61f6ed1ea9098ae388023188dd9ae1e639b1540 Mon Sep 17 00:00:00 2001
From: Sam <samuv.eth@gmail.com>
Date: Sat, 18 Nov 2023 10:05:49 +0700
Subject: [PATCH 6/7] Fix message

---
 src/locales/default.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/locales/default.json b/src/locales/default.json
index 0b4de441b43c..d82eaa3422b0 100644
--- a/src/locales/default.json
+++ b/src/locales/default.json
@@ -750,7 +750,7 @@
       "label": "Gitcoin Passport gated",
       "description": "Protect your space from spam by requiring users to have a Gitcoin Passport to create a proposal.",
       "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold}",
-      "invalidMessageStamps": "and {operator} of the following stamps to create a proposal: {stamps} "
+      "invalidMessageStamps": " and {operator} of the following stamps to create a proposal: {stamps} "
     },
     "arbitrum": {
       "label": "Arbitrum DAO votable supply",
@@ -784,7 +784,7 @@
       "label": "Gitcoin Passport gated",
       "description": "Protect your proposals from spam and vote manipulation by requiring users to have a Gitcoin Passport.",
       "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold}",
-      "invalidMessageStamps": "and {operator} of the following stamps to vote on this proposal: {stamps} "
+      "invalidMessageStamps": " and {operator} of the following stamps to vote on this proposal: {stamps} "
     }
   },
   "safeSnap": {

From 5531951302df0d2bcdc13322d49183bbd96c6b8a Mon Sep 17 00:00:00 2001
From: Sam <samuv.eth@gmail.com>
Date: Sat, 18 Nov 2023 10:11:42 +0700
Subject: [PATCH 7/7] If no stamps default to none as operator

---
 src/components/ModalValidation.vue     | 5 ++++-
 src/components/ModalVoteValidation.vue | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/ModalValidation.vue b/src/components/ModalValidation.vue
index 23a10210178d..66b21ab57fa1 100644
--- a/src/components/ModalValidation.vue
+++ b/src/components/ModalValidation.vue
@@ -105,7 +105,10 @@ function handleSubmit() {
 }
 
 function handlePassportGated() {
-  if (!input.value.params.stamps?.[0]) input.value.params.stamps = undefined;
+  if (!input.value.params.stamps?.[0]) {
+    input.value.params.stamps = undefined;
+    input.value.params.operator = 'NONE';
+  }
   if (input.value.params.operator === 'NONE') {
     input.value.params.stamps = undefined;
   }
diff --git a/src/components/ModalVoteValidation.vue b/src/components/ModalVoteValidation.vue
index c41eea89a94e..ef84f6757bfe 100644
--- a/src/components/ModalVoteValidation.vue
+++ b/src/components/ModalVoteValidation.vue
@@ -103,7 +103,10 @@ function handleSubmit() {
 }
 
 function handlePassportGatedNoneOperator() {
-  if (!input.value.params.stamps?.[0]) input.value.params.stamps = undefined;
+  if (!input.value.params.stamps?.[0]) {
+    input.value.params.stamps = undefined;
+    input.value.params.operator = 'NONE';
+  }
   if (input.value.params.operator === 'NONE') {
     input.value.params.stamps = undefined;
   }