Merge branch 'master' into master

package.json

@@ -43,7 +43,7 @@
     "@noble/curves": "^1.4.0",
     "@noble/hashes": "^1.4.0",
     "@noble/secp256k1": "^2.0.0",
-    "@popicons/react": "^0.0.9",
+    "@popicons/react": "^0.0.11",
     "@scure/base": "^1.1.6",
     "@scure/bip32": "^1.3.3",
     "@scure/bip39": "^1.2.2",
@@ -55,7 +55,7 @@
     "bolt11-signet": "1.4.1",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.10",
-    "dexie": "^3.2.6",
+    "dexie": "^3.2.7",
     "elliptic": "^6.5.4",
     "events": "^3.3.0",
     "html5-qrcode": "^2.3.8",
@@ -75,10 +75,10 @@
     "react-loading-skeleton": "^3.3.1",
     "react-modal": "^3.16.1",
     "react-qr-code": "^2.0.12",
-    "react-router-dom": "^6.22.2",
+    "react-router-dom": "^6.22.3",
     "slip77": "^0.2.0",
     "stream": "^0.0.2",
-    "tailwindcss": "^3.4.1",
+    "tailwindcss": "^3.4.3",
     "uuid": "^9.0.1",
     "webextension-polyfill": "^0.10.0",
     "zustand": "^4.5.2"

src/app/components/AccountMenu/index.tsx

@@ -1,6 +1,7 @@
 import {
   PopiconsChevronBottomLine,
   PopiconsCirclePlusLine,
+  PopiconsGlobeLine,
   PopiconsWalletLine,
 } from "@popicons/react";
 import { useEffect } from "react";
@@ -14,7 +15,6 @@ import { useAccounts } from "~/app/context/AccountsContext";
 import { isAlbyLNDHubAccount, isAlbyOAuthAccount } from "~/app/utils";
 import utils from "~/common/lib/utils";
 
-import PopiconsGlobeLine from "~/app/icons/popicons/GlobeLine";
 import Menu from "../Menu";
 
 export type Props = {

src/app/components/Badge/index.tsx

@@ -17,7 +17,7 @@ export default function Badge({
   return (
     <div
       className={classNames(
-        "inline-flex items-center leading-none rounded-full font-medium mr-2 py-1 pr-2 pl-3 mb-2 text-xs cursor-default",
+        "inline-flex items-center leading-none rounded-full font-medium py-1.5 px-2 text-xs cursor-default",
         className
       )}
       title={description}

src/app/components/BadgesList/index.tsx

@@ -14,13 +14,13 @@ export default function BadgesList({ allowance }: Props) {
   if (allowance.remainingBudget > 0) {
     badges.push({
       label: "budget",
-      className: "bg-blue-500 text-white",
+      className: "bg-blue-500 text-white mr-2",
     });
   }
   if (allowance.lnurlAuth) {
     badges.push({
       label: "auth",
-      className: "bg-green-bitcoin text-white",
+      className: "bg-green-bitcoin text-white mr-2",
     });
   }
 

src/app/components/SitePreferences/index.tsx

@@ -291,7 +291,7 @@ function SitePreferences({ launcherType, allowance, onEdit, onDelete }: Props) {
                               )
                             );
                           }}
-                          className="bg-green-50 dark:bg-emerald-950 border border-green-100 dark:border-emerald-900 text-gray-800 dark:text-neutral-200 gap-1"
+                          className="bg-green-50 dark:bg-emerald-950 border border-green-100 dark:border-emerald-900 text-gray-800 dark:text-neutral-200 mr-2 mb-2"
                         />
                       </>
                     ))}
@@ -319,7 +319,7 @@ function SitePreferences({ launcherType, allowance, onEdit, onDelete }: Props) {
                               )
                             );
                           }}
-                          className="bg-red-50 dark:bg-red-950 border border-red-100 dark:border-red-900 text-gray-800 dark:text-neutral-200 gap-1"
+                          className="bg-red-50 dark:bg-red-950 border border-red-100 dark:border-red-900 text-gray-800 dark:text-neutral-200 mr-2 mb-2"
                         />
                       </>
                     ))}

src/app/screens/Nostr/ConfirmDecrypt.tsx

@@ -70,7 +70,7 @@ function NostrConfirmDecrypt() {
               <p className="mb-2">{t("allow", { host: origin.host })}</p>
               <p className="dark:text-white">
                 <PopiconsCheckLine className="w-5 h-5 mr-2 inline" />
-                {tPermissions("nostr.decrypt")}
+                {tPermissions("nostr.decrypt.title")}
               </p>
             </div>
           </div>

src/extension/background-script/actions/nostr/decryptOrPrompt.ts

@@ -14,7 +14,7 @@ const decryptOrPrompt = async (message: MessageDecryptGet, sender: Sender) => {
 
   try {
     const hasPermission = await hasPermissionFor(
-      PermissionMethodNostr["NOSTR_NIP04DECRYPT"],
+      PermissionMethodNostr["NOSTR_DECRYPT"],
       host
     );
 
@@ -39,7 +39,7 @@ const decryptOrPrompt = async (message: MessageDecryptGet, sender: Sender) => {
       // add permission to db only if user decided to always allow this request
       if (promptResponse.data.rememberPermission) {
         await addPermissionFor(
-          PermissionMethodNostr["NOSTR_NIP04DECRYPT"],
+          PermissionMethodNostr["NOSTR_DECRYPT"],
           host,
           promptResponse.data.blocked
         );

src/extension/background-script/actions/nostr/enable.ts

@@ -82,10 +82,8 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
           // Add permissions
           const permissions: PermissionMethodNostr[] = [
             PermissionMethodNostr.NOSTR_GETPUBLICKEY,
-            PermissionMethodNostr.NOSTR_NIP04ENCRYPT,
-            PermissionMethodNostr.NOSTR_NIP04DECRYPT,
-            PermissionMethodNostr.NOSTR_NIP44ENCRYPT,
-            PermissionMethodNostr.NOSTR_NIP44DECRYPT,
+            PermissionMethodNostr.NOSTR_ENCRYPT,
+            PermissionMethodNostr.NOSTR_DECRYPT,
           ];
           permissions.forEach(async (permission) => {
             await addPermissionFor(permission, host, false);

src/extension/background-script/actions/nostr/encryptOrPrompt.ts

@@ -15,7 +15,7 @@ const encryptOrPrompt = async (message: MessageEncryptGet, sender: Sender) => {
 
   try {
     const hasPermission = await hasPermissionFor(
-      PermissionMethodNostr["NOSTR_NIP04ENCRYPT"],
+      PermissionMethodNostr["NOSTR_ENCRYPT"],
       host
     );
 
@@ -45,7 +45,7 @@ const encryptOrPrompt = async (message: MessageEncryptGet, sender: Sender) => {
       // add permission to db only if user decided to always allow this request
       if (promptResponse.data.rememberPermission) {
         await addPermissionFor(
-          PermissionMethodNostr["NOSTR_NIP04ENCRYPT"],
+          PermissionMethodNostr["NOSTR_ENCRYPT"],
           host,
           promptResponse.data.blocked
         );

src/extension/background-script/actions/nostr/nip44DecryptOrPrompt.ts

@@ -17,7 +17,7 @@ const nip44DecryptOrPrompt = async (
 
   try {
     const hasPermission = await hasPermissionFor(
-      PermissionMethodNostr["NOSTR_NIP44DECRYPT"],
+      PermissionMethodNostr["NOSTR_DECRYPT"],
       host
     );
 
@@ -42,7 +42,7 @@ const nip44DecryptOrPrompt = async (
       // add permission to db only if user decided to always allow this request
       if (promptResponse.data.rememberPermission) {
         await addPermissionFor(
-          PermissionMethodNostr["NOSTR_NIP44DECRYPT"],
+          PermissionMethodNostr["NOSTR_DECRYPT"],
           host,
           promptResponse.data.blocked
         );

src/extension/background-script/actions/nostr/nip44EncryptOrPrompt.ts

@@ -18,7 +18,7 @@ const nip44EncryptOrPrompt = async (
 
   try {
     const hasPermission = await hasPermissionFor(
-      PermissionMethodNostr["NOSTR_NIP44ENCRYPT"],
+      PermissionMethodNostr["NOSTR_ENCRYPT"],
       host
     );
 
@@ -47,7 +47,7 @@ const nip44EncryptOrPrompt = async (
       // add permission to db only if user decided to always allow this request
       if (promptResponse.data.rememberPermission) {
         await addPermissionFor(
-          PermissionMethodNostr["NOSTR_NIP44ENCRYPT"],
+          PermissionMethodNostr["NOSTR_ENCRYPT"],
           host,
           promptResponse.data.blocked
         );

src/extension/background-script/connectors/lndhub.ts

@@ -171,6 +171,7 @@ export default class LndHub implements Connector {
       (transaction, index): ConnectorTransaction => ({
         id: `${index}`,
         memo: transaction.memo,
+        custom_records: transaction.custom_records,
         preimage: transaction.payment_preimage,
         payment_hash: Buffer.from(transaction.payment_hash.data).toString(
           "hex"

src/extension/background-script/migrations/index.ts

@@ -1,10 +1,8 @@
-// import db from "../db";
-// import state from "../state";
+import db from "../db";
+import state from "../state";
 
 export type Migration = keyof typeof migrations;
 
-/*
-
 // TS does not want unused code.
 // we need this for the next migration again
 
@@ -30,9 +28,71 @@ const setMigrated = (name: Migration): Promise<void> => {
   return state.getState().saveToStorage();
 };
 
-*/
+const migrations = {
+  migrateEncryptPermission: async () => {
+    const allowances = await db.allowances.toArray();
+
+    for (const allowance of allowances) {
+      const permissions = await db.permissions
+        .where({ allowanceId: allowance.id })
+        .toArray();
+
+      let isupdated = false;
+
+      for (const permission of permissions) {
+        if (
+          permission.method === "nostr/nip04encrypt" ||
+          permission.method === "nostr/nip44encrypt"
+        ) {
+          if (isupdated === false) {
+            permission.id &&
+              (await db.permissions.update(permission.id, {
+                method: "nostr/encrypt",
+              }));
+
+            isupdated = true;
+          } else {
+            permission.id && (await db.permissions.delete(permission.id));
+          }
+        }
+      }
+    }
+
+    console.info("Migration migrateEncryptPermission complete.");
+  },
+
+  migrateDecryptPermission: async () => {
+    const allowances = await db.allowances.toArray();
+
+    for (const allowance of allowances) {
+      const permissions = await db.permissions
+        .where({ allowanceId: allowance.id })
+        .toArray();
 
-const migrations = {};
+      let isupdated = false;
+
+      for (const permission of permissions) {
+        if (
+          permission.method === "nostr/nip04decrypt" ||
+          permission.method === "nostr/nip44decrypt"
+        ) {
+          if (isupdated === false) {
+            permission.id &&
+              (await db.permissions.update(permission.id, {
+                method: "nostr/decrypt",
+              }));
+
+            isupdated = true;
+          } else {
+            permission.id && (await db.permissions.delete(permission.id));
+          }
+        }
+      }
+    }
+
+    console.info("Migration migrateDecryptPermission complete.");
+  },
+};
 
 const migrate = async () => {
   // going forward we can iterate through the the migrations object above and DRY this up:
@@ -43,6 +103,18 @@ const migrate = async () => {
   //  await migrations["migratePermissionsWithoutAccountId"]();
   //  await setMigrated("migratePermissionsWithoutAccountId");
   //}
+
+  if (shouldMigrate("migrateEncryptPermission")) {
+    console.info("Running migration for: migrateEncryptPermission");
+    await migrations["migrateEncryptPermission"]();
+    await setMigrated("migrateEncryptPermission");
+  }
+
+  if (shouldMigrate("migrateDecryptPermission")) {
+    console.info("Running migration for: migrateDecryptPermission");
+    await migrations["migrateDecryptPermission"]();
+    await setMigrated("migrateDecryptPermission");
+  }
 };
 
 export default migrate;

src/i18n/locales/de/translation.json

@@ -1092,7 +1092,8 @@
       "edit_allowance": {
         "title": "Seiten Einstellung",
         "screen_reader": "Zulässigkeitsoptionen",
-        "always_allow": "Immer erlauben"
+        "always_allow": "Immer erlauben",
+        "always_reject": "Immer ablehnen"
       },
       "enable_login": {
         "title": "Anmeldung auf der Webseite aktivieren",
@@ -1211,7 +1212,9 @@
       "disconnect": "Verbindung trennen",
       "copied_to_clipboard": "In die Zwischenablage kopiert",
       "hide": "Ausblenden",
-      "finish": "Oberfläche"
+      "finish": "Oberfläche",
+      "deny": "Verweigern",
+      "sign": "Unterschrift"
     },
     "discover": "Apps entdecken",
     "errors": {

src/i18n/locales/en/translation.json

@@ -1290,23 +1290,15 @@
         "title": "read public key",
         "description": "Read your public key"
       },
-      "decrypt": "Decrypt data",
-      "nip04decrypt": {
-        "title": "decrypt (nip04)",
+      "decrypt": {
+        "title": "decrypt",
         "description": "Decrypt data"
       },
-      "nip04encrypt": {
-        "title": "encrypt (nip04)",
-        "description": "Encrypt data"
-      },
-      "nip44decrypt": {
-        "title": "decrypt (nip44)",
-        "description": "Decrypt data"
-      },
-      "nip44encrypt": {
-        "title": "encrypt (nip44)",
+      "encrypt": {
+        "title": "encrypt",
         "description": "Encrypt data"
       },
+
       "signmessage": {
         "title": "Sign Message",
         "description": "Sign all nostr events"