diff --git a/src/app/space/components/widgetList.tsx b/src/app/space/components/widgetList.tsx
index 477e3d46..ac049729 100644
--- a/src/app/space/components/widgetList.tsx
+++ b/src/app/space/components/widgetList.tsx
@@ -42,7 +42,7 @@ export function WidgetList({ params }: { params: Widget }) {
return (
-
+
{DefaultWidgets.map((row: WidgetGroup) => renderItem(row))}
diff --git a/src/libs/ndk/instance.ts b/src/libs/ndk/instance.ts
index fbba215a..16cf5d09 100644
--- a/src/libs/ndk/instance.ts
+++ b/src/libs/ndk/instance.ts
@@ -58,7 +58,7 @@ export const NDKInstance = () => {
// return all validate relays
return verifiedRelays;
} catch (e) {
- e.forEach((error) => console.error(error));
+ console.error('ndk instance error: ', e);
}
}
diff --git a/src/shared/accounts/active.tsx b/src/shared/accounts/active.tsx
index d515352c..74cf4e89 100644
--- a/src/shared/accounts/active.tsx
+++ b/src/shared/accounts/active.tsx
@@ -1,14 +1,15 @@
import { NDKFilter, NDKKind } from '@nostr-dev-kit/ndk';
import { useEffect } from 'react';
-import { Link } from 'react-router-dom';
import { useStorage } from '@libs/storage/provider';
+import { AccountMoreActions } from '@shared/accounts/more';
import { Image } from '@shared/image';
import { useNostr } from '@utils/hooks/useNostr';
import { useProfile } from '@utils/hooks/useProfile';
import { sendNativeNotification } from '@utils/notification';
+import { displayNpub } from '@utils/shortenKey';
export function ActiveAccount() {
const { db } = useStorage();
@@ -57,16 +58,23 @@ export function ActiveAccount() {
}
return (
-
-
-
Your profile
-
+
+
+
+
+
+ {user?.name || user?.display_name || user?.nip05}
+
+
+ {displayNpub(db.account.pubkey, 16)}
+
+
+
+
+
);
}
diff --git a/src/shared/accounts/inactive.tsx b/src/shared/accounts/inactive.tsx
deleted file mode 100644
index dd7275af..00000000
--- a/src/shared/accounts/inactive.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Image } from '@shared/image';
-
-import { useProfile } from '@utils/hooks/useProfile';
-
-export function InactiveAccount({ data }: { data: any }) {
- const { user } = useProfile(data.npub);
-
- return (
-
-
-
- );
-}
diff --git a/src/shared/accounts/more.tsx b/src/shared/accounts/more.tsx
new file mode 100644
index 00000000..e49158ca
--- /dev/null
+++ b/src/shared/accounts/more.tsx
@@ -0,0 +1,55 @@
+import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
+import { useState } from 'react';
+import { Link } from 'react-router-dom';
+
+import { HorizontalDotsIcon } from '@shared/icons';
+
+export function AccountMoreActions({ pubkey }: { pubkey: string }) {
+ const [open, setOpen] = useState(false);
+
+ return (
+
+
+
+
+
+
+
+
+ Profile
+
+
+
+
+ Backup
+
+
+
+
+ Settings
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/src/shared/icons/index.ts b/src/shared/icons/index.ts
index fb2ee072..b295e50b 100644
--- a/src/shared/icons/index.ts
+++ b/src/shared/icons/index.ts
@@ -55,3 +55,4 @@ export * from './share';
export * from './expand';
export * from './focus';
export * from './chevronUp';
+export * from './secure';
diff --git a/src/shared/icons/secure.tsx b/src/shared/icons/secure.tsx
new file mode 100644
index 00000000..0769ff01
--- /dev/null
+++ b/src/shared/icons/secure.tsx
@@ -0,0 +1,22 @@
+import { SVGProps } from 'react';
+
+export function SecureIcon(props: JSX.IntrinsicAttributes & SVGProps
) {
+ return (
+
+ );
+}
diff --git a/src/shared/layouts/settings.tsx b/src/shared/layouts/settings.tsx
index 89a0823b..d6df0c4d 100644
--- a/src/shared/layouts/settings.tsx
+++ b/src/shared/layouts/settings.tsx
@@ -1,60 +1,58 @@
-import { NavLink, Outlet, ScrollRestoration } from 'react-router-dom';
+import { Link, NavLink, Outlet, ScrollRestoration } from 'react-router-dom';
import { twMerge } from 'tailwind-merge';
+import { ArrowLeftIcon, SecureIcon, SettingsIcon } from '@shared/icons';
+
export function SettingsLayout() {
return (
-
-
-
-
-
-
- Settings
-
-
-
-
- twMerge(
- 'flex h-9 items-center gap-2.5 rounded-md px-2.5',
- isActive
- ? 'bg-white/10 text-white backdrop-blur-xl'
- : 'text-white/80'
- )
- }
- >
- General
-
-
- twMerge(
- 'flex h-9 items-center gap-2.5 rounded-md px-2.5',
- isActive
- ? 'bg-white/10 text-white backdrop-blur-xl'
- : 'text-white/80'
- )
- }
- >
- Shortcuts
-
-
- twMerge(
- 'flex h-9 items-center gap-2.5 rounded-md px-2.5',
- isActive
- ? 'bg-white/10 text-white backdrop-blur-xl'
- : 'text-white/80'
- )
- }
- >
- Account
-
-
-
+
+
+
+
+
+
+ twMerge(
+ 'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 pl-4 pr-2',
+ isActive
+ ? 'border-fuchsia-500 bg-white/5 text-white'
+ : 'border-transparent text-white/80'
+ )
+ }
+ >
+
+
+
+ General
+
+
+ twMerge(
+ 'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 pl-4 pr-2',
+ isActive
+ ? 'border-fuchsia-500 bg-white/5 text-white'
+ : 'border-transparent text-white/80'
+ )
+ }
+ >
+
+
+
+ Backup
+
diff --git a/src/shared/navigation.tsx b/src/shared/navigation.tsx
index ee8d62da..5f6f8500 100644
--- a/src/shared/navigation.tsx
+++ b/src/shared/navigation.tsx
@@ -6,7 +6,7 @@ import { ChatsList } from '@app/chats/components/list';
import { ActiveAccount } from '@shared/accounts/active';
import { ComposerModal } from '@shared/composer';
-import { BellIcon, NavArrowDownIcon, SettingsIcon, SpaceIcon } from '@shared/icons';
+import { BellIcon, NavArrowDownIcon, SpaceIcon } from '@shared/icons';
import { useSidebar } from '@stores/sidebar';
@@ -14,9 +14,9 @@ export function Navigation() {
const [chats, toggleChats] = useSidebar((state) => [state.chats, state.toggleChats]);
return (
-
-
-
+
+
+
Notifications
-
- twMerge(
- 'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 pl-4 pr-2',
- isActive
- ? 'border-fuchsia-500 bg-white/5 text-white'
- : 'border-transparent text-white/80'
- )
- }
- >
-
-
-
- Settings
-
-
@@ -95,6 +77,9 @@ export function Navigation() {
+
);
}
diff --git a/src/shared/notes/actions/more.tsx b/src/shared/notes/actions/more.tsx
index 2c7e7afd..ca7c1591 100644
--- a/src/shared/notes/actions/more.tsx
+++ b/src/shared/notes/actions/more.tsx
@@ -45,7 +45,7 @@ export function MoreActions({ id, pubkey }: { id: string; pubkey: string }) {
-
+