Skip to content

Commit

Permalink
Merge branch 'dev' into feat/unify-code-highlight
Browse files Browse the repository at this point in the history
  • Loading branch information
olafsulich authored Dec 18, 2024
2 parents fc0ba4d + ce3e833 commit f9b5527
Show file tree
Hide file tree
Showing 52 changed files with 618 additions and 280 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"@datadog/browser-logs": "5.33.0",
"@datadog/browser-rum": "5.33.0",
"@emotion/react": "11.11.4",
"@lexical/code": "0.20.2",
"@lexical/history": "0.20.2",
"@lexical/list": "0.20.2",
"@lexical/markdown": "0.20.2",
"@lexical/react": "0.20.2",
"@lexical/rich-text": "0.20.2",
"@lexical/code": "0.21.0",
"@lexical/history": "0.21.0",
"@lexical/list": "0.21.0",
"@lexical/markdown": "0.21.0",
"@lexical/react": "0.21.0",
"@lexical/rich-text": "0.21.0",
"@mediapipe/tasks-vision": "0.10.20",
"@wireapp/avs": "10.0.4",
"@wireapp/avs-debugger": "0.0.7",
Expand All @@ -34,7 +34,7 @@
"kalium-backup": "./TEMP-crossplatform-backup",
"keyboardjs": "2.7.0",
"knockout": "3.5.1",
"lexical": "0.20.2",
"lexical": "0.21.0",
"libsodium-wrappers": "0.7.15",
"linkify-it": "5.0.0",
"long": "5.2.3",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/ar-SA.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "شخص ما",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "اليوم",
"conversationToday": "today",
"conversationTweetAuthor": " على تويتر",
"conversationUnableToDecrypt1": "رسالة من {user} لم تُستقبل.",
"conversationUnableToDecrypt2": "[highlight]{user}[/highlight]´s device identity changed. Undelivered message.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/cs-CZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Někdo",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "dnes",
"conversationToday": "today",
"conversationTweetAuthor": " na Twittru",
"conversationUnableToDecrypt1": "zpráva od uživatele {user} nebyla přijata.",
"conversationUnableToDecrypt2": "Identita uživatele {user} se změnila. Zpráva nedoručena.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/da-DK.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Nogen",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "i dag",
"conversationToday": "today",
"conversationTweetAuthor": " på Twitter",
"conversationUnableToDecrypt1": "en besked fra {user} blev ikke modtaget.",
"conversationUnableToDecrypt2": "{user}’s enheds identitet er ændret. Uleveret besked.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/de-DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Jemand",
"conversationStartNewConversation": "Eine Gruppe erstellen",
"conversationTeamLeft": "[bold]{name}[/bold] wurde aus dem Team entfernt",
"conversationToday": "Heute",
"conversationToday": "today",
"conversationTweetAuthor": " auf Twitter",
"conversationUnableToDecrypt1": "Eine Nachricht von [highlight]{user}[/highlight] wurde nicht empfangen.",
"conversationUnableToDecrypt2": "[highlight]{users}s[/highlight] Geräte-Identität hat sich geändert. Nachricht kann nicht entschlüsselt werden.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/el-GR.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Κάποιος",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "σήμερα",
"conversationToday": "today",
"conversationTweetAuthor": " στο Twitter",
"conversationUnableToDecrypt1": "ένα μήνυμα από τον {user} δεν παρελήφθη.",
"conversationUnableToDecrypt2": "{user}´ς η ταυτότητα συσκευής άλλαξε. Ανεπίδοτο μήνυμα.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/es-ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Alguien",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] fue removido del equipo",
"conversationToday": "hoy",
"conversationToday": "today",
"conversationTweetAuthor": " en Twitter",
"conversationUnableToDecrypt1": "un mensaje de {user} no se ha recibido.",
"conversationUnableToDecrypt2": "La identidad del dispositivo de {user} ha cambiado. Mensaje no entregado.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/et-EE.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Keegi",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] eemaldati meeskonnast",
"conversationToday": "täna",
"conversationToday": "today",
"conversationTweetAuthor": " Twitteris",
"conversationUnableToDecrypt1": "Sõnumit kasutajalt [highlight]{user}[/highlight] ei võetud vastu.",
"conversationUnableToDecrypt2": "[highlight]{user}[/highlight] seadme identiteet muutus. Sõnumit ei saadetud.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/fa-IR.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "شخصی",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "امروز",
"conversationToday": "today",
"conversationTweetAuthor": " در توییتر",
"conversationUnableToDecrypt1": "یک پیام از {user} دریافت نشد.",
"conversationUnableToDecrypt2": "هویت دستگاه {user} تغییر یافته است. پیام تحویل داده نشده است.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/fi-FI.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Joku",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "tänään",
"conversationToday": "today",
"conversationTweetAuthor": " Twitterissä",
"conversationUnableToDecrypt1": "Käyttäjän {user} viesti ei tullut perille.",
"conversationUnableToDecrypt2": "Käyttäjän {user} laitteen identiteetti muuttui. Viestiä ei toimitettu.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Quelqu’un",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] a été retiré de l’équipe",
"conversationToday": "aujourd’hui",
"conversationToday": "today",
"conversationTweetAuthor": " via Twitter",
"conversationUnableToDecrypt1": "Un message de [highlight]{user}[/highlight] n’a pas été reçu.",
"conversationUnableToDecrypt2": "L’identité de l’appareil de {user} a changé. Message non délivré.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/hr-HR.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Netko",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] je uklonjen iz tima",
"conversationToday": "danas",
"conversationToday": "today",
"conversationTweetAuthor": " na Twitteru",
"conversationUnableToDecrypt1": "Poruka od [highlight]{user}[/highlight] nije zaprimljena.",
"conversationUnableToDecrypt2": "Identitet [highlight]{user}[/highlight] uređaja je promjenjen. Poruka nije dostavljena.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/hu-HU.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Valaki",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] eltávolítottuk a csapatból",
"conversationToday": "ma",
"conversationToday": "today",
"conversationTweetAuthor": " Twitteren",
"conversationUnableToDecrypt1": "Nem kaptál meg egy üzenetet tőle: {user}.",
"conversationUnableToDecrypt2": "{user} eszközének azonosítója megváltozott. Kézbesítetlen üzenet.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/id-ID.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Seseorang",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "hari ini",
"conversationToday": "today",
"conversationTweetAuthor": " di Twitter",
"conversationUnableToDecrypt1": "pesan dari {user} tidak diterima",
"conversationUnableToDecrypt2": "Identitas perangkat {user} berubah. Pesan tidak terkirim",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/it-IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Qualcuno",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "oggi",
"conversationToday": "today",
"conversationTweetAuthor": " su Twitter",
"conversationUnableToDecrypt1": "un messaggio da {user} non è stato ricevuto.",
"conversationUnableToDecrypt2": "L’identità dei dispositivi {user}´s è cambiata. Messaggi non consegnati.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "誰か",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] はチームから削除されました",
"conversationToday": "今日",
"conversationToday": "today",
"conversationTweetAuthor": " はツイッターにいます",
"conversationUnableToDecrypt1": "{user} からのメッセージが受信されませんでした",
"conversationUnableToDecrypt2": "{user} のデバイスIDが変更されました。メッセージは配信されません。",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/lt-LT.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Kažkas",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] buvo pašalintas (-a) iš komandos",
"conversationToday": "šiandien",
"conversationToday": "today",
"conversationTweetAuthor": " socialiniame tinkle Twitter",
"conversationUnableToDecrypt1": "žinutė nuo {user} nebuvo gauta.",
"conversationUnableToDecrypt2": "Pasikeitė {user} įrenginio tapatybė. Žinutė nepristatyta.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/nl-NL.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Iemand",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "vandaag",
"conversationToday": "today",
"conversationTweetAuthor": " op Twitter",
"conversationUnableToDecrypt1": "een bericht van {user} is niet ontvangen.",
"conversationUnableToDecrypt2": "{user}’s apparaatidentiteit is veranderd. Het bericht is niet afgeleverd.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/no-NO.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Noen",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "i dag",
"conversationToday": "today",
"conversationTweetAuthor": " på Twitter",
"conversationUnableToDecrypt1": "A message from [highlight]{user}[/highlight] was not received.",
"conversationUnableToDecrypt2": "[highlight]{user}[/highlight]´s device identity changed. Undelivered message.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/pl-PL.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Ktoś",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "dzisiaj",
"conversationToday": "today",
"conversationTweetAuthor": " na Twitterze",
"conversationUnableToDecrypt1": "wiadomość od {user} nie została dostarczona.",
"conversationUnableToDecrypt2": "Użytkownik {user} zmienił urządzenie. Wiadomość nie została dostarczona.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Alguém",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] foi removido da equipe",
"conversationToday": "hoje",
"conversationToday": "today",
"conversationTweetAuthor": " no Twitter",
"conversationUnableToDecrypt1": "Uma mensagem de [highlight]{user}[/highlight] não foi recebida.",
"conversationUnableToDecrypt2": "A identidade do dispositivo de [highlight]{user}[/highlight] foi alterada. Mensagem não entregue.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/pt-PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Alguém",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "hoje",
"conversationToday": "today",
"conversationTweetAuthor": " no Twitter",
"conversationUnableToDecrypt1": "não foi recebida uma mensagem de {user}.",
"conversationUnableToDecrypt2": "A identidade do dispositivo de {user} foi alterada. A mensagem não foi entregue.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/ro-RO.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Cineva",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "azi",
"conversationToday": "today",
"conversationTweetAuthor": " pe Twitter",
"conversationUnableToDecrypt1": "ai primit un mesaj de la {user}.",
"conversationUnableToDecrypt2": "identitatea dispozitivului lui {user} s-a schimbat. Mesajul nu a fost livrat.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/ru-RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Кто-то",
"conversationStartNewConversation": "Создать группу",
"conversationTeamLeft": "[bold]{name}[/bold] был удален из команды",
"conversationToday": "сегодня",
"conversationToday": "today",
"conversationTweetAuthor": " в Twitter",
"conversationUnableToDecrypt1": "Сообщение от [highlight]{user}[/highlight] не было получено.",
"conversationUnableToDecrypt2": "Идентификатор устройства [highlight]{user}[/highlight] изменился. Сообщение не доставлено.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/si-LK.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "යමෙක්",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] කණ්ඩායමෙන් ඉවත් කර ඇත",
"conversationToday": "අද",
"conversationToday": "today",
"conversationTweetAuthor": "ට්විටර් හි",
"conversationUnableToDecrypt1": "[highlight]{user}[/highlight] වෙතින් පණිවිඩයක් ලැබී නැත.",
"conversationUnableToDecrypt2": "[highlight]{user}[/highlight]ගේ උපාංගයේ අනන්‍යතාවය වෙනස් විය. බාර නොදුන් පණිවිඩයකි.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/sk-SK.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Niekto",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "dnes",
"conversationToday": "today",
"conversationTweetAuthor": " na Twitteri",
"conversationUnableToDecrypt1": "správa od {user} nebola prijatá.",
"conversationUnableToDecrypt2": "{user}´s zariadenie sa zmenilo. Nedoručená správa.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/sl-SI.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Nekdo",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "danes",
"conversationToday": "today",
"conversationTweetAuthor": " na Twitterju",
"conversationUnableToDecrypt1": "sporočilo od {user} ni bilo prejeto.",
"conversationUnableToDecrypt2": "Identita naprave od {user} je bila spremenjena. Sporočilo ni dostavljeno.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/sr-SP.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Неко",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] је уклоњен из тима",
"conversationToday": "данас",
"conversationToday": "today",
"conversationTweetAuthor": " на Твитеру",
"conversationUnableToDecrypt1": "Порука од [highlight]{user}[/highlight] није примљена.",
"conversationUnableToDecrypt2": "[highlight]{user}[/highlight]´s промењен је идентитет уређаја Неиспоручена порука.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/sv-SE.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Någon",
"conversationStartNewConversation": "Skapa en grupp",
"conversationTeamLeft": "[bold]{name}[/bold] togs bort från teamet",
"conversationToday": "idag",
"conversationToday": "today",
"conversationTweetAuthor": " på Twitter",
"conversationUnableToDecrypt1": "Ett meddelande från {user} tog inte emot.",
"conversationUnableToDecrypt2": "{user}\"s enhetsidentitet ändrades. Icke levererat meddelande.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/tr-TR.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Birisi",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] ekipten çıkarıldı",
"conversationToday": "bugün",
"conversationToday": "today",
"conversationTweetAuthor": " Twitter’da",
"conversationUnableToDecrypt1": "{user}’den gelen bir mesaj alınamadı.",
"conversationUnableToDecrypt2": "{user}’nin cihaz kimliği değişti. Teslim edilmemiş mesaj.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/uk-UA.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "Хтось",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] був(-ла) видалений(-а) з команди",
"conversationToday": "сьогодні",
"conversationToday": "today",
"conversationTweetAuthor": " в Twitter",
"conversationUnableToDecrypt1": "Повідомлення від [highlight]{user}[/highlight] не отримане.",
"conversationUnableToDecrypt2": "Ідентифікатор пристрою [highlight]{user}[/highlight] змінився. Повідомлення не доставлене.",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "某人",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] 已从团队删除",
"conversationToday": "今天",
"conversationToday": "today",
"conversationTweetAuthor": " 在 Twitter 上",
"conversationUnableToDecrypt1": "一条来自 {user} 的消息未被接收。",
"conversationUnableToDecrypt2": "{user} 的设备指纹已改变。该消息未送达。",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"conversationSomeone": "有人",
"conversationStartNewConversation": "Create a Group",
"conversationTeamLeft": "[bold]{name}[/bold] was removed from the team",
"conversationToday": "今天",
"conversationToday": "today",
"conversationTweetAuthor": " 在推特上",
"conversationUnableToDecrypt1": "有一個來自 {user} 的訊息未被接收。",
"conversationUnableToDecrypt2": "{user} 的設備識別碼改變了,訊息無法送達。",
Expand Down
2 changes: 1 addition & 1 deletion src/script/Config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const config = {
MIN_TEAM_CREATION_SUPPORTED_API_VERSION: 7,

/** Image MIME types */
ALLOWED_IMAGE_TYPES: ['image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/png'],
ALLOWED_IMAGE_TYPES: ['image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/png', 'image/webp'],

/** Which min and max version of the backend api do we support */
SUPPORTED_API_RANGE: [1, env.ENABLE_DEV_BACKEND_API ? Infinity : 7],
Expand Down
6 changes: 3 additions & 3 deletions src/script/client/ClientEntity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import {ClientRecord} from '../storage';
export const MLSPublicKeys = {
ed25519: 'ED25519',
ed448: 'ED448',
ecdsa_secp521r1_sha512: 'EDCSA_SECP521R1_SHA512',
ecdsa_secp384r1_sha384: 'EDCSA_SECP384R1_SHA384',
ecdsa_secp256r1_sha256: 'EDCSA_SECP256R1_SHA256',
ecdsa_secp521r1_sha512: 'P521',
ecdsa_secp384r1_sha384: 'P384',
ecdsa_secp256r1_sha256: 'P256',
} as const;

export const isKnownSignature = (signature: unknown): signature is keyof typeof MLSPublicKeys =>
Expand Down
24 changes: 15 additions & 9 deletions src/script/components/InputBar/InputBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ export const InputBar = ({

const enableSending = textValue.length > 0;

const showAvatar = messageFormatButtonsEnabled || !!textValue.length;
const showAvatar = !!textValue.length;

return (
<div ref={wrapperRef}>
Expand Down Expand Up @@ -627,14 +627,20 @@ export const InputBar = ({
onSend={handleSendMessage}
onBlur={() => isTypingRef.current && conversationRepository.sendTypingStop(conversation)}
>
<ul
className={cx('controls-right buttons-group input-bar-buttons', {
'controls-right-shrinked': textValue.length !== 0,
})}
>
<ControlButtons {...controlButtonsProps} showGiphyButton={showGiphyButton} />
<SendMessageButton disabled={!enableSending} onSend={handleSendMessage} />
</ul>
<div className="input-bar-buttons">
<ul
className={cx('controls-right buttons-group input-bar-buttons__list', {
'controls-right-shrinked': textValue.length !== 0,
})}
>
<ControlButtons {...controlButtonsProps} showGiphyButton={showGiphyButton} />
</ul>
<SendMessageButton
disabled={!enableSending}
onSend={handleSendMessage}
className="input-bar-buttons__send"
/>
</div>
</RichTextEditor>
)}
</>
Expand Down
Loading

0 comments on commit f9b5527

Please sign in to comment.