LBRYFoundation/lbry-desktop
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-desktop.git synced 2025-09-01 01:35:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bump lbry-redux and handle other fatal sync errors

Browse source
This commit is contained in:
Sean Yesmunt 2020-11-12 13:32:18 -05:00
parent cfb10db4ea
commit f1adfddded
6 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -136,7 +136,7 @@
"imagesloaded": "^4.1.4", "imagesloaded": "^4.1.4",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git", "lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#8093d69807d890f4110be0b2aa629e3df5945661", "lbry-redux": "lbryio/lbry-redux#72ead945cc7cb96e36d67638981ecdc921e5f663",
"lbryinc": "lbryio/lbryinc#2a9d04b2efcae0a68b7315bf04632db4a757461c", "lbryinc": "lbryio/lbryinc#2a9d04b2efcae0a68b7315bf04632db4a757461c",
"lint-staged": "^7.0.2", "lint-staged": "^7.0.2",
"localforage": "^1.7.1", "localforage": "^1.7.1",

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

@ -8,8 +8,10 @@ export default function SyncFatalError() {
return ( return (
<div className="main--empty"> <div className="main--empty">
<Yrbl <Yrbl
title={__('There was an error starting up')} title={__('There is a bug... somewhere')}
subtitle={<p>Try refreshing to fix the issue. If that doesn't work, email help@lbry.com for support.</p>} subtitle={
<p>{__("Try refreshing to fix the issue. If that doesn't work, email help@lbry.com for support.")}</p>
}
actions={ actions={
<div className="section__actions"> <div className="section__actions">
<Button <Button

1
ui/constants/action_types.js
View file

@ -300,6 +300,7 @@ export const SYNC_APPLY_COMPLETED = 'SYNC_APPLY_COMPLETED';
export const SYNC_APPLY_FAILED = 'SYNC_APPLY_FAILED'; export const SYNC_APPLY_FAILED = 'SYNC_APPLY_FAILED';
export const SYNC_APPLY_BAD_PASSWORD = 'SYNC_APPLY_BAD_PASSWORD'; export const SYNC_APPLY_BAD_PASSWORD = 'SYNC_APPLY_BAD_PASSWORD';
export const SYNC_RESET = 'SYNC_RESET'; export const SYNC_RESET = 'SYNC_RESET';
export const SYNC_FATAL_ERROR = 'SYNC_FATAL_ERROR';
export const REACTIONS_LIST_STARTED = 'REACTIONS_LIST_STARTED'; export const REACTIONS_LIST_STARTED = 'REACTIONS_LIST_STARTED';
export const REACTIONS_LIST_FAILED = 'REACTIONS_LIST_FAILED'; export const REACTIONS_LIST_FAILED = 'REACTIONS_LIST_FAILED';

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

@ -653,11 +653,15 @@ export function doGetAndPopulatePreferences() {
message: __('Unable to load your saved preferences.'), message: __('Unable to load your saved preferences.'),
}) })
); );
dispatch({
type: ACTIONS.SYNC_FATAL_ERROR,
});
}); });
return false; return false;
} }
return doPreferenceGet(preferenceKey, successCb, failCb); return dispatch(doPreferenceGet(preferenceKey, successCb, failCb));
}; };
} }

6
ui/redux/reducers/sync.js
View file

@ -69,6 +69,7 @@ reducers[ACTIONS.SET_SYNC_FAILED] = (state, action) =>
Object.assign({}, state, { Object.assign({}, state, {
setSyncIsPending: false, setSyncIsPending: false,
setSyncErrorMessage: action.data.error, setSyncErrorMessage: action.data.error,
fatalError: true,
}); });
reducers[ACTIONS.SET_SYNC_COMPLETED] = (state, action) => reducers[ACTIONS.SET_SYNC_COMPLETED] = (state, action) =>
@ -103,6 +104,11 @@ reducers[ACTIONS.SYNC_APPLY_BAD_PASSWORD] = state =>
syncApplyPasswordError: true, syncApplyPasswordError: true,
}); });
reducers[LBRY_REDUX_ACTIONS.SYNC_FATAL_ERROR] = state =>
Object.assign({}, state, {
fatalError: true,
});
reducers[ACTIONS.SYNC_RESET] = () => defaultState; reducers[ACTIONS.SYNC_RESET] = () => defaultState;
export default function syncReducer(state = defaultState, action) { export default function syncReducer(state = defaultState, action) {

4
yarn.lock
View file

@ -7411,9 +7411,9 @@ lazy-val@^1.0.4:
yargs "^13.2.2" yargs "^13.2.2"
zstd-codec "^0.1.1" zstd-codec "^0.1.1"
lbry-redux@lbryio/lbry-redux#8093d69807d890f4110be0b2aa629e3df5945661: lbry-redux@lbryio/lbry-redux#72ead945cc7cb96e36d67638981ecdc921e5f663:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/8093d69807d890f4110be0b2aa629e3df5945661" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/72ead945cc7cb96e36d67638981ecdc921e5f663"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"