diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml index 402fd7b3beb..35e4751078e 100644 --- a/.github/workflows/release_prepare.yml +++ b/.github/workflows/release_prepare.yml @@ -72,9 +72,9 @@ jobs: echo "REPOS=$(ls . | tr '\n' ' ')" >> $GITHUB_ENV - name: Merge develop run: | - git config --global user.email "releases@riot.im" - git config --global user.name "RiotRobot" - for REPO in $REPOS; do git -C "$REPO" merge origin/develop; done + git config --global user.email "releases@riot.im" + git config --global user.name "RiotRobot" + for REPO in $REPOS; do git -C "$REPO" merge origin/develop; done - name: Push staging run: for REPO in $REPOS; do git -C "$REPO" push origin staging; done diff --git a/config.remote.json b/config.remote.json deleted file mode 100644 index 9d33e0fb5ae..00000000000 --- a/config.remote.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "default_server_config": { - "m.homeserver": { - "prod_base_url": "http://matrix.superhero.chat", - "base_url": "https://matrix.superhero.chat", - "server_name": "superhero.chat" - }, - "m.identity_server": { - "base_url": "https://vector.im" - } - }, - "prod_bots_backend_url": "https://matrix.superhero.chat/callback", - "bots_backend_url": "https://matrix.superhero.chat/callback", - "permalink_prefix": "http://localhost:8080", - "disable_custom_urls": false, - "disable_guests": false, - "disable_login_language_selector": false, - "disable_3pid_login": false, - "brand": "Superhero", - "integrations_ui_url": "https://scalar.vector.im/", - "integrations_rest_url": "https://scalar.vector.im/api", - "integrations_widgets_urls": [ - "https://scalar.vector.im/_matrix/integrations/v1", - "https://scalar.vector.im/api", - "https://scalar-staging.vector.im/_matrix/integrations/v1", - "https://scalar-staging.vector.im/api", - "https://scalar-staging.riot.im/scalar/api" - ], - "default_country_code": "GB", - "show_labs_settings": false, - "features": {}, - "default_federate": true, - "default_theme": "light", - "room_directory": { - "servers": [ - "matrix.org" - ] - }, - "enable_presence_by_hs_url": { - "https://matrix.org": false, - "https://matrix-client.matrix.org": false - }, - "setting_defaults": { - "breadcrumbs": true - }, - "jitsi": { - "preferred_domain": "c.aeternity.org" - }, - "element_call": { - "url": "https://call.element.io", - "participant_limit": 8, - "brand": "Superhero Call" - }, - "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx", - "branding": { - "auth_header_logo_url": "themes/superhero/img/logos/superhero-logo.svg" - } -} diff --git a/package.json b/package.json index 0c5ead50782..7dc391ac9a4 100644 --- a/package.json +++ b/package.json @@ -1,218 +1,218 @@ { - "name": "element-web", - "version": "1.11.55", - "description": "A feature-rich client for Matrix.org", - "author": "New Vector Ltd.", - "repository": { - "type": "git", - "url": "https://github.com/element-hq/element-web" - }, - "license": "Apache-2.0", - "files": [ - "lib", - "res", - "src", - "webpack.config.js", - "scripts", - "docs", - "release.sh", - "deploy", - "CHANGELOG.md", - "CONTRIBUTING.rst", - "LICENSE", - "README.md", - "AUTHORS.rst", - "package.json", - "contribute.json" - ], - "style": "bundle.css", - "matrix_i18n_extra_translation_funcs": [ - "UserFriendlyError" - ], - "scripts": { - "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint", - "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json", - "i18n:lint": "prettier --log-level=silent --write src/i18n/strings/ --ignore-path /dev/null", - "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", - "clean": "rimraf lib webapp", - "build": "yarn clean && yarn build:genfiles && yarn build:bundle", - "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats", - "build:res": "ts-node scripts/copy-res.ts", - "build:genfiles": "yarn build:res && yarn build:module_system", - "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js", - "build:bundle": "webpack --progress --mode production", - "build:bundle-stats": "webpack --progress --mode production --json > webpack-stats.json", - "build:module_system": "ts-node --project ./tsconfig.module_system.json module_system/scripts/install.ts", - "dist": "scripts/package.sh", - "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n modules,res \"yarn build:module_system\" \"yarn build:res\" && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js\"", - "start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js --https\"", - "start:res": "ts-node scripts/copy-res.ts -w", - "start:js": "webpack serve --output-path webapp --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js --mode development", - "lint": "yarn lint:types && yarn lint:js && yarn lint:style && yarn lint:workflows", - "lint:js": "yarn lint:js:src && yarn lint:js:module_system", - "lint:js:src": "eslint --max-warnings 0 src test && prettier --check .", - "lint:js:module_system": "eslint --max-warnings 0 --config .eslintrc-module_system.js module_system", - "lint:js-fix": "yarn lint:js-fix:src && yarn lint:js-fix:module_system", - "lint:js-fix:src": "prettier --log-level=warn --write . && eslint --fix src test", - "lint:js-fix:module_system": "eslint --fix --config .eslintrc-module_system.js module_system", - "lint:types": "yarn lint:types:src && yarn lint:types:module_system", - "lint:types:src": "tsc --noEmit --jsx react", - "lint:types:module_system": "tsc --noEmit --project ./tsconfig.module_system.json", - "lint:style": "stylelint \"res/css/**/*.pcss\"", - "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'", - "test": "jest", - "coverage": "yarn test --coverage", - "analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts", - "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp", - "update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js" - }, - "resolutions": { - "@types/react-dom": "17.0.21", - "@types/react": "17.0.68" - }, - "dependencies": { - "@matrix-org/olm": "3.2.15", - "@matrix-org/react-sdk-module-api": "^2.2.1", - "gfm.css": "^1.1.2", - "jotai": "^2.6.0", - "jsrsasign": "^10.5.25", - "katex": "^0.16.0", - "lodash": "^4.17.21", - "matrix-js-sdk": "31.1.0", - "matrix-react-sdk": "3.90.0", - "matrix-widget-api": "^1.3.1", - "react": "17.0.2", - "react-dom": "17.0.2", - "ua-parser-js": "^1.0.0" - }, - "devDependencies": { - "@action-validator/cli": "^0.5.3", - "@action-validator/core": "^0.5.3", - "@babel/core": "^7.12.10", - "@babel/eslint-parser": "^7.12.10", - "@babel/eslint-plugin": "^7.12.10", - "@babel/plugin-proposal-class-properties": "^7.12.1", - "@babel/plugin-proposal-export-default-from": "^7.12.1", - "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1", - "@babel/plugin-proposal-numeric-separator": "^7.12.7", - "@babel/plugin-proposal-object-rest-spread": "^7.12.1", - "@babel/plugin-proposal-optional-chaining": "^7.12.7", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-transform-runtime": "^7.12.10", - "@babel/preset-env": "^7.12.11", - "@babel/preset-react": "^7.12.10", - "@babel/preset-typescript": "^7.12.7", - "@babel/register": "^7.12.10", - "@babel/runtime": "^7.12.5", - "@casualbot/jest-sonar-reporter": "2.2.7", - "@principalstudio/html-webpack-inject-preload": "^1.2.7", - "@sentry/webpack-plugin": "^2.7.1", - "@svgr/webpack": "^5.5.0", - "@testing-library/react": "^12.1.5", - "@types/commonmark": "^0.27.9", - "@types/content-type": "^1.1.8", - "@types/counterpart": "^0.18.4", - "@types/diff-match-patch": "^1.0.36", - "@types/escape-html": "^1.0.4", - "@types/file-saver": "^2.0.7", - "@types/glob-to-regexp": "^0.4.4", - "@types/jest": "^29.0.0", - "@types/jitsi-meet": "^2.0.2", - "@types/jsrsasign": "^10.5.4", - "@types/katex": "^0.16.7", - "@types/lodash": "^4.14.197", - "@types/minimist": "^1.2.5", - "@types/modernizr": "^3.5.6", - "@types/node": "^16", - "@types/node-fetch": "^2.6.4", - "@types/pako": "^2.0.3", - "@types/qrcode": "^1.5.5", - "@types/react": "17.0.68", - "@types/react-beautiful-dnd": "^13.1.7", - "@types/react-dom": "17.0.21", - "@types/react-transition-group": "^4.4.9", - "@types/sanitize-html": "^2.9.5", - "@types/sdp-transform": "^2.4.9", - "@types/tar-js": "^0.3.5", - "@types/ua-parser-js": "^0.7.36", - "@types/uuid": "^9.0.7", - "@typescript-eslint/eslint-plugin": "^6.0.0", - "@typescript-eslint/parser": "^6.0.0", - "allchange": "^1.0.6", - "babel-jest": "^29.0.0", - "babel-loader": "^9.0.0", - "babel-plugin-jsx-remove-data-test-id": "^3.0.0", - "buffer": "^6.0.3", - "chokidar": "^3.5.1", - "concurrently": "^8.0.0", - "copy-webpack-plugin": "^11.0.0", - "cronstrue": "^2.41.0", - "css-loader": "^5.2.7", - "css-minimizer-webpack-plugin": "^5.0.1", - "dotenv": "^16.0.2", - "eslint": "8.55.0", - "eslint-config-google": "^0.14.0", - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-deprecate": "0.8.4", - "eslint-plugin-import": "^2.26.0", - "eslint-plugin-matrix-org": "^1.0.0", - "eslint-plugin-react": "^7.28.0", - "eslint-plugin-react-hooks": "^4.3.0", - "eslint-plugin-unicorn": "^49.0.0", - "fake-indexeddb": "^5.0.0", - "fetch-mock": "9.11.0", - "fetch-mock-jest": "^1.5.1", - "file-loader": "^6.0.0", - "html-webpack-plugin": "^5.5.3", - "jest": "^29.0.0", - "jest-canvas-mock": "2.5.2", - "jest-environment-jsdom": "^29.0.0", - "jest-mock": "^29.0.0", - "jest-raw-loader": "^1.0.1", - "matrix-mock-request": "^2.5.0", - "matrix-web-i18n": "^3.1.3", - "mini-css-extract-plugin": "^2.7.6", - "minimist": "^1.2.6", - "mkdirp": "^3.0.0", - "modernizr": "^3.12.0", - "node-fetch": "^2.6.7", - "postcss": "^8.4.31", - "postcss-easings": "^2.0.0", - "postcss-hexrgba": "2.0.1", - "postcss-import": "^12.0.1", - "postcss-loader": "^3.0.0", - "postcss-mixins": "^6.2.3", - "postcss-nested": "^4.2.3", - "postcss-preset-env": "^6.7.0", - "postcss-scss": "^4.0.4", - "postcss-simple-vars": "^5.0.2", - "prettier": "3.1.1", - "process": "^0.11.10", - "proxy-agent": "^6.3.0", - "raw-loader": "^4.0.2", - "rimraf": "^5.0.0", - "semver": "^7.5.2", - "setimmediate": "^1.0.5", - "string-replace-loader": "3", - "style-loader": "3", - "stylelint": "^16.0.0", - "stylelint-config-standard": "^35.0.0", - "stylelint-scss": "^6.0.0", - "terser-webpack-plugin": "^5.3.9", - "ts-node": "^10.9.1", - "ts-prune": "^0.10.3", - "typescript": "5.3.3", - "util": "^0.12.5", - "webpack": "^5.89.0", - "webpack-bundle-analyzer": "^4.8.0", - "webpack-cli": "^5.0.0", - "webpack-dev-server": "^4.15.1", - "yaml": "^2.3.3" - }, - "@casualbot/jest-sonar-reporter": { - "outputDirectory": "coverage", - "outputName": "jest-sonar-report.xml", - "relativePaths": true - } + "name": "element-web", + "version": "1.11.55", + "description": "A feature-rich client for Matrix.org", + "author": "New Vector Ltd.", + "repository": { + "type": "git", + "url": "https://github.com/element-hq/element-web" + }, + "license": "Apache-2.0", + "files": [ + "lib", + "res", + "src", + "webpack.config.js", + "scripts", + "docs", + "release.sh", + "deploy", + "CHANGELOG.md", + "CONTRIBUTING.rst", + "LICENSE", + "README.md", + "AUTHORS.rst", + "package.json", + "contribute.json" + ], + "style": "bundle.css", + "matrix_i18n_extra_translation_funcs": [ + "UserFriendlyError" + ], + "scripts": { + "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint", + "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json", + "i18n:lint": "prettier --log-level=silent --write src/i18n/strings/ --ignore-path /dev/null", + "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", + "clean": "rimraf lib webapp", + "build": "yarn clean && yarn build:genfiles && yarn build:bundle", + "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats", + "build:res": "ts-node scripts/copy-res.ts", + "build:genfiles": "yarn build:res && yarn build:module_system", + "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js", + "build:bundle": "webpack --progress --mode production", + "build:bundle-stats": "webpack --progress --mode production --json > webpack-stats.json", + "build:module_system": "ts-node --project ./tsconfig.module_system.json module_system/scripts/install.ts", + "dist": "scripts/package.sh", + "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n modules,res \"yarn build:module_system\" \"yarn build:res\" && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js\"", + "start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js --https\"", + "start:res": "ts-node scripts/copy-res.ts -w", + "start:js": "webpack serve --output-path webapp --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js --mode development", + "lint": "yarn lint:types && yarn lint:js && yarn lint:style && yarn lint:workflows", + "lint:js": "yarn lint:js:src && yarn lint:js:module_system", + "lint:js:src": "eslint --max-warnings 0 src test && prettier --check .", + "lint:js:module_system": "eslint --max-warnings 0 --config .eslintrc-module_system.js module_system", + "lint:js-fix": "yarn lint:js-fix:src && yarn lint:js-fix:module_system", + "lint:js-fix:src": "prettier --log-level=warn --write . && eslint --fix src test", + "lint:js-fix:module_system": "eslint --fix --config .eslintrc-module_system.js module_system", + "lint:types": "yarn lint:types:src && yarn lint:types:module_system", + "lint:types:src": "tsc --noEmit --jsx react", + "lint:types:module_system": "tsc --noEmit --project ./tsconfig.module_system.json", + "lint:style": "stylelint \"res/css/**/*.pcss\"", + "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'", + "test": "jest", + "coverage": "yarn test --coverage", + "analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts", + "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp", + "update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js" + }, + "resolutions": { + "@types/react-dom": "17.0.21", + "@types/react": "17.0.68" + }, + "dependencies": { + "@matrix-org/olm": "3.2.15", + "@matrix-org/react-sdk-module-api": "^2.2.1", + "gfm.css": "^1.1.2", + "jotai": "^2.6.0", + "jsrsasign": "^10.5.25", + "katex": "^0.16.0", + "lodash": "^4.17.21", + "matrix-js-sdk": "31.1.0", + "matrix-react-sdk": "3.90.0", + "matrix-widget-api": "^1.3.1", + "react": "17.0.2", + "react-dom": "17.0.2", + "ua-parser-js": "^1.0.0" + }, + "devDependencies": { + "@action-validator/cli": "^0.5.3", + "@action-validator/core": "^0.5.3", + "@babel/core": "^7.12.10", + "@babel/eslint-parser": "^7.12.10", + "@babel/eslint-plugin": "^7.12.10", + "@babel/plugin-proposal-class-properties": "^7.12.1", + "@babel/plugin-proposal-export-default-from": "^7.12.1", + "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1", + "@babel/plugin-proposal-numeric-separator": "^7.12.7", + "@babel/plugin-proposal-object-rest-spread": "^7.12.1", + "@babel/plugin-proposal-optional-chaining": "^7.12.7", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-transform-runtime": "^7.12.10", + "@babel/preset-env": "^7.12.11", + "@babel/preset-react": "^7.12.10", + "@babel/preset-typescript": "^7.12.7", + "@babel/register": "^7.12.10", + "@babel/runtime": "^7.12.5", + "@casualbot/jest-sonar-reporter": "2.2.7", + "@principalstudio/html-webpack-inject-preload": "^1.2.7", + "@sentry/webpack-plugin": "^2.7.1", + "@svgr/webpack": "^5.5.0", + "@testing-library/react": "^12.1.5", + "@types/commonmark": "^0.27.9", + "@types/content-type": "^1.1.8", + "@types/counterpart": "^0.18.4", + "@types/diff-match-patch": "^1.0.36", + "@types/escape-html": "^1.0.4", + "@types/file-saver": "^2.0.7", + "@types/glob-to-regexp": "^0.4.4", + "@types/jest": "^29.0.0", + "@types/jitsi-meet": "^2.0.2", + "@types/jsrsasign": "^10.5.4", + "@types/katex": "^0.16.7", + "@types/lodash": "^4.14.197", + "@types/minimist": "^1.2.5", + "@types/modernizr": "^3.5.6", + "@types/node": "^16", + "@types/node-fetch": "^2.6.4", + "@types/pako": "^2.0.3", + "@types/qrcode": "^1.5.5", + "@types/react": "17.0.68", + "@types/react-beautiful-dnd": "^13.1.7", + "@types/react-dom": "17.0.21", + "@types/react-transition-group": "^4.4.9", + "@types/sanitize-html": "^2.9.5", + "@types/sdp-transform": "^2.4.9", + "@types/tar-js": "^0.3.5", + "@types/ua-parser-js": "^0.7.36", + "@types/uuid": "^9.0.7", + "@typescript-eslint/eslint-plugin": "^6.0.0", + "@typescript-eslint/parser": "^6.0.0", + "allchange": "^1.0.6", + "babel-jest": "^29.0.0", + "babel-loader": "^9.0.0", + "babel-plugin-jsx-remove-data-test-id": "^3.0.0", + "buffer": "^6.0.3", + "chokidar": "^3.5.1", + "concurrently": "^8.0.0", + "copy-webpack-plugin": "^11.0.0", + "cronstrue": "^2.41.0", + "css-loader": "^5.2.7", + "css-minimizer-webpack-plugin": "^5.0.1", + "dotenv": "^16.0.2", + "eslint": "8.55.0", + "eslint-config-google": "^0.14.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-deprecate": "0.8.4", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-matrix-org": "^1.0.0", + "eslint-plugin-react": "^7.28.0", + "eslint-plugin-react-hooks": "^4.3.0", + "eslint-plugin-unicorn": "^49.0.0", + "fake-indexeddb": "^5.0.0", + "fetch-mock": "9.11.0", + "fetch-mock-jest": "^1.5.1", + "file-loader": "^6.0.0", + "html-webpack-plugin": "^5.5.3", + "jest": "^29.0.0", + "jest-canvas-mock": "2.5.2", + "jest-environment-jsdom": "^29.0.0", + "jest-mock": "^29.0.0", + "jest-raw-loader": "^1.0.1", + "matrix-mock-request": "^2.5.0", + "matrix-web-i18n": "^3.1.3", + "mini-css-extract-plugin": "^2.7.6", + "minimist": "^1.2.6", + "mkdirp": "^3.0.0", + "modernizr": "^3.12.0", + "node-fetch": "^2.6.7", + "postcss": "^8.4.31", + "postcss-easings": "^2.0.0", + "postcss-hexrgba": "2.0.1", + "postcss-import": "^12.0.1", + "postcss-loader": "^3.0.0", + "postcss-mixins": "^6.2.3", + "postcss-nested": "^4.2.3", + "postcss-preset-env": "^6.7.0", + "postcss-scss": "^4.0.4", + "postcss-simple-vars": "^5.0.2", + "prettier": "3.1.1", + "process": "^0.11.10", + "proxy-agent": "^6.3.0", + "raw-loader": "^4.0.2", + "rimraf": "^5.0.0", + "semver": "^7.5.2", + "setimmediate": "^1.0.5", + "string-replace-loader": "3", + "style-loader": "3", + "stylelint": "^16.0.0", + "stylelint-config-standard": "^35.0.0", + "stylelint-scss": "^6.0.0", + "terser-webpack-plugin": "^5.3.9", + "ts-node": "^10.9.1", + "ts-prune": "^0.10.3", + "typescript": "5.3.3", + "util": "^0.12.5", + "webpack": "^5.89.0", + "webpack-bundle-analyzer": "^4.8.0", + "webpack-cli": "^5.0.0", + "webpack-dev-server": "^4.15.1", + "yaml": "^2.3.3" + }, + "@casualbot/jest-sonar-reporter": { + "outputDirectory": "coverage", + "outputName": "jest-sonar-report.xml", + "relativePaths": true + } } diff --git a/src/components/views/avatars/BaseAvatar.tsx b/src/components/views/avatars/BaseAvatar.tsx index 240d4d7e73b..947d71a0bd3 100644 --- a/src/components/views/avatars/BaseAvatar.tsx +++ b/src/components/views/avatars/BaseAvatar.tsx @@ -17,7 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React, { forwardRef, useCallback, useContext, useEffect, useState} from "react"; +import React, { forwardRef, useCallback, useContext, useEffect, useState } from "react"; import classNames from "classnames"; import { ClientEvent } from "matrix-js-sdk/src/matrix"; import { Avatar } from "@vector-im/compound-web"; diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx index bebfc0e0861..0ccb026c026 100644 --- a/src/components/views/rooms/RoomSublist.tsx +++ b/src/components/views/rooms/RoomSublist.tsx @@ -443,7 +443,7 @@ export default class RoomSublist extends React.Component { // find the first room with a count of the same colour as the badge count room = RoomListStore.instance.orderedLists[this.getTagId()].find((r: Room) => { const notifState = this.notificationState.getForRoom(r); - return notifState.count > 0 && notifState.level === this.notificationState.level; + return notifState.count > 0 && notifState.color === this.notificationState.color; }); } @@ -679,7 +679,6 @@ export default class RoomSublist extends React.Component { const badge = ( = ({ selected, isPanelCollap ); }; -const VideoRoomsButton: React.FC = ({ selected, isPanelCollapsed }) => { - return ( - - ); -}; - const CreateSpaceButton: React.FC> = ({ isPanelCollapsed, setPanelCollapsed, @@ -278,7 +264,6 @@ const metaSpaceComponentMap: Record = { [MetaSpace.Favourites]: FavouritesButton, [MetaSpace.People]: PeopleButton, [MetaSpace.Orphans]: OrphansButton, - [MetaSpace.VideoRooms]: VideoRoomsButton, }; interface IInnerSpacePanelProps extends DroppableProvidedProps { diff --git a/test/setup/setupLanguage.ts b/test/setup/setupLanguage.ts index 2dc4f0b048b..7a585763282 100644 --- a/test/setup/setupLanguage.ts +++ b/test/setup/setupLanguage.ts @@ -16,7 +16,6 @@ limitations under the License. import fetchMock from "fetch-mock-jest"; import _ from "lodash"; -import { setupLanguageMock as reactSetupLanguageMock } from "matrix-react-sdk/test/setup/setupLanguage"; import en from "../../src/i18n/strings/en_EN.json"; import reactEn from "../../src/i18n/strings/en_EN.json"; @@ -24,7 +23,6 @@ import reactEn from "../../src/i18n/strings/en_EN.json"; fetchMock.config.overwriteRoutes = false; export function setupLanguageMock() { - reactSetupLanguageMock(); fetchMock.get("end:en_EN.json", _.merge({}, en, reactEn), { overwriteRoutes: true }); } setupLanguageMock();