Fix bug, when repeated wallet initialization fails

i1skn · Feb 11, 2019 · 07fea9c · 07fea9c
1 parent 2ebb4a8
commit 07fea9c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/modules/wallet.js b/src/modules/wallet.js
@@ -89,6 +89,7 @@ const walletInit = function(
         ...state,
         inProgress: true,
         progress: 0,
+        mnemonic: '',
       }
     case 'WALLET_INIT_SUCCESS':
       return {

diff --git a/src/screens/Initial.js b/src/screens/Initial.js
@@ -19,7 +19,7 @@ import { ActivityIndicator } from 'react-native'
 import { connect } from 'react-redux'
 import styled from 'styled-components/native'
 
-import { colors, WALLET_DATA_DIRECTORY } from 'common'
+import { colors, WALLET_DATA_DIRECTORY, isWalletInitialized } from 'common'
 import { type State as ReduxState, type Currency, type Error, type Navigation } from 'common/types'
 import RNFS from 'react-native-fs'
 
@@ -54,13 +54,14 @@ class Initial extends Component<Props, State> {
   }
 
   componentDidMount() {
-    RNFS.readFile(WALLET_DATA_DIRECTORY + '/wallet.seed', 'utf8')
-      .then(slate => {
-        this.props.navigation.navigate('App')
-      })
-      .catch(error => {
-        this.props.navigation.navigate('Landing')
-      })
+    const { navigation } = this.props
+    isWalletInitialized().then(exists => {
+      if (exists) {
+        navigation.navigate('App')
+      } else {
+        navigation.navigate('Landing')
+      }
+    })
   }
 
   componentDidUpdate(prevProps) {}

diff --git a/src/screens/Landing.js b/src/screens/Landing.js
@@ -96,7 +96,7 @@ class Landing extends Component<Props, State> {
           }}
         />
         <FlexGrow />
-        <Text>Version: {pkg.version} (alpha)</Text>
+        <Text>Version: {pkg.version} (floonet)</Text>
         <Spacer />
       </Wrapper>
     )