Merge branch 'main' into badges

packages/app/src/Const.ts

@@ -78,6 +78,13 @@ export const RecommendedFollows = [
   "52b4a076bcbbbdc3a1aefa3735816cf74993b1b8db202b01c883c58be7fad8bd", // semisol
 ];
 
+/**
+ * Mark zaps invalid for the following pubkeys
+ */
+export const ZapperSpam = [
+  "e1ff3bfdd4e40315959b08b4fcc8245eaa514637e1d4ec2ae166b743341be1af", // benthecarman
+];
+
 /**
  * Regex to match email address
  */

packages/app/src/Element/Invoice.tsx

@@ -66,7 +66,7 @@ export default function Invoice(props: InvoiceProps) {
         <p className="invoice-amount">
           {amount > 0 && (
             <>
-              {amount.toLocaleString()} <span className="sats">sat{amount === 1 ? "" : "s"}</span>
+              {(amount / 1_000).toLocaleString()} <span className="sats">sat{amount === 1_000 ? "" : "s"}</span>
             </>
           )}
         </p>

packages/app/src/Element/Note.tsx

@@ -115,7 +115,7 @@ export default function Note(props: NoteProps) {
   const zaps = useMemo(() => {
     const sortedZaps = getReactions(related, ev.Id, EventKind.ZapReceipt)
       .map(parseZap)
-      .filter(z => z.valid && z.zapper !== ev.PubKey);
+      .filter(z => z.valid && z.sender !== ev.PubKey);
     sortedZaps.sort((a, b) => b.amount - a.amount);
     return sortedZaps;
   }, [related]);

packages/app/src/Element/NoteFooter.tsx

@@ -65,7 +65,7 @@ export default function NoteFooter(props: NoteFooterProps) {
     type: "language",
   });
   const zapTotal = zaps.reduce((acc, z) => acc + z.amount, 0);
-  const didZap = zaps.some(a => a.zapper === login);
+  const didZap = zaps.some(a => a.sender === login);
   const longPress = useLongPress(
     e => {
       e.stopPropagation();
@@ -277,7 +277,7 @@ export default function NoteFooter(props: NoteFooterProps) {
           </MenuItem>
         )}
         <MenuItem onClick={() => copyId()}>
-          <Icon name="dislike" />
+          <Icon name="copy" />
           <FormattedMessage {...messages.CopyID} />
         </MenuItem>
         <MenuItem onClick={() => mute(ev.PubKey)}>
@@ -286,7 +286,7 @@ export default function NoteFooter(props: NoteFooterProps) {
         </MenuItem>
         {prefs.enableReactions && (
           <MenuItem onClick={() => react("-")}>
-            <Icon name="copy" />
+            <Icon name="dislike" />
             <FormattedMessage {...messages.DislikeAction} />
           </MenuItem>
         )}

packages/app/src/Element/Reactions.tsx

@@ -98,7 +98,7 @@ const Reactions = ({ show, setShow, positive, negative, reposts, zaps }: Reactio
           {tab.value === 1 &&
             zaps.map(z => {
               return (
-                z.zapper && (
+                z.sender && (
                   <div key={z.id} className="reactions-item">
                     <div className="zap-reaction-icon">
                       <Icon name="zap" size={20} />
@@ -106,7 +106,7 @@ const Reactions = ({ show, setShow, positive, negative, reposts, zaps }: Reactio
                     </div>
                     <ProfileImage
                       autoWidth={false}
-                      pubkey={z.anonZap ? "" : z.zapper}
+                      pubkey={z.anonZap ? "" : z.sender}
                       subHeader={
                         <div className="f-ellipsis zap-comment" title={z.content}>
                           {z.content}

packages/app/src/Element/Text.tsx

@@ -1,6 +1,6 @@
 import "./Text.css";
 import { useMemo, useCallback } from "react";
-import { Link } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import ReactMarkdown from "react-markdown";
 import { visit, SKIP } from "unist-util-visit";
 import * as unist from "unist";
@@ -28,6 +28,8 @@ export interface TextProps {
 }
 
 export default function Text({ content, tags, creator }: TextProps) {
+  const location = useLocation();
+
   function extractLinks(fragments: Fragment[]) {
     return fragments
       .map(f => {
@@ -80,7 +82,10 @@ export default function Text({ content, tags, creator }: TextProps) {
                   case "e": {
                     const eText = hexToBech32("note", ref.Event).substring(0, 12);
                     return (
-                      <Link to={eventLink(ref.Event ?? "")} onClick={e => e.stopPropagation()}>
+                      <Link
+                        to={eventLink(ref.Event ?? "")}
+                        onClick={e => e.stopPropagation()}
+                        state={{ from: location.pathname }}>
                         #{eText}
                       </Link>
                     );

packages/app/src/Element/Thread.tsx

@@ -254,15 +254,12 @@ const TierThree = ({ active, path, isLastSubthread, from, notes, related, chains
 };
 
 export interface ThreadProps {
-  this?: u256;
   notes?: TaggedRawEvent[];
 }
 
 export default function Thread(props: ThreadProps) {
   const notes = props.notes ?? [];
   const parsedNotes = notes.map(a => new NEvent(a));
-  // root note has no thread info
-  const root = useMemo(() => parsedNotes.find(a => a.Thread === null), [notes]);
   const [path, setPath] = useState<HexKey[]>([]);
   const currentId = path.length > 0 && path[path.length - 1];
   const currentRoot = useMemo(() => parsedNotes.find(a => a.Id === currentId), [notes, currentId]);
@@ -295,6 +292,33 @@ export default function Thread(props: ThreadProps) {
     return chains;
   }, [notes]);
 
+  const root = useMemo(() => {
+    const isRoot = (ne?: NEvent) => ne?.Thread === null;
+    const currentNote = parsedNotes.find(ne => ne.Id === urlNoteHex);
+
+    if (isRoot(currentNote)) {
+      return currentNote;
+    }
+
+    const rootEventId = currentNote?.Thread?.Root?.Event;
+
+    // sometimes the root event ID is missing, and we can only take the happy path if the root event ID exists
+    if (rootEventId) {
+      return parsedNotes.find(ne => ne.Id === rootEventId);
+    }
+
+    const possibleRoots = parsedNotes.filter(isRoot);
+
+    // worst case we need to check every possible root to see which one contains the current note as a child
+    for (const ne of possibleRoots) {
+      const children = chains.get(ne.Id) ?? [];
+
+      if (children.find(ne => ne.Id === urlNoteHex)) {
+        return ne;
+      }
+    }
+  }, [notes, chains, urlNoteHex]);
+
   useEffect(() => {
     if (!root) {
       return;
@@ -370,7 +394,7 @@ export default function Thread(props: ThreadProps) {
       const newPath = path.slice(0, path.length - 1);
       setPath(newPath);
     } else {
-      navigate("/");
+      navigate(location.state?.from ?? "/");
     }
   }
 

packages/app/src/Element/Timeline.tsx

@@ -99,7 +99,7 @@ export default function Timeline({
       }
       case EventKind.ZapReceipt: {
         const zap = parseZap(e);
-        return zap.e ? null : <Zap zap={zap} key={e.id} />;
+        return zap.event ? null : <Zap zap={zap} key={e.id} />;
       }
       case EventKind.Reaction:
       case EventKind.Repost: {

packages/app/src/Element/Zap.tsx

@@ -2,108 +2,127 @@ import "./Zap.css";
 import { useMemo } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useSelector } from "react-redux";
-import { Event, HexKey, TaggedRawEvent } from "@snort/nostr";
+import { HexKey, TaggedRawEvent } from "@snort/nostr";
 
-import { decodeInvoice, sha256, unwrap } from "Util";
+import { decodeInvoice, InvoiceDetails, sha256, unwrap } from "Util";
 import { formatShort } from "Number";
 import Text from "Element/Text";
 import ProfileImage from "Element/ProfileImage";
 import { RootState } from "State/Store";
 import { findTag } from "Util";
+import { ZapperSpam } from "Const";
+import { UserCache } from "State/Users/UserCache";
 
 import messages from "./messages";
 
-function getInvoice(zap: TaggedRawEvent) {
+function getInvoice(zap: TaggedRawEvent): InvoiceDetails | undefined {
   const bolt11 = findTag(zap, "bolt11");
   if (!bolt11) {
-    console.debug("Invalid zap: ", zap);
-    return {};
+    throw new Error("Invalid zap, missing bolt11 tag");
   }
-  const decoded = decodeInvoice(bolt11);
-  if (decoded) {
-    return { amount: decoded?.amount, hash: decoded?.descriptionHash };
-  }
-  return {};
+  return decodeInvoice(bolt11);
 }
 
-interface Zapper {
-  pubkey?: HexKey;
-  isValid: boolean;
-  isAnon: boolean;
-  content: string;
-}
-
-function getZapper(zap: TaggedRawEvent, dhash: string): Zapper {
-  let zapRequest = findTag(zap, "description");
-  if (zapRequest) {
+export function parseZap(zapReceipt: TaggedRawEvent): ParsedZap {
+  let innerZapJson = findTag(zapReceipt, "description");
+  if (innerZapJson) {
     try {
-      if (zapRequest.startsWith("%")) {
-        zapRequest = decodeURIComponent(zapRequest);
+      const invoice = getInvoice(zapReceipt);
+      if (innerZapJson.startsWith("%")) {
+        innerZapJson = decodeURIComponent(innerZapJson);
       }
-      const rawEvent: TaggedRawEvent = JSON.parse(zapRequest);
-      if (Array.isArray(rawEvent)) {
+      const zapRequest: TaggedRawEvent = JSON.parse(innerZapJson);
+      if (Array.isArray(zapRequest)) {
         // old format, ignored
-        return { isValid: false, isAnon: false, content: "" };
+        throw new Error("deprecated zap format");
       }
-      const anonZap = rawEvent.tags.some(a => a[0] === "anon");
-      const metaHash = sha256(zapRequest);
-      const ev = new Event(rawEvent);
-      return { pubkey: ev.PubKey, isValid: dhash === metaHash, isAnon: anonZap, content: rawEvent.content };
+      const anonZap = findTag(zapRequest, "anon");
+      const metaHash = sha256(innerZapJson);
+      const ret: ParsedZap = {
+        id: zapReceipt.id,
+        zapService: zapReceipt.pubkey,
+        amount: (invoice?.amount ?? 0) / 1000,
+        event: findTag(zapRequest, "e"),
+        sender: zapRequest.pubkey,
+        receiver: findTag(zapRequest, "p"),
+        valid: true,
+        anonZap: anonZap !== undefined,
+        content: zapRequest.content,
+        errors: [],
+      };
+      if (invoice?.descriptionHash !== metaHash) {
+        ret.valid = false;
+        ret.errors.push("description_hash does not match zap request");
+      }
+      if (ZapperSpam.includes(zapReceipt.pubkey)) {
+        ret.valid = false;
+        ret.errors.push("zapper is banned");
+      }
+      if (findTag(zapRequest, "p") !== findTag(zapReceipt, "p")) {
+        ret.valid = false;
+        ret.errors.push("p tags dont match");
+      }
+      if (ret.event && ret.event !== findTag(zapReceipt, "e")) {
+        ret.valid = false;
+        ret.errors.push("e tags dont match");
+      }
+      if (findTag(zapRequest, "amount") === invoice?.amount) {
+        ret.valid = false;
+        ret.errors.push("amount tag does not match invoice amount");
+      }
+      if (UserCache.get(ret.receiver)?.zapService !== ret.zapService) {
+        ret.valid = false;
+        ret.errors.push("zap service pubkey doesn't match");
+      }
+      if (!ret.valid) {
+        console.debug("Invalid zap", ret);
+      }
+      return ret;
     } catch (e) {
-      console.warn("Invalid zap", zapRequest);
+      console.debug("Invalid zap", zapReceipt, e);
     }
   }
-  return { isValid: false, isAnon: false, content: "" };
+  return {
+    id: zapReceipt.id,
+    zapService: zapReceipt.pubkey,
+    amount: 0,
+    valid: false,
+    anonZap: false,
+    errors: ["invalid zap, parsing failed"],
+  };
 }
 
 export interface ParsedZap {
   id: HexKey;
-  e?: HexKey;
-  p: HexKey;
+  event?: HexKey;
+  receiver?: HexKey;
   amount: number;
-  content: string;
-  zapper?: HexKey;
+  content?: string;
+  sender?: HexKey;
   valid: boolean;
   zapService: HexKey;
   anonZap: boolean;
-}
-
-export function parseZap(zap: TaggedRawEvent): ParsedZap {
-  const { amount, hash } = getInvoice(zap);
-  const zapper = hash ? getZapper(zap, hash) : ({ isValid: false, content: "" } as Zapper);
-  const e = findTag(zap, "e");
-  const p = unwrap(findTag(zap, "p"));
-  return {
-    id: zap.id,
-    e,
-    p,
-    amount: Number(amount) / 1000,
-    zapper: zapper.pubkey,
-    content: zapper.content,
-    valid: zapper.isValid,
-    zapService: zap.pubkey,
-    anonZap: zapper.isAnon,
-  };
+  errors: Array<string>;
 }
 
 const Zap = ({ zap, showZapped = true }: { zap: ParsedZap; showZapped?: boolean }) => {
-  const { amount, content, zapper, valid, p } = zap;
+  const { amount, content, sender, valid, receiver } = zap;
   const pubKey = useSelector((s: RootState) => s.login.publicKey);
 
-  return valid && zapper ? (
+  return valid && sender ? (
     <div className="zap note card">
       <div className="header">
-        <ProfileImage autoWidth={false} pubkey={zapper} />
-        {p !== pubKey && showZapped && <ProfileImage autoWidth={false} pubkey={p} />}
+        <ProfileImage autoWidth={false} pubkey={sender} />
+        {receiver !== pubKey && showZapped && <ProfileImage autoWidth={false} pubkey={unwrap(receiver)} />}
         <div className="amount">
           <span className="amount-number">
-            <FormattedMessage {...messages.Sats} values={{ n: formatShort(amount) }} />
+            <FormattedMessage {...messages.Sats} values={{ n: formatShort(amount ?? 0) }} />
           </span>
         </div>
       </div>
-      {content.length > 0 && zapper && (
+      {(content?.length ?? 0) > 0 && sender && (
         <div className="body">
-          <Text creator={zapper} content={content} tags={[]} />
+          <Text creator={sender} content={unwrap(content)} tags={[]} />
         </div>
       )}
     </div>
@@ -117,8 +136,8 @@ interface ZapsSummaryProps {
 export const ZapsSummary = ({ zaps }: ZapsSummaryProps) => {
   const { formatMessage } = useIntl();
   const sortedZaps = useMemo(() => {
-    const pub = [...zaps.filter(z => z.zapper && z.valid)];
-    const priv = [...zaps.filter(z => !z.zapper && z.valid)];
+    const pub = [...zaps.filter(z => z.sender && z.valid)];
+    const priv = [...zaps.filter(z => !z.sender && z.valid)];
     pub.sort((a, b) => b.amount - a.amount);
     return pub.concat(priv);
   }, [zaps]);
@@ -128,17 +147,17 @@ export const ZapsSummary = ({ zaps }: ZapsSummaryProps) => {
   }
 
   const [topZap, ...restZaps] = sortedZaps;
-  const { zapper, amount, anonZap } = topZap;
+  const { sender, amount, anonZap } = topZap;
 
   return (
     <div className="zaps-summary">
       {amount && (
         <div className={`top-zap`}>
           <div className="summary">
-            {zapper && (
+            {sender && (
               <ProfileImage
                 autoWidth={false}
-                pubkey={anonZap ? "" : zapper}
+                pubkey={anonZap ? "" : sender}
                 overrideUsername={anonZap ? formatMessage({ defaultMessage: "Anonymous" }) : undefined}
               />
             )}

packages/app/src/Feed/ZapsFeed.ts

@@ -18,7 +18,7 @@ export default function useZapsFeed(pubkey?: HexKey) {
   const zaps = useMemo(() => {
     const profileZaps = zapsFeed.store.notes
       .map(parseZap)
-      .filter(z => z.valid && z.p === pubkey && z.zapper !== pubkey && !z.e);
+      .filter(z => z.valid && z.receiver === pubkey && z.sender !== pubkey && !z.event);
     profileZaps.sort((a, b) => b.amount - a.amount);
     return profileZaps;
   }, [zapsFeed]);

packages/app/src/LNURL.ts

@@ -111,6 +111,13 @@ export class LNURL {
     return this.#service?.nostrPubkey ? true : false;
   }
 
+  /**
+   * Return pubkey of zap service
+   */
+  get zapperPubkey() {
+    return this.#service?.nostrPubkey;
+  }
+
   /**
    * Get the max allowed comment length
    */

packages/app/src/Number.ts

@@ -8,7 +8,9 @@ export function formatShort(n: number) {
     return n;
   } else if (n < 1e6) {
     return `${intl.format(n / 1e3)}K`;
-  } else {
+  } else if (n < 1e9) {
     return `${intl.format(n / 1e6)}M`;
+  } else {
+    return `${intl.format(n / 1e9)}G`;
   }
 }

packages/app/src/Pages/EventPage.tsx

@@ -8,5 +8,5 @@ export default function EventPage() {
   const id = parseId(params.id ?? "");
   const thread = useThreadFeed(id);
 
-  return <Thread notes={thread.notes} this={id} />;
+  return <Thread key={id} notes={thread.notes} />;
 }

packages/app/src/State/Users/UserCache.ts

@@ -1,5 +1,6 @@
 import { HexKey } from "@snort/nostr";
 import { db } from "Db";
+import { LNURL } from "LNURL";
 import { unixNowMs, unwrap } from "Util";
 import { MetadataCache } from ".";
 
@@ -97,6 +98,19 @@ export class UserProfileCache {
     const existing = this.get(m.pubkey);
     const refresh = existing && existing.created === m.created && existing.loaded < m.loaded;
     if (!existing || existing.created < m.created || refresh) {
+      // fetch zapper key
+      const lnurl = m.lud16 || m.lud06;
+      if (lnurl) {
+        try {
+          const svc = new LNURL(lnurl);
+          await svc.load();
+          m.zapService = svc.zapperPubkey;
+        } catch {
+          console.debug("Failed to load LNURL for zapper pubkey", lnurl);
+        }
+        // ignored
+      }
+
       this.#cache.set(m.pubkey, m);
       if (db.ready) {
         await db.users.put(m);

packages/app/src/State/Users/index.ts

@@ -21,6 +21,11 @@ export interface MetadataCache extends UserMetadata {
    * The bech32 encoded pubkey
    */
   npub: string;
+
+  /**
+   * Pubkey of zapper service
+   */
+  zapService?: HexKey;
 }
 
 export function mapEventToProfile(ev: TaggedRawEvent) {

packages/app/src/Util.ts

@@ -240,25 +240,35 @@ export const delay = (t: number) => {
   });
 };
 
-export function decodeInvoice(pr: string) {
+export interface InvoiceDetails {
+  amount?: number;
+  expire?: number;
+  timestamp?: number;
+  description?: string;
+  descriptionHash?: string;
+  paymentHash?: string;
+  expired: boolean;
+}
+
+export function decodeInvoice(pr: string): InvoiceDetails | undefined {
   try {
     const parsed = invoiceDecode(pr);
 
     const amountSection = parsed.sections.find(a => a.name === "amount");
-    const amount = amountSection ? (amountSection.value as number) : NaN;
+    const amount = amountSection ? Number(amountSection.value as number | string) : undefined;
 
     const timestampSection = parsed.sections.find(a => a.name === "timestamp");
-    const timestamp = timestampSection ? (timestampSection.value as number) : NaN;
+    const timestamp = timestampSection ? Number(timestampSection.value as number | string) : undefined;
 
     const expirySection = parsed.sections.find(a => a.name === "expiry");
-    const expire = expirySection ? (expirySection.value as number) : NaN;
+    const expire = expirySection ? Number(expirySection.value as number | string) : undefined;
     const descriptionSection = parsed.sections.find(a => a.name === "description")?.value;
     const descriptionHashSection = parsed.sections.find(a => a.name === "description_hash")?.value;
     const paymentHashSection = parsed.sections.find(a => a.name === "payment_hash")?.value;
     const ret = {
-      amount: !isNaN(amount) ? amount : undefined,
-      expire: !isNaN(timestamp) && !isNaN(expire) ? timestamp + expire : undefined,
-      timestamp: !isNaN(timestamp) ? timestamp : undefined,
+      amount: amount,
+      expire: timestamp && expire ? timestamp + expire : undefined,
+      timestamp: timestamp,
       description: descriptionSection as string | undefined,
       descriptionHash: descriptionHashSection ? bytesToHex(descriptionHashSection as Uint8Array) : undefined,
       paymentHash: paymentHashSection ? bytesToHex(paymentHashSection as Uint8Array) : undefined,

packages/app/src/Wallet/index.ts

@@ -85,8 +85,8 @@ export function prToWalletInvoice(pr: string) {
     return {
       amount: parsedInvoice.amount ?? 0,
       memo: parsedInvoice.description,
-      paymentHash: parsedInvoice.paymentHash,
-      timestamp: parsedInvoice.timestamp,
+      paymentHash: parsedInvoice.paymentHash ?? "",
+      timestamp: parsedInvoice.timestamp ?? 0,
       state: parsedInvoice.expired ? WalletInvoiceState.Expired : WalletInvoiceState.Pending,
       pr,
     } as WalletInvoice;

packages/app/src/translations/ar.json

@@ -91,6 +91,7 @@
   "G1BGCg": "Select Wallet",
   "GFOoEE": "ملح",
   "GL8aXW": "المنشورات المرجعية ({n})",
+  "Gcn9NQ": "Magnet Link",
   "GspYR7": "{n} استهجان",
   "H+vHiz": "مفتاح بصيغة سداسية عشرية ..",
   "H0JBH6": "تسجيل خروج",

packages/app/src/translations/de.json

@@ -91,6 +91,7 @@
   "G1BGCg": "Select Wallet",
   "GFOoEE": "Salt",
   "GL8aXW": "Lesezeichen ({n})",
+  "Gcn9NQ": "Magnet Link",
   "GspYR7": "{n} Dislike",
   "H+vHiz": "Hex Schlüssel..",
   "H0JBH6": "Abmelden",

packages/app/src/translations/es.json

@@ -91,6 +91,7 @@
   "G1BGCg": "Select Wallet",
   "GFOoEE": "Salt",
   "GL8aXW": "Bookmarks ({n})",
+  "Gcn9NQ": "Magnet Link",
   "GspYR7": "{n} No me gusta",
   "H+vHiz": "Llave hexagonal..",
   "H0JBH6": "Salir",

packages/app/src/translations/fr.json

@@ -91,6 +91,7 @@
   "G1BGCg": "Select Wallet",
   "GFOoEE": "Sel",
   "GL8aXW": "Favoris ({n})",
+  "Gcn9NQ": "Magnet Link",
   "GspYR7": "{n} N'aime pas",
   "H+vHiz": "Clé hexagonale..",
   "H0JBH6": "Se Déconnecter",

packages/app/src/translations/hu.json

@@ -91,6 +91,7 @@
   "G1BGCg": "Select Wallet",
   "GFOoEE": "Salt",
   "GL8aXW": "Könyvjelzők ({n})",
+  "Gcn9NQ": "Magnet Link",
   "GspYR7": "{n} Nem tetszik",
   "H+vHiz": "Hex kulcs..",
   "H0JBH6": "Kijelentkezés",

packages/app/src/translations/id.json

@@ -91,6 +91,7 @@
   "G1BGCg": "Select Wallet",
   "GFOoEE": "Garam",
   "GL8aXW": "Penanda buku ({n})",
+  "Gcn9NQ": "Magnet Link",
   "GspYR7": "{n} Tidak suka",
   "H+vHiz": "Kunci Hex..",
   "H0JBH6": "Keluar",

packages/app/src/translations/it.json

@@ -1,8 +1,8 @@
 {
   "+D82kt": "Sei sicuro di voler ripostare: {id}",
   "+aZY2h": "Zap Type",
-  "+vIQlC": "Assicurati di salvare la seguente password per gestire il tuo handle in futuro",
-  "+vVZ/G": "Connect",
+  "+vIQlC": "Assicurati di salvare la seguente password per gestire il tuo profilo in futuro",
+  "+vVZ/G": "Connetti",
   "/4tOwT": "Salta",
   "/JE/X+": "Supporto Clienti",
   "/PCavi": "Pubblica",
@@ -15,13 +15,13 @@
   "0yO7wF": "{n} secs",
   "1A7TZk": "Che cos’è Snort e come funziona?",
   "1Mo59U": "Sei sicuro di voler rimuovere questa nota dai segnalibri?",
-  "1c4YST": "Connected to: {node} 🎉",
+  "1c4YST": "Connesso a: {node}🎉",
   "1nYUGC": "{n} Seguiti ",
   "1udzha": "Conversazioni",
   "2/2yg+": "Aggiungi",
   "25V4l1": "Immagine dell'intestazione",
   "2IFGap": "Dona",
-  "2LbrkB": "Enter password",
+  "2LbrkB": "Inserisci la password",
   "2a2YiP": "Segnalibri {n}",
   "2k0Cv+": "Non Mi piace ({n})",
   "3cc4Ct": "Chiaro",
@@ -88,9 +88,10 @@
   "FfYsOb": "Si è verificato un errore!",
   "FmXUJg": "ti segue",
   "G/yZLu": "Rimuovi",
-  "G1BGCg": "Select Wallet",
+  "G1BGCg": "Seleziona Wallet",
   "GFOoEE": "Salt",
   "GL8aXW": "Segnalibri ({n})",
+  "Gcn9NQ": "Magnet Link",
   "GspYR7": "{n} Non mi piace",
   "H+vHiz": "Chiave Esadecimale",
   "H0JBH6": "Disconnetti",
@@ -108,7 +109,7 @@
   "JkLHGw": "Sito Web",
   "K3r6DQ": "Elimina",
   "K7AkdL": "Visualizza",
-  "KAhAcM": "Enter LNDHub config",
+  "KAhAcM": "Inserisci la configurazione LNDHub",
   "KQvWvD": "Eliminato",
   "KWuDfz": "Ho salvato le mie chiavi, continua",
   "KahimY": "Tipo di evento sconosciuto: {kind}",
@@ -118,7 +119,7 @@
   "M3Oirc": "Menu debug",
   "MBAYRO": "Mostra \"Copia ID\" e \"Copia evento JSON\" nel menu contestuale di ogni messaggio",
   "MI2jkA": "Non disponibile:",
-  "MP54GY": "Wallet password",
+  "MP54GY": "Password del Wallet",
   "MRp6Ly": "Nome utente Twitter",
   "MWTx65": "Pagina Predefinita",
   "MzRYWH": "Acquistare {item}",
@@ -138,7 +139,7 @@
   "QTdJfH": "Crea un account",
   "QawghE": "Puoi cambiare il tuo nome utente in qualsiasi momento.",
   "QxCuTo": "Art by {name}",
-  "R2OqnW": "Delete Account",
+  "R2OqnW": "Elimina account",
   "RDZVQL": "Verifica",
   "RahCRH": "Scaduto",
   "RhDAoS": "Sei sicuro di volerlo eliminare {id}",
@@ -148,7 +149,7 @@
   "TpgeGw": "Hex Salt..",
   "UQ3pOC": "Su Nostr, molte persone hanno lo stesso nome utente. I nomi utente e l'identità sono cose separate. Puoi ottenere un identificatore univoco nel prossimo passaggio.",
   "Up5U7K": "Blocca",
-  "VN0+Fz": "Balance: {amount} sats",
+  "VN0+Fz": "Saldo: {amount} sats",
   "VOjC1i": "Scegli quale servizio di caricamento vuoi caricare gli allegati",
   "VlJkSk": "{n} mutato",
   "VnXp8Z": "Immagine di profilo",
@@ -162,7 +163,7 @@
   "Y31HTH": "Contribuisci a finanziare lo sviluppo di Snort",
   "YDURw6": "Url Del Servizio",
   "YXA3AH": "Abilita reazioni",
-  "Z4BMCZ": "Enter pairing phrase",
+  "Z4BMCZ": "Inserisci la frase di accoppiamento",
   "ZKORll": "Attiva Adesso",
   "ZLmyG9": "Contributori",
   "ZUZedV": "Donazione Lightning:",
@@ -174,10 +175,10 @@
   "cPIKU2": "Stai seguendo",
   "cQfLWb": "URL..",
   "cWx9t8": "Silenzia tutto",
-  "cg1VJ2": "Connect Wallet",
+  "cg1VJ2": "Connetti Wallet",
   "cuV2gK": "il nome è registrato",
   "cyR7Kh": "Indietro",
-  "d6CyG5": "History",
+  "d6CyG5": "Cronologia",
   "d7d0/x": "Indirizzo LN",
   "dOQCL8": "Nome visualizzato",
   "e7qqly": "Segna tutto come letto",
@@ -213,10 +214,10 @@
   "jzgQ2z": "{n} Reazioni",
   "k2veDA": "Scrivi",
   "k7sKNy": "Il nostro servizio di verifica NIP-05, aiuta a supportare lo sviluppo di questo sito e ottenere un distintivo speciale multicolore sul nostro sito!",
-  "kaaf1E": "now",
+  "kaaf1E": "Ora",
   "lCILNz": "Acquista ora",
   "lD3+8a": "Paga",
-  "lTbT3s": "Wallet password",
+  "lTbT3s": "Password del Wallet",
   "lgg1KN": "Pagina del profilo",
   "ll3xBp": "Servizio proxy di immagini",
   "lnaT9F": "Segui {n}",
@@ -240,14 +241,14 @@
   "oxCa4R": "Ottenere un identificatore ti aiuta a confermare il tuo account a persone che ti conoscono. Molte persone possono avere un nome utente @jack, ma c'è solo uno jack@cash.app.",
   "puLNUJ": "Pin",
   "pzTOmv": "Seguaci",
-  "qDwvZ4": "Unknown error",
+  "qDwvZ4": "Errore sconosciuto",
   "qMx1sA": "Quantità Zap predefinita",
   "qUJTsT": "Bloccato",
   "qdGuQo": "La tua chiave privata è (non condividerla con nessuno)",
   "qkvYUb": "Aggiungi al Profilo",
   "qmJ8kD": "Traduzione fallita",
   "r3C4x/": "Software",
-  "r5srDR": "Enter wallet password",
+  "r5srDR": "Inserire la password del portafogli",
   "rT14Ow": "Aggiungi Relays",
   "reJ6SM": "Si consiglia di utilizzare una delle seguenti estensioni del browser se si è su un computer desktop per proteggere la chiave:",
   "rfuMjE": "(Predefinito)",
@@ -264,7 +265,7 @@
   "usAvMr": "Modifica Il Profilo",
   "ut+2Cd": "Ottieni un identificatore partner",
   "vOKedj": "{n,plural,=1{& {n} other} other{& {n} others}}",
-  "vU71Ez": "Paying with {wallet}",
+  "vU71Ez": "Paga con {wallet}",
   "vZ4quW": "NIP-05 è una specifica di verifica basata su DNS che ti aiuta a convalidare come un utente reale.",
   "vrTOHJ": "{amount} sats",
   "wEQDC6": "Modifica",
@@ -273,13 +274,13 @@
   "wih7iJ": "il nome è bloccato",
   "wqyN/i": "Per saperne di più su {service} a {link}",
   "wtLjP6": "Copia il mio ID",
-  "wvFw6Y": "Hey, it looks like you dont have a NIP-05 handle yet, you should get one! Check out {link}",
+  "wvFw6Y": "Ehi, sembra che tu non abbia ancora una verifica NIP-05, dovresti averne una! Dai un'occhiata a {link}",
   "x82IOl": "Muto",
   "xIoGG9": "Vai a",
   "xJ9n2N": "La tua chiave pubblica",
   "xKdNPm": "Invia",
   "xKflGN": "Seguito da {username} su Nostr",
-  "xQtL3v": "Unlock",
+  "xQtL3v": "Sblocca",
   "xbVgIm": "Carica automaticamente i media",
   "xmcVZ0": "Ricerca",
   "y1Z3or": "Lingua",

packages/app/src/translations/ja.json

@@ -91,6 +91,7 @@
   "G1BGCg": "ウォレットを選択する",
   "GFOoEE": "ソルト",
   "GL8aXW": "ブックマーク ({n})",
+  "Gcn9NQ": "マグネットリンク",
   "GspYR7": "{n} イヤ",
   "H+vHiz": "Hex Keyを入力",
   "H0JBH6": "ログアウト",

packages/app/src/translations/ko.json

@@ -91,6 +91,7 @@
   "G1BGCg": "Select Wallet",
   "GFOoEE": "Salt",
   "GL8aXW": "Bookmarks ({n})",
+  "Gcn9NQ": "Magnet Link",
   "GspYR7": "{n} Dislike",
   "H+vHiz": "Hex Key..",
   "H0JBH6": "Log Out",

packages/app/src/translations/zh.json

@@ -91,6 +91,7 @@
   "G1BGCg": "Select Wallet",
   "GFOoEE": "盐",
   "GL8aXW": "书签({n})",
+  "Gcn9NQ": "Magnet Link",
   "GspYR7": "{n} 不喜欢",
   "H+vHiz": "十六进制密钥...",
   "H0JBH6": "注销",