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

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