Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Add support for deleting threepids #597

Merged
merged 3 commits into from
Dec 22, 2016
Merged

Add support for deleting threepids #597

merged 3 commits into from
Dec 22, 2016

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Dec 21, 2016

return this._refreshFromServer();
}).catch((e) => {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will creating a modal from within an existing modal work? I vaguely remember having to put the second create into a setTimeout(0) to let the other one first disappear...?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Empirically it seems to be fine (although I did get the variable name wrong)

@@ -507,7 +531,7 @@ module.exports = React.createClass({
this.state.avatarUrl ? MatrixClientPeg.get().mxcUrlToHttp(this.state.avatarUrl) : null
);

var threepidsSection = this.state.threepids.map(function(val, pidIndex) {
var threepidsSection = this.state.threepids.map((val, pidIndex) => {
var id = "email-" + val.address;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3pid- ?

@ara4n
Copy link
Member

ara4n commented Dec 22, 2016

lgtm mod comments

@dbkr dbkr merged commit fd44d9f into develop Dec 22, 2016
@richvdh richvdh deleted the dbkr/delete_threepid branch February 15, 2017 13:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants