From e7d1bd6d061e93566acb2be58cbb216955af3602 Mon Sep 17 00:00:00 2001 From: Bogdan Cochior <bogdan.cochior@thinslices.com> Date: Tue, 17 Jul 2018 11:16:53 +0300 Subject: [PATCH] refactor(admin-users): show inactive first --- .../components-faraday/src/components/Admin/AdminUsers.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/components-faraday/src/components/Admin/AdminUsers.js b/packages/components-faraday/src/components/Admin/AdminUsers.js index ecaf18ab7..2fe5afe3a 100644 --- a/packages/components-faraday/src/components/Admin/AdminUsers.js +++ b/packages/components-faraday/src/components/Admin/AdminUsers.js @@ -142,10 +142,10 @@ export default compose( setPage(p => (p > 0 ? p - 1 : p)) }, getStatusLabel: () => ({ isConfirmed, isActive = true }) => () => { - if (isConfirmed) { - return isActive ? 'Active' : 'Inactive' + if (!isActive) { + return 'Inactive' } - return 'Invited' + return isConfirmed ? 'Active' : 'Invited' }, toggleUserStatus: ({ dispatch, -- GitLab