Merge pull request #533 from lightninglabs/wait-on-wallet-addr

Wait for wallet address to be set before naving to NewAddress screen

Author: tanx

src/action/wallet.js

@@ -3,7 +3,7 @@
  * call the corresponding GRPC apis for updating wallet balances.
  */
 
-import { observe } from 'mobx';
+import { observe, when } from 'mobx';
 import { toBuffer, parseSat, checkHttpStatus, nap } from '../helper';
 import { MIN_PASSWORD_LENGTH, NOTIFICATION_DELAY, RATE_DELAY } from '../config';
 import * as log from './log';
@@ -261,6 +261,26 @@ class WalletAction {
     }
   }
 
+  /**
+   * Ensure that the wallet address is non-null before navigating to the
+   * NewAddress view during onboarding.
+   * This is necessary because the wallet address may be null if neutrino
+   * has not started syncing by the time the user finishes verifying
+   * their seed.
+   * @return {undefined}
+   */
+  initInitialDeposit() {
+    if (this._store.walletAddress) {
+      this._nav.goNewAddress();
+    } else {
+      this._nav.goWait();
+      when(
+        () => typeof this._store.walletAddress === 'string',
+        () => this._nav.goNewAddress()
+      );
+    }
+  }
+
   /**
    * Fetch a new on-chain bitcoin address which can be used to fund the wallet
    * or receive an on-chain transaction from another user.

src/view/main.js

@@ -60,7 +60,7 @@ class MainView extends Component {
         {route === 'SeedVerify' && (
           <SeedVerify store={store} nav={nav} wallet={wallet} />
         )}
-        {route === 'SeedSuccess' && <SeedSuccess nav={nav} />}
+        {route === 'SeedSuccess' && <SeedSuccess wallet={wallet} />}
         {route === 'SetPassword' && (
           <SetPassword store={store} wallet={wallet} />
         )}

src/view/seed-success.js

@@ -24,7 +24,7 @@ const styles = StyleSheet.create({
   },
 });
 
-const SeedSuccessView = ({ nav }) => (
+const SeedSuccessView = ({ wallet }) => (
   <Background image="purple-gradient-bg">
     <MainContent>
       <View style={styles.wrapper}>
@@ -36,13 +36,15 @@ const SeedSuccessView = ({ nav }) => (
           }
         </CopyText>
       </View>
-      <GlasButton onPress={() => nav.goNewAddress()}>Add some coin</GlasButton>
+      <GlasButton onPress={() => wallet.initInitialDeposit()}>
+        Add some coin
+      </GlasButton>
     </MainContent>
   </Background>
 );
 
 SeedSuccessView.propTypes = {
-  nav: PropTypes.object.isRequired,
+  wallet: PropTypes.object.isRequired,
 };
 
 export default SeedSuccessView;

stories/screen.js

@@ -95,7 +95,7 @@ storiesOf('Screens', module)
   .add('Restore Wallet', () => (
     <RestoreWallet store={store} nav={nav} wallet={wallet} />
   ))
-  .add('Seed Success', () => <SeedSuccess nav={nav} />)
+  .add('Seed Success', () => <SeedSuccess wallet={wallet} />)
   .add('Set Password', () => <SetPassword store={store} wallet={wallet} />)
   .add('Password', () => <Password store={store} wallet={wallet} />)
   .add('New Address', () => (

test/unit/action/wallet.spec.js

@@ -221,6 +221,24 @@ describe('Action Wallet Unit Tests', () => {
     });
   });
 
+  describe('initInitialDeposit()', () => {
+    it('should navigate to new address screen if address is non-null', () => {
+      store.walletAddress = 'non-null-addr';
+      wallet.initInitialDeposit();
+      expect(nav.goNewAddress, 'was called once');
+      expect(nav.goWait, 'was not called');
+    });
+
+    it('should stay on wait screen until address is non-null', async () => {
+      store.walletAddress = null;
+      wallet.initInitialDeposit();
+      expect(nav.goNewAddress, 'was not called');
+      store.walletAddress = 'non-null-addr';
+      expect(nav.goWait, 'was called once');
+      expect(nav.goNewAddress, 'was called once');
+    });
+  });
+
   describe('checkPassword()', () => {
     beforeEach(() => {
       sandbox.stub(wallet, 'unlockWallet');