Merge pull request #2923 from korhaliv/fix/channel-open

fix(ui): close channel create modal after channel opening is finished
LN-Zap · Oct 7, 2019 · 9993e38 · 9993e38
2 parents a40c13d + 1984974
commit 9993e38
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/renderer/containers/Channels/ChannelCreate.js b/renderer/containers/Channels/ChannelCreate.js
@@ -1,14 +1,18 @@
 import { connect } from 'react-redux'
 import ChannelCreate from 'components/Channels/ChannelCreate'
+import { closeModal } from 'reducers/modal'
 import { updateContactFormSearchQuery, contactFormSelectors } from 'reducers/contactsform'
 
+const onSubmit = () => closeModal()
+
 const mapStateToProps = state => ({
   searchQuery: state.contactsform.searchQuery,
   isSearchValidNodeAddress: contactFormSelectors.isSearchValidNodeAddress(state),
 })
 
 const mapDispatchToProps = {
   updateContactFormSearchQuery,
+  onSubmit,
 }
 
 export default connect(

diff --git a/renderer/reducers/channels.js b/renderer/reducers/channels.js
@@ -1,5 +1,4 @@
 import { createSelector } from 'reselect'
-import { proxyValue } from 'comlinkjs'
 import orderBy from 'lodash/orderBy'
 import throttle from 'lodash/throttle'
 import config from 'config'
@@ -546,10 +545,6 @@ export const openChannel = data => async (dispatch, getState) => {
       spendUnconfirmed,
     })
     dispatch(pushchannelupdated(data))
-    grpc.services.Lightning.once(
-      'openChannel.data',
-      proxyValue(data => dispatch(pushchannelupdated(data)))
-    )
   } catch (e) {
     dispatch(
       pushchannelerror({
@@ -647,10 +642,6 @@ export const closeChannel = () => async (dispatch, getState) => {
         force: !active,
       })
       dispatch(pushclosechannelupdated(data))
-      grpc.services.Lightning.once(
-        'closeChannel.data',
-        proxyValue(data => dispatch(pushclosechannelupdated(data)))
-      )
     } catch (e) {
       dispatch(
         pushchannelerror({

diff --git a/services/grpc/lightning.methods.js b/services/grpc/lightning.methods.js
@@ -175,26 +175,22 @@ async function openChannel(payload = {}) {
       call.on('data', data => {
         grpcLog.debug('OPEN_CHANNEL DATA', data)
         const response = { ...parsePayload(payload), data }
-        this.emit('openChannel.data', response)
         resolve(response)
       })
 
       call.on('error', data => {
         grpcLog.error('OPEN_CHANNEL ERROR', data)
         const error = new Error(data.message)
         error.payload = parsePayload(payload)
-        this.emit('openChannel.error', error)
         reject(error)
       })
 
       call.on('status', status => {
         grpcLog.debug('OPEN_CHANNEL STATUS', status)
-        this.emit('openChannel.status', status)
       })
 
       call.on('end', () => {
         grpcLog.debug('OPEN_CHANNEL END')
-        this.emit('openChannel.end')
       })
     } catch (e) {
       const error = new Error(e.message)
@@ -235,26 +231,22 @@ async function closeChannel(payload = {}) {
       call.on('data', data => {
         grpcLog.debug('CLOSE_CHANNEL DATA', data)
         const response = { data, chan_id }
-        this.emit('closeChannel.data', response)
         resolve(response)
       })
 
       call.on('error', data => {
         grpcLog.error('CLOSE_CHANNEL ERROR', data)
         const error = new Error(data.message)
         error.payload = { chan_id }
-        this.emit('closeChannel.error', error)
         reject(error)
       })
 
       call.on('status', status => {
         grpcLog.debug('CLOSE_CHANNEL STATUS', status)
-        this.emit('closeChannel.status', status)
       })
 
       call.on('end', () => {
         grpcLog.debug('CLOSE_CHANNEL END')
-        this.emit('closeChannel.end')
       })
     } catch (e) {
       const error = new Error(e.message)