From 1ad6192530ab865c921ab54c1c8a8f91a6bf6d2a Mon Sep 17 00:00:00 2001
From: Bojan Mojsilovic <bmojsilovic@itekako.com>
Date: Wed, 6 Dec 2023 17:49:09 +0100
Subject: [PATCH] First try fixing message duplication

---
 src/contexts/MessagesContext.tsx | 3 ++-
 src/pages/Messages.module.scss   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/contexts/MessagesContext.tsx b/src/contexts/MessagesContext.tsx
index acdad49e..e8e4bfc8 100644
--- a/src/contexts/MessagesContext.tsx
+++ b/src/contexts/MessagesContext.tsx
@@ -785,7 +785,8 @@ export const MessagesProvider = (props: { children: ContextChildren }) => {
       account?.hasPublicKey() &&
       store.selectedSender &&
       store.messageCountPerSender[store.selectedSender] &&
-      store.messageCountPerSender[store.selectedSender].cnt > 0
+      store.messageCountPerSender[store.selectedSender].cnt > 0,
+      store.isConversationLoaded
     ) {
 
       updateStore('encryptedMessages', () => []);
diff --git a/src/pages/Messages.module.scss b/src/pages/Messages.module.scss
index 2b317f0f..0fed2d32 100644
--- a/src/pages/Messages.module.scss
+++ b/src/pages/Messages.module.scss
@@ -170,8 +170,10 @@
       margin-bottom: 0px;
       align-items: center;
 
-      &:hover, &.selected {
+      &:hover, &.selected, &.focus {
         background-color: var(--background-input);
+        box-shadow: none;
+        outline: none;
       }
 
       .senderInfo {