- ![]({require("../../../../res/img/warning.svg")})
-
- { _t("Yes, I want to help!") }
-
-
- ![{_t('Close')}]({require("../../../../res/img/cancel.svg")})
-
-
- );
- }
-}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8ac05bf429..a79ee97109 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -391,10 +391,17 @@
"Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
"Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
"Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
+ "Notifications": "Notifications",
+ "Send
-
- { this.props.policyUrl ? _t(
- "Please help improve Riot.im by sending anonymous usage data . " +
- "This will use a cookie " +
- "(please see our Cookie Policy ).",
- {},
- {
- 'UsageDataLink': (sub) =>
- { sub }
- ,
- // XXX: We need to link to the page that explains our cookies
- 'PolicyLink': (sub) =>
- { sub }
-
- ,
- },
- ) : _t(
- "Please help improve Riot.im by sending anonymous usage data . " +
- "This will use a cookie.",
- {},
- {
- 'UsageDataLink': (sub) =>
- { sub }
- ,
- },
- ) }
-
-
-
-
-
- );
- },
-});
diff --git a/src/toasts/SetPasswordToast.ts b/src/toasts/SetPasswordToast.ts
new file mode 100644
index 0000000000..88cc317978
--- /dev/null
+++ b/src/toasts/SetPasswordToast.ts
@@ -0,0 +1,47 @@
+/*
+Copyright 2020 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 { _t } from "../languageHandler";
+import Modal from "../Modal";
+import SetPasswordDialog from "../components/views/dialogs/SetPasswordDialog";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const onAccept = () => {
+ Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog);
+};
+
+const TOAST_KEY = "setpassword";
+
+export const showToast = () => {
+ ToastStore.sharedInstance().addOrReplaceToast({
+ key: TOAST_KEY,
+ title: _t("Set password"),
+ props: {
+ description: _t("To return to your account in future you need to set a password"),
+ acceptLabel: _t("Set Password"),
+ onAccept,
+ rejectLabel: _t("Later"),
+ onReject: hideToast, // it'll return on reload
+ },
+ component: GenericToast,
+ priority: 60,
+ });
+};
+
+export const hideToast = () => {
+ ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
From ccf9e6512341bb7395b1eba3841b0ce475379da5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 22:27:19 +0100
Subject: [PATCH 07/33] Migrate Server Limit Bar Banner to a Toast
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/LoggedInView.tsx | 56 ++++++-----
.../views/globals/ServerLimitBar.js | 99 -------------------
src/toasts/ServerLimitToast.tsx | 50 ++++++++++
3 files changed, 80 insertions(+), 125 deletions(-)
delete mode 100644 src/components/views/globals/ServerLimitBar.js
create mode 100644 src/toasts/ServerLimitToast.tsx
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 131e6a3867..edb2482aa3 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -47,6 +47,10 @@ import {
showToast as showSetPasswordToast,
hideToast as hideSetPasswordToast
} from "../../toasts/SetPasswordToast";
+import {
+ showToast as showServerLimitToast,
+ hideToast as hideServerLimitToast
+} from "../../toasts/ServerLimitToast";
// We need to fetch each pinned message individually (if we don't already have it)
// so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -99,7 +103,6 @@ interface IState {
};
syncErrorData: any;
useCompactLayout: boolean;
- serverNoticeEvents: MatrixEvent[];
}
/**
@@ -144,8 +147,6 @@ class LoggedInView extends React.PureComponent
-
- { _t(
- "To return to your account in future you need to set a password",
- {},
- { 'u': (sub) => { sub } },
- ) }
-
-
-
-
- );
- },
-});
diff --git a/src/toasts/ServerLimitToast.tsx b/src/toasts/ServerLimitToast.tsx
new file mode 100644
index 0000000000..f2de9e3499
--- /dev/null
+++ b/src/toasts/ServerLimitToast.tsx
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 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, _td } from "../languageHandler";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+import {messageForResourceLimitError} from "../utils/ErrorUtils";
+
+const TOAST_KEY = "serverlimit";
+
+export const showToast = (limitType: string, adminContact?: string, syncError?: boolean) => {
+ const errorText = messageForResourceLimitError(limitType, adminContact, {
+ 'monthly_active_user': _td("Your homeserver has exceeded its user limit."),
+ '': _td("Your homeserver has exceeded one of its resource limits."),
+ });
+ const contactText = messageForResourceLimitError(limitType, adminContact, {
+ '': _td("Contact your server admin."),
+ });
+
+ ToastStore.sharedInstance().addOrReplaceToast({
+ key: TOAST_KEY,
+ title: _t("Notifications"),
+ props: {
+ description:
- {limitError}
- {' '}
- {adminContact}
-
- {releaseNotes}
,
- button: _t("Update"),
- onFinished: (update) => {
- if (update && PlatformPeg.get()) {
- PlatformPeg.get().installUpdate();
- }
- },
- });
- },
-
- displayChangelog: function() {
- const ChangelogDialog = sdk.getComponent('dialogs.ChangelogDialog');
- Modal.createTrackedDialog('Display Changelog', '', ChangelogDialog, {
- version: this.props.version,
- newVersion: this.props.newVersion,
- onFinished: (update) => {
- if (update && PlatformPeg.get()) {
- PlatformPeg.get().installUpdate();
- }
- },
- });
- },
-
- onUpdateClicked: function() {
- PlatformPeg.get().installUpdate();
- },
-
- render: function() {
- let action_button;
- // If we have release notes to display, we display them. Otherwise,
- // we display the Changelog Dialog which takes two versions and
- // automatically tells you what's changed (provided the versions
- // are in the right format)
- if (this.props.releaseNotes) {
- action_button = (
-
- );
- } else if (checkVersion(this.props.version) && checkVersion(this.props.newVersion)) {
- action_button = (
-
- );
- } else if (PlatformPeg.get()) {
- action_button = (
-
- );
- }
- return (
-
-
-
- );
- },
-});
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 72c19587c8..0170aee17a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -421,6 +421,12 @@
"Other users may not trust it": "Other users may not trust it",
"New login. Was this you?": "New login. Was this you?",
"Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
+ "What's New": "What's New",
+ "Update": "Update",
+ "What's new?": "What's new?",
+ "Restart": "Restart",
+ "Upgrade your Riot": "Upgrade your Riot",
+ "A new version of Riot is available!": "A new version of Riot is available!",
"There was an error joining the room": "There was an error joining the room",
"Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
"Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
@@ -1391,10 +1397,6 @@
"Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
"Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
"You're not currently a member of any communities.": "You're not currently a member of any communities.",
- "What's New": "What's New",
- "Update": "Update",
- "What's new?": "What's new?",
- "A new version of Riot is available.": "A new version of Riot is available.",
"Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
"Checking for an update...": "Checking for an update...",
"No update available.": "No update available.",
diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
new file mode 100644
index 0000000000..3d4b55a4ff
--- /dev/null
+++ b/src/toasts/UpdateToast.tsx
@@ -0,0 +1,90 @@
+/*
+Copyright 2020 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 GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+import QuestionDialog from "../components/views/dialogs/QuestionDialog";
+import ChangelogDialog from "../components/views/dialogs/ChangelogDialog";
+import PlatformPeg from "../PlatformPeg";
+import Modal from "../Modal";
+
+const TOAST_KEY = "update";
+
+/*
+ * Check a version string is compatible with the Changelog
+ * dialog ([riot-version]-react-[react-sdk-version]-js-[js-sdk-version])
+ */
+function checkVersion(ver) {
+ const parts = ver.split('-');
+ return parts.length === 5 && parts[1] === 'react' && parts[3] === 'js';
+}
+
+function installUpdate() {
+ PlatformPeg.get().installUpdate();
+}
+
+export const showToast = (version: string, newVersion: string, releaseNotes?: string) => {
+ let onAccept;
+ let acceptLabel = _t("What's new?");
+ if (releaseNotes) {
+ onAccept = () => {
+ Modal.createTrackedDialog('Display release notes', '', QuestionDialog, {
+ title: _t("What's New"),
+ description:
-
- {_t("A new version of Riot is available.")}
-
- {action_button}
- {releaseNotes},
+ button: _t("Update"),
+ onFinished: (update) => {
+ if (update && PlatformPeg.get()) {
+ PlatformPeg.get().installUpdate();
+ }
+ },
+ });
+ };
+ } else if (checkVersion(version) && checkVersion(newVersion)) {
+ onAccept = () => {
+ Modal.createTrackedDialog('Display Changelog', '', ChangelogDialog, {
+ version,
+ newVersion,
+ onFinished: (update) => {
+ if (update && PlatformPeg.get()) {
+ PlatformPeg.get().installUpdate();
+ }
+ },
+ });
+ };
+ } else {
+ onAccept = installUpdate;
+ acceptLabel = _t("Restart");
+ }
+
+ ToastStore.sharedInstance().addOrReplaceToast({
+ key: TOAST_KEY,
+ title: _t("Upgrade your Riot"),
+ props: {
+ description: _t("A new version of Riot is available!"),
+ acceptLabel,
+ onAccept,
+ },
+ component: GenericToast,
+ priority: 20,
+ });
+};
+
+export const hideToast = () => {
+ ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
From 41934268087fa0b9be828f1714eb4a5e3ab6f28a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 23:14:33 +0100
Subject: [PATCH 11/33] delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/LoggedInView.tsx | 3 ---
src/components/structures/MatrixChat.tsx | 1 -
2 files changed, 4 deletions(-)
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 2a17233ec6..df21768da5 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -91,9 +91,6 @@ interface IProps {
currentUserId?: string;
currentGroupId?: string;
currentGroupIsNew?: boolean;
- version?: string;
- newVersion?: string;
- newVersionReleaseNotes?: string;
}
interface IState {
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index f4d31708fe..e6db42af1d 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -226,7 +226,6 @@ export default class MatrixChat extends React.PureComponent