[MM-56019] Move the deactivate account section to the last, and change the button to danger (#25697)
* [MM-56019] 🎨 Move the deactivate account section to the last, and change the button to danger
* refactor: remove unnecessary divider
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
3a6264ad19
Коммит
55e222a9e2
@@ -48,6 +48,7 @@ type Props = {
|
|||||||
cancelButtonText?: ReactNode;
|
cancelButtonText?: ReactNode;
|
||||||
shiftEnter?: boolean;
|
shiftEnter?: boolean;
|
||||||
saveButtonText?: string;
|
saveButtonText?: string;
|
||||||
|
saveButtonClassName?: string;
|
||||||
}
|
}
|
||||||
export default class SettingItemMax extends React.PureComponent<Props> {
|
export default class SettingItemMax extends React.PureComponent<Props> {
|
||||||
settingList: React.RefObject<HTMLDivElement>;
|
settingList: React.RefObject<HTMLDivElement>;
|
||||||
@@ -170,6 +171,7 @@ export default class SettingItemMax extends React.PureComponent<Props> {
|
|||||||
saving={this.props.saving}
|
saving={this.props.saving}
|
||||||
disabled={this.props.saving}
|
disabled={this.props.saving}
|
||||||
onClick={this.handleSubmit}
|
onClick={this.handleSubmit}
|
||||||
|
btnClass={this.props.saveButtonClassName}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -819,6 +819,7 @@ export default class AdvancedSettingsDisplay extends React.PureComponent<Props,
|
|||||||
</div>,
|
</div>,
|
||||||
]}
|
]}
|
||||||
saveButtonText={'Deactivate'}
|
saveButtonText={'Deactivate'}
|
||||||
|
saveButtonClassName={'btn-danger'}
|
||||||
setting={'deactivateAccount'}
|
setting={'deactivateAccount'}
|
||||||
submit={this.handleShowDeactivateAccountModal}
|
submit={this.handleShowDeactivateAccountModal}
|
||||||
saving={this.state.isSaving}
|
saving={this.state.isSaving}
|
||||||
@@ -942,17 +943,17 @@ export default class AdvancedSettingsDisplay extends React.PureComponent<Props,
|
|||||||
/>
|
/>
|
||||||
{previewFeaturesSectionDivider}
|
{previewFeaturesSectionDivider}
|
||||||
{previewFeaturesSection}
|
{previewFeaturesSection}
|
||||||
{formattingSectionDivider}
|
|
||||||
<PerformanceDebuggingSection
|
<PerformanceDebuggingSection
|
||||||
active={this.props.activeSection === AdvancedSections.PERFORMANCE_DEBUGGING}
|
active={this.props.activeSection === AdvancedSections.PERFORMANCE_DEBUGGING}
|
||||||
onUpdateSection={this.handleUpdateSection}
|
onUpdateSection={this.handleUpdateSection}
|
||||||
areAllSectionsInactive={this.props.activeSection === ''}
|
areAllSectionsInactive={this.props.activeSection === ''}
|
||||||
/>
|
/>
|
||||||
{deactivateAccountSection}
|
|
||||||
{unreadScrollPositionSectionDivider}
|
{unreadScrollPositionSectionDivider}
|
||||||
{unreadScrollPositionSection}
|
{unreadScrollPositionSection}
|
||||||
{syncDraftsSectionDivider}
|
{syncDraftsSectionDivider}
|
||||||
{syncDraftsSection}
|
{syncDraftsSection}
|
||||||
|
{formattingSectionDivider}
|
||||||
|
{deactivateAccountSection}
|
||||||
<div className='divider-dark'/>
|
<div className='divider-dark'/>
|
||||||
{makeConfirmationModal}
|
{makeConfirmationModal}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user