From 23622db74b3b13a99905ade513cfffe1d8adf7b8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 28 Aug 2020 19:41:19 +0100 Subject: [PATCH 1/2] Fix eslint ts override tsx matching --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5391fa179c..4009da4a18 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -8,7 +8,7 @@ module.exports = { "quotes": "off", }, "overrides": [{ - "files": ["src/**/*.{ts, tsx}"], + "files": ["src/**/*.{ts,tsx}"], "extends": ["matrix-org/ts", "matrix-org/react"], "env": { "browser": true, From ae8595690d7c46c1e72ff66859d8009ed8aec2cd Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 29 Aug 2020 01:14:51 +0100 Subject: [PATCH 2/2] delint --- .../structures/CompatibilityView.tsx | 21 +++++++++++++------ src/vector/init.tsx | 2 ++ src/vector/platform/ElectronPlatform.tsx | 6 +++--- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx index 974d8c1b80..05a09c6b89 100644 --- a/src/async-components/structures/CompatibilityView.tsx +++ b/src/async-components/structures/CompatibilityView.tsx @@ -78,17 +78,26 @@ const CompatibilityView: React.FC = ({ onAccept }) => {

Use Element on mobile

iOS (iPhone or iPad)

- + Apple App Store

Android

- + Google Play Store - + F-Droid
diff --git a/src/vector/init.tsx b/src/vector/init.tsx index 043ae0ba32..139e67a3bf 100644 --- a/src/vector/init.tsx +++ b/src/vector/init.tsx @@ -17,6 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import olmWasmPath from "olm/olm.wasm"; import Olm from 'olm'; @@ -127,6 +128,7 @@ export async function loadSkin() { import( /* webpackChunkName: "riot-web-component-index" */ /* webpackPreload: true */ + // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore - this module is generated so may fail lint "../component-index"), ]); diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index 7932c6433d..1ce7eefde3 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -27,7 +27,7 @@ import BaseEventIndexManager, { MatrixEvent, MatrixProfile, SearchArgs, - SearchResult + SearchResult, } from 'matrix-react-sdk/src/indexing/BaseEventIndexManager'; import dis from 'matrix-react-sdk/src/dispatcher/dispatcher'; import {_t, _td} from 'matrix-react-sdk/src/languageHandler'; @@ -99,7 +99,7 @@ interface IPCPayload { class SeshatIndexManager extends BaseEventIndexManager { private pendingIpcCalls: Record = {}; - private nextIpcCallId: number = 0; + private nextIpcCallId = 0; constructor() { super(); @@ -216,7 +216,7 @@ class SeshatIndexManager extends BaseEventIndexManager { export default class ElectronPlatform extends VectorBasePlatform { private eventIndexManager: BaseEventIndexManager = new SeshatIndexManager(); private pendingIpcCalls: Record = {}; - private nextIpcCallId: number = 0; + private nextIpcCallId = 0; // this is the opaque token we pass to the HS which when we get it in our callback we can resolve to a profile private ssoID: string = randomString(32);