preferences sync and wallet sync updates

package.json

@@ -12,8 +12,8 @@
         "base-64": "^0.1.0",
         "@expo/vector-icons": "^8.1.0",
         "gfycat-style-urls": "^1.0.3",
-        "lbry-redux": "lbryio/lbry-redux#23bcde0539a27fb19bf3a7d87683279194e02046",
-        "lbryinc": "lbryio/lbryinc#67bb3e215be3f13605c5e3f9f2b0e2fb880724cf",
+        "lbry-redux": "lbryio/lbry-redux#f06e1e64a8587a183bd7333f628fca821fe81fa4",
+        "lbryinc": "lbryio/lbryinc#02d8571cd7fafd00d1a60f133d884eb8c5f1a306",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
         "moment": "^2.22.1",

src/component/AppNavigator.js

@@ -39,6 +39,7 @@ import {
   selectEmailToVerify,
   selectEmailVerifyIsPending,
   selectEmailVerifyErrorMessage,
+  selectHashChanged,
   selectUser,
 } from 'lbryinc';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
@@ -53,6 +54,8 @@ import discoverStyle from 'styles/discover';
 import searchStyle from 'styles/search';
 import SearchRightHeaderIcon from 'component/searchRightHeaderIcon';
 
+const SYNC_GET_INTERVAL = 1000 * 60 * 5; // every 5 minutes
+
 const menuNavigationButton = navigation => (
   <NavigationButton
     name="bars"
@@ -272,6 +275,7 @@ class AppWithNavigationState extends React.Component {
     this.state = {
       emailVerifyDone: false,
       verifyPending: false,
+      syncHashChanged: false,
     };
   }
 
@@ -292,8 +296,17 @@ class AppWithNavigationState extends React.Component {
   }
 
   componentDidMount() {
+    const { dispatch } = this.props;
     this.emailVerifyCheckInterval = setInterval(() => this.checkEmailVerification(), 5000);
     Linking.addEventListener('url', this._handleUrl);
+
+    // call /sync/get with interval
+    setInterval(() => {
+      this.setState({ syncHashChanged: false }); // reset local state
+      NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
+        dispatch(doGetSync(walletPassword));
+      });
+    }, SYNC_GET_INTERVAL);
   }
 
   checkEmailVerification = () => {
@@ -320,7 +333,7 @@ class AppWithNavigationState extends React.Component {
   }
 
   componentDidUpdate() {
-    const { dispatch, user } = this.props;
+    const { dispatch, user, hashChanged } = this.props;
     if (this.state.verifyPending && this.emailVerifyCheckInterval > 0 && user && user.has_verified_email) {
       clearInterval(this.emailVerifyCheckInterval);
       AsyncStorage.setItem(Constants.KEY_EMAIL_VERIFY_PENDING, 'false');
@@ -332,6 +345,11 @@ class AppWithNavigationState extends React.Component {
       // get user settings after email verification
       this.getUserSettings();
     }
+
+    if (hashChanged && !this.state.syncHashChanged) {
+      this.setState({ syncHashChanged: true });
+      this.getUserSettings();
+    }
   }
 
   componentWillUpdate(nextProps) {
@@ -438,6 +456,7 @@ class AppWithNavigationState extends React.Component {
 
 const mapStateToProps = state => ({
   backgroundPlayEnabled: makeSelectClientSetting(SETTINGS.BACKGROUND_PLAY_ENABLED)(state),
+  hashChanged: selectHashChanged(state),
   keepDaemonRunning: makeSelectClientSetting(SETTINGS.KEEP_DAEMON_RUNNING)(state),
   nav: state.nav,
   toast: selectToast(state),

src/component/channelSelector/index.js

@@ -7,6 +7,7 @@ import {
   doCreateChannel,
   doToast,
 } from 'lbry-redux';
+import { doGetSync } from 'lbryinc';
 import ChannelSelector from './view';
 
 const select = state => ({
@@ -19,6 +20,7 @@ const perform = dispatch => ({
   notify: data => dispatch(doToast(data)),
   createChannel: (name, amount) => dispatch(doCreateChannel(name, amount)),
   fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
+  getSync: password => dispatch(doGetSync(password)),
 });
 
 export default connect(

src/component/channelSelector/view.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { CLAIM_VALUES, isNameValid } from 'lbry-redux';
-import { ActivityIndicator, Picker, Text, TextInput, TouchableOpacity, View } from 'react-native';
+import { ActivityIndicator, NativeModules, Picker, Text, TextInput, TouchableOpacity, View } from 'react-native';
 import Button from 'component/button';
 import Colors from 'styles/colors';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
@@ -117,7 +117,7 @@ export default class ChannelSelector extends React.PureComponent {
   };
 
   handleCreateChannelClick = () => {
-    const { balance, createChannel, onChannelChange, notify } = this.props;
+    const { balance, createChannel, getSync, onChannelChange, notify } = this.props;
     const { newChannelBid, newChannelName } = this.state;
 
     if (newChannelName.trim().length === 0 || !isNameValid(newChannelName.substr(1), false)) {
@@ -153,6 +153,9 @@ export default class ChannelSelector extends React.PureComponent {
       if (onChannelChange) {
         onChannelChange(channelName);
       }
+
+      // sync wallet
+      NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(password => getSync(password));
     };
 
     const failure = () => {

src/page/channelCreator/index.js

@@ -12,6 +12,7 @@ import {
   doUpdateChannel,
   doToast,
 } from 'lbry-redux';
+import { doGetSync } from 'lbryinc';
 import { doPushDrawerStack, doPopDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
 import { doUpdateChannelFormState, doClearChannelFormState } from 'redux/actions/form';
 import { selectDrawerStack } from 'redux/selectors/drawer';
@@ -37,6 +38,7 @@ const perform = dispatch => ({
   clearChannelFormState: () => dispatch(doClearChannelFormState()),
   createChannel: (name, amount, optionalParams) => dispatch(doCreateChannel(name, amount, optionalParams)),
   fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
+  getSync: password => dispatch(doGetSync(password)),
   updateChannel: params => dispatch(doUpdateChannel(params)),
   updateChannelFormState: data => dispatch(doUpdateChannelFormState(data)),
   pushDrawerStack: (routeName, params) => dispatch(doPushDrawerStack(routeName, params)),

src/page/channelCreator/view.js

@@ -376,7 +376,15 @@ export default class ChannelCreator extends React.PureComponent {
   };
 
   handleCreateChannelClick = () => {
-    const { balance, clearChannelFormState, createChannel, onChannelChange, notify, updateChannel } = this.props;
+    const {
+      balance,
+      clearChannelFormState,
+      createChannel,
+      onChannelChange,
+      getSync,
+      notify,
+      updateChannel,
+    } = this.props;
     const {
       claimId,
       coverImageUrl,
@@ -439,6 +447,9 @@ export default class ChannelCreator extends React.PureComponent {
       clearChannelFormState();
       notify({ message: 'The channel was successfully created.' });
       this.showChannelList();
+
+      // sync wallet
+      NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(password => getSync(password));
     };
 
     const failure = () => {

src/page/splash/view.js

@@ -16,8 +16,6 @@ import splashStyle from 'styles/splash';
 
 const BLOCK_HEIGHT_INTERVAL = 1000 * 60 * 2.5; // every 2.5 minutes
 
-const SETTINGS_GET_INTERVAL = 1000 * 60 * 5; // every 5 minutes
-
 const testingNetwork = 'Testing network';
 const waitingForResolution = 'Waiting for name resolution';
 
@@ -98,9 +96,7 @@ class SplashScreen extends React.PureComponent {
         // user is authenticated, navigate to the main view
         if (user.has_verified_email) {
           NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
-            if (walletPassword) {
-              getSync(walletPassword);
-            }
+            getSync(walletPassword);
             this.navigateToMain();
           });
           return;
@@ -140,14 +136,11 @@ class SplashScreen extends React.PureComponent {
 
       // get user settings interval
       this.getUserSettings();
-      setInterval(() => this.getUserSettings(), SETTINGS_GET_INTERVAL);
 
       if (user && user.id && user.has_verified_email) {
         // user already authenticated
         NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
-          if (walletPassword) {
-            getSync(walletPassword);
-          }
+          getSync(walletPassword);
           this.navigateToMain();
         });
       } else {

src/page/wallet/view.js

@@ -47,9 +47,7 @@ class WalletPage extends React.PureComponent {
     const { deviceWalletSynced, getSync, user } = this.props;
     if (deviceWalletSynced && user && user.has_verified_email) {
       NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
-        if (walletPassword) {
-          getSync(walletPassword);
-        }
+        getSync(walletPassword);
       });
     }
   };