Merge branch 'develop' into feature/coupons

frontend/src/components/Settings/SettingFields.vue

@@ -96,7 +96,7 @@
 						size="sm"
 						:label="__(field.label)"
 						:description="__(field.description)"
-						v-model="data[field.name]"
+						v-model="field.value"
 					/>
 
 					<FormControl
@@ -147,8 +147,6 @@ const columns = computed(() => {
 		} else {
 			if (field.type == 'checkbox') {
 				field.value = props.data[field.name] ? true : false
-			} else {
-				field.value = props.data[field.name]
 			}
 			currentColumn.push(field)
 		}

frontend/src/components/Settings/Settings.vue

@@ -14,18 +14,13 @@
 							<span>{{ __(tab.label) }}</span>
 						</div>
 						<nav class="space-y-1">
-							<SidebarLink
-								v-for="item in tab.items"
-								:link="item"
-								:key="item.label"
-								class="w-full"
-								:class="
-									activeTab?.label == item.label
-										? 'bg-surface-selected shadow-sm'
-										: 'hover:bg-surface-gray-2'
-								"
-								@click="activeTab = item"
-							/>
+							<div v-for="item in tab.items" @click="activeTab = item">
+								<SidebarLink
+									:link="item"
+									:key="item.label"
+									:activeTab="activeTab?.label"
+								/>
+							</div>
 						</nav>
 					</div>
 				</div>