From 1ce926dd9853da9747c5f102d593dbf27d05ecb8 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Tue, 27 Jun 2017 14:15:37 -0400 Subject: [PATCH] fix nsfw not refreshing --- ui/js/reducers/app.js | 1 - ui/js/selectors/app.js | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ui/js/reducers/app.js b/ui/js/reducers/app.js index 5e44f4ac1..fe8c9adae 100644 --- a/ui/js/reducers/app.js +++ b/ui/js/reducers/app.js @@ -18,7 +18,6 @@ const defaultState = { platform: process.platform, upgradeSkipped: sessionStorage.getItem("upgradeSkipped"), daemonReady: false, - obscureNsfw: !lbry.getClientSetting("showNsfw"), hasSignature: false, badgeNumber: 0, }; diff --git a/ui/js/selectors/app.js b/ui/js/selectors/app.js index 086500ff2..8a6435499 100644 --- a/ui/js/selectors/app.js +++ b/ui/js/selectors/app.js @@ -1,5 +1,6 @@ import { createSelector } from "reselect"; import { parseQueryParams } from "util/query_params"; +import lbry from "lbry"; import lbryuri from "lbryuri"; export const _selectState = state => state.app || {}; @@ -176,10 +177,13 @@ export const selectDaemonReady = createSelector( state => state.daemonReady ); -export const selectObscureNsfw = createSelector( - _selectState, - state => !!state.obscureNsfw -); +/** + * Calls to lbry.getClientSetting shouldn't be happening in selector logic, but settings have not + * properly been reworked into redux framework. This added as a bug fix to NSFW settings not refreshing. + */ +export const selectObscureNsfw = () => { + return !lbry.getClientSetting("showNsfw"); +}; export const selectSnackBar = createSelector( _selectState,