From bd7b3924ffa46d0e6118c70f9d5331c9e9f32f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=ABck=20V=C3=A9zien?= Date: Fri, 26 Jan 2018 13:09:52 +0100 Subject: [PATCH] Hide Synchronizing when you don't have accounts --- src/components/TopBar.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/TopBar.js b/src/components/TopBar.js index 761d0941..a70dde7a 100644 --- a/src/components/TopBar.js +++ b/src/components/TopBar.js @@ -9,6 +9,7 @@ import type { Devices } from 'types/common' import type { SetCurrentDevice } from 'actions/devices' import { getDevices, getCurrentDevice } from 'reducers/devices' +import { getAccounts } from 'reducers/accounts' import { setCurrentDevice } from 'actions/devices' import { lock } from 'reducers/application' import { hasPassword } from 'reducers/settings' @@ -16,8 +17,9 @@ import { hasPassword } from 'reducers/settings' import Box from 'components/base/Box' const mapStateToProps: MapStateToProps<*, *, *> = state => ({ - devices: getDevices(state), + hasAccounts: Object.keys(getAccounts(state)).length > 0, currentDevice: getCurrentDevice(state), + devices: getDevices(state), hasPassword: hasPassword(state), }) @@ -27,10 +29,11 @@ const mapDispatchToProps: MapDispatchToProps<*, *, *> = { } type Props = { - setCurrentDevice: SetCurrentDevice, - lock: Function, - hasPassword: boolean, + hasAccounts: boolean, devices: Devices, + hasPassword: boolean, + lock: Function, + setCurrentDevice: SetCurrentDevice, } type State = { sync: { @@ -93,15 +96,16 @@ class TopBar extends PureComponent { handleLock = () => this.props.lock() render() { - const { devices, hasPassword } = this.props + const { devices, hasPassword, hasAccounts } = this.props const { sync } = this.state return ( - {sync.progress === true - ? 'Synchronizing...' - : sync.fail === true ? 'Synchronization fail :(' : 'Synchronisation finished!'} + {hasAccounts && + (sync.progress === true + ? 'Synchronizing...' + : sync.fail === true ? 'Synchronization fail :(' : 'Synchronisation finished!')} {hasPassword && }