{
break;
case PageTypes.HomePage:
- pageElement =
;
+ pageElement =
;
break;
case PageTypes.UserView:
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index f417bd6045a..9d3114c67cb 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -55,7 +55,6 @@ import { FontWatcher } from "../../settings/watchers/FontWatcher";
import { storeRoomAliasInCache } from "../../RoomAliasCache";
import ToastStore from "../../stores/ToastStore";
import * as StorageManager from "../../utils/StorageManager";
-import { UseCase } from "../../settings/enums/UseCase";
import type LoggedInViewType from "./LoggedInView";
import LoggedInView from "./LoggedInView";
import { Action } from "../../dispatcher/actions";
@@ -114,7 +113,6 @@ import { ShowThreadPayload } from "../../dispatcher/payloads/ShowThreadPayload";
import { RightPanelPhases } from "../../stores/right-panel/RightPanelStorePhases";
import RightPanelStore from "../../stores/right-panel/RightPanelStore";
import { TimelineRenderingType } from "../../contexts/RoomContext";
-import { UseCaseSelection } from "../views/elements/UseCaseSelection";
import { ValidatedServerConfig } from "../../utils/ValidatedServerConfig";
import { isLocalRoom } from "../../utils/localRoom/isLocalRoom";
import { SDKContext, SdkContextClass } from "../../contexts/SDKContext";
@@ -866,8 +864,7 @@ export default class MatrixChat extends React.PureComponent
{
this.state.view !== Views.LOGIN &&
this.state.view !== Views.REGISTER &&
this.state.view !== Views.COMPLETE_SECURITY &&
- this.state.view !== Views.E2E_SETUP &&
- this.state.view !== Views.USE_CASE_SELECTION
+ this.state.view !== Views.E2E_SETUP
) {
this.onLoggedIn();
}
@@ -1359,12 +1356,7 @@ export default class MatrixChat extends React.PureComponent {
await this.onShowPostLoginScreen();
}
- private async onShowPostLoginScreen(useCase?: UseCase): Promise {
- if (useCase) {
- PosthogAnalytics.instance.setProperty("ftueUseCaseSelection", useCase);
- SettingsStore.setValue("FTUE.useCaseSelection", null, SettingLevel.ACCOUNT, useCase);
- }
-
+ private async onShowPostLoginScreen(): Promise {
this.setStateForNewView({ view: Views.LOGGED_IN });
// If a specific screen is set to be shown after login, show that above
// all else, as it probably means the user clicked on something already.
@@ -2010,33 +2002,10 @@ export default class MatrixChat extends React.PureComponent {
// complete security / e2e setup has finished
private onCompleteSecurityE2eSetupFinished = (): void => {
- if (MatrixClientPeg.currentUserIsJustRegistered() && SettingsStore.getValue("FTUE.useCaseSelection") === null) {
- this.setStateForNewView({ view: Views.USE_CASE_SELECTION });
-
- // Listen to changes in settings and hide the use case screen if appropriate - this is necessary because
- // account settings can still be changing at this point in app init (due to the initial sync being cached,
- // then subsequent syncs being received from the server)
- //
- // This seems unlikely for something that should happen directly after registration, but if a user does
- // their initial login on another device/browser than they registered on, we want to avoid asking this
- // question twice
- //
- // initPosthogAnalyticsToast pioneered this technique, we’re just reusing it here.
- SettingsStore.watchSetting(
- "FTUE.useCaseSelection",
- null,
- (originalSettingName, changedInRoomId, atLevel, newValueAtLevel, newValue) => {
- if (newValue !== null && this.state.view === Views.USE_CASE_SELECTION) {
- this.onShowPostLoginScreen();
- }
- },
- );
- } else {
- // This is async but we makign this function async to wait for it isn't useful
- this.onShowPostLoginScreen().catch((e) => {
- logger.error("Exception showing post-login screen", e);
- });
- }
+ // This is async but we making this function async to wait for it isn't useful
+ this.onShowPostLoginScreen().catch((e) => {
+ logger.error("Exception showing post-login screen", e);
+ });
};
private getFragmentAfterLogin(): string {
@@ -2156,8 +2125,6 @@ export default class MatrixChat extends React.PureComponent {
fragmentAfterLogin={fragmentAfterLogin}
/>
);
- } else if (this.state.view === Views.USE_CASE_SELECTION) {
- view = => this.onShowPostLoginScreen(useCase)} />;
} else if (this.state.view === Views.LOCK_STOLEN) {
view = ;
} else {
diff --git a/src/components/structures/UserView.tsx b/src/components/structures/UserView.tsx
index f71a6331d9e..7325f607ad8 100644
--- a/src/components/structures/UserView.tsx
+++ b/src/components/structures/UserView.tsx
@@ -17,7 +17,7 @@ import RightPanel from "./RightPanel";
import Spinner from "../views/elements/Spinner";
import ResizeNotifier from "../../utils/ResizeNotifier";
import { RightPanelPhases } from "../../stores/right-panel/RightPanelStorePhases";
-import { UserOnboardingPage } from "../views/user-onboarding/UserOnboardingPage";
+import HomePage from "./HomePage.tsx";
import MatrixClientContext from "../../contexts/MatrixClientContext";
interface IProps {
@@ -93,7 +93,7 @@ export default class UserView extends React.Component {
defaultSize={420}
analyticsRoomType="user_profile"
>
-
+
);
} else {
diff --git a/src/components/views/dialogs/AppDownloadDialog.tsx b/src/components/views/dialogs/AppDownloadDialog.tsx
deleted file mode 100644
index a934b5825a6..00000000000
--- a/src/components/views/dialogs/AppDownloadDialog.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React, { FC } from "react";
-
-import { Icon as FDroidBadge } from "../../../../res/img/badges/f-droid.svg";
-import { Icon as GooglePlayBadge } from "../../../../res/img/badges/google-play.svg";
-import { Icon as IOSBadge } from "../../../../res/img/badges/ios.svg";
-import { _t } from "../../../languageHandler";
-import SdkConfig from "../../../SdkConfig";
-import AccessibleButton from "../elements/AccessibleButton";
-import QRCode from "../elements/QRCode";
-import Heading from "../typography/Heading";
-import BaseDialog from "./BaseDialog";
-
-interface Props {
- onFinished(): void;
-}
-
-export const showAppDownloadDialogPrompt = (): boolean => {
- const desktopBuilds = SdkConfig.getObject("desktop_builds");
- const mobileBuilds = SdkConfig.getObject("mobile_builds");
-
- return (
- !!desktopBuilds?.get("available") ||
- !!mobileBuilds?.get("ios") ||
- !!mobileBuilds?.get("android") ||
- !!mobileBuilds?.get("fdroid")
- );
-};
-
-export const AppDownloadDialog: FC = ({ onFinished }) => {
- const brand = SdkConfig.get("brand");
- const desktopBuilds = SdkConfig.getObject("desktop_builds");
- const mobileBuilds = SdkConfig.getObject("mobile_builds");
-
- const urlAppStore = mobileBuilds?.get("ios");
-
- const urlGooglePlay = mobileBuilds?.get("android");
- const urlFDroid = mobileBuilds?.get("fdroid");
- const urlAndroid = urlGooglePlay ?? urlFDroid;
-
- return (
-
- {desktopBuilds?.get("available") && (
-
-
{_t("onboarding|download_brand_desktop", { brand })}
-
{}}
- >
- {_t("onboarding|download_brand_desktop", { brand })}
-
-
- {urlAppStore && (
-
-
{_t("common|ios")}
-
-
- {_t("onboarding|qr_or_app_links", {
- appLinks: "",
- qrCode: "",
- })}
-
-
-
- )}
- {urlAndroid && (
-
-
{_t("common|android")}
-
-
- {_t("onboarding|qr_or_app_links", {
- appLinks: "",
- qrCode: "",
- })}
-
-
- {urlGooglePlay && (
-
{}}
- >
-
-
- )}
- {urlFDroid && (
-
{}}
- >
-
-
- )}
-
-
- )}
-
-
{_t("onboarding|apple_trademarks")}
-
{_t("onboarding|google_trademarks")}
-
-
{_t("onboarding|use_case_heading1")}
-
-
-
{_t("onboarding|use_case_heading2")}
- {_t("onboarding|use_case_heading3")}
-
-
-
-
-
-
-
-
setSelected(UseCase.Skip)}>
- {_t("action|skip")}
-
-
-
- {_t("common|welcome")}
-
-
-
-
-
- {title}
- .
-
-
{description}
-
- {actionLabel}
-
-
-
-
-
-
- {waiting > 0
- ? _t("onboarding|only_n_steps_to_go", {
- count: waiting,
- })
- : _t("onboarding|you_did_it")}
-
-
- {_t("onboarding|complete_these", {
- brand: SdkConfig.get("brand"),
- })}
-
-
-
-
- {tasks.map((task) => (
-
- ))}
-
-
-
- {title}
-
-
{description}
-
-
-
-
-
-
- Android
-
-
-
- or
-
-
-
-
-
-
- App Store® and the Apple logo® are trademarks of Apple Inc.
-
-
- Google Play and the Google Play logo are trademarks of Google LLC.
-
-
-
-
-
-
-
-
-
-
- Android
-
-
-
- or
-
-
-
-
-
-
- App Store® and the Apple logo® are trademarks of Apple Inc.
-
-
- Google Play and the Google Play logo are trademarks of Google LLC.
-
-
-
-
-
-
-
-
-
- App Store® and the Apple logo® are trademarks of Apple Inc.
-
-
- Google Play and the Google Play logo are trademarks of Google LLC.
-
-
-
-
-
-
-
-
-
-
- Android
-
-
-
- or
-
-
-
-
-
-
- App Store® and the Apple logo® are trademarks of Apple Inc.
-
-
- Google Play and the Google Play logo are trademarks of Google LLC.
-
-
-
-
{url}
,
-}));
-
-jest.mock("../../../../../src/components/structures/HomePage", () => ({
- __esModule: true,
- default: () => home page
,
-}));
-
-describe("UserOnboardingPage", () => {
- const renderComponent = async (): Promise => {
- const renderResult = render(, withClientContextRenderOptions(MatrixClientPeg.safeGet()));
- await act(async () => {
- jest.runAllTimers();
- });
- return renderResult;
- };
-
- filterConsole(
- // unrelated for this test
- "could not update user onboarding context",
- );
-
- beforeEach(() => {
- stubClient();
- jest.useFakeTimers();
- });
-
- afterEach(() => {
- jest.useRealTimers();
- jest.restoreAllMocks();
- });
-
- describe("when the user registered before the cutoff date", () => {
- beforeEach(() => {
- jest.spyOn(MatrixClientPeg, "userRegisteredAfter").mockReturnValue(false);
- });
-
- it("should render the home page", async () => {
- expect((await renderComponent()).queryByText("home page")).toBeInTheDocument();
- });
- });
-
- describe("when the user registered after the cutoff date", () => {
- beforeEach(() => {
- jest.spyOn(MatrixClientPeg, "userRegisteredAfter").mockReturnValue(true);
- });
-
- describe("and there is an explicit home page configured", () => {
- beforeEach(() => {
- jest.spyOn(SdkConfig, "get").mockReturnValue({
- embedded_pages: {
- home_url: "https://example.com/home",
- },
- });
- });
-
- it("should render the configured page", async () => {
- expect((await renderComponent()).queryByText("https://example.com/home")).toBeInTheDocument();
- });
- });
-
- describe("and there is no home page configured", () => {
- it("should render the onboarding", async () => {
- expect((await renderComponent()).queryByTestId("user-onboarding-list")).toBeInTheDocument();
- });
- });
- });
-});
diff --git a/test/unit-tests/hooks/useUserOnboardingTasks-test.tsx b/test/unit-tests/hooks/useUserOnboardingTasks-test.tsx
deleted file mode 100644
index c20a75e910b..00000000000
--- a/test/unit-tests/hooks/useUserOnboardingTasks-test.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React from "react";
-import { renderHook, waitFor } from "jest-matrix-react";
-
-import { useUserOnboardingTasks } from "../../../src/hooks/useUserOnboardingTasks";
-import { useUserOnboardingContext } from "../../../src/hooks/useUserOnboardingContext";
-import { stubClient } from "../../test-utils";
-import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
-import DMRoomMap from "../../../src/utils/DMRoomMap";
-import PlatformPeg from "../../../src/PlatformPeg";
-
-describe("useUserOnboardingTasks", () => {
- it.each([
- {
- context: {
- hasAvatar: false,
- hasDevices: false,
- hasDmRooms: false,
- showNotificationsPrompt: false,
- },
- },
- {
- context: {
- hasAvatar: true,
- hasDevices: false,
- hasDmRooms: false,
- showNotificationsPrompt: true,
- },
- },
- ])("sequence should stay static", async ({ context }) => {
- const { result } = renderHook(() => useUserOnboardingTasks(context));
-
- expect(result.current).toHaveLength(5);
- expect(result.current[0].id).toBe("create-account");
- expect(result.current[1].id).toBe("find-friends");
- expect(result.current[2].id).toBe("download-apps");
- expect(result.current[3].id).toBe("setup-profile");
- expect(result.current[4].id).toBe("permission-notifications");
- });
-
- it("should mark desktop notifications task completed on click", async () => {
- jest.spyOn(PlatformPeg, "get").mockReturnValue({
- supportsNotifications: jest.fn().mockReturnValue(true),
- maySendNotifications: jest.fn().mockReturnValue(false),
- } as any);
-
- const cli = stubClient();
- cli.pushRules = {
- global: {
- override: [
- {
- rule_id: ".m.rule.master",
- enabled: false,
- actions: [],
- default: true,
- },
- ],
- },
- };
- DMRoomMap.makeShared(cli);
- const context = renderHook(() => useUserOnboardingContext(), {
- wrapper: (props) => {
- return {props.children};
- },
- });
- const { result, rerender } = renderHook(() => useUserOnboardingTasks(context.result.current));
- expect(result.current[4].id).toBe("permission-notifications");
- expect(result.current[4].completed).toBe(false);
- result.current[4].action!.onClick!({ type: "click" } as any);
- await waitFor(() => {
- rerender();
- expect(result.current[4].completed).toBe(true);
- });
- });
-});