diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m index be87bea3b8..9f818a988e 100644 --- a/Riot/Modules/Settings/SettingsViewController.m +++ b/Riot/Modules/Settings/SettingsViewController.m @@ -365,7 +365,10 @@ - (void)updateSections { [sectionUserSettings addRowWithTag: USER_SETTINGS_PHONENUMBERS_OFFSET + index]; } - if (BuildSettings.settingsScreenAllowAddingEmailThreepids) + if (BuildSettings.settingsScreenAllowAddingEmailThreepids && + // If the threePidChanges is nil we assume the capability to be true + (!self.mainSession.homeserverCapabilities.threePidChanges || + self.mainSession.homeserverCapabilities.threePidChanges.enabled)) { [sectionUserSettings addRowWithTag:USER_SETTINGS_ADD_EMAIL_INDEX]; } diff --git a/changelog.d/7645.bugfix b/changelog.d/7645.bugfix new file mode 100644 index 0000000000..b546db4f9e --- /dev/null +++ b/changelog.d/7645.bugfix @@ -0,0 +1 @@ +Add email UI is hidden if the 3 pid changes capability is disabled. \ No newline at end of file