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

Merge remote-tracking branch 'origin/dbkr/change_is' into travis/integs/account_set

Browse source
This commit is contained in:
Travis Ralston 2019-08-12 13:06:36 -06:00
commit e21c12c2c9
7 changed files with 241 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
View file

@ -28,11 +28,11 @@ import AccessibleButton from "../../../elements/AccessibleButton";
import DeactivateAccountDialog from "../../../dialogs/DeactivateAccountDialog";
import PropTypes from "prop-types";
import {THEMES} from "../../../../../themes";
const PlatformPeg = require("../../../../../PlatformPeg");
const MatrixClientPeg = require("../../../../../MatrixClientPeg");
const sdk = require('../../../../..');
const Modal = require("../../../../../Modal");
const dis = require("../../../../../dispatcher");
import PlatformPeg from "../../../../../PlatformPeg";
import MatrixClientPeg from "../../../../../MatrixClientPeg";
import sdk from "../../../../..";
import Modal from "../../../../../Modal";
import dis from "../../../../../dispatcher";
export default class GeneralUserSettingsTab extends React.Component {
static propTypes = {
@ -174,6 +174,7 @@ export default class GeneralUserSettingsTab extends React.Component {
_renderDiscoverySection() {
const EmailAddresses = sdk.getComponent("views.settings.discovery.EmailAddresses");
const PhoneNumbers = sdk.getComponent("views.settings.discovery.PhoneNumbers");
const SetIdServer = sdk.getComponent("views.settings.SetIdServer");
return (
<div className="mx_SettingsTab_section">
@ -182,6 +183,8 @@ export default class GeneralUserSettingsTab extends React.Component {
<span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
<PhoneNumbers />
{ /* has its own heading as it includes the current ID server */ }
<SetIdServer />
</div>
);
}