From c997286340ea19219c5e3d9bd76b04bbe1395104 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Tue, 28 Jun 2022 13:22:10 +0100
Subject: [PATCH 1/2] patch: temporarily fix issue with public invites

---
 src/components/common/user/UserIcon.tsx | 3 ++-
 src/pages/invite/Invite.tsx             | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/common/user/UserIcon.tsx b/src/components/common/user/UserIcon.tsx
index c1eade4a..3c19ecdb 100644
--- a/src/components/common/user/UserIcon.tsx
+++ b/src/components/common/user/UserIcon.tsx
@@ -56,7 +56,8 @@ export default observer(
                 keyof Props | "children" | "as"
             >,
     ) => {
-        const client = useApplicationState().client!;
+        // ! TODO: this is temporary code
+        const client = useClient() ?? useApplicationState().client!;
 
         const {
             target,
diff --git a/src/pages/invite/Invite.tsx b/src/pages/invite/Invite.tsx
index b11f0d96..c92ae072 100644
--- a/src/pages/invite/Invite.tsx
+++ b/src/pages/invite/Invite.tsx
@@ -1,5 +1,4 @@
 import { ArrowBack } from "@styled-icons/boxicons-regular";
-import { autorun } from "mobx";
 import { Redirect, useHistory, useParams } from "react-router-dom";
 import { API } from "revolt.js";
 

From b53d3bce133d52b114739dd705727ef5a69c36ee Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Tue, 28 Jun 2022 13:23:45 +0100
Subject: [PATCH 2/2] fix: don't display date on ("new") message divider

---
 src/pages/channels/messaging/MessageRenderer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/channels/messaging/MessageRenderer.tsx b/src/pages/channels/messaging/MessageRenderer.tsx
index fd7aa7b9..b97fac8c 100644
--- a/src/pages/channels/messaging/MessageRenderer.tsx
+++ b/src/pages/channels/messaging/MessageRenderer.tsx
@@ -126,7 +126,7 @@ export default observer(({ last_id, renderer, highlight }: Props) => {
         if (unread || date) {
             render.push(
                 <MessageDivider
-                    date={dayjs(date).format("LL")}
+                    date={date ? dayjs(date).format("LL") : undefined}
                     unread={unread}
                 />,
             );