Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-04-06 07:20:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/livekit' into hs/emoji-reactions

Browse Source
This commit is contained in:
Half-Shot
2024-11-08 16:20:42 +00:00
parent 31bf036aa1 5b94dd6f1a
commit 1a95c576e0
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tile/MediaView.tsx
View File

@@ -116,7 +116,8 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
/>
)}
</div>
{encryptionStatus !== EncryptionStatus.Okay && (
{/* TODO: Bring this back once encryption status is less broken */}
{/*encryptionStatus !== EncryptionStatus.Okay && (
<div className={styles.status}>
<Text as="span" size="sm" weight="medium" className={styles.name}>
{encryptionStatus === EncryptionStatus.Connecting &&
@@ -129,7 +130,7 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
t("e2ee_encryption_status.password_invalid")}
</Text>
</div>
)}
)*/}
<div className={styles.nameTag}>
{nameTagLeadingIcon}
<Text as="span" size="sm" weight="medium" className={styles.name}>