diff --git a/src/helpers/nostr/mailbox.ts b/src/helpers/nostr/mailbox.ts index c32dde609..809af757c 100644 --- a/src/helpers/nostr/mailbox.ts +++ b/src/helpers/nostr/mailbox.ts @@ -1,9 +1,10 @@ import { kinds } from "nostr-tools"; -import { DraftNostrEvent, NostrEvent, RTag, Tag, isRTag } from "../../types/nostr-event"; +import { isSafeRelayURL } from "applesauce-core/helpers/relays"; +import { normalizeURL } from "applesauce-core/helpers/url"; + +import { DraftNostrEvent, NostrEvent, RTag, Tag } from "../../types/nostr-event"; import { cloneEvent } from "./event"; import { RelayMode } from "../../services/app-relays"; -import { isSafeRelayURL } from "../../../../applesauce/packages/core/dist/helpers/relays"; -import { normalizeURL } from "applesauce-core/helpers"; /** * fixes or removes any bad r tags diff --git a/src/services/notifications.ts b/src/services/notifications.ts index 311257438..97e4ebbe9 100644 --- a/src/services/notifications.ts +++ b/src/services/notifications.ts @@ -203,11 +203,10 @@ const notifications$: Observable = combineLatest([accounts.a return combineLatest([timeline$, mute$]).pipe( // filter events out by mutes map(([timeline, mutes]) => filterEvents(timeline, account.pubkey, mutes)), - // keep the observable hot for 5 minutes after its unsubscribed - share({ connector: () => new ReplaySubject(1), resetOnComplete: () => timer(5 * 60_000) }), ); }), - share(), + // keep the observable hot for 5 minutes after its unsubscribed + share({ connector: () => new ReplaySubject(1), resetOnComplete: () => timer(5 * 60_000) }), ); export default notifications$; diff --git a/src/views/settings/relays/add-relay-form.tsx b/src/views/settings/relays/add-relay-form.tsx index 401d8d8fc..3e1e77e90 100644 --- a/src/views/settings/relays/add-relay-form.tsx +++ b/src/views/settings/relays/add-relay-form.tsx @@ -1,9 +1,9 @@ import { Button, Flex, FlexProps, useToast } from "@chakra-ui/react"; +import { isSafeRelayURL } from "applesauce-core/helpers/relays"; +import { normalizeURL } from "applesauce-core/helpers/url"; import { useForm } from "react-hook-form"; import { RelayUrlInput } from "../../../components/relay-url-input"; -import { isSafeRelayURL } from "../../../../../applesauce/packages/core/dist/helpers/relays"; -import { normalizeURL } from "applesauce-core/helpers"; export default function AddRelayForm({ onSubmit,