From cc4d145f148f9e5108503d8af276fb27f1549d26 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 12 Apr 2021 14:06:57 -0600 Subject: [PATCH 1/2] Fix js-sdk import in SlashCommands This is important because the `matrix-js-sdk` types are mismatched in some builds of Element --- src/SlashCommands.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx index 3b6a202cf63..65658ed41c0 100644 --- a/src/SlashCommands.tsx +++ b/src/SlashCommands.tsx @@ -20,7 +20,7 @@ limitations under the License. import * as React from 'react'; -import { ContentHelpers } from 'matrix-js-sdk'; +import { ContentHelpers } from 'matrix-js-sdk/src/content-helpers'; import {MatrixClientPeg} from './MatrixClientPeg'; import dis from './dispatcher/dispatcher'; import * as sdk from './index'; From 9805170a6f17e78d7b95ac28d971bde36ab655c3 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 12 Apr 2021 14:34:24 -0600 Subject: [PATCH 2/2] Update SlashCommands.tsx --- src/SlashCommands.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx index 65658ed41c0..f99868f5e06 100644 --- a/src/SlashCommands.tsx +++ b/src/SlashCommands.tsx @@ -20,7 +20,7 @@ limitations under the License. import * as React from 'react'; -import { ContentHelpers } from 'matrix-js-sdk/src/content-helpers'; +import * as ContentHelpers from 'matrix-js-sdk/src/content-helpers'; import {MatrixClientPeg} from './MatrixClientPeg'; import dis from './dispatcher/dispatcher'; import * as sdk from './index';