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

public/locales/en-GB/app.json

@@ -72,12 +72,6 @@
   "crypto_version": "Crypto version: {{version}}",
   "device_id": "Device ID: {{id}}",
   "disconnected_banner": "Connectivity to the server has been lost.",
-  "e2ee_encryption_status": {
-    "connecting": "Connecting...",
-    "key_invalid": "The end-to-end encrypted media key for this person is invalid",
-    "key_missing": "You haven't received the current end-to-end encrypted media key for this person yet",
-    "password_invalid": "This person is using a different password so you won't be able to communicate with them"
-  },
   "full_screen_view_description": "<0>Submitting debug logs will help us track down the problem.</0>",
   "full_screen_view_h1": "<0>Oops, something's gone wrong.</0>",
   "group_call_loader": {

src/tile/MediaView.tsx

@@ -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}>