From a4a478cf720881aefca72bf1823925a5d3e77c7d Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Tue, 9 Feb 2021 20:01:45 +0200 Subject: [PATCH] Remove host signup link from UserMenu.tsx It duplicates the new host signup modal dialog. --- src/components/structures/UserMenu.tsx | 29 ++------------------------ 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx index 296642a8d9..5b34d36d09 100644 --- a/src/components/structures/UserMenu.tsx +++ b/src/components/structures/UserMenu.tsx @@ -28,7 +28,6 @@ import Modal from "../../Modal"; import LogoutDialog from "../views/dialogs/LogoutDialog"; import SettingsStore from "../../settings/SettingsStore"; import {getCustomTheme} from "../../theme"; -import {getHostingLink} from "../../utils/HostingLink"; import AccessibleButton, {ButtonEvent} from "../views/elements/AccessibleButton"; import SdkConfig from "../../SdkConfig"; import {getHomePageUrl} from "../../utils/pages"; @@ -274,7 +273,6 @@ export default class UserMenu extends React.Component { const prototypeCommunityName = CommunityPrototypeStore.instance.getSelectedCommunityName(); let topSection; - const signupLink = getHostingLink("user-context-menu"); const hostSignupConfig: IHostSignupConfig = SdkConfig.get().hostSignup; if (MatrixClientPeg.get().isGuest()) { topSection = ( @@ -295,8 +293,7 @@ export default class UserMenu extends React.Component { })} ) - } else if (signupLink || hostSignupConfig) { - let hostSignupAction; + } else if (hostSignupConfig) { if (hostSignupConfig && hostSignupConfig.url) { // If hostSignup.domains is set to a non-empty array, only show // dialog if the user is on the domain or a subdomain. @@ -304,33 +301,11 @@ export default class UserMenu extends React.Component { const mxDomain = MatrixClientPeg.get().getDomain(); const validDomains = hostSignupDomains.filter(d => (d === mxDomain || mxDomain.endsWith(`.${d}`))); if (!hostSignupDomains || validDomains.length > 0) { - hostSignupAction =
+ topSection =
; } } - topSection = ( - <> - {signupLink && -
- {_t( - "Upgrade to your own domain", {}, - { - a: sub => ( - - {sub} - - ), - }, - )} -
- } - {hostSignupAction} - - ); } let homeButton = null;