diff --git a/src/js/components/DeviceHeader/index.js b/src/js/components/DeviceHeader/index.js
index 654f0b53..d54e8ba2 100644
--- a/src/js/components/DeviceHeader/index.js
+++ b/src/js/components/DeviceHeader/index.js
@@ -162,15 +162,15 @@ class DeviceHeader extends Component {
}
}
-
DeviceHeader.propTypes = {
- deviceCount: PropTypes.number,
+ device: PropTypes.object,
+ devices: PropTypes.array,
+ transport: PropTypes.object,
+ icon: PropTypes.element,
+ isHoverable: PropTypes.bool,
disabled: PropTypes.bool,
isOpen: PropTypes.bool,
- trezorModel: PropTypes.string.isRequired,
onClickWrapper: PropTypes.func.isRequired,
- status: PropTypes.string.isRequired,
- label: PropTypes.string.isRequired,
};
export default DeviceHeader;
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 870ceaf3..2316638c 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -39,19 +39,8 @@ if (process.env.NODE_ENV === 'development') {
return pass.length === 0;
};
- const logger = createLogger({
- level: 'info',
- predicate: excludeLogger,
- collapsed: true,
- });
-
- const devToolsExtension: ?Function = window.devToolsExtension;
- if (typeof devToolsExtension === 'function') {
- enhancers.push(devToolsExtension());
- }
-
composedEnhancers = compose(
- applyMiddleware(...middleware, logger, ...services),
+ applyMiddleware(...middleware, ...services),
...enhancers,
);
} else {
diff --git a/src/js/views/Settings/index.js b/src/js/views/Settings/index.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/Submenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/Submenu/index.js
new file mode 100644
index 00000000..2f4f48cc
--- /dev/null
+++ b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/Submenu/index.js
@@ -0,0 +1,55 @@
+import React, { Component } from 'react';
+import styled from 'styled-components';
+import Icon from 'components/Icon';
+import DeviceHeader from 'components/DeviceHeader';
+import icons from 'config/icons';
+import colors from 'config/colors';
+
+const Wrapper = styled.div``;
+const IconClick = styled.div``;
+
+class DeviceList extends Component {
+ sortByInstance(a, b) {
+ if (!a.instance || !b.instance) return -1;
+ return a.instance > b.instance ? 1 : -1;
+ }
+
+ render() {
+ const { devices, selectedDevice, onSelectDevice } = this.props;
+ return (
+
+ {devices
+ .sort(this.sortByInstance)
+ .map(device => (
+ device !== selectedDevice && (
+ this.props.onSelectDevice(device)}
+ onClickIcon={() => this.onDeviceMenuClick({ type: 'forget', label: '' }, device)}
+ icon={(
+ {
+ event.stopPropagation();
+ event.preventDefault();
+ this.onDeviceMenuClick({ type: 'forget', label: '' }, device);
+ }}
+ >
+
+
+ )}
+ device={device}
+ devices={devices}
+ isHoverable
+ />
+ )
+ ))}
+
+
+ );
+ }
+}
+
+export default DeviceList;
\ No newline at end of file
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
index 9c1fa0c6..5103173c 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
@@ -24,7 +24,7 @@ export const DeviceSelect = (props: Props) => {
onClickWrapper={handleOpen}
device={props.wallet.selectedDevice}
transport={props.connect.transport}
- devices={props.devices.length}
+ devices={props.devices}
isOpen={props.deviceDropdownOpened}
/>
);
@@ -101,6 +101,10 @@ export class DeviceDropdown extends Component {
return this.props.devices.length > 1;
}
+ getMenu() {
+
+ }
+
render() {
const { devices, onSelectDevice } = this.props;
const { transport } = this.props.connect;
diff --git a/src/js/views/Wallet/views/DeviceSettings/index.js b/src/js/views/Wallet/views/DeviceSettings/index.js
index b51a505e..5cc3d11e 100644
--- a/src/js/views/Wallet/views/DeviceSettings/index.js
+++ b/src/js/views/Wallet/views/DeviceSettings/index.js
@@ -33,6 +33,7 @@ const DeviceSettings = () => (