LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

properly transforms wallet server preference #3728

Merged
jessopb merged 1 commit from fix-prefToDaemonSettings into master 2020-02-22 06:36:47 +01:00
Conversation 0 Commits 1 Files changed 1 +8 -1
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ui/redux/actions/app.js
View file

@ -19,6 +19,7 @@ import {
doPreferenceGet, doPreferenceGet,
doToast, doToast,
doClearSupport, doClearSupport,
SHARED_PREFERENCES,
} from 'lbry-redux'; } from 'lbry-redux';
import Native from 'native'; import Native from 'native';
import { doFetchDaemonSettings, doSetAutoLaunch, doSetDaemonSetting } from 'redux/actions/settings'; import { doFetchDaemonSettings, doSetAutoLaunch, doSetDaemonSetting } from 'redux/actions/settings';
@ -484,9 +485,15 @@ export function doGetAndPopulatePreferences() {
dispatch(doPopulateSharedUserState(savedPreferences)); dispatch(doPopulateSharedUserState(savedPreferences));
// @if TARGET='app' // @if TARGET='app'
const { settings, sharing_3P: sharing3P } = savedPreferences.value; const { settings, sharing_3P: sharing3P } = savedPreferences.value;
// apply daemonSettings (todo: separate function)
Object.entries(settings).forEach(([key, val]) => { Object.entries(settings).forEach(([key, val]) => {
if (val !== null && daemonSettings[key] !== val) { if (val !== null && daemonSettings[key] !== val) {
dispatch(doSetDaemonSetting(key, val, true)); if (key === SHARED_PREFERENCES.WALLET_SERVERS) {
const servers = val.map(item => `${item[0]}:${item[1]}`);
dispatch(doSetDaemonSetting(key, servers, true));
} else {
dispatch(doSetDaemonSetting(key, val, true));
}
} }
}); });
if (sharing3P !== undefined) { if (sharing3P !== undefined) {