diff --git a/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx b/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx index 8372ca305..facc13581 100644 --- a/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx +++ b/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx @@ -391,6 +391,7 @@ const ChatViewListCard = styled(Section)` ` filter: blur(12px); `} + overscroll-behavior: contain; `; const Overlay = styled.div``; diff --git a/packages/uiweb/src/lib/components/chat/ChatViewList/MessageEncryption.tsx b/packages/uiweb/src/lib/components/chat/ChatViewList/MessageEncryption.tsx index 2a47d2bc3..74e307637 100644 --- a/packages/uiweb/src/lib/components/chat/ChatViewList/MessageEncryption.tsx +++ b/packages/uiweb/src/lib/components/chat/ChatViewList/MessageEncryption.tsx @@ -14,7 +14,6 @@ export const ENCRYPTION_KEYS = { export type EncryptionKeys = (typeof ENCRYPTION_KEYS)[keyof typeof ENCRYPTION_KEYS]; - const EncryptionMessageContent = { ENCRYPTED: { IconComponent: , @@ -29,6 +28,7 @@ const EncryptionMessageContent = { IconComponent: , text: `Messages in this group are not encrypted`, }, + }; export const EncryptionMessage = ({ id }: { id: EncryptionKeys}) => { const theme = useContext(ThemeContext); diff --git a/packages/uiweb/src/lib/hooks/chat/usePushSendMessage.ts b/packages/uiweb/src/lib/hooks/chat/usePushSendMessage.ts index 4de824bf0..5e1e2de78 100644 --- a/packages/uiweb/src/lib/hooks/chat/usePushSendMessage.ts +++ b/packages/uiweb/src/lib/hooks/chat/usePushSendMessage.ts @@ -15,8 +15,7 @@ const usePushSendMessage = () => { const [error, setError] = useState(); const [loading, setLoading] = useState(false); - const { verificationSuccessfull, setVerificationSuccessfull, setVerified } = - useVerifyAccessControl(); + const { pgpPrivateKey, env, account } = useChatData(); const sendMessage = useCallback( diff --git a/packages/uiweb/src/lib/hooks/chat/useVerifyAccessControl.ts b/packages/uiweb/src/lib/hooks/chat/useVerifyAccessControl.ts index 957ccaf4e..fbdf1d484 100644 --- a/packages/uiweb/src/lib/hooks/chat/useVerifyAccessControl.ts +++ b/packages/uiweb/src/lib/hooks/chat/useVerifyAccessControl.ts @@ -12,11 +12,13 @@ interface VerifyAccessControlParams { const useVerifyAccessControl = () => { const [error, setError] = useState(); const [loading, setLoading] = useState(false); + console.log('in hereeeeeee'); const [verificationSuccessfull, setVerificationSuccessfull] = useState(true); const [verified, setVerified] = useState(false); const { pgpPrivateKey, env, account } = useChatData(); + console.log(verificationSuccessfull); const verifyAccessControl = useCallback( async (options: VerifyAccessControlParams) => { @@ -51,6 +53,7 @@ const useVerifyAccessControl = () => { }, [pgpPrivateKey, account, env] ); + return { verifyAccessControl, error,