Do not show reset button for hidden settings (#6432)

Closes #5806

packages/rocketchat-ui-admin/client/admin.coffee

@@ -251,15 +251,14 @@ Template.admin.helpers
 		}
 
 	selectedRooms: ->
-		console.log(this._id)
 		return Template.instance().selectedRooms.get()[this._id] or []
 
 	getColorVariable: (color) ->
 		return color.replace(/theme-color-/, '@')
 
-	isDefaultValue: (settingId) ->
-		setting = TempSettings.findOne({_id: settingId}, {fields: {value: 1, packageValue: 1}})
-		return setting.value is setting.packageValue
+	showResetButton: ->
+		setting = TempSettings.findOne({ _id: @_id }, { fields: { value: 1, packageValue: 1 } })
+		return @type isnt 'asset' and setting.value isnt setting.packageValue and not @blocked
 
 Template.admin.events
 	"change .input-monitor, keyup .input-monitor": _.throttle((e, t) ->

packages/rocketchat-ui-admin/client/admin.html

@@ -192,13 +192,11 @@
 													<div class="settings-alert pending-color pending-background pending-border"><i class="icon-attention secondary-font-color"></i>{{{_ alert}}}</div>
 												{{/if}}
 											</div>
-											{{#unless $eq type 'asset'}}
-												{{#unless isDefaultValue _id}}
-													<button text="{{_ 'Reset'}}" data-setting="{{_id}}" class="reset-setting button danger">
-														<i class="icon-ccw secondary-font-color color-error-contrast"></i>
-													</button>
-												{{/unless}}
-											{{/unless}}
+											{{#if showResetButton}}
+												<button text="{{_ 'Reset'}}" data-setting="{{_id}}" class="reset-setting button danger">
+													<i class="icon-ccw secondary-font-color color-error-contrast"></i>
+												</button>
+											{{/if}}
 										</div>
 									{{/each}}