diff --git a/client/src/actions.jsx b/client/src/actions.jsx index 9beb8700..0c17da7d 100644 --- a/client/src/actions.jsx +++ b/client/src/actions.jsx @@ -29,7 +29,7 @@ export const SET_ACTIVE_SKILL = 'SET_ACTIVE_SKILL'; export const setActiveSkill = (crypId, skill) => ({ type: SET_ACTIVE_SKILL, value: crypId ? { crypId, skill } : null }); export const SET_INFO = 'SET_INFO'; -export const setInfo = value => ({ type: SET_INFO, value: Array.from(value) }); +export const setInfo = value => ({ type: SET_INFO, value }); export const SET_RECLAIMING = 'SET_RECLAIMING'; export const setReclaiming = value => ({ type: SET_RECLAIMING, value }); diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index fac21c21..9d3851f5 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -44,27 +44,26 @@ function Info(args) {
{specs}
- ); } - /*if (item) { - if (SKILLS[item]) { - itemDetails = SKILLS[item]; - } else if (SPECS[item]) { - itemDetails = SPECS[item]; - } else if (COLOURS[item]) { - itemDetails = COLOURS[item]; + if (type === 'item') { + let itemDetails; + if (SKILLS[value]) { + itemDetails = SKILLS[value]; + } else if (SPECS[value]) { + itemDetails = SPECS[value]; + } else if (COLOURS[value]) { + itemDetails = COLOURS[value]; } - }*/ - - -/* const unequip = (itemDetails && cryp) - ? - : null; -*/ + return ( +
+ {itemDetails} +
+ ); + } } module.exports = Info; diff --git a/client/src/components/vbox.container.jsx b/client/src/components/vbox.container.jsx index cbd9a473..943db4f6 100644 --- a/client/src/components/vbox.container.jsx +++ b/client/src/components/vbox.container.jsx @@ -45,7 +45,7 @@ const addState = connect( } function setInfo(type, info) { - return dispatch(actions.setInfo(type, info)); + return dispatch(actions.setInfo([type, info])); } diff --git a/client/src/events.jsx b/client/src/events.jsx index 6d178ad7..800402ba 100644 --- a/client/src/events.jsx +++ b/client/src/events.jsx @@ -32,8 +32,8 @@ function registerEvents(store) { store.dispatch(actions.setActiveSkill(skill)); } - function setInfo(info) { - store.dispatch(actions.setInfo(info)); + function clearInfo(info) { + store.dispatch(actions.setInfo([])); console.log('event clear item'); } @@ -204,7 +204,7 @@ function registerEvents(store) { setCryps, setCrypList, setGame, - setInfo, + clearInfo, setMenu, setPlayer, setInstanceList, diff --git a/client/src/socket.jsx b/client/src/socket.jsx index e7f08ba3..f5fd90d5 100644 --- a/client/src/socket.jsx +++ b/client/src/socket.jsx @@ -95,7 +95,7 @@ function createSocket(events) { function sendVboxUnequip(instanceId, crypId, target) { send({ method: 'player_vbox_unequip', params: { instance_id: instanceId, cryp_id: crypId, target } }); - events.setInfo([]); + events.clearInfo(); } function sendVboxDiscard(instanceId) {