From f2163af9df785f39b08ba952815204b3f830be9d Mon Sep 17 00:00:00 2001 From: Jed Fox <git@jedfox.com> Date: Thu, 23 Feb 2023 15:14:05 -0500 Subject: [PATCH] =?UTF-8?q?Make=20the=20=E2=80=9CNot=20logged=20in?= =?UTF-8?q?=E2=80=9D=20warning=20a=20button=20(#674)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desktop-client/src/components/LoggedInUser.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/desktop-client/src/components/LoggedInUser.js b/packages/desktop-client/src/components/LoggedInUser.js index 63306f797..b6f8a4298 100644 --- a/packages/desktop-client/src/components/LoggedInUser.js +++ b/packages/desktop-client/src/components/LoggedInUser.js @@ -54,11 +54,14 @@ function LoggedInUser({ } async function onClick() { - if (serverUrl) { + if (!serverUrl) { + await closeBudget(); + window.__history.push('/config-server'); + } else if (userData) { setMenuOpen(true); } else { await closeBudget(); - window.__history.push('/config-server'); + window.__history.push('/login'); } } @@ -97,7 +100,11 @@ function LoggedInUser({ </View> ); } else { - return <View style={[{ color }, style]}>Not logged in</View>; + return ( + <Button bare onClick={onClick} style={[{ color }, style]}> + Not logged in + </Button> + ); } } -- GitLab