Use welshman/app

src/app/components/GroupCompose.svelte

@@ -5,10 +5,11 @@
   import {createEditor, type Editor, EditorContent} from "svelte-tiptap"
   import {NProfileExtension, TagExtension as TopicExtension, ImageExtension} from "nostr-editor"
   import {createEvent, CHAT_MESSAGE} from "@welshman/util"
+  import {publishThunk, makeThunk} from "@welshman/app"
   import {findNodes} from "@lib/tiptap"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
-  import {publishThunk, makeThunk, userRelayUrlsByNom} from "@app/state"
+  import {userRelayUrlsByNom} from "@app/state"
   import {makeMention, makeIMeta} from "@app/commands"
   import {getChatEditorOptions, addFile} from "@app/editor"
 

src/app/components/GroupComposeMention.svelte

@@ -3,8 +3,8 @@
   import type {NodeViewProps} from "@tiptap/core"
   import {NodeViewWrapper} from "svelte-tiptap"
   import {displayProfile} from "@welshman/util"
+  import {deriveProfile} from "@welshman/app"
   import Link from "@lib/components/Link.svelte"
-  import {deriveProfile} from "@app/state"
 
   export let node: NodeViewProps["node"]
   export let selected: NodeViewProps["selected"]

src/app/components/GroupComposeProfileSuggestion.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {deriveProfileDisplay} from "@app/state"
+  import {deriveProfileDisplay} from "@welshman/app"
 
   export let value
 

src/app/components/GroupNote.svelte

@@ -8,6 +8,13 @@
   import type {TrustedEvent} from "@welshman/util"
   import {deriveEvents} from "@welshman/store"
   import {PublishStatus} from "@welshman/net"
+  import {
+    publishStatusData,
+    deriveProfile,
+    deriveProfileDisplay,
+    formatTimestampAsTime,
+  } from "@welshman/app"
+  import type {PublishStatusData} from "@welshman/app"
   import {
     GROUP_REPLY,
     REACTION,
@@ -15,14 +22,12 @@
     displayRelayUrl,
     getAncestorTags,
   } from "@welshman/util"
+  import {repository} from "@welshman/app"
   import {fly} from "@lib/transition"
-  import {formatTimestampAsTime} from "@lib/util"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import Avatar from "@lib/components/Avatar.svelte"
-  import {repository} from "@app/base"
-  import type {PublishStatusData} from "@app/state"
-  import {deriveProfile, deriveProfileDisplay, deriveEvent, publishStatusData} from "@app/state"
+  import {deriveEvent} from "@app/state"
   import {getChatViewOptions} from "@app/editor"
 
   export let event: TrustedEvent
@@ -73,8 +78,8 @@
   let editor: Readable<Editor>
 
   $: parentPubkey = $parentEvent?.pubkey || replies[0]?.[4]
-  $: parentProfile = deriveProfile(parentPubkey)
-  $: parentProfileDisplay = deriveProfileDisplay(parentPubkey)
+  $: parentProfile = deriveProfile(parentPubkey || "")
+  $: parentProfileDisplay = deriveProfileDisplay(parentPubkey || "")
   $: isPublished = findStatus($ps, [PublishStatus.Success])
   $: isPending = findStatus($ps, [PublishStatus.Pending]) && event.created_at > now() - 30
   $: failure =

src/app/components/InfoNip29.svelte

@@ -3,7 +3,7 @@
   import Button from "@lib/components/Button.svelte"
   import Link from "@lib/components/Link.svelte"
   import Icon from "@lib/components/Icon.svelte"
-  import {DEFAULT_RELAYS} from "@app/base"
+  import {DEFAULT_RELAYS} from "@app/state"
   import {clip} from "@app/toast"
 </script>
 

src/app/components/LogIn.svelte

@@ -1,16 +1,14 @@
 <script lang="ts">
   import {makeSecret, getNip07, Nip46Broker} from "@welshman/signer"
+  import {addSession, loadHandle, nip46Perms, type Session} from "@welshman/app"
   import Icon from "@lib/components/Icon.svelte"
   import Field from "@lib/components/Field.svelte"
   import Button from "@lib/components/Button.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
   import SignUp from "@app/components/SignUp.svelte"
   import InfoNostr from "@app/components/LogIn.svelte"
-  import type {Session} from "@app/types"
   import {pushModal, clearModal} from "@app/modal"
   import {pushToast} from "@app/toast"
-  import {addSession, nip46Perms} from "@app/base"
-  import {loadHandle} from "@app/state"
   import {loadUserData} from "@app/commands"
 
   const signUp = () => pushModal(SignUp)

src/app/components/LogOut.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
+  import {clearStorage} from "@welshman/app"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
-  import {clearStorage} from "@app/storage"
 
   const back = () => history.back()
 

src/app/components/SignUp.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
   import {makeSecret, Nip46Broker} from "@welshman/signer"
+  import {addSession, nip46Perms, loadHandle} from "@welshman/app"
   import Icon from "@lib/components/Icon.svelte"
   import Field from "@lib/components/Field.svelte"
   import Button from "@lib/components/Button.svelte"
@@ -8,8 +9,6 @@
   import InfoNostr from "@app/components/LogIn.svelte"
   import {pushModal, clearModal} from "@app/modal"
   import {pushToast} from "@app/toast"
-  import {addSession, nip46Perms} from "@app/base"
-  import {loadHandle} from "@app/state"
 
   const login = () => pushModal(LogIn)
 

src/app/components/SpaceInviteAccept.svelte

@@ -1,12 +1,13 @@
 <script lang="ts">
   import {goto} from "$app/navigation"
+  import {loadRelay} from "@welshman/app"
   import CardButton from "@lib/components/CardButton.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
   import Button from "@lib/components/Button.svelte"
   import Field from "@lib/components/Field.svelte"
   import Icon from "@lib/components/Icon.svelte"
   import {pushToast} from "@app/toast"
-  import {splitGroupId, loadRelay, loadGroup} from "@app/state"
+  import {splitGroupId, loadGroup} from "@app/state"
   import {addGroupMemberships} from "@app/commands"
 
   const back = () => history.back()
@@ -24,7 +25,7 @@
       })
     }
 
-    if (!relay.supported_nips?.includes(29)) {
+    if (!relay.profile?.supported_nips?.includes(29)) {
       return pushToast({
         theme: "error",
         message: "Sorry, it looks like that relay doesn't support nostr spaces.",