Only Force if No Peer

Author: casesandberg

packages/lightning-core/accounts/ChannelListItem.js

@@ -91,8 +91,8 @@ export const ChannelListItem = ({ id, capacity, localBalance, remoteBalance,
   const PROMPT = 'CHANNEL_LIST/PROMPT'
 
   // eslint-disable-next-line
-  const close = ({ channelPoint }) => {
-    const call = onCloseChannel({ channelPoint })
+  const close = ({ channelPoint, force }) => {
+    const call = onCloseChannel({ channelPoint, force })
     call.on('data', () => {
       onSuccess('Channel Closed')
       onFetchChannels()
@@ -106,7 +106,7 @@ export const ChannelListItem = ({ id, capacity, localBalance, remoteBalance,
   menu.append(new MenuItem({ label: 'Close Channel', click() { showPopupOrClose() } }))
   const handleMenu = () => menu.popup(remote.getCurrentWindow())
   const handleClose = () => {
-    close({ channelPoint })
+    close({ channelPoint, force: true })
     onClosePopup(PROMPT)
   }
   const handleCancel = () => onClosePopup(PROMPT)

packages/lightning-core/accounts/reducer.js

@@ -196,7 +196,7 @@ export const actions = {
         .catch(rejectError)
     })
   },
-  closeChannel: ({ channelPoint }) => {
+  closeChannel: ({ channelPoint, force = false }) => {
     const txid = channelPoint.split(':')[0]
     const index = channelPoint.split(':')[1]
     return {
@@ -208,7 +208,7 @@ export const actions = {
             funding_txid: new Buffer(txid, 'hex').reverse(),
             output_index: parseInt(index, 10),
           },
-          force: true,
+          force,
         },
         stream: true,
       },