chore: revert intermediate steps for btcpay

src/app/router/connectorRoutes.tsx

@@ -1,4 +1,5 @@
 import ChooseConnector from "@screens/connectors/ChooseConnector";
+import ConnectBtcpay from "@screens/connectors/ConnectBtcpay";
 import ConnectCitadel from "@screens/connectors/ConnectCitadel";
 import ConnectEclair from "@screens/connectors/ConnectEclair";
 import ConnectGaloy, { galoyUrls } from "@screens/connectors/ConnectGaloy";
@@ -13,8 +14,6 @@ import ConnectUmbrel from "@screens/connectors/ConnectUmbrel";
 import { Route } from "react-router-dom";
 import i18n from "~/i18n/i18nConfig";
 
-import ConnectBtcpayCommando from "~/app/screens/connectors/ConnectBtcpayCommando";
-import ConnectBtcpayLND from "~/app/screens/connectors/ConnectBtcpayLND";
 import ConnectNWC from "~/app/screens/connectors/ConnectNWC";
 import ConnectVoltage from "~/app/screens/connectors/ConnectVoltage";
 import ConnectCommando from "../screens/connectors/ConnectCommando";
@@ -82,24 +81,18 @@ const connectorMap: { [key: string]: ConnectorRoute } = {
     title: i18n.t("translation:choose_connector.umbrel_lightning_node.title"),
     logo: lightning_node,
   },
-  "btcpay-lnd": {
-    path: "lnd",
-    element: <ConnectBtcpayLND />,
-    title: i18n.t("translation:choose_connector.lnd.title"),
-    logo: lnd,
-  },
-  "btcpay-commando": {
-    path: "commando",
-    element: <ConnectBtcpayCommando />,
-    title: i18n.t("translation:choose_connector.commando.title"),
-    logo: core_ln,
-  },
   "raspiblitz-lnd": {
     path: "lnd",
     element: <ConnectRaspiBlitz />,
     title: i18n.t("translation:choose_connector.lnd.title"),
     logo: lnd,
   },
+  btcpay: {
+    path: "btcpay",
+    element: <ConnectBtcpay />,
+    title: i18n.t("translation:choose_connector.btcpay.title"),
+    logo: btcpay,
+  },
   "mynode-lnd": {
     path: "lnd",
     element: <ConnectMyNode />,
@@ -210,10 +203,6 @@ const distributionMap: { [key: string]: { logo: string; children: Route[] } } =
         connectorMap["lnbits"],
       ],
     },
-    btcpay: {
-      logo: btcpay,
-      children: [connectorMap["btcpay-lnd"], connectorMap["btcpay-commando"]],
-    },
     umbrel: {
       logo: umbrel,
       children: [
@@ -261,7 +250,7 @@ function getConnectorRoutes(): ConnectorRoute[] {
     connectorMap["lnbits"],
     connectorMap["lnd-hub-go"],
     connectorMap["eclair"],
-    getDistribution("btcpay"),
+    connectorMap["btcpay"],
     connectorMap["voltage"],
     connectorMap[galoyPaths.blink],
     connectorMap[galoyPaths.bitcoinJungle],

src/app/screens/connectors/ConnectBtcpayLND/index.tsx → src/app/screens/connectors/ConnectBtcpay/index.tsx

@@ -18,10 +18,10 @@ const initialFormData = {
   name: "",
 };
 
-export default function ConnectBtcpayLND() {
+export default function ConnectBtcpay() {
   const navigate = useNavigate();
   const { t } = useTranslation("translation", {
-    keyPrefix: "choose_connector.btcpay_lnd",
+    keyPrefix: "choose_connector.btcpay",
   });
   const [formData, setFormData] = useState(initialFormData);
   const [loading, setLoading] = useState(false);

src/app/screens/connectors/ConnectLnc/index.tsx

@@ -7,7 +7,7 @@ import { useNavigate } from "react-router-dom";
 import PasswordViewAdornment from "~/app/components/PasswordViewAdornment";
 import toast from "~/app/components/Toast";
 import msg from "~/common/lib/msg";
-import logo from "/static/assets/icons/lnd_lnc.png";
+import logo from "/static/assets/icons/lightning_terminal.png";
 
 const initialFormData = Object.freeze({
   pairingPhrase: "",

src/i18n/locales/en/translation.json

@@ -12,9 +12,9 @@
           "label": "Let's confirm you typed it correct:"
         },
         "errors": {
-          "enter_password": "Please enter a password.",
-          "confirm_password": "Please confirm your password.",
-          "mismatched_password": "Passwords don't match."
+          "enter_password": "Please enter a passcode.",
+          "confirm_password": "Please confirm your passcode.",
+          "mismatched_password": "Passcodes don't match."
         }
       },
       "test_connection": {
@@ -258,9 +258,7 @@
         }
       },
       "btcpay": {
-        "title": "BTCPay Server"
-      },
-      "btcpay_lnd": {
+        "title": "BTCPay Server",
         "page": {
           "title": "Connect to BTCPay LND",
           "instructions": "Navigate to your BTCPayServer and log in as an admin. Go to Server Settings > Services > LND REST - See information. Then Click \"See QR Code information\" and copy the QR Code data. Paste it below:"
@@ -273,19 +271,6 @@
           "connection_failed": "Connection failed. Is the BTCPay connection URL correct and accessible?"
         }
       },
-      "btcpay_commando": {
-        "page": {
-          "title": "Connect to BTCPay CLN",
-          "instructions": "Navigate to your BTCPayServer and log in as an admin. Go to Server Settings > Services > C- Lightning REST - See information. Then Click \"See QR Code information\" and copy the QR Code data. Paste it below:"
-        },
-        "config": {
-          "label": "Config data",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
-        },
-        "errors": {
-          "connection_failed": "Connection failed. Is the BTCPay connection URL correct and accessible?"
-        }
-      },
       "commando": {
         "title": "Core Lightning",
         "page": {