From c5e578a50246c435695afb99e68434db702632cc Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Mon, 30 Nov 2020 13:07:12 +0000 Subject: [PATCH] linting --- src/components/views/settings/BridgeTile.tsx | 14 ++++++++++---- src/utils/replaceableComponent.ts | 3 +-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/components/views/settings/BridgeTile.tsx b/src/components/views/settings/BridgeTile.tsx index 67f0eb7802..1f5448dcc1 100644 --- a/src/components/views/settings/BridgeTile.tsx +++ b/src/components/views/settings/BridgeTile.tsx @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React, { ReactNode } from 'react'; +import React from 'react'; import PropTypes from 'prop-types'; import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo"; import {_t} from "../../../languageHandler"; @@ -22,7 +22,6 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg"; import Pill from "../elements/Pill"; import {makeUserPermalink} from "../../../utils/permalinks/Permalinks"; import BaseAvatar from "../avatars/BaseAvatar"; -import AccessibleButton from "../elements/AccessibleButton"; import {replaceableComponentTs} from "../../../utils/replaceableComponent"; import SettingsStore from "../../../settings/SettingsStore"; import {MatrixEvent} from "matrix-js-sdk/src/models/event"; @@ -43,19 +42,25 @@ interface IBridgeStateEvent { protocol: { id: string; displayname?: string; + // eslint-disable-next-line camelcase avatar_url?: string; + // eslint-disable-next-line camelcase external_url?: string; }; network?: { id: string; displayname?: string; + // eslint-disable-next-line camelcase avatar_url?: string; + // eslint-disable-next-line camelcase external_url?: string; }; channel: { id: string; displayname?: string; + // eslint-disable-next-line camelcase avatar_url?: string; + // eslint-disable-next-line camelcase external_url?: string; }; } @@ -77,7 +82,8 @@ export default class BridgeTile extends React.PureComponent { if (!content.bridgebot) { // Bridgebot was not required previously, so in order to not break rooms we are allowing // the sender to be used in place. When the proposal is merged, this should be removed. - console.warn(`Bridge info event ${this.props.ev.getId()} does not provide a 'bridgebot' key which is deprecated behaviour. Using sender for now.`); + console.warn(`Bridge info event ${this.props.ev.getId()} does not provide a 'bridgebot' key which` + + "is deprecated behaviour. Using sender for now."); content.bridgebot = this.props.ev.getSender(); } const { channel, network, protocol } = content; @@ -151,7 +157,7 @@ export default class BridgeTile extends React.PureComponent {

{networkItem} {_t("Channel: ", {}, { - channelLink: () => channelLink + channelLink: () => channelLink, })}

    diff --git a/src/utils/replaceableComponent.ts b/src/utils/replaceableComponent.ts index f83e0c95c1..7ea192f76b 100644 --- a/src/utils/replaceableComponent.ts +++ b/src/utils/replaceableComponent.ts @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { func } from 'prop-types'; import * as React from 'react'; import * as sdk from '../index'; @@ -47,4 +46,4 @@ export function replaceableComponent(name: string, origComponent: React.Componen */ export function replaceableComponentTs(name: string) { return (origComponent: typeof React.Component) => sdk.getComponent(name) || origComponent; -} \ No newline at end of file +}