Skip to content

Commit dfd5087

Browse files
author
Erika Perugachi
authored
Merge pull request #1238 from tacho87/ordering_fix_1223
device cap sorting fix, Close #1223
2 parents b495914 + c509deb commit dfd5087

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,6 @@ binding.gyp
4040
*/yarn-error.log*
4141
*.db
4242
.vscode
43+
44+
#Alice
45+
alice_logs.txt

email_login/src/components/DeleteDeviceWrapperPopup.js

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,21 @@ class DeleteDeviceWrapperPopup extends Component {
187187

188188
const res = await findDevices(params);
189189
if (res.status === 200) {
190-
const devices = res.body.devices.map(device => {
191-
return {
192-
checked: false,
193-
deviceId: device.deviceId,
194-
deviceType: device.deviceType,
195-
lastActivity: device.lastActivity,
196-
name: device.deviceFriendlyName
197-
};
198-
});
190+
const devices = res.body.devices
191+
.map(device => {
192+
return {
193+
checked: false,
194+
deviceId: device.deviceId,
195+
deviceType: device.deviceType,
196+
lastActivity: device.lastActivity,
197+
name: device.deviceFriendlyName
198+
};
199+
})
200+
.sort((a, b) => {
201+
if (!b.lastActivity.date || !a.lastActivity.date) return 0;
202+
return new Date(b.lastActivity.date) - new Date(a.lastActivity.date);
203+
});
204+
199205
this.setState(state => ({
200206
confirmButtonState: ButtonState.ENABLED,
201207
devices,

0 commit comments

Comments
 (0)