Merge main into stable

packages/web/src/components/Dialog/ImportDialog.tsx

@@ -105,7 +105,8 @@ export const ImportDialog = ({ open, onOpenChange }: ImportDialogProps) => {
           )
         ) {
           setChange(
-            { type: "channels", index: importIndex[index] ?? 0 },
+            { type: "channel", index: importIndex[index] ?? 0 },
+
             payload,
             channels.get(importIndex[index] ?? 0),
           );

packages/web/src/components/PageComponents/Channels/Channel.tsx

@@ -47,7 +47,7 @@ export const Channel = ({ onFormInit, channel }: SettingsPanelProps) => {
   };
 
   const workingChannel = getChange({
-    type: "channels",
+    type: "channel",
     index: channel.index,
   }) as Protobuf.Channel.Channel | undefined;
   const effectiveConfig = workingChannel ?? channel;