fix(wallet): reset app right before launching lnd

LN-Zap · Oct 25, 2020 · a9bcc66 · a9bcc66
1 parent d48e387
commit a9bcc66
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/renderer/components/Home/Home.js b/renderer/components/Home/Home.js
@@ -35,6 +35,7 @@ class Home extends React.Component {
     isWalletUnlockerGrpcActive: PropTypes.bool.isRequired,
     lndConnect: PropTypes.string,
     putWallet: PropTypes.func.isRequired,
+    resetApp: PropTypes.func.isRequired,
     setActiveWallet: PropTypes.func.isRequired,
     setIsWalletOpen: PropTypes.func.isRequired,
     setUnlockWalletError: PropTypes.func.isRequired,
@@ -77,6 +78,7 @@ class Home extends React.Component {
       wallets,
       setActiveWallet,
       clearStartLndError,
+      resetApp,
       showError,
       stopLnd,
       isNeutrinoRunning,
@@ -135,6 +137,7 @@ class Home extends React.Component {
                     isStartingLnd={isStartingLnd}
                     isWalletUnlockerGrpcActive={isWalletUnlockerGrpcActive}
                     putWallet={putWallet}
+                    resetApp={resetApp}
                     showError={showError}
                     showNotification={showNotification}
                     startLnd={startLnd}

diff --git a/renderer/components/Home/WalletLauncher.js b/renderer/components/Home/WalletLauncher.js
@@ -201,6 +201,7 @@ class WalletLauncher extends React.Component {
     isStartingLnd: PropTypes.bool.isRequired,
     isWalletUnlockerGrpcActive: PropTypes.bool.isRequired,
     putWallet: PropTypes.func.isRequired,
+    resetApp: PropTypes.func.isRequired,
     showError: PropTypes.func.isRequired,
     showNotification: PropTypes.func.isRequired,
     startLnd: PropTypes.func.isRequired,
@@ -259,8 +260,9 @@ class WalletLauncher extends React.Component {
 
   launchWallet = async () => {
     try {
-      const { startLnd, wallet } = this.props
+      const { resetApp, startLnd, wallet } = this.props
       // discard settings edits and just launch current saved config
+      resetApp()
       return await startLnd(wallet)
     } catch (e) {
       // this error is handled via startLndErrors mechanism

diff --git a/renderer/containers/Home/Home.js b/renderer/containers/Home/Home.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import { connect } from 'react-redux'
+import { resetApp } from 'reducers/app'
 import { neutrinoSelectors } from 'reducers/neutrino'
 import {
   setActiveWallet,
@@ -51,6 +52,7 @@ const mapDispatchToProps = {
   clearStartLndError,
   stopLnd,
   putWallet,
+  resetApp,
   showNotification,
   startLnd,
   unlockWallet,