diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png index 6be5e50e..0c39fe2a 100644 Binary files a/src-tauri/icons/128x128.png and b/src-tauri/icons/128x128.png differ diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png index e81becee..f7d98e55 100644 Binary files a/src-tauri/icons/128x128@2x.png and b/src-tauri/icons/128x128@2x.png differ diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png index a437dd51..75ddb4cf 100644 Binary files a/src-tauri/icons/32x32.png and b/src-tauri/icons/32x32.png differ diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png index 0ca4f271..da81d6de 100644 Binary files a/src-tauri/icons/Square107x107Logo.png and b/src-tauri/icons/Square107x107Logo.png differ diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png index b81f8203..ed88af40 100644 Binary files a/src-tauri/icons/Square142x142Logo.png and b/src-tauri/icons/Square142x142Logo.png differ diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png index 624c7bfb..0d5ac0e1 100644 Binary files a/src-tauri/icons/Square150x150Logo.png and b/src-tauri/icons/Square150x150Logo.png differ diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png index c021d2ba..f935036f 100644 Binary files a/src-tauri/icons/Square284x284Logo.png and b/src-tauri/icons/Square284x284Logo.png differ diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png index 62197002..bb9cbc6e 100644 Binary files a/src-tauri/icons/Square30x30Logo.png and b/src-tauri/icons/Square30x30Logo.png differ diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png index f9bc0483..f40bf3d0 100644 Binary files a/src-tauri/icons/Square310x310Logo.png and b/src-tauri/icons/Square310x310Logo.png differ diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png index d5fbfb2a..37dc5751 100644 Binary files a/src-tauri/icons/Square44x44Logo.png and b/src-tauri/icons/Square44x44Logo.png differ diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png index 63440d79..d3900c55 100644 Binary files a/src-tauri/icons/Square71x71Logo.png and b/src-tauri/icons/Square71x71Logo.png differ diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png index f3f705af..285b45fc 100644 Binary files a/src-tauri/icons/Square89x89Logo.png and b/src-tauri/icons/Square89x89Logo.png differ diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png index 45563882..0897e7ed 100644 Binary files a/src-tauri/icons/StoreLogo.png and b/src-tauri/icons/StoreLogo.png differ diff --git a/src-tauri/icons/app-icon.png b/src-tauri/icons/app-icon.png new file mode 100644 index 00000000..9951741e Binary files /dev/null and b/src-tauri/icons/app-icon.png differ diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns index 12a5bcee..9eca3e70 100644 Binary files a/src-tauri/icons/icon.icns and b/src-tauri/icons/icon.icns differ diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico index b3636e4b..2bca08e0 100644 Binary files a/src-tauri/icons/icon.ico and b/src-tauri/icons/icon.ico differ diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png index e1cd2619..a23cdeaf 100644 Binary files a/src-tauri/icons/icon.png and b/src-tauri/icons/icon.png differ diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 84af8230..7787c363 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -23,7 +23,7 @@ }, "bundle": { "active": true, - "category": "DeveloperTool", + "category": "SocialNetworking", "copyright": "", "deb": { "depends": [] @@ -36,7 +36,7 @@ "icons/icon.icns", "icons/icon.ico" ], - "identifier": "com.tauri.dev", + "identifier": "com.uselume.xyz", "longDescription": "", "macOS": { "entitlements": null, diff --git a/src/components/note/content/index.tsx b/src/components/note/content/index.tsx index 00b1bb68..2ae381ac 100644 --- a/src/components/note/content/index.tsx +++ b/src/components/note/content/index.tsx @@ -6,7 +6,7 @@ import { ImageCard } from '@components/note/content/preview/imageCard'; import { Video } from '@components/note/content/preview/video'; import dynamic from 'next/dynamic'; -import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import ReactPlayer from 'react-player'; const MarkdownPreview = dynamic(() => import('@uiw/react-markdown-preview'), { @@ -14,7 +14,7 @@ const MarkdownPreview = dynamic(() => import('@uiw/react-markdown-preview'), { loading: () =>
, }); -export default function Content({ data }: { data: any }) { +export const Content = memo(function Content({ data }: { data: any }) { const [preview, setPreview] = useState({}); const content = useRef(data.content); @@ -96,4 +96,4 @@ export default function Content({ data }: { data: any }) {
); -} +}); diff --git a/src/components/note/modal/index.tsx b/src/components/note/modal/index.tsx index 31d3a05c..f690e344 100644 --- a/src/components/note/modal/index.tsx +++ b/src/components/note/modal/index.tsx @@ -1,5 +1,5 @@ import { UserWithUsername } from '@components/note/atoms/userWithUsername'; -import Content from '@components/note/content'; +import { Content } from '@components/note/content'; import NoteReply from '@components/note/modal/noteReply'; import { useNostrEvents } from 'nostr-react'; @@ -24,7 +24,7 @@ const Modal = ({ event }: { event: any }) => {
- +
{events.map((item) => ( diff --git a/src/components/note/modal/noteReply.tsx b/src/components/note/modal/noteReply.tsx index 9bf934c2..561011a7 100644 --- a/src/components/note/modal/noteReply.tsx +++ b/src/components/note/modal/noteReply.tsx @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { User } from '@components/note/atoms/user'; -import Content from '@components/note/content'; +import { Content } from '@components/note/content'; export default function NoteReply({ event }: { event: any }) { return ( diff --git a/src/components/note/repost.tsx b/src/components/note/repost.tsx index 889231e8..c86c4340 100644 --- a/src/components/note/repost.tsx +++ b/src/components/note/repost.tsx @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { UserRepost } from '@components/note/atoms/userRepost'; -import Content from '@components/note/content'; +import { Content } from '@components/note/content'; import { Placeholder } from '@components/note/placeholder'; import RepostIcon from '@assets/icons/Repost'; @@ -24,7 +24,7 @@ export const Repost = memo(function Repost({ root, user }: { root: any; user: st }, }); - if (events !== null) { + if (events !== null && Object.keys(events).length > 0) { return ( @@ -35,12 +35,12 @@ export const Repost = memo(function Repost({ root, user }: { root: any; user: st
- + {events[0].content && } - + {events[0].content && } diff --git a/src/components/note/single.tsx b/src/components/note/single.tsx index eb9ac544..e6d56b59 100644 --- a/src/components/note/single.tsx +++ b/src/components/note/single.tsx @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import Content from '@components/note/content'; +import { Content } from '@components/note/content'; import * as Dialog from '@radix-ui/react-dialog'; import dynamic from 'next/dynamic'; @@ -12,8 +12,6 @@ const Modal = dynamic(() => import('@components/note/modal'), { // eslint-disable-next-line @typescript-eslint/no-explicit-any export const Single = memo(function Single({ event }: { event: any }) { - console.log(event); - return ( diff --git a/src/pages/onboarding/import.tsx b/src/pages/onboarding/import.tsx index dd036f07..9bb12a9b 100644 --- a/src/pages/onboarding/import.tsx +++ b/src/pages/onboarding/import.tsx @@ -4,7 +4,7 @@ import OnboardingLayout from '@layouts/onboardingLayout'; import { motion } from 'framer-motion'; import { useRouter } from 'next/router'; -import { getPublicKey, nip19 } from 'nostr-tools'; +import { nip19 } from 'nostr-tools'; import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal } from 'react'; import { Resolver, useForm } from 'react-hook-form'; @@ -36,17 +36,15 @@ export default function Page() { } = useForm({ resolver }); const onSubmit = async (data: any) => { - let privKey = data['key']; + let privkey = data['key']; - if (privKey.substring(0, 4) === 'nsec') { - privKey = nip19.decode(privKey).data; + if (privkey.substring(0, 4) === 'nsec') { + privkey = nip19.decode(privkey).data; } try { - const pubKey = getPublicKey(privKey); - - if (pubKey) { - router.push(`/onboarding/profile/${privKey}`); + if (privkey) { + router.push(`/onboarding/profile/${privkey}`); } } catch (error) { setError('key', {