Fix more imports post-merge

This commit is contained in:
Travis Ralston 2020-01-09 14:16:32 -07:00
parent dc914774fb
commit 135c84251c
9 changed files with 15 additions and 16 deletions

View file

@ -17,7 +17,7 @@ limitations under the License.
import React, {useCallback} from "react";
import PropTypes from "prop-types";
import sdk from "../../../index";
import * as sdk from "../../../index";
import {_t} from "../../../languageHandler";
import Modal from "../../../Modal";

View file

@ -20,7 +20,7 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
import Field from "../elements/Field";
import {User} from "matrix-js-sdk";
import { getHostingLink } from '../../../utils/HostingLink';
import sdk from "../../../index";
import * as sdk from "../../../index";
export default class ProfileSettings extends React.Component {
constructor() {

View file

@ -17,11 +17,11 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import {_t} from "../../../../../languageHandler";
import MatrixClientPeg from "../../../../../MatrixClientPeg";
import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
import Pill from "../../../elements/Pill";
import {makeUserPermalink} from "../../../../../utils/permalinks/Permalinks";
import BaseAvatar from "../../../avatars/BaseAvatar";
import { ContentRepo } from "matrix-js-sdk";
import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
const BRIDGE_EVENT_TYPES = [
"uk.half-shot.bridge",
@ -83,7 +83,7 @@ export default class BridgeSettingsTab extends React.Component {
let networkIcon = null;
if (networkName && network.avatar) {
const avatarUrl = ContentRepo.getHttpUriForMxc(
const avatarUrl = getHttpUriForMxc(
MatrixClientPeg.get().getHomeserverUrl(),
network.avatar, 32, 32, "crop",
);
@ -99,7 +99,7 @@ export default class BridgeSettingsTab extends React.Component {
let channelIcon = null;
if (channel.avatar) {
const avatarUrl = ContentRepo.getHttpUriForMxc(
const avatarUrl = getHttpUriForMxc(
MatrixClientPeg.get().getHomeserverUrl(),
channel.avatar, 32, 32, "crop",
);