Merge branch 'master' into alpine-3.21

zwave-js · Dec 19, 2024 · e594c62 · e594c62
2 parents f864f67 + 655fc92
commit e594c62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -538,7 +538,6 @@
 												newZwave.deviceConfigPriorityDir
 											"
 											label="Config priority directory"
-											:rules="[rules.required]"
 											hint="Directory from where device configuration files can be loaded with higher priority than the included ones. This directory does not get indexed and should be used sparingly, e.g. when custom files are absolutely necessary or for testing"
 											required
 										></v-text-field>

diff --git a/src/views/Zniffer.vue b/src/views/Zniffer.vue
@@ -168,7 +168,7 @@
 							<template
 								v-slot:[`item.protocolDataRate`]="{ item }"
 							>
-								<span v-if="item.corrupted">----</span>
+								<span v-if="item.corrupted"></span>
 								<div v-else class="d-flex text-center">
 									<rich-value
 										:value="getProtocolIcon(item.protocol)"
@@ -198,7 +198,7 @@
 
 							<template v-slot:[`item.payload`]="{ item }">
 								<code v-if="item.corrupted"> CRC Error </code>
-								<span v-if="item.parsedPayload">
+								<span v-else-if="item.parsedPayload">
 									{{ getPayloadTags(item.parsedPayload) }}
 								</span>
 								<span