initial app launch wallet creation fixed

BindCreative · Jul 11, 2020 · 9668c0e · 9668c0e
1 parent b10d60d
commit 9668c0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "android": "react-native run-android",
+    "android": "adb reverse tcp:8081 tcp:8081 && react-native run-android",
     "ios": "react-native run-ios",
     "start": "react-native start --reset-cache",
     "postinstall": "npx react-native link react-native-randombytes && ./node_modules/.bin/rn-nodeify --hack --install",

diff --git a/src/reducers/wallet.js b/src/reducers/wallet.js
@@ -14,6 +14,7 @@ const initialState = {
   publicKey: null,
   privateKey: null,
   walletPirvateKey: null,
+  walletPath: null,
 };
 
 function reducer(state = initialState, action) {

diff --git a/src/sagas/wallet.js b/src/sagas/wallet.js
@@ -56,9 +56,13 @@ export function* initWallet() {
 }
 
 export function* createInitialWallet(action) {
-  const { payload } = yield take(REHYDRATE);
+  // Take two as we have two different persisted stores
+  const { payload: payload1 } = yield take(REHYDRATE);
+  const { payload: payload2 } = yield take(REHYDRATE);
+  const payload = { ...payload1, ...payload2 };
+
   try {
-    if (payload?.wallet && !payload.wallet.address) {
+    if (!payload?.wallet?.address) {
       const password = '';
       let mnemonic = new Mnemonic();
       while (!Mnemonic.isValid(mnemonic.toString())) {
@@ -89,12 +93,14 @@ export function* createInitialWallet(action) {
         createInitialWalletSuccess({
           password,
           address,
+          addressPath,
           walletWif,
           addressWif,
           xPrivKey,
           publicKey,
           privateKey,
           walletPirvateKey,
+          walletPath,
           seedWords: mnemonic.phrase,
         }),
       );