From 8e5e7ad5eab89864816f13acc10789f9fa1d052d Mon Sep 17 00:00:00 2001
From: Dmytro Tolok <tolok.d@gmail.com>
Date: Tue, 13 Jun 2023 17:36:56 +0200
Subject: [PATCH 1/4] feat(proposal): add validation to start time

---
 src/components/ModalSelectDate.vue | 14 +++++++++++++-
 src/views/SpaceCreate.vue          |  6 +++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/ModalSelectDate.vue b/src/components/ModalSelectDate.vue
index 2650b185357..19537534fff 100644
--- a/src/components/ModalSelectDate.vue
+++ b/src/components/ModalSelectDate.vue
@@ -28,7 +28,8 @@ function handleSubmit() {
   if (step.value === 0) return (step.value = 1);
   const dateString = `${input.value} ${time.value}:00`;
   const timestamp = new Date(dateString).getTime() / 1000;
-  emit('input', timestamp);
+  const now = parseInt((Date.now() / 1e3).toFixed());
+  emit('input', timestamp > now ? timestamp : now);
   emit('close');
 }
 
@@ -39,6 +40,17 @@ watch(open, () => {
   time.value = `${h}:${m}`;
   input.value = dateString;
 });
+
+watchEffect(() => {
+  const startDateString = `${input.value} ${time.value}:00`;
+  const startTimestamp = new Date(startDateString).getTime();
+
+  if (startTimestamp < Date.now()) {
+    const { dateString, h, m } = formatDate(Date.now() / 1000);
+    input.value = dateString;
+    time.value = `${h}:${m}`;
+  }
+});
 </script>
 
 <template>
diff --git a/src/views/SpaceCreate.vue b/src/views/SpaceCreate.vue
index e6b454de9e2..1c8459bca81 100644
--- a/src/views/SpaceCreate.vue
+++ b/src/views/SpaceCreate.vue
@@ -159,7 +159,11 @@ function getFormattedForm() {
     .map(choice => choice.text)
     .filter(choiceText => choiceText.length > 0);
   updateTime();
-  clonedForm.start = dateStart.value;
+  const thisMomentTimestamp = parseInt((Date.now() / 1e3).toFixed());
+  clonedForm.start =
+    dateStart.value < thisMomentTimestamp
+      ? thisMomentTimestamp
+      : dateStart.value;
   clonedForm.end = dateEnd.value;
   return clonedForm;
 }

From 4537eadec931d9c257616ee96af86add17498a17 Mon Sep 17 00:00:00 2001
From: Dmytro Tolok <tolok.d@gmail.com>
Date: Thu, 15 Jun 2023 11:48:43 +0200
Subject: [PATCH 2/4] refactor(math): use Math.max instead of condition

---
 src/components/ModalSelectDate.vue | 2 +-
 src/views/SpaceCreate.vue          | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/ModalSelectDate.vue b/src/components/ModalSelectDate.vue
index 19537534fff..6e84eafef51 100644
--- a/src/components/ModalSelectDate.vue
+++ b/src/components/ModalSelectDate.vue
@@ -29,7 +29,7 @@ function handleSubmit() {
   const dateString = `${input.value} ${time.value}:00`;
   const timestamp = new Date(dateString).getTime() / 1000;
   const now = parseInt((Date.now() / 1e3).toFixed());
-  emit('input', timestamp > now ? timestamp : now);
+  emit('input', Math.max(timestamp, now));
   emit('close');
 }
 
diff --git a/src/views/SpaceCreate.vue b/src/views/SpaceCreate.vue
index 1c8459bca81..b6c565cdabc 100644
--- a/src/views/SpaceCreate.vue
+++ b/src/views/SpaceCreate.vue
@@ -160,10 +160,7 @@ function getFormattedForm() {
     .filter(choiceText => choiceText.length > 0);
   updateTime();
   const thisMomentTimestamp = parseInt((Date.now() / 1e3).toFixed());
-  clonedForm.start =
-    dateStart.value < thisMomentTimestamp
-      ? thisMomentTimestamp
-      : dateStart.value;
+  clonedForm.start = Math.max(thisMomentTimestamp, dateStart.value);
   clonedForm.end = dateEnd.value;
   return clonedForm;
 }

From 66a53ab59a14ab833f29f50d231253aa6e6434b6 Mon Sep 17 00:00:00 2001
From: Dmytro Tolok <tolok.d@gmail.com>
Date: Sun, 18 Jun 2023 10:50:04 +0200
Subject: [PATCH 3/4] fix(validation): add validation instead of forcing proper
 time entering

---
 src/components/ModalSelectDate.vue | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/components/ModalSelectDate.vue b/src/components/ModalSelectDate.vue
index 6e84eafef51..35c564e93b9 100644
--- a/src/components/ModalSelectDate.vue
+++ b/src/components/ModalSelectDate.vue
@@ -11,6 +11,16 @@ const { open } = toRefs(props);
 const step = ref(0);
 const input = ref('');
 const time = ref('12:00');
+const isTimeValid = computed(() => {
+  const isTimeEnteringStep = step.value === 1;
+  if (!isTimeEnteringStep) return true;
+  if (!input.value) return false;
+
+  const startDateString = `${input.value} ${time.value}:00`;
+  const startTimestamp = new Date(startDateString).getTime();
+
+  return startTimestamp >= Date.now();
+});
 
 function formatDate(date) {
   const output = { h: '12', m: '00', dateString: '' };
@@ -40,17 +50,6 @@ watch(open, () => {
   time.value = `${h}:${m}`;
   input.value = dateString;
 });
-
-watchEffect(() => {
-  const startDateString = `${input.value} ${time.value}:00`;
-  const startTimestamp = new Date(startDateString).getTime();
-
-  if (startTimestamp < Date.now()) {
-    const { dateString, h, m } = formatDate(Date.now() / 1000);
-    input.value = dateString;
-    time.value = `${h}:${m}`;
-  }
-});
 </script>
 
 <template>
@@ -84,7 +83,7 @@ watchEffect(() => {
       <div class="float-left w-2/4 pl-2">
         <BaseButton
           type="submit"
-          :disabled="!input"
+          :disabled="!isTimeValid"
           class="w-full"
           primary
           @click="handleSubmit"

From 45c41da8598719bf6cef44128acd446429fd8f53 Mon Sep 17 00:00:00 2001
From: Dmytro Tolok <tolok.d@gmail.com>
Date: Mon, 19 Jun 2023 14:25:50 +0200
Subject: [PATCH 4/4] fix(error): add error message for wrong time

---
 src/components/ModalSelectDate.vue | 22 +++++++++++++++++++---
 src/locales/default.json           |  3 ++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/ModalSelectDate.vue b/src/components/ModalSelectDate.vue
index 35c564e93b9..61bfab329ea 100644
--- a/src/components/ModalSelectDate.vue
+++ b/src/components/ModalSelectDate.vue
@@ -16,7 +16,7 @@ const isTimeValid = computed(() => {
   if (!isTimeEnteringStep) return true;
   if (!input.value) return false;
 
-  const startDateString = `${input.value} ${time.value}:00`;
+  const startDateString = `${input.value} ${time.value}:59`;
   const startTimestamp = new Date(startDateString).getTime();
 
   return startTimestamp >= Date.now();
@@ -50,6 +50,17 @@ watch(open, () => {
   time.value = `${h}:${m}`;
   input.value = dateString;
 });
+
+watch(step, () => {
+  if (step.value === 0) return;
+  const timestamp = Math.max(
+    props.value,
+    parseInt((Date.now() / 1e3 + 10).toFixed())
+  );
+  const { dateString, h, m } = formatDate(timestamp);
+  time.value = `${h}:${m}`;
+  input.value = dateString;
+});
 </script>
 
 <template>
@@ -67,11 +78,16 @@ watch(open, () => {
         <BaseCalendar v-model="input" class="mx-auto mb-2" />
       </div>
     </div>
-    <div v-else class="m-4 mx-auto max-w-[140px]">
+    <div v-else class="m-4">
       <input
         v-model="time"
         type="time"
-        class="s-input form-input text-center text-lg"
+        class="s-input form-input mx-auto max-w-[140px] text-center text-lg"
+      />
+      <TuneErrorInput
+        v-if="!isTimeValid"
+        class="mx-auto mt-2 text-center"
+        :error="$t('create.errorTimeInPast')"
       />
     </div>
     <template #footer>
diff --git a/src/locales/default.json b/src/locales/default.json
index f8c697f904f..2d8c3befeb8 100644
--- a/src/locales/default.json
+++ b/src/locales/default.json
@@ -228,7 +228,8 @@
     "uploadImageExplainer": "Attach images by dragging & dropping, selecting or pasting them.",
     "uploading": "Uploading image",
     "markdown": "Styling with Markdown is supported",
-    "errorGettingSnapshot": "We encountered an error while fetching the snapshot block number which is needed to calculate your voting power. Please try again later."
+    "errorGettingSnapshot": "We encountered an error while fetching the snapshot block number which is needed to calculate your voting power. Please try again later.",
+    "errorTimeInPast": "Entered time is in the past. Please select a future time."
   },
   "delegate": {
     "header": "Delegate",