Remove logo spinner

Removed since design wants to avoid associating slowness with the brand.

Signed-off-by: Robin Townsend <robin@robin.town>

src/components/views/elements/InlineSpinner.js

@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from "react";
 import {_t} from "../../../languageHandler";
-import SettingsStore from "../../../settings/SettingsStore";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.elements.InlineSpinner")
@@ -24,31 +23,15 @@ export default class InlineSpinner extends React.Component {
     render() {
         const w = this.props.w || 16;
         const h = this.props.h || 16;
-        const imgClass = this.props.imgClassName || "";
 
-        let icon;
-        if (SettingsStore.getValue('feature_new_spinner')) {
-            icon = (
-                <img
-                    src={require("../../../../res/img/logo-spinner.svg")}
-                    width={w}
-                    height={h}
-                    className={imgClass}
-                    aria-label={_t("Loading...")}
-                />
-            );
-        } else {
-            icon = (
+        return (
+            <div className="mx_InlineSpinner">
                 <div
                     className="mx_InlineSpinner_icon mx_Spinner_icon"
                     style={{width: w, height: h}}
                     aria-label={_t("Loading...")}
                 ></div>
-            );
-        }
-
-        return (
-            <div className="mx_InlineSpinner">{ icon }</div>
+            </div>
         );
     }
 }

src/components/views/elements/Spinner.js

@@ -18,41 +18,21 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import {_t} from "../../../languageHandler";
-import SettingsStore from "../../../settings/SettingsStore";
 
-const Spinner = ({w = 32, h = 32, imgClassName, message}) => {
-    let icon;
-    if (SettingsStore.getValue('feature_new_spinner')) {
-        icon = (
-            <img
-                src={require("../../../../res/img/logo-spinner.svg")}
-                width={w}
-                height={h}
-                className={imgClassName}
-                aria-label={_t("Loading...")}
-            />
-        );
-    } else {
-        icon = (
-            <div
-                className="mx_Spinner_icon"
-                style={{width: w, height: h}}
-                aria-label={_t("Loading...")}
-            ></div>
-        );
-    }
+const Spinner = ({w = 32, h = 32, message}) => (
+    <div className="mx_Spinner">
+        { message && <React.Fragment><div className="mx_Spinner_Msg">{ message }</div>&nbsp;</React.Fragment> }
+        <div
+            className="mx_Spinner_icon"
+            style={{width: w, height: h}}
+            aria-label={_t("Loading...")}
+        ></div>
+    </div>
+);
 
-    return (
-        <div className="mx_Spinner">
-            { message && <React.Fragment><div className="mx_Spinner_Msg">{ message }</div>&nbsp;</React.Fragment> }
-            { icon }
-        </div>
-    );
-};
 Spinner.propTypes = {
     w: PropTypes.number,
     h: PropTypes.number,
-    imgClassName: PropTypes.string,
     message: PropTypes.node,
 };
 

src/components/views/right_panel/UserInfo.tsx

@@ -1307,7 +1307,7 @@ const BasicUserInfo: React.FC<{
     }
 
     if (pendingUpdateCount > 0) {
-        spinner = <Spinner imgClassName="mx_ContextualMenu_spinner" />;
+        spinner = <Spinner />;
     }
 
     let memberDetails;

src/i18n/strings/en_EN.json

@@ -793,7 +793,6 @@
     "Send and receive voice messages": "Send and receive voice messages",
     "Render LaTeX maths in messages": "Render LaTeX maths in messages",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
-    "New spinner design": "New spinner design",
     "Message Pinning": "Message Pinning",
     "Custom user status messages": "Custom user status messages",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",

src/settings/Settings.tsx

@@ -197,12 +197,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: false,
         controller: new IncompatibleController("feature_spaces"),
     },
-    "feature_new_spinner": {
-        isFeature: true,
-        displayName: _td("New spinner design"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_pinning": {
         isFeature: true,
         displayName: _td("Message Pinning"),