Rename app2 to app

ROADMAP.md

@@ -2,7 +2,7 @@
 
 - [ ] Refactor
   - Move global modals to child components?
-  - Combine app/agent, rename app2
+  - Combine app/agent, rename app
 - [ ] Improve topic suggestions and rendering
 - [ ] Add topic search
 - [ ] Relays bounty

src/app/App.svelte

@@ -18,15 +18,15 @@
   import sync from "src/agent/sync"
   import * as db from "src/agent/db"
   import user from "src/agent/user"
-  import {loadAppData} from "src/app2/state"
+  import {loadAppData} from "src/app/state"
   import {theme, getThemeVariables, modal, openModals} from "src/partials/state"
-  import {logUsage} from "src/app2/state"
-  import SideNav from "src/app2/SideNav.svelte"
-  import Routes from "src/app2/Routes.svelte"
-  import Toast from "src/app2/Toast.svelte"
-  import TopNav from "src/app2/TopNav.svelte"
-  import Modal from "src/app2/Modal.svelte"
-  import ForegroundButtons from "src/app2/ForegroundButtons.svelte"
+  import {logUsage} from "src/app/state"
+  import SideNav from "src/app/SideNav.svelte"
+  import Routes from "src/app/Routes.svelte"
+  import Toast from "src/app/Toast.svelte"
+  import TopNav from "src/app/TopNav.svelte"
+  import Modal from "src/app/Modal.svelte"
+  import ForegroundButtons from "src/app/ForegroundButtons.svelte"
 
   Object.assign(window, {cmd, user, keys, network, pool, sync, db, bech32ToHex, hexToBech32})
 

src/app/EnsureData.svelte

@@ -2,10 +2,10 @@
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
   import Modal from "src/partials/Modal.svelte"
-  import PersonInfo from "src/app2/shared/PersonInfo.svelte"
-  import RelaySearch from "src/app2/shared/RelaySearch.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
-  import PersonSearch from "src/app2/shared/PersonSearch.svelte"
+  import PersonInfo from "src/app/shared/PersonInfo.svelte"
+  import RelaySearch from "src/app/shared/RelaySearch.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
+  import PersonSearch from "src/app/shared/PersonSearch.svelte"
   import {getPersonWithFallback} from "src/agent/db"
   import user from "src/agent/user"
 

src/app/Modal.svelte

@@ -1,20 +1,20 @@
 <script lang="ts">
-  import {menuIsOpen} from "src/app2/state"
+  import {menuIsOpen} from "src/app/state"
   import {modal} from "src/partials/state"
   import Modal from "src/partials/Modal.svelte"
   import Content from "src/partials/Content.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import ChatEdit from "src/app2/views/ChatEdit.svelte"
-  import LoginConnect from "src/app2/views/LoginConnect.svelte"
-  import LoginPrivKey from "src/app2/views/LoginPrivKey.svelte"
-  import LoginPubKey from "src/app2/views/LoginPubKey.svelte"
-  import Onboarding from "src/app2/views/Onboarding.svelte"
-  import NoteCreate from "src/app2/views/NoteCreate.svelte"
-  import NoteDetail from "src/app2/views/NoteDetail.svelte"
-  import PersonList from "src/app2/shared/PersonList.svelte"
-  import PersonProfileInfo from "src/app2/views/PersonProfileInfo.svelte"
-  import PersonShare from "src/app2/views/PersonShare.svelte"
-  import AddRelay from "src/app2/views/RelayAdd.svelte"
+  import ChatEdit from "src/app/views/ChatEdit.svelte"
+  import LoginConnect from "src/app/views/LoginConnect.svelte"
+  import LoginPrivKey from "src/app/views/LoginPrivKey.svelte"
+  import LoginPubKey from "src/app/views/LoginPubKey.svelte"
+  import Onboarding from "src/app/views/Onboarding.svelte"
+  import NoteCreate from "src/app/views/NoteCreate.svelte"
+  import NoteDetail from "src/app/views/NoteDetail.svelte"
+  import PersonList from "src/app/shared/PersonList.svelte"
+  import PersonProfileInfo from "src/app/views/PersonProfileInfo.svelte"
+  import PersonShare from "src/app/views/PersonShare.svelte"
+  import AddRelay from "src/app/views/RelayAdd.svelte"
 
   const closeModal = async () => {
     modal.clear()

src/app/Routes.svelte

@@ -1,25 +1,25 @@
 <script lang="ts">
   import {Route} from "svelte-routing"
   import {onReady} from "src/agent/db"
-  import EnsureData from "src/app2/EnsureData.svelte"
-  import Notifications from "src/app2/views/Notifications.svelte"
-  import Bech32Entity from "src/app2/views/Bech32Entity.svelte"
-  import ChatDetail from "src/app2/views/ChatDetail.svelte"
-  import ChatList from "src/app2/views/ChatList.svelte"
-  import Feeds from "src/app2/views/Feeds.svelte"
-  import UserKeys from "src/app2/views/UserKeys.svelte"
-  import Login from "src/app2/views/Login.svelte"
-  import Logout from "src/app2/views/Logout.svelte"
-  import MessagesDetail from "src/app2/views/MessagesDetail.svelte"
-  import MessagesList from "src/app2/views/MessagesList.svelte"
-  import NotFound from "src/app2/views/NotFound.svelte"
-  import PersonDetail from "src/app2/views/PersonDetail.svelte"
-  import Search from "src/app2/views/Search.svelte"
-  import Scan from "src/app2/views/Scan.svelte"
-  import RelayDetail from "src/app2/views/RelayDetail.svelte"
-  import RelayList from "src/app2/views/RelayList.svelte"
-  import UserProfile from "src/app2/views/UserProfile.svelte"
-  import UserSettings from "src/app2/views/UserSettings.svelte"
+  import EnsureData from "src/app/EnsureData.svelte"
+  import Notifications from "src/app/views/Notifications.svelte"
+  import Bech32Entity from "src/app/views/Bech32Entity.svelte"
+  import ChatDetail from "src/app/views/ChatDetail.svelte"
+  import ChatList from "src/app/views/ChatList.svelte"
+  import Feeds from "src/app/views/Feeds.svelte"
+  import UserKeys from "src/app/views/UserKeys.svelte"
+  import Login from "src/app/views/Login.svelte"
+  import Logout from "src/app/views/Logout.svelte"
+  import MessagesDetail from "src/app/views/MessagesDetail.svelte"
+  import MessagesList from "src/app/views/MessagesList.svelte"
+  import NotFound from "src/app/views/NotFound.svelte"
+  import PersonDetail from "src/app/views/PersonDetail.svelte"
+  import Search from "src/app/views/Search.svelte"
+  import Scan from "src/app/views/Scan.svelte"
+  import RelayDetail from "src/app/views/RelayDetail.svelte"
+  import RelayList from "src/app/views/RelayList.svelte"
+  import UserProfile from "src/app/views/UserProfile.svelte"
+  import UserSettings from "src/app/views/UserSettings.svelte"
 
   let ready = false
 

src/app/SideNav.svelte

@@ -4,10 +4,10 @@
   import {installPrompt} from "src/partials/state"
   import user from "src/agent/user"
   import pool from "src/agent/pool"
-  import {routes, menuIsOpen} from "src/app2/state"
-  import {newNotifications, newDirectMessages, newChatMessages} from "src/app2/state"
-  import {slowConnections} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
+  import {routes, menuIsOpen} from "src/app/state"
+  import {newNotifications, newDirectMessages, newChatMessages} from "src/app/state"
+  import {slowConnections} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
 
   const {profile, canPublish} = user
 

src/app/TopNav.svelte

@@ -2,8 +2,8 @@
   import {onMount} from "svelte"
   import {theme} from "src/partials/state"
   import Anchor from "src/partials/Anchor.svelte"
-  import {menuIsOpen} from "src/app2/state"
-  import {newNotifications} from "src/app2/state"
+  import {menuIsOpen} from "src/app/state"
+  import {newNotifications} from "src/app/state"
 
   const toggleMenu = () => menuIsOpen.update(x => !x)
   const toggleTheme = () => theme.update(t => (t === "dark" ? "light" : "dark"))

src/app/shared/Feed.svelte

@@ -9,11 +9,11 @@
   import Spinner from "src/partials/Spinner.svelte"
   import Modal from "src/partials/Modal.svelte"
   import Content from "src/partials/Content.svelte"
-  import RelayFeed from "src/app2/shared/RelayFeed.svelte"
-  import Note from "src/app2/shared/Note.svelte"
+  import RelayFeed from "src/app/shared/RelayFeed.svelte"
+  import Note from "src/app/shared/Note.svelte"
   import user from "src/agent/user"
   import network from "src/agent/network"
-  import {mergeParents} from "src/app2/state"
+  import {mergeParents} from "src/app/state"
 
   export let filter
   export let relays = []

src/app/shared/Note.svelte

@@ -9,17 +9,17 @@
   import {modal} from "src/partials/state"
   import Popover from "src/partials/Popover.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
-  import PersonSummary from "src/app2/shared/PersonSummary.svelte"
-  import NoteReply from "src/app2/shared/NoteReply.svelte"
-  import NoteActions from "src/app2/shared/NoteActions.svelte"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonSummary from "src/app/shared/PersonSummary.svelte"
+  import NoteReply from "src/app/shared/NoteReply.svelte"
+  import NoteActions from "src/app/shared/NoteActions.svelte"
   import Card from "src/partials/Card.svelte"
   import user from "src/agent/user"
   import {getRelaysForEventParent} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import {watch} from "src/agent/db"
-  import {routes} from "src/app2/state"
-  import NoteContent from "src/app2/shared/NoteContent.svelte"
+  import {routes} from "src/app/state"
+  import NoteContent from "src/app/shared/NoteContent.svelte"
 
   export let note
   export let feedRelay

src/app/shared/NoteActions.svelte

@@ -16,10 +16,10 @@
   import Anchor from "src/partials/Anchor.svelte"
   import OverflowMenu from "src/partials/OverflowMenu.svelte"
   import CopyValue from "src/partials/CopyValue.svelte"
-  import PersonBadge from "src/app2/shared/PersonBadge.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import Input from "src/partials/Input.svelte"
   import Textarea from "src/partials/Textarea.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import {getEventPublishRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import network from "src/agent/network"

src/app/shared/NoteContent.svelte

@@ -10,12 +10,12 @@
   import Card from "src/partials/Card.svelte"
   import Spinner from "src/partials/Spinner.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
   import {sampleRelays} from "src/agent/relays"
   import user from "src/agent/user"
   import network from "src/agent/network"
   import {getPersonWithFallback} from "src/agent/db"
-  import {routes} from "src/app2/state"
+  import {routes} from "src/app/state"
 
   export let note
   export let maxLength = 700
@@ -132,7 +132,7 @@
       {:else}
         {value}
       {/if}
-      {' '}
+      {" "}
     {/each}
   </p>
   {#if showMedia && links.length > 0}

src/app/shared/NoteReply.svelte

@@ -12,7 +12,7 @@
   import {getEventPublishRelays} from "src/agent/relays"
   import user from "src/agent/user"
   import cmd from "src/agent/cmd"
-  import {publishWithToast} from "src/app2/state"
+  import {publishWithToast} from "src/app/state"
 
   export let note
   export let borderColor

src/app/shared/PersonBadge.svelte

@@ -2,8 +2,8 @@
   import {Link} from "svelte-routing"
   import {killEvent} from "src/util/html"
   import {displayPerson} from "src/util/nostr"
-  import {routes} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
+  import {routes} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
 
   export let person
   export let inert = false

src/app/shared/PersonInfo.svelte

@@ -4,11 +4,11 @@
   import {noEvent} from "src/util/html"
   import {displayPerson} from "src/util/nostr"
   import Anchor from "src/partials/Anchor.svelte"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
-  import PersonAbout from "src/app2/shared/PersonAbout.svelte"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonAbout from "src/app/shared/PersonAbout.svelte"
   import {getPubkeyWriteRelays, sampleRelays} from "src/agent/relays"
   import user from "src/agent/user"
-  import {routes} from "src/app2/state"
+  import {routes} from "src/app/state"
 
   export let person
 

src/app/shared/PersonList.svelte

@@ -4,7 +4,7 @@
   import {Tags} from "src/util/nostr"
   import Content from "src/partials/Content.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import PersonInfo from "src/app2/shared/PersonInfo.svelte"
+  import PersonInfo from "src/app/shared/PersonInfo.svelte"
   import {sampleRelays, getPubkeyWriteRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import {watch} from "src/agent/db"

src/app/shared/PersonSearch.svelte

@@ -3,7 +3,7 @@
   import {personKinds} from "src/util/nostr"
   import Input from "src/partials/Input.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import PersonInfo from "src/app2/shared/PersonInfo.svelte"
+  import PersonInfo from "src/app/shared/PersonInfo.svelte"
   import {getUserReadRelays} from "src/agent/relays"
   import {watch} from "src/agent/db"
   import network from "src/agent/network"

src/app/shared/PersonSummary.svelte

@@ -7,9 +7,9 @@
   import {sampleRelays, getPubkeyWriteRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import {watch} from "src/agent/db"
-  import {routes} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
-  import PersonAbout from "src/app2/shared/PersonAbout.svelte"
+  import {routes} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonAbout from "src/app/shared/PersonAbout.svelte"
 
   export let pubkey
 

src/app/shared/RelayCard.svelte

@@ -9,7 +9,7 @@
   import Anchor from "src/partials/Anchor.svelte"
   import pool from "src/agent/pool"
   import user from "src/agent/user"
-  import {loadAppData} from "src/app2/state"
+  import {loadAppData} from "src/app/state"
 
   export let relay
   export let theme = "gray-8"

src/app/shared/RelayFeed.svelte

@@ -2,9 +2,9 @@
   import {displayRelay} from "src/util/nostr"
   import Content from "src/partials/Content.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import RelayTitle from "src/app2/shared/RelayTitle.svelte"
-  import RelayActions from "src/app2/shared/RelayActions.svelte"
-  import Note from "src/app2/shared/Note.svelte"
+  import RelayTitle from "src/app/shared/RelayTitle.svelte"
+  import RelayActions from "src/app/shared/RelayActions.svelte"
+  import Note from "src/app/shared/Note.svelte"
 
   export let depth
   export let showContext = false

src/app/shared/RelaySearch.svelte

@@ -2,7 +2,7 @@
   import {pluck} from "ramda"
   import {fuzzy} from "src/util/misc"
   import Input from "src/partials/Input.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import {watch} from "src/agent/db"
   import user from "src/agent/user"
 

src/app/views/Bech32Entity.svelte

@@ -4,8 +4,8 @@
   import {nip19} from "nostr-tools"
   import {warn} from "src/util/logger"
   import Content from "src/partials/Content.svelte"
-  import NoteDetail from "src/app2/views/NoteDetail.svelte"
-  import PersonDetail from "src/app2/views/PersonDetail.svelte"
+  import NoteDetail from "src/app/views/NoteDetail.svelte"
+  import PersonDetail from "src/app/views/PersonDetail.svelte"
   import {sampleRelays} from "src/agent/relays"
 
   export let entity

src/app/views/ChatDetail.svelte

@@ -6,14 +6,14 @@
   import {modal} from "src/partials/state"
   import Channel from "src/partials/Channel.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import PersonBadge from "src/app2/shared/PersonBadge.svelte"
-  import NoteContent from "src/app2/shared/NoteContent.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
+  import NoteContent from "src/app/shared/NoteContent.svelte"
   import user from "src/agent/user"
   import {getRelaysForEventChildren, sampleRelays} from "src/agent/relays"
   import network from "src/agent/network"
   import {watch} from "src/agent/db"
   import cmd from "src/agent/cmd"
-  import {lastChecked} from "src/app2/state"
+  import {lastChecked} from "src/app/state"
 
   export let entity
 

src/app/views/ChatEdit.svelte

@@ -11,7 +11,7 @@
   import {getUserWriteRelays} from "src/agent/relays"
   import {rooms} from "src/agent/db"
   import cmd from "src/agent/cmd"
-  import {publishWithToast} from "src/app2/state"
+  import {publishWithToast} from "src/app/state"
 
   export let room = {name: null, id: null, about: null, picture: null}
 

src/app/views/ChatList.svelte

@@ -4,7 +4,7 @@
   import Input from "src/partials/Input.svelte"
   import Content from "src/partials/Content.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import ChatListItem from "src/app2/views/ChatListItem.svelte"
+  import ChatListItem from "src/app/views/ChatListItem.svelte"
   import {watch} from "src/agent/db"
   import network from "src/agent/network"
   import {getUserReadRelays} from "src/agent/relays"

src/app/views/Feeds.svelte

@@ -4,8 +4,8 @@
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
   import Tabs from "src/partials/Tabs.svelte"
-  import FeedsFollows from "src/app2/views/FeedsFollows.svelte"
-  import FeedsNetwork from "src/app2/views/FeedsNetwork.svelte"
+  import FeedsFollows from "src/app/views/FeedsFollows.svelte"
+  import FeedsNetwork from "src/app/views/FeedsNetwork.svelte"
   import user from "src/agent/user"
 
   export let activeTab

src/app/views/FeedsFollows.svelte

@@ -1,6 +1,6 @@
 <script>
   import {shuffle} from "src/util/misc"
-  import Feed from "src/app2/shared/Feed.svelte"
+  import Feed from "src/app/shared/Feed.svelte"
   import {getUserFollows} from "src/agent/social"
   import {sampleRelays, getAllPubkeyWriteRelays} from "src/agent/relays"
 

src/app/views/FeedsNetwork.svelte

@@ -1,6 +1,6 @@
 <script>
   import {shuffle} from "src/util/misc"
-  import Feed from "src/app2/shared/Feed.svelte"
+  import Feed from "src/app/shared/Feed.svelte"
   import {getUserNetwork} from "src/agent/social"
   import {sampleRelays, getAllPubkeyWriteRelays} from "src/agent/relays"
 

src/app/views/Login.svelte

@@ -6,7 +6,7 @@
   import Content from "src/partials/Content.svelte"
   import Heading from "src/partials/Heading.svelte"
   import user from "src/agent/user"
-  import {login} from "src/app2/state"
+  import {login} from "src/app/state"
 
   const nip07 = "https://github.com/nostr-protocol/nips/blob/master/07.md"
 

src/app/views/LoginConnect.svelte

@@ -12,12 +12,12 @@
   import Heading from "src/partials/Heading.svelte"
   import Anchor from "src/partials/Anchor.svelte"
   import Modal from "src/partials/Modal.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import {watch} from "src/agent/db"
   import network from "src/agent/network"
   import user from "src/agent/user"
   import pool from "src/agent/pool"
-  import {loadAppData} from "src/app2/state"
+  import {loadAppData} from "src/app/state"
 
   let modal = null
   let customRelayUrl = null

src/app/views/LoginPrivKey.svelte

@@ -6,7 +6,7 @@
   import Content from "src/partials/Content.svelte"
   import Heading from "src/partials/Heading.svelte"
   import keys from "src/agent/keys"
-  import {login} from "src/app2/state"
+  import {login} from "src/app/state"
 
   let nsec = ""
   const nip07 = "https://github.com/nostr-protocol/nips/blob/master/07.md"

src/app/views/LoginPubKey.svelte

@@ -6,7 +6,7 @@
   import Heading from "src/partials/Heading.svelte"
   import keys from "src/agent/keys"
   import {toast} from "src/partials/state"
-  import {login} from "src/app2/state"
+  import {login} from "src/app/state"
 
   let npub = ""
 

src/app/views/MessagesDetail.svelte

@@ -6,7 +6,7 @@
   import {Tags} from "src/util/nostr"
   import Channel from "src/partials/Channel.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import NoteContent from "src/app2/shared/NoteContent.svelte"
+  import NoteContent from "src/app/shared/NoteContent.svelte"
   import {getAllPubkeyRelays, sampleRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import {watch} from "src/agent/db"
@@ -14,10 +14,10 @@
   import keys from "src/agent/keys"
   import user from "src/agent/user"
   import cmd from "src/agent/cmd"
-  import {routes} from "src/app2/state"
-  import {lastChecked} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
-  import PersonAbout from "src/app2/shared/PersonAbout.svelte"
+  import {routes} from "src/app/state"
+  import {lastChecked} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonAbout from "src/app/shared/PersonAbout.svelte"
 
   export let entity
 

src/app/views/MessagesList.svelte

@@ -3,7 +3,7 @@
   import {toTitle} from "hurdak/lib/hurdak"
   import Tabs from "src/partials/Tabs.svelte"
   import Content from "src/partials/Content.svelte"
-  import MessagesListItem from "src/app2/views/MessagesListItem.svelte"
+  import MessagesListItem from "src/app/views/MessagesListItem.svelte"
   import {watch} from "src/agent/db"
 
   let activeTab = "messages"

src/app/views/MessagesListItem.svelte

@@ -4,8 +4,8 @@
   import {ellipsize} from "hurdak/lib/hurdak"
   import {displayPerson} from "src/util/nostr"
   import {getPersonWithFallback} from "src/agent/db"
-  import {lastChecked} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
+  import {lastChecked} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
   import Card from "src/partials/Card.svelte"
 
   export let contact

src/app/views/NoteCreate.svelte

@@ -14,14 +14,14 @@
   import Content from "src/partials/Content.svelte"
   import Modal from "src/partials/Modal.svelte"
   import Heading from "src/partials/Heading.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
-  import RelaySearch from "src/app2/shared/RelaySearch.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
+  import RelaySearch from "src/app/shared/RelaySearch.svelte"
   import {getUserWriteRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import cmd from "src/agent/cmd"
   import user from "src/agent/user"
   import {toast, modal} from "src/partials/state"
-  import {publishWithToast} from "src/app2/state"
+  import {publishWithToast} from "src/app/state"
 
   export let pubkey = null
   export let nevent = null

src/app/views/NoteDetail.svelte

@@ -6,10 +6,10 @@
   import {log} from "src/util/logger"
   import {asDisplayEvent} from "src/util/nostr"
   import Content from "src/partials/Content.svelte"
-  import RelayFeed from "src/app2/shared/RelayFeed.svelte"
+  import RelayFeed from "src/app/shared/RelayFeed.svelte"
   import Modal from "src/partials/Modal.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import Note from "src/app2/shared/Note.svelte"
+  import Note from "src/app/shared/Note.svelte"
   import user from "src/agent/user"
   import network from "src/agent/network"
   import {sampleRelays} from "src/agent/relays"

src/app/views/Notification.svelte

@@ -3,11 +3,11 @@
   import {closure, quantify} from "hurdak/lib/hurdak"
   import {formatTimestamp, tryJson} from "src/util/misc"
   import {Tags} from "src/util/nostr"
-  import PersonBadge from "src/app2/shared/PersonBadge.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import Card from "src/partials/Card.svelte"
   import Popover from "src/partials/Popover.svelte"
-  import NoteContent from "src/app2/shared/NoteContent.svelte"
-  import NotificationSection from "src/app2/views/NotificationSection.svelte"
+  import NoteContent from "src/app/shared/NoteContent.svelte"
+  import NotificationSection from "src/app/views/NotificationSection.svelte"
   import {getPersonWithFallback, userEvents} from "src/agent/db"
   import {modal} from "src/partials/state"
 

src/app/views/NotificationSection.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import PersonBadge from "src/app2/shared/PersonBadge.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import {getPersonWithFallback} from "src/agent/db"
 
   export let pubkeys

src/app/views/Notifications.svelte

@@ -6,11 +6,11 @@
   import {findReplyId} from "src/util/nostr"
   import Spinner from "src/partials/Spinner.svelte"
   import Content from "src/partials/Content.svelte"
-  import Notification from "src/app2/views/Notification.svelte"
+  import Notification from "src/app/views/Notification.svelte"
   import {watch} from "src/agent/db"
   import user from "src/agent/user"
   import {userEvents} from "src/agent/db"
-  import {lastChecked} from "src/app2/state"
+  import {lastChecked} from "src/app/state"
 
   let limit = 0
   let events = null

src/app/views/Onboarding.svelte

@@ -6,11 +6,11 @@
   import {navigate} from "svelte-routing"
   import {shuffle} from "src/util/misc"
   import {displayPerson} from "src/util/nostr"
-  import OnboardingIntro from "src/app2/views/OnboardingIntro.svelte"
-  import OnboardingKey from "src/app2/views/OnboardingKey.svelte"
-  import OnboardingRelays from "src/app2/views/OnboardingRelays.svelte"
-  import OnboardingFollows from "src/app2/views/OnboardingFollows.svelte"
-  import OnboardingComplete from "src/app2/views/OnboardingComplete.svelte"
+  import OnboardingIntro from "src/app/views/OnboardingIntro.svelte"
+  import OnboardingKey from "src/app/views/OnboardingKey.svelte"
+  import OnboardingRelays from "src/app/views/OnboardingRelays.svelte"
+  import OnboardingFollows from "src/app/views/OnboardingFollows.svelte"
+  import OnboardingComplete from "src/app/views/OnboardingComplete.svelte"
   import {getFollows} from "src/agent/social"
   import {getPubkeyWriteRelays, sampleRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
@@ -18,7 +18,7 @@
   import pool from "src/agent/pool"
   import user from "src/agent/user"
   import keys from "src/agent/keys"
-  import {loadAppData} from "src/app2/state"
+  import {loadAppData} from "src/app/state"
   import {modal} from "src/partials/state"
 
   export let stage

src/app/views/OnboardingFollows.svelte

@@ -5,7 +5,7 @@
   import Anchor from "src/partials/Anchor.svelte"
   import Heading from "src/partials/Heading.svelte"
   import Content from "src/partials/Content.svelte"
-  import PersonInfo from "src/app2/shared/PersonInfo.svelte"
+  import PersonInfo from "src/app/shared/PersonInfo.svelte"
   import {getPersonWithFallback} from "src/agent/db"
   import {watch} from "src/agent/db"
   import {modal} from "src/partials/state"

src/app/views/OnboardingRelays.svelte

@@ -6,7 +6,7 @@
   import Anchor from "src/partials/Anchor.svelte"
   import Heading from "src/partials/Heading.svelte"
   import Content from "src/partials/Content.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import {watch} from "src/agent/db"
 
   export let relays

src/app/views/PersonDetail.svelte

@@ -13,17 +13,17 @@
   import Content from "src/partials/Content.svelte"
   import OverflowMenu from "src/partials/OverflowMenu.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import Notes from "src/app2/views/PersonNotes.svelte"
-  import Likes from "src/app2/views/PersonLikes.svelte"
-  import Relays from "src/app2/views/PersonRelays.svelte"
+  import Notes from "src/app/views/PersonNotes.svelte"
+  import Likes from "src/app/views/PersonLikes.svelte"
+  import Relays from "src/app/views/PersonRelays.svelte"
   import user from "src/agent/user"
   import pool from "src/agent/pool"
   import {sampleRelays, getPubkeyWriteRelays} from "src/agent/relays"
   import network from "src/agent/network"
   import {getPersonWithFallback, watch} from "src/agent/db"
-  import {routes} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
-  import PersonAbout from "src/app2/shared/PersonAbout.svelte"
+  import {routes} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonAbout from "src/app/shared/PersonAbout.svelte"
 
   export let npub
   export let activeTab

src/app/views/PersonLikes.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Feed from "src/app2/shared/Feed.svelte"
+  import Feed from "src/app/shared/Feed.svelte"
   import {isLike} from "src/util/nostr"
   import {timedelta} from "src/util/misc"
 

src/app/views/PersonNotes.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import {timedelta} from "src/util/misc"
-  import Feed from "src/app2/shared/Feed.svelte"
+  import Feed from "src/app/shared/Feed.svelte"
 
   export let pubkey
   export let relays

src/app/views/PersonProfileInfo.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import {nip05, nip19} from "nostr-tools"
   import Content from "src/partials/Content.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import CopyValue from "src/partials/CopyValue.svelte"
   import {onMount} from "svelte"
   import {fly} from "svelte/transition"

src/app/views/PersonRelays.svelte

@@ -1,7 +1,7 @@
 <script>
   import {fly} from "svelte/transition"
   import Content from "src/partials/Content.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
 
   export let relays
 </script>

src/app/views/RelayAdd.svelte

@@ -6,7 +6,7 @@
   import Button from "src/partials/Button.svelte"
   import user from "src/agent/user"
   import {toast, modal} from "src/partials/state"
-  import {loadAppData} from "src/app2/state"
+  import {loadAppData} from "src/app/state"
 
   let url = $modal.url
 

src/app/views/RelayDetail.svelte

@@ -1,9 +1,9 @@
 <script lang="ts">
   import {displayRelay} from "src/util/nostr"
   import Content from "src/partials/Content.svelte"
-  import Feed from "src/app2/shared/Feed.svelte"
-  import RelayTitle from "src/app2/shared/RelayTitle.svelte"
-  import RelayActions from "src/app2/shared/RelayActions.svelte"
+  import Feed from "src/app/shared/Feed.svelte"
+  import RelayTitle from "src/app/shared/RelayTitle.svelte"
+  import RelayActions from "src/app/shared/RelayActions.svelte"
   import {relays} from "src/agent/db"
 
   export let url

src/app/views/RelayList.svelte

@@ -2,8 +2,8 @@
   import {fly} from "svelte/transition"
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
-  import RelaySearch from "src/app2/shared/RelaySearch.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelaySearch from "src/app/shared/RelaySearch.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import user from "src/agent/user"
   import {modal} from "src/partials/state"
 

src/app/views/Search.svelte

@@ -1,7 +1,7 @@
 <script>
   import Heading from "src/partials/Heading.svelte"
   import Content from "src/partials/Content.svelte"
-  import PersonSearch from "src/app2/shared/PersonSearch.svelte"
+  import PersonSearch from "src/app/shared/PersonSearch.svelte"
 </script>
 
 <Content>

src/app/views/UserProfile.svelte

@@ -12,8 +12,8 @@
   import user from "src/agent/user"
   import {getUserWriteRelays} from "src/agent/relays"
   import cmd from "src/agent/cmd"
-  import {routes} from "src/app2/state"
-  import {publishWithToast} from "src/app2/state"
+  import {routes} from "src/app/state"
+  import {publishWithToast} from "src/app/state"
 
   let values = user.getProfile().kind0 || {}
 

src/main.js

@@ -1,7 +1,7 @@
 import "src/app.css"
 
 import Bugsnag from "@bugsnag/js"
-import App from "src/app2/App.svelte"
+import App from "src/app/App.svelte"
 import {installPrompt} from "src/partials/state"
 
 Bugsnag.start({

src/partials/Compose.svelte

@@ -3,7 +3,7 @@
   import {last, pluck, propEq} from "ramda"
   import {fuzzy} from "src/util/misc"
   import {displayPerson} from "src/util/nostr"
-  import PersonBadge from "src/app2/shared/PersonBadge.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import ContentEditable from "src/partials/ContentEditable.svelte"
   import Suggestions from "src/partials/Suggestions.svelte"
   import {watch} from "src/agent/db"