From 5eba4ab2ec04b7ecf60aba7271f9f99fa3dc83ff Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Mon, 30 Sep 2019 22:54:31 +0100
Subject: [PATCH 01/15] use shared state subscriber for preferences_set and
 preferences_get

---
 package-lock.json |  4 ++--
 package.json      |  2 +-
 src/index.js      | 36 ++++++++++++++++++------------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 57c6435..1d0eb6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5640,8 +5640,8 @@
             }
         },
         "lbry-redux": {
-            "version": "github:lbryio/lbry-redux#7ec72a737bcd336f000c5f5085891643110298c3",
-            "from": "github:lbryio/lbry-redux#7ec72a737bcd336f000c5f5085891643110298c3",
+            "version": "github:lbryio/lbry-redux#23bcde0539a27fb19bf3a7d87683279194e02046",
+            "from": "github:lbryio/lbry-redux#23bcde0539a27fb19bf3a7d87683279194e02046",
             "requires": {
                 "proxy-polyfill": "0.1.6",
                 "reselect": "^3.0.0",
diff --git a/package.json b/package.json
index 40155f1..dba18fb 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
         "base-64": "^0.1.0",
         "@expo/vector-icons": "^8.1.0",
         "gfycat-style-urls": "^1.0.3",
-        "lbry-redux": "lbryio/lbry-redux#7ec72a737bcd336f000c5f5085891643110298c3",
+        "lbry-redux": "lbryio/lbry-redux#23bcde0539a27fb19bf3a7d87683279194e02046",
         "lbryinc": "lbryio/lbryinc#67bb3e215be3f13605c5e3f9f2b0e2fb880724cf",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
diff --git a/src/index.js b/src/index.js
index 4013fe2..252f85c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,6 +13,7 @@ import {
   searchReducer,
   tagsReducer,
   walletReducer,
+  sharedStateSubscriber,
 } from 'lbry-redux';
 import {
   Lbryio,
@@ -83,7 +84,7 @@ const compressor = createCompressor();
 const authFilter = createFilter('auth', ['authToken']);
 const contentFilter = createFilter('content', ['positions']);
 const saveClaimsFilter = createFilter('claims', ['claimsByUri']);
-const subscriptionsFilter = createFilter('subscriptions', ['enabledChannelNotifications', 'subscriptions']);
+const subscriptionsFilter = createFilter('subscriptions', ['enabledChannelNotifications', 'subscriptions', 'latest']);
 const settingsFilter = createFilter('settings', ['clientSettings']);
 const tagsFilter = createFilter('tags', ['followedTags']);
 const walletFilter = createFilter('wallet', ['receiveAddress']);
@@ -147,25 +148,24 @@ const persistor = persistStore(store, persistOptions, err => {
 });
 window.persistor = persistor;
 
-let currentPayload;
-store.subscribe(() => {
-  const state = store.getState();
-  const subscriptions = state.subscriptions.subscriptions.map(({ uri }) => uri);
-  const tags = state.tags.followedTags;
-
-  const newPayload = {
-    version: '0.1',
-    shared: {
-      subscriptions,
-      tags,
+const sharedStateCache = {};
+const sharedStateFilters = {
+  tags: { source: 'tags', property: 'followedTags' },
+  subscriptions: {
+    source: 'subscriptions',
+    property: 'subscriptions',
+    transform: function(value) {
+      return value.map(({ uri }) => uri);
     },
-  };
+  },
+};
 
-  if (!isEqual(newPayload, currentPayload)) {
-    currentPayload = newPayload;
-    if (Lbryio.authToken) {
-      Lbryio.call('user_settings', 'set', { settings: JSON.stringify(newPayload) });
-    }
+store.subscribe(() => {
+  try {
+    const state = store.getState();
+    sharedStateSubscriber(state, sharedStateFilters, sharedStateCache);
+  } catch (e) {
+    // handle gracefully?
   }
 });
 
-- 
2.45.2


From f42cbb90a063eec91f0ccb2489a67703b3a8be42 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Wed, 2 Oct 2019 10:29:08 +0100
Subject: [PATCH 02/15] use doPreferenceGet for retrieving saved user state

---
 src/component/AppNavigator.js | 6 +++---
 src/index.js                  | 8 ++++++--
 src/page/splash/view.js       | 7 ++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/component/AppNavigator.js b/src/component/AppNavigator.js
index a5fb642..2d68083 100644
--- a/src/component/AppNavigator.js
+++ b/src/component/AppNavigator.js
@@ -29,7 +29,7 @@ import {
 import { connect } from 'react-redux';
 import { AppState, BackHandler, Linking, NativeModules, TextInput, ToastAndroid } from 'react-native';
 import { selectDrawerStack } from 'redux/selectors/drawer';
-import { SETTINGS, doDismissToast, doPopulateSharedUserState, doToast, selectToast } from 'lbry-redux';
+import { SETTINGS, doDismissToast, doPopulateSharedUserState, doPreferenceGet, doToast, selectToast } from 'lbry-redux';
 import {
   Lbryio,
   doGetSync,
@@ -308,8 +308,8 @@ class AppWithNavigationState extends React.Component {
 
   getUserSettings = () => {
     const { dispatch } = this.props;
-    Lbryio.call('user_settings', 'get').then(settings => {
-      dispatch(doPopulateSharedUserState(settings));
+    doPreferenceGet('shared', null, null, preference => {
+      dispatch(doPopulateSharedUserState(preference));
     });
   };
 
diff --git a/src/index.js b/src/index.js
index 252f85c..cea3631 100644
--- a/src/index.js
+++ b/src/index.js
@@ -148,7 +148,11 @@ const persistor = persistStore(store, persistOptions, err => {
 });
 window.persistor = persistor;
 
-const sharedStateCache = {};
+/**
+ * source: the reducer name
+ * property: the property in the reducer-specific state
+ * transform: optional method to modify the value to be stored
+ */
 const sharedStateFilters = {
   tags: { source: 'tags', property: 'followedTags' },
   subscriptions: {
@@ -163,7 +167,7 @@ const sharedStateFilters = {
 store.subscribe(() => {
   try {
     const state = store.getState();
-    sharedStateSubscriber(state, sharedStateFilters, sharedStateCache);
+    sharedStateSubscriber(state, sharedStateFilters, '0.1');
   } catch (e) {
     // handle gracefully?
   }
diff --git a/src/page/splash/view.js b/src/page/splash/view.js
index 2a2a5c6..3eecfdc 100644
--- a/src/page/splash/view.js
+++ b/src/page/splash/view.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Lbry } from 'lbry-redux';
+import { Lbry, doPreferenceGet } from 'lbry-redux';
 import { Lbryio } from 'lbryinc';
 import { ActivityIndicator, Linking, NativeModules, Platform, Text, View } from 'react-native';
 import { NavigationActions, StackActions } from 'react-navigation';
@@ -113,8 +113,9 @@ class SplashScreen extends React.PureComponent {
 
   getUserSettings = () => {
     const { populateSharedUserState } = this.props;
-    Lbryio.call('user_settings', 'get').then(settings => {
-      populateSharedUserState(settings);
+
+    doPreferenceGet('shared', null, null, preference => {
+      populateSharedUserState(preference);
     });
   };
 
-- 
2.45.2


From 03b321c742c7c0671ffdff366391c9c23c109258 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 11 Oct 2019 15:10:54 +0100
Subject: [PATCH 03/15] add share button

---
 src/page/file/view.js  | 37 +++++++++++++++++++++++++++++++------
 src/styles/filePage.js | 18 ++++++++++++++++++
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/src/page/file/view.js b/src/page/file/view.js
index 5600e8a..c6ccdd3 100644
--- a/src/page/file/view.js
+++ b/src/page/file/view.js
@@ -508,6 +508,20 @@ class FilePage extends React.PureComponent {
     this.setState({ fileViewLogged: true });
   };
 
+  // TODO: Move this to lbry-redux
+  formatLbryUrlForWeb = url => {
+    return url.replace('lbry://', '/').replace(/#/g, ':');
+  };
+
+  handleSharePress = () => {
+    const { claim, notify } = this.props;
+    if (claim) {
+      const { canonical_url: canonicalUrl, short_url: shortUrl, permanent_url: permanentUrl } = claim;
+      const url = 'https://beta.lbry.tv/' + this.formatLbryUrlForWeb(canonicalUrl || (shortUrl || permanentUrl));
+      NativeModules.UtilityModule.shareUrl(url);
+    }
+  };
+
   handleSendTip = () => {
     const { claim, balance, navigation, notify, sendTip } = this.props;
     const { uri } = navigation.state.params;
@@ -933,6 +947,22 @@ class FilePage extends React.PureComponent {
                     </View>
                   </View>
                 </TouchableWithoutFeedback>
+
+                <View style={filePageStyle.largeButtonsRow}>
+                  <TouchableOpacity style={filePageStyle.largeButton} onPress={this.handleSharePress}>
+                    <Icon name={'share-alt'} size={24} style={filePageStyle.largeButtonIcon} />
+                    <Text style={filePageStyle.largeButtonText}>Share</Text>
+                  </TouchableOpacity>
+
+                  <TouchableOpacity
+                    style={filePageStyle.largeButton}
+                    onPress={() => Linking.openURL(`https://lbry.com/dmca/${claim.claim_id}`)}
+                  >
+                    <Icon name={'flag'} size={24} style={filePageStyle.largeButtonIcon} />
+                    <Text style={filePageStyle.largeButtonText}>Report</Text>
+                  </TouchableOpacity>
+                </View>
+
                 <View style={filePageStyle.channelRow}>
                   <View style={filePageStyle.publishInfo}>
                     {channelName && (
@@ -969,12 +999,7 @@ class FilePage extends React.PureComponent {
                         onPress={this.onSaveFilePressed}
                       />
                     )}
-                    <Button
-                      style={[filePageStyle.actionButton, filePageStyle.reportButton]}
-                      theme={'light'}
-                      icon={'flag'}
-                      onPress={() => Linking.openURL(`https://lbry.com/dmca?claim_id=${claim.claim_id}`)}
-                    />
+
                     <Button
                       style={[filePageStyle.actionButton, filePageStyle.tipButton]}
                       theme={'light'}
diff --git a/src/styles/filePage.js b/src/styles/filePage.js
index b039d1d..64fc4b3 100644
--- a/src/styles/filePage.js
+++ b/src/styles/filePage.js
@@ -377,6 +377,24 @@ const filePageStyle = StyleSheet.create({
   backButtonIcon: {
     color: Colors.White,
   },
+  largeButton: {
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  largeButtonIcon: {
+    color: Colors.DescriptionGrey,
+  },
+  largeButtonText: {
+    fontFamily: 'Inter-UI-Regular',
+    fontSize: 14,
+    marginTop: 4,
+  },
+  largeButtonsRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    margin: 16,
+  },
 });
 
 export default filePageStyle;
-- 
2.45.2


From c85581b98f5d5a06257473c3c86d56d6197e3d43 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 11 Oct 2019 15:17:49 +0100
Subject: [PATCH 04/15] remove extra slash

---
 src/page/file/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/page/file/view.js b/src/page/file/view.js
index cd98598..7c30694 100644
--- a/src/page/file/view.js
+++ b/src/page/file/view.js
@@ -517,7 +517,7 @@ class FilePage extends React.PureComponent {
     const { claim, notify } = this.props;
     if (claim) {
       const { canonical_url: canonicalUrl, short_url: shortUrl, permanent_url: permanentUrl } = claim;
-      const url = 'https://beta.lbry.tv/' + this.formatLbryUrlForWeb(canonicalUrl || (shortUrl || permanentUrl));
+      const url = 'https://beta.lbry.tv' + this.formatLbryUrlForWeb(canonicalUrl || (shortUrl || permanentUrl));
       NativeModules.UtilityModule.shareUrl(url);
     }
   };
-- 
2.45.2


From 79c02825d187844d759514117c664f9426c641ca Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 11 Oct 2019 17:12:51 +0100
Subject: [PATCH 05/15] preferences sync and wallet sync updates

---
 package.json                           |  4 ++--
 src/component/AppNavigator.js          | 21 ++++++++++++++++++++-
 src/component/channelSelector/index.js |  2 ++
 src/component/channelSelector/view.js  |  7 +++++--
 src/page/channelCreator/index.js       |  2 ++
 src/page/channelCreator/view.js        | 13 ++++++++++++-
 src/page/splash/view.js                | 11 ++---------
 src/page/wallet/view.js                |  4 +---
 8 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index dba18fb..3c44f78 100644
--- a/package.json
+++ b/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",
diff --git a/src/component/AppNavigator.js b/src/component/AppNavigator.js
index 2d68083..462d520 100644
--- a/src/component/AppNavigator.js
+++ b/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),
diff --git a/src/component/channelSelector/index.js b/src/component/channelSelector/index.js
index daee8c7..eb9bae9 100644
--- a/src/component/channelSelector/index.js
+++ b/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(
diff --git a/src/component/channelSelector/view.js b/src/component/channelSelector/view.js
index bd5cfbe..a4e6388 100644
--- a/src/component/channelSelector/view.js
+++ b/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 = () => {
diff --git a/src/page/channelCreator/index.js b/src/page/channelCreator/index.js
index b58c369..085cf2a 100644
--- a/src/page/channelCreator/index.js
+++ b/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)),
diff --git a/src/page/channelCreator/view.js b/src/page/channelCreator/view.js
index 17a90d7..506a7aa 100644
--- a/src/page/channelCreator/view.js
+++ b/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 = () => {
diff --git a/src/page/splash/view.js b/src/page/splash/view.js
index 3eecfdc..b5ce480 100644
--- a/src/page/splash/view.js
+++ b/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 {
diff --git a/src/page/wallet/view.js b/src/page/wallet/view.js
index df6c5f5..491ef88 100644
--- a/src/page/wallet/view.js
+++ b/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);
       });
     }
   };
-- 
2.45.2


From 4ac36b0bc7bf839d7b52bcafcd0ca10a07dde20b Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 15 Oct 2019 08:28:37 +0100
Subject: [PATCH 06/15] updates for release

---
 package-lock.json                         |  4 ++--
 package.json                              |  2 +-
 src/page/firstRun/internal/wallet-page.js | 15 +++++++++++----
 src/page/firstRun/view.js                 |  9 +++++----
 src/page/splash/view.js                   | 16 ++++------------
 src/redux/reducers/drawer.js              |  2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b742d5b..189da2d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5640,8 +5640,8 @@
             }
         },
         "lbry-redux": {
-            "version": "github:lbryio/lbry-redux#f06e1e64a8587a183bd7333f628fca821fe81fa4",
-            "from": "github:lbryio/lbry-redux#f06e1e64a8587a183bd7333f628fca821fe81fa4",
+            "version": "github:lbryio/lbry-redux#dff1ecb195a03c5443526329116058b94d7391f7",
+            "from": "github:lbryio/lbry-redux#dff1ecb195a03c5443526329116058b94d7391f7",
             "requires": {
                 "proxy-polyfill": "0.1.6",
                 "reselect": "^3.0.0",
diff --git a/package.json b/package.json
index 3c44f78..a4817cc 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
         "base-64": "^0.1.0",
         "@expo/vector-icons": "^8.1.0",
         "gfycat-style-urls": "^1.0.3",
-        "lbry-redux": "lbryio/lbry-redux#f06e1e64a8587a183bd7333f628fca821fe81fa4",
+        "lbry-redux": "lbryio/lbry-redux#91848445aa9e1efb76488947a32a7fc52543d52d",
         "lbryinc": "lbryio/lbryinc#02d8571cd7fafd00d1a60f133d884eb8c5f1a306",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
diff --git a/src/page/firstRun/internal/wallet-page.js b/src/page/firstRun/internal/wallet-page.js
index f1b1cfb..cad1931 100644
--- a/src/page/firstRun/internal/wallet-page.js
+++ b/src/page/firstRun/internal/wallet-page.js
@@ -14,7 +14,7 @@ import {
 import { BarPasswordStrengthDisplay } from 'react-native-password-strength-meter';
 import AsyncStorage from '@react-native-community/async-storage';
 import Colors from 'styles/colors';
-import Constants from 'constants';
+import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import firstRunStyle from 'styles/firstRun';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 
@@ -62,7 +62,14 @@ class WalletPage extends React.PureComponent {
   };
 
   render() {
-    const { onPasswordChanged, onWalletViewLayout, getSyncIsPending, hasSyncedWallet, syncApplyIsPending } = this.props;
+    const {
+      onPasswordChanged,
+      onWalletViewLayout,
+      getSyncIsPending,
+      hasSyncedWallet,
+      syncApplyIsPending,
+      syncApplyStarted,
+    } = this.props;
 
     let content;
     if (!this.state.walletReady || !this.state.hasCheckedSync || getSyncIsPending) {
@@ -72,11 +79,11 @@ class WalletPage extends React.PureComponent {
           <Text style={firstRunStyle.paragraph}>Retrieving your account information...</Text>
         </View>
       );
-    } else if (syncApplyIsPending) {
+    } else if (syncApplyStarted || syncApplyIsPending) {
       content = (
         <View style={firstRunStyle.centered}>
           <ActivityIndicator size="large" color={Colors.White} style={firstRunStyle.waiting} />
-          <Text style={firstRunStyle.paragraph}>Validating password...</Text>
+          <Text style={firstRunStyle.paragraph}>{syncApplyIsPending ? 'Validating password' : 'Synchronizing'}...</Text>
         </View>
       );
     } else {
diff --git a/src/page/firstRun/view.js b/src/page/firstRun/view.js
index 5ff0843..8c54d3b 100644
--- a/src/page/firstRun/view.js
+++ b/src/page/firstRun/view.js
@@ -81,8 +81,8 @@ class FirstRunScreen extends React.PureComponent {
 
     if (this.state.syncApplyStarted && !syncApplyIsPending) {
       if (syncApplyErrorMessage && syncApplyErrorMessage.trim().length > 0) {
-        notify({ message: syncApplyErrorMessage, syncApplyStarted: false, isError: true });
-        this.setState({ showBottomContainer: true });
+        notify({ message: syncApplyErrorMessage, isError: true });
+        this.setState({ showBottomContainer: true, syncApplyStarted: false });
       } else {
         // password successfully verified
         NativeModules.UtilityModule.setSecureValue(
@@ -132,9 +132,9 @@ class FirstRunScreen extends React.PureComponent {
     const { navigation } = this.props;
     const resetAction = StackActions.reset({
       index: 0,
-      actions: [NavigationActions.navigate({ routeName: 'Splash', params: { launchUri: this.state.launchUri } })],
+      actions: [NavigationActions.navigate({ routeName: 'Splash', params: { launchUri: this.state.launchUrl } })],
     });
-    navigation.dispatch(resetAction);
+    setTimeout(() => navigation.dispatch(resetAction), 1000);
   }
 
   handleLeftButtonPressed = () => {
@@ -367,6 +367,7 @@ class FirstRunScreen extends React.PureComponent {
             hasSyncedWallet={hasSyncedWallet}
             getSyncIsPending={getSyncIsPending}
             syncApplyIsPending={syncApplyIsPending}
+            syncApplyStarted={this.state.syncApplyStarted}
             onWalletViewLayout={this.onWalletViewLayout}
             onPasswordChanged={this.onWalletPasswordChanged}
           />
diff --git a/src/page/splash/view.js b/src/page/splash/view.js
index b5ce480..c6cda03 100644
--- a/src/page/splash/view.js
+++ b/src/page/splash/view.js
@@ -38,12 +38,6 @@ class SplashScreen extends React.PureComponent {
     subscriptionsFetched: false,
   };
 
-  componentWillMount() {
-    if (NativeModules.DaemonServiceControl) {
-      NativeModules.DaemonServiceControl.startService();
-    }
-  }
-
   updateStatus() {
     Lbry.status().then(status => {
       this._updateStatusCallback(status);
@@ -58,7 +52,7 @@ class SplashScreen extends React.PureComponent {
     });
     navigation.dispatch(resetAction);
 
-    const launchUrl = navigation.state.params.launchUrl || this.state.launchUrl;
+    const launchUrl = navigation.state.params ? navigation.state.params.launchUrl : this.state.launchUrl;
     if (launchUrl) {
       if (launchUrl.startsWith('lbry://?verify=')) {
         let verification = {};
@@ -89,9 +83,10 @@ class SplashScreen extends React.PureComponent {
 
   componentWillReceiveProps(nextProps) {
     const { emailToVerify, getSync, setEmailToVerify, verifyUserEmail, verifyUserEmailFailure } = this.props;
+    const { daemonReady, shouldAuthenticate } = this.state;
     const { user } = nextProps;
 
-    if (this.state.daemonReady && this.state.shouldAuthenticate && user && user.id) {
+    if (daemonReady && shouldAuthenticate && user && user.id) {
       this.setState({ shouldAuthenticate: false }, () => {
         // user is authenticated, navigate to the main view
         if (user.has_verified_email) {
@@ -243,10 +238,7 @@ class SplashScreen extends React.PureComponent {
   }
 
   componentDidMount() {
-    if (NativeModules.Firebase) {
-      NativeModules.Firebase.track('app_launch', null);
-    }
-
+    NativeModules.Firebase.track('app_launch', null);
     NativeModules.Firebase.setCurrentScreen('Splash');
 
     this.props.fetchRewardedContent();
diff --git a/src/redux/reducers/drawer.js b/src/redux/reducers/drawer.js
index aa10871..362703b 100644
--- a/src/redux/reducers/drawer.js
+++ b/src/redux/reducers/drawer.js
@@ -54,7 +54,7 @@ reducers[Constants.ACTION_POP_DRAWER_STACK] = (state, action) => {
 reducers[Constants.ACTION_REACT_NAVGIATION_RESET] = (state, action) => {
   return {
     ...state,
-    currentRoute: Constants.DRAWER_ROUTE_DISCOVER, // default to Discover upon reset
+    // currentRoute: Constants.DRAWER_ROUTE_DISCOVER, // default to Discover upon reset
   };
 };
 
-- 
2.45.2


From 194e29356f24527f7d17c6adbaf24c0165b54a67 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 15 Oct 2019 10:24:03 +0100
Subject: [PATCH 07/15] preference updates. send firebase token.

---
 package-lock.json                             |  8 +--
 package.json                                  |  2 +-
 src/component/AppNavigator.js                 | 14 ++--
 src/component/channelSelector/view.js         |  2 +-
 src/component/floatingWalletBalance/view.js   |  2 +-
 src/constants.js                              |  2 +-
 src/index.js                                  | 71 +++++++++++--------
 src/page/channelCreator/view.js               |  2 +-
 src/page/firstRun/index.js                    |  4 +-
 src/page/firstRun/internal/welcome-page.js    | 40 ++++++-----
 src/page/firstRun/view.js                     | 25 +++----
 src/page/splash/index.js                      |  2 +-
 src/page/splash/view.js                       | 24 ++++---
 src/page/verification/index.js                |  2 -
 .../verification/internal/sync-verify-page.js | 13 ++--
 src/page/verification/view.js                 |  2 -
 src/page/wallet/view.js                       |  2 +-
 17 files changed, 117 insertions(+), 100 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 189da2d..5637071 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5640,8 +5640,8 @@
             }
         },
         "lbry-redux": {
-            "version": "github:lbryio/lbry-redux#dff1ecb195a03c5443526329116058b94d7391f7",
-            "from": "github:lbryio/lbry-redux#dff1ecb195a03c5443526329116058b94d7391f7",
+            "version": "github:lbryio/lbry-redux#91848445aa9e1efb76488947a32a7fc52543d52d",
+            "from": "github:lbryio/lbry-redux#91848445aa9e1efb76488947a32a7fc52543d52d",
             "requires": {
                 "proxy-polyfill": "0.1.6",
                 "reselect": "^3.0.0",
@@ -5649,8 +5649,8 @@
             }
         },
         "lbryinc": {
-            "version": "github:lbryio/lbryinc#02d8571cd7fafd00d1a60f133d884eb8c5f1a306",
-            "from": "github:lbryio/lbryinc#02d8571cd7fafd00d1a60f133d884eb8c5f1a306",
+            "version": "github:lbryio/lbryinc#367d987e1f8344761e9fe9602499c583208d3b6b",
+            "from": "github:lbryio/lbryinc#367d987e1f8344761e9fe9602499c583208d3b6b",
             "requires": {
                 "reselect": "^3.0.0"
             }
diff --git a/package.json b/package.json
index a4817cc..a25e2d6 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
         "@expo/vector-icons": "^8.1.0",
         "gfycat-style-urls": "^1.0.3",
         "lbry-redux": "lbryio/lbry-redux#91848445aa9e1efb76488947a32a7fc52543d52d",
-        "lbryinc": "lbryio/lbryinc#02d8571cd7fafd00d1a60f133d884eb8c5f1a306",
+        "lbryinc": "lbryio/lbryinc#367d987e1f8344761e9fe9602499c583208d3b6b",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
         "moment": "^2.22.1",
diff --git a/src/component/AppNavigator.js b/src/component/AppNavigator.js
index 462d520..a7b0240 100644
--- a/src/component/AppNavigator.js
+++ b/src/component/AppNavigator.js
@@ -303,7 +303,7 @@ class AppWithNavigationState extends React.Component {
     // call /sync/get with interval
     setInterval(() => {
       this.setState({ syncHashChanged: false }); // reset local state
-      NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
+      NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(walletPassword => {
         dispatch(doGetSync(walletPassword));
       });
     }, SYNC_GET_INTERVAL);
@@ -321,9 +321,15 @@ class AppWithNavigationState extends React.Component {
 
   getUserSettings = () => {
     const { dispatch } = this.props;
-    doPreferenceGet('shared', null, null, preference => {
-      dispatch(doPopulateSharedUserState(preference));
-    });
+    doPreferenceGet(
+      'shared',
+      preference => {
+        dispatch(doPopulateSharedUserState(preference));
+      },
+      error => {
+        /* failed */
+      }
+    );
   };
 
   componentWillUnmount() {
diff --git a/src/component/channelSelector/view.js b/src/component/channelSelector/view.js
index a4e6388..8ab3e7d 100644
--- a/src/component/channelSelector/view.js
+++ b/src/component/channelSelector/view.js
@@ -155,7 +155,7 @@ export default class ChannelSelector extends React.PureComponent {
       }
 
       // sync wallet
-      NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(password => getSync(password));
+      NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password => getSync(password));
     };
 
     const failure = () => {
diff --git a/src/component/floatingWalletBalance/view.js b/src/component/floatingWalletBalance/view.js
index deb3877..705d471 100644
--- a/src/component/floatingWalletBalance/view.js
+++ b/src/component/floatingWalletBalance/view.js
@@ -34,7 +34,7 @@ class FloatingWalletBalance extends React.PureComponent<Props> {
           <Icon name="coins" size={12} style={floatingButtonStyle.balanceIcon} />
           {isNaN(balance) && <ActivityIndicator size="small" color={Colors.White} />}
           {(!isNaN(balance) || balance === 0) && (
-            <Text style={floatingButtonStyle.text}>{formatCredits(parseFloat(balance), 0, true)}</Text>
+            <Text style={floatingButtonStyle.text}>{formatCredits(parseFloat(balance), 1, true)}</Text>
           )}
         </TouchableOpacity>
       </View>
diff --git a/src/constants.js b/src/constants.js
index be0d4f5..eab9cc2 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -32,7 +32,7 @@ const Constants = {
   ABOUT_TAB: 'about',
 
   KEY_FIRST_RUN_EMAIL: 'firstRunEmail',
-  KEY_FIRST_RUN_PASSWORD: 'firstRunPassword',
+  KEY_WALLET_PASSWORD: 'firstRunPassword',
   KEY_FIRST_USER_AUTH: 'firstUserAuth',
   KEY_SHOULD_VERIFY_EMAIL: 'shouldVerifyEmail',
   KEY_EMAIL_VERIFY_PENDING: 'emailVerifyPending',
diff --git a/src/index.js b/src/index.js
index cea3631..98e7539 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,6 +4,7 @@ import { Provider, connect } from 'react-redux';
 import { AppRegistry, Text, View, NativeModules } from 'react-native';
 import {
   Lbry,
+  buildSharedStateMiddleware,
   claimsReducer,
   contentReducer,
   fileReducer,
@@ -13,20 +14,24 @@ import {
   searchReducer,
   tagsReducer,
   walletReducer,
-  sharedStateSubscriber,
+  ACTIONS as LBRY_REDUX_ACTIONS,
 } from 'lbry-redux';
 import {
   Lbryio,
   authReducer,
   blacklistReducer,
   costInfoReducer,
+  doGetSync,
   filteredReducer,
   homepageReducer,
   rewardsReducer,
+  selectUserVerifiedEmail,
   subscriptionsReducer,
   syncReducer,
   userReducer,
+  LBRYINC_ACTIONS,
 } from 'lbryinc';
+import { makeSelectClientSetting } from 'redux/selectors/settings';
 import { createStore, applyMiddleware, compose } from 'redux';
 import AppWithNavigationState, {
   AppNavigator,
@@ -34,6 +39,7 @@ import AppWithNavigationState, {
   reactNavigationMiddleware,
 } from 'component/AppNavigator';
 import { REHYDRATE, PURGE, persistCombineReducers, persistStore } from 'redux-persist';
+import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import getStoredStateMigrateV4 from 'redux-persist/lib/integration/getStoredStateMigrateV4';
 import FilesystemStorage from 'redux-persist-filesystem-storage';
 import createCompressor from 'redux-persist-transform-compress';
@@ -43,7 +49,6 @@ import formReducer from 'redux/reducers/form';
 import drawerReducer from 'redux/reducers/drawer';
 import settingsReducer from 'redux/reducers/settings';
 import thunk from 'redux-thunk';
-import isEqual from 'utils/deep-equal';
 
 const globalExceptionHandler = (error, isFatal) => {
   if (error && NativeModules.Firebase) {
@@ -128,8 +133,43 @@ const reducers = persistCombineReducers(persistOptions, {
   wallet: walletReducer,
 });
 
+/**
+ * source: the reducer name
+ * property: the property in the reducer-specific state
+ * transform: optional method to modify the value to be stored
+ */
+const sharedStateActions = [
+  LBRYINC_ACTIONS.CHANNEL_SUBSCRIBE,
+  LBRYINC_ACTIONS.CHANNEL_UNSUBSCRIBE,
+  LBRY_REDUX_ACTIONS.TOGGLE_TAG_FOLLOW,
+  LBRY_REDUX_ACTIONS.TOGGLE_BLOCK_CHANNEL,
+];
+const sharedStateFilters = {
+  tags: { source: 'tags', property: 'followedTags' },
+  subscriptions: {
+    source: 'subscriptions',
+    property: 'subscriptions',
+    transform: function(value) {
+      return value.map(({ uri }) => uri);
+    },
+  },
+};
+
+const sharedStateCallback = ({ dispatch, getState }) => {
+  const state = getState();
+  const syncEnabled = makeSelectClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED)(state);
+  const emailVerified = selectUserVerifiedEmail(state);
+  if (syncEnabled && emailVerified) {
+    NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password =>
+      dispatch(doGetSync(password))
+    );
+  }
+};
+
+const sharedStateMiddleware = buildSharedStateMiddleware(sharedStateActions, sharedStateFilters, sharedStateCallback);
+
 const bulkThunk = createBulkThunkMiddleware();
-const middleware = [thunk, bulkThunk, reactNavigationMiddleware];
+const middleware = [sharedStateMiddleware, thunk, bulkThunk, reactNavigationMiddleware];
 
 // eslint-disable-next-line no-underscore-dangle
 const composeEnhancers = compose;
@@ -148,31 +188,6 @@ const persistor = persistStore(store, persistOptions, err => {
 });
 window.persistor = persistor;
 
-/**
- * source: the reducer name
- * property: the property in the reducer-specific state
- * transform: optional method to modify the value to be stored
- */
-const sharedStateFilters = {
-  tags: { source: 'tags', property: 'followedTags' },
-  subscriptions: {
-    source: 'subscriptions',
-    property: 'subscriptions',
-    transform: function(value) {
-      return value.map(({ uri }) => uri);
-    },
-  },
-};
-
-store.subscribe(() => {
-  try {
-    const state = store.getState();
-    sharedStateSubscriber(state, sharedStateFilters, '0.1');
-  } catch (e) {
-    // handle gracefully?
-  }
-});
-
 // TODO: Find i18n module that is compatible with react-native
 global.__ = str => str;
 
diff --git a/src/page/channelCreator/view.js b/src/page/channelCreator/view.js
index 506a7aa..afb89ab 100644
--- a/src/page/channelCreator/view.js
+++ b/src/page/channelCreator/view.js
@@ -449,7 +449,7 @@ export default class ChannelCreator extends React.PureComponent {
       this.showChannelList();
 
       // sync wallet
-      NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(password => getSync(password));
+      NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password => getSync(password));
     };
 
     const failure = () => {
diff --git a/src/page/firstRun/index.js b/src/page/firstRun/index.js
index 1596cb3..725ef17 100644
--- a/src/page/firstRun/index.js
+++ b/src/page/firstRun/index.js
@@ -4,7 +4,6 @@ import {
   doAuthenticate,
   doCheckSync,
   doGetSync,
-  doSetDefaultAccount,
   doSyncApply,
   doUserEmailNew,
   doUserResendVerificationEmail,
@@ -41,12 +40,11 @@ const select = state => ({
 
 const perform = dispatch => ({
   addUserEmail: email => dispatch(doUserEmailNew(email)),
-  authenticate: (appVersion, os) => dispatch(doAuthenticate(appVersion, os)),
+  authenticate: (appVersion, os, firebaseToken) => dispatch(doAuthenticate(appVersion, os, firebaseToken)),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
   syncApply: (hash, data, password) => dispatch(doSyncApply(hash, data, password)),
   getSync: password => dispatch(doGetSync(password)),
   checkSync: () => dispatch(doCheckSync()),
-  setDefaultAccount: (success, failure) => dispatch(doSetDefaultAccount(success, failure)),
   notify: data => dispatch(doToast(data)),
   resendVerificationEmail: email => dispatch(doUserResendVerificationEmail(email)),
 });
diff --git a/src/page/firstRun/internal/welcome-page.js b/src/page/firstRun/internal/welcome-page.js
index 04c80c2..8fe71cc 100644
--- a/src/page/firstRun/internal/welcome-page.js
+++ b/src/page/firstRun/internal/welcome-page.js
@@ -3,7 +3,7 @@ import { Lbry } from 'lbry-redux';
 import { ActivityIndicator, NativeModules, Platform, Text, View } from 'react-native';
 import AsyncStorage from '@react-native-community/async-storage';
 import Colors from 'styles/colors';
-import Constants from 'constants';
+import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import firstRunStyle from 'styles/firstRun';
 
 class WelcomePage extends React.PureComponent {
@@ -25,7 +25,7 @@ class WelcomePage extends React.PureComponent {
       } else {
         // first_user_auth because it's the first time
         AsyncStorage.getItem(Constants.KEY_FIRST_USER_AUTH).then(firstUserAuth => {
-          if ('true' !== firstUserAuth) {
+          if (firstUserAuth !== 'true') {
             // first_user_auth
             NativeModules.Firebase.track('first_user_auth', null);
             AsyncStorage.setItem(Constants.KEY_FIRST_USER_AUTH, 'true');
@@ -47,25 +47,27 @@ class WelcomePage extends React.PureComponent {
     const { authenticate } = this.props;
     this.setState({ authenticationStarted: true, authenticationFailed: false });
     NativeModules.VersionInfo.getAppVersion().then(appVersion => {
-      Lbry.status()
-        .then(info => {
-          this.setState({ sdkStarted: true });
+      NativeModules.Firebase.getMessagingToken().then(firebaseToken => {
+        Lbry.status()
+          .then(info => {
+            this.setState({ sdkStarted: true });
 
-          authenticate(appVersion, Platform.OS);
-        })
-        .catch(error => {
-          if (this.state.statusTries >= WelcomePage.MAX_STATUS_TRIES) {
-            this.setState({ authenticationFailed: true });
+            authenticate(appVersion, Platform.OS, firebaseToken);
+          })
+          .catch(error => {
+            if (this.state.statusTries >= WelcomePage.MAX_STATUS_TRIES) {
+              this.setState({ authenticationFailed: true });
 
-            // sdk_start_failed
-            NativeModules.Firebase.track('sdk_start_failed', null);
-          } else {
-            setTimeout(() => {
-              this.startAuthenticating();
-              this.setState({ statusTries: this.state.statusTries + 1 });
-            }, 1000); // Retry every second for a maximum of MAX_STATUS_TRIES tries (60 seconds)
-          }
-        });
+              // sdk_start_failed
+              NativeModules.Firebase.track('sdk_start_failed', null);
+            } else {
+              setTimeout(() => {
+                this.startAuthenticating();
+                this.setState({ statusTries: this.state.statusTries + 1 });
+              }, 1000); // Retry every second for a maximum of MAX_STATUS_TRIES tries (60 seconds)
+            }
+          });
+      });
     });
   };
 
diff --git a/src/page/firstRun/view.js b/src/page/firstRun/view.js
index 8c54d3b..5c6d25e 100644
--- a/src/page/firstRun/view.js
+++ b/src/page/firstRun/view.js
@@ -66,7 +66,7 @@ class FirstRunScreen extends React.PureComponent {
 
   componentWillReceiveProps(nextProps) {
     const { emailNewErrorMessage, emailNewPending, syncApplyErrorMessage, syncApplyIsPending, user } = nextProps;
-    const { notify, isApplyingSync, setClientSetting, setDefaultAccount } = this.props;
+    const { notify, isApplyingSync, setClientSetting } = this.props;
 
     if (this.state.emailSubmitted && !emailNewPending) {
       this.setState({ emailSubmitted: false });
@@ -86,27 +86,24 @@ class FirstRunScreen extends React.PureComponent {
       } else {
         // password successfully verified
         NativeModules.UtilityModule.setSecureValue(
-          Constants.KEY_FIRST_RUN_PASSWORD,
+          Constants.KEY_WALLET_PASSWORD,
           this.state.walletPassword ? this.state.walletPassword : ''
         );
-        setDefaultAccount(
-          () => {
-            setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
 
-            // unlock the wallet
+        setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
+        Lbry.status().then(status => {
+          // unlock the wallet
+          if (status.wallet.is_locked) {
             Lbry.account_unlock({ password: this.state.walletPassword ? this.state.walletPassword : '' })
               .then(() => this.closeFinalPage())
               .catch(err =>
                 notify({ message: 'The wallet could not be unlocked at this time. Please restart the app.' })
               );
-          },
-          err => {
-            notify({
-              message:
-                'The account restore operation could not be completed successfully. Please restart the app and try again.',
-            });
+          } else {
+            // wallet not locked. close final page
+            this.closeFinalPage();
           }
-        );
+        });
       }
     }
 
@@ -298,7 +295,7 @@ class FirstRunScreen extends React.PureComponent {
     const { getSync, setClientSetting } = this.props;
     if (NativeModules.UtilityModule) {
       const newPassword = this.state.walletPassword ? this.state.walletPassword : '';
-      NativeModules.UtilityModule.setSecureValue(Constants.KEY_FIRST_RUN_PASSWORD, newPassword);
+      NativeModules.UtilityModule.setSecureValue(Constants.KEY_WALLET_PASSWORD, newPassword);
       Lbry.account_encrypt({ new_password: newPassword }).then(() => {
         // fresh account, new password set
         getSync(newPassword);
diff --git a/src/page/splash/index.js b/src/page/splash/index.js
index 031aaf8..bde7570 100644
--- a/src/page/splash/index.js
+++ b/src/page/splash/index.js
@@ -23,7 +23,7 @@ const select = state => ({
 });
 
 const perform = dispatch => ({
-  authenticate: (appVersion, os) => dispatch(doAuthenticate(appVersion, os)),
+  authenticate: (appVersion, os, firebaseToken) => dispatch(doAuthenticate(appVersion, os, firebaseToken)),
   balanceSubscribe: () => dispatch(doBalanceSubscribe()),
   blacklistedOutpointsSubscribe: () => dispatch(doBlackListedOutpointsSubscribe()),
   filteredOutpointsSubscribe: () => dispatch(doFilteredOutpointsSubscribe()),
diff --git a/src/page/splash/view.js b/src/page/splash/view.js
index c6cda03..d467753 100644
--- a/src/page/splash/view.js
+++ b/src/page/splash/view.js
@@ -90,7 +90,7 @@ class SplashScreen extends React.PureComponent {
       this.setState({ shouldAuthenticate: false }, () => {
         // user is authenticated, navigate to the main view
         if (user.has_verified_email) {
-          NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
+          NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(walletPassword => {
             getSync(walletPassword);
             this.navigateToMain();
           });
@@ -105,9 +105,15 @@ class SplashScreen extends React.PureComponent {
   getUserSettings = () => {
     const { populateSharedUserState } = this.props;
 
-    doPreferenceGet('shared', null, null, preference => {
-      populateSharedUserState(preference);
-    });
+    doPreferenceGet(
+      'shared',
+      preference => {
+        populateSharedUserState(preference);
+      },
+      error => {
+        /* failed */
+      }
+    );
   };
 
   finishSplashScreen = () => {
@@ -134,14 +140,16 @@ class SplashScreen extends React.PureComponent {
 
       if (user && user.id && user.has_verified_email) {
         // user already authenticated
-        NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
+        NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(walletPassword => {
           getSync(walletPassword);
           this.navigateToMain();
         });
       } else {
         NativeModules.VersionInfo.getAppVersion().then(appVersion => {
-          this.setState({ shouldAuthenticate: true });
-          authenticate(appVersion, Platform.OS);
+          NativeModules.Firebase.getMessagingToken().then(firebaseToken => {
+            this.setState({ shouldAuthenticate: true });
+            authenticate(appVersion, Platform.OS, firebaseToken);
+          });
         });
       }
     });
@@ -171,7 +179,7 @@ class SplashScreen extends React.PureComponent {
       });
 
       // For now, automatically unlock the wallet if a password is set so that downloads work
-      NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(password => {
+      NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password => {
         if (walletStatus.is_locked) {
           this.setState({
             message: 'Unlocking account',
diff --git a/src/page/verification/index.js b/src/page/verification/index.js
index 30dca55..ca247d7 100644
--- a/src/page/verification/index.js
+++ b/src/page/verification/index.js
@@ -3,7 +3,6 @@ import { doToast } from 'lbry-redux';
 import {
   doCheckSync,
   doGetSync,
-  doSetDefaultAccount,
   doSyncApply,
   doUserEmailNew,
   doUserEmailToVerify,
@@ -60,7 +59,6 @@ const perform = dispatch => ({
   verifyPhone: verificationCode => dispatch(doUserPhoneVerify(verificationCode)),
   notify: data => dispatch(doToast(data)),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
-  setDefaultAccount: (success, failure) => dispatch(doSetDefaultAccount(success, failure)),
   setEmailToVerify: email => dispatch(doUserEmailToVerify(email)),
   syncApply: (hash, data, password) => dispatch(doSyncApply(hash, data, password)),
   resendVerificationEmail: email => dispatch(doUserResendVerificationEmail(email)),
diff --git a/src/page/verification/internal/sync-verify-page.js b/src/page/verification/internal/sync-verify-page.js
index 49cbcaa..41e0104 100644
--- a/src/page/verification/internal/sync-verify-page.js
+++ b/src/page/verification/internal/sync-verify-page.js
@@ -50,7 +50,7 @@ class SyncVerifyPage extends React.PureComponent {
 
   componentWillReceiveProps(nextProps) {
     const { getSyncIsPending, syncApplyIsPending, syncApplyErrorMessage } = nextProps;
-    const { getSync, hasSyncedWallet, navigation, notify, setClientSetting, setDefaultAccount } = this.props;
+    const { getSync, hasSyncedWallet, navigation, notify, setClientSetting } = this.props;
     if (this.state.checkSyncStarted && !getSyncIsPending) {
       this.setState({ syncChecked: true });
     }
@@ -63,17 +63,12 @@ class SyncVerifyPage extends React.PureComponent {
         // password successfully verified
         if (NativeModules.UtilityModule) {
           NativeModules.UtilityModule.setSecureValue(
-            Constants.KEY_FIRST_RUN_PASSWORD,
+            Constants.KEY_WALLET_PASSWORD,
             this.state.password ? this.state.password : ''
           );
         }
-        setDefaultAccount(
-          () => this.finishSync(true),
-          err => {
-            // fail silently and still finish
-            this.finishSync();
-          }
-        );
+
+        this.finishSync(true);
       }
     }
   }
diff --git a/src/page/verification/view.js b/src/page/verification/view.js
index 09012f1..91318d1 100644
--- a/src/page/verification/view.js
+++ b/src/page/verification/view.js
@@ -101,7 +101,6 @@ class VerificationScreen extends React.PureComponent {
       notify,
       addUserPhone,
       getSyncIsPending,
-      setDefaultAccount,
       hasSyncedWallet,
       setSyncIsPending,
       syncApplyIsPending,
@@ -162,7 +161,6 @@ class VerificationScreen extends React.PureComponent {
             notify={notify}
             setEmailVerificationPhase={this.setEmailVerificationPhase}
             setClientSetting={setClientSetting}
-            setDefaultAccount={setDefaultAccount}
             setSyncIsPending={setSyncIsPending}
             syncApplyIsPending={syncApplyIsPending}
             syncApplyErrorMessage={syncApplyErrorMessage}
diff --git a/src/page/wallet/view.js b/src/page/wallet/view.js
index 491ef88..4c444b7 100644
--- a/src/page/wallet/view.js
+++ b/src/page/wallet/view.js
@@ -46,7 +46,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 => {
+      NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(walletPassword => {
         getSync(walletPassword);
       });
     }
-- 
2.45.2


From 60b0667546d3d6187fb5bf35456c67c1280f225d Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 15 Oct 2019 10:27:11 +0100
Subject: [PATCH 08/15] cleanup

---
 src/redux/reducers/drawer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redux/reducers/drawer.js b/src/redux/reducers/drawer.js
index 362703b..aa10871 100644
--- a/src/redux/reducers/drawer.js
+++ b/src/redux/reducers/drawer.js
@@ -54,7 +54,7 @@ reducers[Constants.ACTION_POP_DRAWER_STACK] = (state, action) => {
 reducers[Constants.ACTION_REACT_NAVGIATION_RESET] = (state, action) => {
   return {
     ...state,
-    // currentRoute: Constants.DRAWER_ROUTE_DISCOVER, // default to Discover upon reset
+    currentRoute: Constants.DRAWER_ROUTE_DISCOVER, // default to Discover upon reset
   };
 };
 
-- 
2.45.2


From b5d9e44445cf4aabe96f576f4aeb046fe5635b1f Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 15 Oct 2019 13:49:29 +0100
Subject: [PATCH 09/15] add URI bar suggestions setting. reorganise settings
 page

---
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 src/component/uriBar/index.js                 |   3 +
 src/component/uriBar/internal/uri-bar-item.js |   5 +
 src/component/uriBar/view.js                  | 104 +++++++++++-------
 src/page/settings/index.js                    |   3 +-
 src/page/settings/view.js                     |  18 +++
 src/styles/settings.js                        |   8 ++
 src/styles/uriBar.js                          |   9 +-
 9 files changed, 109 insertions(+), 47 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0b63958..861c1fa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5640,8 +5640,8 @@
             }
         },
         "lbry-redux": {
-            "version": "github:lbryio/lbry-redux#7ec72a737bcd336f000c5f5085891643110298c3",
-            "from": "github:lbryio/lbry-redux#7ec72a737bcd336f000c5f5085891643110298c3",
+            "version": "github:lbryio/lbry-redux#4c4f926ee2cd77d750df0a95fad669257aa31ae7",
+            "from": "github:lbryio/lbry-redux#4c4f926ee2cd77d750df0a95fad669257aa31ae7",
             "requires": {
                 "proxy-polyfill": "0.1.6",
                 "reselect": "^3.0.0",
diff --git a/package.json b/package.json
index 4e3f28b..b1bdd7c 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
         "base-64": "^0.1.0",
         "@expo/vector-icons": "^8.1.0",
         "gfycat-style-urls": "^1.0.3",
-        "lbry-redux": "lbryio/lbry-redux#7ec72a737bcd336f000c5f5085891643110298c3",
+        "lbry-redux": "lbryio/lbry-redux#4c4f926ee2cd77d750df0a95fad669257aa31ae7",
         "lbryinc": "lbryio/lbryinc#c55a2c98ab92c72149c824ee5906aed4404fd89b",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
diff --git a/src/component/uriBar/index.js b/src/component/uriBar/index.js
index 1f01ae7..9320187 100644
--- a/src/component/uriBar/index.js
+++ b/src/component/uriBar/index.js
@@ -4,8 +4,10 @@ import {
   selectSearchState as selectSearch,
   selectSearchValue,
   selectSearchSuggestions,
+  SETTINGS,
 } from 'lbry-redux';
 import { selectCurrentRoute } from 'redux/selectors/drawer';
+import { makeSelectClientSetting } from 'redux/selectors/settings';
 import UriBar from './view';
 
 const select = state => {
@@ -16,6 +18,7 @@ const select = state => {
     query: selectSearchValue(state),
     currentRoute: selectCurrentRoute(state),
     suggestions: selectSearchSuggestions(state),
+    showUriBarSuggestions: makeSelectClientSetting(SETTINGS.SHOW_URI_BAR_SUGGESTIONS)(state),
   };
 };
 
diff --git a/src/component/uriBar/internal/uri-bar-item.js b/src/component/uriBar/internal/uri-bar-item.js
index ab42170..dd65b9f 100644
--- a/src/component/uriBar/internal/uri-bar-item.js
+++ b/src/component/uriBar/internal/uri-bar-item.js
@@ -20,6 +20,10 @@ class UriBarItem extends React.PureComponent {
         icon = <Icon name="search" size={18} />;
         break;
 
+      case SEARCH_TYPES.TAG:
+        icon = <Icon name="hashtag" size={18} />;
+        break;
+
       case SEARCH_TYPES.FILE:
       default:
         icon = <Icon name="file" size={18} />;
@@ -37,6 +41,7 @@ class UriBarItem extends React.PureComponent {
             {type === SEARCH_TYPES.SEARCH && `Search for '${value}'`}
             {type === SEARCH_TYPES.CHANNEL && `View the @${shorthand} channel`}
             {type === SEARCH_TYPES.FILE && `View content at ${value}`}
+            {type === SEARCH_TYPES.TAG && `Explore the '${value}' tag`}
           </Text>
         </View>
       </TouchableOpacity>
diff --git a/src/component/uriBar/view.js b/src/component/uriBar/view.js
index 8a2b605..de12496 100644
--- a/src/component/uriBar/view.js
+++ b/src/component/uriBar/view.js
@@ -1,7 +1,7 @@
 // @flow
 import React from 'react';
 import { SEARCH_TYPES, isNameValid, isURIValid, normalizeURI } from 'lbry-redux';
-import { FlatList, Keyboard, Text, TextInput, TouchableOpacity, View } from 'react-native';
+import { Dimensions, FlatList, Keyboard, Text, TextInput, TouchableOpacity, View } from 'react-native';
 import { navigateToUri, transformUrl } from 'utils/helper';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import UriBarItem from './internal/uri-bar-item';
@@ -14,6 +14,8 @@ class UriBar extends React.PureComponent {
 
   textInput = null;
 
+  keyboardDidShowListener = null;
+
   keyboardDidHideListener = null;
 
   state = {
@@ -21,17 +23,19 @@ class UriBar extends React.PureComponent {
     currentValue: null,
     inputText: null,
     focused: false,
-
-    // TODO: Add a setting to enable / disable direct search?
-    directSearch: true,
+    keyboardHeight: 0,
   };
 
   componentDidMount() {
+    this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this._keyboardDidShow);
     this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this._keyboardDidHide);
     this.setSelection();
   }
 
   componentWillUnmount() {
+    if (this.keyboardDidShowListener) {
+      this.keyboardDidShowListener.remove();
+    }
     if (this.keyboardDidHideListener) {
       this.keyboardDidHideListener.remove();
     }
@@ -49,25 +53,28 @@ class UriBar extends React.PureComponent {
   handleChangeText = text => {
     const newValue = text || '';
     clearTimeout(this.state.changeTextTimeout);
-    const { updateSearchQuery, onSearchSubmitted, navigation } = this.props;
+    const { updateSearchQuery, onSearchSubmitted, showUriBarSuggestions, navigation } = this.props;
 
-    let timeout = setTimeout(() => {
-      if (text.trim().length === 0) {
-        // don't do anything if the text is empty
-        return;
-      }
+    updateSearchQuery(text);
 
-      updateSearchQuery(text);
-
-      if (!text.startsWith('lbry://')) {
-        // not a URI input, so this is a search, perform a direct search
-        if (onSearchSubmitted) {
-          onSearchSubmitted(text);
-        } else {
-          navigation.navigate({ routeName: 'Search', key: 'searchPage', params: { searchQuery: text } });
+    let timeout = -1;
+    if (!showUriBarSuggestions) {
+      timeout = setTimeout(() => {
+        if (text.trim().length === 0) {
+          // don't do anything if the text is empty
+          return;
         }
-      }
-    }, UriBar.INPUT_TIMEOUT);
+
+        if (!text.startsWith('lbry://')) {
+          // not a URI input, so this is a search, perform a direct search
+          if (onSearchSubmitted) {
+            onSearchSubmitted(text);
+          } else {
+            navigation.navigate({ routeName: 'Search', key: 'searchPage', params: { searchQuery: text } });
+          }
+        }
+      }, UriBar.INPUT_TIMEOUT);
+    }
     this.setState({ inputText: newValue, currentValue: newValue, changeTextTimeout: timeout });
   };
 
@@ -86,18 +93,34 @@ class UriBar extends React.PureComponent {
         return;
       }
 
-      navigation.navigate({ routeName: 'Search', key: 'searchPage', params: { searchQuery: value } });
+      navigation.navigate({
+        routeName: Constants.DRAWER_ROUTE_SEARCH,
+        key: 'searchPage',
+        params: { searchQuery: value },
+      });
+    } else if (SEARCH_TYPES.TAG === type) {
+      navigation.navigate({
+        routeName: Constants.DRAWER_ROUTE_TAG,
+        key: 'tagPage',
+        params: {
+          tag: value.toLowerCase(),
+        },
+      });
     } else {
       const uri = normalizeURI(value);
       navigateToUri(navigation, uri);
     }
   };
 
+  _keyboardDidShow = evt => {
+    this.setState({ keyboardHeight: evt.endCoordinates.height });
+  };
+
   _keyboardDidHide = () => {
     if (this.textInput) {
       this.textInput.blur();
     }
-    this.setState({ focused: false });
+    this.setState({ focused: false, keyboardHeight: 0 });
   };
 
   setSelection() {
@@ -152,16 +175,18 @@ class UriBar extends React.PureComponent {
       selectedItemCount,
       selectionMode,
       suggestions,
+      showUriBarSuggestions,
       value,
     } = this.props;
     if (this.state.currentValue === null) {
       this.setState({ currentValue: value });
     }
 
-    let style = [uriBarStyle.overlay, belowOverlay ? null : uriBarStyle.overlayElevated];
-
-    // TODO: Add optional setting to enable URI / search bar suggestions
-    /* if (this.state.focused) { style.push(uriBarStyle.inFocus); } */
+    let style = [
+      uriBarStyle.overlay,
+      belowOverlay ? null : uriBarStyle.overlayElevated,
+      this.state.focused && showUriBarSuggestions ? uriBarStyle.inFocus : null,
+    ];
 
     // TODO: selectionModeActions should be dynamically created / specified
     return (
@@ -248,20 +273,21 @@ class UriBar extends React.PureComponent {
               onSubmitEditing={this.handleSubmitEditing}
             />
           )}
-          {this.state.focused && !this.state.directSearch && (
-            <View style={uriBarStyle.suggestions}>
-              <FlatList
-                style={uriBarStyle.suggestionList}
-                data={suggestions}
-                keyboardShouldPersistTaps={'handled'}
-                keyExtractor={(item, value) => item.value}
-                renderItem={({ item }) => (
-                  <UriBarItem item={item} navigation={navigation} onPress={() => this.handleItemPress(item)} />
-                )}
-              />
-            </View>
-          )}
         </View>
+        {this.state.focused && showUriBarSuggestions && (
+          <FlatList
+            style={[
+              uriBarStyle.suggestions,
+              { height: Dimensions.get('window').height - this.state.keyboardHeight - 60 },
+            ]}
+            data={suggestions}
+            keyboardShouldPersistTaps={'handled'}
+            keyExtractor={(item, value) => `${item.value}-${item.type}`}
+            renderItem={({ item }) => (
+              <UriBarItem item={item} navigation={navigation} onPress={() => this.handleItemPress(item)} />
+            )}
+          />
+        )}
       </View>
     );
   }
diff --git a/src/page/settings/index.js b/src/page/settings/index.js
index e630143..c90d2d5 100644
--- a/src/page/settings/index.js
+++ b/src/page/settings/index.js
@@ -4,7 +4,7 @@ import { doPushDrawerStack, doPopDrawerStack, doSetPlayerVisible } from 'redux/a
 import { doSetClientSetting } from 'redux/actions/settings';
 import { selectCurrentRoute, selectDrawerStack } from 'redux/selectors/drawer';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
-import Constants from 'constants';
+import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import SettingsPage from './view';
 
 const select = state => ({
@@ -13,6 +13,7 @@ const select = state => ({
   drawerStack: selectDrawerStack(state),
   keepDaemonRunning: makeSelectClientSetting(SETTINGS.KEEP_DAEMON_RUNNING)(state),
   showNsfw: makeSelectClientSetting(SETTINGS.SHOW_NSFW)(state),
+  showUriBarSuggestions: makeSelectClientSetting(SETTINGS.SHOW_URI_BAR_SUGGESTIONS)(state),
 });
 
 const perform = dispatch => ({
diff --git a/src/page/settings/view.js b/src/page/settings/view.js
index ea2a3a2..5ba4755 100644
--- a/src/page/settings/view.js
+++ b/src/page/settings/view.js
@@ -51,6 +51,7 @@ class SettingsPage extends React.PureComponent {
       navigation,
       popDrawerStack,
       showNsfw,
+      showUriBarSuggestions,
       setClientSetting,
     } = this.props;
 
@@ -62,6 +63,7 @@ class SettingsPage extends React.PureComponent {
       <View style={settingsStyle.container}>
         <PageHeader title={'Settings'} onBackPressed={() => navigateBack(navigation, drawerStack, popDrawerStack)} />
         <ScrollView style={settingsStyle.scrollContainer}>
+          <Text style={settingsStyle.sectionTitle}>Content</Text>
           <View style={settingsStyle.row}>
             <View style={settingsStyle.switchText}>
               <Text style={settingsStyle.label}>Enable background media playback</Text>
@@ -86,6 +88,22 @@ class SettingsPage extends React.PureComponent {
             </View>
           </View>
 
+          <View style={settingsStyle.sectionDivider} />
+          <Text style={settingsStyle.sectionTitle}>Search</Text>
+          <View style={settingsStyle.row}>
+            <View style={settingsStyle.switchText}>
+              <Text style={settingsStyle.label}>Show URL suggestions</Text>
+            </View>
+            <View style={settingsStyle.switchContainer}>
+              <Switch
+                value={showUriBarSuggestions}
+                onValueChange={value => setClientSetting(SETTINGS.SHOW_URI_BAR_SUGGESTIONS, value)}
+              />
+            </View>
+          </View>
+
+          <View style={settingsStyle.sectionDivider} />
+          <Text style={settingsStyle.sectionTitle}>Other</Text>
           <View style={settingsStyle.row}>
             <View style={settingsStyle.switchText}>
               <Text style={settingsStyle.label}>Keep the daemon background service running after closing the app</Text>
diff --git a/src/styles/settings.js b/src/styles/settings.js
index f20f302..adcc434 100644
--- a/src/styles/settings.js
+++ b/src/styles/settings.js
@@ -39,6 +39,14 @@ const settingsStyle = StyleSheet.create({
     fontFamily: 'Inter-UI-Regular',
     lineHeight: 18,
   },
+  sectionTitle: {
+    fontFamily: 'Inter-UI-Regular',
+    fontSize: 20,
+    marginBottom: 4,
+  },
+  sectionDivider: {
+    marginTop: 24,
+  },
 });
 
 export default settingsStyle;
diff --git a/src/styles/uriBar.js b/src/styles/uriBar.js
index c21618d..d44d955 100644
--- a/src/styles/uriBar.js
+++ b/src/styles/uriBar.js
@@ -36,7 +36,7 @@ const uriBarStyle = StyleSheet.create({
   },
   overlay: {
     position: 'absolute',
-    backgroundColor: 'transparent',
+    backgroundColor: 'red',
     top: 0,
     width: '100%',
     zIndex: 200,
@@ -54,9 +54,10 @@ const uriBarStyle = StyleSheet.create({
   item: {
     flexDirection: 'row',
     alignItems: 'center',
-    padding: 12,
-    paddingTop: 8,
-    paddingBottom: 8,
+    paddingLeft: 16,
+    paddingRight: 16,
+    paddingTop: 12,
+    paddingBottom: 12,
   },
   itemContent: {
     marginLeft: 12,
-- 
2.45.2


From a8daf84c52c18d4d28bc5a24474b1cf7f16f445d Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 15 Oct 2019 13:51:33 +0100
Subject: [PATCH 10/15] NSFW -> mature

---
 src/page/settings/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/page/settings/view.js b/src/page/settings/view.js
index 5ba4755..659fe72 100644
--- a/src/page/settings/view.js
+++ b/src/page/settings/view.js
@@ -81,7 +81,7 @@ class SettingsPage extends React.PureComponent {
 
           <View style={settingsStyle.row}>
             <View style={settingsStyle.switchText}>
-              <Text style={settingsStyle.label}>Show NSFW content</Text>
+              <Text style={settingsStyle.label}>Show mature content</Text>
             </View>
             <View style={settingsStyle.switchContainer}>
               <Switch value={showNsfw} onValueChange={value => setClientSetting(SETTINGS.SHOW_NSFW, value)} />
-- 
2.45.2


From eb12a361b7ae847b8f965f2e1a00df0cc92c19ea Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 15 Oct 2019 23:13:41 +0100
Subject: [PATCH 11/15] sdk calls: account_* -> wallet_*

---
 package-lock.json                             |  4 +-
 package.json                                  |  2 +-
 src/page/firstRun/view.js                     |  8 +--
 src/page/splash/view.js                       | 50 ++++++++++---------
 .../verification/internal/sync-verify-page.js |  8 +--
 5 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f5b08db..5acec84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5640,8 +5640,8 @@
             }
         },
         "lbry-redux": {
-            "version": "github:lbryio/lbry-redux#4c4f926ee2cd77d750df0a95fad669257aa31ae7",
-            "from": "github:lbryio/lbry-redux#4c4f926ee2cd77d750df0a95fad669257aa31ae7",
+            "version": "github:lbryio/lbry-redux#98723e0c3cc48340d5a1c7100700fcae69298a2e",
+            "from": "github:lbryio/lbry-redux#98723e0c3cc48340d5a1c7100700fcae69298a2e",
             "requires": {
                 "proxy-polyfill": "0.1.6",
                 "reselect": "^3.0.0",
diff --git a/package.json b/package.json
index 74f8ff3..cea8d96 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
         "base-64": "^0.1.0",
         "@expo/vector-icons": "^8.1.0",
         "gfycat-style-urls": "^1.0.3",
-        "lbry-redux": "lbryio/lbry-redux#4c4f926ee2cd77d750df0a95fad669257aa31ae7",
+        "lbry-redux": "lbryio/lbry-redux#98723e0c3cc48340d5a1c7100700fcae69298a2e",
         "lbryinc": "lbryio/lbryinc#aebad10a9c5d725c3fedae4236d56f239a0bc1de",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
diff --git a/src/page/firstRun/view.js b/src/page/firstRun/view.js
index 5c6d25e..edeadcf 100644
--- a/src/page/firstRun/view.js
+++ b/src/page/firstRun/view.js
@@ -91,10 +91,10 @@ class FirstRunScreen extends React.PureComponent {
         );
 
         setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
-        Lbry.status().then(status => {
+        Lbry.wallet_status().then(status => {
           // unlock the wallet
-          if (status.wallet.is_locked) {
-            Lbry.account_unlock({ password: this.state.walletPassword ? this.state.walletPassword : '' })
+          if (status.is_locked) {
+            Lbry.wallet_unlock({ password: this.state.walletPassword ? this.state.walletPassword : '' })
               .then(() => this.closeFinalPage())
               .catch(err =>
                 notify({ message: 'The wallet could not be unlocked at this time. Please restart the app.' })
@@ -296,7 +296,7 @@ class FirstRunScreen extends React.PureComponent {
     if (NativeModules.UtilityModule) {
       const newPassword = this.state.walletPassword ? this.state.walletPassword : '';
       NativeModules.UtilityModule.setSecureValue(Constants.KEY_WALLET_PASSWORD, newPassword);
-      Lbry.account_encrypt({ new_password: newPassword }).then(() => {
+      Lbry.wallet_encrypt({ new_password: newPassword }).then(() => {
         // fresh account, new password set
         getSync(newPassword);
         setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
diff --git a/src/page/splash/view.js b/src/page/splash/view.js
index d467753..36f84ed 100644
--- a/src/page/splash/view.js
+++ b/src/page/splash/view.js
@@ -178,31 +178,33 @@ class SplashScreen extends React.PureComponent {
         isRunning: true,
       });
 
-      // For now, automatically unlock the wallet if a password is set so that downloads work
-      NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password => {
-        if (walletStatus.is_locked) {
-          this.setState({
-            message: 'Unlocking account',
-            details: 'Decrypting wallet',
-          });
+      Lbry.wallet_status().then(secureWalletStatus => {
+        // For now, automatically unlock the wallet if a password is set so that downloads work
+        NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password => {
+          if (secureWalletStatus.is_locked) {
+            this.setState({
+              message: 'Unlocking account',
+              details: 'Decrypting wallet',
+            });
 
-          // unlock the wallet and then finish the splash screen
-          Lbry.account_unlock({ password: password || '' })
-            .then(() => {
-              this.setState({
-                message: testingNetwork,
-                details: waitingForResolution,
-              });
-              this.finishSplashScreen();
-            })
-            .catch(() => this.handleAccountUnlockFailed());
-        } else {
-          this.setState({
-            message: testingNetwork,
-            details: waitingForResolution,
-          });
-          this.finishSplashScreen();
-        }
+            // unlock the wallet and then finish the splash screen
+            Lbry.wallet_unlock({ password: password || '' })
+              .then(() => {
+                this.setState({
+                  message: testingNetwork,
+                  details: waitingForResolution,
+                });
+                this.finishSplashScreen();
+              })
+              .catch(() => this.handleAccountUnlockFailed());
+          } else {
+            this.setState({
+              message: testingNetwork,
+              details: waitingForResolution,
+            });
+            this.finishSplashScreen();
+          }
+        });
       });
 
       return;
diff --git a/src/page/verification/internal/sync-verify-page.js b/src/page/verification/internal/sync-verify-page.js
index 41e0104..e75f282 100644
--- a/src/page/verification/internal/sync-verify-page.js
+++ b/src/page/verification/internal/sync-verify-page.js
@@ -37,7 +37,7 @@ class SyncVerifyPage extends React.PureComponent {
       if (!hasSyncedWallet) {
         // fresh account with no sync
         const newPassword = this.state.password ? this.state.password : '';
-        Lbry.account_encrypt({ new_password: newPassword }).then(() => {
+        Lbry.wallet_encrypt({ new_password: newPassword }).then(() => {
           getSync(newPassword);
           setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
           navigation.goBack();
@@ -79,9 +79,9 @@ class SyncVerifyPage extends React.PureComponent {
     setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
 
     // unlock the wallet (if locked)
-    Lbry.status().then(status => {
-      if (status.wallet.is_locked) {
-        Lbry.account_unlock({ password: this.state.password ? this.state.password : '' })
+    Lbry.wallet_status().then(status => {
+      if (status.is_locked) {
+        Lbry.wallet_unlock({ password: this.state.password ? this.state.password : '' })
           .then(() => navigation.goBack())
           .catch(err => {
             if (notifyUnlockFailed) {
-- 
2.45.2


From 48030a97f2ce898502938ef0cd648dececa32aa1 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Wed, 16 Oct 2019 17:08:16 +0100
Subject: [PATCH 12/15] more updates for release

---
 package-lock.json                      |  4 ++--
 package.json                           |  2 +-
 src/component/AppNavigator.js          | 11 +++++++++--
 src/component/channelSelector/index.js |  2 +-
 src/index.js                           | 18 ++++++++++++++++--
 src/page/channelCreator/index.js       |  2 +-
 src/page/file/view.js                  | 20 +++++++++++---------
 src/page/firstRun/index.js             |  2 +-
 src/page/splash/index.js               |  2 +-
 src/page/splash/view.js                | 18 +++++++++++-------
 src/page/verification/index.js         |  2 +-
 src/page/wallet/index.js               |  4 ++--
 src/styles/filePage.js                 |  7 +++++--
 13 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5acec84..8da0108 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5640,8 +5640,8 @@
             }
         },
         "lbry-redux": {
-            "version": "github:lbryio/lbry-redux#98723e0c3cc48340d5a1c7100700fcae69298a2e",
-            "from": "github:lbryio/lbry-redux#98723e0c3cc48340d5a1c7100700fcae69298a2e",
+            "version": "github:lbryio/lbry-redux#9919a8150998822ca997cd23418f023d64d4a3da",
+            "from": "github:lbryio/lbry-redux#9919a8150998822ca997cd23418f023d64d4a3da",
             "requires": {
                 "proxy-polyfill": "0.1.6",
                 "reselect": "^3.0.0",
diff --git a/package.json b/package.json
index cea8d96..13aca50 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
         "base-64": "^0.1.0",
         "@expo/vector-icons": "^8.1.0",
         "gfycat-style-urls": "^1.0.3",
-        "lbry-redux": "lbryio/lbry-redux#98723e0c3cc48340d5a1c7100700fcae69298a2e",
+        "lbry-redux": "lbryio/lbry-redux#9919a8150998822ca997cd23418f023d64d4a3da",
         "lbryinc": "lbryio/lbryinc#aebad10a9c5d725c3fedae4236d56f239a0bc1de",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
diff --git a/src/component/AppNavigator.js b/src/component/AppNavigator.js
index a7b0240..5f35446 100644
--- a/src/component/AppNavigator.js
+++ b/src/component/AppNavigator.js
@@ -272,6 +272,7 @@ class AppWithNavigationState extends React.Component {
   constructor() {
     super();
     this.emailVerifyCheckInterval = null;
+    this.syncGetInterval = null;
     this.state = {
       emailVerifyDone: false,
       verifyPending: false,
@@ -301,10 +302,10 @@ class AppWithNavigationState extends React.Component {
     Linking.addEventListener('url', this._handleUrl);
 
     // call /sync/get with interval
-    setInterval(() => {
+    this.syncGetInterval = setInterval(() => {
       this.setState({ syncHashChanged: false }); // reset local state
       NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(walletPassword => {
-        dispatch(doGetSync(walletPassword));
+        dispatch(doGetSync(walletPassword, () => this.getUserSettings()));
       });
     }, SYNC_GET_INTERVAL);
   }
@@ -336,6 +337,12 @@ class AppWithNavigationState extends React.Component {
     AppState.removeEventListener('change', this._handleAppStateChange);
     BackHandler.removeEventListener('hardwareBackPress');
     Linking.removeEventListener('url', this._handleUrl);
+    if (this.emailVerifyCheckInterval > -1) {
+      clearInterval(this.emailVerifyCheckInterval);
+    }
+    if (this.syncGetInterval > -1) {
+      clearInterval(this.syncGetInterval);
+    }
   }
 
   componentDidUpdate() {
diff --git a/src/component/channelSelector/index.js b/src/component/channelSelector/index.js
index eb9bae9..29c4fe5 100644
--- a/src/component/channelSelector/index.js
+++ b/src/component/channelSelector/index.js
@@ -20,7 +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)),
+  getSync: (password, callback) => dispatch(doGetSync(password, callback)),
 });
 
 export default connect(
diff --git a/src/index.js b/src/index.js
index 98e7539..92993bb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,6 +5,7 @@ import { AppRegistry, Text, View, NativeModules } from 'react-native';
 import {
   Lbry,
   buildSharedStateMiddleware,
+  blockedReducer,
   claimsReducer,
   contentReducer,
   fileReducer,
@@ -52,6 +53,7 @@ import thunk from 'redux-thunk';
 
 const globalExceptionHandler = (error, isFatal) => {
   if (error && NativeModules.Firebase) {
+    console.log(error);
     NativeModules.Firebase.logException(isFatal, error.message ? error.message : 'No message', JSON.stringify(error));
   }
 };
@@ -87,6 +89,7 @@ function enableBatching(reducer) {
 
 const compressor = createCompressor();
 const authFilter = createFilter('auth', ['authToken']);
+const blockedFilter = createFilter('blocked', ['blockedChannels']);
 const contentFilter = createFilter('content', ['positions']);
 const saveClaimsFilter = createFilter('claims', ['claimsByUri']);
 const subscriptionsFilter = createFilter('subscriptions', ['enabledChannelNotifications', 'subscriptions', 'latest']);
@@ -95,10 +98,18 @@ const tagsFilter = createFilter('tags', ['followedTags']);
 const walletFilter = createFilter('wallet', ['receiveAddress']);
 
 const v4PersistOptions = {
-  whitelist: ['auth', 'claims', 'content', 'subscriptions', 'settings', 'tags', 'wallet'],
+  whitelist: ['auth', 'blocked', 'claims', 'content', 'subscriptions', 'settings', 'tags', 'wallet'],
   // Order is important. Needs to be compressed last or other transforms can't
   // read the data
-  transforms: [authFilter, saveClaimsFilter, subscriptionsFilter, settingsFilter, walletFilter, compressor],
+  transforms: [
+    authFilter,
+    blockedFilter,
+    saveClaimsFilter,
+    subscriptionsFilter,
+    settingsFilter,
+    walletFilter,
+    compressor,
+  ],
   debounce: 10000,
   storage: FilesystemStorage,
 };
@@ -111,6 +122,7 @@ const persistOptions = Object.assign({}, v4PersistOptions, {
 const reducers = persistCombineReducers(persistOptions, {
   auth: authReducer,
   blacklist: blacklistReducer,
+  blocked: blockedReducer,
   claims: claimsReducer,
   content: contentReducer,
   costInfo: costInfoReducer,
@@ -141,6 +153,7 @@ const reducers = persistCombineReducers(persistOptions, {
 const sharedStateActions = [
   LBRYINC_ACTIONS.CHANNEL_SUBSCRIBE,
   LBRYINC_ACTIONS.CHANNEL_UNSUBSCRIBE,
+  LBRY_REDUX_ACTIONS.CREATE_CHANNEL_COMPLETED,
   LBRY_REDUX_ACTIONS.TOGGLE_TAG_FOLLOW,
   LBRY_REDUX_ACTIONS.TOGGLE_BLOCK_CHANNEL,
 ];
@@ -153,6 +166,7 @@ const sharedStateFilters = {
       return value.map(({ uri }) => uri);
     },
   },
+  blocked: { source: 'blocked', property: 'blockedChannels' },
 };
 
 const sharedStateCallback = ({ dispatch, getState }) => {
diff --git a/src/page/channelCreator/index.js b/src/page/channelCreator/index.js
index 085cf2a..8f47ad3 100644
--- a/src/page/channelCreator/index.js
+++ b/src/page/channelCreator/index.js
@@ -38,7 +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)),
+  getSync: (password, callback) => dispatch(doGetSync(password, callback)),
   updateChannel: params => dispatch(doUpdateChannel(params)),
   updateChannelFormState: data => dispatch(doUpdateChannelFormState(data)),
   pushDrawerStack: (routeName, params) => dispatch(doPushDrawerStack(routeName, params)),
diff --git a/src/page/file/view.js b/src/page/file/view.js
index e95a022..a79bd0c 100644
--- a/src/page/file/view.js
+++ b/src/page/file/view.js
@@ -517,7 +517,7 @@ class FilePage extends React.PureComponent {
     const { claim, notify } = this.props;
     if (claim) {
       const { canonical_url: canonicalUrl, short_url: shortUrl, permanent_url: permanentUrl } = claim;
-      const url = 'https://lbry.tv' + this.formatLbryUrlForWeb(canonicalUrl || shortUrl || permanentUrl);
+      const url = 'https://open.lbry.com' + this.formatLbryUrlForWeb(canonicalUrl || shortUrl || permanentUrl);
       NativeModules.UtilityModule.shareUrl(url);
     }
   };
@@ -950,15 +950,23 @@ class FilePage extends React.PureComponent {
 
                 <View style={filePageStyle.largeButtonsRow}>
                   <TouchableOpacity style={filePageStyle.largeButton} onPress={this.handleSharePress}>
-                    <Icon name={'share-alt'} size={24} style={filePageStyle.largeButtonIcon} />
+                    <Icon name={'share-alt'} size={20} style={filePageStyle.largeButtonIcon} />
                     <Text style={filePageStyle.largeButtonText}>Share</Text>
                   </TouchableOpacity>
 
+                  <TouchableOpacity
+                    style={filePageStyle.largeButton}
+                    onPress={() => this.setState({ showTipView: true })}
+                  >
+                    <Icon name={'gift'} size={20} style={filePageStyle.largeButtonIcon} />
+                    <Text style={filePageStyle.largeButtonText}>Tip</Text>
+                  </TouchableOpacity>
+
                   <TouchableOpacity
                     style={filePageStyle.largeButton}
                     onPress={() => Linking.openURL(`https://lbry.com/dmca/${claim.claim_id}`)}
                   >
-                    <Icon name={'flag'} size={24} style={filePageStyle.largeButtonIcon} />
+                    <Icon name={'flag'} size={20} style={filePageStyle.largeButtonIcon} />
                     <Text style={filePageStyle.largeButtonText}>Report</Text>
                   </TouchableOpacity>
                 </View>
@@ -999,12 +1007,6 @@ class FilePage extends React.PureComponent {
                         onPress={this.onSaveFilePressed}
                       />
                     )}
-                    <Button
-                      style={[filePageStyle.actionButton, filePageStyle.tipButton]}
-                      theme={'light'}
-                      icon={'gift'}
-                      onPress={() => this.setState({ showTipView: true })}
-                    />
                     {channelName && (
                       <SubscribeButton
                         style={filePageStyle.actionButton}
diff --git a/src/page/firstRun/index.js b/src/page/firstRun/index.js
index 725ef17..e3ff6ac 100644
--- a/src/page/firstRun/index.js
+++ b/src/page/firstRun/index.js
@@ -43,7 +43,7 @@ const perform = dispatch => ({
   authenticate: (appVersion, os, firebaseToken) => dispatch(doAuthenticate(appVersion, os, firebaseToken)),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
   syncApply: (hash, data, password) => dispatch(doSyncApply(hash, data, password)),
-  getSync: password => dispatch(doGetSync(password)),
+  getSync: (password, callback) => dispatch(doGetSync(password, callback)),
   checkSync: () => dispatch(doCheckSync()),
   notify: data => dispatch(doToast(data)),
   resendVerificationEmail: email => dispatch(doUserResendVerificationEmail(email)),
diff --git a/src/page/splash/index.js b/src/page/splash/index.js
index bde7570..d402a70 100644
--- a/src/page/splash/index.js
+++ b/src/page/splash/index.js
@@ -30,7 +30,7 @@ const perform = dispatch => ({
   checkSubscriptionsInit: () => dispatch(doCheckSubscriptionsInit()),
   fetchRewardedContent: () => dispatch(doFetchRewardedContent()),
   fetchSubscriptions: callback => dispatch(doFetchMySubscriptions(callback)),
-  getSync: password => dispatch(doGetSync(password)),
+  getSync: (password, callback) => dispatch(doGetSync(password, callback)),
   notify: data => dispatch(doToast(data)),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
   setEmailToVerify: email => dispatch(doUserEmailToVerify(email)),
diff --git a/src/page/splash/view.js b/src/page/splash/view.js
index 36f84ed..5c6eb7b 100644
--- a/src/page/splash/view.js
+++ b/src/page/splash/view.js
@@ -91,8 +91,10 @@ class SplashScreen extends React.PureComponent {
         // user is authenticated, navigate to the main view
         if (user.has_verified_email) {
           NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(walletPassword => {
-            getSync(walletPassword);
-            this.navigateToMain();
+            getSync(walletPassword, () => {
+              this.getUserSettings();
+              this.navigateToMain();
+            });
           });
           return;
         }
@@ -108,10 +110,13 @@ class SplashScreen extends React.PureComponent {
     doPreferenceGet(
       'shared',
       preference => {
+        console.log('***');
+        console.log(preference);
         populateSharedUserState(preference);
       },
       error => {
         /* failed */
+        console.log(error);
       }
     );
   };
@@ -135,14 +140,13 @@ class SplashScreen extends React.PureComponent {
       filteredOutpointsSubscribe();
       checkSubscriptionsInit();
 
-      // get user settings interval
-      this.getUserSettings();
-
       if (user && user.id && user.has_verified_email) {
         // user already authenticated
         NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(walletPassword => {
-          getSync(walletPassword);
-          this.navigateToMain();
+          getSync(walletPassword, err => {
+            this.getUserSettings();
+            this.navigateToMain();
+          });
         });
       } else {
         NativeModules.VersionInfo.getAppVersion().then(appVersion => {
diff --git a/src/page/verification/index.js b/src/page/verification/index.js
index ca247d7..82a412f 100644
--- a/src/page/verification/index.js
+++ b/src/page/verification/index.js
@@ -54,7 +54,7 @@ const select = state => ({
 const perform = dispatch => ({
   addUserEmail: email => dispatch(doUserEmailNew(email)),
   addUserPhone: (phone, countryCode) => dispatch(doUserPhoneNew(phone, countryCode)),
-  getSync: password => dispatch(doGetSync(password)),
+  getSync: (password, callback) => dispatch(doGetSync(password, callback)),
   checkSync: () => dispatch(doCheckSync()),
   verifyPhone: verificationCode => dispatch(doUserPhoneVerify(verificationCode)),
   notify: data => dispatch(doToast(data)),
diff --git a/src/page/wallet/index.js b/src/page/wallet/index.js
index 634455d..d1475f6 100644
--- a/src/page/wallet/index.js
+++ b/src/page/wallet/index.js
@@ -5,7 +5,7 @@ import { doPushDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
 import { selectCurrentRoute } from 'redux/selectors/drawer';
 import { selectBalance } from 'lbry-redux';
 import { doCheckSync, doGetSync, selectUser, selectHasSyncedWallet } from 'lbryinc';
-import Constants from 'constants';
+import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import WalletPage from './view';
 
 const select = state => ({
@@ -21,7 +21,7 @@ const select = state => ({
 
 const perform = dispatch => ({
   checkSync: () => dispatch(doCheckSync()),
-  getSync: password => dispatch(doGetSync(password)),
+  getSync: (password, callback) => dispatch(doGetSync(password, callback)),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
   pushDrawerStack: () => dispatch(doPushDrawerStack(Constants.DRAWER_ROUTE_WALLET)),
   setPlayerVisible: () => dispatch(doSetPlayerVisible(false)),
diff --git a/src/styles/filePage.js b/src/styles/filePage.js
index a2efbe7..6f15861 100644
--- a/src/styles/filePage.js
+++ b/src/styles/filePage.js
@@ -384,6 +384,7 @@ const filePageStyle = StyleSheet.create({
   largeButton: {
     alignItems: 'center',
     justifyContent: 'center',
+    marginRight: 48,
   },
   largeButtonIcon: {
     color: Colors.DescriptionGrey,
@@ -396,8 +397,10 @@ const filePageStyle = StyleSheet.create({
   largeButtonsRow: {
     flexDirection: 'row',
     alignItems: 'center',
-    justifyContent: 'space-between',
-    margin: 16,
+    marginLeft: 20,
+    marginRight: 20,
+    marginTop: 12,
+    marginBottom: 12,
   },
 });
 
-- 
2.45.2


From d5f6d494a4a4b8aaf07110a5c896b445dd9649b7 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 17 Oct 2019 06:29:50 +0100
Subject: [PATCH 13/15] filtered homepage. other updates.

---
 src/component/claimList/view.js                    |  2 +-
 src/component/fileItem/index.js                    |  4 +++-
 src/component/fileItem/view.js                     | 14 +++++++++++++-
 src/index.js                                       |  1 -
 src/page/firstRun/view.js                          | 14 +++++++++-----
 src/page/splash/view.js                            | 13 ++++++-------
 src/page/verification/internal/sync-verify-page.js | 10 ++++++----
 7 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/component/claimList/view.js b/src/component/claimList/view.js
index b9df926..d527c48 100644
--- a/src/component/claimList/view.js
+++ b/src/component/claimList/view.js
@@ -12,7 +12,7 @@ import claimListStyle from 'styles/claimList';
 import discoverStyle from 'styles/discover';
 import moment from 'moment';
 
-const horizontalLimit = 7;
+const horizontalLimit = 10;
 const softLimit = 500;
 
 class ClaimList extends React.PureComponent {
diff --git a/src/component/fileItem/index.js b/src/component/fileItem/index.js
index 21a68e1..33f2b3d 100644
--- a/src/component/fileItem/index.js
+++ b/src/component/fileItem/index.js
@@ -10,13 +10,15 @@ import {
   makeSelectClaimIsNsfw,
   makeSelectShortUrlForUri,
 } from 'lbry-redux';
-import { selectRewardContentClaimIds } from 'lbryinc';
+import { selectBlackListedOutpoints, selectFilteredOutpoints, selectRewardContentClaimIds } from 'lbryinc';
 import { selectShowNsfw } from 'redux/selectors/settings';
 import FileItem from './view';
 
 const select = (state, props) => ({
+  blackListedOutpoints: selectBlackListedOutpoints(state),
   claim: makeSelectClaimForUri(props.uri)(state),
   fileInfo: makeSelectFileInfoForUri(props.uri)(state),
+  filteredOutpoints: selectFilteredOutpoints(state),
   metadata: makeSelectMetadataForUri(props.uri)(state),
   rewardedContentClaimIds: selectRewardContentClaimIds(state),
   isResolvingUri: makeSelectIsUriResolving(props.uri)(state),
diff --git a/src/component/fileItem/view.js b/src/component/fileItem/view.js
index 6f38554..cf2db92 100644
--- a/src/component/fileItem/view.js
+++ b/src/component/fileItem/view.js
@@ -40,10 +40,12 @@ class FileItem extends React.PureComponent {
 
   render() {
     const {
+      blackListedOutpoints,
       claim,
       title,
       thumbnail,
       fileInfo,
+      filteredOutpoints,
       metadata,
       isResolvingUri,
       rewardedContentClaimIds,
@@ -58,7 +60,17 @@ class FileItem extends React.PureComponent {
     } = this.props;
 
     if (claim && claim.value_type === 'channel') {
-      // don't display channels in the lists on the Explore page
+      // don't display channels in the lists on the Your tags page
+      return null;
+    }
+
+    let shouldHide = false;
+    if (blackListedOutpoints || filteredOutpoints) {
+      const outpointsToHide = blackListedOutpoints.concat(filteredOutpoints);
+      shouldHide = outpointsToHide.some(outpoint => outpoint.txid === claim.txid && outpoint.nout === claim.nout);
+    }
+    if (shouldHide) {
+      // don't display blacklisted or filtered outpoints on the Your tags page
       return null;
     }
 
diff --git a/src/index.js b/src/index.js
index 92993bb..7588c20 100644
--- a/src/index.js
+++ b/src/index.js
@@ -53,7 +53,6 @@ import thunk from 'redux-thunk';
 
 const globalExceptionHandler = (error, isFatal) => {
   if (error && NativeModules.Firebase) {
-    console.log(error);
     NativeModules.Firebase.logException(isFatal, error.message ? error.message : 'No message', JSON.stringify(error));
   }
 };
diff --git a/src/page/firstRun/view.js b/src/page/firstRun/view.js
index edeadcf..f3a24ea 100644
--- a/src/page/firstRun/view.js
+++ b/src/page/firstRun/view.js
@@ -94,11 +94,15 @@ class FirstRunScreen extends React.PureComponent {
         Lbry.wallet_status().then(status => {
           // unlock the wallet
           if (status.is_locked) {
-            Lbry.wallet_unlock({ password: this.state.walletPassword ? this.state.walletPassword : '' })
-              .then(() => this.closeFinalPage())
-              .catch(err =>
-                notify({ message: 'The wallet could not be unlocked at this time. Please restart the app.' })
-              );
+            Lbry.wallet_unlock({ password: this.state.walletPassword ? this.state.walletPassword : '' }).then(
+              unlocked => {
+                if (unlocked) {
+                  this.closeFinalPage();
+                } else {
+                  notify({ message: 'The wallet could not be unlocked at this time. Please restart the app.' });
+                }
+              }
+            );
           } else {
             // wallet not locked. close final page
             this.closeFinalPage();
diff --git a/src/page/splash/view.js b/src/page/splash/view.js
index 5c6eb7b..ac5a58c 100644
--- a/src/page/splash/view.js
+++ b/src/page/splash/view.js
@@ -110,13 +110,10 @@ class SplashScreen extends React.PureComponent {
     doPreferenceGet(
       'shared',
       preference => {
-        console.log('***');
-        console.log(preference);
         populateSharedUserState(preference);
       },
       error => {
         /* failed */
-        console.log(error);
       }
     );
   };
@@ -192,15 +189,17 @@ class SplashScreen extends React.PureComponent {
             });
 
             // unlock the wallet and then finish the splash screen
-            Lbry.wallet_unlock({ password: password || '' })
-              .then(() => {
+            Lbry.wallet_unlock({ password: password || '' }).then(unlocked => {
+              if (unlocked) {
                 this.setState({
                   message: testingNetwork,
                   details: waitingForResolution,
                 });
                 this.finishSplashScreen();
-              })
-              .catch(() => this.handleAccountUnlockFailed());
+              } else {
+                this.handleAccountUnlockFailed();
+              }
+            });
           } else {
             this.setState({
               message: testingNetwork,
diff --git a/src/page/verification/internal/sync-verify-page.js b/src/page/verification/internal/sync-verify-page.js
index e75f282..952bc49 100644
--- a/src/page/verification/internal/sync-verify-page.js
+++ b/src/page/verification/internal/sync-verify-page.js
@@ -81,13 +81,15 @@ class SyncVerifyPage extends React.PureComponent {
     // unlock the wallet (if locked)
     Lbry.wallet_status().then(status => {
       if (status.is_locked) {
-        Lbry.wallet_unlock({ password: this.state.password ? this.state.password : '' })
-          .then(() => navigation.goBack())
-          .catch(err => {
+        Lbry.wallet_unlock({ password: this.state.password ? this.state.password : '' }).then(unlocked => {
+          if (unlocked) {
+            navigation.goBack();
+          } else {
             if (notifyUnlockFailed) {
               notify({ message: 'The wallet could not be unlocked at this time. Please restart the app.' });
             }
-          });
+          }
+        });
       } else {
         navigation.goBack();
       }
-- 
2.45.2


From 5d38da2d465be38cf32f50985f98f42772399016 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 17 Oct 2019 13:43:30 +0100
Subject: [PATCH 14/15] log publish

---
 src/component/channelSelector/view.js |  4 +++-
 src/page/channelCreator/view.js       |  5 +++--
 src/page/publish/view.js              | 10 ++++++++--
 src/utils/helper.js                   | 18 ++++++++++++++++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/component/channelSelector/view.js b/src/component/channelSelector/view.js
index 8ab3e7d..cb63404 100644
--- a/src/component/channelSelector/view.js
+++ b/src/component/channelSelector/view.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { CLAIM_VALUES, isNameValid } from 'lbry-redux';
 import { ActivityIndicator, NativeModules, Picker, Text, TextInput, TouchableOpacity, View } from 'react-native';
+import { logPublish } from 'utils/helper';
 import Button from 'component/button';
 import Colors from 'styles/colors';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
@@ -142,13 +143,14 @@ export default class ChannelSelector extends React.PureComponent {
       createChannelError: undefined,
     });
 
-    const success = () => {
+    const success = channelClaim => {
       this.setState({
         creatingChannel: false,
         addingChannel: false,
         currentSelectedValue: channelName,
         showCreateChannel: false,
       });
+      logPublish(channelClaim);
 
       if (onChannelChange) {
         onChannelChange(channelName);
diff --git a/src/page/channelCreator/view.js b/src/page/channelCreator/view.js
index de45c82..dd046b2 100644
--- a/src/page/channelCreator/view.js
+++ b/src/page/channelCreator/view.js
@@ -14,7 +14,7 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native';
-import { navigateToUri, uploadImageAsset } from 'utils/helper';
+import { navigateToUri, logPublish, uploadImageAsset } from 'utils/helper';
 import Button from 'component/button';
 import ChannelIconItem from 'component/channelIconItem';
 import ChannelRewardsDriver from 'component/channelRewardsDriver';
@@ -440,7 +440,7 @@ export default class ChannelCreator extends React.PureComponent {
       createChannelError: undefined,
     });
 
-    const success = () => {
+    const success = channelClaim => {
       this.setState({
         creatingChannel: false,
         addingChannel: false,
@@ -448,6 +448,7 @@ export default class ChannelCreator extends React.PureComponent {
         showCreateChannel: false,
       });
 
+      logPublish(channelClaim);
       if (onChannelChange) {
         onChannelChange(channelName);
       }
diff --git a/src/page/publish/view.js b/src/page/publish/view.js
index 8ecf9d1..3953e3e 100644
--- a/src/page/publish/view.js
+++ b/src/page/publish/view.js
@@ -43,7 +43,7 @@ import Tag from 'component/tag';
 import TagSearch from 'component/tagSearch';
 import UriBar from 'component/uriBar';
 import publishStyle from 'styles/publish';
-import { __, navigateToUri, uploadImageAsset } from 'utils/helper';
+import { __, navigateToUri, logPublish, uploadImageAsset } from 'utils/helper';
 
 const languages = {
   en: 'English',
@@ -371,7 +371,7 @@ class PublishPage extends React.PureComponent {
       filePath: currentMedia ? currentMedia.filePath : null,
       bid: bid || 0.1,
       title: title || '',
-      thumbnail,
+      thumbnail: thumbnail || '',
       description: description || '',
       language,
       license,
@@ -395,6 +395,11 @@ class PublishPage extends React.PureComponent {
 
   handlePublishSuccess = data => {
     const { clearPublishFormState, navigation, notify } = this.props;
+    const pendingClaim = data.outputs[0];
+    logPublish(pendingClaim);
+
+    // TODO: fake temp claim for claim_list_mine
+
     notify({
       message: `Your content was successfully published to ${this.state.uri}. It will be available in a few mintues.`,
     });
@@ -404,6 +409,7 @@ class PublishPage extends React.PureComponent {
   };
 
   handlePublishFailure = error => {
+    console.log(error);
     const { notify } = this.props;
     notify({ message: __('Your content could not be published at this time. Please try again.') });
     this.setState({ publishStarted: false });
diff --git a/src/utils/helper.js b/src/utils/helper.js
index 1f9e76d..0126067 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -1,5 +1,6 @@
 import { NavigationActions, StackActions } from 'react-navigation';
 import { buildURI, isURIValid, normalizeURI } from 'lbry-redux';
+import { Lbryio } from 'lbryinc';
 import { doPopDrawerStack, doPushDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
 import Constants, { DrawerRoutes, InnerDrawerRoutes } from 'constants'; // eslint-disable-line node/no-deprecated-api
 
@@ -290,6 +291,23 @@ export function __(str) {
   return str;
 }
 
+export function logPublish(claimResult) {
+  // eslint-disable-next-line no-undef
+  if (!__DEV__) {
+    const { permanent_url: uri, claim_id: claimId, txid, nout, signing_channel: signingChannel } = claimResult;
+    let channelClaimId;
+    if (signingChannel) {
+      channelClaimId = signingChannel.claim_id;
+    }
+    const outpoint = `${txid}:${nout}`;
+    const params = { uri, claim_id: claimId, outpoint };
+    if (channelClaimId) {
+      params['channel_claim_id'] = channelClaimId;
+    }
+    Lbryio.call('event', 'publish', params);
+  }
+}
+
 export function uploadImageAsset(filePath, success, failure) {
   const makeid = () => {
     let text = '';
-- 
2.45.2


From 3ddd0b5b50dcc2f1107d351b7386b67f881211a0 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 17 Oct 2019 13:57:22 +0100
Subject: [PATCH 15/15] remove getSync from channel creation success

---
 src/page/channelCreator/view.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/page/channelCreator/view.js b/src/page/channelCreator/view.js
index dd046b2..63e2b74 100644
--- a/src/page/channelCreator/view.js
+++ b/src/page/channelCreator/view.js
@@ -448,7 +448,6 @@ export default class ChannelCreator extends React.PureComponent {
         showCreateChannel: false,
       });
 
-      logPublish(channelClaim);
       if (onChannelChange) {
         onChannelChange(channelName);
       }
@@ -458,8 +457,7 @@ export default class ChannelCreator extends React.PureComponent {
       notify({ message: 'The channel was successfully created.' });
       this.showChannelList();
 
-      // sync wallet
-      NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password => getSync(password));
+      logPublish(channelClaim);
     };
 
     const failure = () => {
-- 
2.45.2