From b41ec353c6908cbc4a54e35614384d3d5720583e Mon Sep 17 00:00:00 2001
From: reya <reya@lume.nu>
Date: Thu, 16 Nov 2023 07:59:29 +0700
Subject: [PATCH] improve relay connection

---
 src/app/relays/relay.tsx     |  6 ++++--
 src/libs/ndk/provider.tsx    |  4 ++--
 src/libs/storage/instance.ts |  2 +-
 src/shared/notes/notify.tsx  |  2 +-
 src/utils/types.d.ts         | 19 +++++++++++++++++++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/app/relays/relay.tsx b/src/app/relays/relay.tsx
index 76360cf3..91ddcdc3 100644
--- a/src/app/relays/relay.tsx
+++ b/src/app/relays/relay.tsx
@@ -4,6 +4,8 @@ import { Await, useLoaderData, useNavigate, useParams } from 'react-router-dom';
 import { ArrowLeftIcon, LoaderIcon } from '@shared/icons';
 import { User } from '@shared/user';
 
+import { NIP11 } from '@utils/types';
+
 import { RelayEventList } from './components/relayEventList';
 
 export function RelayScreen() {
@@ -59,7 +61,7 @@ export function RelayScreen() {
                 </div>
               }
             >
-              {(resolvedRelay) => (
+              {(resolvedRelay: NIP11) => (
                 <div className="flex flex-col gap-5">
                   <div>
                     <h3 className="font-semibold leading-tight text-neutral-900 dark:text-neutral-100">
@@ -114,7 +116,7 @@ export function RelayScreen() {
                       Supported NIPs:
                     </h5>
                     <div className="mt-2 grid grid-cols-7 gap-2">
-                      {resolvedRelay.supported_nips.map((item: string) => (
+                      {resolvedRelay.supported_nips.map((item) => (
                         <a
                           key={item}
                           href={`https://nips.be/${item}`}
diff --git a/src/libs/ndk/provider.tsx b/src/libs/ndk/provider.tsx
index 136c5fa5..9fbaff12 100644
--- a/src/libs/ndk/provider.tsx
+++ b/src/libs/ndk/provider.tsx
@@ -12,14 +12,14 @@ import { QUOTES } from '@stores/constants';
 
 interface NDKContext {
   ndk: undefined | NDK;
+  fetcher: undefined | NostrFetcher;
   relayUrls: string[];
-  fetcher: NostrFetcher;
 }
 
 const NDKContext = createContext<NDKContext>({
   ndk: undefined,
-  relayUrls: [],
   fetcher: undefined,
+  relayUrls: [],
 });
 
 const NDKProvider = ({ children }: PropsWithChildren<object>) => {
diff --git a/src/libs/storage/instance.ts b/src/libs/storage/instance.ts
index 3e7a0250..071e2555 100644
--- a/src/libs/storage/instance.ts
+++ b/src/libs/storage/instance.ts
@@ -406,7 +406,7 @@ export class LumeStorage {
       `SELECT * FROM relays WHERE account_id = "${this.account.id}" ORDER BY id DESC LIMIT 50;`
     );
 
-    if (!result || result.length < 1) return FULL_RELAYS;
+    if (!result || !result.length) return FULL_RELAYS;
     return result.map((el) => el.relay);
   }
 
diff --git a/src/shared/notes/notify.tsx b/src/shared/notes/notify.tsx
index 2f7480f8..aaf54b18 100644
--- a/src/shared/notes/notify.tsx
+++ b/src/shared/notes/notify.tsx
@@ -86,7 +86,7 @@ export function NotifyNote({ event }: { event: NDKEvent }) {
           </div>
         </div>
         <div className="flex gap-2">
-          <div className="flex-1">{renderKind(data)}</div>
+          <div className="flex-1">{data ? renderKind(data) : <p>Loading...</p>}</div>
           <button
             type="button"
             onClick={() =>
diff --git a/src/utils/types.d.ts b/src/utils/types.d.ts
index f6315707..7a0bf0ba 100644
--- a/src/utils/types.d.ts
+++ b/src/utils/types.d.ts
@@ -139,3 +139,22 @@ export interface NDKCacheEventTag {
   value: string;
   tagValue: string;
 }
+
+export interface NIP11 {
+  name: string;
+  description: string;
+  pubkey: string;
+  contact: string;
+  supported_nips: number[];
+  software: string;
+  version: string;
+  limitation: {
+    [key: string]: string | number | boolean;
+  };
+  relay_countries: string[];
+  language_tags: string[];
+  tags: string[];
+  posting_policy: string;
+  payments_url: string;
+  icon: string[];
+}