From 02b8374adfc4753ca0f81b5f2206c1a206268f00 Mon Sep 17 00:00:00 2001
From: hzrd149 <github@hzrd149.com>
Date: Sat, 28 Oct 2023 11:38:57 -0500
Subject: [PATCH 1/2] Fix community join button "no account" error

---
 .changeset/twenty-turkeys-push.md                            | 5 +++++
 ...munity-subscribe-button.tsx => community-join-button.tsx} | 2 +-
 .../community/components/horizonal-community-details.tsx     | 2 +-
 .../community/components/vertical-community-details.tsx      | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/twenty-turkeys-push.md
 rename src/views/communities/components/{community-subscribe-button.tsx => community-join-button.tsx} (97%)

diff --git a/.changeset/twenty-turkeys-push.md b/.changeset/twenty-turkeys-push.md
new file mode 100644
index 000000000..7f0aedefb
--- /dev/null
+++ b/.changeset/twenty-turkeys-push.md
@@ -0,0 +1,5 @@
+---
+"nostrudel": patch
+---
+
+Fix community join button "no account" error
diff --git a/src/views/communities/components/community-subscribe-button.tsx b/src/views/communities/components/community-join-button.tsx
similarity index 97%
rename from src/views/communities/components/community-subscribe-button.tsx
rename to src/views/communities/components/community-join-button.tsx
index 4a9125863..f25d8d0bf 100644
--- a/src/views/communities/components/community-subscribe-button.tsx
+++ b/src/views/communities/components/community-join-button.tsx
@@ -47,7 +47,7 @@ export default function CommunityJoinButton({
     } catch (e) {
       if (e instanceof Error) toast({ description: e.message, status: "error" });
     }
-  }, [isSubscribed, list, community]);
+  }, [isSubscribed, list, community, requestSignature, toast]);
 
   return (
     <Button
diff --git a/src/views/community/components/horizonal-community-details.tsx b/src/views/community/components/horizonal-community-details.tsx
index cece77633..7a6829081 100644
--- a/src/views/community/components/horizonal-community-details.tsx
+++ b/src/views/community/components/horizonal-community-details.tsx
@@ -25,7 +25,7 @@ import CommunityDescription from "../../communities/components/community-descrip
 import UserAvatarLink from "../../../components/user-avatar-link";
 import { UserLink } from "../../../components/user-link";
 import { NostrEvent } from "../../../types/nostr-event";
-import CommunityJoinButton from "../../communities/components/community-subscribe-button";
+import CommunityJoinButton from "../../communities/components/community-join-button";
 import CommunityMenu from "./community-menu";
 import useCountCommunityMembers from "../../../hooks/use-count-community-members";
 import { readablizeSats } from "../../../helpers/bolt11";
diff --git a/src/views/community/components/vertical-community-details.tsx b/src/views/community/components/vertical-community-details.tsx
index 901162fb9..923eb6852 100644
--- a/src/views/community/components/vertical-community-details.tsx
+++ b/src/views/community/components/vertical-community-details.tsx
@@ -12,7 +12,7 @@ import CommunityDescription from "../../communities/components/community-descrip
 import UserAvatarLink from "../../../components/user-avatar-link";
 import { UserLink } from "../../../components/user-link";
 import { NostrEvent } from "../../../types/nostr-event";
-import CommunityJoinButton from "../../communities/components/community-subscribe-button";
+import CommunityJoinButton from "../../communities/components/community-join-button";
 import CommunityMenu from "./community-menu";
 import useCountCommunityMembers from "../../../hooks/use-count-community-members";
 import CommunityMembersModal from "./community-members-modal";

From 5c036fffe64cdd156d23b731790c69590507a6db Mon Sep 17 00:00:00 2001
From: hzrd149 <github@hzrd149.com>
Date: Sat, 28 Oct 2023 11:48:08 -0500
Subject: [PATCH 2/2] small fixes

---
 .changeset/dull-cycles-look.md    |  5 +++++
 .changeset/itchy-penguins-care.md |  5 +++++
 src/services/db/index.ts          | 19 ++++++++++++++++++-
 src/views/messages/chat.tsx       |  5 +++--
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/dull-cycles-look.md
 create mode 100644 .changeset/itchy-penguins-care.md

diff --git a/.changeset/dull-cycles-look.md b/.changeset/dull-cycles-look.md
new file mode 100644
index 000000000..fad679039
--- /dev/null
+++ b/.changeset/dull-cycles-look.md
@@ -0,0 +1,5 @@
+---
+"nostrudel": patch
+---
+
+Fix error when clearing database cache
diff --git a/.changeset/itchy-penguins-care.md b/.changeset/itchy-penguins-care.md
new file mode 100644
index 000000000..860aae454
--- /dev/null
+++ b/.changeset/itchy-penguins-care.md
@@ -0,0 +1,5 @@
+---
+"nostrudel": patch
+---
+
+Fix scrolling in direct messages view
diff --git a/src/services/db/index.ts b/src/services/db/index.ts
index 2e878512e..c4316fb9b 100644
--- a/src/services/db/index.ts
+++ b/src/services/db/index.ts
@@ -1,5 +1,8 @@
 import { openDB, deleteDB, IDBPDatabase } from "idb";
 import { SchemaV1, SchemaV2, SchemaV3, SchemaV4 } from "./schema";
+import { logger } from "../../helpers/debug";
+
+const log = logger.extend("Database");
 
 const dbName = "storage";
 const version = 4;
@@ -87,17 +90,31 @@ const db = await openDB<SchemaV4>(dbName, version, {
   },
 });
 
+log("Open");
+
 export async function clearCacheData() {
+  log("Clearing replaceableEvents");
   await db.clear("replaceableEvents");
-  await db.clear("userFollows");
+
+  log("Clearing userSearch");
+  await db.clear("userSearch");
+
+  log("Clearing relayInfo");
   await db.clear("relayInfo");
+
+  log("Clearing dnsIdentifiers");
   await db.clear("dnsIdentifiers");
+
+  log("Clearing relayScoreboardStats");
   await db.clear("relayScoreboardStats");
+
   window.location.reload();
 }
 
 export async function deleteDatabase() {
+  log("Closing");
   db.close();
+  log("Deleting");
   await deleteDB(dbName);
   window.location.reload();
 }
diff --git a/src/views/messages/chat.tsx b/src/views/messages/chat.tsx
index 1e4e3c7f8..7152b3407 100644
--- a/src/views/messages/chat.tsx
+++ b/src/views/messages/chat.tsx
@@ -22,6 +22,7 @@ import { useTimelineCurserIntersectionCallback } from "../../hooks/use-timeline-
 import TimelineActionAndStatus from "../../components/timeline-page/timeline-action-and-status";
 import NostrPublishAction from "../../classes/nostr-publish-action";
 import { LightboxProvider } from "../../components/lightbox-provider";
+import VerticalPageLayout from "../../components/vertical-page-layout";
 
 function DirectMessageChatPage({ pubkey }: { pubkey: string }) {
   const toast = useToast();
@@ -71,7 +72,7 @@ function DirectMessageChatPage({ pubkey }: { pubkey: string }) {
   return (
     <LightboxProvider>
       <IntersectionObserverProvider callback={callback}>
-        <Flex height="100%" overflow="hidden" direction="column">
+        <Flex maxH={{ base: "calc(100vh - 3.5rem)", md: "100vh" }} overflow="hidden" direction="column">
           <Card size="sm" flexShrink={0}>
             <CardBody display="flex" gap="2" alignItems="center">
               <IconButton variant="ghost" icon={<ChevronLeftIcon />} aria-label="Back" onClick={() => navigate(-1)} />
@@ -79,7 +80,7 @@ function DirectMessageChatPage({ pubkey }: { pubkey: string }) {
               <UserLink pubkey={pubkey} />
             </CardBody>
           </Card>
-          <Flex flex={1} overflowX="hidden" overflowY="scroll" direction="column-reverse" gap="2" py="4" px="2">
+          <Flex h="0" flex={1} overflowX="hidden" overflowY="scroll" direction="column-reverse" gap="2" py="4" px="2">
             {[...messages].map((event) => (
               <Message key={event.id} event={event} />
             ))}