First try fixing message duplication

PrimalHQ · Dec 6, 2023 · 1ad6192 · 1ad6192
1 parent bd02107
commit 1ad6192
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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 {