} />
{/* @if TARGET='app' */}
-
} />
{
))}
- {/* @endif */}
+
+ {/* @endif */}
}
/>
diff --git a/ui/redux/actions/settings.js b/ui/redux/actions/settings.js
index dd17516cc..cfca43f60 100644
--- a/ui/redux/actions/settings.js
+++ b/ui/redux/actions/settings.js
@@ -1,4 +1,4 @@
-import { Lbry, ACTIONS, doToast, SHARED_PREFS, doWalletReconnect } from 'lbry-redux';
+import { Lbry, ACTIONS, doToast, SHARED_PREFERENCES, doWalletReconnect } from 'lbry-redux';
import * as SETTINGS from 'constants/settings';
import * as LOCAL_ACTIONS from 'constants/action_types';
import analytics from 'analytics';
@@ -23,19 +23,34 @@ export function doFetchDaemonSettings() {
};
}
+export function doGetDaemonStatus() {
+ return dispatch => {
+ return Lbry.status().then(status => {
+ dispatch({
+ type: ACTIONS.DAEMON_STATUS_RECEIVED,
+ data: {
+ status,
+ },
+ });
+ return status;
+ },
+ );
+ };
+};
+
export function doClearDaemonSetting(key) {
return dispatch => {
const clearKey = {
key,
};
Lbry.settings_clear(clearKey).then(defaultSettings => {
- if (Object.values(SHARED_PREFS).includes(key)) {
+ if (Object.values(SHARED_PREFERENCES).includes(key)) {
dispatch({
type: ACTIONS.SHARED_PREFERENCE_SET,
data: { key: key, value: undefined },
});
}
- if (key === SHARED_PREFS.WALLET_SERVERS) {
+ if (key === SHARED_PREFERENCES.WALLET_SERVERS) {
dispatch(doWalletReconnect());
}
});
@@ -58,14 +73,14 @@ export function doSetDaemonSetting(key, value) {
value: !value && value !== false ? null : value,
};
Lbry.settings_set(newSettings).then(newSetting => {
- if (Object.values(SHARED_PREFS).includes(key)) {
+ if (Object.values(SHARED_PREFERENCES).includes(key)) {
dispatch({
type: ACTIONS.SHARED_PREFERENCE_SET,
data: {key: key, value: newSetting[key]},
});
}
// hardcoding this in lieu of a better solution
- if (key === SHARED_PREFS.WALLET_SERVERS) {
+ if (key === SHARED_PREFERENCES.WALLET_SERVERS) {
dispatch(doWalletReconnect());
}
});
@@ -81,19 +96,13 @@ export function doSetDaemonSetting(key, value) {
};
}
-export function doCacheCustomWalletServers(servers) {
+export function doSaveCustomWalletServers(servers) {
return {
- type: ACTIONS.WALLET_SERVERS_CACHED,
+ type: ACTIONS.SAVE_CUSTOM_WALLET_SERVERS,
data: servers,
};
}
-export function doGetDaemonStatus() {
- return dispatch => {
- return Lbry.status().then(settings => settings);
- };
-};
-
export function doSetClientSetting(key, value) {
return {
type: ACTIONS.CLIENT_SETTING_CHANGED,
diff --git a/ui/redux/reducers/settings.js b/ui/redux/reducers/settings.js
index bcc8acd3e..78fe4f623 100644
--- a/ui/redux/reducers/settings.js
+++ b/ui/redux/reducers/settings.js
@@ -2,17 +2,18 @@ import * as ACTIONS from 'constants/action_types';
import * as SETTINGS from 'constants/settings';
import moment from 'moment';
import SUPPORTED_LANGUAGES from 'constants/supported_languages';
-import { ACTIONS as LBRY_REDUX_ACTIONS, SHARED_PREFS } from 'lbry-redux';
+import { ACTIONS as LBRY_REDUX_ACTIONS, SHARED_PREFERENCES } from 'lbry-redux';
const reducers = {};
const defaultState = {
isNight: false,
loadedLanguages: [...Object.keys(window.i18n_messages), 'en'] || ['en'],
customWalletServers: [],
- sharedPrefs: {
- [SHARED_PREFS.WALLET_SERVERS]: false,
+ sharedPreferences: {
+ [SHARED_PREFERENCES.WALLET_SERVERS]: false,
},
daemonSettings: {},
+ daemonStatus: {},
clientSettings: {
// UX
[SETTINGS.NEW_USER_ACKNOWLEDGED]: false,
@@ -56,11 +57,16 @@ const defaultState = {
},
};
-reducers[ACTIONS.DAEMON_SETTINGS_RECEIVED] = (state, action) =>
+reducers[LBRY_REDUX_ACTIONS.DAEMON_SETTINGS_RECEIVED] = (state, action) =>
Object.assign({}, state, {
daemonSettings: action.data.settings,
});
+reducers[LBRY_REDUX_ACTIONS.DAEMON_STATUS_RECEIVED] = (state, action) =>
+ Object.assign({}, state, {
+ daemonStatus: action.data.status,
+ });
+
reducers[ACTIONS.CLIENT_SETTING_CHANGED] = (state, action) => {
const { key, value } = action.data;
const clientSettings = Object.assign({}, state.clientSettings);
@@ -99,11 +105,11 @@ reducers[ACTIONS.DOWNLOAD_LANGUAGE_SUCCESS] = (state, action) => {
reducers[LBRY_REDUX_ACTIONS.SHARED_PREFERENCE_SET] = (state, action) => {
const { key, value } = action.data;
- const sharedPrefs = Object.assign({}, state.sharedPrefs);
- sharedPrefs[key] = value;
+ const sharedPreferences = Object.assign({}, state.sharedPreferences);
+ sharedPreferences[key] = value;
return Object.assign({}, state, {
- sharedPrefs,
+ sharedPreferences,
});
}
@@ -122,13 +128,13 @@ reducers[LBRY_REDUX_ACTIONS.USER_STATE_POPULATE] = (
state,
action,
) => {
- const { settings: sharedPrefs } = action.data;
+ const { settings: sharedPreferences } = action.data;
// process clientSettings and daemonSettings
- return Object.assign({}, state, { sharedPrefs });
+ return Object.assign({}, state, { sharedPreferences });
};
-reducers[ACTIONS.WALLET_SERVERS_CACHED] = (state, action) => {
+reducers[LBRY_REDUX_ACTIONS.SAVE_CUSTOM_WALLET_SERVERS] = (state, action) => {
return Object.assign({}, state, {customWalletServers: action.data});
}
diff --git a/ui/redux/selectors/settings.js b/ui/redux/selectors/settings.js
index dca171e98..08664c261 100644
--- a/ui/redux/selectors/settings.js
+++ b/ui/redux/selectors/settings.js
@@ -1,4 +1,5 @@
import * as SETTINGS from 'constants/settings';
+import { SHARED_PREFERENCES } from 'lbry-redux';
import { createSelector } from 'reselect';
const selectState = state => state.settings || {};
@@ -8,6 +9,11 @@ export const selectDaemonSettings = createSelector(
state => state.daemonSettings
);
+export const selectDaemonStatus = createSelector(
+ selectState,
+ state => state.daemonStatus
+);
+
export const selectClientSettings = createSelector(
selectState,
state => state.clientSettings || {}
@@ -34,22 +40,31 @@ export const selectIsNight = createSelector(
state => state.isNight
);
-export const selectCachedWalletServers = createSelector(
+export const selectSavedWalletServers = createSelector(
selectState,
state => state.customWalletServers
);
-export const selectSharedPrefs = createSelector(
+export const selectSharedPreferences = createSelector(
selectState,
- state => state.sharedPrefs
+ state => state.sharedPreferences
);
-export const makeSelectSharedPrefsForKey = key =>
+export const makeSelectSharedPreferencesForKey = key =>
createSelector(
- selectSharedPrefs,
+ selectSharedPreferences,
prefs => (prefs ? prefs[key] : undefined)
);
+export const selectHasWalletServerPrefs =
+ createSelector(
+ makeSelectSharedPreferencesForKey(SHARED_PREFERENCES.WALLET_SERVERS),
+ servers => {
+ if (servers && servers.length) return true;
+ return false;
+ }
+ )
+
export const selectThemePath = createSelector(
selectTheme,
selectAutomaticDarkModeEnabled,
diff --git a/ui/store.js b/ui/store.js
index d6313ae2d..3b8a170f7 100644
--- a/ui/store.js
+++ b/ui/store.js
@@ -130,7 +130,7 @@ const sharedStateFilters = {
},
},
blocked: { source: 'blocked', property: 'blockedChannels' },
- settings: { source: 'settings', property: 'sharedPrefs'},
+ settings: { source: 'settings', property: 'sharedPreferences'},
};
const sharedStateCb = ({ dispatch, getState }) => {
diff --git a/yarn.lock b/yarn.lock
index d8bbf741f..37664ab16 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7066,9 +7066,9 @@ lazy-val@^1.0.4:
yargs "^13.2.2"
zstd-codec "^0.1.1"
-lbry-redux@lbryio/lbry-redux#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc:
+lbry-redux@lbryio/lbry-redux#341d60661468b654b9baf5b96ca4a08ee202f0f2:
version "0.0.1"
- resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc"
+ resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/341d60661468b654b9baf5b96ca4a08ee202f0f2"
dependencies:
proxy-polyfill "0.1.6"
reselect "^3.0.0"