- You can even use 'img' tags
+ You can even add images with Matrix URLs
- {
- if (!ev.target.files?.length) return;
- setBusy(true);
- Analytics.trackEvent("home_page", "upload_avatar");
- CountlyAnalytics.instance.track("home_page_upload_avatar");
- const file = ev.target.files[0];
- const uri = await cli.uploadContent(file);
- await cli.setAvatarUrl(uri);
- setBusy(false);
- }}
- accept="image/*"
- />
-
- {
- uploadRef.current.click();
- }}
+ cli.setAvatarUrl(url)}
>
- {state => (
-
-
+
{
const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
const hasModifier = ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey;
const isModifier = ev.key === Key.ALT || ev.key === Key.CONTROL || ev.key === Key.META || ev.key === Key.SHIFT;
+ const modKey = isMac ? ev.metaKey : ev.ctrlKey;
switch (ev.key) {
case Key.PAGE_UP:
@@ -436,6 +438,16 @@ class LoggedInView extends React.Component {
}
break;
+ case Key.H:
+ if (ev.altKey && modKey) {
+ dis.dispatch({
+ action: 'view_home_page',
+ });
+ Modal.closeCurrentModal("homeKeyboardShortcut");
+ handled = true;
+ }
+ break;
+
case Key.ARROW_UP:
case Key.ARROW_DOWN:
if (ev.altKey && !ev.ctrlKey && !ev.metaKey) {
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 22cd73eff7..114347196a 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -87,38 +87,37 @@ import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
export enum Views {
// a special initial state which is only used at startup, while we are
// trying to re-animate a matrix client or register as a guest.
- LOADING = 0,
+ LOADING,
// we are showing the welcome view
- WELCOME = 1,
+ WELCOME,
// we are showing the login view
- LOGIN = 2,
+ LOGIN,
// we are showing the registration view
- REGISTER = 3,
-
- // completing the registration flow
- POST_REGISTRATION = 4,
+ REGISTER,
// showing the 'forgot password' view
- FORGOT_PASSWORD = 5,
+ FORGOT_PASSWORD,
// showing flow to trust this new device with cross-signing
- COMPLETE_SECURITY = 6,
+ COMPLETE_SECURITY,
// flow to setup SSSS / cross-signing on this account
- E2E_SETUP = 7,
+ E2E_SETUP,
// we are logged in with an active matrix client. The logged_in state also
// includes guests users as they too are logged in at the client level.
- LOGGED_IN = 8,
+ LOGGED_IN,
// We are logged out (invalid token) but have our local state again. The user
// should log back in to rehydrate the client.
- SOFT_LOGOUT = 9,
+ SOFT_LOGOUT,
}
+const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas"];
+
// Actions that are redirected through the onboarding process prior to being
// re-dispatched. NOTE: some actions are non-trivial and would require
// re-factoring to be included in this list in future.
@@ -562,11 +561,6 @@ export default class MatrixChat extends React.PureComponent {
ThemeController.isLogin = true;
this.themeWatcher.recheck();
break;
- case 'start_post_registration':
- this.setState({
- view: Views.POST_REGISTRATION,
- });
- break;
case 'start_password_recovery':
this.setStateForNewView({
view: Views.FORGOT_PASSWORD,
@@ -653,8 +647,9 @@ export default class MatrixChat extends React.PureComponent {
}
case Action.ViewRoomDirectory: {
const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
- Modal.createTrackedDialog('Room directory', '', RoomDirectory, {},
- 'mx_RoomDirectory_dialogWrapper', false, true);
+ Modal.createTrackedDialog('Room directory', '', RoomDirectory, {
+ initialText: payload.initialText,
+ }, 'mx_RoomDirectory_dialogWrapper', false, true);
// View the welcome or home page if we need something to look at
this.viewSomethingBehindModal();
@@ -677,7 +672,7 @@ export default class MatrixChat extends React.PureComponent {
this.chatCreateOrReuse(payload.user_id);
break;
case 'view_create_chat':
- showStartChatInviteDialog();
+ showStartChatInviteDialog(payload.initialText || "");
break;
case 'view_invite':
showRoomInviteDialog(payload.roomId);
@@ -1554,6 +1549,14 @@ export default class MatrixChat extends React.PureComponent {
}
showScreen(screen: string, params?: {[key: string]: any}) {
+ const cli = MatrixClientPeg.get();
+ const isLoggedOutOrGuest = !cli || cli.isGuest();
+ if (!isLoggedOutOrGuest && AUTH_SCREENS.includes(screen)) {
+ // user is logged in and landing on an auth page which will uproot their session, redirect them home instead
+ dis.dispatch({ action: "view_home_page" });
+ return;
+ }
+
if (screen === 'register') {
dis.dispatch({
action: 'start_registration',
@@ -1570,7 +1573,7 @@ export default class MatrixChat extends React.PureComponent {
params: params,
});
} else if (screen === 'soft_logout') {
- if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId() && !Lifecycle.isSoftLogout()) {
+ if (cli.getUserId() && !Lifecycle.isSoftLogout()) {
// Logged in - visit a room
this.viewLastRoom();
} else {
@@ -1621,14 +1624,6 @@ export default class MatrixChat extends React.PureComponent {
dis.dispatch({
action: 'view_my_groups',
});
- } else if (screen === 'complete_security') {
- dis.dispatch({
- action: 'start_complete_security',
- });
- } else if (screen === 'post_registration') {
- dis.dispatch({
- action: 'start_post_registration',
- });
} else if (screen.indexOf('room/') === 0) {
// Rooms can have the following formats:
// #room_alias:domain or !opaque_id:domain
@@ -1799,14 +1794,6 @@ export default class MatrixChat extends React.PureComponent {
return Lifecycle.setLoggedIn(credentials);
}
- onFinishPostRegistration = () => {
- // Don't confuse this with "PageType" which is the middle window to show
- this.setState({
- view: Views.LOGGED_IN,
- });
- this.showScreen("settings");
- };
-
onSendEvent(roomId: string, event: MatrixEvent) {
const cli = MatrixClientPeg.get();
if (!cli) {
@@ -1971,13 +1958,6 @@ export default class MatrixChat extends React.PureComponent {
accountPassword={this.accountPassword}
/>
);
- } else if (this.state.view === Views.POST_REGISTRATION) {
- // needs to be before normal PageTypes as you are logged in technically
- const PostRegistration = sdk.getComponent('structures.auth.PostRegistration');
- view = (
-
{ eventTiles }
,
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index ece70e3a8f..e3323b05fa 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -44,6 +44,7 @@ function track(action) {
export default class RoomDirectory extends React.Component {
static propTypes = {
+ initialText: PropTypes.string,
onFinished: PropTypes.func.isRequired,
};
@@ -61,7 +62,7 @@ export default class RoomDirectory extends React.Component {
error: null,
instanceId: undefined,
roomServer: MatrixClientPeg.getHomeserverName(),
- filterString: null,
+ filterString: this.props.initialText || "",
selectedCommunityId: SettingsStore.getValue("feature_communities_v2_prototypes")
? selectedCommunityId
: null,
@@ -686,6 +687,7 @@ export default class RoomDirectory extends React.Component {
onJoinClick={this.onJoinFromSearchClick}
placeholder={placeholder}
showJoinButton={showJoinButton}
+ initialText={this.props.initialText}
/>
{dropdown}
;
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index 526aecddd7..a64e40bc65 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -148,7 +148,7 @@ export default class RoomSearch extends React.PureComponent{ _t("Welcome %(name)s", { name: ownProfile.displayName }) }
{ _t("Now, let's help you get started") }
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index ab5b93794c..ec5afd13f0 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -21,7 +21,7 @@ import * as PropTypes from 'prop-types'; import { MatrixClient } from 'matrix-js-sdk/src/client'; import { DragDropContext } from 'react-beautiful-dnd'; -import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard'; +import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent, isMac} from '../../Keyboard'; import PageTypes from '../../PageTypes'; import CallMediaHandler from '../../CallMediaHandler'; import { fixupColorFonts } from '../../utils/FontManager'; @@ -52,6 +52,7 @@ import RoomListStore from "../../stores/room-list/RoomListStore"; import NonUrgentToastContainer from "./NonUrgentToastContainer"; import { ToggleRightPanelPayload } from "../../dispatcher/payloads/ToggleRightPanelPayload"; import { IThreepidInvite } from "../../stores/ThreepidInviteStore"; +import Modal from "../../Modal"; import { ICollapseConfig } from "../../resizer/distributors/collapse"; // We need to fetch each pinned message individually (if we don't already have it) @@ -392,6 +393,7 @@ class LoggedInView extends React.Component
- { _t("There's no one else here! Would you like to invite others " +
- "or stop warning about the empty room ?",
- {},
- {
- 'inviteText': (sub) =>
- { sub },
- 'nowarnText': (sub) =>
- { sub },
- },
- ) }
-
- );
- }
-
return null;
}
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 0cb4a5d305..de7ae347dd 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -71,7 +71,7 @@ import RoomHeader from "../views/rooms/RoomHeader";
import TintableSvg from "../views/elements/TintableSvg";
import {XOR} from "../../@types/common";
import { IThreepidInvite } from "../../stores/ThreepidInviteStore";
-import { CallState, CallType, MatrixCall } from "matrix-js-sdk/lib/webrtc/call";
+import { CallState, CallType, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
import WidgetStore from "../../stores/WidgetStore";
import {UPDATE_EVENT} from "../../stores/AsyncStore";
import Notifier from "../../Notifier";
@@ -150,7 +150,6 @@ export interface IState {
guestsCanJoin: boolean;
canPeek: boolean;
showApps: boolean;
- isAlone: boolean;
isPeeking: boolean;
showingPinned: boolean;
showReadReceipts: boolean;
@@ -223,7 +222,6 @@ export default class RoomView extends React.Component
- { _t('Set a display name:') }
-
- { _t('Create your account') }
{ errorText } { serverDeadSection } { this.renderServerComponent() } + { this.state.phase !== PHASE_SERVER_DETAILS &&+ {yourMatrixAccountText} + {editLink} +
} { this.renderRegisterComponent() } { goBack } { signIn } diff --git a/src/components/views/auth/CaptchaForm.js b/src/components/views/auth/CaptchaForm.js index 5cce93f0b8..e2d7d594fa 100644 --- a/src/components/views/auth/CaptchaForm.js +++ b/src/components/views/auth/CaptchaForm.js @@ -102,6 +102,10 @@ export default class CaptchaForm extends React.Component { console.log("Loaded recaptcha script."); try { this._renderRecaptcha(DIV_ID); + // clear error if re-rendered + this.setState({ + errorText: null, + }); CountlyAnalytics.instance.track("onboarding_grecaptcha_loaded"); } catch (e) { this.setState({ diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js index f49e6959fb..6628ca7120 100644 --- a/src/components/views/auth/InteractiveAuthEntryComponents.js +++ b/src/components/views/auth/InteractiveAuthEntryComponents.js @@ -421,12 +421,12 @@ export class EmailIdentityAuthEntry extends React.Component { return
-
- {this.props.serverConfig.hsName}
- ;
- },
- });
- }
-
- let editLink = null;
- if (this.props.onEditServerDetailsClick) {
- editLink =
- {_t('Change')}
- ;
- }
-
const registerButton = (
);
@@ -572,10 +547,6 @@ export default class RegistrationForm extends React.Component {
return (
{ _t("An email has been sent to %(emailAddress)s", - { emailAddress: (sub) => { this.props.inputs.emailAddress } }, +
+
);
}
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index db7d1df994..70c1017427 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -51,7 +51,6 @@ export default class RegistrationForm extends React.Component {
defaultUsername: PropTypes.string,
defaultPassword: PropTypes.string,
onRegisterClick: PropTypes.func.isRequired, // onRegisterClick(Object) => ?Promise
- onEditServerDetailsClick: PropTypes.func,
flows: PropTypes.arrayOf(PropTypes.object).isRequired,
serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
canSubmit: PropTypes.bool,
@@ -250,6 +249,7 @@ export default class RegistrationForm extends React.Component {
validateEmailRules = withValidation({
description: () => _t("Use an email address to recover your account"),
+ hideDescriptionIfValid: true,
rules: [
{
key: "required",
@@ -326,6 +326,7 @@ export default class RegistrationForm extends React.Component {
validatePhoneNumberRules = withValidation({
description: () => _t("Other users can invite you to rooms using your contact details"),
+ hideDescriptionIfValid: true,
rules: [
{
key: "required",
@@ -356,6 +357,7 @@ export default class RegistrationForm extends React.Component {
validateUsernameRules = withValidation({
description: () => _t("Use lowercase letters, numbers, dashes and underscores only"),
+ hideDescriptionIfValid: true,
rules: [
{
key: "required",
@@ -458,7 +460,7 @@ export default class RegistrationForm extends React.Component {
ref={field => this[FIELD_PASSWORD_CONFIRM] = field}
type="password"
autoComplete="new-password"
- label={_t("Confirm")}
+ label={_t("Confirm password")}
value={this.state.passwordConfirm}
onChange={this.onPasswordConfirmChange}
onValidate={this.onPasswordConfirmValidate}
@@ -510,33 +512,6 @@ export default class RegistrationForm extends React.Component {
}
render() {
- let yourMatrixAccountText = _t('Create your Matrix account on %(serverName)s', {
- serverName: this.props.serverConfig.hsName,
- });
- if (this.props.serverConfig.hsNameIsDifferent) {
- const TextWithTooltip = sdk.getComponent("elements.TextWithTooltip");
-
- yourMatrixAccountText = _t('Create your Matrix account on { _t("A confirmation email has been sent to %(emailAddress)s", + { emailAddress: (sub) => { this.props.inputs.emailAddress } }, ) }
-{ _t("Please check your email to continue registration.") }
+{ _t("Open the link in the email to continue registration.") }
-