Merge branch 'master' into copy-qr

Author: rajanarahul93

README.md

@@ -76,7 +76,6 @@ We welcome and appreciate new contributions! 🎉 To get started, [Refer to SETU
 
 #### 🎨 Designer
 
-- Have a look at our [Open source Design guide](https://github.com/getAlby/lightning-browser-extension/wiki/Open-source-Design)
 - Check out the issues that have specifically been [marked with "design"](https://github.com/getAlby/lightning-browser-extension/issues?q=is%3Aopen+is%3Aissue+label%3A%22design%22)
 - You can find and copy the current version of the extension in this Figma file: [Alby Extension Master Design](https://www.figma.com/file/O49NS4o3IjWwmHvFLncTy6/Alby-Extension-Master-Design?node-id=0%3A1&t=rd4dQkDtwZ4Nuuqo-1)
 
@@ -113,7 +112,7 @@ WebLN is a library and set of specifications for lightning apps and client provi
 
 #### Is there a bounty program and can I contribute?
 
-Yes. Thanks to generous donors, Alby is able to offer several bounties. You can find them on our [Wiki page](https://github.com/getAlby/lightning-browser-extension/wiki/Bounties). If you want to support Alby's bounty program, please donate [here](https://getalby.com/bounties). We greatly appreciate your contribution! 🙏
+Yes. Thanks to generous donors, Alby is able to offer several bounties. You can find them on our [Alby Guides](https://guides.getalby.com/developer-guide/developer-guide/bounties/). If you want to support Alby's bounty program, please donate [here](https://getalby.com/p/bounties). We greatly appreciate your contribution! 🙏
 
 ## ⚡️ Donations
 

doc/SETUP.md

@@ -59,8 +59,6 @@ This guide helps you run the extension in desktop browsers.
   - Load the extension via `opera:extensions`
   - Check the `Developer Mode` and load as unpacked from extension’s extracted directory.
 
-To connect to a remote development LND node you can use a [test account](https://github.com/bumi/lightning-browser-extension/wiki/Test-setup)
-
 ## 📱 Firefox Android Setup
 
 Alby extension is actively maintained for Firefox on Android. Follow the [SETUP_ANDROID.md](./SETUP_ANDROID.md) guide to install and debug it.
@@ -98,7 +96,7 @@ Some ways you can work around this are:
 
 ### How to Test Different Connectors Supported by the Extension?
 
-By default, Alby and NWC (Nostr Wallet Connect) connectors are sufficient for testing UI changes and core functionality. However, if you need to test specific connectors like LND, CLN, or LNbits, you can [Start the lightning network test environment locally and link to the Alby Browser Extension](https://github.com/getAlby/lightning-browser-extension/wiki/Start-the-lightning-network-test-environment-locally-and-link-to-the-Alby)
+By default, Alby and NWC (Nostr Wallet Connect) connectors are sufficient for testing UI changes and core functionality. However, if you need to test specific connectors like LND, CLN, or LNbits, you can run your own local lightning network and you can use [Lightning Polar](https://lightningpolar.com/) which helps you to spin up local instances.
 
 ## 📂 Project Structure
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightning-browser-extension",
-  "version": "3.14.0",
+  "version": "3.14.1",
   "description": "Lightning browser extension",
   "private": true,
   "repository": "https://github.com/bumi/lightning-browser-extension.git",

src/extension/background-script/actions/setup/setIcon.ts

@@ -2,8 +2,6 @@ import browser, { Runtime } from "webextension-polyfill";
 import { isManifestV3 } from "~/common/utils/mv3";
 import { MessageSetIcon } from "~/types";
 
-import state from "../../state";
-
 // Store all tabs with their respective icon
 const tabIcons = new Map<number, string>();
 
@@ -46,7 +44,27 @@ const setIcon = async (icon: string, tabId: number): Promise<void> => {
 
   tabIcons.set(tabId, icon);
 
-  const theme = state.getState().settings.theme == "dark" ? "_dark" : "";
+  // For Chrome (Manifest V3): Use browser theme (prefers-color-scheme)
+  // For Firefox (Manifest V2): theme_icons in manifest.json handles OS-based icons automatically
+  let theme = "";
+  if (isManifestV3) {
+    try {
+      const results = await browser.scripting.executeScript({
+        target: { tabId },
+        func: () => {
+          return window.matchMedia &&
+            window.matchMedia("(prefers-color-scheme: dark)").matches
+            ? "dark"
+            : "light";
+        },
+      });
+      theme = results[0]?.result === "dark" ? "_dark" : "";
+    } catch (error) {
+      console.warn("Failed to detect browser theme, using default:", error);
+      theme = "";
+    }
+  }
+
   const iconsParams = {
     path: {
       // it's looking relative from the "js" folder
@@ -63,4 +81,4 @@ const setIcon = async (icon: string, tabId: number): Promise<void> => {
     : browser.browserAction.setIcon(iconsParams);
 };
 
-export { setIcon, setIconMessageHandler, ExtensionIcon };
+export { ExtensionIcon, setIcon, setIconMessageHandler };

src/i18n/locales/de/translation.json

@@ -3,18 +3,18 @@
     "welcome": {
       "set_password": {
         "choose_password": {
-          "label": "Wähle einen Passcode zum Entsperren:"
+          "label": "Wählen Sie einen Entsperrcode:"
         },
         "errors": {
           "mismatched_password": "Die Passcodes stimmen nicht überein.",
-          "enter_password": "Bitte gebe einen Passcode ein.",
+          "enter_password": "Bitte geben Sie einen Passcode ein.",
           "confirm_password": "Bitte bestätige deinen Passcode."
         },
         "confirm_password": {
-          "label": "Vergewisser dich, dass du es richtig eingegeben hast:"
+          "label": "Vergewissere dich, dass du es richtig eingegeben hast:"
         },
-        "description1": "Lege ein Passcode fest, um die Alby-Erweiterung in diesem Browser zu entsperren",
-        "description2": "Das Password zum Entsperren kann nicht wiederhergestellt, aber geändert werden ",
+        "description1": "Lege einen Passcode fest, um die Alby-Erweiterung in diesem Browser zu entsperren.",
+        "description2": "Der Passcode zum Entsperren kann nicht wiederhergestellt, aber geändert werden.",
         "title": "Passcode zum Entsperren der Erweiterung festlegen"
       },
       "test_connection": {
@@ -379,7 +379,7 @@
       },
       "show_fiat": {
         "title": "Sats in Fiat",
-        "subtitle": "Beträge in die ausgewählte Währung umrechnen (z.B.: EUR)"
+        "subtitle": "Immer in die ausgewählte Währung zum ausgewählten Wechselkurs umrechnen"
       },
       "personal_data": {
         "title": "Persönliche Daten",
@@ -655,7 +655,7 @@
     },
     "send": {
       "input": {
-        "label": "Rechnung, Lightning-Adresse oder LNURL",
+        "label": "Empfänger",
         "hint": "Rechnung, Lightning-Adresse, LNURL",
         "hint_with_bitcoin_address": "Rechnung, Lightning-Adresse, LNURL oder Bitcoin-Adresse"
       },