fix: fixed verification on send

push-protocol · Aug 24, 2023 · e63777f · e63777f
1 parent 064f01d
commit e63777f
Show file tree

Hide file tree

Showing 6 changed files with 527 additions and 544 deletions.
diff --git a/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx b/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx
@@ -27,7 +27,7 @@ import { ThemeContext } from '../theme/ThemeProvider';
 import { IChatTheme } from '../theme';
 import useFetchConversationHash from '../../../hooks/chat/useFetchConversationHash';
 
-import { EncryptionMessage } from './MessageEncryption';
+import { ENCRYPTION_KEYS, EncryptionMessage } from './MessageEncryption';
 import useGetGroup from '../../../hooks/chat/useGetGroup';
 import useGetChatProfile from '../../../hooks/useGetChatProfile';
 import useFetchChat from '../../../hooks/chat/useFetchChat';
@@ -308,9 +308,9 @@ export const ChatViewList: React.FC<IChatViewListProps> = (
           (chatFeed.publicKey ||
             (chatFeed?.groupInformation &&
               !chatFeed?.groupInformation?.isPublic)) ? (
-            <EncryptionMessage id={'ENCRYPTED'} />
+            <EncryptionMessage id={ENCRYPTION_KEYS.ENCRYPTED} />
           ) : (
-            <EncryptionMessage id={'NO_ENCRYPTED'} />
+            <EncryptionMessage id={chatFeed?.groupInformation?ENCRYPTION_KEYS.NO_ENCRYPTED_GROUP:ENCRYPTION_KEYS.NO_ENCRYPTED} />
           )}
 
           {chatStatusText && (

diff --git a/packages/uiweb/src/lib/components/chat/ChatViewList/MessageEncryption.tsx b/packages/uiweb/src/lib/components/chat/ChatViewList/MessageEncryption.tsx
@@ -6,6 +6,14 @@ import { ThemeContext } from "../theme/ThemeProvider";
 import { NoEncryptionIcon } from "../../../icons/NoEncryption";
 import { EncryptionIcon } from "../../../icons/Encryption";
 
+export const ENCRYPTION_KEYS = {
+  ENCRYPTED: 'ENCRYPTED',
+  NO_ENCRYPTED: 'NO_ENCRYPTED',
+  NO_ENCRYPTED_GROUP: 'NO_ENCRYPTED_GROUP'
+} as const;
+
+export type EncryptionKeys = (typeof ENCRYPTION_KEYS)[keyof typeof ENCRYPTION_KEYS];
+
 const EncryptionMessageContent = {
     ENCRYPTED: {
       IconComponent: <EncryptionIcon size="15" />,
@@ -15,8 +23,14 @@ const EncryptionMessageContent = {
       IconComponent: <NoEncryptionIcon size="15" />,
       text: `Messages are not encrypted`,
     },
+    NO_ENCRYPTED_GROUP: {
+      IconComponent: <NoEncryptionIcon size="15" />,
+      text: `Messages in this group are not encrypted`,
+    },
   };
- export const EncryptionMessage = ({ id }: { id: 'ENCRYPTED' | 'NO_ENCRYPTED' }) => {
+
+
+ export const EncryptionMessage = ({ id }: { id: EncryptionKeys}) => {
     console.log(id)
     const theme = useContext(ThemeContext);
     const isMobile = useDeviceWidthCheck(771);