diff --git a/frontend/components/TurnOnMdmMessage/TurnOnMdmMessage.tsx b/frontend/components/TurnOnMdmMessage/TurnOnMdmMessage.tsx index 3264e3269986..d7653170fef7 100644 --- a/frontend/components/TurnOnMdmMessage/TurnOnMdmMessage.tsx +++ b/frontend/components/TurnOnMdmMessage/TurnOnMdmMessage.tsx @@ -14,9 +14,15 @@ interface ITurnOnMdmMessageProps { header?: string; /** Default: MDM must be turned on to change settings on your hosts. */ info?: string; + buttonText?: string; } -const TurnOnMdmMessage = ({ router, header, info }: ITurnOnMdmMessageProps) => { +const TurnOnMdmMessage = ({ + router, + header, + info, + buttonText = "Turn on", +}: ITurnOnMdmMessageProps) => { const { isGlobalAdmin } = useContext(AppContext); const onConnectClick = () => { @@ -30,7 +36,7 @@ const TurnOnMdmMessage = ({ router, header, info }: ITurnOnMdmMessageProps) => { onClick={onConnectClick} className={`${baseClass}__connectAPC-button`} > - Turn on + {buttonText} ) : ( <> @@ -39,6 +45,7 @@ const TurnOnMdmMessage = ({ router, header, info }: ITurnOnMdmMessageProps) => { return ( { } case ACTIONS.SET_CONFIG: { const { config } = action; - // config.sandbox_enabled = true; // TODO: uncomment for sandbox dev - return { ...state, config, diff --git a/frontend/pages/ManageControlsPage/SetupExperience/SetupExperience.tsx b/frontend/pages/ManageControlsPage/SetupExperience/SetupExperience.tsx index fc1940ff1ef2..1f7271ce1ada 100644 --- a/frontend/pages/ManageControlsPage/SetupExperience/SetupExperience.tsx +++ b/frontend/pages/ManageControlsPage/SetupExperience/SetupExperience.tsx @@ -39,7 +39,7 @@ const SetupEmptyState = ({ router }: ISetupEmptyState) => { interface ISetupExperienceProps { params: Params; location: { search: string }; - router: any; + router: InjectedRouter; teamIdForApi: number; } @@ -63,7 +63,14 @@ const SetupExperience = ({ // MDM is not on so show messaging for user to enable it. if (!config?.mdm.enabled_and_configured) { - return ; + return ( + + ); } // User has not set up Apple Business Manager. if (!config?.mdm.apple_bm_enabled_and_configured) {