imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into gsouqet/ts-migration-1

Browse source
This commit is contained in:
Germain Souquet 2021-07-20 18:43:08 +02:00
commit efce2d16f1
313 changed files with 4352 additions and 2957 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.tsx
View file

@ -59,8 +59,8 @@ export default class DisableEventIndexDialog extends React.Component<IProps, ISt
public render(): React.ReactNode {
return (
<BaseDialog onFinished={this.props.onFinished} title={_t("Are you sure?")}>
{_t("If disabled, messages from encrypted rooms won't appear in search results.")}
{this.state.disabling ? <Spinner /> : <div />}
{ _t("If disabled, messages from encrypted rooms won't appear in search results.") }
{ this.state.disabling ? <Spinner /> : <div /> }
<DialogButtons
primaryButton={_t('Disable')}
onPrimaryButtonClick={this.onDisable}