imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into sort-imports

Browse source 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
This commit is contained in:
Aaron Raimist 2021-12-09 08:34:20 +00:00
commit 7b94e13a84
642 changed files with 30052 additions and 8035 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/verification/VerificationCancelled.tsx
View file

@ -15,10 +15,9 @@ limitations under the License.
*/
import React from 'react';
import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import { replaceableComponent } from "../../../utils/replaceableComponent";
import DialogButtons from "../elements/DialogButtons";
interface IProps {
onDone: () => void;
@ -27,7 +26,6 @@ interface IProps {
@replaceableComponent("views.verification.VerificationCancelled")
export default class VerificationCancelled extends React.Component<IProps> {
public render(): React.ReactNode {
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
return <div>
<p>{ _t(
"The other party cancelled the verification.",

4
src/components/views/verification/VerificationComplete.tsx
View file

@ -15,10 +15,9 @@ limitations under the License.
*/
import React from 'react';
import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import { replaceableComponent } from "../../../utils/replaceableComponent";
import DialogButtons from "../elements/DialogButtons";
interface IProps {
onDone: () => void;
@ -27,7 +26,6 @@ interface IProps {
@replaceableComponent("views.verification.VerificationComplete")
export default class VerificationComplete extends React.Component<IProps> {
public render(): React.ReactNode {
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
return <div>
<h2>{ _t("Verified!") }</h2>
<p>{ _t("You've successfully verified this user.") }</p>

2
src/components/views/verification/VerificationShowSas.tsx
View file

@ -114,7 +114,7 @@ export default class VerificationShowSas extends React.Component<IProps, IState>
} else {
return <div>
{ _t("Unable to find a supported verification method.") }
<AccessibleButton kind="primary" onClick={this.props.onCancel} className="mx_UserInfo_wideButton">
<AccessibleButton kind="primary" onClick={this.props.onCancel}>
{ _t('Cancel') }
</AccessibleButton>
</div>;