diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js index a0091e5c184..2d9fb75cc98 100644 --- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js +++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js @@ -230,6 +230,7 @@ class ContactMethodDetailsPage extends Component { const isDefaultContactMethod = this.props.session.email === loginData.partnerUserID; const hasMagicCodeBeenSent = lodashGet(this.props.loginList, [contactMethod, 'validateCodeSent'], false); const isFailedAddContactMethod = Boolean(lodashGet(loginData, 'errorFields.addedLogin')); + const isFailedRemovedContactMethod = Boolean(lodashGet(loginData, 'errorFields.deletedLogin')); return ( this.validateCodeFormRef.current && this.validateCodeFormRef.current.focus()}> @@ -245,7 +246,7 @@ class ContactMethodDetailsPage extends Component { prompt={this.props.translate('contacts.removeAreYouSure')} confirmText={this.props.translate('common.yesContinue')} cancelText={this.props.translate('common.cancel')} - isVisible={this.state.isDeleteModalOpen} + isVisible={this.state.isDeleteModalOpen && !isDefaultContactMethod} danger /> {isFailedAddContactMethod && ( @@ -286,9 +287,9 @@ class ContactMethodDetailsPage extends Component { {isDefaultContactMethod ? ( User.clearContactMethodErrors(contactMethod, 'defaultLogin')} + onClose={() => User.clearContactMethodErrors(contactMethod, isFailedRemovedContactMethod ? 'deletedLogin' : 'defaultLogin')} > {this.props.translate('contacts.yourDefaultContactMethod')}