Merge branch 'main' into HEAD

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

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={{