From 7be61fc1525ac60d84c5f41343d656909d0dafea Mon Sep 17 00:00:00 2001 From: Tom Rees-Herdman Date: Thu, 5 May 2022 17:35:19 +0100 Subject: [PATCH 1/2] Fix styling for view only dashboard button. --- assets/js/components/setup/SetupUsingProxyWithSignIn.js | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn.js b/assets/js/components/setup/SetupUsingProxyWithSignIn.js index db33415171f..a2419125e93 100644 --- a/assets/js/components/setup/SetupUsingProxyWithSignIn.js +++ b/assets/js/components/setup/SetupUsingProxyWithSignIn.js @@ -361,6 +361,7 @@ export default function SetupUsingProxyWithSignIn() { onClick={ goToSharedDashboard } + inherit > { __( 'Go to dashboard', From a714deb762815cba39aa5f1d8623900013cad7e9 Mon Sep 17 00:00:00 2001 From: Evan Mattson Date: Thu, 5 May 2022 15:52:26 -0400 Subject: [PATCH 2/2] Only show dashboard link once checks are complete. --- assets/js/components/setup/SetupUsingProxyWithSignIn.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn.js b/assets/js/components/setup/SetupUsingProxyWithSignIn.js index a2419125e93..8e45bcce3f8 100644 --- a/assets/js/components/setup/SetupUsingProxyWithSignIn.js +++ b/assets/js/components/setup/SetupUsingProxyWithSignIn.js @@ -356,7 +356,8 @@ export default function SetupUsingProxyWithSignIn() { inProgressFeedback } { dashboardSharingEnabled && - canViewSharedDashboard && ( + canViewSharedDashboard && + complete && (