Regression: Reset section button (RocketChat#18007)

Co-authored-by: Tasso Evangelista <[email protected]>
allanbritos · Jun 25, 2020 · ef47ef6 · ef47ef6
1 parent dbe4d17
commit ef47ef6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/client/admin/settings/Section.js b/client/admin/settings/Section.js
@@ -58,16 +58,16 @@ export function Section({ children, groupId, hasReset = true, help, sectionName,
 		<FieldGroup>
 			{editableSettings.map((setting) => <Setting key={setting._id} settingId={setting._id} sectionChanged={changed} />)}
 
-			{hasReset && canReset && <Button
-				children={t('Reset_section_settings')}
-				danger
-				data-section={sectionName}
-				ghost
-				onClick={handleResetSectionClick}
-			/>}
 
 			{children}
 		</FieldGroup>
+		{hasReset && canReset && <Button
+			children={t('Reset_section_settings')}
+			danger
+			marginBlockStart={'x16'}
+			data-section={sectionName}
+			onClick={handleResetSectionClick}
+		/>}
 	</Accordion.Item>;
 }
 

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2962,7 +2962,7 @@
   "Reset": "Reset",
   "Reset_E2E_Key": "Reset E2E Key",
   "Reset_password": "Reset password",
-  "Reset_section_settings": "Reset Section Settings",
+  "Reset_section_settings": "Reset Section to Default",
   "Reset_Connection": "Reset Connection",
   "Responding": "Responding",
   "Response_description_pre": "If the handler wishes to post a response back into the channel, the following JSON should be returned as the body of the response:",