mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Merge branch 'main' into HEAD

Browse source
This commit is contained in:
Scott Nonnenberg 2024-07-30 15:53:28 -07:00
commit fed6bbfc8b
1127 changed files with 263697 additions and 302446 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ts/components/leftPane/LeftPaneChooseGroupMembersHelper.tsx
View file

@ -228,7 +228,7 @@ export class LeftPaneChooseGroupMembersHelper extends LeftPaneHelper<LeftPaneCho
<ContactPill
key={contact.id}
acceptedMessageRequest={contact.acceptedMessageRequest}
avatarPath={contact.avatarPath}
avatarUrl={contact.avatarUrl}
color={contact.color}
firstName={contact.systemGivenName ?? contact.firstName}
i18n={i18n}

4
ts/components/leftPane/LeftPaneInboxHelper.tsx
View file

@ -5,7 +5,7 @@ import { last } from 'lodash';
import type { ReactChild } from 'react';
import React from 'react';
import { Intl } from '../Intl';
import { I18n } from '../I18n';
import type { ToFindType } from './LeftPaneHelper';
import type {
ConversationType,
@ -130,7 +130,7 @@ export class LeftPaneInboxHelper extends LeftPaneHelper<LeftPaneInboxPropsType>
return (
<div className="module-left-pane__empty">
<div>
<Intl
<I18n
i18n={i18n}
id="icu:emptyInboxMessage"
components={{

4
ts/components/leftPane/LeftPaneSearchHelper.tsx
View file

@ -17,7 +17,7 @@ import type {
} from '../../state/ducks/conversations';
import { LeftPaneSearchInput } from '../LeftPaneSearchInput';
import { Intl } from '../Intl';
import { I18n } from '../I18n';
import { assertDev } from '../../util/assert';
import { UserText } from '../UserText';
@ -159,7 +159,7 @@ export class LeftPaneSearchHelper extends LeftPaneHelper<LeftPaneSearchPropsType
let noResults: ReactChild;
if (searchConversationName) {
noResults = (
<Intl
<I18n
id="icu:noSearchResultsInConversation"
i18n={i18n}
components={{