From a33adf41ff36b83969c72adcc93600ceb8eeb424 Mon Sep 17 00:00:00 2001 From: hzrd149 Date: Fri, 8 Nov 2024 10:18:51 +0000 Subject: [PATCH] fix lightning invoices not showing in content --- package.json | 6 +- pnpm-lock.yaml | 216 +++++++++++------- .../content/components/lightning.tsx | 10 + src/components/content/index.tsx | 2 + src/components/content/links/emoji.tsx | 18 -- src/components/content/links/index.ts | 2 - src/components/content/links/lightning.tsx | 19 -- .../lightning/inline-invoice-card.tsx | 12 +- .../dvm-feed/components/feed-status.tsx | 2 +- 9 files changed, 152 insertions(+), 135 deletions(-) create mode 100644 src/components/content/components/lightning.tsx delete mode 100644 src/components/content/links/emoji.tsx delete mode 100644 src/components/content/links/lightning.tsx diff --git a/package.json b/package.json index 5e0cf1d5a..39a232c86 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@chakra-ui/breakpoint-utils": "^2.0.8", "@chakra-ui/icons": "^2.2.4", "@chakra-ui/media-query": "^3.3.0", - "@chakra-ui/react": "^2.10.3", + "@chakra-ui/react": "^2.10.4", "@chakra-ui/shared-utils": "^2.0.4", "@chakra-ui/styled-system": "^2.12.0", "@chakra-ui/theme-tools": "^2.2.6", @@ -66,7 +66,7 @@ "framer-motion": "^10.18.0", "handlebars": "^4.7.8", "hls.js": "^1.5.17", - "i18n-iso-countries": "^7.12.0", + "i18n-iso-countries": "^7.13.0", "idb": "^8.0.0", "identicon.js": "^2.3.3", "iso-language-codes": "^2.0.0", @@ -95,7 +95,7 @@ "react-mosaic-component": "^6.1.0", "react-photo-album": "^2.4.1", "react-qr-barcode-scanner": "^2.0.0", - "react-router-dom": "^6.27.0", + "react-router-dom": "^6.28.0", "react-simplemde-editor": "^5.2.0", "react-singleton-hook": "^4.0.1", "react-use": "^17.5.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e3a9eafef..12069b697 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,13 +23,13 @@ importers: version: 2.0.8 '@chakra-ui/icons': specifier: ^2.2.4 - version: 2.2.4(@chakra-ui/react@2.10.3(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(framer-motion@10.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + version: 2.2.4(@chakra-ui/react@2.10.4(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(framer-motion@10.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@chakra-ui/media-query': specifier: ^3.3.0 version: 3.3.0(@chakra-ui/system@2.6.2(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(react@18.3.1))(react@18.3.1) '@chakra-ui/react': - specifier: ^2.10.3 - version: 2.10.3(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(framer-motion@10.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^2.10.4 + version: 2.10.4(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(framer-motion@10.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@chakra-ui/shared-utils': specifier: ^2.0.4 version: 2.0.4 @@ -95,25 +95,25 @@ importers: version: 4.9.2(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) applesauce-channel: specifier: next - version: 0.0.0-next-20241106104112(typescript@5.6.3) + version: 0.0.0-next-20241108100553(typescript@5.6.3) applesauce-content: specifier: next - version: 0.0.0-next-20241106104112(typescript@5.6.3) + version: 0.0.0-next-20241108100553(typescript@5.6.3) applesauce-core: specifier: next - version: 0.0.0-next-20241106104112(typescript@5.6.3) + version: 0.0.0-next-20241108100553(typescript@5.6.3) applesauce-lists: specifier: next - version: 0.0.0-next-20241106104112(typescript@5.6.3) + version: 0.0.0-next-20241108100553(typescript@5.6.3) applesauce-net: specifier: next - version: 0.0.0-next-20241106104112(typescript@5.6.3) + version: 0.0.0-next-20241108100553(typescript@5.6.3) applesauce-react: specifier: next - version: 0.0.0-next-20241106104112(typescript@5.6.3) + version: 0.0.0-next-20241108100553(typescript@5.6.3) applesauce-signer: specifier: next - version: 0.0.0-next-20241106104112(typescript@5.6.3) + version: 0.0.0-next-20241108100553(typescript@5.6.3) bech32: specifier: ^2.0.0 version: 2.0.0 @@ -163,8 +163,8 @@ importers: specifier: ^1.5.17 version: 1.5.17 i18n-iso-countries: - specifier: ^7.12.0 - version: 7.12.0 + specifier: ^7.13.0 + version: 7.13.0 idb: specifier: ^8.0.0 version: 8.0.0 @@ -250,8 +250,8 @@ importers: specifier: ^2.0.0 version: 2.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-router-dom: - specifier: ^6.27.0 - version: 6.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^6.28.0 + version: 6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-simplemde-editor: specifier: ^5.2.0 version: 5.2.0(easymde@2.18.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -341,10 +341,10 @@ importers: specifier: ^0.6.8 version: 0.6.8 '@types/react': - specifier: ^18.2.22 + specifier: ^18.3.12 version: 18.3.12 '@types/react-dom': - specifier: ^18.2.7 + specifier: ^18.3.1 version: 18.3.1 '@types/react-window': specifier: ^1.8.8 @@ -916,6 +916,9 @@ packages: '@chakra-ui/anatomy@2.3.4': resolution: {integrity: sha512-fFIYN7L276gw0Q7/ikMMlZxP7mvnjRaWJ7f3Jsf9VtDOi6eAYIBRrhQe6+SZ0PGmoOkRaBc7gSE5oeIbgFFyrw==} + '@chakra-ui/anatomy@2.3.5': + resolution: {integrity: sha512-3im33cUOxCbISjaBlINE2u8BOwJSCdzpjCX0H+0JxK2xz26UaVA5xeI3NYHUoxDnr/QIrgfrllGxS0szYwOcyg==} + '@chakra-ui/breakpoint-utils@2.0.8': resolution: {integrity: sha512-Pq32MlEX9fwb5j5xx8s18zJMARNHlQZH2VH1RZgfgRDpp7DcEgtRW5AInfN5CfqdHLO1dGxA7I3MqEuL5JnIsA==} @@ -924,8 +927,8 @@ packages: peerDependencies: react: '>=18' - '@chakra-ui/hooks@2.4.2': - resolution: {integrity: sha512-LRKiVE1oA7afT5tbbSKAy7Uas2xFHE6IkrQdbhWCHmkHBUtPvjQQDgwtnd4IRZPmoEfNGwoJ/MQpwOM/NRTTwA==} + '@chakra-ui/hooks@2.4.3': + resolution: {integrity: sha512-Sr2zsoTZw3p7HbrUy4aLpTIkE2XXUelAUgg3NGwMzrmx75bE0qVyiuuTFOuyEzGxYVV2Fe8QtcKKilm6RwzTGg==} peerDependencies: react: '>=18' @@ -959,8 +962,8 @@ packages: peerDependencies: react: '>=18' - '@chakra-ui/react@2.10.3': - resolution: {integrity: sha512-oWmGGzzKWBfoB3hrrQxWwFirlxJXGdk3v4SLnLPPYRy9IMibmQM5rAUJ/NxZum1mrYGP5lo7DHcIWDfV2A3ubw==} + '@chakra-ui/react@2.10.4': + resolution: {integrity: sha512-XyRWnuZ1Uw7Mlj5pKUGO5/WhnIHP/EOrpy6lGZC1yWlkd0eIfIpYMZ1ALTZx4KPEdbBaes48dgiMT2ROCqLhkA==} peerDependencies: '@emotion/react': '>=11' '@emotion/styled': '>=11' @@ -977,6 +980,9 @@ packages: '@chakra-ui/styled-system@2.12.0': resolution: {integrity: sha512-zoqLw1I2y4GlZ0LDoyw8o0JjoDOW6u0IwFPAoHuw0UMbP8glHUGvwEL1STug/i/GzBKw83yoF6ae41HIQvhMww==} + '@chakra-ui/styled-system@2.12.1': + resolution: {integrity: sha512-DQph1nDiCPtgze7nDe0a36530ByXb5VpPosKGyWMvKocVeZJcDtYG6XM0+V5a0wKuFBXsViBBRIFUTiUesJAcg==} + '@chakra-ui/styled-system@2.9.2': resolution: {integrity: sha512-To/Z92oHpIE+4nk11uVMWqo2GGRS86coeMmjxtpnErmWRdLcp1WVCVRAvn+ZwpLiNR+reWFr2FFqJRsREuZdAg==} @@ -997,6 +1003,11 @@ packages: peerDependencies: '@chakra-ui/styled-system': '>=2.0.0' + '@chakra-ui/theme-tools@2.2.7': + resolution: {integrity: sha512-K/VJd0QcnKik7m+qZTkggqNLep6+MPUu8IP5TUpHsnSM5R/RVjsJIR7gO8IZVAIMIGLLTIhGshHxeMekqv6LcQ==} + peerDependencies: + '@chakra-ui/styled-system': '>=2.0.0' + '@chakra-ui/theme-utils@2.0.21': resolution: {integrity: sha512-FjH5LJbT794r0+VSCXB3lT4aubI24bLLRWB+CuRKHijRvsOg717bRdUN/N1fEmEpFnRVrbewttWh/OQs0EWpWw==} @@ -1005,8 +1016,8 @@ packages: peerDependencies: '@chakra-ui/styled-system': '>=2.8.0' - '@chakra-ui/theme@3.4.6': - resolution: {integrity: sha512-ZwFBLfiMC3URwaO31ONXoKH9k0TX0OW3UjdPF3EQkQpYyrk/fm36GkkzajjtdpWEd7rzDLRsQjPmvwNaSoNDtg==} + '@chakra-ui/theme@3.4.7': + resolution: {integrity: sha512-pfewthgZTFNUYeUwGvhPQO/FTIyf375cFV1AT8N1y0aJiw4KDe7YTGm7p0aFy4AwAjH2ydMgeEx/lua4tx8qyQ==} peerDependencies: '@chakra-ui/styled-system': '>=2.8.0' @@ -1018,6 +1029,11 @@ packages: peerDependencies: react: '>=16.8.0' + '@chakra-ui/utils@2.2.3': + resolution: {integrity: sha512-cldoCQuexZ6e07/9hWHKD4l1QXXlM1Nax9tuQOBvVf/EgwNZt3nZu8zZRDFlhAOKCTQDkmpLTTu+eXXjChNQOw==} + peerDependencies: + react: '>=16.8.0' + '@changesets/apply-release-plan@7.0.5': resolution: {integrity: sha512-1cWCk+ZshEkSVEZrm2fSj1Gz8sYvxgUL4Q78+1ZZqeqfuevPTPk033/yUZ3df8BKMohkqqHfzj0HOOrG0KtXTw==} @@ -1444,8 +1460,8 @@ packages: '@react-dnd/shallowequal@4.0.2': resolution: {integrity: sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==} - '@remix-run/router@1.20.0': - resolution: {integrity: sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==} + '@remix-run/router@1.21.0': + resolution: {integrity: sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==} engines: {node: '>=14.0.0'} '@rollup/plugin-babel@5.3.1': @@ -1859,26 +1875,26 @@ packages: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} - applesauce-channel@0.0.0-next-20241106104112: - resolution: {integrity: sha512-f0TmoBBhlUZ/x5zxPBIkLhfbLDCpFd8hIYmHwT6psYag65ocErLmJcQswTHRmzod+3GYfFncsWDBNxjul1oRHg==} + applesauce-channel@0.0.0-next-20241108100553: + resolution: {integrity: sha512-QbZnh3P4FwJ1x/e7etWdwJ9XnX3E40cZr4RnQ7AnLH8VwDsIgApZcuBlxpki6OqojyMuZteQxV672wkTOgt4LA==} - applesauce-content@0.0.0-next-20241106104112: - resolution: {integrity: sha512-+eqcjAEhFaKenwvm/dz9cOQREmLVvM3JjUgaeYsHXpvJ89wy90Ge8JheCnDpgA7ToahanZGL1hogLrx2tPdc3Q==} + applesauce-content@0.0.0-next-20241108100553: + resolution: {integrity: sha512-Cpuz7aPTxdsi5OqM8yRRVR2Me0hk/sWPGegcrcz5fYyJUrjGPf+3Wq1XmQILXMwKv6zyFSWC8roBbq4AozYUrw==} - applesauce-core@0.0.0-next-20241106104112: - resolution: {integrity: sha512-kbWOqbxfLXbGo9/3cYD7fKKf2z/qkyGYNU4nikgnVRSR2uTelpemtBP3DK1gXptFxRK8yVNABrXfzKkb5RVbog==} + applesauce-core@0.0.0-next-20241108100553: + resolution: {integrity: sha512-PbpYBffS+59Jrj584lRF5aY0W9WvjbEcNjAog5yUlfdXemchNQgFtAXCO+1M9OvQv+1kHQHPwaCxDxolLnoIcQ==} - applesauce-lists@0.0.0-next-20241106104112: - resolution: {integrity: sha512-oBUZCUm5fmxCMDWW9g11fZBhxc6WTg0cDT79Eiewh5mPbyAdohW/elsGn848s1gLOFdvXDcpj3mEKAq26JyloA==} + applesauce-lists@0.0.0-next-20241108100553: + resolution: {integrity: sha512-7veKnLlwgpvtNSzvzf7QYKjvygFAtSTIBDA+48atuBIuE7Fgm9CZtw5552tTqeqGqTcNk2bnbR1QZZKFGt3n9w==} - applesauce-net@0.0.0-next-20241106104112: - resolution: {integrity: sha512-xYCzJXBrMYTz6CIUuL14W5posI92zb0ieYKTy2blUoSKERNQ6kNscuqlRzQtj3WbSW5gbKXapCAbAkjX8oqeFw==} + applesauce-net@0.0.0-next-20241108100553: + resolution: {integrity: sha512-WOL02cIKC06t+xOmod8Oz60Vs2wdGgJ0WsqHl4g7QOybFv9fG4XyduOmcmmJSjkzt0S0jM7fUZiuOaMQOIm7pA==} - applesauce-react@0.0.0-next-20241106104112: - resolution: {integrity: sha512-t5xpo8zv3bnTuXi69ycB5HYfzAUKaYTQH56ZMcm8t/38DogY0BGMLGwShsThoIW+fPGXRrzBxrG2vwtTvX1oJA==} + applesauce-react@0.0.0-next-20241108100553: + resolution: {integrity: sha512-8ENek4JJELMF9UGf9brg9q+9N6g0dJVEUdvNKlvG5skk+ZFgqG4L2uN1a8UEB5kAUQJmdNDRLY04OK51aki1Kg==} - applesauce-signer@0.0.0-next-20241106104112: - resolution: {integrity: sha512-/8hzJMlZrf3Ctkriyjd1Li2ozgNFgXeFKypQCo7t2Nbb5vRD59S9QGC4d2SP/6+/4YX0CjfTut4E4pIQmeLScw==} + applesauce-signer@0.0.0-next-20241108100553: + resolution: {integrity: sha512-s1vTBjKkmGINeq93rb0TASLznsf8NoVPmDnD9TqM3nfKCFfP6NwzXrUD4Np4nHiyHOqim7ga4V60sZNDiVjmWA==} argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} @@ -1993,8 +2009,8 @@ packages: resolution: {integrity: sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==} engines: {node: '>=16'} - caniuse-lite@1.0.30001677: - resolution: {integrity: sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==} + caniuse-lite@1.0.30001679: + resolution: {integrity: sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==} canvas-color-tracker@1.3.1: resolution: {integrity: sha512-eNycxGS7oQ3IS/9QQY41f/aQjiO9Y/MtedhCgSdsbLSxC9EyUD8L3ehl/Q3Kfmvt8um79S45PBV+5Rxm5ztdSw==} @@ -2338,8 +2354,8 @@ packages: engines: {node: '>=0.10.0'} hasBin: true - electron-to-chromium@1.5.52: - resolution: {integrity: sha512-xtoijJTZ+qeucLBDNztDOuQBE1ksqjvNjvqFoST3nGC7fSpqJ+X6BdTBaY5BHG+IhWWmpc6b/KfpeuEDupEPOQ==} + electron-to-chromium@1.5.55: + resolution: {integrity: sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg==} emoji-regex@10.4.0: resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==} @@ -2636,8 +2652,8 @@ packages: hyphenate-style-name@1.1.0: resolution: {integrity: sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==} - i18n-iso-countries@7.12.0: - resolution: {integrity: sha512-NDFf5j/raA5JrcPT/NcHP3RUMH7TkdkxQKAKdvDlgb+MS296WJzzqvV0Y5uwavSm7A6oYvBeSV0AxoHdDiHIiw==} + i18n-iso-countries@7.13.0: + resolution: {integrity: sha512-pVh4CjdgAHZswI98hzG+1BItQlsQfR+yGDsjDISoWIV/jHDAvCmSyZ5vj2YWwAjfVZ8/BhBDqWcFvuGOyHe4vg==} engines: {node: '>= 12'} iconv-lite@0.4.24: @@ -3549,15 +3565,15 @@ packages: '@types/react': optional: true - react-router-dom@6.27.0: - resolution: {integrity: sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==} + react-router-dom@6.28.0: + resolution: {integrity: sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' - react-router@6.27.0: - resolution: {integrity: sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==} + react-router@6.28.0: + resolution: {integrity: sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' @@ -5041,6 +5057,8 @@ snapshots: '@chakra-ui/anatomy@2.3.4': {} + '@chakra-ui/anatomy@2.3.5': {} + '@chakra-ui/breakpoint-utils@2.0.8': dependencies: '@chakra-ui/shared-utils': 2.0.5 @@ -5050,17 +5068,17 @@ snapshots: '@chakra-ui/react-use-safe-layout-effect': 2.1.0(react@18.3.1) react: 18.3.1 - '@chakra-ui/hooks@2.4.2(react@18.3.1)': + '@chakra-ui/hooks@2.4.3(react@18.3.1)': dependencies: - '@chakra-ui/utils': 2.2.2(react@18.3.1) + '@chakra-ui/utils': 2.2.3(react@18.3.1) '@zag-js/element-size': 0.31.1 copy-to-clipboard: 3.3.3 framesync: 6.1.2 react: 18.3.1 - '@chakra-ui/icons@2.2.4(@chakra-ui/react@2.10.3(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(framer-motion@10.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': + '@chakra-ui/icons@2.2.4(@chakra-ui/react@2.10.4(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(framer-motion@10.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': dependencies: - '@chakra-ui/react': 2.10.3(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(framer-motion@10.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@chakra-ui/react': 2.10.4(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(framer-motion@10.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 '@chakra-ui/media-query@3.3.0(@chakra-ui/system@2.6.2(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(react@18.3.1))(react@18.3.1)': @@ -5087,12 +5105,12 @@ snapshots: '@chakra-ui/utils': 2.0.15 react: 18.3.1 - '@chakra-ui/react@2.10.3(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(framer-motion@10.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@chakra-ui/react@2.10.4(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(framer-motion@10.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@chakra-ui/hooks': 2.4.2(react@18.3.1) - '@chakra-ui/styled-system': 2.12.0(react@18.3.1) - '@chakra-ui/theme': 3.4.6(@chakra-ui/styled-system@2.12.0(react@18.3.1))(react@18.3.1) - '@chakra-ui/utils': 2.2.2(react@18.3.1) + '@chakra-ui/hooks': 2.4.3(react@18.3.1) + '@chakra-ui/styled-system': 2.12.1(react@18.3.1) + '@chakra-ui/theme': 3.4.7(@chakra-ui/styled-system@2.12.1(react@18.3.1))(react@18.3.1) + '@chakra-ui/utils': 2.2.3(react@18.3.1) '@emotion/react': 11.13.3(@types/react@18.3.12)(react@18.3.1) '@emotion/styled': 11.13.0(@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react@18.3.1) '@popperjs/core': 2.11.8 @@ -5118,6 +5136,13 @@ snapshots: transitivePeerDependencies: - react + '@chakra-ui/styled-system@2.12.1(react@18.3.1)': + dependencies: + '@chakra-ui/utils': 2.2.3(react@18.3.1) + csstype: 3.1.3 + transitivePeerDependencies: + - react + '@chakra-ui/styled-system@2.9.2': dependencies: '@chakra-ui/shared-utils': 2.0.5 @@ -5153,6 +5178,15 @@ snapshots: transitivePeerDependencies: - react + '@chakra-ui/theme-tools@2.2.7(@chakra-ui/styled-system@2.12.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@chakra-ui/anatomy': 2.3.5 + '@chakra-ui/styled-system': 2.12.1(react@18.3.1) + '@chakra-ui/utils': 2.2.3(react@18.3.1) + color2k: 2.0.3 + transitivePeerDependencies: + - react + '@chakra-ui/theme-utils@2.0.21': dependencies: '@chakra-ui/shared-utils': 2.0.5 @@ -5167,12 +5201,12 @@ snapshots: '@chakra-ui/styled-system': 2.9.2 '@chakra-ui/theme-tools': 2.1.2(@chakra-ui/styled-system@2.9.2) - '@chakra-ui/theme@3.4.6(@chakra-ui/styled-system@2.12.0(react@18.3.1))(react@18.3.1)': + '@chakra-ui/theme@3.4.7(@chakra-ui/styled-system@2.12.1(react@18.3.1))(react@18.3.1)': dependencies: - '@chakra-ui/anatomy': 2.3.4 - '@chakra-ui/styled-system': 2.12.0(react@18.3.1) - '@chakra-ui/theme-tools': 2.2.6(@chakra-ui/styled-system@2.12.0(react@18.3.1))(react@18.3.1) - '@chakra-ui/utils': 2.2.2(react@18.3.1) + '@chakra-ui/anatomy': 2.3.5 + '@chakra-ui/styled-system': 2.12.1(react@18.3.1) + '@chakra-ui/theme-tools': 2.2.7(@chakra-ui/styled-system@2.12.1(react@18.3.1))(react@18.3.1) + '@chakra-ui/utils': 2.2.3(react@18.3.1) transitivePeerDependencies: - react @@ -5189,6 +5223,12 @@ snapshots: lodash.mergewith: 4.6.2 react: 18.3.1 + '@chakra-ui/utils@2.2.3(react@18.3.1)': + dependencies: + '@types/lodash.mergewith': 4.6.9 + lodash.mergewith: 4.6.2 + react: 18.3.1 + '@changesets/apply-release-plan@7.0.5': dependencies: '@changesets/config': 3.0.3 @@ -5719,7 +5759,7 @@ snapshots: '@react-dnd/shallowequal@4.0.2': {} - '@remix-run/router@1.20.0': {} + '@remix-run/router@1.21.0': {} '@rollup/plugin-babel@5.3.1(@babel/core@7.26.0)(@types/babel__core@7.20.5)(rollup@2.79.2)': dependencies: @@ -6126,22 +6166,22 @@ snapshots: dependencies: color-convert: 2.0.1 - applesauce-channel@0.0.0-next-20241106104112(typescript@5.6.3): + applesauce-channel@0.0.0-next-20241108100553(typescript@5.6.3): dependencies: - applesauce-core: 0.0.0-next-20241106104112(typescript@5.6.3) + applesauce-core: 0.0.0-next-20241108100553(typescript@5.6.3) nostr-tools: 2.10.1(typescript@5.6.3) rxjs: 7.8.1 transitivePeerDependencies: - supports-color - typescript - applesauce-content@0.0.0-next-20241106104112(typescript@5.6.3): + applesauce-content@0.0.0-next-20241108100553(typescript@5.6.3): dependencies: '@cashu/cashu-ts': 2.0.0-rc1 '@types/hast': 3.0.4 '@types/mdast': 4.0.4 '@types/unist': 3.0.3 - applesauce-core: 0.0.0-next-20241106104112(typescript@5.6.3) + applesauce-core: 0.0.0-next-20241108100553(typescript@5.6.3) linkifyjs: 4.1.3 mdast-util-find-and-replace: 3.0.1 nostr-tools: 2.10.1(typescript@5.6.3) @@ -6153,7 +6193,7 @@ snapshots: - supports-color - typescript - applesauce-core@0.0.0-next-20241106104112(typescript@5.6.3): + applesauce-core@0.0.0-next-20241108100553(typescript@5.6.3): dependencies: debug: 4.3.7 json-stringify-deterministic: 1.0.12 @@ -6165,13 +6205,13 @@ snapshots: - supports-color - typescript - applesauce-lists@0.0.0-next-20241106104112(typescript@5.6.3): + applesauce-lists@0.0.0-next-20241108100553(typescript@5.6.3): dependencies: '@noble/hashes': 1.5.0 '@noble/secp256k1': 1.7.1 '@scure/base': 1.1.9 '@types/dom-serial': 1.0.6 - applesauce-core: 0.0.0-next-20241106104112(typescript@5.6.3) + applesauce-core: 0.0.0-next-20241108100553(typescript@5.6.3) debug: 4.3.7 nostr-tools: 2.10.1(typescript@5.6.3) rxjs: 7.8.1 @@ -6179,9 +6219,9 @@ snapshots: - supports-color - typescript - applesauce-net@0.0.0-next-20241106104112(typescript@5.6.3): + applesauce-net@0.0.0-next-20241108100553(typescript@5.6.3): dependencies: - applesauce-core: 0.0.0-next-20241106104112(typescript@5.6.3) + applesauce-core: 0.0.0-next-20241108100553(typescript@5.6.3) nanoid: 5.0.8 nostr-tools: 2.10.1(typescript@5.6.3) rxjs: 7.8.1 @@ -6190,10 +6230,10 @@ snapshots: - supports-color - typescript - applesauce-react@0.0.0-next-20241106104112(typescript@5.6.3): + applesauce-react@0.0.0-next-20241108100553(typescript@5.6.3): dependencies: - applesauce-content: 0.0.0-next-20241106104112(typescript@5.6.3) - applesauce-core: 0.0.0-next-20241106104112(typescript@5.6.3) + applesauce-content: 0.0.0-next-20241108100553(typescript@5.6.3) + applesauce-core: 0.0.0-next-20241108100553(typescript@5.6.3) nostr-tools: 2.10.1(typescript@5.6.3) react: 18.3.1 rxjs: 7.8.1 @@ -6201,14 +6241,14 @@ snapshots: - supports-color - typescript - applesauce-signer@0.0.0-next-20241106104112(typescript@5.6.3): + applesauce-signer@0.0.0-next-20241108100553(typescript@5.6.3): dependencies: '@noble/hashes': 1.5.0 '@noble/secp256k1': 1.7.1 '@scure/base': 1.1.9 '@types/dom-serial': 1.0.6 - applesauce-core: 0.0.0-next-20241106104112(typescript@5.6.3) - applesauce-net: 0.0.0-next-20241106104112(typescript@5.6.3) + applesauce-core: 0.0.0-next-20241108100553(typescript@5.6.3) + applesauce-net: 0.0.0-next-20241108100553(typescript@5.6.3) debug: 4.3.7 nanoid: 5.0.8 nostr-tools: 2.10.1(typescript@5.6.3) @@ -6333,8 +6373,8 @@ snapshots: browserslist@4.24.2: dependencies: - caniuse-lite: 1.0.30001677 - electron-to-chromium: 1.5.52 + caniuse-lite: 1.0.30001679 + electron-to-chromium: 1.5.55 node-releases: 2.0.18 update-browserslist-db: 1.1.1(browserslist@4.24.2) @@ -6357,7 +6397,7 @@ snapshots: camelcase@8.0.0: {} - caniuse-lite@1.0.30001677: {} + caniuse-lite@1.0.30001679: {} canvas-color-tracker@1.3.1: dependencies: @@ -6728,7 +6768,7 @@ snapshots: dependencies: jake: 10.9.2 - electron-to-chromium@1.5.52: {} + electron-to-chromium@1.5.55: {} emoji-regex@10.4.0: {} @@ -7121,7 +7161,7 @@ snapshots: hyphenate-style-name@1.1.0: {} - i18n-iso-countries@7.12.0: + i18n-iso-countries@7.13.0: dependencies: diacritics: 1.3.0 @@ -8232,16 +8272,16 @@ snapshots: optionalDependencies: '@types/react': 18.3.12 - react-router-dom@6.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-router-dom@6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@remix-run/router': 1.20.0 + '@remix-run/router': 1.21.0 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-router: 6.27.0(react@18.3.1) + react-router: 6.28.0(react@18.3.1) - react-router@6.27.0(react@18.3.1): + react-router@6.28.0(react@18.3.1): dependencies: - '@remix-run/router': 1.20.0 + '@remix-run/router': 1.21.0 react: 18.3.1 react-simplemde-editor@5.2.0(easymde@2.18.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): diff --git a/src/components/content/components/lightning.tsx b/src/components/content/components/lightning.tsx new file mode 100644 index 000000000..7a87eaf2d --- /dev/null +++ b/src/components/content/components/lightning.tsx @@ -0,0 +1,10 @@ +import InlineInvoiceCard from "../../lightning/inline-invoice-card"; +import ExpandableEmbed from "./expandable-embed"; + +export default function LightningInvoice({ invoice }: { invoice: string }) { + return ( + + + + ); +} diff --git a/src/components/content/index.tsx b/src/components/content/index.tsx index 90ffe6c80..f58076d6f 100644 --- a/src/components/content/index.tsx +++ b/src/components/content/index.tsx @@ -8,6 +8,7 @@ import Cashu from "./components/cashu"; import { InlineEmoji } from "./components/ininle-emoji"; import NipDefinition from "./components/nip"; import { ImageGallery } from "./components/gallery"; +import LightningInvoice from "./components/lightning"; const InlineFedimintCard = lazy(() => import("../fedimint/inline-fedimint-card")); export const components: ComponentMap = { @@ -23,4 +24,5 @@ export const components: ComponentMap = { ), nip: NipDefinition, gallery: ({ node }) => , + lightning: ({ node }) => , }; diff --git a/src/components/content/links/emoji.tsx b/src/components/content/links/emoji.tsx deleted file mode 100644 index 84678df85..000000000 --- a/src/components/content/links/emoji.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import { EmbedableContent, embedJSX } from "../../../helpers/embeds"; -import { DraftNostrEvent, NostrEvent, isEmojiTag } from "../../../types/nostr-event"; -import { getMatchEmoji } from "../../../helpers/regexp"; -import { InlineEmoji } from "../components/ininle-emoji"; -import { getEmojiTag } from "applesauce-core/helpers"; - -export function embedEmoji(content: EmbedableContent, note: NostrEvent | DraftNostrEvent) { - return embedJSX(content, { - regexp: getMatchEmoji(), - render: (match) => { - const tag = getEmojiTag(note, match[1]); - - if (tag) return ; - return null; - }, - name: "emoji", - }); -} diff --git a/src/components/content/links/index.ts b/src/components/content/links/index.ts index 1b589ad80..6dc9f98cc 100644 --- a/src/components/content/links/index.ts +++ b/src/components/content/links/index.ts @@ -1,9 +1,7 @@ export * from "./audio"; export * from "./code"; export * from "./common"; -export * from "./emoji"; export * from "./image"; -export * from "./lightning"; export * from "./model"; export * from "./music"; export * from "./reddit"; diff --git a/src/components/content/links/lightning.tsx b/src/components/content/links/lightning.tsx deleted file mode 100644 index 90450ab6b..000000000 --- a/src/components/content/links/lightning.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { EmbedableContent, embedJSX } from "../../../helpers/embeds"; -import { InlineInvoiceCard } from "../../lightning/inline-invoice-card"; -import ExpandableEmbed from "../components/expandable-embed"; - -export function renderLightningInvoice(invoice: string) { - return ( - - - - ); -} - -export function embedLightningInvoice(content: EmbedableContent) { - return embedJSX(content, { - name: "Lightning Invoice", - regexp: /(lightning:)?(LNBC[A-Za-z0-9]+)/gim, - render: (match) => renderLightningInvoice(match[2]), - }); -} diff --git a/src/components/lightning/inline-invoice-card.tsx b/src/components/lightning/inline-invoice-card.tsx index 9ff6c168a..44be05647 100644 --- a/src/components/lightning/inline-invoice-card.tsx +++ b/src/components/lightning/inline-invoice-card.tsx @@ -14,8 +14,9 @@ import { Text, useDisclosure, } from "@chakra-ui/react"; +import { parseBolt11 } from "applesauce-core/helpers"; -import { parsePaymentRequest, readablizeSats } from "../../helpers/bolt11"; +import { readablizeSats } from "../../helpers/bolt11"; import { CopyIconButton } from "../copy-icon-button"; import QrCode02 from "../icons/qr-code-02"; import QrCodeSvg from "../qr-code/qr-code-svg"; @@ -23,8 +24,11 @@ import QrCodeSvg from "../qr-code/qr-code-svg"; export type InvoiceButtonProps = { paymentRequest: string; }; -export const InlineInvoiceCard = ({ paymentRequest, ...props }: Omit & InvoiceButtonProps) => { - const { value: invoice, error } = useAsync(async () => parsePaymentRequest(paymentRequest)); +export default function InlineInvoiceCard({ + paymentRequest, + ...props +}: Omit & InvoiceButtonProps) { + const { value: invoice, error } = useAsync(async () => parseBolt11(paymentRequest)); const more = useDisclosure(); const [loading, setLoading] = useState(false); @@ -97,4 +101,4 @@ export const InlineInvoiceCard = ({ paymentRequest, ...props }: Omit ); -}; +} diff --git a/src/views/discovery/dvm-feed/components/feed-status.tsx b/src/views/discovery/dvm-feed/components/feed-status.tsx index d00961b6e..a93a7f259 100644 --- a/src/views/discovery/dvm-feed/components/feed-status.tsx +++ b/src/views/discovery/dvm-feed/components/feed-status.tsx @@ -21,7 +21,6 @@ import { getJobStatusType, getResponseFromDVM, } from "../../../../helpers/nostr/dvm"; -import { InlineInvoiceCard } from "../../../../components/lightning/inline-invoice-card"; import { DraftNostrEvent } from "../../../../types/nostr-event"; import { useReadRelays } from "../../../../hooks/use-client-relays"; import { DVMAvatarLink } from "./dvm-avatar"; @@ -29,6 +28,7 @@ import DVMLink from "./dvm-name"; import { AddressPointer } from "nostr-tools/nip19"; import useUserMailboxes from "../../../../hooks/use-user-mailboxes"; import { usePublishEvent } from "../../../../providers/global/publish-provider"; +import InlineInvoiceCard from "../../../../components/lightning/inline-invoice-card"; function NextPageButton({ chain, pointer }: { pointer: AddressPointer; chain: ChainedDVMJob[] }) { const publish = usePublishEvent();