-
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index 0f9569d6bf..5d2ba897ba 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -51,6 +51,7 @@ import { ViewHomePagePayload } from "../../dispatcher/payloads/ViewHomePagePaylo
import { Icon as LiveIcon } from "../../../res/img/compound/live-8px.svg";
import { VoiceBroadcastRecording, VoiceBroadcastRecordingsStoreEvent } from "../../voice-broadcast";
import { SDKContext } from "../../contexts/SDKContext";
+import { shouldShowFeedback } from "../../utils/Feedback";
interface IProps {
isPanelCollapsed: boolean;
@@ -333,7 +334,7 @@ export default class UserMenu extends React.Component {
}
let feedbackButton: JSX.Element | undefined;
- if (SettingsStore.getValue(UIFeature.Feedback)) {
+ if (shouldShowFeedback()) {
feedbackButton = (
= ({ initialText = "", initialFilter = n
}
};
- const openFeedback = shouldShowFeedback()
- ? () => {
- Modal.createDialog(FeedbackDialog, {
- feature: "spotlight",
- });
- }
- : null;
-
const activeDescendant = rovingContext.state.activeRef?.current?.id;
return (
@@ -1242,26 +1231,6 @@ const SpotlightDialog: React.FC = ({ initialText = "", initialFilter = n
>
{content}
-
-
- {openFeedback &&
- _t(
- "Results not as expected? Please
give feedback.",
- {},
- {
- a: (sub) => (
-
- {sub}
-
- ),
- },
- )}
- {openFeedback && (
-
- {_t("Feedback")}
-
- )}
-
);
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index fca2ce706d..344067203d 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -41,14 +41,9 @@ import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
import Field from "../elements/Field";
import withValidation from "../elements/Validation";
import RoomAliasField from "../elements/RoomAliasField";
-import Modal from "../../../Modal";
-import GenericFeatureFeedbackDialog from "../dialogs/GenericFeatureFeedbackDialog";
-import SettingsStore from "../../../settings/SettingsStore";
import { getKeyBindingsManager } from "../../../KeyBindingsManager";
import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { shouldShowFeedback } from "../../../utils/Feedback";
-
export const createSpace = async (
name: string,
isPublic: boolean,
@@ -118,40 +113,6 @@ const nameToLocalpart = (name: string): string => {
.replace(/[^a-z0-9_-]+/gi, "");
};
-// XXX: Temporary for the Spaces release only
-export const SpaceFeedbackPrompt: React.FC<{
- onClick?(): void;
-}> = ({ onClick }) => {
- if (!shouldShowFeedback()) return null;
-
- return (
-
-
{_t("Spaces are a new feature.")}
-
{
- if (onClick) onClick();
- Modal.createDialog(GenericFeatureFeedbackDialog, {
- title: _t("Spaces feedback"),
- subheading: _t(
- "Thank you for trying Spaces. " + "Your feedback will help inform the next versions.",
- ),
- rageshakeLabel: "spaces-feedback",
- rageshakeData: Object.fromEntries(
- ["Spaces.allRoomsInHome", "Spaces.enabledMetaSpaces"].map((k) => [
- k,
- SettingsStore.getValue(k),
- ]),
- ),
- });
- }}
- >
- {_t("Give feedback.")}
-
-
- );
-};
-
type BProps = Omit
, "nameDisabled" | "topicDisabled" | "avatarDisabled">;
interface ISpaceCreateFormProps extends BProps {
busy: boolean;
@@ -316,8 +277,6 @@ const SpaceCreateMenu: React.FC<{
/>
{_t("To join a space you'll need an invite.")}
-
-
);
} else {
diff --git a/src/components/views/user-onboarding/UserOnboardingFeedback.tsx b/src/components/views/user-onboarding/UserOnboardingFeedback.tsx
deleted file mode 100644
index ee827e2603..0000000000
--- a/src/components/views/user-onboarding/UserOnboardingFeedback.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-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 React from "react";
-
-import { _t } from "../../../languageHandler";
-import Modal from "../../../Modal";
-import SdkConfig from "../../../SdkConfig";
-import AccessibleButton from "../../views/elements/AccessibleButton";
-import Heading from "../../views/typography/Heading";
-import FeedbackDialog from "../dialogs/FeedbackDialog";
-import { shouldShowFeedback } from "../../../utils/Feedback";
-
-export function UserOnboardingFeedback(): JSX.Element {
- if (!shouldShowFeedback()) {
- return <>;
- }
-
- return (
-
-
-
- {_t("How are you finding %(brand)s so far?", {
- brand: SdkConfig.get("brand"),
- })}
-
-
- {_t("We’d appreciate any feedback on how you’re finding %(brand)s.", {
- brand: SdkConfig.get("brand"),
- })}
-
-
-
{
- Modal.createDialog(FeedbackDialog, {
- feature: "use-case-selection",
- });
- }}
- >
- {_t("Feedback")}
-
-