Revert "Merge branch 'verji-develop' of https://github.com/verji/matr…

…ix-react-sdk into develop" This reverts commit 68437a1, reversing changes made to 80aa32f.
verji · Jul 4, 2024 · 4a16bf4 · 4a16bf4
1 parent 68437a1
commit 4a16bf4
Show file tree

Hide file tree

Showing 143 changed files with 2,316 additions and 7,238 deletions.
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -1,6 +1,5 @@
 name: Static Analysis
 on:
-    workflow_dispatch:
     pull_request: {}
     merge_group:
         types: [checks_requested]
@@ -22,44 +21,14 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
+
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-            # VERJI SPECIFIC - yarn link FOR matrix-react-sdk-module-api on verji-main branch
-            #- name: "Veri - Clone Github Repo Action - Download verji-main of module-api"
-            #  # You may pin to the exact commit or the version.
-            #  # uses: GuillaumeFalourd/clone-github-repo-action@19817562c346ff60f9935158dede6c5ece8fd0ac
-            #  uses: GuillaumeFalourd/[email protected]
-            #  with:
-            #       # Repository Owner
-            #       owner: verji
-            #       # Repository name
-            #       repository: "matrix-react-sdk-module-api"
-            #       # PAT with repository scope (https://github.com/settings/tokens)
-            #       access-token: ${{secrets.PAT}}
-            #       # Depth of the clone (default: full history)
-            #       depth: 1
-            #       # Branch name (default: main)
-            #       branch: "verji-main"
-            #       # Clone with submodules
-            #       submodule: false # optional, default is false
-            # - name: "Verji - Build and yarn link matrix-react-sdk-module-api (prepublish)"
-            #   uses: Azure/powershell@v2
-            #   with:
-            #       # Yarn link matrix-react-sdk-module-api #--skipLibCheck build --skipLibCheck
-            #       inlineScript: "cd matrix-react-sdk-module-api && yarn && yarn link && yarn prepublishOnly && cd .. && cd .. && cd 'matrix-react-sdk'"
-            #       azPSVersion: "latest"
-            #END VERJI SPECIFIC
+
             - name: Install Deps
               run: "./scripts/ci/install-deps.sh --ignore-scripts"
-              # VERJI
-            # - name: "Verji - yarn link matrix-react-sdk-module-api/verji-main into matrix-react-sdk"
-            #   uses: Azure/powershell@v2
-            #   with:
-            #       # Yarn link matrix-react-sdk-module-api #--skipLibCheck
-            #       inlineScript: "yarn link '@matrix-org/react-sdk-module-api'"
-            #       azPSVersion: "latest"
-            # VERJI END
+
             - name: Typecheck
               run: "yarn run lint:types"
 
@@ -86,7 +55,6 @@ jobs:
 
     i18n_lint:
         name: "i18n Check"
-        if: ${{ github.ref_name != 'verji-develop' }}
         uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
         with:
             hardcoded-words: "Element"

diff --git a/.github/workflows/verji-release-drafter.yml b/.github/workflows/verji-release-drafter.yml
diff --git a/jest.config.ts b/jest.config.ts
@@ -20,11 +20,10 @@ import type { Config } from "jest";
 
 const config: Config = {
     testEnvironment: "jsdom",
-    testMatch: ["<rootDir>/test/**/*-test.[jt]s?(x)", "<rootDir>/test/**/**/*-test.[jt]s?(x)"],
+    testMatch: ["<rootDir>/test/**/*-test.[jt]s?(x)"],
     globalSetup: "<rootDir>/test/globalSetup.ts",
     setupFiles: ["jest-canvas-mock"],
     setupFilesAfterEnv: ["<rootDir>/test/setupTests.ts"],
-    moduleFileExtensions: ["js", "jsx", "json", "ts", "tsx"],
     moduleNameMapper: {
         "\\.(gif|png|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js",
         "\\.svg$": "<rootDir>/__mocks__/svg.js",

diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@matrix-org/analytics-events": "^0.21.0",
+        "@matrix-org/analytics-events": "^0.20.0",
         "@matrix-org/emojibase-bindings": "^1.1.2",
         "@matrix-org/matrix-wysiwyg": "2.17.0",
         "@matrix-org/olm": "3.2.15",
@@ -128,7 +128,6 @@
         "react-focus-lock": "^2.5.1",
         "react-transition-group": "^4.4.1",
         "rfc4648": "^1.4.0",
-        "rss-parser": "^3.12.0",
         "sanitize-filename": "^1.6.3",
         "sanitize-html": "2.13.0",
         "tar-js": "^0.3.0",
@@ -183,7 +182,6 @@
         "@types/react-dom": "17.0.25",
         "@types/react-transition-group": "^4.4.0",
         "@types/sanitize-html": "2.11.0",
-        "@types/scheduler": "^0.23.0",
         "@types/sdp-transform": "^2.4.6",
         "@types/seedrandom": "<3.0.5",
         "@types/tar-js": "^0.3.2",
@@ -222,7 +220,6 @@
         "postcss-scss": "^4.0.4",
         "prettier": "3.2.5",
         "raw-loader": "^4.0.2",
-        "react-test-renderer": "17.0.2",
         "rimraf": "^5.0.0",
         "stylelint": "^16.1.0",
         "stylelint-config-standard": "^36.0.0",

diff --git a/res/css/structures/_HomePage.pcss b/res/css/structures/_HomePage.pcss
@@ -22,7 +22,6 @@ limitations under the License.
     height: 100%;
     margin-left: auto;
     margin-right: auto;
-    max-height: 100%;
 }
 
 .mx_HomePage_default {

diff --git a/res/css/structures/_LeftPanel.pcss b/res/css/structures/_LeftPanel.pcss
@@ -148,8 +148,6 @@ limitations under the License.
                 }
             }
 
-            .mx_LeftPanel_omButton,
-            .mx_LeftPanel_newsButton,
             .mx_LeftPanel_exploreButton,
             .mx_LeftPanel_recentsButton {
                 width: 32px;
@@ -181,15 +179,6 @@ limitations under the License.
                 }
             }
 
-            //Verji start
-            .mx_LeftPanel_newsButton::before {
-                mask-image: url("$(res)/img/verji/news.svg");
-            }
-            .mx_LeftPanel_omButton::before {
-                mask-image: url("$(res)/img/verji/shield.svg");
-            }
-            //Verji end
-
             .mx_LeftPanel_exploreButton::before {
                 mask-image: url("$(res)/img/element-icons/roomlist/explore.svg");
             }

diff --git a/res/css/structures/_MiscHeader.scss b/res/css/structures/_MiscHeader.scss
diff --git a/res/css/structures/_RoomView.pcss b/res/css/structures/_RoomView.pcss
@@ -162,32 +162,6 @@ limitations under the License.
     margin-bottom: 80px; /* visually center the content (intentional offset) */
 }
 
-// Verji start
-@keyframes fade1 {
-    0% {
-        opacity: 0;
-    }
-    100% {
-        opacity: 1;
-    }
-}
-.mx_RoomView_News1 {
-    animation: 0.2s ease-out 0s 0.2 fade1;
-}
-
-@keyframes fade2 {
-    0% {
-        transform: translateX(70px);
-    }
-    100% {
-        transform: translateX(0);
-    }
-}
-.mx_RoomView_News2 {
-    animation: 0.2s ease 0s 0.2 fade2;
-}
-// Verji end
-
 .mx_RoomView_MessageList {
     list-style-type: none;
     padding: var(--RoomView_MessageList-padding); /* mx_ProfileResizer depends on this value */

diff --git a/res/css/structures/_UserMenu.pcss b/res/css/structures/_UserMenu.pcss
@@ -207,27 +207,6 @@ limitations under the License.
     .mx_UserMenu_iconSignOut::before {
         mask-image: url("$(res)/img/element-icons/leave.svg");
     }
-    /* Verji start */
-    .mx_UserMenu_iconMembers::before {
-        mask-image: url("$(res)/img/element-icons/room/members.svg");
-    }
-
-    .mx_UserMenu_iconInvite::before {
-        mask-image: url("$(res)/img/element-icons/room/invite.svg");
-    }
-
-    .mx_UserMenu_oidcmanage::before {
-        mask-image: url("$(res)/img/verji/address-card.svg");
-    }
-
-    .mx_UserMenu_portal::before {
-        mask-image: url("$(res)/img/verji/house-user.svg");
-    }
-
-    .mx_UserMenu_signing::before {
-        mask-image: url("$(res)/img/verji/signing.svg");
-    }
-    /* Verji end */
 }
 
 .mx_UserMenu_CustomStatusSection {

diff --git a/res/css/views/dialogs/_ConfirmInviteExternalUsersDialog.scss b/res/css/views/dialogs/_ConfirmInviteExternalUsersDialog.scss