diff --git a/packages/app/src/Const.ts b/packages/app/src/Const.ts index 7ed6af69..af41055d 100644 --- a/packages/app/src/Const.ts +++ b/packages/app/src/Const.ts @@ -179,7 +179,6 @@ export const MagnetRegex = /(magnet:[\S]+)/i; */ export const WavlakeRegex = /https?:\/\/(?:player\.|www\.)?wavlake\.com\/(?!top|new|artists|account|activity|login|preferences|feed)(?:(?:track|album)\/[a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}|[a-z-]+)/i; -/player\.wavlake\.com\/(?!feed\/)(track\/[.a-zA-Z0-9-]+|album\/[.a-zA-Z0-9-]+|[.a-zA-Z0-9-]+)/i; /* * Regex to match any base64 string diff --git a/packages/app/src/Pages/settings/WalletSettings.tsx b/packages/app/src/Pages/settings/WalletSettings.tsx index d875afa1..e522999f 100644 --- a/packages/app/src/Pages/settings/WalletSettings.tsx +++ b/packages/app/src/Pages/settings/WalletSettings.tsx @@ -32,10 +32,10 @@ const WalletSettings = () => {

Nostr Wallet Connect

-
navigate("/settings/wallet/cashu")}> + {/*
navigate("/settings/wallet/cashu")}>

Cashu

-
+
*/} ); diff --git a/packages/app/src/lang.json b/packages/app/src/lang.json index daee238d..f5626bff 100644 --- a/packages/app/src/lang.json +++ b/packages/app/src/lang.json @@ -455,6 +455,9 @@ "KahimY": { "defaultMessage": "Unknown event kind: {kind}" }, + "KoFlZg": { + "defaultMessage": "Enter mint URL" + }, "L7SZPr": { "defaultMessage": "For more information about donations see {link}." }, @@ -595,6 +598,10 @@ "SOqbe9": { "defaultMessage": "Update Lightning Address" }, + "SX58hM": { + "defaultMessage": "Copy", + "description": "Button: Copy Cashu token" + }, "SYQtZ7": { "defaultMessage": "LN Address Proxy" }, @@ -604,6 +611,9 @@ "Ss0sWu": { "defaultMessage": "Pay Now" }, + "TMfYfY": { + "defaultMessage": "Cashu token" + }, "TpgeGw": { "defaultMessage": "Hex Salt..", "description": "Hexidecimal 'salt' input for imgproxy" @@ -614,6 +624,9 @@ "UDYlxu": { "defaultMessage": "Pending Subscriptions" }, + "ULotH9": { + "defaultMessage": "Amount: {amount} sats" + }, "UQ3pOC": { "defaultMessage": "On Nostr, many people have the same username. User names and identity are separate things. You can get a unique identifier in the next step." }, @@ -669,6 +682,10 @@ "XgWvGA": { "defaultMessage": "Reactions" }, + "XrSk2j": { + "defaultMessage": "Redeem", + "description": "Button: Redeem Cashu token" + }, "XzF0aC": { "defaultMessage": "Key manager extensions are more secure and allow you to easily login to any Nostr client, here are some well known extensions:" }, @@ -852,6 +869,9 @@ "iNWbVV": { "defaultMessage": "Handle" }, + "iUsU2x": { + "defaultMessage": "Mint: {url}" + }, "iXPL0Z": { "defaultMessage": "Can't login with private key on an insecure connection, please use a Nostr key manager extension instead" }, diff --git a/packages/app/src/translations/en.json b/packages/app/src/translations/en.json index 3d824184..4bf27357 100644 --- a/packages/app/src/translations/en.json +++ b/packages/app/src/translations/en.json @@ -149,6 +149,7 @@ "KQvWvD": "Deleted", "KWuDfz": "I have saved my keys, continue", "KahimY": "Unknown event kind: {kind}", + "KoFlZg": "Enter mint URL", "L7SZPr": "For more information about donations see {link}.", "LF5kYT": "Other Connections", "LXxsbk": "Anonymous", @@ -195,12 +196,15 @@ "RoOyAh": "Relays", "Rs4kCE": "Bookmark", "SOqbe9": "Update Lightning Address", + "SX58hM": "Copy", "SYQtZ7": "LN Address Proxy", "Sjo1P4": "Custom", "Ss0sWu": "Pay Now", + "TMfYfY": "Cashu token", "TpgeGw": "Hex Salt..", "TwyMau": "Account", "UDYlxu": "Pending Subscriptions", + "ULotH9": "Amount: {amount} sats", "UQ3pOC": "On Nostr, many people have the same username. User names and identity are separate things. You can get a unique identifier in the next step.", "UUPFlt": "Users must accept the content warning to show the content of your note.", "Up5U7K": "Block", @@ -219,6 +223,7 @@ "WxthCV": "e.g. Jack", "X7xU8J": "nsec, npub, nip-05, hex, mnemonic", "XgWvGA": "Reactions", + "XrSk2j": "Redeem", "XzF0aC": "Key manager extensions are more secure and allow you to easily login to any Nostr client, here are some well known extensions:", "Y31HTH": "Help fund the development of Snort", "YDURw6": "Service URL", @@ -279,6 +284,7 @@ "iEoXYx": "DeepL translations", "iGT1eE": "Prevent fake accounts from imitating you", "iNWbVV": "Handle", + "iUsU2x": "Mint: {url}", "iXPL0Z": "Can't login with private key on an insecure connection, please use a Nostr key manager extension instead", "ieGrWo": "Follow", "itPgxd": "Profile",