Merge pull request #3465 from matrix-org/t3chguy/nvl/userinfo

UserInfo consolidation of GroupMemberInfo and MemberInfo panels
2019-10-21 15:50:08 +01:00
parent b237ecab29 4de0b3c177
commit c5d5cd72bc
12 changed files with 1527 additions and 10 deletions
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -596,6 +596,7 @@ module.exports = createReactClass({
        e.preventDefault();

        // Update the IS in account data. Actually using it may trigger terms.
+        // eslint-disable-next-line react-hooks/rules-of-hooks
        useDefaultIdentityServer();

        // Add email as a valid address type.
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js