diff --git a/package.json b/package.json index 068564b46..95eb2fd27 100644 --- a/package.json +++ b/package.json @@ -128,8 +128,8 @@ "husky": "^0.14.3", "json-loader": "^0.5.4", "lbry-format": "https://github.com/lbryio/lbry-format.git", - "lbry-redux": "lbryio/lbry-redux#973d28e46290c77f2d9d468304008f80f71fd8cd", - "lbryinc": "lbryio/lbryinc#7c94a38683344262fe34773dc50bfbe6d2a9e116", + "lbry-redux": "lbryio/lbry-redux#04ae0913a444abac200731c7ed53796d763a0bbb", + "lbryinc": "lbryio/lbryinc#a44576194e1f5f60e37d328ddfdca40bd6165c2d", "lint-staged": "^7.0.2", "localforage": "^1.7.1", "lodash-es": "^4.17.14", diff --git a/src/ui/redux/actions/app.js b/src/ui/redux/actions/app.js index ecaa8f0cc..c4c0b4132 100644 --- a/src/ui/redux/actions/app.js +++ b/src/ui/redux/actions/app.js @@ -7,7 +7,6 @@ import path from 'path'; import * as ACTIONS from 'constants/action_types'; import * as MODALS from 'constants/modal_types'; import * as PAGES from 'constants/pages'; -import * as SETTINGS from 'constants/settings'; import { Lbry, doBalanceSubscribe, @@ -17,7 +16,6 @@ import { makeSelectClaimIsMine, doPopulateSharedUserState, doFetchChannelListMine, - selectBalance, } from 'lbry-redux'; import Native from 'native'; import { doFetchDaemonSettings } from 'redux/actions/settings'; @@ -33,13 +31,12 @@ import { selectUpgradeTimer, selectModal, } from 'redux/selectors/app'; -import { Lbryio, doAuthenticate, doGetSync, selectSyncHash } from 'lbryinc'; +import { Lbryio, doAuthenticate, doGetSync } from 'lbryinc'; import { lbrySettings as config, version as appVersion } from 'package.json'; import { push } from 'connected-react-router'; import analytics from 'analytics'; import { deleteAuthToken } from 'util/saved-passwords'; import cookie from 'cookie'; -import { makeSelectClientSetting } from 'redux/selectors/settings'; // @if TARGET='app' const { autoUpdater } = remote.require('electron-updater'); @@ -459,15 +456,7 @@ export function doSignIn() { // @endif // @if TARGET='app' - const state = getState(); - const syncEnabled = makeSelectClientSetting(SETTINGS.ENABLE_SYNC)(state); - const syncHash = selectSyncHash(state); - const balance = selectBalance(state); - - // For existing users, check if they've synced before, or have 0 balance - if (syncEnabled && (!syncHash || balance === 0)) { - dispatch(doGetSync()); - } + dispatch(doGetSync()); // @endif Lbryio.call('user_settings', 'get').then(settings => { diff --git a/src/ui/store.js b/src/ui/store.js index ceeb6a379..3d9089406 100644 --- a/src/ui/store.js +++ b/src/ui/store.js @@ -63,7 +63,6 @@ const whiteListedReducers = [ 'search', 'blocked', 'settings', - 'sync', ]; const transforms = [ diff --git a/static/app-strings.json b/static/app-strings.json index ff75be79c..cb7a2b73e 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -794,6 +794,5 @@ "channel": "channel", "Create": "Create", "Use this address to receive LBC.": "Use this address to receive LBC.", - "Not a valid LBRY address": "Not a valid LBRY address", - "You have no rewards available.": "You have no rewards available." + "Not a valid LBRY address": "Not a valid LBRY address" } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 86cc8147f..ea3399a30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6850,17 +6850,17 @@ lazy-val@^1.0.3, lazy-val@^1.0.4: yargs "^13.2.2" zstd-codec "^0.1.1" -lbry-redux@lbryio/lbry-redux#973d28e46290c77f2d9d468304008f80f71fd8cd: +lbry-redux@lbryio/lbry-redux#04ae0913a444abac200731c7ed53796d763a0bbb: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/973d28e46290c77f2d9d468304008f80f71fd8cd" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/04ae0913a444abac200731c7ed53796d763a0bbb" dependencies: proxy-polyfill "0.1.6" reselect "^3.0.0" uuid "^3.3.2" -lbryinc@lbryio/lbryinc#7c94a38683344262fe34773dc50bfbe6d2a9e116: +lbryinc@lbryio/lbryinc#a44576194e1f5f60e37d328ddfdca40bd6165c2d: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/7c94a38683344262fe34773dc50bfbe6d2a9e116" + resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/a44576194e1f5f60e37d328ddfdca40bd6165c2d" dependencies: reselect "^3.0.0"