Merge branch 'main' into fix/add-aria-label-to-featured-pins

src/shared/components/home/signup.tsx

@@ -298,7 +298,6 @@ export class Signup extends Component<any, State> {
           </>
         )}
         {this.renderCaptcha()}
-        {siteView.local_site.enable_nsfw && (
         <div className="form-group row">
           <div className="col-sm-10">
             <div className="form-check">
@@ -309,16 +308,12 @@ export class Signup extends Component<any, State> {
                 checked={this.state.form.show_nsfw}
                 onChange={linkEvent(this, this.handleRegisterShowNsfwChange)}
               />
-                <label
+              <label className="form-check-label" htmlFor="register-show-nsfw">
-                  className="form-check-label"
-                  htmlFor="register-show-nsfw"
-                >
                 {i18n.t("show_nsfw")}
               </label>
             </div>
           </div>
         </div>
-        )}
         <input
           tabIndex={-1}
           autoComplete="false"

src/shared/components/person/settings.tsx

@@ -21,7 +21,6 @@ import {
   debounce,
   elementUrl,
   emDash,
-  enableNsfw,
   fetchCommunities,
   fetchThemeList,
   fetchUsers,
@@ -642,7 +641,6 @@ export class Settings extends Component<any, SettingsState> {
               />
             </div>
           </form>
-          {enableNsfw(this.state.siteRes) && (
           <div className="form-group">
             <div className="form-check">
               <input
@@ -657,7 +655,6 @@ export class Settings extends Component<any, SettingsState> {
               </label>
             </div>
           </div>
-          )}
           <div className="form-group">
             <div className="form-check">
               <input