From 7e7c6aa053c2dde2722a63496a9e4f283045108a Mon Sep 17 00:00:00 2001
From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Wed, 1 Feb 2023 17:09:33 +0100
Subject: [PATCH] Remove default commission buttons on Matter config panel
 (#15304)Co-authored-by: Bram Kragten <mail@bramkragten.nl>

* remove default commission buttons

* Update matter-config-panel.ts

* only show for dev versions

---------

Co-authored-by: Bram Kragten <mail@bramkragten.nl>
---
 src/common/config/version.ts                    |  8 ++++++++
 .../matter/matter-config-panel.ts               | 17 +++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/common/config/version.ts b/src/common/config/version.ts
index ec89a3407e..cdfebc4196 100644
--- a/src/common/config/version.ts
+++ b/src/common/config/version.ts
@@ -22,3 +22,11 @@ export const atLeastVersion = (
       Number(haPatch) >= patch)
   );
 };
+
+export const isDevVersion = (version: string): boolean => {
+  if (__DEMO__) {
+    return false;
+  }
+
+  return version.includes("dev");
+};
diff --git a/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts b/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts
index eeb35d3e84..1f99075dc3 100644
--- a/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts
+++ b/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts
@@ -15,6 +15,7 @@ import "../../../../../components/ha-alert";
 import { showPromptDialog } from "../../../../../dialogs/generic/show-dialog-box";
 import { navigate } from "../../../../../common/navigate";
 import { isComponentLoaded } from "../../../../../common/config/is_component_loaded";
+import { isDevVersion } from "../../../../../common/config/version";
 
 @customElement("matter-config-panel")
 export class MatterConfigPanel extends LitElement {
@@ -61,15 +62,19 @@ export class MatterConfigPanel extends LitElement {
                     >Commission device with mobile app</mwc-button
                   >`
                 : ""}
+              ${isDevVersion(this.hass.config.version)
+                ? html`<mwc-button @click=${this._commission}
+                      >Commission device</mwc-button
+                    >
+                    <mwc-button @click=${this._acceptSharedDevice}
+                      >Add shared device</mwc-button
+                    >`
+                : ""}
               <mwc-button @click=${this._setWifi}
                 >Set WiFi Credentials</mwc-button
               >
-              <mwc-button @click=${this._setThread}>Set Thread</mwc-button>
-              <mwc-button @click=${this._commission}
-                >Commission device</mwc-button
-              >
-              <mwc-button @click=${this._acceptSharedDevice}
-                >Add shared device</mwc-button
+              <mwc-button @click=${this._setThread}
+                >Set Thread Credentials</mwc-button
               >
             </div>
           </ha-card>