Remove feedback buttons from onboarding, search, and spaces (#10506)

Author: t3chguy

res/css/_components.pcss

@@ -365,7 +365,6 @@
 @import "./views/toasts/_NonUrgentEchoFailureToast.pcss";
 @import "./views/typography/_Heading.pcss";
 @import "./views/user-onboarding/_UserOnboardingButton.pcss";
-@import "./views/user-onboarding/_UserOnboardingFeedback.pcss";
 @import "./views/user-onboarding/_UserOnboardingHeader.pcss";
 @import "./views/user-onboarding/_UserOnboardingList.pcss";
 @import "./views/user-onboarding/_UserOnboardingPage.pcss";

res/css/structures/_SpaceRoomView.pcss

@@ -96,10 +96,6 @@ $SpaceRoomViewInnerWidth: 428px;
  }
  }
 
- &:not(.mx_SpaceRoomView_landing) .mx_SpaceFeedbackPrompt {
- width: $SpaceRoomViewInnerWidth;
- }
-
  .mx_SpaceRoomView_buttons {
  display: block;
  margin-top: 44px;
@@ -153,16 +149,6 @@ $SpaceRoomViewInnerWidth: 428px;
  border-radius: 12px;
  }
  }
-
- /* XXX: Temporary for the Spaces release only */
- .mx_SpaceFeedbackPrompt {
- padding: 7px; /* 8px - 1px border */
- border: 1px solid rgba($primary-content, 0.1);
- border-radius: 8px;
- width: max-content;
- height: fit-content;
- margin-left: 24px;
- }
  }
 
  .mx_SpaceRoomView_landing_name {

res/css/views/dialogs/_SpotlightDialog.pcss

@@ -511,24 +511,4 @@ limitations under the License.
  }
  }
  }
-
- .mx_SpotlightDialog_footer {
- font-size: $font-12px;
- line-height: $font-15px;
- color: $secondary-content;
- padding: $spacing-12 $spacing-16 $spacing-16;
- display: flex;
- border-top: 1px solid $quinary-content;
-
- > span {
- align-self: center;
- }
-
- .mx_AccessibleButton_kind_primary_outline {
- padding: $spacing-4 $spacing-8;
- border-color: $secondary-content;
- color: $secondary-content;
- margin-left: auto;
- }
- }
 }

res/css/views/spaces/_SpaceCreateMenu.pcss

@@ -42,13 +42,6 @@ $spacePanelWidth: 68px;
  font-size: $font-15px;
  color: $secondary-content;
  }
-
- /* XXX: Temporary for the Spaces release only */
- .mx_SpaceFeedbackPrompt {
- border-top: 1px solid $input-border-color;
- padding-top: 12px;
- margin-top: 16px;
- }
  }
 
  .mx_SpaceCreateMenuType {
@@ -100,21 +93,3 @@ $spacePanelWidth: 68px;
  }
  }
 }
-
-.mx_SpaceFeedbackPrompt {
- font-size: $font-15px;
- line-height: $font-24px;
-
- > span {
- color: $secondary-content;
- position: relative;
- font-size: inherit;
- line-height: inherit;
- margin-right: 8px;
- }
-
- .mx_AccessibleButton_kind_link {
- color: $accent;
- position: relative;
- }
-}

res/css/views/user-onboarding/_UserOnboardingFeedback.pcss

@@ -48,10 +48,6 @@ limitations under the License.
 
  @mixin ProgressBarBorderRadius 16px;
  }
-
- .mx_UserOnboardingFeedback {
- margin-top: $spacing-16;
- }
  }
 
  .mx_UserOnboardingList_list {

res/css/views/user-onboarding/_UserOnboardingList.pcss

@@ -71,7 +71,6 @@ import RoomTopic from "../views/elements/RoomTopic";
 import withValidation from "../views/elements/Validation";
 import RoomInfoLine from "../views/rooms/RoomInfoLine";
 import RoomPreviewCard from "../views/rooms/RoomPreviewCard";
-import { SpaceFeedbackPrompt } from "../views/spaces/SpaceCreateMenu";
 import SpacePublicShare from "../views/spaces/SpacePublicShare";
 import { ChevronFace, ContextMenuButton, useContextMenu } from "./ContextMenu";
 import MainSplit from "./MainSplit";
@@ -269,7 +268,6 @@ const SpaceLanding: React.FC<{ space: Room }> = ({ space }) => {
  <div className="mx_SpaceRoomView_landing">
  <div className="mx_SpaceRoomView_landing_header">
  <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
- <SpaceFeedbackPrompt />
  </div>
  <div className="mx_SpaceRoomView_landing_name">
  <RoomName room={space}>

src/components/structures/SpaceRoomView.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<IProps, IState> {
  }
 
  let feedbackButton: JSX.Element | undefined;
- if (SettingsStore.getValue(UIFeature.Feedback)) {
+ if (shouldShowFeedback()) {
  feedbackButton = (
  <IconizedContextMenuOption
  iconClassName="mx_UserMenu_iconMessage"

src/components/structures/UserMenu.tsx

@@ -54,7 +54,6 @@ import { useUserDirectory } from "../../../../hooks/useUserDirectory";
 import { getKeyBindingsManager } from "../../../../KeyBindingsManager";
 import { _t } from "../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
-import Modal from "../../../../Modal";
 import { PosthogAnalytics } from "../../../../PosthogAnalytics";
 import { getCachedRoomIDForAlias } from "../../../../RoomAliasCache";
 import { showStartChatInviteDialog } from "../../../../RoomInvite";
@@ -81,14 +80,12 @@ import LabelledCheckbox from "../../elements/LabelledCheckbox";
 import Spinner from "../../elements/Spinner";
 import NotificationBadge from "../../rooms/NotificationBadge";
 import BaseDialog from "../BaseDialog";
-import FeedbackDialog from "../FeedbackDialog";
 import { Option } from "./Option";
 import { PublicRoomResultDetails } from "./PublicRoomResultDetails";
 import { RoomResultContextMenus } from "./RoomResultContextMenus";
 import { RoomContextDetails } from "../../rooms/RoomContextDetails";
 import { TooltipOption } from "./TooltipOption";
 import { isLocalRoom } from "../../../../utils/localRoom/isLocalRoom";
-import { shouldShowFeedback } from "../../../../utils/Feedback";
 import RoomAvatar from "../../avatars/RoomAvatar";
 import { useFeatureEnabled } from "../../../../hooks/useSettings";
 import { filterBoolean } from "../../../../utils/arrays";
@@ -1157,14 +1154,6 @@ const SpotlightDialog: React.FC<IProps> = ({ 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<IProps> = ({ initialText = "", initialFilter = n
  >
  {content}
  </div>
-
- <div className="mx_SpotlightDialog_footer">
- {openFeedback &&
- _t(
- "Results not as expected? Please <a>give feedback</a>.",
- {},
- {
- a: (sub) => (
- <AccessibleButton kind="link_inline" onClick={openFeedback}>
- {sub}
- </AccessibleButton>
- ),
- },
- )}
- {openFeedback && (
- <AccessibleButton kind="primary_outline" onClick={openFeedback}>
- {_t("Feedback")}
- </AccessibleButton>
- )}
- </div>
  </BaseDialog>
  </>
  );

src/components/views/dialogs/spotlight/SpotlightDialog.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 (
- <div className="mx_SpaceFeedbackPrompt">
- <span className="mx_SpaceFeedbackPrompt_text">{_t("Spaces are a new feature.")}</span>
- <AccessibleButton
- kind="link_inline"
- onClick={() => {
- 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.")}
- </AccessibleButton>
- </div>
- );
-};
-
 type BProps = Omit<ComponentProps<typeof SpaceBasicSettings>, "nameDisabled" | "topicDisabled" | "avatarDisabled">;
 interface ISpaceCreateFormProps extends BProps {
  busy: boolean;
@@ -316,8 +277,6 @@ const SpaceCreateMenu: React.FC<{
  />
 
  <p>{_t("To join a space you'll need an invite.")}</p>
-
- <SpaceFeedbackPrompt onClick={onFinished} />
  </React.Fragment>
  );
  } else {