Merge branch 'master' into lawallet-extension

getAlby · Mar 10, 2024 · 3342dab · 3342dab
2 parents 814a2d1 + 0a42b3d
commit 3342dab
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 46 deletions.
diff --git a/src/app/router/connectorRoutes.tsx b/src/app/router/connectorRoutes.tsx
@@ -107,12 +107,6 @@ const connectorMap: { [key: string]: ConnectorRoute } = {
     title: i18n.t("translation:choose_connector.lnd.title"),
     logo: lnd,
   },
-  "voltage-lnd": {
-    path: "lnd",
-    element: <ConnectVoltage />,
-    title: i18n.t("translation:choose_connector.lnd.title"),
-    logo: lnd,
-  },
   lnc: {
     path: "lnc",
     element: <ConnectLnc />,
@@ -256,8 +250,12 @@ function getConnectorRoutes(): ConnectorRoute[] {
     connectorMap["lnc"],
     connectorMap["commando"],
     connectorMap["lnbits"],
-    connectorMap["lnd-hub-go"],
-    connectorMap["eclair"],
+    connectorMap["nwc"],
+    getDistribution("umbrel"),
+    getDistribution("startos"),
+    getDistribution("raspiblitz"),
+    getDistribution("mynode"),
+    getDistribution("citadel"),
     connectorMap["btcpay"],
     connectorMap["voltage"],
     connectorMap[galoyPaths.blink],
@@ -269,6 +267,8 @@ function getConnectorRoutes(): ConnectorRoute[] {
     getDistribution("raspiblitz"),
     connectorMap["nwc"],
     connectorMap["lawallet"],
+    connectorMap["lnd-hub-go"],
+    connectorMap["eclair"],
   ];
 }
 

diff --git a/src/app/screens/connectors/ChooseConnectorPath/index.tsx b/src/app/screens/connectors/ChooseConnectorPath/index.tsx
@@ -20,7 +20,7 @@ export default function ChooseConnectorPath() {
         <h1 className="text-2xl font-bold dark:text-white text-center mb-8">
           {t("title")}
         </h1>
-        <div className="grid lg:grid-cols-3 gap-5 mb-4">
+        <div className="grid lg:grid-cols-2 gap-8 mb-4">
           <ConnectorPath
             title={t("other.title")}
             icon={
@@ -58,33 +58,7 @@ export default function ChooseConnectorPath() {
               </Link>
             }
           />
-          <ConnectorPath
-            title={t("voltage.title")}
-            icon={<img src="assets/icons/voltage.png" className="w-10 h-10" />}
-            description={t("voltage.description")}
-            content={
-              <>
-                <FeatureItem type="success">{t("voltage.point1")}</FeatureItem>
-                <FeatureItem type="success">{t("voltage.point2")}</FeatureItem>
-                <FeatureItem type="disabled">{t("voltage.point3")}</FeatureItem>
-                <FeatureItem type="success">{t("voltage.point4")}</FeatureItem>
-              </>
-            }
-            actions={
-              <Link
-                to="choose-connector/voltage"
-                rel="noreferrer noopener"
-                className="flex flex-1"
-              >
-                <Button
-                  tabIndex={-1}
-                  label={t("voltage.connect")}
-                  primary
-                  flex
-                />
-              </Link>
-            }
-          />
+
           <ConnectorPath
             title={t("alby.title")}
             icon={

diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
@@ -46,15 +46,6 @@
         "point3": "Both self-custody and custodial options",
         "point4": "No lightning and nostr address"
       },
-      "voltage": {
-        "title": "Voltage Cloud Node",
-        "description": "Great if you don't mind paying for a lightning node cloud service.",
-        "connect": "Connect",
-        "point1": "Start instantly, no waiting for an invite",
-        "point2": "No transaction or volume limits",
-        "point3": "Paid cloud service",
-        "point4": "Unique lightning and nostr address"
-      },
       "alby": {
         "title": "Alby Account",
         "description": "Ideal for beginners or anyone looking for a great daily spending wallet.",

diff --git a/static/assets/icons/nwc.svg b/static/assets/icons/nwc.svg