Merge pull request #437 from lightninglabs/wait-screen

Wait screen

Author: tanx

src/action/nav.js

@@ -31,6 +31,10 @@ class NavAction {
     this._store.route = 'NewAddress';
   }
 
+  goWait() {
+    this._store.route = 'Wait';
+  }
+
   goHome() {
     this._store.route = 'Home';
   }

src/action/payment.js

@@ -105,9 +105,11 @@ class PaymentAction {
         });
         stream.on('error', reject);
         stream.write(JSON.stringify({ payment_request: invoice }), 'utf8');
+        this._nav.goWait();
       });
       this._nav.goPayLightningDone();
     } catch (err) {
+      this._nav.goPayLightningConfirm();
       this._notification.display({ msg: 'Lightning payment failed!', err });
     }
     await this._transaction.update();

src/action/wallet.js

@@ -1,3 +1,4 @@
+import { observe } from 'mobx';
 import { toBuffer, parseSat, checkHttpStatus, nap } from '../helper';
 import { MIN_PASSWORD_LENGTH, NOTIFICATION_DELAY } from '../config';
 import * as log from './log';
@@ -132,7 +133,8 @@ class WalletAction {
         wallet_password: toBuffer(walletPassword),
       });
       this._store.walletUnlocked = true;
-      this._nav.goHome();
+      this._nav.goWait();
+      observe(this._store, 'lndReady', () => this._nav.goHome());
     } catch (err) {
       this._notification.display({ type: 'error', msg: 'Invalid password' });
     }

src/view/main.js

@@ -10,6 +10,7 @@ import SeedSuccess from './seed-success';
 import SetPassword from './set-password';
 import Password from './password';
 import NewAddress from './new-address';
+import Wait from './wait';
 import Home from './home';
 import Payment from './payment';
 import PayLightningConfirm from './pay-lightning-confirm';
@@ -64,6 +65,7 @@ class MainView extends Component {
         {route === 'NewAddress' && (
           <NewAddress store={store} nav={nav} invoice={invoice} />
         )}
+        {route === 'Wait' && <Wait />}
         {route === 'Home' && (
           <Home
             store={store}

src/view/wait.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { StyleSheet, ActivityIndicator } from 'react-native';
+import Background from '../component/background';
+import MainContent from '../component/main-content';
+import { color } from '../component/style';
+
+const styles = StyleSheet.create({
+  content: {
+    justifyContent: 'center',
+  },
+  spinner: {
+    transform: [{ scale: 1.5 }],
+  },
+});
+
+const WaitView = () => (
+  <Background color={color.blackDark}>
+    <MainContent style={styles.content}>
+      <ActivityIndicator
+        size="large"
+        color={color.lightPurple}
+        style={styles.spinner}
+      />
+    </MainContent>
+  </Background>
+);
+
+export default WaitView;

stories/screen.js

@@ -43,6 +43,7 @@ import SeedVerify from '../src/view/seed-verify';
 import SetPassword from '../src/view/set-password';
 import Password from '../src/view/password';
 import NewAddress from '../src/view/new-address';
+import Wait from '../src/view/wait';
 
 const store = new Store();
 store.init();
@@ -90,6 +91,7 @@ storiesOf('Screens', module)
   .add('New Address', () => (
     <NewAddress store={store} nav={nav} invoice={invoice} />
   ))
+  .add('Wait', () => <Wait />)
   .add('Home', () => (
     <Home
       store={store}

test/unit/action/nav.spec.js

@@ -67,6 +67,13 @@ describe('Action Nav Unit Tests', () => {
     });
   });
 
+  describe('goWait()', () => {
+    it('should set correct route', () => {
+      nav.goWait();
+      expect(store.route, 'to equal', 'Wait');
+    });
+  });
+
   describe('goHome()', () => {
     it('should set correct route', () => {
       nav.goHome();

test/unit/action/payment.spec.js

@@ -203,6 +203,7 @@ describe('Action Payments Unit Tests', () => {
         JSON.stringify({ payment_request: 'some-invoice' }),
         'utf8'
       );
+      expect(nav.goWait, 'was called once');
       expect(nav.goPayLightningDone, 'was called once');
       expect(notification.display, 'was not called');
       expect(transaction.update, 'was called once');
@@ -211,6 +212,7 @@ describe('Action Payments Unit Tests', () => {
     it('should display notification on error', async () => {
       paymentsOnStub.withArgs('data').yields({ payment_error: 'Boom!' });
       await payment.payLightning({ invoice: 'some-payment' });
+      expect(nav.goPayLightningConfirm, 'was called once');
       expect(notification.display, 'was called once');
       expect(transaction.update, 'was called once');
     });

test/unit/action/wallet.spec.js

@@ -238,6 +238,9 @@ describe('Action Wallet Unit Tests', () => {
       expect(grpc.sendUnlockerCommand, 'was called with', 'UnlockWallet', {
         wallet_password: Buffer.from('baz', 'utf8'),
       });
+      expect(nav.goWait, 'was called once');
+      expect(nav.goHome, 'was not called');
+      store.lndReady = true;
       expect(nav.goHome, 'was called once');
     });
 
@@ -247,7 +250,7 @@ describe('Action Wallet Unit Tests', () => {
         .rejects(new Error('Boom!'));
       await wallet.unlockWallet({ walletPassword: 'baz' });
       expect(notification.display, 'was called once');
-      expect(nav.goHome, 'was not called');
+      expect(nav.goWait, 'was not called');
     });
   });