Merge pull request #476 from lightninglabs/fix-channel-close

Don’t force close and already closing channel

Author: tanx

src/action/channel.js

@@ -177,10 +177,7 @@ class ChannelAction {
     try {
       const { selectedChannel } = this._store;
       this._nav.goChannels();
-      await this.closeChannel({
-        channelPoint: selectedChannel.channelPoint,
-        force: !selectedChannel.status.includes('open'), // force close already closing
-      });
+      await this.closeChannel({ channelPoint: selectedChannel.channelPoint });
     } catch (err) {
       this._notification.display({ msg: 'Closing channel failed!', err });
     }

test/unit/action/channel.spec.js

@@ -265,16 +265,6 @@ describe('Action Channels Unit Tests', () => {
       expect(nav.goChannels, 'was called once');
       expect(channel.closeChannel, 'was called with', {
         channelPoint: 'some-channel-point',
-        force: false,
-      });
-    });
-
-    it('should force close pending-closing channel', async () => {
-      store.selectedChannel.status = 'pending-closing';
-      await channel.closeSelectedChannel();
-      expect(channel.closeChannel, 'was called with', {
-        channelPoint: 'some-channel-point',
-        force: true,
       });
     });