Merge pull request #1543 from mrfelton/fix/disable-launch-button

fix(launchpad): disable launch button when launch is in progress
LN-Zap · Feb 8, 2019 · ad4f744 · ad4f744
2 parents 0a9e57d + d4d2a8c
commit ad4f744
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git 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
@@ -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 (
       <Box>
@@ -84,7 +85,14 @@ class WalletLauncher extends React.Component {
             <WalletHeader wallet={wallet} />
           </Box>
           <Flex ml="auto" justifyContent="flex-end" flexDirection="column">
-            <Button type="submit" size="small" form={`wallet-settings-form-${wallet.id}`} ml={2}>
+            <Button
+              type="submit"
+              size="small"
+              disabled={startingLnd}
+              processing={startingLnd}
+              form={`wallet-settings-form-${wallet.id}`}
+              ml={2}
+            >
               <FormattedMessage {...messages.launch_wallet_button_text} />
             </Button>
           </Flex>

diff --git 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
 })