diff --git a/appviews/src/Onboarding/Onboarding.tsx b/appviews/src/Onboarding/Onboarding.tsx index 3ce453ec..094e2cfc 100644 --- a/appviews/src/Onboarding/Onboarding.tsx +++ b/appviews/src/Onboarding/Onboarding.tsx @@ -170,6 +170,10 @@ export const Onboarding: React.FC = ({ /> } /> } /> + } + /> } /> } /> diff --git a/appviews/src/Onboarding/StepSwitcher.tsx b/appviews/src/Onboarding/StepSwitcher.tsx index fb170f7c..f1c99a2c 100644 --- a/appviews/src/Onboarding/StepSwitcher.tsx +++ b/appviews/src/Onboarding/StepSwitcher.tsx @@ -168,6 +168,7 @@ function getProgressStep(currentStep: OnboardingStep): number { case `exemptUsers`: case `locateMenuBarIcon`: case `viewHealthCheck`: + case `encourageFilterSuspensions`: case `howToUseGertrude`: case `finish`: return 7; diff --git a/appviews/src/Onboarding/Steps/EncourageFilterSuspensions.tsx b/appviews/src/Onboarding/Steps/EncourageFilterSuspensions.tsx new file mode 100644 index 00000000..0ed5d2ef --- /dev/null +++ b/appviews/src/Onboarding/Steps/EncourageFilterSuspensions.tsx @@ -0,0 +1,34 @@ +import React from 'react'; +import ExpandableContent from '../ExpandableContent'; +import * as Onboarding from '../UtilityComponents'; +import assets from '../cdn-assets'; + +const EncourageFilterSuspensions: React.FC = () => ( + + +
+ Start in “Easy Mode” + + While you work on getting websites and apps unblocked, feel free to use{` `} + lots of temporary filter suspensions to simplify the first few days. + Especially if your kids are older and need to do lots of work online, + right away. + + + Keep screenshot monitoring enabled, and let your child know you’ll be able to see + what they do. + + + Got it + +
+
+); + +export default EncourageFilterSuspensions; diff --git a/appviews/src/Onboarding/Steps/index.ts b/appviews/src/Onboarding/Steps/index.ts index 6ae8469b..af79bc0c 100644 --- a/appviews/src/Onboarding/Steps/index.ts +++ b/appviews/src/Onboarding/Steps/index.ts @@ -7,6 +7,7 @@ export { default as MacosUserAccountType } from './MacosUserAccountType'; export { default as ConnectChild } from './ConnectChild'; export { default as AllowScreenshots } from './AllowScreenshots'; export { default as AllowFullDiskAccess } from './AllowFullDiskAccess'; +export { default as EncourageFilterSuspensions } from './EncourageFilterSuspensions'; export { default as AllowNotifications } from './AllowNotifications'; export { default as AllowKeylogging } from './AllowKeylogging'; export { default as InstallSysExt } from './InstallSysExt'; diff --git a/appviews/src/Onboarding/cdn-assets.ts b/appviews/src/Onboarding/cdn-assets.ts index 9f1a0610..b741f67c 100644 --- a/appviews/src/Onboarding/cdn-assets.ts +++ b/appviews/src/Onboarding/cdn-assets.ts @@ -139,6 +139,7 @@ const COMMON_IMG_IDS = [ `locate-menubar-icon`, `wrong-install-dir`, `how-to-use-gifs`, + `encourage-filter-suspensions`, ] as const; const OS_IMAGE_IDS = [ @@ -153,6 +154,7 @@ const OS_IMAGE_IDS = [ const COMMON_IMG_DATA: Record = { notifications: `png`, administrate: `png`, + 'encourage-filter-suspensions': `png`, 'locate-menubar-icon': `gif`, 'wrong-install-dir': [10.8], 'how-to-use-gifs': [4.88, 5.45], diff --git a/appviews/src/Onboarding/onboarding-store.ts b/appviews/src/Onboarding/onboarding-store.ts index 1be0f8b9..a9bd25ae 100644 --- a/appviews/src/Onboarding/onboarding-store.ts +++ b/appviews/src/Onboarding/onboarding-store.ts @@ -38,6 +38,7 @@ export type OnboardingStep = | 'exemptUsers' | 'locateMenuBarIcon' | 'viewHealthCheck' + | 'encourageFilterSuspensions' | 'howToUseGertrude' | 'finish'; diff --git a/storybook/stories/macos-app/Onboarding.stories.tsx b/storybook/stories/macos-app/Onboarding.stories.tsx index 34456f03..60d7edf3 100644 --- a/storybook/stories/macos-app/Onboarding.stories.tsx +++ b/storybook/stories/macos-app/Onboarding.stories.tsx @@ -244,6 +244,11 @@ export const ViewHealthCheck: Story = props({ step: `viewHealthCheck`, }); +export const EasyMode: Story = props({ + ...Welcome.args, + step: `encourageFilterSuspensions`, +}); + export const HowToUseGertrude: Story = props({ ...Welcome.args, step: `howToUseGertrude`,