From 4ac36b0bc7bf839d7b52bcafcd0ca10a07dde20b Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Tue, 15 Oct 2019 08:28:37 +0100 Subject: [PATCH] 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 { Retrieving your account information... ); - } else if (syncApplyIsPending) { + } else if (syncApplyStarted || syncApplyIsPending) { content = ( - Validating password... + {syncApplyIsPending ? 'Validating password' : 'Synchronizing'}... ); } 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 }; };