diff --git a/packages/app/public/icons.svg b/packages/app/public/icons.svg index bb4ba8dc..a59d8b8a 100644 --- a/packages/app/public/icons.svg +++ b/packages/app/public/icons.svg @@ -325,5 +325,11 @@ + + + + + + \ No newline at end of file diff --git a/packages/app/src/Element/Note.tsx b/packages/app/src/Element/Note.tsx index 72cc5bd7..84ee88ea 100644 --- a/packages/app/src/Element/Note.tsx +++ b/packages/app/src/Element/Note.tsx @@ -255,18 +255,26 @@ export function NoteInner(props: NoteProps) { - + {c}, + }} + /> {contentWarning[1] && ( <> -
+   {c}, reason: contentWarning[1], }} /> )} +   + }> {innerContent()} diff --git a/packages/app/src/Element/Reveal.css b/packages/app/src/Element/Reveal.css new file mode 100644 index 00000000..c305313e --- /dev/null +++ b/packages/app/src/Element/Reveal.css @@ -0,0 +1,15 @@ +.note-notice { + color: var(--font-tertiary-color); + border: 1px solid var(--border-color); + padding: 8px 16px; + border-radius: 12px; +} + +.note-notice i { + font-style: normal; + color: var(--font-color); +} + +.note-notice svg { + color: var(--warning); +} diff --git a/packages/app/src/Element/Reveal.tsx b/packages/app/src/Element/Reveal.tsx index 01f6cc7d..dc5f1734 100644 --- a/packages/app/src/Element/Reveal.tsx +++ b/packages/app/src/Element/Reveal.tsx @@ -1,3 +1,5 @@ +import "./Reveal.css"; +import Icon from "Icons/Icon"; import { useState } from "react"; interface RevealProps { @@ -15,8 +17,9 @@ export default function Reveal(props: RevealProps): JSX.Element { e.stopPropagation(); setReveal(true); }} - className="note-invoice"> - {props.message} + className="note-notice flex g8"> + +
{props.message}
); } else { diff --git a/packages/app/src/lang.json b/packages/app/src/lang.json index cd95fb17..bc4cc657 100644 --- a/packages/app/src/lang.json +++ b/packages/app/src/lang.json @@ -63,6 +63,9 @@ "0mch2Y": { "defaultMessage": "name has disallowed characters" }, + "0uoY11": { + "defaultMessage": "Show Status" + }, "0yO7wF": { "defaultMessage": "{n} secs" }, @@ -108,6 +111,9 @@ "2ukA4d": { "defaultMessage": "{n} hours" }, + "3KNMbJ": { + "defaultMessage": "Articles" + }, "3Rx6Qo": { "defaultMessage": "Advanced" }, @@ -184,6 +190,9 @@ "65BmHb": { "defaultMessage": "Failed to proxy image from {host}, click here to load directly" }, + "6OSOXl": { + "defaultMessage": "Reason: {reason}" + }, "6Yfvvp": { "defaultMessage": "Get an identifier" }, @@ -229,9 +238,6 @@ "9+Ddtu": { "defaultMessage": "Next" }, - "91VPqq": { - "defaultMessage": "Paying with wallet" - }, "9HU8vw": { "defaultMessage": "Reply" }, @@ -355,6 +361,9 @@ "EPYwm7": { "defaultMessage": "Your private key is your password. If you lose this key, you will lose access to your account! Copy it and keep it in a safe place. There is no way to reset your private key." }, + "EQKRE4": { + "defaultMessage": "Show badges on profile pages" + }, "EWyQH5": { "defaultMessage": "Global" }, @@ -382,6 +391,9 @@ "FDguSC": { "defaultMessage": "{n} Zaps" }, + "FMfjrl": { + "defaultMessage": "Show status messages on profile pages" + }, "FS3b54": { "defaultMessage": "Done!" }, @@ -467,6 +479,9 @@ "Ig9/a1": { "defaultMessage": "Sent {n} sats to {name}" }, + "IoQq+a": { + "defaultMessage": "Click here to load anyway" + }, "Ix8l+B": { "defaultMessage": "Trending Notes" }, @@ -506,9 +521,6 @@ "KAhAcM": { "defaultMessage": "Enter LNDHub config" }, - "KLo3SP": { - "defaultMessage": "Reason: {reason}" - }, "KQvWvD": { "defaultMessage": "Deleted" }, @@ -570,6 +582,9 @@ "N2IrpM": { "defaultMessage": "Confirm" }, + "NAidKb": { + "defaultMessage": "Notifications" + }, "NAuFNH": { "defaultMessage": "You already have a subscription of this type, please renew or pay" }, @@ -703,6 +718,9 @@ "Ss0sWu": { "defaultMessage": "Pay Now" }, + "StKzTE": { + "defaultMessage": "The author has marked this note as a sensitive topic" + }, "TDR5ge": { "defaultMessage": "Media in notes will automatically be shown for selected people, otherwise only the link will show" }, @@ -986,6 +1004,9 @@ "hicxcO": { "defaultMessage": "Show replies" }, + "hmZ3Bz": { + "defaultMessage": "Media" + }, "hniz8Z": { "defaultMessage": "here" }, @@ -1227,6 +1248,9 @@ "rudscU": { "defaultMessage": "Failed to load follows, please try again later" }, + "sKDn4e": { + "defaultMessage": "Show Badges" + }, "sUNhQE": { "defaultMessage": "user" }, @@ -1316,9 +1340,6 @@ "x/Fx2P": { "defaultMessage": "Fund the services that you use by splitting a portion of all your zaps into a pool of funds!" }, - "x/q8d5": { - "defaultMessage": "This note has been marked as sensitive, click here to reveal" - }, "x82IOl": { "defaultMessage": "Mute" }, diff --git a/packages/app/src/translations/en.json b/packages/app/src/translations/en.json index 9fe8f20d..ac84adfe 100644 --- a/packages/app/src/translations/en.json +++ b/packages/app/src/translations/en.json @@ -20,6 +20,7 @@ "0BUTMv": "Search...", "0jOEtS": "Invalid LNURL", "0mch2Y": "name has disallowed characters", + "0uoY11": "Show Status", "0yO7wF": "{n} secs", "1A7TZk": "What is Snort and how does it work?", "1Mo59U": "Are you sure you want to remove this note from bookmarks?", @@ -35,6 +36,7 @@ "2a2YiP": "{n} Bookmarks", "2k0Cv+": "Dislikes ({n})", "2ukA4d": "{n} hours", + "3KNMbJ": "Articles", "3Rx6Qo": "Advanced", "3cc4Ct": "Light", "3gOsZq": "Translators", @@ -60,6 +62,7 @@ "5vMmmR": "Usernames are not unique on Nostr. The nostr address is your unique human-readable address that is unique to you upon registration.", "5ykRmX": "Send zap", "65BmHb": "Failed to proxy image from {host}, click here to load directly", + "6OSOXl": "Reason: {reason}", "6Yfvvp": "Get an identifier", "6bgpn+": "Not all clients support this, you may still receive some zaps as if zap splits was not configured", "6ewQqw": "Likes ({n})", @@ -70,6 +73,7 @@ "8/vBbP": "Reposts ({n})", "89q5wc": "Confirm Reposts", "8QDesP": "Zap {n} sats", + "8Rkoyb": "Recipient", "8Y6bZQ": "Invalid zap split: {input}", "8g2vyB": "name too long", "8v1NN+": "Pairing phrase", @@ -114,6 +118,7 @@ "E8a4yq": "Follow some popular accounts", "ELbg9p": "Data Providers", "EPYwm7": "Your private key is your password. If you lose this key, you will lose access to your account! Copy it and keep it in a safe place. There is no way to reset your private key.", + "EQKRE4": "Show badges on profile pages", "EWyQH5": "Global", "Ebl/B2": "Translate to {lang}", "EcZF24": "Custom Relays", @@ -123,6 +128,7 @@ "F+B3x1": "We have also partnered with nostrplebs.com to give you more options", "F3l7xL": "Add Account", "FDguSC": "{n} Zaps", + "FMfjrl": "Show status messages on profile pages", "FS3b54": "Done!", "FSYL8G": "Trending Users", "FdhSU2": "Claim Now", @@ -145,13 +151,13 @@ "HOzFdo": "Muted", "HWbkEK": "Clear cache and reload", "HbefNb": "Open Wallet", - "I9zn6f": "Pubkey", "IDjHJ6": "Thanks for using Snort, please consider donating if you can.", "IEwZvs": "Are you sure you want to unpin this note?", "IKKHqV": "Follows", "INSqIz": "Twitter username...", "IUZC+0": "This means that nobody can modify notes which you have created and everybody can easily verify that the notes they are reading are created by you.", "Ig9/a1": "Sent {n} sats to {name}", + "IoQq+a": "Click here to load anyway", "Ix8l+B": "Trending Notes", "J+dIsA": "Subscriptions", "JCIgkj": "Username", @@ -165,7 +171,6 @@ "K3r6DQ": "Delete", "K7AkdL": "Show", "KAhAcM": "Enter LNDHub config", - "KLo3SP": "Reason: {reason}", "KQvWvD": "Deleted", "KWuDfz": "I have saved my keys, continue", "KahimY": "Unknown event kind: {kind}", @@ -186,6 +191,7 @@ "MuVeKe": "Buy nostr address", "MzRYWH": "Buying {item}", "N2IrpM": "Confirm", + "NAidKb": "Notifications", "NAuFNH": "You already have a subscription of this type, please renew or pay", "NNSu3d": "Import Twitter Follows", "NdOYJJ": "Hmm nothing here.. Checkout {newUsersPage} to follow some recommended nostrich's!", @@ -229,6 +235,7 @@ "ShdEie": "Mark all read", "Sjo1P4": "Custom", "Ss0sWu": "Pay Now", + "StKzTE": "The author has marked this note as a sensitive topic", "TDR5ge": "Media in notes will automatically be shown for selected people, otherwise only the link will show", "TMfYfY": "Cashu token", "TpgeGw": "Hex Salt..", @@ -267,6 +274,7 @@ "Z4BMCZ": "Enter pairing phrase", "ZKORll": "Activate Now", "ZLmyG9": "Contributors", + "ZS+jRE": "Send zap splits to", "ZUZedV": "Lightning Donation:", "Zr5TMx": "Setup profile", "a5UPxh": "Fund developers and platforms providing NIP-05 verification services", @@ -320,6 +328,7 @@ "hWSp+B": "Nostr Connect (NIP-46)", "hY4lzx": "Supports", "hicxcO": "Show replies", + "hmZ3Bz": "Media", "hniz8Z": "here", "i/dBAR": "Zap Pool", "iCqGww": "Reactions ({n})", @@ -399,6 +408,7 @@ "rmdsT4": "{n} days", "rrfdTe": "This is the same technology which is used by Bitcoin and has been proven to be extremely secure.", "rudscU": "Failed to load follows, please try again later", + "sKDn4e": "Show Badges", "sUNhQE": "user", "sWnYKw": "Snort is designed to have a similar experience to Twitter.", "sZQzjQ": "Failed to parse zap split: {input}", @@ -410,11 +420,11 @@ "u/vOPu": "Paid", "u4bHcR": "Check out the code here: {link}", "uSV4Ti": "Reposts need to be manually confirmed", + "uc0din": "Send sats splits to", "usAvMr": "Edit Profile", "ut+2Cd": "Get a partner identifier", "v8lolG": "Start chat", "vOKedj": "{n,plural,=1{& {n} other} other{& {n} others}}", - "vU71Ez": "Paying with {wallet}", "vZ4quW": "NIP-05 is a DNS based verification spec which helps to validate you as a real user.", "vhlWFg": "Poll Options", "vlbWtt": "Get a free one", @@ -428,7 +438,6 @@ "wqyN/i": "Find out more info about {service} at {link}", "wtLjP6": "Copy ID", "x/Fx2P": "Fund the services that you use by splitting a portion of all your zaps into a pool of funds!", - "x/q8d5": "This note has been marked as sensitive, click here to reveal", "x82IOl": "Mute", "xIcAOU": "Votes by {type}", "xIoGG9": "Go to",