Skip to content

Commit

Permalink
Merge pull request #2736 from robintown/disable-encryption-status
Browse files Browse the repository at this point in the history
Disable the encryption status indicators
  • Loading branch information
robintown authored Nov 8, 2024
2 parents f4096a6 + 0ffb4cc commit 5b94dd6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
6 changes: 0 additions & 6 deletions public/locales/en-GB/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,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": {
Expand Down
5 changes: 3 additions & 2 deletions src/tile/MediaView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
)}
</div>
<div className={styles.fg}>
{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 &&
Expand All @@ -111,7 +112,7 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
t("e2ee_encryption_status.password_invalid")}
</Text>
</div>
)}
)*/}
<RaisedHandIndicator
raisedHandTime={raisedHandTime}
miniature={avatarSize < 96}
Expand Down

0 comments on commit 5b94dd6

Please sign in to comment.