LBRYCommunity/lbry-redux
1
0
Fork 0
Code Issues 5 Pull requests 6 Projects Releases Packages Wiki Activity

review changes

Browse source
This commit is contained in:
jessop 2019-12-12 11:47:09 -05:00
parent 7d2e8ba170
commit ee6831c2a8
5 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dist/bundle.es.js vendored
View file

@ -171,7 +171,7 @@ const SEARCH_BLUR = 'SEARCH_BLUR';
// Settings
const DAEMON_SETTINGS_RECEIVED = 'DAEMON_SETTINGS_RECEIVED';
const SHARED_PREFERENCE_SET = 'SHARED_PREFERENCE_SET';
const WALLET_SERVERS_CACHED = 'WALLET_SERVERS_CACHED';
const SAVE_CUSTOM_WALLET_SERVERS = 'SAVE_CUSTOM_WALLET_SERVERS';
const CLIENT_SETTING_CHANGED = 'CLIENT_SETTING_CHANGED';
const UPDATE_IS_NIGHT = 'UPDATE_IS_NIGHT';
@ -407,7 +407,7 @@ var action_types = /*#__PURE__*/Object.freeze({
SEARCH_BLUR: SEARCH_BLUR,
DAEMON_SETTINGS_RECEIVED: DAEMON_SETTINGS_RECEIVED,
SHARED_PREFERENCE_SET: SHARED_PREFERENCE_SET,
WALLET_SERVERS_CACHED: WALLET_SERVERS_CACHED,
SAVE_CUSTOM_WALLET_SERVERS: SAVE_CUSTOM_WALLET_SERVERS,
CLIENT_SETTING_CHANGED: CLIENT_SETTING_CHANGED,
UPDATE_IS_NIGHT: UPDATE_IS_NIGHT,
AUTHENTICATION_STARTED: AUTHENTICATION_STARTED,
@ -762,6 +762,15 @@ var daemon_settings = /*#__PURE__*/Object.freeze({
WALLETS: WALLETS
});
/*
* How to use this file:
* Settings exported from here will trigger the setting to be
* sent to the preference middleware when set using the
* usual setDaemonSettings and clearDaemonSettings methods.
*
* See redux/settings/actions in the app for where this is used.
*/
const WALLET_SERVERS = LBRYUM_SERVERS;
var shared_prefs = /*#__PURE__*/Object.freeze({
@ -1517,7 +1526,7 @@ function extractUserState(rawObj) {
function doPopulateSharedUserState(sharedSettings) {
return dispatch => {
const { subscriptions, tags, blockedChannels, settings } = extractUserState(sharedSettings);
dispatch({ type: USER_STATE_POPULATE, data: { subscriptions, tags, blockedChannels, settings } }); // clientSettings ? hideSplash ?
dispatch({ type: USER_STATE_POPULATE, data: { subscriptions, tags, blockedChannels, settings } });
};
}
@ -2597,7 +2606,7 @@ function doWalletReconnect() {
});
// this basically returns null when it's done. :(
// might be good to dispatch ACTIONS.WALLET_RESTARTED
lbryProxy.wallet_reconnect().then(dispatch({
lbryProxy.wallet_reconnect().then(() => dispatch({
type: WALLET_RESTART_COMPLETED
}));
};

2
src/constants/action_types.js
View file

@ -148,7 +148,7 @@ export const SEARCH_BLUR = 'SEARCH_BLUR';
// Settings
export const DAEMON_SETTINGS_RECEIVED = 'DAEMON_SETTINGS_RECEIVED';
export const SHARED_PREFERENCE_SET = 'SHARED_PREFERENCE_SET';
export const WALLET_SERVERS_CACHED = 'WALLET_SERVERS_CACHED';
export const SAVE_CUSTOM_WALLET_SERVERS = 'SAVE_CUSTOM_WALLET_SERVERS';
export const CLIENT_SETTING_CHANGED = 'CLIENT_SETTING_CHANGED';
export const UPDATE_IS_NIGHT = 'UPDATE_IS_NIGHT';

9
src/constants/shared_prefs.js
View file

@ -1,3 +1,12 @@
/*
* How to use this file:
* Settings exported from here will trigger the setting to be
* sent to the preference middleware when set using the
* usual setDaemonSettings and clearDaemonSettings methods.
*
* See redux/settings/actions in the app for where this is used.
*/
import * as DAEMON_SETTINGS from './daemon_settings';
export const WALLET_SERVERS = DAEMON_SETTINGS.LBRYUM_SERVERS;

2
src/redux/actions/sync.js
View file

@ -30,7 +30,7 @@ function extractUserState(rawObj: SharedData) {
export function doPopulateSharedUserState(sharedSettings: any) {
return (dispatch: Dispatch) => {
const { subscriptions, tags, blockedChannels, settings } = extractUserState(sharedSettings);
dispatch({ type: ACTIONS.USER_STATE_POPULATE, data: { subscriptions, tags, blockedChannels, settings } }); // clientSettings ? hideSplash ?
dispatch({ type: ACTIONS.USER_STATE_POPULATE, data: { subscriptions, tags, blockedChannels, settings } });
};
}

2
src/redux/actions/wallet.js
View file

@ -345,7 +345,7 @@ export function doWalletReconnect() {
});
// this basically returns null when it's done. :(
// might be good to dispatch ACTIONS.WALLET_RESTARTED
Lbry.wallet_reconnect().then(
Lbry.wallet_reconnect().then(() =>
dispatch({
type: ACTIONS.WALLET_RESTART_COMPLETED,
})