diff --git a/src/components/layout/Misc.tsx b/src/components/layout/Misc.tsx
index 6f998302..e2df53e3 100644
--- a/src/components/layout/Misc.tsx
+++ b/src/components/layout/Misc.tsx
@@ -152,7 +152,7 @@ export const FullscreenLoader = () => {
{i18n.t("error.load_time.stuck")}{" "}
-
+
{i18n.t("error.emergency_link")}
diff --git a/src/root.tsx b/src/root.tsx
index b1c96e0b..c95dcf83 100644
--- a/src/root.tsx
+++ b/src/root.tsx
@@ -76,11 +76,15 @@ export default function Root() {
}>
-
-
-
-
-
+
+
+ }
+ >
+
+
+
+
diff --git a/src/utils/fetchZaps.ts b/src/utils/fetchZaps.ts
index 7c45139b..9fb6d80d 100644
--- a/src/utils/fetchZaps.ts
+++ b/src/utils/fetchZaps.ts
@@ -1,14 +1,14 @@
import { MutinyWallet } from "@mutinywallet/mutiny-wasm";
-import { NDKKind, NDKTag, NDKUser } from "@nostr-dev-kit/ndk";
import { ResourceFetcher } from "solid-js";
import { useMegaStore } from "~/state/megaStore";
+import { hexpubFromNpub, NostrKind, NostrTag } from "~/utils/nostr";
export type NostrEvent = {
created_at: number;
content: string;
- tags: NDKTag[];
- kind?: NDKKind | number;
+ tags: NostrTag[];
+ kind?: NostrKind | number;
pubkey: string;
id?: string;
sig?: string;
@@ -116,12 +116,6 @@ async function simpleZapFromEvent(
const PRIMAL_API = import.meta.env.VITE_PRIMAL;
-export function getHexpubFromNpub(npub?: string) {
- if (!npub) return;
- const user = new NDKUser({ npub });
- return user.hexpubkey();
-}
-
export const fetchZaps: ResourceFetcher<
string,
{
@@ -143,7 +137,13 @@ export const fetchZaps: ResourceFetcher<
// Only have to ask the relays for follows one time
if (follows.length === 0) {
- const pubkey = getHexpubFromNpub(npub);
+ let pubkey = undefined;
+ try {
+ pubkey = await hexpubFromNpub(npub);
+ } catch (err) {
+ console.error("Failed to get hexpub from npub");
+ throw err;
+ }
const response = await fetch(PRIMAL_API, {
method: "POST",
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 567df09d..daf031e5 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -17,3 +17,4 @@ export * from "./words";
export * from "./fetchZaps";
export * from "./vibrate";
export * from "./openLinkProgrammatically";
+export * from "./nostr";
diff --git a/src/utils/nostr.ts b/src/utils/nostr.ts
new file mode 100644
index 00000000..3c376901
--- /dev/null
+++ b/src/utils/nostr.ts
@@ -0,0 +1,61 @@
+import { MutinyWallet } from "@mutinywallet/mutiny-wasm";
+
+export type NostrTag = string[];
+export declare enum NostrKind {
+ Metadata = 0,
+ Text = 1,
+ RecommendRelay = 2,
+ Contacts = 3,
+ EncryptedDirectMessage = 4,
+ EventDeletion = 5,
+ Repost = 6,
+ Reaction = 7,
+ BadgeAward = 8,
+ GenericRepost = 16,
+ ChannelCreation = 40,
+ ChannelMetadata = 41,
+ ChannelMessage = 42,
+ ChannelHideMessage = 43,
+ ChannelMuteUser = 44,
+ Report = 1984,
+ ZapRequest = 9734,
+ Zap = 9735,
+ Highlight = 9802,
+ MuteList = 10000,
+ PinList = 10001,
+ RelayList = 10002,
+ ClientAuth = 22242,
+ NostrConnect = 24133,
+ CategorizedPeopleList = 30000,
+ CategorizedBookmarkList = 30001,
+ CategorizedRelayList = 30022,
+ ProfileBadge = 30008,
+ BadgeDefinition = 30009,
+ MarketStall = 30017,
+ MarketProduct = 30018,
+ Article = 30023,
+ AppSpecificData = 30078,
+ Classified = 30402,
+ AppRecommendation = 31989,
+ AppHandler = 31990,
+ CategorizedHighlightList = 39802,
+ DVMJobFeedback = 65000,
+ DVMJobResult = 65001,
+ DVMJobRequestTranscription = 65002
+}
+
+export async function hexpubFromNpub(
+ npub: string
+): Promise {
+ if (!npub.toLowerCase().startsWith("npub")) {
+ return undefined;
+ }
+
+ try {
+ const hexpub = await MutinyWallet.npub_to_hexpub(npub);
+ return hexpub;
+ } catch (err) {
+ console.error(err);
+ return undefined;
+ }
+}