Merge remote-tracking branch 'aaronraimist/sort-imports' into develop

This commit is contained in:
Travis Ralston 2021-12-09 16:03:59 -07:00
commit e4b96cff1f
553 changed files with 1097 additions and 915 deletions

View file

@ -15,6 +15,8 @@ limitations under the License.
*/
import React, { createRef } from 'react';
import { logger } from "matrix-js-sdk/src/logger";
import { _t } from "../../../languageHandler";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
import Field from "../elements/Field";
@ -27,9 +29,7 @@ import { mediaFromMxc } from "../../../customisations/Media";
import AccessibleButton from '../elements/AccessibleButton';
import AvatarSetting from './AvatarSetting';
import { logger } from "matrix-js-sdk/src/logger";
import ExternalLink from '../elements/ExternalLink';
interface IState {
userId?: string;
originalDisplayName?: string;