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

pull sync on nav to settings

Browse source
This commit is contained in:
jessop 2020-07-31 17:09:05 -04:00
parent c65afb201d
commit 314fb22638
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ui/component/router/index.js
View file

@ -3,7 +3,7 @@ import { selectUserVerifiedEmail } from 'redux/selectors/user';
import { selectHasNavigated, selectScrollStartingPosition, selectWelcomeVersion } from 'redux/selectors/app';
import Router from './view';
import { normalizeURI, makeSelectTitleForUri } from 'lbry-redux';
import { doSetHasNavigated } from 'redux/actions/app';
import { doSetHasNavigated, doSyncWithPreferences } from 'redux/actions/app';
import { doSyncClientSettings } from 'redux/actions/settings';
const select = state => {
const { pathname, hash } = state.router.location;
@ -35,6 +35,7 @@ const select = state => {
const perform = dispatch => ({
setHasNavigated: () => dispatch(doSetHasNavigated()),
syncSettings: () => dispatch(doSyncClientSettings()),
checkSync: () => dispatch(doSyncWithPreferences()),
});
export default connect(select, perform)(Router);

6
ui/component/router/view.jsx
View file

@ -98,6 +98,7 @@ type Props = {
hasNavigated: boolean,
setHasNavigated: () => void,
syncSettings: () => void,
checkSync: () => void,
};
function AppRouter(props: Props) {
@ -112,6 +113,7 @@ function AppRouter(props: Props) {
hasNavigated,
setHasNavigated,
syncSettings,
checkSync,
} = props;
const { entries } = history;
const entryIndex = history.index;
@ -135,11 +137,11 @@ function AppRouter(props: Props) {
if (!location.pathname.includes(PAGES.SETTINGS) && prevPath.includes(PAGES.SETTINGS)) {
syncSettings();
} else if (location.pathname.includes(PAGES.SETTINGS) && !prevPath.includes(PAGES.SETTINGS)) {
syncSettings();
checkSync();
}
});
return unlisten;
}, [prevPath, syncSettings]);
}, [prevPath, syncSettings, checkSync]);
useEffect(() => {
const unlisten = history.listen(location => {