diff --git a/src/panels/config/zha/zha-add-devices-page.ts b/src/panels/config/zha/zha-add-devices-page.ts index 05d627c80abf..f4a476582801 100644 --- a/src/panels/config/zha/zha-add-devices-page.ts +++ b/src/panels/config/zha/zha-add-devices-page.ts @@ -170,7 +170,7 @@ class ZHAAddDevicesPage extends LitElement { this._active = true; this._addDevicesTimeoutHandle = setTimeout( () => this._unsubscribe(), - 75000 + 120000 ); } diff --git a/src/panels/config/zha/zha-device-card.ts b/src/panels/config/zha/zha-device-card.ts index ec00a3de1014..312fe982c1e5 100644 --- a/src/panels/config/zha/zha-device-card.ts +++ b/src/panels/config/zha/zha-device-card.ts @@ -283,45 +283,50 @@ class ZHADeviceCard extends LitElement { this.showActions ? html`
- - ${this.hass!.localize( - "ui.dialogs.zha_device_info.buttons.reconfigure" - )} - - ${this.showHelp + ${this.device!.device_type !== "Coordinator" ? html` -
+ ${this.hass!.localize( - "ui.dialogs.zha_device_info.services.reconfigure" + "ui.dialogs.zha_device_info.buttons.reconfigure" )} -
- ` - : ""} + + ${this.showHelp + ? html` +
+ ${this.hass!.localize( + "ui.dialogs.zha_device_info.services.reconfigure" + )} +
+ ` + : ""} - - ${this.hass!.localize( - "ui.dialogs.zha_device_info.buttons.remove" - )} - - ${this.showHelp - ? html` -
+ ${this.hass!.localize( - "ui.dialogs.zha_device_info.services.remove" + "ui.dialogs.zha_device_info.buttons.remove" )} -
+ + ${this.showHelp + ? html` +
+ ${this.hass!.localize( + "ui.dialogs.zha_device_info.services.remove" + )} +
+ ` + : ""} ` : ""} ${this.device!.power_source === "Mains" && - this.device!.device_type === "Router" + (this.device!.device_type === "Router" || + this.device!.device_type === "Coordinator") ? html` ${this.hass!.localize( diff --git a/src/panels/config/zha/zha-node.ts b/src/panels/config/zha/zha-node.ts index b0f14683697f..d7b93438d7e7 100644 --- a/src/panels/config/zha/zha-node.ts +++ b/src/panels/config/zha/zha-node.ts @@ -67,7 +67,7 @@ export class ZHANode extends LitElement { showName showModelInfo .showEntityDetail=${false} - .showActions="${this.device.device_type !== "Coordinator"}" + showActions @zha-device-removed=${this._onDeviceRemoved} > `