reorganize files & rm unused

packages/app/src/Element/Button/AsyncButton.tsx

@@ -1,6 +1,6 @@
 import "./AsyncButton.css";
 import React, { ForwardedRef } from "react";
-import Spinner from "../Icons/Spinner";
+import Spinner from "../../Icons/Spinner";
 import useLoading from "@/Hooks/useLoading";
 import classNames from "classnames";
 

packages/app/src/Element/Button/BackButton.tsx

@@ -3,7 +3,7 @@ import { useIntl } from "react-intl";
 
 import Icon from "@/Icons/Icon";
 
-import messages from "./messages";
+import messages from "../messages";
 
 interface BackButtonProps {
   text?: string;

packages/app/src/Element/Button/LogoutButton.tsx

@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 
 import { logout } from "@/Login";
 import useLogin from "@/Hooks/useLogin";
-import messages from "./messages";
+import messages from "../messages";
 
 export default function LogoutButton() {
   const navigate = useNavigate();

packages/app/src/Element/Chat/WriteMessage.tsx

@@ -2,7 +2,7 @@ import { useState } from "react";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import Textarea from "../Textarea";
 import { Chat } from "@/chat";
-import { AsyncIcon } from "@/Element/AsyncIcon";
+import { AsyncIcon } from "@/Element/Button/AsyncIcon";
 
 export default function WriteMessage({ chat }: { chat: Chat }) {
   const [msg, setMsg] = useState("");

packages/app/src/Element/CodeBlock.css

@@ -1,14 +0,0 @@
-.codeblock {
-  overflow: auto;
-  position: relative;
-}
-
-.codeblock pre {
-  overflow: auto;
-  line-height: 1.4;
-  font-size: var(--font-size);
-}
-
-.hljs {
-  background: #f6f8fa;
-}

packages/app/src/Element/CodeBlock.tsx

@@ -1,24 +0,0 @@
-import { useEffect } from "react";
-import "highlight.js/styles/github.css";
-import "./CodeBlock.css";
-
-const CodeBlock = ({ content, language }: { content: string; language?: string }) => {
-  useEffect(() => {
-    const importHljs = async () => {
-      const hljs = (await import("highlight.js")).default;
-      hljs.highlightAll();
-    };
-
-    importHljs();
-  });
-
-  return (
-    <div className={`codeblock ${language && `language-${language}`}`} dir="auto">
-      <pre>
-        <code className={language && `language-${language}`}>{content.trim()}</code>
-      </pre>
-    </div>
-  );
-};
-
-export default CodeBlock;

packages/app/src/Element/Embed/PubkeyList.tsx

@@ -4,7 +4,7 @@ import { LNURL } from "@snort/shared";
 
 import { dedupe, findTag, hexToBech32, getDisplayName } from "@/SnortUtils";
 import FollowListBase from "@/Element/User/FollowListBase";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { useWallet } from "@/Wallet";
 import { Toastore } from "@/Toaster";
 import { UserCache } from "@/Cache";

packages/app/src/Element/Event/Create/NoteBroadcaster.tsx

@@ -3,7 +3,7 @@ import { FormattedMessage, useIntl } from "react-intl";
 import { unwrap } from "@snort/shared";
 import { NostrEvent, OkResponse } from "@snort/system";
 
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import Icon from "@/Icons/Icon";
 import { getRelayName, sanitizeRelayUrl } from "@/SnortUtils";
 import { removeRelay } from "@/Login";

packages/app/src/Element/Event/Create/NoteCreator.tsx

@@ -16,8 +16,8 @@ import Note from "@/Element/Event/Note";
 import { ClipboardEventHandler, DragEvent } from "react";
 import useLogin from "@/Hooks/useLogin";
 import { GetPowWorker } from "@/index";
-import AsyncButton from "@/Element/AsyncButton";
-import { AsyncIcon } from "@/Element/AsyncIcon";
+import AsyncButton from "@/Element/Button/AsyncButton";
+import { AsyncIcon } from "@/Element/Button/AsyncIcon";
 import { fetchNip05Pubkey } from "@snort/shared";
 import { ZapTarget } from "@/Zapper";
 import { useNoteCreator } from "@/State/NoteCreator";

packages/app/src/Element/Event/NoteFooter.tsx

@@ -12,7 +12,7 @@ import useEventPublisher from "@/Hooks/useEventPublisher";
 import { delay, findTag, getDisplayName } from "@/SnortUtils";
 import SendSats from "@/Element/SendSats";
 import { ZapsSummary } from "@/Element/Event/Zap";
-import { AsyncIcon, AsyncIconProps } from "@/Element/AsyncIcon";
+import { AsyncIcon, AsyncIconProps } from "@/Element/Button/AsyncIcon";
 
 import { useWallet } from "@/Wallet";
 import useLogin from "@/Hooks/useLogin";

packages/app/src/Element/Event/Thread.tsx

@@ -6,7 +6,7 @@ import { TaggedNostrEvent, u256, NostrPrefix, EventExt, parseNostrLink, NostrLin
 import classNames from "classnames";
 
 import { getAllLinkReactions, getLinkReactions } from "@/SnortUtils";
-import BackButton from "@/Element/BackButton";
+import BackButton from "@/Element/Button/BackButton";
 import Note from "@/Element/Event/Note";
 import NoteGhost from "@/Element/Event/NoteGhost";
 import Collapsed from "@/Element/Collapsed";

packages/app/src/Element/Feed/Articles.tsx

@@ -3,7 +3,7 @@ import { useReactions } from "@snort/system-react";
 
 import { useArticles } from "@/Feed/ArticlesFeed";
 import { orderDescending } from "@/SnortUtils";
-import Note from "./Event/Note";
+import Note from "../Event/Note";
 import { useContext } from "react";
 import { DeckContext } from "@/Pages/DeckLayout";
 

packages/app/src/Element/FixedTabs.css

@@ -1,34 +0,0 @@
-.fixed-tabs {
-  display: flex;
-  align-items: center;
-  flex-direction: row;
-  white-space: nowrap;
-  text-align: center;
-  user-select: none;
-}
-
-.fixed-tabs > a {
-  flex: 1;
-  padding: 16px;
-  color: var(--font-tertiary-color);
-  font-weight: 500;
-  font-size: 16px;
-  letter-spacing: 0.2px;
-  cursor: pointer;
-  text-decoration: none;
-}
-
-.fixed-tabs > a.active {
-  border-bottom: 1px solid var(--highlight);
-  color: var(--font-color);
-}
-
-.fixed-tabs > a.disabled {
-  opacity: 0.3;
-  cursor: not-allowed;
-  pointer-events: none;
-}
-
-.fixed-tabs > a:hover {
-  border-color: var(--highlight);
-}

packages/app/src/Element/FixedTabs.tsx

@@ -1,6 +0,0 @@
-import "./FixedTabs.css";
-import { ReactNode } from "react";
-
-export function FixedTabs({ children }: { children: ReactNode }) {
-  return <div className="fixed-tabs">{children}</div>;
-}

packages/app/src/Element/Logo.tsx

@@ -1,12 +0,0 @@
-import { useNavigate } from "react-router-dom";
-
-const Logo = () => {
-  const navigate = useNavigate();
-  return (
-    <h1 className="logo" onClick={() => navigate("/")}>
-      {CONFIG.appNameCapitalized}
-    </h1>
-  );
-};
-
-export default Logo;

packages/app/src/Element/Nip5Service.tsx

@@ -14,7 +14,7 @@ import {
   HandleRegisterResponse,
   CheckRegisterResponse,
 } from "@/Nip05/ServiceProvider";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import SendSats from "@/Element/SendSats";
 import Copy from "@/Element/Copy";
 import { useUserProfile } from "@snort/system-react";

packages/app/src/Element/Offline.tsx

@@ -1,5 +1,5 @@
 import Icon from "@/Icons/Icon";
-import AsyncButton from "./AsyncButton";
+import AsyncButton from "./Button/AsyncButton";
 import { FormattedMessage } from "react-intl";
 import classNames from "classnames";
 

packages/app/src/Element/PinPrompt.tsx

@@ -8,7 +8,7 @@ import { EventPublisher, InvalidPinError, PinEncrypted } from "@snort/system";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import { LoginStore, createPublisher, sessionNeedsPin } from "@/Login";
 import Modal from "./Modal";
-import AsyncButton from "./AsyncButton";
+import AsyncButton from "./Button/AsyncButton";
 import { GetPowWorker } from "@/index";
 
 export function PinPrompt({

packages/app/src/Element/ReBroadcaster.tsx

@@ -6,7 +6,7 @@ import { SnortContext } from "@snort/system-react";
 import Modal from "@/Element/Modal";
 import messages from "./messages";
 import useLogin from "@/Hooks/useLogin";
-import AsyncButton from "./AsyncButton";
+import AsyncButton from "./Button/AsyncButton";
 
 export function ReBroadcaster({ onClose, ev }: { onClose: () => void; ev: TaggedNostrEvent }) {
   const [selected, setSelected] = useState<Array<string>>();

packages/app/src/Element/Relay/Relay.tsx

@@ -11,7 +11,7 @@ import { getRelayName, unwrap } from "@/SnortUtils";
 import useLogin from "@/Hooks/useLogin";
 import { removeRelay, setRelays } from "@/Login";
 import { RelayFavicon } from "./RelaysMetadata";
-import { AsyncIcon } from "@/Element/AsyncIcon";
+import { AsyncIcon } from "@/Element/Button/AsyncIcon";
 
 export interface RelayProps {
   addr: string;

packages/app/src/Element/SendSats.tsx

@@ -15,7 +15,7 @@ import Copy from "@/Element/Copy";
 import { debounce } from "@/SnortUtils";
 import { LNWallet, useWallet } from "@/Wallet";
 import useLogin from "@/Hooks/useLogin";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { ZapTarget, ZapTargetResult, Zapper } from "@/Zapper";
 
 import messages from "./messages";

packages/app/src/Element/Text.tsx

@@ -5,7 +5,7 @@ import classNames from "classnames";
 
 import Invoice from "@/Element/Embed/Invoice";
 import Hashtag from "@/Element/Embed/Hashtag";
-import HyperText from "@/Element/HyperText";
+import HyperText from "@/Element/Embed/HyperText";
 import CashuNuts from "@/Element/Embed/CashuNuts";
 import RevealMedia from "./Event/RevealMedia";
 import { ProxyImg } from "./ProxyImg";
@@ -262,7 +262,6 @@ export default function Text({
         chunks.push(<ProxyImg src={element.content} size={15} className="custom-emoji" />);
       }
       if (element.type === "code_block") {
-        //chunks.push(<CodeBlock content={element.content} language={element.language} />);
         chunks.push(<pre>{element.content}</pre>);
       }
       if (element.type === "text") {

packages/app/src/Element/Trending/TrendingHashtags.tsx

@@ -2,7 +2,7 @@ import { ReactNode, useEffect, useState } from "react";
 
 import PageSpinner from "@/Element/PageSpinner";
 import NostrBandApi from "@/External/NostrBand";
-import { ErrorOrOffline } from "./ErrorOrOffline";
+import { ErrorOrOffline } from "../ErrorOrOffline";
 import { HashTagHeader } from "@/Pages/HashTagsPage";
 import { useLocale } from "@/IntlProvider";
 import classNames from "classnames";

packages/app/src/Element/Trending/TrendingUsers.tsx

@@ -4,7 +4,7 @@ import { HexKey } from "@snort/system";
 import FollowListBase from "@/Element/User/FollowListBase";
 import PageSpinner from "@/Element/PageSpinner";
 import NostrBandApi from "@/External/NostrBand";
-import { ErrorOrOffline } from "./ErrorOrOffline";
+import { ErrorOrOffline } from "../ErrorOrOffline";
 
 export default function TrendingUsers({ title, count = Infinity }: { title?: ReactNode; count?: number }) {
   const [userList, setUserList] = useState<HexKey[]>();

packages/app/src/Element/User/FollowButton.tsx

@@ -4,7 +4,7 @@ import { HexKey } from "@snort/system";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import { parseId } from "@/SnortUtils";
 import useLogin from "@/Hooks/useLogin";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 
 import messages from "../messages";
 import { FollowsFeed } from "@/Cache";

packages/app/src/Element/User/FollowListBase.tsx

@@ -9,7 +9,7 @@ import useLogin from "@/Hooks/useLogin";
 
 import messages from "../messages";
 import { FollowsFeed } from "@/Cache";
-import AsyncButton from "../AsyncButton";
+import AsyncButton from "../Button/AsyncButton";
 import { setFollows } from "@/Login";
 
 export interface FollowListBaseProps {

packages/app/src/Pages/DeckLayout.tsx

@@ -7,15 +7,15 @@ import { NostrLink, TaggedNostrEvent } from "@snort/system";
 import useLoginFeed from "@/Feed/LoginFeed";
 import { useLoginRelays } from "@/Hooks/useLoginRelays";
 import { useTheme } from "@/Hooks/useTheme";
-import Articles from "@/Element/Articles";
+import Articles from "@/Element/Feed/Articles";
 import TimelineFollows from "@/Element/Feed/TimelineFollows";
 import { transformTextCached } from "@/Hooks/useTextTransformCache";
 import Icon from "@/Icons/Icon";
-import NotificationsPage from "./Notifications";
+import NotificationsPage from "./Notifications/Notifications";
 import useImgProxy from "@/Hooks/useImgProxy";
 import Modal from "@/Element/Modal";
 import { Thread } from "@/Element/Event/Thread";
-import { RootTabs } from "@/Element/RootTabs";
+import { RootTabs } from "@/Element/Feed/RootTabs";
 import { SpotlightMedia } from "@/Element/SpotlightMedia";
 import { ThreadContext, ThreadContextWrapper } from "@/Hooks/useThreadContext";
 import Toaster from "@/Toaster";

packages/app/src/Pages/Discover.tsx

@@ -1,7 +1,7 @@
 import SuggestedProfiles from "@/Element/SuggestedProfiles";
 import { Tab, TabElement } from "@/Element/Tabs";
-import TrendingNotes from "@/Element/TrendingPosts";
-import TrendingUsers from "@/Element/TrendingUsers";
+import TrendingNotes from "@/Element/Trending/TrendingPosts";
+import TrendingUsers from "@/Element/Trending/TrendingUsers";
 import { useState } from "react";
 import { useIntl } from "react-intl";
 

packages/app/src/Pages/DonatePage.tsx

@@ -8,7 +8,7 @@ import ZapButton from "@/Element/Event/ZapButton";
 import { bech32ToHex } from "@/SnortUtils";
 import SnortApi, { RevenueSplit, RevenueToday } from "@/External/SnortApi";
 import Modal from "@/Element/Modal";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import QrCode from "@/Element/QrCode";
 import Copy from "@/Element/Copy";
 

packages/app/src/Pages/ErrorPage.tsx

@@ -1,5 +1,5 @@
 import { db } from "@/Db";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { FormattedMessage } from "react-intl";
 import { useRouteError } from "react-router-dom";
 

packages/app/src/Pages/HashTagsPage.tsx

@@ -9,7 +9,7 @@ import Timeline from "@/Element/Feed/Timeline";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import useLogin from "@/Hooks/useLogin";
 import { setTags } from "@/Login";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import ProfileImage from "@/Element/User/ProfileImage";
 import classNames from "classnames";
 import { formatShort } from "@/Number";

packages/app/src/Pages/Layout/RightColumn.tsx

@@ -1,7 +1,7 @@
 import SearchBox from "@/Element/SearchBox";
-import TrendingUsers from "@/Element/TrendingUsers";
-import TrendingHashtags from "@/Element/TrendingHashtags";
-import TrendingNotes from "@/Element/TrendingPosts";
+import TrendingUsers from "@/Element/Trending/TrendingUsers";
+import TrendingHashtags from "@/Element/Trending/TrendingHashtags";
+import TrendingNotes from "@/Element/Trending/TrendingPosts";
 import { FormattedMessage } from "react-intl";
 import classNames from "classnames";
 

packages/app/src/Pages/Messages/MessagesPage.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useNavigate, useParams } from "react-router-dom";
 
-import UnreadCount from "@/Element/UnreadCount";
+import UnreadCount from "@/Pages/Messages/UnreadCount";
 import ProfileImage from "@/Element/User/ProfileImage";
 import { parseId } from "@/SnortUtils";
 import NoteToSelf from "@/Element/User/NoteToSelf";

packages/app/src/Pages/Notifications/NotificationChart.tsx

@@ -7,8 +7,8 @@ import { TaggedNostrEvent, EventKind } from "@snort/system";
 import classNames from "classnames";
 import { useState, useMemo } from "react";
 import { FormattedMessage } from "react-intl";
-import { AsyncIcon } from "./AsyncIcon";
-import Tabs, { Tab } from "./Tabs";
+import { AsyncIcon } from "../../Element/Button/AsyncIcon";
+import Tabs, { Tab } from "../../Element/Tabs";
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from "recharts";
 
 interface StatSlot {

packages/app/src/Pages/Notifications/Notifications.tsx

@@ -20,7 +20,7 @@ import { LiveEvent } from "@/Element/LiveEvent";
 import ProfilePreview from "@/Element/User/ProfilePreview";
 import { ShowMoreInView } from "@/Element/Event/ShowMore";
 import PageSpinner from "@/Element/PageSpinner";
-const NotificationGraph = lazy(() => import("@/Element/NotificationChart"));
+const NotificationGraph = lazy(() => import("@/Pages/Notifications/NotificationChart"));
 
 function notificationContext(ev: TaggedNostrEvent) {
   switch (ev.kind) {

packages/app/src/Pages/Profile/ProfilePage.tsx

@@ -35,7 +35,7 @@ import ProfileImage from "@/Element/User/ProfileImage";
 import BlockList from "@/Element/User/BlockList";
 import MutedList from "@/Element/User/MutedList";
 import FollowsList from "@/Element/User/FollowListBase";
-import IconButton from "@/Element/IconButton";
+import IconButton from "@/Element/Button/IconButton";
 import FollowsYou from "@/Element/User/FollowsYou";
 import QrCode from "@/Element/QrCode";
 import Modal from "@/Element/Modal";

packages/app/src/Pages/Root.tsx

@@ -10,16 +10,16 @@ import { TimelineSubject } from "@/Feed/TimelineFeed";
 import { debounce, getRelayName, sha256 } from "@/SnortUtils";
 import useLogin from "@/Hooks/useLogin";
 import Discover from "@/Pages/Discover";
-import TrendingUsers from "@/Element/TrendingUsers";
-import TrendingNotes from "@/Element/TrendingPosts";
+import TrendingUsers from "@/Element/Trending/TrendingUsers";
+import TrendingNotes from "@/Element/Trending/TrendingPosts";
 import HashTagsPage from "@/Pages/HashTagsPage";
 import SuggestedProfiles from "@/Element/SuggestedProfiles";
 import { TaskList } from "@/Tasks/TaskList";
 import TimelineFollows from "@/Element/Feed/TimelineFollows";
-import { RootTabs } from "@/Element/RootTabs";
+import { RootTabs } from "@/Element/Feed/RootTabs";
 import { DeckContext } from "@/Pages/DeckLayout";
 import { TopicsPage } from "./TopicsPage";
-import TrendingHashtags from "@/Element/TrendingHashtags";
+import TrendingHashtags from "@/Element/Trending/TrendingHashtags";
 
 import messages from "./messages";
 

packages/app/src/Pages/SearchPage.tsx

@@ -5,9 +5,9 @@ import Tabs, { Tab } from "@/Element/Tabs";
 import { useEffect, useState } from "react";
 import { debounce } from "@/SnortUtils";
 import { router } from "@/index";
-import TrendingUsers from "@/Element/TrendingUsers";
+import TrendingUsers from "@/Element/Trending/TrendingUsers";
 
-import TrendingNotes from "@/Element/TrendingPosts";
+import TrendingNotes from "@/Element/Trending/TrendingPosts";
 
 const NOTES = 0;
 const PROFILES = 1;

packages/app/src/Pages/WalletPage.tsx

@@ -6,7 +6,7 @@ import { FormattedMessage, FormattedNumber, useIntl } from "react-intl";
 
 import NoteTime from "@/Element/Event/NoteTime";
 import { WalletInvoice, Sats, WalletInfo, WalletInvoiceState, useWallet, LNWallet, Wallets } from "@/Wallet";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { unwrap } from "@/SnortUtils";
 import { WebLNWallet } from "@/Wallet/WebLN";
 import Icon from "@/Icons/Icon";

packages/app/src/Pages/ZapPool.tsx

@@ -10,7 +10,7 @@ import useLogin from "@/Hooks/useLogin";
 import { UploaderServices } from "@/Upload";
 import { bech32ToHex, getRelayName, unwrap } from "@/SnortUtils";
 import { ZapPoolController, ZapPoolRecipient, ZapPoolRecipientType } from "@/ZapPoolController";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { useWallet } from "@/Wallet";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 

packages/app/src/Pages/onboarding/discover.tsx

@@ -1,8 +1,8 @@
 import { FormattedMessage } from "react-intl";
 import { useLocation, useNavigate } from "react-router-dom";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { NewUserState } from ".";
-import TrendingUsers from "@/Element/TrendingUsers";
+import TrendingUsers from "@/Element/Trending/TrendingUsers";
 
 export function Discover() {
   const location = useLocation();

packages/app/src/Pages/onboarding/moderation.tsx

@@ -3,7 +3,7 @@ import { FormattedMessage } from "react-intl";
 import { useNavigate } from "react-router-dom";
 import { unixNowMs } from "@snort/shared";
 
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { appendDedupe } from "@/SnortUtils";
 import { ToggleSwitch } from "@/Icons/Toggle";
 import { updateAppData } from "@/Login";

packages/app/src/Pages/onboarding/profile.tsx

@@ -1,4 +1,4 @@
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import AvatarEditor from "@/Element/User/AvatarEditor";
 import { useContext, useState } from "react";
 import { FormattedMessage } from "react-intl";

packages/app/src/Pages/onboarding/start.tsx

@@ -3,7 +3,7 @@ import { useState } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import { unwrap } from "@snort/shared";
 
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import Icon from "@/Icons/Icon";
 import { NewUserState } from ".";
 import { LoginSessionType, LoginStore } from "@/Login";

packages/app/src/Pages/onboarding/topics.tsx

@@ -1,7 +1,7 @@
 import { ReactNode, useState } from "react";
 import { FormattedMessage } from "react-intl";
 import { useNavigate } from "react-router-dom";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import classNames from "classnames";
 import { appendDedupe } from "@/SnortUtils";
 import useEventPublisher from "@/Hooks/useEventPublisher";

packages/app/src/Pages/settings/Cache.tsx

@@ -10,7 +10,7 @@ import {
   UserCache,
   UserRelays,
 } from "@/Cache";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { ReactNode, useSyncExternalStore } from "react";
 import { FormattedMessage, FormattedNumber } from "react-intl";
 

packages/app/src/Pages/settings/Profile.tsx

@@ -7,7 +7,7 @@ import { useUserProfile } from "@snort/system-react";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import { openFile } from "@/SnortUtils";
 import useFileUpload from "@/Upload";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { UserCache } from "@/Cache";
 import useLogin from "@/Hooks/useLogin";
 import Icon from "@/Icons/Icon";

packages/app/src/Pages/settings/Relays.tsx

@@ -7,7 +7,7 @@ import Relay from "@/Element/Relay/Relay";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import useLogin from "@/Hooks/useLogin";
 import { setRelays } from "@/Login";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import SnortApi, { RelayDistance } from "@/External/SnortApi";
 import { getCountry, getRelayName, sanitizeRelayUrl } from "@/SnortUtils";
 import { formatShort } from "@/Number";

packages/app/src/Pages/settings/handle/LNAddress.tsx

@@ -3,7 +3,7 @@ import { FormattedMessage, useIntl } from "react-intl";
 import { LNURL } from "@snort/shared";
 
 import { ApiHost } from "@/Const";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import SnortServiceProvider, { ForwardType, ManageHandle } from "@/Nip05/SnortServiceProvider";
 

packages/app/src/Pages/settings/handle/TransferHandle.tsx

@@ -3,7 +3,7 @@ import { FormattedMessage, useIntl } from "react-intl";
 import { useNavigate } from "react-router-dom";
 
 import { ApiHost } from "@/Const";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import { ServiceError } from "@/Nip05/ServiceProvider";
 import SnortServiceProvider, { ManageHandle } from "@/Nip05/SnortServiceProvider";

packages/app/src/Pages/settings/wallet/Cashu.tsx

@@ -2,7 +2,7 @@ import { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { v4 as uuid } from "uuid";
 
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { unwrap } from "@/SnortUtils";
 import { WalletConfig, WalletKind, Wallets } from "@/Wallet";
 import { useNavigate } from "react-router-dom";

packages/app/src/Pages/settings/wallet/LNC.tsx

@@ -3,7 +3,7 @@ import { FormattedMessage, useIntl } from "react-intl";
 import { useNavigate } from "react-router-dom";
 import { v4 as uuid } from "uuid";
 
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { LNWallet, WalletInfo, WalletKind, Wallets } from "@/Wallet";
 import { unwrap } from "@/SnortUtils";
 

packages/app/src/Pages/settings/wallet/LNDHub.tsx

@@ -2,7 +2,7 @@ import { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { v4 as uuid } from "uuid";
 
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { unwrap } from "@/SnortUtils";
 import LNDHubWallet from "@/Wallet/LNDHub";
 import { WalletConfig, WalletKind, Wallets } from "@/Wallet";

packages/app/src/Pages/settings/wallet/NWC.tsx

@@ -2,7 +2,7 @@ import { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { v4 as uuid } from "uuid";
 
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import { unwrap } from "@/SnortUtils";
 import { WalletConfig, WalletKind, Wallets } from "@/Wallet";
 import { Link, useNavigate } from "react-router-dom";

packages/app/src/Pages/subscribe/RenewSub.tsx

@@ -2,7 +2,7 @@ import { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { unixNow, unwrap } from "@snort/shared";
 
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import SendSats from "@/Element/SendSats";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import SnortApi, { Subscription, SubscriptionError } from "@/External/SnortApi";

packages/app/src/Pages/subscribe/index.tsx

@@ -7,7 +7,7 @@ import { RouteObject } from "react-router-dom";
 import { formatShort } from "@/Number";
 import { LockedFeatures, Plans, SubscriptionType } from "@/Subscription";
 import ManageSubscriptionPage from "@/Pages/subscribe/ManageSubscription";
-import AsyncButton from "@/Element/AsyncButton";
+import AsyncButton from "@/Element/Button/AsyncButton";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import SnortApi, { SubscriptionError, SubscriptionErrorCode } from "@/External/SnortApi";
 import SendSats from "@/Element/SendSats";

packages/app/src/index.tsx

@@ -31,7 +31,7 @@ import { getCountry, unwrap } from "@/SnortUtils";
 import Layout from "@/Pages/Layout";
 import ProfilePage from "@/Pages/Profile/ProfilePage";
 import { RootRoutes, RootTabRoutes } from "@/Pages/Root";
-import NotificationsPage from "@/Pages/Notifications";
+import NotificationsPage from "@/Pages/Notifications/Notifications";
 import SettingsPage, { SettingsRoutes } from "@/Pages/SettingsPage";
 import ErrorPage from "@/Pages/ErrorPage";
 import NostrAddressPage from "@/Pages/NostrAddressPage";