Merge branch 'master' into feature/lnd-routermc

README.md

@@ -58,7 +58,7 @@ Add Alby to your browser
 ### Try out the most recent version of Alby (Nightly Releases)
 
 - [Firefox Nightly](https://nightly.link/getAlby/lightning-browser-extension/workflows/build/master/firefox.xpi.zip) - best to install it as a temporary add-on as discussed in the "Load extension into browser" section
-- [Chrome Nightly](https://nightly.link/getAlby/lightning-browser-extension/workflows/build/master/chrome.zip) - go to `chrome://extensions/`, enable "Developer mode" (top right) and drag & drop the file in the browser
+- [Chrome Nightly](https://nightly.link/getAlby/lightning-browser-extension/workflows/build/master/chrome.zip) - go to `chrome://extensions/`, enable "Developer mode" (top right), and drag & drop the file in the browser
 
 (Note: You might need to reconfigure your wallet after installing new versions)
 
@@ -95,7 +95,7 @@ Then run the following
 
 ## Native Companions
 
-Alby supports native connectors to native applications on the host computer. For this the extension passes each call to a native application (using [native messaging](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging)).
+Alby supports native connectors to native applications on the host computer. For this, the extension passes each call to a native application (using [native messaging](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging)).
 This allows Alby also to connect to nodes behind Tor (through this native "proxy" application).
 
 Currently, there is one native companion app available to connect to Tor nodes: [https://github.com/getAlby/alby-companion-rs](https://github.com/getAlby/alby-companion-rs)
@@ -132,7 +132,7 @@ We use the [Development Project Board](https://github.com/orgs/getAlby/projects/
 
 Joule is a full interface to manage a LND node. It only supports one LND account.
 Our goal is NOT to write a full UI for a Lightning Network node with all the channel management features, but instead to only focus on what is necessary for the web (for payment and authentication flows). We believe there are already way better management UIs.
-Also we focus on supporting multiple different node backends (non-custodial and custodial).
+Also, we focus on supporting multiple different node backends (non-custodial and custodial).
 
 #### What is WebLN?
 

doc/CONTRIBUTION.md

@@ -30,7 +30,7 @@ When creating a PR please take this points as a reminder:
 - Think in iterations (babysteps)\
   You can always start a PR and if you feel like adding on more things to it, better branch off and [create a new i.e. _draft_-PR](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
 - Newly added components should have a unit-test
-- If you work on a more complex PR please [join our community chat](https://bitcoindesign.slack.com/archives/C02591ADXM2) to get feedback, discuss the best way to tackle the challenge, and to ensure that there's no duplication of work. It's often faster and nicer to chat or call about questions than to do ping-pong comments in PRs
+- If you work on a more complex PR please [join our community chat](https://bitcoindesign.slack.com/archives/C02591ADXM2) (Invite link at https://bitcoin.design/) to get feedback, discuss the best way to tackle the challenge, and to ensure that there's no duplication of work. It's often faster and nicer to chat or call about questions than to do ping-pong comments in PRs
 
 ### Code format & preferences
 
@@ -49,6 +49,10 @@ For better support we recommend these extensions:
 - [vscode-tailwindcss](https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss)
 - [vscode-html-css](https://marketplace.visualstudio.com/items?itemName=ecmel.vscode-html-css)
 
+### Branch names
+
+Please prefix your branch names with `feat/`, `fix/`, `chore/`, `refactor/`, `docs/` based on the intent of the branch or issue being addressed (see commit message format below).
+
 ### Commit message format
 
 Alby enforces [Conventional Commits Specification](https://www.conventionalcommits.org/en/)

src/i18n/locales/cs/translation.json

@@ -634,7 +634,6 @@
     "confirm_request_permission": {
       "title": "",
       "allow": "",
-      "enable_method": "",
       "always_allow": ""
     },
     "nostr": {

src/i18n/locales/de/translation.json

@@ -1,7 +1,7 @@
 {
   "translation": {
     "welcome": {
-      "title": "Die Macht von ⚡ Bitcoin ⚡ in Ihrem Browser",
+      "title": "Die Macht von ⚡ bitcoin ⚡ in deinem Browser",
       "nav": {
         "welcome": "Willkommen",
         "password": "Dein Passwort",

src/i18n/locales/eo/translation.json

@@ -634,7 +634,6 @@
     "confirm_request_permission": {
       "title": "Aprobi peton",
       "allow": "",
-      "enable_method": "",
       "always_allow": ""
     },
     "nostr": {

src/i18n/locales/es/translation.json

@@ -110,21 +110,6 @@
           "connection_failed": "La conexión falló. ¿Son correctas sus credenciales de LND?"
         }
       },
-      "lndhub": {
-        "title": "LNDHub (billetera Bluewallet)",
-        "description": "Conéctese a su billetera móvil Blue Wallet",
-        "page": {
-          "title": "Conéctese a LNDHub (BlueWallet)",
-          "description": "En la billetera BlueWallet, elija la billetera que desea conectar, ábrala, haga clic en\"...\", haga clic en Exportar / Copia de seguridad para mostrar el código QR y escanearlo con su cámara web."
-        },
-        "uri": {
-          "label": "Exportar URI de LNDHub"
-        },
-        "errors": {
-          "invalid_uri": "URI de LNDHub no válido",
-          "connection_failed": "La conexión falló. ¿Es correcto el URI de LNDHub?"
-        }
-      },
       "lnbits": {
         "title": "Cuenta LNbits",
         "description": "Conéctese a su cuenta de LNbits",
@@ -274,7 +259,6 @@
       "allow": "Permitir que {{host}}:",
       "request1": "Solicitar aprobación de transacciones",
       "request2": "Solicitar facturas e información sobre rayos",
-      "connect": "Conectar",
       "block_and_ignore": "Bloquear e ignorar {{host}}",
       "title": "Conectar"
     },
@@ -384,8 +368,7 @@
         "title": "Esperando para escanear"
       },
       "input": {
-        "label": "Factura, Dirección Lightning o LNURL",
-        "placeholder": "Pegar dirección de factura, lnurl o lightning"
+        "label": "Factura, Dirección Lightning o LNURL"
       }
     },
     "lnurlpay": {

src/i18n/locales/fi/translation.json

@@ -634,7 +634,6 @@
     "confirm_request_permission": {
       "title": "Hyväksy pyyntö",
       "allow": "Salli {{host}}:",
-      "enable_method": "{{metodi}}:n kutsu",
       "always_allow": "Salli aina {{metodi}} {{host}}:lla"
     },
     "nostr": {

src/i18n/locales/it/translation.json

@@ -611,15 +611,13 @@
     "error": "Errore",
     "settings": "Impostazioni",
     "websites": "Siti web",
-    "sats": "sats",
     "loading": "caricamento",
     "amount": "Importo",
     "optional": "Facoltativo",
     "feedback": "Valutazione",
     "copied": "Copiato!",
     "description": "Descrizione",
     "description_full": "Descrizione completa",
-    "were_sent_to": "sono stati inviati a",
     "message": "Messaggio",
     "help": "Aiuto",
     "actions": {

src/i18n/locales/pt_BR/translation.json

@@ -110,21 +110,6 @@
           "connection_failed": "Falha na conexão. As credenciais LND estão corretas?"
         }
       },
-      "lndhub": {
-        "title": "LNDHub (Bluewallet)",
-        "description": "Conectar carteira Bluewallet",
-        "page": {
-          "title": "Conecte na LNDHub (BlueWallet)",
-          "description": "Na BlueWallet, abra a carteira que você deseja conectar, clique em \"...\", clique em Exportar/Backup para exibir o código QR. Leia o código QR com sua webcam."
-        },
-        "uri": {
-          "label": "Exportar URI LNDHub"
-        },
-        "errors": {
-          "invalid_uri": "URI LNDHub inválida",
-          "connection_failed": "Falha na conexão. Tem certeza de que a URI da LNDHub está correta?"
-        }
-      },
       "lnbits": {
         "title": "LNbits",
         "description": "Conectar em uma conta LNbits",
@@ -390,7 +375,6 @@
       "allow": "Permitir {{host}}:",
       "request1": "Solicitar aprovação para transações",
       "request2": "Gerar faturas e solicitar informações do servidor",
-      "connect": "Conectar",
       "block_and_ignore": "Bloquear e ignorar {{host}}",
       "title": "Conectar",
       "block_added": "{{host}} adicionado na lista de bloqueio, por favor recarregue o site."
@@ -516,7 +500,6 @@
       },
       "input": {
         "label": "Destinatário",
-        "placeholder": "Cole uma fatura, lnurl ou um endereço relâmpago",
         "hint": "Fatura, Endereço Relâmpago ou LNURL"
       }
     },
@@ -668,7 +651,6 @@
     "confirm_request_permission": {
       "title": "Aprovar Solicitação",
       "allow": "Permitir {{host}}:",
-      "enable_method": "Chamar {{method}}",
       "always_allow": "Sempre permitir {{method}} em {{host}}"
     }
   },

src/i18n/locales/sv/translation.json

@@ -611,15 +611,13 @@
     "error": "Misslyckades",
     "settings": "Inställningar",
     "websites": "Webbplatser",
-    "sats": "sats",
     "loading": "laddar",
     "amount": "Belopp",
     "optional": "Valfritt",
     "feedback": "Återkoppling",
     "copied": "Kopierad!",
     "description": "Beskrivning",
     "description_full": "Fullständig beskrivning",
-    "were_sent_to": "skickades till",
     "message": "Meddelande",
     "help": "Hjälp",
     "actions": {

src/i18n/locales/tl/translation.json

@@ -455,8 +455,7 @@
         "title": ""
       },
       "input": {
-        "label": "",
-        "placeholder": ""
+        "label": ""
       }
     },
     "lnurlpay": {

src/i18n/locales/zh_Hans/translation.json

@@ -595,8 +595,7 @@
     "confirm_request_permission": {
       "allow": "允许{{host}}进行：",
       "always_allow": "始终允许在{{host}}上使用{{method}}",
-      "title": "批准请求",
-      "enable_method": "调用{{method}}"
+      "title": "批准请求"
     },
     "nostr": {
       "title": "Nostr",