From 7bfaa04e00735fb79ca128387c7c5b897809acb6 Mon Sep 17 00:00:00 2001 From: Evelyn Eastmond Date: Wed, 14 Nov 2018 15:18:06 -0500 Subject: [PATCH] Extension name fix. --- src/reducers/alerts.js | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/src/reducers/alerts.js b/src/reducers/alerts.js index ca2fd64c3..5b0fbd09a 100644 --- a/src/reducers/alerts.js +++ b/src/reducers/alerts.js @@ -56,37 +56,26 @@ const reducer = function (state, action) { return state; // if alert not found, show nothing } case SHOW_EXTENSION_ALERT: { - const newList = state.alertsList.slice(); - const newAlert = { - alertType: AlertTypes.EXTENSION, - message: action.data.message, - level: AlertLevels.WARN - }; const extensionId = action.data.extensionId; if (extensionId) { - const newList = state.alertsList.slice(); - const newAlert = { - level: AlertLevels.WARN, - extensionId: extensionId, - showReconnect: true - }; - newAlert.extensionId = extensionId; - newAlert.showReconnect = true; const extension = extensionData.find(ext => ext.extensionId === extensionId); if (extension) { - if (extension.name) { - newAlert.extensionName = extension.name; - } - if (extension.smallPeripheralImage) { - newAlert.iconURL = extension.smallPeripheralImage; - } - newAlert.closeButton = true; - } - newList.push(newAlert); + const newList = state.alertsList.slice(); + const newAlert = { + alertType: AlertTypes.EXTENSION, + closeButton: true, + extensionId: extensionId, + extensionName: extension.name, + iconURL: extension.smallPeripheralImage, + level: AlertLevels.WARN, + showReconnect: true + }; + newList.push(newAlert); - return Object.assign({}, state, { - alertsList: newList - }); + return Object.assign({}, state, { + alertsList: newList + }); + } } return state; // if alert not found, show nothing }