From d4d2a8c61148de9a4df23f5ee580e9c98a404a7d Mon Sep 17 00:00:00 2001 From: Tom Kirkpatrick Date: Fri, 8 Feb 2019 16:42:17 +0100 Subject: [PATCH] fix(launchpad): disable launch button when launch is in progress --- app/components/Home/Home.js | 3 +++ app/components/Home/WalletLauncher.js | 12 ++++++++++-- app/containers/Home.js | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/components/Home/Home.js b/app/components/Home/Home.js index 7db82351bce..5ea119f861c 100644 --- a/app/components/Home/Home.js +++ b/app/components/Home/Home.js @@ -24,6 +24,7 @@ class Home extends React.Component { deleteWallet: PropTypes.func.isRequired, lndConnect: PropTypes.object, startLndError: PropTypes.object, + startingLnd: PropTypes.bool, lightningGrpcActive: PropTypes.bool.isRequired, walletUnlockerGrpcActive: PropTypes.bool.isRequired, wallets: PropTypes.array.isRequired, @@ -65,6 +66,7 @@ class Home extends React.Component { deleteWallet, startLnd, startLndError, + startingLnd, unlockWallet, wallets, setActiveWallet, @@ -117,6 +119,7 @@ class Home extends React.Component { wallet={wallet} startLnd={startLnd} stopLnd={stopLnd} + startingLnd={startingLnd} lightningGrpcActive={lightningGrpcActive} walletUnlockerGrpcActive={walletUnlockerGrpcActive} startLndError={startLndError} diff --git a/app/components/Home/WalletLauncher.js b/app/components/Home/WalletLauncher.js index b80e7ffb4e3..52775ee88ad 100644 --- a/app/components/Home/WalletLauncher.js +++ b/app/components/Home/WalletLauncher.js @@ -12,6 +12,7 @@ class WalletLauncher extends React.Component { wallet: PropTypes.object.isRequired, deleteWallet: PropTypes.func.isRequired, startLnd: PropTypes.func.isRequired, + startingLnd: PropTypes.bool.isRequired, lightningGrpcActive: PropTypes.bool.isRequired, walletUnlockerGrpcActive: PropTypes.bool.isRequired, startLndError: PropTypes.object, @@ -75,7 +76,7 @@ class WalletLauncher extends React.Component { } render() { - const { startLnd, wallet } = this.props + const { startLnd, startingLnd, wallet } = this.props return ( @@ -84,7 +85,14 @@ class WalletLauncher extends React.Component { - diff --git a/app/containers/Home.js b/app/containers/Home.js index 545f51f7996..9c66634d0c1 100644 --- a/app/containers/Home.js +++ b/app/containers/Home.js @@ -18,6 +18,7 @@ const mapStateToProps = state => ({ lightningGrpcActive: state.lnd.lightningGrpcActive, walletUnlockerGrpcActive: state.lnd.walletUnlockerGrpcActive, startLndError: state.lnd.startLndError, + startingLnd: state.lnd.startingLnd, unlockingWallet: state.lnd.unlockingWallet, unlockWalletError: state.lnd.unlockWalletError })