From 85d7d2add34643f8453ee4085a15f765cf70ba3f Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Wed, 10 Jan 2024 14:54:27 +0530
Subject: [PATCH 01/10] feat: new unlock screen

---
 src/app/components/PasswordForm/index.tsx     |  2 +-
 src/app/screens/Onboard/SetPassword/index.tsx | 51 +++++++++++--------
 src/i18n/locales/en/translation.json          | 11 ++--
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/app/components/PasswordForm/index.tsx b/src/app/components/PasswordForm/index.tsx
index cb9ea73dfd..e69962c800 100644
--- a/src/app/components/PasswordForm/index.tsx
+++ b/src/app/components/PasswordForm/index.tsx
@@ -88,7 +88,7 @@ export default function PasswordForm<
 
   return (
     <>
-      <div className="w-full">
+      <div className="w-full mt-8">
         <TextField
           autoFocus={autoFocus}
           id="password"
diff --git a/src/app/screens/Onboard/SetPassword/index.tsx b/src/app/screens/Onboard/SetPassword/index.tsx
index 9e4179fd63..8416253f5e 100644
--- a/src/app/screens/Onboard/SetPassword/index.tsx
+++ b/src/app/screens/Onboard/SetPassword/index.tsx
@@ -1,5 +1,9 @@
 import Button from "@components/Button";
 import PasswordForm from "@components/PasswordForm";
+import {
+  PopiconsCircleExclamationLine,
+  PopiconsLockOpenLine,
+} from "@popicons/react";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
@@ -33,27 +37,30 @@ export default function SetPassword() {
   }
 
   const unlockScreenshot = (
-    <img
-      src="assets/images/unlock_passcode.png"
-      alt="Unlock screen"
-      className="h-44"
-    />
+    <img src="assets/images/unlock_passcode.png" alt="Unlock screen" />
   );
 
   return (
     <form onSubmit={handleSubmit}>
       <div className="max-w-xl shadow-lg rounded-xl mx-auto relative lg:flex lg:space-x-8 bg-white dark:bg-surface-02dp pt-10 pb-10 px-10">
         <div>
-          <h1 className="text-2xl font-bold dark:text-white max-sm:text-center">
+          <h1 className="text-2xl font-bold dark:text-white text-center">
             {t("title")}
           </h1>
 
-          <p className="text-gray-500 my-5 dark:text-gray-400">
-            {t("description")}
-          </p>
-          <div className="w-full flex justify-center short:hidden my-5">
+          <div className="w-full flex justify-center my-8">
             {unlockScreenshot}
           </div>
+
+          <div className="flex flex-row text-gray-500 my-4 dark:text-gray-400">
+            <PopiconsLockOpenLine className="w-6 h-6 mr-2"></PopiconsLockOpenLine>
+            {t("description1")}
+          </div>
+          <div className="flex flex-row text-gray-500 my-4 dark:text-gray-400">
+            <PopiconsCircleExclamationLine className="w-6 h-6 mr-2"></PopiconsCircleExclamationLine>
+            {t("description2")}
+          </div>
+
           <div>
             <PasswordForm
               i18nKeyPrefix="welcome.set_password"
@@ -61,20 +68,20 @@ export default function SetPassword() {
               setFormData={setFormData}
             />
           </div>
+          <div className="mt-8 flex justify-center">
+            <Button
+              label={tCommon("actions.next")}
+              type="submit"
+              primary
+              disabled={
+                !formData.password ||
+                formData.password !== formData.passwordConfirmation
+              }
+              className="w-64"
+            />
+          </div>
         </div>
       </div>
-      <div className="my-8 flex justify-center">
-        <Button
-          label={tCommon("actions.next")}
-          type="submit"
-          primary
-          disabled={
-            !formData.password ||
-            formData.password !== formData.passwordConfirmation
-          }
-          className="w-64"
-        />
-      </div>
     </form>
   );
 }
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index 54b91d50f2..6cf85b962e 100644
--- a/src/i18n/locales/en/translation.json
+++ b/src/i18n/locales/en/translation.json
@@ -3,8 +3,9 @@
     "welcome": {
       "title": "Welcome to Alby",
       "set_password": {
-        "title": "Set an unlock passcode",
-        "description": "This passcode will allow you to unlock Alby on this device. It cannot be recovered, but may be changed later.",
+        "title": "Set extension unlock passcode",
+        "description1": "Set a passcode to unlock Alby Extension in this browser",
+        "description2": "Unlock passcode cannot be recovered, but may be changed ",
         "choose_password": {
           "label": "Choose an unlock passcode:"
         },
@@ -12,9 +13,9 @@
           "label": "Let's confirm you typed it correct:"
         },
         "errors": {
-          "enter_password": "Please enter a passcode.",
-          "confirm_password": "Please confirm your passcode.",
-          "mismatched_password": "Passcodes don't match."
+          "enter_password": "Please enter a password.",
+          "confirm_password": "Please confirm your password.",
+          "mismatched_password": "Passwords don't match."
         }
       },
       "test_connection": {

From c99af4d971aa60eec5e04bfca624711e370f5d82 Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Thu, 11 Jan 2024 12:12:19 +0530
Subject: [PATCH 02/10] feat: style changes in unlock screen

---
 src/app/screens/Onboard/SetPassword/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/Onboard/SetPassword/index.tsx b/src/app/screens/Onboard/SetPassword/index.tsx
index 8416253f5e..36365d5870 100644
--- a/src/app/screens/Onboard/SetPassword/index.tsx
+++ b/src/app/screens/Onboard/SetPassword/index.tsx
@@ -42,7 +42,7 @@ export default function SetPassword() {
 
   return (
     <form onSubmit={handleSubmit}>
-      <div className="max-w-xl shadow-lg rounded-xl mx-auto relative lg:flex lg:space-x-8 bg-white dark:bg-surface-02dp pt-10 pb-10 px-10">
+      <div className="max-w-xl rounded-2xl mx-auto relative lg:flex lg:space-x-8 bg-white dark:bg-surface-02dp pt-10 pb-10 px-10 border border-gray-200 dark:border-gray-700">
         <div>
           <h1 className="text-2xl font-bold dark:text-white text-center">
             {t("title")}

From 5e6befd4981169b86950ef6fb9ea641ab234feed Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Thu, 11 Jan 2024 12:20:29 +0530
Subject: [PATCH 03/10] chore: hidden image for short screen

---
 src/app/screens/Onboard/SetPassword/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/Onboard/SetPassword/index.tsx b/src/app/screens/Onboard/SetPassword/index.tsx
index 36365d5870..3811cf4a00 100644
--- a/src/app/screens/Onboard/SetPassword/index.tsx
+++ b/src/app/screens/Onboard/SetPassword/index.tsx
@@ -48,7 +48,7 @@ export default function SetPassword() {
             {t("title")}
           </h1>
 
-          <div className="w-full flex justify-center my-8">
+          <div className="w-full flex justify-center my-8 short:hidden">
             {unlockScreenshot}
           </div>
 

From b66f0d666b725f90ff448a5104d9de2bc2cb811c Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Thu, 11 Jan 2024 13:07:43 +0530
Subject: [PATCH 04/10] feat: choose connector and connector card improvements

---
 src/app/components/ConnectorPath/index.tsx           | 2 +-
 src/app/components/LinkButton/index.tsx              | 2 +-
 src/app/screens/connectors/ChooseConnector/index.tsx | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/components/ConnectorPath/index.tsx b/src/app/components/ConnectorPath/index.tsx
index 228ba097a7..8aeaf0d552 100644
--- a/src/app/components/ConnectorPath/index.tsx
+++ b/src/app/components/ConnectorPath/index.tsx
@@ -8,7 +8,7 @@ type Props = {
 
 function ConnectorPath({ title, icon, description, content, actions }: Props) {
   return (
-    <div className="flex flex-col p-10 border border-neutral-200 dark:border-neutral-700 rounded-2xl bg-white dark:bg-surface-02dp">
+    <div className="flex flex-col p-10 border border-gray-200 dark:border-neutral-700 rounded-2xl bg-white dark:bg-surface-02dp">
       <div className="flex flex-col sm:flex-row items-center mb-4 space-x-3">
         {icon}
         <h1 className="text-xl font-bold dark:text-white text-center">
diff --git a/src/app/components/LinkButton/index.tsx b/src/app/components/LinkButton/index.tsx
index 10f2a50c67..68adec4634 100644
--- a/src/app/components/LinkButton/index.tsx
+++ b/src/app/components/LinkButton/index.tsx
@@ -11,7 +11,7 @@ export default function LinkButton({ to, title, logo }: Props) {
     <Link to={to}>
       <div className="p-10 h-72 border border-neutral-200 dark:border-neutral-700 bg-white dark:bg-surface-02dp text-center overflow-hidden rounded-lg hover:bg-gray-50 dark:hover:bg-neutral-800 transition duration-200 flex flex-col justify-center space-y-4">
         <div>
-          <img src={logo} alt="logo" className="inline rounded-3xl w-32" />
+          <img src={logo} alt="logo" className="inline rounded-3xl w-32 mb-6" />
         </div>
         <div>
           <span className="block dark:text-white text-lg font-medium">
diff --git a/src/app/screens/connectors/ChooseConnector/index.tsx b/src/app/screens/connectors/ChooseConnector/index.tsx
index e209298570..64f73bbd13 100644
--- a/src/app/screens/connectors/ChooseConnector/index.tsx
+++ b/src/app/screens/connectors/ChooseConnector/index.tsx
@@ -25,11 +25,11 @@ export default function ChooseConnector({
             </p>
           )}
         </div>
-        <div className="flex flex-row flex-wrap justify-center -mb-4 -mx-2">
+        <div className="flex flex-row flex-wrap -mb-4 -mx-2">
           {connectorRoutes.map(({ path, title, logo }) => (
             <div
               key={path}
-              className="w-full sm:w-1/2 md:w-1/3 lg:w-1/4 mb-4 px-2"
+              className="w-full sm:w-1/2 md:w-1/3 lg:w-1/5 mb-4 px-2"
             >
               <LinkButton to={path} title={title} logo={logo} />
             </div>

From bdefb8901754a40af4f50452e1fb4e80a413a671 Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Thu, 11 Jan 2024 16:06:04 +0530
Subject: [PATCH 05/10] feat: refactor connector form improve connector screens

---
 src/app/components/ConnectorForm/index.tsx    |  29 +++++++++---------
 src/app/components/LinkButton/index.tsx       |   2 +-
 .../connectors/ConnectCommando/index.tsx      |  28 ++++++++++++-----
 .../screens/connectors/ConnectLnc/index.tsx   |   2 +-
 src/i18n/locales/en/translation.json          |  13 ++++----
 static/assets/icons/lnd_lnc.png               | Bin 0 -> 5397 bytes
 6 files changed, 44 insertions(+), 30 deletions(-)
 create mode 100644 static/assets/icons/lnd_lnc.png

diff --git a/src/app/components/ConnectorForm/index.tsx b/src/app/components/ConnectorForm/index.tsx
index 920aa8caa9..00a459e3a8 100644
--- a/src/app/components/ConnectorForm/index.tsx
+++ b/src/app/components/ConnectorForm/index.tsx
@@ -42,7 +42,7 @@ function ConnectorForm({
       )}
       {image && (
         <>
-          <div className="w-full mb-6">
+          <div className="w-96 mb-6">
             <img
               src={image}
               alt="Screenshot"
@@ -56,7 +56,7 @@ function ConnectorForm({
 
   return (
     <form onSubmit={onSubmit}>
-      <div className="max-w-xl mx-auto mt-6 relative bg-white dark:bg-surface-02dp p-7 shadow rounded-lg">
+      <div className="max-w-xl mx-auto mt-6 relative bg-white dark:bg-surface-02dp p-10 rounded-2xl border border-gray-200 darK:border-neutral-700">
         <div className="flex items-center mb-4">
           {logo && <img src={logo} className="w-16 mr-4 rounded-lg" />}
           {/*
@@ -70,9 +70,8 @@ function ConnectorForm({
             title
           )}
         </div>
-        {media}
         {description && (
-          <div className="text-gray-500 dark:text-white whitespace-pre-line">
+          <div className="text-gray-500 dark:text-white whitespace-pre-line mb-8">
             {typeof description === "string" ? (
               <p className="mb-6">{description}</p>
             ) : (
@@ -80,18 +79,18 @@ function ConnectorForm({
             )}
           </div>
         )}
+        {media}
         <div>{children}</div>
-      </div>
-
-      <div className="my-6 flex justify-center">
-        <Button
-          type="submit"
-          label={submitLabel}
-          loading={submitLoading}
-          disabled={submitDisabled}
-          primary
-          className="w-64"
-        />
+        <div className="mt-8 flex justify-center">
+          <Button
+            type="submit"
+            label={submitLabel}
+            loading={submitLoading}
+            disabled={submitDisabled}
+            primary
+            className="w-64"
+          />
+        </div>
       </div>
     </form>
   );
diff --git a/src/app/components/LinkButton/index.tsx b/src/app/components/LinkButton/index.tsx
index 68adec4634..e8c3416aec 100644
--- a/src/app/components/LinkButton/index.tsx
+++ b/src/app/components/LinkButton/index.tsx
@@ -9,7 +9,7 @@ type Props = {
 export default function LinkButton({ to, title, logo }: Props) {
   return (
     <Link to={to}>
-      <div className="p-10 h-72 border border-neutral-200 dark:border-neutral-700 bg-white dark:bg-surface-02dp text-center overflow-hidden rounded-lg hover:bg-gray-50 dark:hover:bg-neutral-800 transition duration-200 flex flex-col justify-center space-y-4">
+      <div className="p-10 h-72 border border-gray-200 dark:border-neutral-700 bg-white dark:bg-surface-02dp text-center overflow-hidden rounded-lg hover:bg-gray-50 dark:hover:bg-neutral-800 transition duration-200 flex flex-col justify-center space-y-4">
         <div>
           <img src={logo} alt="logo" className="inline rounded-3xl w-32 mb-6" />
         </div>
diff --git a/src/app/screens/connectors/ConnectCommando/index.tsx b/src/app/screens/connectors/ConnectCommando/index.tsx
index 19d64b8161..d197e667bf 100644
--- a/src/app/screens/connectors/ConnectCommando/index.tsx
+++ b/src/app/screens/connectors/ConnectCommando/index.tsx
@@ -1,4 +1,7 @@
-import Button from "@components/Button";
+import {
+  CaretDownIcon,
+  CaretUpIcon,
+} from "@bitcoin-design/bitcoin-icons-react/outline";
 import ConnectorForm from "@components/ConnectorForm";
 import TextField from "@components/form/TextField";
 import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
@@ -6,6 +9,7 @@ import * as secp256k1 from "@noble/secp256k1";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
+import Hyperlink from "~/app/components/Hyperlink";
 import PasswordViewAdornment from "~/app/components/PasswordViewAdornment";
 import toast from "~/app/components/Toast";
 import msg from "~/common/lib/msg";
@@ -151,12 +155,22 @@ export default function ConnectCommando() {
           onChange={handleChange}
         />
       </div>
-      <Button
-        onClick={() => {
-          setShowAdvanced(!showAdvanced);
-        }}
-        label={tCommon("advanced")}
-      />
+
+      <div className="text-center">
+        <Hyperlink onClick={() => setShowAdvanced(!showAdvanced)}>
+          {showAdvanced ? (
+            <>
+              {tCommon("hide_advanced")}
+              <CaretUpIcon className="h-4 w-4 inline-flex" />
+            </>
+          ) : (
+            <>
+              {tCommon("advanced")}
+              <CaretDownIcon className="h-4 w-4 inline-flex" />
+            </>
+          )}
+        </Hyperlink>
+      </div>
       {showAdvanced && (
         <div className="mt-6">
           <div className="mb-6">
diff --git a/src/app/screens/connectors/ConnectLnc/index.tsx b/src/app/screens/connectors/ConnectLnc/index.tsx
index aed88d1c2d..7e9ada8c1c 100644
--- a/src/app/screens/connectors/ConnectLnc/index.tsx
+++ b/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.png";
+import logo from "/static/assets/icons/lnd_lnc.png";
 
 const initialFormData = Object.freeze({
   pairingPhrase: "",
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index 6cf85b962e..6ed3a22dce 100644
--- a/src/i18n/locales/en/translation.json
+++ b/src/i18n/locales/en/translation.json
@@ -110,8 +110,8 @@
       "lnc": {
         "title": "Lightning Terminal (LNC)",
         "page": {
-          "title": "Connect to your LND node",
-          "description": "1. Open Lightning Terminal and choose <0>Lightning Node Connect</0> from the sidebar.<1/> 2. Click <0>Create a new session</0><1/>3. Label the session, choose desired permissions and submit<1/>4. <0>Copy pairing phrase</0> and paste it below."
+          "title": "Connect to Lightning Terminal (LNC)",
+          "description": "1. On Lightning Terminal sidebar choose <0>Lightning Node Connect</0>.<1/> 2. Click <0>Create a new session</0><1/>3. Label the session, choose desired permissions and submit<1/>4. <0>Copy pairing phrase</0> and paste it below."
         },
         "pairing_phrase": {
           "label": "Your pairing phrase ",
@@ -261,12 +261,12 @@
       "btcpay": {
         "title": "BTCPay Server",
         "page": {
-          "title": "Connect to your BTCPay LND node",
-          "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:"
+          "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:"
         },
         "config": {
           "label": "Config data",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.co"
         },
         "errors": {
           "connection_failed": "Connection failed. Is the BTCPay connection URL correct and accessible?"
@@ -994,7 +994,8 @@
   "common": {
     "password": "Password",
     "confirm_password": "Confirm Password",
-    "advanced": "Advanced",
+    "advanced": "Show advanced settings",
+    "hide_advanced": "Hide advanced settings",
     "success": "Success",
     "error": "Error",
     "settings": "Settings",
diff --git a/static/assets/icons/lnd_lnc.png b/static/assets/icons/lnd_lnc.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c0ef1da0b4bc71d7ab3cfeb63ad9396baaa1370
GIT binary patch
literal 5397
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

literal 0
HcmV?d00001


From b8ece36cc4df8924ce73953d60150bd731361ea8 Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Fri, 12 Jan 2024 12:44:01 +0530
Subject: [PATCH 06/10] feat: intermediate step for btcpay

---
 src/app/router/connectorRoutes.tsx            |  27 +++-
 .../ConnectBtcpayCommando/index.tsx           | 144 ++++++++++++++++++
 .../index.tsx                                 |   4 +-
 src/i18n/locales/en/translation.json          |  17 ++-
 4 files changed, 181 insertions(+), 11 deletions(-)
 create mode 100644 src/app/screens/connectors/ConnectBtcpayCommando/index.tsx
 rename src/app/screens/connectors/{ConnectBtcpay => ConnectBtcpayLND}/index.tsx (97%)

diff --git a/src/app/router/connectorRoutes.tsx b/src/app/router/connectorRoutes.tsx
index 6c7332c979..e9626b393b 100644
--- a/src/app/router/connectorRoutes.tsx
+++ b/src/app/router/connectorRoutes.tsx
@@ -1,5 +1,4 @@
 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";
@@ -14,6 +13,8 @@ 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";
@@ -81,6 +82,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 />,
@@ -153,12 +166,6 @@ const connectorMap: { [key: string]: ConnectorRoute } = {
     title: i18n.t("translation:choose_connector.bitcoin_jungle.title"),
     logo: galoyBitcoinJungle,
   },
-  btcpay: {
-    path: "btcpay",
-    element: <ConnectBtcpay />,
-    title: i18n.t("translation:choose_connector.btcpay.title"),
-    logo: btcpay,
-  },
   voltage: {
     path: "voltage",
     element: <ConnectVoltage />,
@@ -203,6 +210,10 @@ const distributionMap: { [key: string]: { logo: string; children: Route[] } } =
         connectorMap["lnbits"],
       ],
     },
+    btcpay: {
+      logo: btcpay,
+      children: [connectorMap["btcpay-lnd"], connectorMap["btcpay-commando"]],
+    },
     umbrel: {
       logo: umbrel,
       children: [
@@ -250,7 +261,7 @@ function getConnectorRoutes(): ConnectorRoute[] {
     connectorMap["lnbits"],
     connectorMap["lnd-hub-go"],
     connectorMap["eclair"],
-    connectorMap["btcpay"],
+    getDistribution("btcpay"),
     connectorMap["voltage"],
     connectorMap[galoyPaths.blink],
     connectorMap[galoyPaths.bitcoinJungle],
diff --git a/src/app/screens/connectors/ConnectBtcpayCommando/index.tsx b/src/app/screens/connectors/ConnectBtcpayCommando/index.tsx
new file mode 100644
index 0000000000..a7c1df15ea
--- /dev/null
+++ b/src/app/screens/connectors/ConnectBtcpayCommando/index.tsx
@@ -0,0 +1,144 @@
+import CompanionDownloadInfo from "@components/CompanionDownloadInfo";
+import ConnectorForm from "@components/ConnectorForm";
+import TextField from "@components/form/TextField";
+import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
+import fetchAdapter from "@vespaiach/axios-fetch-adapter";
+import axios from "axios";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom";
+import toast from "~/app/components/Toast";
+import msg from "~/common/lib/msg";
+
+import logo from "/static/assets/icons/btcpay.svg";
+
+const initialFormData = {
+  url: "",
+  macaroon: "",
+  name: "",
+};
+
+export default function ConnectBtcpayCommando() {
+  const navigate = useNavigate();
+  const { t } = useTranslation("translation", {
+    keyPrefix: "choose_connector.btcpay_commando",
+  });
+  const [formData, setFormData] = useState(initialFormData);
+  const [loading, setLoading] = useState(false);
+  const [hasTorSupport, setHasTorSupport] = useState(false);
+
+  function getConfigUrl(data: string) {
+    const configUrl = data.trim().replace("config=", "");
+    try {
+      return new URL(configUrl);
+    } catch (e) {
+      return null;
+    }
+  }
+  async function handleChange(event: React.ChangeEvent<HTMLInputElement>) {
+    const configUrl = getConfigUrl(event.target.value);
+    if (!configUrl) {
+      return;
+    }
+    const host = configUrl.host;
+    try {
+      const response = await axios.get<{
+        configurations: [{ uri: string; adminMacaroon: string }];
+      }>(configUrl.toString(), { adapter: fetchAdapter });
+
+      if (response.data.configurations[0].uri) {
+        setFormData({
+          url: response.data.configurations[0].uri,
+          macaroon: response.data.configurations[0].adminMacaroon,
+          name: host,
+        });
+      }
+    } catch (e) {
+      console.error(e);
+      toast.error(t("errors.connection_failed"));
+    }
+  }
+
+  function getConnectorType() {
+    if (formData.url.match(/\.onion/i) && !hasTorSupport) {
+      return "nativelnd";
+    }
+    // default to LND
+    return "lnd";
+  }
+
+  async function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    setLoading(true);
+    const { url, macaroon, name } = formData;
+    const account = {
+      name: name || "LND",
+      config: {
+        macaroon,
+        url,
+      },
+      connector: getConnectorType(),
+    };
+
+    try {
+      let validation;
+      // TODO: for native connectors we currently skip the validation because it is too slow (booting up Tor etc.)
+      if (account.connector === "nativelnd") {
+        validation = { valid: true, error: "" };
+      } else {
+        validation = await msg.request("validateAccount", account);
+      }
+
+      if (validation.valid) {
+        const addResult = await msg.request("addAccount", account);
+        if (addResult.accountId) {
+          await msg.request("selectAccount", {
+            id: addResult.accountId,
+          });
+          navigate("/test-connection");
+        }
+      } else {
+        toast.error(
+          <ConnectionErrorToast message={validation.error as string} />
+        );
+      }
+    } catch (e) {
+      console.error(e);
+      let message = "";
+      if (e instanceof Error) {
+        message += `${e.message}`;
+      }
+      toast.error(<ConnectionErrorToast message={message} />);
+    }
+    setLoading(false);
+  }
+
+  return (
+    <ConnectorForm
+      title={t("page.title")}
+      description={t("page.instructions")}
+      logo={logo}
+      submitLoading={loading}
+      submitDisabled={formData.url === "" || formData.macaroon === ""}
+      onSubmit={handleSubmit}
+    >
+      <TextField
+        id="btcpay-config"
+        label={t("config.label")}
+        placeholder={t("config.placeholder")}
+        onChange={handleChange}
+        required
+        autoFocus={true}
+      />
+      {formData.url.match(/\.onion/i) && (
+        <div className="mt-6">
+          <CompanionDownloadInfo
+            hasTorCallback={(hasTor: boolean) => {
+              setHasTorSupport(hasTor);
+            }}
+          />
+        </div>
+      )}
+    </ConnectorForm>
+  );
+}
diff --git a/src/app/screens/connectors/ConnectBtcpay/index.tsx b/src/app/screens/connectors/ConnectBtcpayLND/index.tsx
similarity index 97%
rename from src/app/screens/connectors/ConnectBtcpay/index.tsx
rename to src/app/screens/connectors/ConnectBtcpayLND/index.tsx
index 5efb6d0376..5ece6082ef 100644
--- a/src/app/screens/connectors/ConnectBtcpay/index.tsx
+++ b/src/app/screens/connectors/ConnectBtcpayLND/index.tsx
@@ -18,10 +18,10 @@ const initialFormData = {
   name: "",
 };
 
-export default function ConnectBtcpay() {
+export default function ConnectBtcpayLND() {
   const navigate = useNavigate();
   const { t } = useTranslation("translation", {
-    keyPrefix: "choose_connector.btcpay",
+    keyPrefix: "choose_connector.btcpay_lnd",
   });
   const [formData, setFormData] = useState(initialFormData);
   const [loading, setLoading] = useState(false);
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index 6ed3a22dce..6de25d32f7 100644
--- a/src/i18n/locales/en/translation.json
+++ b/src/i18n/locales/en/translation.json
@@ -259,7 +259,9 @@
         }
       },
       "btcpay": {
-        "title": "BTCPay Server",
+        "title": "BTCPay Server"
+      },
+      "btcpay_lnd": {
         "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:"
@@ -272,6 +274,19 @@
           "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": {

From 25e32222f6357211b3b4c8c0758aa214a77f4907 Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Fri, 12 Jan 2024 13:06:18 +0530
Subject: [PATCH 07/10] chore: styling descriptions

---
 src/app/components/ConnectorForm/index.tsx           | 2 +-
 src/app/screens/connectors/ChooseConnector/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/ConnectorForm/index.tsx b/src/app/components/ConnectorForm/index.tsx
index 00a459e3a8..ee35c2bd04 100644
--- a/src/app/components/ConnectorForm/index.tsx
+++ b/src/app/components/ConnectorForm/index.tsx
@@ -71,7 +71,7 @@ function ConnectorForm({
           )}
         </div>
         {description && (
-          <div className="text-gray-500 dark:text-white whitespace-pre-line mb-8">
+          <div className="text-gray-700 dark:text-white whitespace-pre-line mb-8">
             {typeof description === "string" ? (
               <p className="mb-6">{description}</p>
             ) : (
diff --git a/src/app/screens/connectors/ChooseConnector/index.tsx b/src/app/screens/connectors/ChooseConnector/index.tsx
index 64f73bbd13..5c82ef5b8b 100644
--- a/src/app/screens/connectors/ChooseConnector/index.tsx
+++ b/src/app/screens/connectors/ChooseConnector/index.tsx
@@ -25,7 +25,7 @@ export default function ChooseConnector({
             </p>
           )}
         </div>
-        <div className="flex flex-row flex-wrap -mb-4 -mx-2">
+        <div className="flex flex-row flex-wrap justify-center -mb-4 -mx-2">
           {connectorRoutes.map(({ path, title, logo }) => (
             <div
               key={path}

From 46473cff726bee363b852a2685fbe696e801fc41 Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Fri, 2 Feb 2024 11:43:46 +0530
Subject: [PATCH 08/10] feat: refactor connector form

---
 src/app/components/ConnectorForm/index.tsx | 14 +++++++-------
 src/app/router/Welcome/Welcome.tsx         | 19 +------------------
 src/i18n/locales/en/translation.json       |  1 -
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/app/components/ConnectorForm/index.tsx b/src/app/components/ConnectorForm/index.tsx
index ee35c2bd04..5a9117d6c8 100644
--- a/src/app/components/ConnectorForm/index.tsx
+++ b/src/app/components/ConnectorForm/index.tsx
@@ -32,7 +32,7 @@ function ConnectorForm({
     <div className="flex h-full justify-center items-center">
       {video && (
         <div
-          className="flex-1 relative h-0 mb-6"
+          className="flex-1 relative h-0"
           style={{ paddingBottom: "56.25%" }}
         >
           <video className="absolute t-0 l-0 w-full h-full" controls>
@@ -42,7 +42,7 @@ function ConnectorForm({
       )}
       {image && (
         <>
-          <div className="w-96 mb-6">
+          <div className="w-96">
             <img
               src={image}
               alt="Screenshot"
@@ -56,8 +56,8 @@ function ConnectorForm({
 
   return (
     <form onSubmit={onSubmit}>
-      <div className="max-w-xl mx-auto mt-6 relative bg-white dark:bg-surface-02dp p-10 rounded-2xl border border-gray-200 darK:border-neutral-700">
-        <div className="flex items-center mb-4">
+      <div className="flex flex-col max-w-xl mx-auto mt-6 relative bg-white dark:bg-surface-02dp p-10 rounded-2xl border border-gray-200 dark:border-neutral-700 gap-4">
+        <div className="flex items-center">
           {logo && <img src={logo} className="w-16 mr-4 rounded-lg" />}
           {/*
               TODO: this can be simplified to always wrap the title in h1, without checking if it
@@ -71,7 +71,7 @@ function ConnectorForm({
           )}
         </div>
         {description && (
-          <div className="text-gray-700 dark:text-white whitespace-pre-line mb-8">
+          <div className="text-gray-700 dark:text-white whitespace-pre-line">
             {typeof description === "string" ? (
               <p className="mb-6">{description}</p>
             ) : (
@@ -79,9 +79,9 @@ function ConnectorForm({
             )}
           </div>
         )}
-        {media}
+        {video || (image && media)}
         <div>{children}</div>
-        <div className="mt-8 flex justify-center">
+        <div className="mt-4 flex justify-center">
           <Button
             type="submit"
             label={submitLabel}
diff --git a/src/app/router/Welcome/Welcome.tsx b/src/app/router/Welcome/Welcome.tsx
index bdfcab35fe..7519f8a233 100644
--- a/src/app/router/Welcome/Welcome.tsx
+++ b/src/app/router/Welcome/Welcome.tsx
@@ -3,7 +3,6 @@ import SetPassword from "@screens/Onboard/SetPassword";
 import TestConnection from "@screens/Onboard/TestConnection";
 import ChooseConnector from "@screens/connectors/ChooseConnector";
 import { useState } from "react";
-import { useTranslation } from "react-i18next";
 import { Outlet, Route, HashRouter as Router, Routes } from "react-router-dom";
 import Container from "~/app/components/Container";
 import LocaleSwitcher from "~/app/components/LocaleSwitcher/LocaleSwitcher";
@@ -54,8 +53,6 @@ function Welcome() {
 }
 
 function Layout() {
-  const { t } = useTranslation();
-
   const [languageChanged, setLanguageChanged] = useState(false);
   i18n.on("languageChanged", () => {
     // Trigger rerender to update displayed language
@@ -70,21 +67,7 @@ function Layout() {
       <div className="flex justify-center items-center">
         <div className="w-full">
           <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 mb-8">
-            <div className="text-center font-serif font-medium text-2xl mt-8 dark:text-white">
-              <p>
-                {t("welcome.title")}
-                <img
-                  src="assets/icons/alby_icon_yellow.svg"
-                  alt="Alby"
-                  className="dark:hidden inline align-middle w-6 ml-2"
-                />
-                <img
-                  src="assets/icons/alby_icon_yellow_dark.svg"
-                  alt="Alby"
-                  className="hidden dark:inline align-middle w-6 ml-2"
-                />
-              </p>
-            </div>
+            <div className="text-center font-serif font-medium text-2xl mt-8 dark:text-white"></div>
           </div>
           <Container maxWidth="xl">
             <Outlet />
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index 8d5feb741e..485bfa5dc8 100644
--- a/src/i18n/locales/en/translation.json
+++ b/src/i18n/locales/en/translation.json
@@ -1,7 +1,6 @@
 {
   "translation": {
     "welcome": {
-      "title": "Welcome to Alby",
       "set_password": {
         "title": "Set extension unlock passcode",
         "description1": "Set a passcode to unlock Alby Extension in this browser",

From c7bdfb7f9842b9e4ee517c09cc624825f8e7e22d Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Wed, 7 Feb 2024 12:03:58 +0530
Subject: [PATCH 09/10] chore: revert intermediate steps for btcpay

---
 src/app/router/connectorRoutes.tsx            |  27 +---
 .../index.tsx                                 |   4 +-
 .../ConnectBtcpayCommando/index.tsx           | 144 ------------------
 .../screens/connectors/ConnectLnc/index.tsx   |   2 +-
 src/i18n/locales/en/translation.json          |  23 +--
 static/assets/icons/lnd_lnc.png               | Bin 5397 -> 0 bytes
 6 files changed, 15 insertions(+), 185 deletions(-)
 rename src/app/screens/connectors/{ConnectBtcpayLND => ConnectBtcpay}/index.tsx (97%)
 delete mode 100644 src/app/screens/connectors/ConnectBtcpayCommando/index.tsx
 delete mode 100644 static/assets/icons/lnd_lnc.png

diff --git a/src/app/router/connectorRoutes.tsx b/src/app/router/connectorRoutes.tsx
index e9626b393b..c1330dc54e 100644
--- a/src/app/router/connectorRoutes.tsx
+++ b/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],
diff --git a/src/app/screens/connectors/ConnectBtcpayLND/index.tsx b/src/app/screens/connectors/ConnectBtcpay/index.tsx
similarity index 97%
rename from src/app/screens/connectors/ConnectBtcpayLND/index.tsx
rename to src/app/screens/connectors/ConnectBtcpay/index.tsx
index 5ece6082ef..5efb6d0376 100644
--- a/src/app/screens/connectors/ConnectBtcpayLND/index.tsx
+++ b/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);
diff --git a/src/app/screens/connectors/ConnectBtcpayCommando/index.tsx b/src/app/screens/connectors/ConnectBtcpayCommando/index.tsx
deleted file mode 100644
index a7c1df15ea..0000000000
--- a/src/app/screens/connectors/ConnectBtcpayCommando/index.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import CompanionDownloadInfo from "@components/CompanionDownloadInfo";
-import ConnectorForm from "@components/ConnectorForm";
-import TextField from "@components/form/TextField";
-import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
-import fetchAdapter from "@vespaiach/axios-fetch-adapter";
-import axios from "axios";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
-import toast from "~/app/components/Toast";
-import msg from "~/common/lib/msg";
-
-import logo from "/static/assets/icons/btcpay.svg";
-
-const initialFormData = {
-  url: "",
-  macaroon: "",
-  name: "",
-};
-
-export default function ConnectBtcpayCommando() {
-  const navigate = useNavigate();
-  const { t } = useTranslation("translation", {
-    keyPrefix: "choose_connector.btcpay_commando",
-  });
-  const [formData, setFormData] = useState(initialFormData);
-  const [loading, setLoading] = useState(false);
-  const [hasTorSupport, setHasTorSupport] = useState(false);
-
-  function getConfigUrl(data: string) {
-    const configUrl = data.trim().replace("config=", "");
-    try {
-      return new URL(configUrl);
-    } catch (e) {
-      return null;
-    }
-  }
-  async function handleChange(event: React.ChangeEvent<HTMLInputElement>) {
-    const configUrl = getConfigUrl(event.target.value);
-    if (!configUrl) {
-      return;
-    }
-    const host = configUrl.host;
-    try {
-      const response = await axios.get<{
-        configurations: [{ uri: string; adminMacaroon: string }];
-      }>(configUrl.toString(), { adapter: fetchAdapter });
-
-      if (response.data.configurations[0].uri) {
-        setFormData({
-          url: response.data.configurations[0].uri,
-          macaroon: response.data.configurations[0].adminMacaroon,
-          name: host,
-        });
-      }
-    } catch (e) {
-      console.error(e);
-      toast.error(t("errors.connection_failed"));
-    }
-  }
-
-  function getConnectorType() {
-    if (formData.url.match(/\.onion/i) && !hasTorSupport) {
-      return "nativelnd";
-    }
-    // default to LND
-    return "lnd";
-  }
-
-  async function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
-    event.preventDefault();
-    setLoading(true);
-    const { url, macaroon, name } = formData;
-    const account = {
-      name: name || "LND",
-      config: {
-        macaroon,
-        url,
-      },
-      connector: getConnectorType(),
-    };
-
-    try {
-      let validation;
-      // TODO: for native connectors we currently skip the validation because it is too slow (booting up Tor etc.)
-      if (account.connector === "nativelnd") {
-        validation = { valid: true, error: "" };
-      } else {
-        validation = await msg.request("validateAccount", account);
-      }
-
-      if (validation.valid) {
-        const addResult = await msg.request("addAccount", account);
-        if (addResult.accountId) {
-          await msg.request("selectAccount", {
-            id: addResult.accountId,
-          });
-          navigate("/test-connection");
-        }
-      } else {
-        toast.error(
-          <ConnectionErrorToast message={validation.error as string} />
-        );
-      }
-    } catch (e) {
-      console.error(e);
-      let message = "";
-      if (e instanceof Error) {
-        message += `${e.message}`;
-      }
-      toast.error(<ConnectionErrorToast message={message} />);
-    }
-    setLoading(false);
-  }
-
-  return (
-    <ConnectorForm
-      title={t("page.title")}
-      description={t("page.instructions")}
-      logo={logo}
-      submitLoading={loading}
-      submitDisabled={formData.url === "" || formData.macaroon === ""}
-      onSubmit={handleSubmit}
-    >
-      <TextField
-        id="btcpay-config"
-        label={t("config.label")}
-        placeholder={t("config.placeholder")}
-        onChange={handleChange}
-        required
-        autoFocus={true}
-      />
-      {formData.url.match(/\.onion/i) && (
-        <div className="mt-6">
-          <CompanionDownloadInfo
-            hasTorCallback={(hasTor: boolean) => {
-              setHasTorSupport(hasTor);
-            }}
-          />
-        </div>
-      )}
-    </ConnectorForm>
-  );
-}
diff --git a/src/app/screens/connectors/ConnectLnc/index.tsx b/src/app/screens/connectors/ConnectLnc/index.tsx
index 7e9ada8c1c..79c01ab8d5 100644
--- a/src/app/screens/connectors/ConnectLnc/index.tsx
+++ b/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: "",
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index 485bfa5dc8..19c7ed1e4d 100644
--- a/src/i18n/locales/en/translation.json
+++ b/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": {
diff --git a/static/assets/icons/lnd_lnc.png b/static/assets/icons/lnd_lnc.png
deleted file mode 100644
index 6c0ef1da0b4bc71d7ab3cfeb63ad9396baaa1370..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5397
zcmV+w73%7VP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH6sk!?K~#7FrCV!o
zUDb8|_R*CrS$^OLmO}x{4g_!jYZ?kTKx`f%kd|N|0n$Qd=p${INy3k&OsBL!W@t+$
znK~U>$~2v}89Id$TJtmsLx4Dr8w|A^Q(nfz2HUb6Y;4&wwxoMj_u1>Q*SV5RXE^rN
zz4x5`SkG^*z4pEVE!VAQ-LgCoR)iv48Gzmp|Ah1}zQ-^8ov-wrKge@w>)KVHQxkyF
zy})<!eQ7J-ivZ$Q{H%!mbfVzql=&#g<aXblbBF4C9HT#e?jH%Gciyz>j;)?w<psC&
z-EvGvLAS^Dw@7CSIy#7oprlts2JJ|4m-Jy4LY;_Aboxw?u|p=3Ae;wb+JtKT3vx1d
z^EiRVw`wdMz{ZyO+7MR0UyM|O*k=N$m~RAnHU#Q3ts+FGbu#?`7K8|`$dhJG)R|BB
zg-8l5Oo;`spoLJK&<mjm?tWGR$xvoBNX!ReR_Qh&d7<_n38NQQLMYN;QS*dyNfaB!
z3uXEn-&rf^CVz;drzau}u>vBdhF{en{GQ~_?<`RsCEbyae4hu2^CFboj?z1iV)r5R
z35_-<x8*V8(?Bw%(oqsY##Q?Iy2_5*)8tY6y#dX)Dj_+IW{o+suZENxR3Mu|?&mO}
zZkiO}{a-a7#N?AQTQEZG1LOU>P}y65m|Lj@D0VoDuKH#7t6G+{ya8(74zXZLp2Lb(
z5|THGq#?A1L@hB}@lF{(6v9UJDzc{4%rj_+uM5qUI^=PsIh`qF8)JDh)v9rZMOHi9
zB-&L-6Z^G?$s$y5)t69S)rg<^GPz2nc28DUX;@`WDlBD3^cGDlbyDXQnnbmZqKa3?
zsDUtdNbS;~rW5nEWX6g`LPjOP;F%632OHAoln}<0#r_3tQe0U?|L9}CQom7mH=i}%
zf%8|v1!9em`oG+i_tY18Y}Ou`+VY%PS=uMwEvYuQ0Ehfd&y$BIrlr3Ul}xxKrMEUu
z$go7c4JE|^R4D9I;9j9%0IIB^l4}s7BKD7Dz?3!0G8b)1SO<|=Y9yILiYKgWiL`2P
z$#sdpYg~Yg8?7Kc1S~>xw~{f8vLTbRKzGTVWMoM0DpJWBC)JiRWm*ta6|I{I)Fqou
zhzz~SqcWM5YI`0(b?iE(J1Dz~;`yBfHnKf<o23*Pq`g{#(P>sHU3k1g8<(U8rh*{z
zUs9KV#UXWv;LKMaxKK&XvQ2n-9EDbyx2>}yT(j~foN{R&G+>bvswySGh-EiHc41W#
zs6M$DLg}ocp*q)SL>xsJ{1rUZt`y73+Y$t-LV%M6hbuN$olIcgTt!Wv?*v@-r&pt+
zyA#{izo8x@=&gAXQ(9VZt!znw4(djUqy&Z}85HM*P9o|%k|jFxMBTXR_cS5OR-tZT
zxEGR6#HCUKLUjOg8Z}F)zMS^yCFni-WITV*Y8>2iAkUy81&2SX(-KI5O5D_Vsku+)
zqh=xTVWT9<$w8Dyg4TllUSqo|8dM9tA?E{dfT<yq-9eHDGb9d!$RRKOnKowz&beV3
zUVmm2Hm`Zbj3QeJ2QhN7U#9~MX1Td!k&-7+83eU+%RDs_$572s!hs+dAgE97DkYWR
zbkheYuT9mD`X2Xl-b~p?qXya=Sbp<mY2=^$<B!lB9mCl-E(@36_IaVpSqo|CBX129
z94waVDI~t$f(hiT2?+$DCYG2Aj#SO51AAgJhbp$}K*5<d^m#UO(KLIpfS<NYKAK$f
zv<P@7U$7X@tb7c^dk<pXDZhqKeBnIo-aL@qCYyF}z^LY31=WzTSzU#))>#QTCvh%b
zh%~%1{lX?2GvKvN8r`U_R1F1g;X&+R=DXQFy5~&C`M-Aw-uTJO*!t3z7zPR~`^sh5
z_4*FH_~2U9uqP7{oTULZOSA==p%RHD!1=CMTp=S%<|HPTI|nu^f;VyG3{BjDC0;Uf
zLHRTQqMR*4%(wb***8|;!0!E6efO&L?BcKeCg%3e!_(hhg|aMRityl<AuW(IbC^I%
z;?-XW<`+=sD-D$OR-sIiBT#fis?q9OGj<-MvG{6+F*M@@rE6+phjX8Fzl<K)jO*<(
zzM7#e<r`JYU%z^3IN{7*Ja^v@F?wW#j$3>@PQCa{tbb@N_7Col0lJOQ)>geEM4SkX
z2EVsAD1A=f+e|3B+$|Am)<!|GLDFRyuPI4uFn>YPPy)FaDOWO|HO0^1LrH@g_*Ahp
zl}(B`bfvIDb5RN@2#+<|Y0ZiiVXVE~2AeiC6jr>x0q1?`Li9hj9$R006H{aMciA_t
z!q)X~;>Cy7VfLT>E{Yl5)@Mp|jT4XQ$n?02;>08G?#J+!ofv%LzcIRJh#P5ilrFNG
zC&9FYL8;_st|cuEsB&tH8brtyZ6TR8GWak+ss!TS!(|!XJ#e7b@8FCXIPT`FQmkM5
z{by6(v#vc4(~q5jAOHQ67#kU_n6LF|QhjcJg`&Wed9yHk>Bn)(Z8u`Z;$F%aVSud0
zX?dCAV8LG~qkcv<4Idsq>K7SU>Zrk@gUq;d`?loI{<?3|emwlm|G@i0?_<%@kKvr_
z&c`$Ntfu|D_8o=Q559`d4xI4&pA8*zXMoHlIDxS!z__IphQecL4l!uWrozPhXAm&J
zg7d%l@BKr=*t2_At>6B`O|0)Yrds&WXaD#rY<b}g^gr>UEXeSouC}fzIQBDV8!c*~
zju-fFC~E<J$O}{w08qV$*0Mzw07*4Ss!5C{!Mc<zp)jy>J7&+Fhqgw;`o4AAY54Nz
z7KbYFdGcHTB?8TVYx6WqZ2sO8PC8O@YYUiv$yu0s!n|7hnM*#3ckX|hw0KfVIh2<b
zsPWbyNnbg|<eDFm13_}Lwh|^jMZTD;QIhdDwHqB7!Qif)IPUlpt?yVz2R6>0i+ApM
zk`C@UD3}FmBN{hX1$4XDzFaSn%lp1fzofoz{ZS}lw9u<DeJaq|9?HXGi4tWcDT@s{
zXmzNdoW_!bL=B&0NewWW4FFn=aW%nwFZbI$umjDpv0Cp3)(>Fg3tK`RcP5)Fn=RQD
zg*!Bi(S5_?+O|*a%DD@?Tju3+Dx&1UHMOnzp(P*_U8TB|0VWyz>LhwKn@tStc&FBX
zw9$@VE?(>emm<j|%#Xtxp)G_7-NvH;Ia+ENU9JdaDP?JC;Q~jwf(lIgmg*LSaiMc}
zbc2y2himt?FIt4*Y151`Od4=FOBErA)s~q2B32N&g&X;ViQkJ_=re7a3#6-@L<l~E
ztXoQ&6w~7}x3&HDx3|{rH6t)?IpYjx+L&Z6c8$_oLaOUcY%`YEIRB*Vri%S&2vAEw
zMM~bBFG=->%hQ+$1R3^iw%j*F=BMMTzq|q8x%=^2pJL=7mVI;vp5HQL_jWB<fE$+e
zV)5*bG{?HudF-7D<Sb5ahDk!SD1;+aD#2#fb9KG&rq4{V62vgXm+9zvK&?H0xa1Em
z#mr-8j_WgecogRjzCDiEAH`j|eFN`d-{3w>#t;;rs6OdLCg5mEQgA>^8FRECLM=dn
zY;uw`ObP^KondS81!wf)H?BAvKfL!TOeBDx-}^XD{NGn<_c!iq;{N;BVfEiUI_W&J
z+I0L+P8eldHw=(KC+m22r$Q<$!3}8ADnB4JiIkIj=qj(Hs~unXi|a5PL({Rn$BygM
z-r0`Jzy4eJ!;2SUT1QcPw&Rm$qi50l2^lKIzDfyISz(jvMv5+!g+SsDT4$@0KjiT;
z_@NFIG&wRuP}bVbm@_l3V%w6YPde-52?cQK1s})h=bVJkE$FH}+toE4FOM|F^{L$V
zlnWMzR;{;&+E&^O`1rk6q)~-6ST4Fzq1!xKyi^&4$t*xpODS5$mb>5i74BMbSK5g^
zRApx;FRb-B6fNW1*Zg%FvDq;NjVrIjSmzXb{`!(WEEy}&(a6@(7T5h3-F!J-U-N4E
zUP|;YD1^zCqZ%YFta1^HY?nCEn?aCT-^ncFC|9WUQOp4y6+5&~TTGD`ZroTGP<J<e
zF>r8PpQrD65+#)a%Wj!F*+rZ=WPy<BQ^T#~0onhxDRKm`3h+d8l-Uo($Eda$ipj78
zSr9#MzKO1(q1yBQ9S1OUIH%3!STkz>6-M(sK%k?bGaGww$s8AU`IX(a5Un{3V8&&h
z4}ckE!}^-hWYlgYEcdGZhh~#{H*Bc2srvoTJGqcj^0G3NPILbA#8gQdBMK?aL>--!
zYJ$YlRHC4}IoXUSpM)V*CxI`jWcf`fGJe7Z)w$c=rdjXpt+jdM-9s2WFw)vp_X#*B
z5cb=rb&Z>&87oUAl^HZi1t?rf3E#@%_Q<Ic93CfK4L0LOx4L?z%n});ZLEm|0PiM*
zSs$4lzIypd<J!IO_I~C%Sar^#PIVPiI>N%wFGJi^t@SHojbZe_A<BLH2?m&Is?Sx-
z(XDD-IFsDtQyQAvwp?@O%)$Q7y>dcC)KhyyI1(y!Uo?&}cF81P6cO#Oz4Ll>cDJEt
z_aFx6^;o-sp%Lude*`Da>cpr2`PNuGY1YPRo6?c`w_f{RO=UPacmwEJ60426UEYFB
z+vWzfQxzrqo(*2aBINw}^D(Vj!8KxWyuE3!=D61wCca3q2IpUY0Zu%90Un8a0rOwl
zFs|jgZ48h_M?2c%&ar<@#C&z_UiV5(%Q^mwwdy7x@p&d9@m;f7>s&YHMqIg7%uksz
z1s~=rg{Yo|J!#GG-1ncwTQ6;)lcpEAWYP3m+dac0cx7<-|2_8BRX@eR+D)!vU3w%6
z8SL3Dq#|UlZ_-k;;Jh(}ius<N9<;Z&<HKBfBBL#Ca;*51t1<Z2E<APbYHD;gqAPq6
zSAL`ojnUCspN%^YeBii8-aCL-zxOz{Jp4Q<2x}A)6^1hNM8bE%00Scj2YhDGnSSr+
z$50IVGkJC%D0L1Q0rY$(s%pSR#rC)}#OZC-wmZi3YSc@=d?}9m*m3xWuiTsb^;0)2
z$K2!RV%1mg!|6MRacI^o>oc{zK>uqSV%}a*+H(oAaUqM^Lj!v;^yUtkUf1?%>z=Be
zq5_)d=3OJn1yd?qKe{H6TV@_pkM;wdL5q=)`e#DQe4I9kto6|3!Z0jUCCXC!MV~kc
z%YJ(qp1SWT?09VlPFQ>bmfv_GR{!0T*!GKU)E#?w@7a@!pYg-?*MbSepD|8W<qn+a
zF_emlA|<_)w&w~B3C23#NSmXjPhdd)7@%cz8a*@wiK|RhDb{>L1CQBU8avW-O*H)-
zZ|uOD2iBmys{_~m`E?lByc265TFZGwOA6s~i;#f~)<&~9Qsp8@6(_eV{SGzMOG3&6
zSUHrFpHla@Bnv7HLi71twRdspkdq>^2bN4ZI<NTJ6`0vG6aRASzsCCDD6aVW6_|7U
z9Q^wo59A$TGC>NM$rxD(`b;^2OKzC%l3XM+Rj87969&9HY|NSv91$ShTFOM(q>^c6
zCAhd@7G&BFr+xC&aAEZI$Nu(l>>b!ky=N}K(yN!^(Up(lS8wlTzeSCq9Fg+e<ir|e
ziKm%pVz7jOT-`b>ea=x%cZXe~$46&UJGY3`BVdLTsLdDzK*$vZrJW8^J?*=AN!Yx8
zGk*TqdYU@3J6wC)wb=CIP59Zv>zuTMov#!lGqtgC2a8&0ZI?+3lsCDg78v9{^HB&;
zG%_E)zOMMn@?c=$!)ScMl3WuOGjA^Waa2fFH4P8`)elg#1&SG6_|jcB#O$vN|M?w0
z3=u+I3Dm;8!{fYrWfZF1xsw%mv)G`4OY|FokynC+dPa`^;w{0O9vN}g-WDY+(Nb-b
zYM`a4nMfOr@qOg*2u@vk3YJ`SCZ7JMr?Gd}-WIo_j2Y@aibu#}8_ncs(*Al|cKlj!
zLSHFQXvj?Y*qJkglqseAxl$z7z#FN=A;w~;n1^gN!c0(ztd8APharCF_Alba)i2?v
zKUgb@bKc`Fa|Z;k%QP1s@8ca$K87b|F3XuzKChO$;)mo+9hSk6xImEX$N6qTh>1>D
zN(`3cgeJ5gd_Xs0<yRzvxq8G8UDLZT5VOC3`{o15YPilX&|X`Nd3PW;x)P6Z{;zJY
zTI7S-Rk|BgayEgwZTL*j^~8A_Or(K-!^7wQAvhvTa1s(MA(8+27a=ZDQDOUC-D+z2
zoPX_M&wa9!?vcvYCq>due$=Jya%!rcUdSZY*NKi<Ohr-C67;7}>@x0$5n^s+Fm3k8
zd6SyF>5nvIINxH#vSMopIXe}+E`syDkbN(sAgQnDXb|gH-8*QOK{(a5ldq_mR*<4-
z7J-1F8VO|}H2<stj%8Oc;LAYcX4AT3$W09;#K6h*;leceX`zXZPiQ3M!6iX?et(eB
z+RH~vrYbAhnp2Bf16L-?LMVv=2&BHm?<F!vLcENp@x>yFIch1VT<deNpwueJr#|&}
zw+n3osz(J8gz;gtD(Tc;#I$#nYrta?{K%d_Ng*u_rP2v4|K`96LngMg)dXSuI_67L
zg6&F~X5sa&qq#jl6+)h`bVAJ*z&+)_WPe;KhDS0rR@78u&Yj5%hE&VJGYQ#$HU^Bj
zY`CtE^!M(gYYUm*m~!sOfAZWaFcZ6R?9wPNc(Na1(J1b0d+X54TNh0|{g`;~+(f>B
zrt?LF;4&?r0oq$Y4PS!)#_fW>8=wb!CLzH$_mL#zFBuSPXlKDkLQ>1rWF#8d)z|Od
zz2UnLq@vo`*pWLce}I7zkuy6@=Ggr0$f-y-M^<=qcFHyPp?qSSO7mYbe1YTwluw=K
ztuM0-hZX!ii~~6}D)U~mEEy~GA1RAFs*mYt)z-tW9bV9J@`FXu=!|X8t>t~erw~3-
zksD@hb)!JYi-KS*=nsBHo%xrMxm6ad%UeRo(}bED%}R7~GfG#PQJUHOR*s>#X=VS)
zeV$yqme0Swx2;LHN7Lww?famK4>zV<5%S4JsCfss%SlKk)+Ijf9<vy70+jMwv?MSA
z^(4#aF@oytxCJLe*cw|t5)*+{EBo(x&hz_!H>GH3n#-vZ00000NkvXXu0mjfxDaBJ


From 388c7ad23c4a63b42b025712bc57bc7295c53ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Aaron?= <rene@twentyuno.net>
Date: Thu, 15 Feb 2024 14:20:51 +0000
Subject: [PATCH 10/10] fix: remove obsolete translations

---
 src/i18n/locales/cs/translation.json      | 15 +++------------
 src/i18n/locales/da/translation.json      | 15 +++------------
 src/i18n/locales/de/translation.json      | 15 +++------------
 src/i18n/locales/el/translation.json      |  5 +----
 src/i18n/locales/eo/translation.json      | 10 ++--------
 src/i18n/locales/es/translation.json      | 15 +++------------
 src/i18n/locales/fa/translation.json      | 15 +++------------
 src/i18n/locales/fi/translation.json      | 10 ++--------
 src/i18n/locales/fr/translation.json      | 15 +++------------
 src/i18n/locales/hi/translation.json      | 15 +++------------
 src/i18n/locales/id/translation.json      | 17 ++++-------------
 src/i18n/locales/it/translation.json      | 17 ++++-------------
 src/i18n/locales/ja/translation.json      | 14 +++-----------
 src/i18n/locales/mr/translation.json      | 15 +++------------
 src/i18n/locales/nl/translation.json      | 10 ++--------
 src/i18n/locales/pl/translation.json      | 15 +++------------
 src/i18n/locales/pt_BR/translation.json   | 15 +++------------
 src/i18n/locales/ro/translation.json      | 15 +++------------
 src/i18n/locales/ru/translation.json      | 15 +++------------
 src/i18n/locales/sl/translation.json      | 13 +++----------
 src/i18n/locales/sv/translation.json      | 15 +++------------
 src/i18n/locales/th/translation.json      | 13 ++-----------
 src/i18n/locales/tl/translation.json      |  9 ++-------
 src/i18n/locales/uk/translation.json      | 15 +++------------
 src/i18n/locales/zh_Hans/translation.json | 15 +++------------
 src/i18n/locales/zh_Hant/translation.json | 15 +++------------
 26 files changed, 73 insertions(+), 285 deletions(-)

diff --git a/src/i18n/locales/cs/translation.json b/src/i18n/locales/cs/translation.json
index 6d3b36b6f5..ffc48587e5 100644
--- a/src/i18n/locales/cs/translation.json
+++ b/src/i18n/locales/cs/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "Nastavit pin pro odemčení účtu",
         "description": "Tento pin vám umožní odemykat doplněk Alby na tomto zařízení. Nelze ho resetovat, ale je možné ho později změnit.",
         "choose_password": {
           "label": "Zvolte pin pro odemykání:"
@@ -172,13 +171,9 @@
       },
       "btcpay": {
         "title": "BTCPay Server",
-        "page": {
-          "title": "Připojení k vašemu uzlu BTCPay LND",
-          "instructions": "Přesuňte se do svého BTCPayServer a přihlašte se jako administrátor. Běžte do Nastavení serveru > Služby > LND Rest - Více informací. Následně zvolte \"Zobrazit informace o QR kódu\" a zkopírujte zobrazená data. Vložte je níže:"
-        },
+        "page": {},
         "config": {
-          "label": "Konfigurační data",
-          "placeholder": "config=https://vas-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Konfigurační data"
         },
         "errors": {
           "connection_failed": "Připojení se nezdařilo. Je BTCPay URL zadána správně a je přístupná?"
@@ -219,10 +214,7 @@
       "title": "Připojte Lightning peněženku",
       "lnc": {
         "title": "Lightning terminál (LNC)",
-        "page": {
-          "title": "Připojit k vašemu LND uzlu",
-          "description": "Vytvořte nové sezení v terminálu (litd) pro získání nové párovací fráze a vložte ji zde"
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "Vaše párovací fráze ",
           "placeholder": "tajná fráze"
@@ -651,7 +643,6 @@
   },
   "common": {
     "password": "Heslo",
-    "advanced": "Pokročilé",
     "success": "Úspěch",
     "error": "Chyba",
     "settings": "Nastavení",
diff --git a/src/i18n/locales/da/translation.json b/src/i18n/locales/da/translation.json
index f044fe4b64..8ca85a3d39 100644
--- a/src/i18n/locales/da/translation.json
+++ b/src/i18n/locales/da/translation.json
@@ -3,7 +3,6 @@
     "welcome": {
       "title": "Velkommen til Alby",
       "set_password": {
-        "title": "Angiv en nøglekode",
         "description": "Dette kodeord bruges til at beskytte din wallet og giver adgang til browserudvidelsen. Det kan ikke nulstilles, og er ikke den samme som adgangskoden til din Alby-konto.",
         "choose_password": {
           "label": "Vælg en nøglekode:"
@@ -78,10 +77,7 @@
       },
       "lnc": {
         "title": "LND med LNC",
-        "page": {
-          "title": "Opret forbindelse til din LND-node",
-          "description": "Start en ny session i terminal (litd) for at få en ny forbindelseskode, og skriv den her"
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "Din forbindelseskode ",
           "placeholder": "hemmelig kode til sats-samlingen"
@@ -205,13 +201,9 @@
       },
       "btcpay": {
         "title": "BTCPay Server",
-        "page": {
-          "title": "Opret forbindelse til din BTCPay LND-node",
-          "instructions": "Gå til din BTCPayServer og log på som administrator. Gå til Server Settings > Services > LND Rest - See information. Klik så på \"See QR Code information\" og kopier QR-kodens data. Indsæt dem herunder:"
-        },
+        "page": {},
         "config": {
-          "label": "Konfigurationsoplysninger",
-          "placeholder": "config=https://din-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Konfigurationsoplysninger"
         },
         "errors": {
           "connection_failed": "Forbindelsen kunne ikke oprettes. Er BTCPay-forbindelsens URL korrekt og tilgængelig?"
@@ -573,7 +565,6 @@
   "common": {
     "password": "Adgangskode",
     "confirm_password": "Bekræft adgangskode",
-    "advanced": "Avanceret",
     "success": "Succes",
     "error": "Fejl",
     "settings": "Indstillinger",
diff --git a/src/i18n/locales/de/translation.json b/src/i18n/locales/de/translation.json
index b5c2ef752e..8474b0a77f 100644
--- a/src/i18n/locales/de/translation.json
+++ b/src/i18n/locales/de/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "Einen Passcode zum Entsperren festlegen",
         "description": "Mit diesem Passcode kannst du Alby auf diesem Gerät entsperren. Er kann nicht wiederhergestellt werden, kann aber später geändert werden.",
         "choose_password": {
           "label": "Wähle einen Passcode zum Entsperren:"
@@ -181,13 +180,9 @@
       },
       "btcpay": {
         "title": "BTCPay Server",
-        "page": {
-          "title": "Verbinden mit deiner BTCPay LND Node",
-          "instructions": "Navigiere zu deinem BTCPayServer und melde dich als Administrator an. Gehe zu Servereinstellungen > Dienste > LND-Rest – Siehe Informationen. Klicke dann auf „QR-Code-Informationen anzeigen“ und kopiere die QR-Code-Daten. Füge es unten ein:"
-        },
+        "page": {},
         "config": {
-          "label": "Konfigurationsdaten",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Konfigurationsdaten"
         },
         "errors": {
           "connection_failed": "Verbindung fehlgeschlagen. Ist die BTCPay Verbindungs URL korrekt und zugänglich?"
@@ -228,10 +223,7 @@
       "title": "Verbinde Lightning Wallet",
       "lnc": {
         "title": "Lightning Terminal (LNC)",
-        "page": {
-          "title": "Verbinden mit deiner LND Node",
-          "description": "1. Öffne Lightning Terminal und wähle <0>Lightning Node Connect</0> in der Seitenleiste.<1/> 2. Klicke auf <0>Erstelle eine neue Sitzung</0><1/>3. Beschrifte die Sitzung, wähle dann die gewünschte Berechtigung und sende sie ab<1/>4. <0>Kopiere die Pairing-Phrase</0> und füge sie hier unten ein."
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "Deine pairing phrase ",
           "placeholder": "geheimer stack sats phrase"
@@ -1074,7 +1066,6 @@
     "sats_one": "sat",
     "success": "Erfolgreich",
     "password": "Kennwort",
-    "advanced": "Fortgeschrittene",
     "description_full": "Vollständige Beschreibung",
     "amount": "Betrag",
     "copied": "Kopiert!",
diff --git a/src/i18n/locales/el/translation.json b/src/i18n/locales/el/translation.json
index f3ad85eb8b..0ff00d8886 100644
--- a/src/i18n/locales/el/translation.json
+++ b/src/i18n/locales/el/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "Ορίστε ένα κωδικό ξεκλειδώματος",
         "errors": {
           "confirm_password": "Παρακαλώ επιβεβαιώστε τον κωδικό σας.",
           "enter_password": "Παρακαλώ εισάγετε ένα κωδικό.",
@@ -91,9 +90,7 @@
       },
       "btcpay": {
         "title": "BTCPay Server",
-        "page": {
-          "title": "Σύνδεση στο BTCPay LND κόμβο σας"
-        }
+        "page": {}
       },
       "lnd": {
         "title": "LND",
diff --git a/src/i18n/locales/eo/translation.json b/src/i18n/locales/eo/translation.json
index ba937258d7..b5e6168675 100644
--- a/src/i18n/locales/eo/translation.json
+++ b/src/i18n/locales/eo/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "Agordu malŝlosan pasvorton",
         "description": "Ĉi tiu pasvorto estas uzata por protekti vian monujon kaj havigi aliron al la retumila etendo. Ĝi ne povas esti rekomencigita kaj estas aparta de la pasvorto de via Alby Account",
         "choose_password": {
           "label": "Elektu malŝlosan pasvorton:"
@@ -171,13 +170,9 @@
       },
       "btcpay": {
         "title": "BTCPay-servilo",
-        "page": {
-          "title": "",
-          "instructions": ""
-        },
+        "page": {},
         "config": {
-          "label": "",
-          "placeholder": ""
+          "label": ""
         },
         "errors": {
           "connection_failed": ""
@@ -476,7 +471,6 @@
   },
   "common": {
     "password": "Pasvorto",
-    "advanced": "Altnivelaj",
     "success": "Sukceso",
     "error": "Eraro",
     "settings": "Agordoj",
diff --git a/src/i18n/locales/es/translation.json b/src/i18n/locales/es/translation.json
index 32aeb06bfa..2d42f47f87 100644
--- a/src/i18n/locales/es/translation.json
+++ b/src/i18n/locales/es/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "Establecer un código de desbloqueo",
         "description": "Este código te permitirá desbloquear Alby en este dispositivo. No se puede recuperar, pero se puede cambiar más tarde.",
         "choose_password": {
           "label": "Elige un código de desbloqueo:"
@@ -159,13 +158,9 @@
       },
       "btcpay": {
         "title": "Servidor BTCPay",
-        "page": {
-          "title": "Conéctese a su nodo BTCPay LND",
-          "instructions": "Navegue a su servidor BTCPay e inicie sesión como administrador. Vaya a Configuración del servidor > Servicios > LND Rest-Ver información. Luego haga clic en\" Ver información del código QR \" y copie los datos del Código QR. Pegar a continuación:"
-        },
+        "page": {},
         "config": {
-          "label": "Datos de configuración",
-          "placeholder": "config=https://su-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Datos de configuración"
         },
         "errors": {
           "connection_failed": "La conexión falló. ¿Es la URL de conexión de BTCPay correcta y accesible?"
@@ -218,10 +213,7 @@
         }
       },
       "lnc": {
-        "page": {
-          "title": "Conecta tu nodo LND",
-          "description": "1. Abra tu Lightning Terminal y selecciona <0>Lightning Node Connect</0> en la barra lateral.<1/> 2. Haz clic en <0>Crear una nueva sesión</0><1/>3. Etiqueta la sesión, luego elige el permiso que deseas y envía<1/>4. <0>Copia la frase de emparejamiento</0> y pégala a continuación."
-        },
+        "page": {},
         "title": "Lightning Terminal (LNC)",
         "pairing_phrase": {
           "label": "Tu frase vinculada. ",
@@ -708,7 +700,6 @@
     "success_message": "{{amount}}{{fiatAmount}} enviados a {{destination}}",
     "message": "Mensaje",
     "description_full": "Descripción Completa",
-    "advanced": "Avanzado",
     "accounts": "Cuentas",
     "discover": "Descubrir",
     "response": "Respuesta",
diff --git a/src/i18n/locales/fa/translation.json b/src/i18n/locales/fa/translation.json
index 9c84bf610a..77b9f48533 100644
--- a/src/i18n/locales/fa/translation.json
+++ b/src/i18n/locales/fa/translation.json
@@ -3,7 +3,6 @@
     "welcome": {
       "title": "به Alby خوش آمدید",
       "set_password": {
-        "title": "یک گذرواژه برای بازکردن تنظیم کنید",
         "description": "این گذرواژه به شما اجازه می دهد البی را در این دستگاه باز کنید. این گذرواژه قابل بازیابی نیست، ولی می تواند بعدا تغییر کند.",
         "choose_password": {
           "label": "یک گذرواژه برای باز کردن انتخاب کنید:"
@@ -88,10 +87,7 @@
       },
       "lnc": {
         "title": "ترمینال لایتنینگ (LNC)",
-        "page": {
-          "title": "به گره لایتنینگ LND خود وصل شوید",
-          "description": "۱. ترمینال لایتنینگ را باز کرده و <0>Lightning Node Connect</0> را از منوی کناری انتخاب کنید. <1/>۲. روی <0>Create a new session</0> کلیک کنید<1/>۳. عنوانی رو جلسه بگذارید، مجوزهای مطلوب را انتخاب کرده و ثبت کنید<1/> ۴. <0>عبارت جفت را کپی کرده</0> و در پایین بچسبانید."
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "عبارت جفت شما ",
           "placeholder": "عبارت مخفی انباشتن ساتوشی"
@@ -215,13 +211,9 @@
       },
       "btcpay": {
         "title": "سرور BTCPay",
-        "page": {
-          "title": "به گره LND در BTCPay خود متصل شوید",
-          "instructions": "به BTCPayServer بروید و به عنوان ادمین در وارد شوید. به مسیر Server Settings > Services > LND Rest - See information بروید. سپس روی \"See QR Code information\" کلیک کرده و کدQR را کپی کنید. در زیر بچسبانید:"
-        },
+        "page": {},
         "config": {
-          "label": "داده پیکربندی",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "داده پیکربندی"
         },
         "errors": {
           "connection_failed": "اتصال انجام نشد. آیا آدرس اینترنتی اتصال BTCPay صحیح و قابل دسترسی است؟"
@@ -813,7 +805,6 @@
   "common": {
     "password": "گذرواژه",
     "confirm_password": "‬تایید گذرواژه",
-    "advanced": "پیشرفته",
     "success": "موفقیت",
     "error": "خطا",
     "settings": "تنظیمات",
diff --git a/src/i18n/locales/fi/translation.json b/src/i18n/locales/fi/translation.json
index a88f82fbbb..576455cabf 100644
--- a/src/i18n/locales/fi/translation.json
+++ b/src/i18n/locales/fi/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "Aseta lukituksen avaussalasana",
         "description": "Lightning-tilisi tiedot on salattu turvallisesti salasanan avulla. Älä unohda tätä salasanaa! Tarvitset sitä avataksesi Alby-laajennuksen lukituksen (tässä selaimessa)",
         "choose_password": {
           "label": "Valitse lukituksen avaamissalasana:"
@@ -166,13 +165,9 @@
       },
       "btcpay": {
         "title": "BTCPay-palvelin",
-        "page": {
-          "title": "Yhdistä BTCPay LND -solmuusi",
-          "instructions": "Siirry BTCPayServerillesi ja kirjaudu sisään järjestelmänvalvojana. Siirry kohtaan Palvelinasetukset > Palvelut > LND Rest - Katso tiedot. Napsauta sitten \"Katso QR-koodin tiedot\" ja kopioi QR-koodin tiedot. Liitä se alle:"
-        },
+        "page": {},
         "config": {
-          "label": "Konfigurointitiedot",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Konfigurointitiedot"
         },
         "errors": {
           "connection_failed": "Yhteys epäonnistui. Onko BTCPay-yhteyden URL-osoite oikea ja saatavilla?"
@@ -468,7 +463,6 @@
   },
   "common": {
     "password": "Salasana",
-    "advanced": "Edistynyt",
     "success": "Menestys",
     "error": "Virhe",
     "settings": "Asetukset",
diff --git a/src/i18n/locales/fr/translation.json b/src/i18n/locales/fr/translation.json
index cbda0ada6f..66378ae9e5 100644
--- a/src/i18n/locales/fr/translation.json
+++ b/src/i18n/locales/fr/translation.json
@@ -3,7 +3,6 @@
     "welcome": {
       "title": "Bienvenue sur Alby",
       "set_password": {
-        "title": "Définir un mot de passe de déverrouillage",
         "description": "Ce mot de passe est utilisé pour protéger votre portefeuille et donner accès à l'extension du navigateur. Il ne peut pas être réinitialisé et est distinct du mot de passe de votre compte Alby.",
         "choose_password": {
           "label": "Choisissez un mot de passe de déverrouillage :"
@@ -78,10 +77,7 @@
       },
       "lnc": {
         "title": "LND avec LNC",
-        "page": {
-          "title": "Connectez-vous à votre nœud LND",
-          "description": "Créez une nouvelle session dans le terminal (litd) pour obtenir une nouvelle phrase d'appariement et entrez-la ici"
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "Votre phrase d'appariement ",
           "placeholder": "phrase de sats de pile secrète"
@@ -205,13 +201,9 @@
       },
       "btcpay": {
         "title": "Serveur BTCPay",
-        "page": {
-          "title": "Connectez-vous à votre nœud BTCPay LND",
-          "instructions": "Accédez à votre BTCPayServer et connectez-vous en tant qu'administrateur. Accédez à Paramètres du serveur > Services > LND Rest - Voir les informations. Cliquez ensuite sur \"Voir les informations du code QR\" et copiez les données du code QR. Collez-le ci-dessous :"
-        },
+        "page": {},
         "config": {
-          "label": "Données de configuration",
-          "placeholder": "config=https://votre-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Données de configuration"
         },
         "errors": {
           "connection_failed": "La connexion a échoué. L'URL de connexion BTCPay est-elle correcte et accessible ?"
@@ -574,7 +566,6 @@
   "common": {
     "password": "Mot de passe",
     "confirm_password": "Confirmez le mot de passe",
-    "advanced": "Avancé",
     "success": "Succès",
     "error": "Erreur",
     "settings": "Paramètres",
diff --git a/src/i18n/locales/hi/translation.json b/src/i18n/locales/hi/translation.json
index 5d8305b833..bf6fafbf7d 100644
--- a/src/i18n/locales/hi/translation.json
+++ b/src/i18n/locales/hi/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "अनलॉक पासवर्ड सेट करें",
         "confirm_password": {
           "label": "आइए पुष्टि करें कि आपने इसे सही टाइप किया है:"
         },
@@ -105,10 +104,7 @@
       },
       "lnc": {
         "title": "LND के साथ LNC",
-        "page": {
-          "title": "अपने LND नोड से कनेक्ट करें",
-          "description": "एक नया युग्मन वाक्यांश प्राप्त करने के लिए टर्मिनल (litd) में एक नया session बनाएँ और इसे यहाँ दर्ज करें।"
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "आपका युग्मन वाक्यांश| ",
           "placeholder": "गुप्त stack sats वाक्यांश"
@@ -240,13 +236,9 @@
       },
       "btcpay": {
         "title": "बीसीटीपे सर्वर(BTCPay Server)",
-        "page": {
-          "title": "आपके BTCPay LND node से connect करें",
-          "instructions": "अपने BTCPayServer पर नेविगेट करें और एक admin के रूप में लॉग इन करें। सर्वर सेटिंग्स पर जाएं> सेवाएं> एलएनडी रेस्ट - जानकारी देखें। फिर \"क्यूआर कोड जानकारी देखें\" पर क्लिक करें और क्यूआर कोड डेटा कॉपी करें। इसे नीचे पेस्ट करें:"
-        },
+        "page": {},
         "config": {
-          "label": "कॉन्फ़िग डेटा",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "कॉन्फ़िग डेटा"
         },
         "errors": {
           "connection_failed": "कनेक्शन विफल। क्या BTCPay कनेक्शन URL सही और पहुंच योग्य है?"
@@ -959,7 +951,6 @@
   "common": {
     "password": "पासवर्ड",
     "confirm_password": "पासवर्ड की पुष्टि करें",
-    "advanced": "उन्नत",
     "success": "सफलता",
     "error": "त्रुटि",
     "settings": "सेटिंग्स",
diff --git a/src/i18n/locales/id/translation.json b/src/i18n/locales/id/translation.json
index dcd3f56349..dd447b1ad1 100644
--- a/src/i18n/locales/id/translation.json
+++ b/src/i18n/locales/id/translation.json
@@ -13,8 +13,7 @@
           "confirm_password": "Mohon konfirmasi kode sandi Anda.",
           "mismatched_password": "Kode sandi tidak sama."
         },
-        "description": "Kode sandi ini dapat digunakan untuk membuka Alby pada perangkat ini. Ini tidak dapat dipulihkan, tetapi bisa diganti.",
-        "title": "Atur kode sandi"
+        "description": "Kode sandi ini dapat digunakan untuk membuka Alby pada perangkat ini. Ini tidak dapat dipulihkan, tetapi bisa diganti."
       },
       "test_connection": {
         "initializing": "Menginisialisasi akun Anda. Mohon tunggu, ini mungkin akan memakan waktu beberapa menit...",
@@ -84,10 +83,7 @@
       },
       "lnc": {
         "title": "Lightning Terminal (LNC)",
-        "page": {
-          "title": "Sambungkan node LND kamu",
-          "description": "1. Bukan Lightning Terminal dan Pilih <0>Sambung Lightning Node</0> dari sidebar.<1/> 2. Klik <0>Buat sesi baru</0><1/>3. Masukkan label pada sesi, pilih izin yang dikehendaki dan kirim<1/>4. <0>Salin pairing phrase</0> dan tempel pada bawah ini."
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "Pairing phrase kamu: ",
           "placeholder": "secret stack sats phrase"
@@ -210,13 +206,9 @@
         }
       },
       "btcpay": {
-        "page": {
-          "title": "Sambungkan dengan node BTCPay LND",
-          "instructions": "Buka BTCPayServer dan masuk sebagai admin. Masuk ke Server Settings > Services > LND Rest - See information. Lalu, klik \"See QR Code information\" dan salin data kode QR. Tempel di bawah ini:"
-        },
+        "page": {},
         "config": {
-          "label": "Config data",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Config data"
         },
         "errors": {
           "connection_failed": "Koneksi gagal. Apakah koneksi BTCPay URL sudah benar dan dapat dibuka?"
@@ -898,7 +890,6 @@
       "connection_failed": "Koneksi gagal",
       "payment_failed": "Pembayaran Gagal"
     },
-    "advanced": "Advanced",
     "discover": "Temui",
     "loading": "memuat",
     "or": "atau"
diff --git a/src/i18n/locales/it/translation.json b/src/i18n/locales/it/translation.json
index 987d4d776a..9796906b65 100644
--- a/src/i18n/locales/it/translation.json
+++ b/src/i18n/locales/it/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "Imposta una password di sblocco",
         "description": "Questa password serve a proteggere il tuo wallet e a fornirti l'accesso all'estensione del browser. Non può essere reimpostata ed è differente dalla password dell'account Alby.",
         "choose_password": {
           "label": "Scegli una password di sblocco:"
@@ -167,13 +166,9 @@
       },
       "btcpay": {
         "title": "BTCPay Server",
-        "page": {
-          "title": "Connettiti al tuo nodo LND BTCPay",
-          "instructions": "Vai al tuo BTCPayServer e accedi come amministratore. Vai su Impostazioni server > Servizi > LND Rest - See information. Quindi fai clic su \"Visualizza informazioni sul codice QR\" e copia i dati del codice QR. Incollali qui sotto:"
-        },
+        "page": {},
         "config": {
-          "label": "Dati di configurazione",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Dati di configurazione"
         },
         "errors": {
           "connection_failed": "Connessione fallita. L'URL di connessione a BTCPay è corretto e accessibile?"
@@ -213,10 +208,7 @@
       },
       "title": "Connetti il Wallet Lightning",
       "lnc": {
-        "page": {
-          "description": "Crea una nuova sessione nel terminale (litd) per ottenere una nuova frase di accoppiamento ed inseriscila qui",
-          "title": "Connettiti al tuo nodo LND"
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "La tua frase di accoppiamento ",
           "placeholder": "frase segreta di stack sats"
@@ -619,8 +611,7 @@
     "success_message": "{{amount}}{{fiatAmount}} inviati a {{destination}}",
     "accounts": "Account",
     "discover": "Scopri",
-    "confirm_password": "Conferma la Password",
-    "advanced": "Avanzate"
+    "confirm_password": "Conferma la Password"
   },
   "components": {
     "allowance_menu": {
diff --git a/src/i18n/locales/ja/translation.json b/src/i18n/locales/ja/translation.json
index 0efc1c4760..b604e0d3f8 100644
--- a/src/i18n/locales/ja/translation.json
+++ b/src/i18n/locales/ja/translation.json
@@ -13,7 +13,6 @@
           "enter_password": "パスコードを入力してください。",
           "confirm_password": "確認用パスコードを入力してください。"
         },
-        "title": "ロック解除パスコードの設定",
         "description": "このパスコードを使用すると、このデバイスでAlbyのロックを解除できます。パスコードは復元できませんが、後で変更することは可能です。"
       },
       "test_connection": {
@@ -86,10 +85,7 @@
       },
       "lnc": {
         "title": "Lightning Terminal (LNC)",
-        "page": {
-          "title": "LNDノードに接続",
-          "description": "1. Lightning Terminalを開き、サイドバーから<0>Lightning Node Connect</0>を選択します。 <0>Create a new session</0>を選択します。<1/>3.セッションにラベルを付け、必要なパーミッションを選択し、送信します。<1/>4.<0>ペアリング・フレーズをコピーし、以下に貼り付けます。"
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "あなたのペアリング・フレーズ ",
           "placeholder": "シークレット・stack sats・フレーズ"
@@ -214,13 +210,9 @@
         }
       },
       "btcpay": {
-        "page": {
-          "title": "BTCPay LNDノードに接続",
-          "instructions": "BTCPay Serverに移動し、管理者としてログインします。Server Settings > Services > LND Rest - See informationに進みます。次に\"See QR Code information\"をクリックし、QRコードデータをコピーします。下に貼り付けてください："
-        },
+        "page": {},
         "config": {
-          "label": "コンフィグデータ",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "コンフィグデータ"
         },
         "errors": {
           "connection_failed": "接続に失敗しました。BTCPayの接続URLは正しく、アクセス可能ですか？"
diff --git a/src/i18n/locales/mr/translation.json b/src/i18n/locales/mr/translation.json
index d24d6a69fe..76b044c582 100644
--- a/src/i18n/locales/mr/translation.json
+++ b/src/i18n/locales/mr/translation.json
@@ -3,7 +3,6 @@
     "welcome": {
       "title": "Alby मध्ये आपले स्वागत आहे",
       "set_password": {
-        "title": "अनलॉक पासवर्ड सेट करा",
         "description": "तुमचे लाइटनिंग खाते पासवर्डसह सुरक्षितपणे एन्क्रिप्ट केलेले आहे. कृपया हा पासवर्ड लक्षात ठेवा. ब्राउझरमध्ये alby एक्सटेंशन उघडण्यासाठी तुम्हाला पासवर्डची आवश्यकता असेल.",
         "confirm_password": {
           "label": "आपण ते बरोबर टाईप केले आहे याची पुष्टी करूया:"
@@ -78,10 +77,7 @@
       },
       "lnc": {
         "title": "LND with LNC",
-        "page": {
-          "title": "आपल्या LND नोडशी कनेक्ट करा",
-          "description": "नवीन जोडी वाक्यांश मिळविण्यासाठी टर्मिनल (litd) मध्ये एक नवीन सत्र तयार करा आणि ते येथे प्रविष्ट करा"
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "आपली जोडी वाक्यांश ",
           "placeholder": "गुप्त स्टॅक सॅट्स वाक्यांश"
@@ -205,13 +201,9 @@
       },
       "btcpay": {
         "title": "BTCPay Server",
-        "page": {
-          "title": "BTCPay LND node ला कनेक्ट करा",
-          "instructions": "तुमच्या BTCPayServer वर नेव्हिगेट करा आणि admin म्हणून लॉग इन करा. सर्व्हर सेटिंग्ज > सेवा > LND REST वर जा - माहिती पहा. नंतर \"QR कोड माहिती पहा\" वर क्लिक करा आणि QR कोड डेटा कॉपी करा. ते खाली पेस्ट करा:"
-        },
+        "page": {},
         "config": {
-          "label": "Config data",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Config data"
         },
         "errors": {
           "connection_failed": "कनेक्शन अयशस्वी झाले. BTCPay कनेक्शन URL योग्य आणि प्रवेशयोग्य आहे का?"
@@ -594,7 +586,6 @@
   "common": {
     "password": "पासवर्ड",
     "confirm_password": "पासवर्डची पुष्टी करा",
-    "advanced": "पुढे",
     "success": "यश",
     "settings": "सेटिंग्ज",
     "accounts": "खाते",
diff --git a/src/i18n/locales/nl/translation.json b/src/i18n/locales/nl/translation.json
index 17d3f46e38..21cc82caab 100644
--- a/src/i18n/locales/nl/translation.json
+++ b/src/i18n/locales/nl/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "Stel een ontgrendelingswachtwoord in",
         "description": "Lightning-accountgegevens zijn veilig versleuteld met een ontgrendelingswachtwoord. Vergeet dit wachtwoord niet! Je hebt het nodig om de Alby-extensie te ontgrendelen (in deze browser)",
         "choose_password": {
           "label": "Kies een ontgrendelingswachtwoord:"
@@ -181,13 +180,9 @@
       },
       "btcpay": {
         "title": "",
-        "page": {
-          "title": "",
-          "instructions": ""
-        },
+        "page": {},
         "config": {
-          "label": "",
-          "placeholder": ""
+          "label": ""
         },
         "errors": {
           "connection_failed": ""
@@ -494,7 +489,6 @@
   },
   "common": {
     "password": "",
-    "advanced": "",
     "success": "",
     "error": "",
     "settings": "",
diff --git a/src/i18n/locales/pl/translation.json b/src/i18n/locales/pl/translation.json
index 402452da59..6ca968e523 100644
--- a/src/i18n/locales/pl/translation.json
+++ b/src/i18n/locales/pl/translation.json
@@ -3,7 +3,6 @@
     "welcome": {
       "title": "Witaj w Alby",
       "set_password": {
-        "title": "Ustaw hasło blokady",
         "description": "To hasło pozwoli odblokować rozszerzenie Alby na tym urządzeniu. Nie można go odzyskać ale może być zmienione później.",
         "choose_password": {
           "label": "Wybierz hasło blokady:"
@@ -87,10 +86,7 @@
       },
       "lnc": {
         "title": "Lightning Terminal (LNC)",
-        "page": {
-          "title": "Podłącz się do swojego węzła LND",
-          "description": "1. Otwórz Lightning Terminal i wybierz <0>Lightning Node Connect</0> z paska bocznego.<1/> 2. Kliknij <0>Create a new session</0><1/>3. Nadaj etykietę sesji, wybierz żądane uprawnienia i zatwierdź<1/>4. <0>Skopiuj frazę parującą</0> i wklej ją poniżej."
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "Twoja fraza parująca ",
           "placeholder": "tajna fraza stosu satsów"
@@ -220,13 +216,9 @@
       },
       "btcpay": {
         "title": "BTCPay Server",
-        "page": {
-          "title": "Podłącz do węzła LND na BTCPayServer",
-          "instructions": "Przejdź do BTCPayServer i zaloguj się jako administrator. Idź do Server Settings > Services > NDS Rest - See information. Następni kliknij \"See QR Code information\" i skopiuj dane kodu QR. Wklej poniżej:"
-        },
+        "page": {},
         "config": {
-          "label": "Date konfiguracyjne",
-          "placeholder": "config=https://twoj-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Date konfiguracyjne"
         },
         "errors": {
           "connection_failed": "Połączenie nieudane. Czy adres BTCPay jest poprawny i osiągalny?"
@@ -707,7 +699,6 @@
   "common": {
     "password": "Hasło",
     "confirm_password": "Potwierdź hasło",
-    "advanced": "Zaawansowane",
     "success": "Sukces",
     "error": "Błąd",
     "settings": "Ustawienia",
diff --git a/src/i18n/locales/pt_BR/translation.json b/src/i18n/locales/pt_BR/translation.json
index fe22095cf4..e37a025e3e 100644
--- a/src/i18n/locales/pt_BR/translation.json
+++ b/src/i18n/locales/pt_BR/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "Definir uma senha de desbloqueio",
         "description": "Esta senha é usada para proteger sua carteira e fornecer acesso à extensão do navegador neste dispositivo. Não esqueça esta senha pois não é possível recuperá-la. Obs. Esta senha é diferente da senha da conta da Alby.",
         "choose_password": {
           "label": "Escolha uma senha de desbloqueio:"
@@ -166,13 +165,9 @@
       },
       "btcpay": {
         "title": "Servidor BTCPay",
-        "page": {
-          "title": "Conecte-se no servidor LND BTCPay",
-          "instructions": "Navegue até a BTCPayServer e acesse como administrador. Vá até Configurações>Serviços>LND Rest - Ver informação. Depois Clique \"Ver Código QR\" e copie os dados do Código QR. Cole os dados abaixo:"
-        },
+        "page": {},
         "config": {
-          "label": "Dados config",
-          "placeholder": "config=https://seu-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Dados config"
         },
         "errors": {
           "connection_failed": "Falha na conexão. A URL de conexão do servidor BTCPay está correta e acessível?"
@@ -226,10 +221,7 @@
       },
       "title": "Conectar Carteira Bitcoin",
       "lnc": {
-        "page": {
-          "title": "Conecte-se no servidor LND usando LNC",
-          "description": "1. Open Lightning Terminal and choose <0>Lightning Node Connect</0> from the sidebar.<1/> 2. Click <0>Create a new session</0><1/>3. Label the session, choose desired permissions and submit<1/>4. <0>Copy pairing phrase</0> and paste it below."
-        },
+        "page": {},
         "title": "Lightning Terminal (LNC)",
         "pairing_phrase": {
           "label": "Frase de pareamento "
@@ -971,7 +963,6 @@
     "help": "Ajuda",
     "response": "Resposta",
     "success_message": "{{amount}}{{fiatAmount}} enviados para {{destination}}",
-    "advanced": "Avançado",
     "discover": "Explorar",
     "confirm_password": "Confirmar senha",
     "accounts": "Minhas contas",
diff --git a/src/i18n/locales/ro/translation.json b/src/i18n/locales/ro/translation.json
index 39588d07f8..bcb0e12f81 100644
--- a/src/i18n/locales/ro/translation.json
+++ b/src/i18n/locales/ro/translation.json
@@ -3,7 +3,6 @@
     "welcome": {
       "title": "Bine ai venit la Alby",
       "set_password": {
-        "title": "Seteaza o parola pentru deblocare",
         "description": "Aceasta parola este folosita pentru a proteja portofelul tau si pentru a permite accesul la extensia de browser. Aceasta parola nu poate fi resetata si este separata de parola contului Alby.",
         "choose_password": {
           "label": "Alege o parola pentru deblocare:"
@@ -78,10 +77,7 @@
       },
       "lnc": {
         "title": "LND cu LNC",
-        "page": {
-          "title": "Conecteaza-te la nodul tau LND",
-          "description": "Creeaza o sesiune noua in terminal (litd) pentru a obtine o noua fraza de imperechere si introdu-o aici"
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "Fraza ta de imperechere. ",
           "placeholder": "fraza ta secreta pentru acumulare de sats"
@@ -205,13 +201,9 @@
       },
       "btcpay": {
         "title": "Serverul BTCPay",
-        "page": {
-          "title": "Conectare la nodul LND BTCPay",
-          "instructions": "Navigheaza la serverul tau BTCPay si logheaza-te ca administrator. Acceseaza Server Settings > Services > LND Rest - See information. Apoi apasa pe \"See QR Code information\" si copiaza datele codului QR. Insereaza-le mai jos:"
-        },
+        "page": {},
         "config": {
-          "label": "Date de configurare",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Date de configurare"
         },
         "errors": {
           "connection_failed": "Conexiune esuata. URL-ul conexiunii BTCPay este corect si accesibil?"
@@ -574,7 +566,6 @@
   "common": {
     "password": "",
     "confirm_password": "",
-    "advanced": "",
     "success": "",
     "error": "",
     "settings": "",
diff --git a/src/i18n/locales/ru/translation.json b/src/i18n/locales/ru/translation.json
index f6f455c40d..773563deba 100644
--- a/src/i18n/locales/ru/translation.json
+++ b/src/i18n/locales/ru/translation.json
@@ -3,7 +3,6 @@
     "welcome": {
       "title": "Добро пожаловать в Alby",
       "set_password": {
-        "title": "Установите пароль разблокировки",
         "description": "Этот пароль нужен для защиты вашего кошелька, он предоставляет доступ к расширению браузера. Он не может быть восстановлен и не является паролем аккаунта Alby.",
         "choose_password": {
           "label": ""
@@ -78,10 +77,7 @@
       },
       "lnc": {
         "title": "",
-        "page": {
-          "title": "",
-          "description": ""
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "",
           "placeholder": ""
@@ -215,13 +211,9 @@
       },
       "btcpay": {
         "title": "",
-        "page": {
-          "title": "",
-          "instructions": ""
-        },
+        "page": {},
         "config": {
-          "label": "",
-          "placeholder": ""
+          "label": ""
         },
         "errors": {
           "connection_failed": ""
@@ -583,7 +575,6 @@
   "common": {
     "password": "",
     "confirm_password": "",
-    "advanced": "",
     "success": "",
     "error": "",
     "settings": "",
diff --git a/src/i18n/locales/sl/translation.json b/src/i18n/locales/sl/translation.json
index 1ca19450f1..01be28d13b 100644
--- a/src/i18n/locales/sl/translation.json
+++ b/src/i18n/locales/sl/translation.json
@@ -98,13 +98,10 @@
       },
       "btcpay": {
         "config": {
-          "label": "Podatki o konfiguraciji",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Podatki o konfiguraciji"
         },
         "title": "BTCPay Server",
-        "page": {
-          "title": "Poveži z BTCPay LND node"
-        },
+        "page": {},
         "errors": {
           "connection_failed": "Neuspešna povezava. Je BTCPay URL povezava pravilna in dostopna?"
         }
@@ -142,10 +139,7 @@
       },
       "lnc": {
         "title": "Terminal Lightning (LNC)",
-        "page": {
-          "title": "Poveži s svojim LND vozliščem",
-          "description": "1. Odpri Lightning Terminal in izberi <0>Lightning Node Connect</0> iz stranske vrstice.<1/> 2. Klikni <0>Ustvari novo sejo</0><1/>3. Označi povezavo, izberi dovoljenje in potrdi<1/>4. <0>Kopiraj frazo za spajanje</0> in jo prilepi spodaj."
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "Tvoja fraza za spajanje ",
           "placeholder": "skrivna fraza za stack sats"
@@ -231,7 +225,6 @@
     "welcome": {
       "title": "Dobrodošli v Alby",
       "set_password": {
-        "title": "Nastavi kodo za odklepanje",
         "errors": {
           "enter_password": "Prosim vpiši kodo.",
           "mismatched_password": "Gesli se ne ujemata.",
diff --git a/src/i18n/locales/sv/translation.json b/src/i18n/locales/sv/translation.json
index 34e20de374..860b3b23e2 100644
--- a/src/i18n/locales/sv/translation.json
+++ b/src/i18n/locales/sv/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "Ange ett lösenord för upplåsning",
         "description": "Detta lösenord låter dig låsa upp Alby på den här enheten. Det kan inte återställas, men kan ändras senare.",
         "choose_password": {
           "label": "Välj ett lösenord för upplåsning:"
@@ -176,13 +175,9 @@
       },
       "btcpay": {
         "title": "BTCPay Server",
-        "page": {
-          "title": "Anslut din BTCPay LND-nod",
-          "instructions": "Navigera till din BTCPayServer och logga in som administratör. Gå till Server Settings > Services > LND Rest - See information. Klicka på \"See QR Code information\" och kopiera QR-koddatan. Klistra in nedan:"
-        },
+        "page": {},
         "config": {
-          "label": "Konfigurationsdata",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "Konfigurationsdata"
         },
         "errors": {
           "connection_failed": "Anslutning misslyckades. Är URL till BTCPay-anslutningen korrekt och tillgänglig?"
@@ -227,10 +222,7 @@
           "label": "Din parningsfras "
         },
         "title": "Lightning Terminal (LNC)",
-        "page": {
-          "title": "Anslut till din LND node",
-          "description": "1. Öppna Lightning Terminal och välj <0>Lightning Node Connect</0> från sidofältet.<1/> 2. Klicka på <0>Skapa en ny session</0><1/>3. Märk sessionen, välj önskade behörigheter och skicka in<1/>4. <0>Kopiera parningsfras</0> och klistra in den nedan."
-        }
+        "page": {}
       },
       "umbrel_lightning_node": {
         "title": "Lightning Node"
@@ -948,7 +940,6 @@
     },
     "sats_other": "sats",
     "sats_one": "sat",
-    "advanced": "Avancerat",
     "accounts": "Konton",
     "discover": "Upptäcka",
     "success_message": "{{amount}}{{fiatAmount}} skickat till {{destination}}",
diff --git a/src/i18n/locales/th/translation.json b/src/i18n/locales/th/translation.json
index d804f7d9ca..78f00e57b0 100644
--- a/src/i18n/locales/th/translation.json
+++ b/src/i18n/locales/th/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "ตั้งรหัสผ่านเข้าแอพ",
         "description": "ใช้รหัสนี้เพื่อเข้าสู่ Alby บนเครื่องนี้ รหัสผ่านนี้ไม่สามารถกู้คืนได้หากคุณลืมรหัสผ่านแต่คุณสามารถเปลี่ยนรหัสผ่านได้ภายหลัง",
         "choose_password": {
           "label": "ตั้งรหัสผ่านเข้าแอพ:"
@@ -472,10 +471,7 @@
           "placeholder": "รหัสเพื่อเข้าถึงแซต"
         },
         "title": "Lightning Terminal (LNC)",
-        "page": {
-          "title": "เชื่อมต่อกับ LND node ของคุณ",
-          "description": "1. เปิด Lightning Terminal และเลือก <0> เชื่อมต่อ Lightning Node </0> จากแถบด้านข้าง </1> 2. คลิก <0> สร้างเซสชันใหม่ </0><1/> 3. ตั้งชื่อเซสชัน เลือกสิทธิ์ที่ต้องการและกดยืนยัน <1/>4. <0> คัดลอก pairing phrase </0> และวางมันข้างล่าง"
-        }
+        "page": {}
       },
       "lndhub_go": {
         "title": "LNDHub",
@@ -583,12 +579,8 @@
         }
       },
       "btcpay": {
-        "page": {
-          "instructions": "ไปที่ BTCPayServer ของคุณและลงชื่อเข้าใช้ในฐานะผู้ดูแลระบบ ไปที่ Server Settings > Services > LND Rest - ดูข้อมูล จากนั้นคลิก \"See QR code information\" และ คัดลอก QR Code มาวางไว้ด้านล่าง:",
-          "title": "เชื่อมต่อกับ BTCPay LND node ของคุณ"
-        },
+        "page": {},
         "config": {
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config",
           "label": "การกำหนดค่าข้อมูล"
         },
         "errors": {
@@ -945,7 +937,6 @@
       "connection_failed": "การเชื่อมต่อล้มเหลว",
       "payment_failed": "การชำระเงินล้มเหลว"
     },
-    "advanced": "ขั้นสูง",
     "success": "สำเร็จ",
     "error": "ข้อผิดพลาด",
     "settings": "การตั้งค่า",
diff --git a/src/i18n/locales/tl/translation.json b/src/i18n/locales/tl/translation.json
index 50197dea88..08ed414c5c 100644
--- a/src/i18n/locales/tl/translation.json
+++ b/src/i18n/locales/tl/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "",
         "description": "",
         "choose_password": {
           "label": ""
@@ -166,13 +165,9 @@
       },
       "btcpay": {
         "title": "",
-        "page": {
-          "title": "",
-          "instructions": ""
-        },
+        "page": {},
         "config": {
-          "label": "",
-          "placeholder": ""
+          "label": ""
         },
         "errors": {
           "connection_failed": ""
diff --git a/src/i18n/locales/uk/translation.json b/src/i18n/locales/uk/translation.json
index e40ba6470e..2df940cbca 100644
--- a/src/i18n/locales/uk/translation.json
+++ b/src/i18n/locales/uk/translation.json
@@ -3,7 +3,6 @@
     "welcome": {
       "title": "Вітаємо у Alby",
       "set_password": {
-        "title": "Встановити пароль для розблокування",
         "description": "Пароль використовується для захисту вашого гаманця і надання доступу до розширення браузера. Його не можна скинути і він є відокремленим від вашого паролю до облікового запису Alby.",
         "choose_password": {
           "label": "Оберіть пароль для розблокування:"
@@ -78,10 +77,7 @@
       },
       "lnc": {
         "title": "",
-        "page": {
-          "title": "",
-          "description": ""
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "",
           "placeholder": ""
@@ -205,13 +201,9 @@
       },
       "btcpay": {
         "title": "",
-        "page": {
-          "title": "",
-          "instructions": ""
-        },
+        "page": {},
         "config": {
-          "label": "",
-          "placeholder": ""
+          "label": ""
         },
         "errors": {
           "connection_failed": ""
@@ -573,7 +565,6 @@
   "common": {
     "password": "",
     "confirm_password": "",
-    "advanced": "",
     "success": "",
     "error": "",
     "settings": "",
diff --git a/src/i18n/locales/zh_Hans/translation.json b/src/i18n/locales/zh_Hans/translation.json
index 14cee2b5e1..4b7ce4737a 100644
--- a/src/i18n/locales/zh_Hans/translation.json
+++ b/src/i18n/locales/zh_Hans/translation.json
@@ -2,7 +2,6 @@
   "translation": {
     "welcome": {
       "set_password": {
-        "title": "设置解锁密码",
         "description": "此密码将允许你在此设备上解锁 Alby。它无法恢复，但可以稍后更改。",
         "choose_password": {
           "label": "选择解锁密码："
@@ -95,17 +94,13 @@
         }
       },
       "btcpay": {
-        "page": {
-          "instructions": "导航到你的BTCPayServer并以管理员身份登录。转到服务器设置 > 服务 > LND Rest - 查看信息。然后点击 \"查看二维码信息 \"并复制二维码数据。把它粘贴在下面：",
-          "title": "连接你的BTCPay LND节点"
-        },
+        "page": {},
         "title": "BTCPay Server",
         "errors": {
           "connection_failed": "连接失败。BTCPay连接URL是否正确且可访问？"
         },
         "config": {
-          "label": "配置数据",
-          "placeholder": "config=http://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "配置数据"
         }
       },
       "commando": {
@@ -218,10 +213,7 @@
         }
       },
       "lnc": {
-        "page": {
-          "description": "1. 打开 Lightning Terminal 并从侧边栏选择 <0>Lightning Node Connect</0> 。<1/> 2. 点击 <0>Create a new session</0><1/>3. 标记对话，选择所需的权限并提交<1/>4. <0>复制配对词句</0> 并粘贴到下方。",
-          "title": "连接你的LND节点"
-        },
+        "page": {},
         "title": "Lightning Terminal (LNC)",
         "pairing_phrase": {
           "placeholder": "秘密的堆聪短语",
@@ -855,7 +847,6 @@
     "copied": "已复制！",
     "error": "错误",
     "loading": "加载中",
-    "advanced": "高级",
     "accounts": "帐户",
     "confirm_password": "确认密码",
     "discover": "发现",
diff --git a/src/i18n/locales/zh_Hant/translation.json b/src/i18n/locales/zh_Hant/translation.json
index 54fe94829a..53dde1b6c5 100644
--- a/src/i18n/locales/zh_Hant/translation.json
+++ b/src/i18n/locales/zh_Hant/translation.json
@@ -3,7 +3,6 @@
     "welcome": {
       "title": "歡迎來到Alby",
       "set_password": {
-        "title": "設置解鎖密碼",
         "description": "此密碼將允許你在此設備上解鎖 Alby。它無法恢復，但可以稍後更改。",
         "choose_password": {
           "label": "選擇解鎖密碼："
@@ -85,10 +84,7 @@
       },
       "lnc": {
         "title": "Lightning Terminal (LNC)",
-        "page": {
-          "title": "連接你的 LND 節點",
-          "description": "1. 打開 Lightning Terminal 並從側邊欄選擇 <0>Lightning Node Connect</0>。2. 點擊 <0>Create a new session</0><1/>3. 標記對話，選擇所需的權限並提交<1/>4. <0>複製配對詞句</0> 並粘貼到下方。"
-        },
+        "page": {},
         "pairing_phrase": {
           "label": "你的配對短語 ",
           "placeholder": "secret stack sats phrase"
@@ -212,13 +208,9 @@
       },
       "btcpay": {
         "title": "BTCPay Server",
-        "page": {
-          "title": "連接到你的BTCPay LND節點",
-          "instructions": "導航到你的BTCPayServer並以管理員身份登錄。轉到Server Settings> LND Rest - See Information。然後點擊「See QR Code Information」並複製二維碼數據。在下面貼上："
-        },
+        "page": {},
         "config": {
-          "label": "配置數據",
-          "placeholder": "config=https://your-btc-pay.org/lnd-config/212121/lnd.config"
+          "label": "配置數據"
         },
         "errors": {
           "connection_failed": "連接失敗。BTCPay連接URL是否正確且可訪問？"
@@ -810,7 +802,6 @@
   "common": {
     "password": "密碼",
     "confirm_password": "確認密碼",
-    "advanced": "高級",
     "success": "成功",
     "error": "錯誤",
     "settings": "設置",