fix(ui): remove channel from closing list on error

LN-Zap · May 10, 2020 · 9cc1999 · 9cc1999
1 parent 626ba70
commit 9cc1999
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 130 deletions.
diff --git a/renderer/reducers/channels/constants.js b/renderer/reducers/channels/constants.js
@@ -6,7 +6,6 @@ export const CHANGE_CHANNEL_SORT_ORDER = 'CHANGE_CHANNEL_SORT_ORDER'
 export const UPDATE_SEARCH_QUERY = 'UPDATE_SEARCH_QUERY'
 export const GET_CHANNELS = 'GET_CHANNELS'
 export const RECEIVE_CHANNELS = 'RECEIVE_CHANNELS'
-export const CLOSING_CHANNEL = 'CLOSING_CHANNEL'
 export const ADD_LOADING_PUBKEY = 'ADD_LOADING_PUBKEY'
 export const REMOVE_LOADING_PUBKEY = 'REMOVE_LOADING_PUBKEY'
 export const ADD_CLOSING_CHAN_ID = 'ADD_CLOSING_CHAN_ID'

diff --git a/renderer/reducers/channels/reducer.js b/renderer/reducers/channels/reducer.js
@@ -23,7 +23,6 @@ const {
   UPDATE_SEARCH_QUERY,
   GET_CHANNELS,
   RECEIVE_CHANNELS,
-  CLOSING_CHANNEL,
   ADD_LOADING_PUBKEY,
   REMOVE_LOADING_PUBKEY,
   ADD_CLOSING_CHAN_ID,
@@ -50,7 +49,6 @@ const initialState = {
   },
   closedChannels: [],
   closingChannelIds: [],
-  closingChannel: false,
   searchQuery: null,
   filter: new Set([...DEFAULT_FILTER]),
   filters: [
@@ -172,17 +170,6 @@ export function getChannels() {
   }
 }
 
-/**
- * closingChannel - Initialte channel close action.
- *
- * @returns {object} Action
- */
-export function closingChannel() {
-  return {
-    type: CLOSING_CHANNEL,
-  }
-}
-
 /**
  * updateChannelSearchQuery - Set the current channel serach string.
  *
@@ -345,13 +332,17 @@ export const fetchChannels = () => async dispatch => {
  * @param {object} data Channel update notification
  * @returns {Function} Thunk
  */
-export const pushchannelupdated = ({ nodePubkey, data }) => dispatch => {
+export const pushchannelupdated = ({ nodePubkey, chanId, data }) => dispatch => {
   dispatch(fetchChannels())
   if (data.update === 'chanPending') {
-    dispatch(removeLoadingChannel(nodePubkey))
+    if (nodePubkey) {
+      dispatch(removeLoadingChannel(nodePubkey))
+    } else if (chanId) {
+      dispatch(removeClosingChanId(chanId))
+    }
     dispatch(
       updateNotification(
-        { payload: { pubkey: nodePubkey } },
+        { payload: { pubkey: nodePubkey, chanId } },
         {
           variant: 'success',
           message: 'Channel successfully created',
@@ -368,11 +359,15 @@ export const pushchannelupdated = ({ nodePubkey, data }) => dispatch => {
  * @param {object} data Channel error notification
  * @returns {Function} Thunk
  */
-export const pushchannelerror = ({ nodePubkey, error }) => dispatch => {
-  dispatch(removeLoadingChannel(nodePubkey))
+export const pushchannelerror = ({ nodePubkey, chanId, error }) => dispatch => {
+  if (nodePubkey) {
+    dispatch(removeLoadingChannel(nodePubkey))
+  } else if (chanId) {
+    dispatch(removeClosingChanId(chanId))
+  }
   dispatch(
     updateNotification(
-      { payload: { pubkey: nodePubkey } },
+      { payload: { pubkey: nodePubkey, chanId } },
       {
         variant: 'error',
         message: error,
@@ -457,7 +452,6 @@ export const closeChannel = () => async (dispatch, getState) => {
 
   if (selectedChannel) {
     const { channelPoint, chanId, active } = selectedChannel
-    dispatch(closingChannel())
     dispatch(addClosingChanId(chanId))
 
     const [fundingTxid, outputIndex] = channelPoint.split(':')
@@ -477,7 +471,7 @@ export const closeChannel = () => async (dispatch, getState) => {
       dispatch(
         pushchannelerror({
           error: `Unable to close channel: ${e.message}`,
-          nodePubkey: e.payload.nodePubkey,
+          chanId: e.payload.chanId,
         })
       )
     }
@@ -566,9 +560,6 @@ const ACTION_HANDLERS = {
     state.pendingChannels = pendingChannels
     state.closedChannels = closedChannels
   },
-  [CLOSING_CHANNEL]: state => {
-    state.closingChannel = true
-  },
   [UPDATE_SEARCH_QUERY]: (state, { searchQuery }) => {
     state.searchQuery = searchQuery
   },

diff --git a/test/unit/reducers/__snapshots__/channels.spec.js.snap b/test/unit/reducers/__snapshots__/channels.spec.js.snap
@@ -9,7 +9,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
 -   "closingChannelIds": Array [],
 +   "closingChannelIds": Array [
 +     "123",
@@ -94,7 +93,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -181,7 +179,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -263,7 +260,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -346,7 +342,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -420,89 +415,6 @@ Snapshot Diff:
   }
 `;
 
-exports[`reducers channelsReducer should handle CLOSING_CHANNEL 1`] = `
-Snapshot Diff:
-- First value
-+ Second value
-
-  Object {
-    "channels": Array [],
-    "channelsLoading": false,
-    "closedChannels": Array [],
--   "closingChannel": false,
-+   "closingChannel": true,
-    "closingChannelIds": Array [],
-    "filter": Set {
-      "ACTIVE_CHANNELS",
-      "NON_ACTIVE_CHANNELS",
-      "OPEN_PENDING_CHANNELS",
-      "CLOSING_PENDING_CHANNELS",
-    },
-    "filters": Array [
-      Object {
-        "key": "ACTIVE_CHANNELS",
-        "value": "Online",
-      },
-      Object {
-        "key": "NON_ACTIVE_CHANNELS",
-        "value": "Offline",
-      },
-      Object {
-        "key": "OPEN_PENDING_CHANNELS",
-        "value": "Pending",
-      },
-      Object {
-        "key": "CLOSING_PENDING_CHANNELS",
-        "value": "Closing",
-      },
-    ],
-    "loadingChannels": Array [],
-    "pendingChannels": Object {
-      "pendingClosingChannels": Array [],
-      "pendingForceClosingChannels": Array [],
-      "pendingOpenChannels": Array [],
-      "totalLimboBalance": "0",
-      "waitingCloseChannels": Array [],
-    },
-    "searchQuery": null,
-    "selectedChannelId": null,
-    "sort": "CHANNELS_SORT_OPEN_DATE",
-    "sortOrder": "asc",
-    "sorters": Array [
-      Object {
-        "key": "CHANNELS_SORT_OPEN_DATE",
-        "value": "Open date",
-      },
-      Object {
-        "key": "CHANNELS_SORT_REMOTE_BALANCE",
-        "value": "Remote balance",
-      },
-      Object {
-        "key": "CHANNELS_SORT_LOCAL_BALANCE",
-        "value": "Local balance",
-      },
-      Object {
-        "key": "CHANNELS_SORT_ACTIVITY",
-        "value": "Activity",
-      },
-      Object {
-        "key": "CHANNELS_SORT_NAME",
-        "value": "Name",
-      },
-      Object {
-        "key": "CHANNELS_SORT_CAPACITY",
-        "value": "Capacity",
-      },
-    ],
-    "suggestedNodes": Object {
-      "mainnet": Array [],
-      "testnet": Array [],
-    },
-    "suggestedNodesError": null,
-    "suggestedNodesLoading": false,
-  }
-`;
-
 exports[`reducers channelsReducer should handle GET_CHANNELS 1`] = `
 Snapshot Diff:
 - First value
@@ -513,7 +425,6 @@ Snapshot Diff:
 -   "channelsLoading": false,
 +   "channelsLoading": true,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -595,7 +506,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -686,7 +596,6 @@ Snapshot Diff:
 +     5,
 +     6,
 +   ],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -781,7 +690,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -864,7 +772,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -957,7 +864,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -1040,7 +946,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -1123,7 +1028,6 @@ Snapshot Diff:
     "channels": Array [],
     "channelsLoading": false,
     "closedChannels": Array [],
-    "closingChannel": false,
     "closingChannelIds": Array [],
     "filter": Set {
       "ACTIVE_CHANNELS",
@@ -1202,7 +1106,6 @@ Object {
   "channels": Array [],
   "channelsLoading": false,
   "closedChannels": Array [],
-  "closingChannel": false,
   "closingChannelIds": Array [],
   "filter": Set {
     "ACTIVE_CHANNELS",

diff --git a/test/unit/reducers/channels.spec.js b/test/unit/reducers/channels.spec.js
@@ -8,7 +8,6 @@ import reducer, {
   UPDATE_SEARCH_QUERY,
   GET_CHANNELS,
   RECEIVE_CHANNELS,
-  CLOSING_CHANNEL,
   ADD_LOADING_PUBKEY,
   REMOVE_LOADING_PUBKEY,
   ADD_CLOSING_CHAN_ID,
@@ -95,13 +94,6 @@ describe('reducers', () => {
       expect(snapshotDiff(reducer(undefined, {}), reducer(undefined, action))).toMatchSnapshot()
     })
 
-    it('should handle CLOSING_CHANNEL', () => {
-      const action = {
-        type: CLOSING_CHANNEL,
-      }
-      expect(snapshotDiff(reducer(undefined, {}), reducer(undefined, action))).toMatchSnapshot()
-    })
-
     it('should handle ADD_LOADING_PUBKEY', () => {
       const action = {
         type: ADD_LOADING_PUBKEY,