From e65283389d8e0bf66b3c2760f1c25d835bcbf5ed Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <11290930+bouwew@users.noreply.github.com>
Date: Sat, 24 Jul 2021 14:28:33 +0200
Subject: [PATCH] Update Plugwise config_flow once more (#53423)

---
 homeassistant/components/plugwise/config_flow.py | 11 +----------
 homeassistant/components/plugwise/const.py       |  4 ++--
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/plugwise/config_flow.py b/homeassistant/components/plugwise/config_flow.py
index abecda7f728..5f32aca13a0 100644
--- a/homeassistant/components/plugwise/config_flow.py
+++ b/homeassistant/components/plugwise/config_flow.py
@@ -42,14 +42,7 @@ _LOGGER = logging.getLogger(__name__)
 CONF_MANUAL_PATH = "Enter Manually"
 
 CONNECTION_SCHEMA = vol.Schema(
-    {
-        vol.Required(FLOW_TYPE, default=FLOW_NET): vol.In(
-            {
-                FLOW_NET: f"Network: {SMILE} / {STRETCH}",
-                FLOW_USB: "USB: To be added later",
-            }
-        ),
-    },
+    {vol.Required(FLOW_TYPE, default=FLOW_NET): vol.In([FLOW_NET, FLOW_USB])}
 )
 
 # PLACEHOLDER USB connection validation
@@ -148,8 +141,6 @@ class PlugwiseConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 user_input[CONF_PORT] = self.discovery_info[CONF_PORT]
                 user_input[CONF_USERNAME] = self.discovery_info[CONF_USERNAME]
 
-            self._async_abort_entries_match({CONF_HOST: user_input[CONF_HOST]})
-
             try:
                 api = await validate_gw_input(self.hass, user_input)
 
diff --git a/homeassistant/components/plugwise/const.py b/homeassistant/components/plugwise/const.py
index a7afbd9e197..a7a5c92a21c 100644
--- a/homeassistant/components/plugwise/const.py
+++ b/homeassistant/components/plugwise/const.py
@@ -5,11 +5,11 @@ ATTR_ILLUMINANCE = "illuminance"
 COORDINATOR = "coordinator"
 DEVICE_STATE = "device_state"
 DOMAIN = "plugwise"
-FLOW_NET = "flow_network"
+FLOW_NET = "Network: Smile/Stretch"
 FLOW_SMILE = "smile (Adam/Anna/P1)"
 FLOW_STRETCH = "stretch (Stretch)"
 FLOW_TYPE = "flow_type"
-FLOW_USB = "flow_usb"
+FLOW_USB = "USB: Stick - Coming soon"
 GATEWAY = "gateway"
 PW_TYPE = "plugwise_type"
 SCHEDULE_OFF = "false"