Merge branch 'main' into feat/voter-list

allinbits · Mar 26, 2024 · 4720ad2 · 4720ad2
2 parents 07b9a37 + 8cdc43e
commit 4720ad2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/components/popups/ProposalDeposit.vue b/src/components/popups/ProposalDeposit.vue
@@ -102,6 +102,7 @@ const signDeposit = async () => {
                     placeholder="e.g. 50"
                     :label="$t('components.ProposalDeposit.instructions')"
                     :min="0"
+                    :max="Infinity"
                     class="w-full justify-end"
                   />
                 </form>

diff --git a/src/components/popups/ProposalVote.vue b/src/components/popups/ProposalVote.vue
@@ -102,6 +102,7 @@ const signVote = async () => {
         },
       ],
     };
+    voteOptions.options = voteOptions.options.filter((opt) => opt.weight !== "0");
   } else {
     if (!voteStraight.value) return;
     voteOptions = {

diff --git a/src/components/ui/UiInput.vue b/src/components/ui/UiInput.vue
@@ -15,6 +15,7 @@
       :max="type === 'number' ? max : undefined"
       @focus="focusHandler(true)"
       @blur="focusHandler(false)"
+      @input="typeof model === 'number' ? (model = MaxValue(MinValue(model))) : model"
     />
   </label>
   <Transition
@@ -56,6 +57,9 @@ const props = withDefaults(defineProps<Props>(), {
 
 const focused = ref(false);
 
+const MinValue = (val: number) => Math.min(props.max, val);
+const MaxValue = (val: number) => Math.max(props.min, val);
+
 const emit = defineEmits(["update:modelValue", "focus"]);
 const model = computed({
   get: () => props.modelValue,