diff --git a/res/welcome/images/matrix.svg b/res/welcome/images/matrix.svg
deleted file mode 100644
index 13adcab25..000000000
--- a/res/welcome/images/matrix.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
diff --git a/scripts/docker-link-repos.sh b/scripts/docker-link-repos.sh
index 54c89baca..cf824d87a 100644
--- a/scripts/docker-link-repos.sh
+++ b/scripts/docker-link-repos.sh
@@ -32,7 +32,6 @@ cd react-sdk
yarn link
yarn link matrix-js-sdk
yarn --network-timeout=100000 install
-yarn reskindex
cd ../
echo "Setting up element-web with react-sdk and js-sdk packages"
diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh
index 65159d1a1..71850188a 100755
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -92,16 +92,8 @@ pushd matrix-react-sdk
yarn link
yarn link matrix-js-sdk
yarn install --pure-lockfile
-yarn reskindex
popd
yarn link matrix-react-sdk
##############################
-
-# Link the reskindex binary in place: if we used `yarn link`,
-# Yarn would do this for us, but we don't because we'd have
-# to define the Yarn binary prefix somewhere so it could put the
-# intermediate symlinks there. Instead, we do it ourselves.
-mkdir -p node_modules/.bin
-ln -sfv ../matrix-react-sdk/scripts/reskindex.js node_modules/.bin/reskindex
diff --git a/src/components/structures/VectorEmbeddedPage.tsx b/src/components/structures/VectorEmbeddedPage.tsx
deleted file mode 100644
index 85adb2fb3..000000000
--- a/src/components/structures/VectorEmbeddedPage.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2019 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import EmbeddedPage from 'matrix-react-sdk/src/components/structures/EmbeddedPage';
-import sanitizeHtml from 'sanitize-html';
-import { _t } from 'matrix-react-sdk/src/languageHandler';
-
-export default class VectorEmbeddedPage extends EmbeddedPage {
- static replaces = 'EmbeddedPage';
-
- // we're overriding the base component here, for Element-specific tweaks
- translate(s: string) {
- s = sanitizeHtml(_t(s));
- // ugly fix for https://github.com/vector-im/element-web/issues/4243
- // eslint-disable-next-line max-len
- s = s.replace(/\[matrix\]/, '
');
- return s;
- }
-}
diff --git a/src/components/views/auth/VectorAuthFooter.tsx b/src/components/views/auth/VectorAuthFooter.tsx
index 0cdfdc0a2..87557ab4b 100644
--- a/src/components/views/auth/VectorAuthFooter.tsx
+++ b/src/components/views/auth/VectorAuthFooter.tsx
@@ -44,6 +44,4 @@ const VectorAuthFooter = () => {
);
};
-VectorAuthFooter.replaces = 'AuthFooter';
-
export default VectorAuthFooter;
diff --git a/src/components/views/auth/VectorAuthHeaderLogo.tsx b/src/components/views/auth/VectorAuthHeaderLogo.tsx
index deaf9cc23..d44e3e5a7 100644
--- a/src/components/views/auth/VectorAuthHeaderLogo.tsx
+++ b/src/components/views/auth/VectorAuthHeaderLogo.tsx
@@ -19,9 +19,7 @@ import React from 'react';
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
export default class VectorAuthHeaderLogo extends React.PureComponent {
- static replaces = 'AuthHeaderLogo';
-
- render() {
+ public render() {
const brandingConfig = SdkConfig.getObject("branding");
const logoUrl = brandingConfig?.get("auth_header_logo_url") ?? "themes/element/img/logos/element-logo.svg";
diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx
index d37739a03..d2e6d9f8d 100644
--- a/src/components/views/auth/VectorAuthPage.tsx
+++ b/src/components/views/auth/VectorAuthPage.tsx
@@ -15,16 +15,15 @@ limitations under the License.
*/
import React, { CSSProperties } from 'react';
-import * as sdk from 'matrix-react-sdk/src/index';
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
-export default class VectorAuthPage extends React.PureComponent {
- static replaces = 'AuthPage';
+import VectorAuthFooter from "./VectorAuthFooter";
- static welcomeBackgroundUrl;
+export default class VectorAuthPage extends React.PureComponent {
+ private static welcomeBackgroundUrl;
// cache the url as a static to prevent it changing without refreshing
- static getWelcomeBackgroundUrl() {
+ private static getWelcomeBackgroundUrl() {
if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl;
const brandingConfig = SdkConfig.getObject("branding");
@@ -43,9 +42,7 @@ export default class VectorAuthPage extends React.PureComponent {
return VectorAuthPage.welcomeBackgroundUrl;
}
- render() {
- const AuthFooter = sdk.getComponent('auth.AuthFooter');
-
+ public render() {
const pageStyle = {
background: `center/cover fixed url(${VectorAuthPage.getWelcomeBackgroundUrl()})`,
};
@@ -80,7 +77,7 @@ export default class VectorAuthPage extends React.PureComponent {
{ this.props.children }
');
- return s;
- }
-}
diff --git a/src/components/views/auth/VectorAuthFooter.tsx b/src/components/views/auth/VectorAuthFooter.tsx
index 0cdfdc0a2..87557ab4b 100644
--- a/src/components/views/auth/VectorAuthFooter.tsx
+++ b/src/components/views/auth/VectorAuthFooter.tsx
@@ -44,6 +44,4 @@ const VectorAuthFooter = () => {
);
};
-VectorAuthFooter.replaces = 'AuthFooter';
-
export default VectorAuthFooter;
diff --git a/src/components/views/auth/VectorAuthHeaderLogo.tsx b/src/components/views/auth/VectorAuthHeaderLogo.tsx
index deaf9cc23..d44e3e5a7 100644
--- a/src/components/views/auth/VectorAuthHeaderLogo.tsx
+++ b/src/components/views/auth/VectorAuthHeaderLogo.tsx
@@ -19,9 +19,7 @@ import React from 'react';
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
export default class VectorAuthHeaderLogo extends React.PureComponent {
- static replaces = 'AuthHeaderLogo';
-
- render() {
+ public render() {
const brandingConfig = SdkConfig.getObject("branding");
const logoUrl = brandingConfig?.get("auth_header_logo_url") ?? "themes/element/img/logos/element-logo.svg";
diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx
index d37739a03..d2e6d9f8d 100644
--- a/src/components/views/auth/VectorAuthPage.tsx
+++ b/src/components/views/auth/VectorAuthPage.tsx
@@ -15,16 +15,15 @@ limitations under the License.
*/
import React, { CSSProperties } from 'react';
-import * as sdk from 'matrix-react-sdk/src/index';
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
-export default class VectorAuthPage extends React.PureComponent {
- static replaces = 'AuthPage';
+import VectorAuthFooter from "./VectorAuthFooter";
- static welcomeBackgroundUrl;
+export default class VectorAuthPage extends React.PureComponent {
+ private static welcomeBackgroundUrl;
// cache the url as a static to prevent it changing without refreshing
- static getWelcomeBackgroundUrl() {
+ private static getWelcomeBackgroundUrl() {
if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl;
const brandingConfig = SdkConfig.getObject("branding");
@@ -43,9 +42,7 @@ export default class VectorAuthPage extends React.PureComponent {
return VectorAuthPage.welcomeBackgroundUrl;
}
- render() {
- const AuthFooter = sdk.getComponent('auth.AuthFooter');
-
+ public render() {
const pageStyle = {
background: `center/cover fixed url(${VectorAuthPage.getWelcomeBackgroundUrl()})`,
};
@@ -80,7 +77,7 @@ export default class VectorAuthPage extends React.PureComponent {
{ this.props.children }