diff --git a/packages/insomnia-app/app/ui/components/onboarding-container.js b/packages/insomnia-app/app/ui/components/onboarding-container.js index 74ef09df0d..da5ba12be3 100644 --- a/packages/insomnia-app/app/ui/components/onboarding-container.js +++ b/packages/insomnia-app/app/ui/components/onboarding-container.js @@ -3,13 +3,12 @@ import React from 'react'; import type { WrapperProps } from './wrapper'; import PageLayout from './page-layout'; import coreLogo from '../images/insomnia-core-logo.png'; -import { getAppLongName, getAppSynopsis } from '../../common/constants'; type Props = { wrapperProps: WrapperProps, }; -const OnboardingContainer = ({ wrapperProps, children }: Props) => ( +const OnboardingContainer = ({ wrapperProps, children, header, subHeader }: Props) => ( ( @@ -20,8 +19,8 @@ const OnboardingContainer = ({ wrapperProps, children }: Props) => ( Kong
-

Welcome to {getAppLongName()}

-

{getAppSynopsis()}

+

{header}

+

{subHeader}

{children}
diff --git a/packages/insomnia-app/app/ui/components/wrapper-migration.js b/packages/insomnia-app/app/ui/components/wrapper-migration.js index fecdc68c58..36edeca09b 100644 --- a/packages/insomnia-app/app/ui/components/wrapper-migration.js +++ b/packages/insomnia-app/app/ui/components/wrapper-migration.js @@ -2,7 +2,7 @@ import * as React from 'react'; import type { WrapperProps } from './wrapper'; -import { ToggleSwitch } from 'insomnia-components'; +import { ToggleSwitch, Button } from 'insomnia-components'; import type { MigrationOptions } from '../../common/migrate-from-designer'; import migrateFromDesigner, { restartApp } from '../../common/migrate-from-designer'; import { getDataDirectory, getDesignerDataDir } from '../../common/misc'; @@ -91,13 +91,9 @@ const Options = ({ start, cancel }: OptionsProps) => { return ( <>

- Migrate from Insomnia Designer + From the list below, select the individual items you would like to migrate from Designer.

-

- Insomnia Designer and Core are now Insomnia! Select the items below you'd like to migrate - from Designer. -

-
+
{
- + @@ -261,7 +260,10 @@ type Props = {| |}; const WrapperMigration = ({ wrapperProps }: Props) => ( - + ); diff --git a/packages/insomnia-app/app/ui/components/wrapper-onboarding.js b/packages/insomnia-app/app/ui/components/wrapper-onboarding.js index b6910c09e5..f746a15335 100644 --- a/packages/insomnia-app/app/ui/components/wrapper-onboarding.js +++ b/packages/insomnia-app/app/ui/components/wrapper-onboarding.js @@ -2,10 +2,11 @@ import * as React from 'react'; import { autoBindMethodsForReact } from 'class-autobind-decorator'; import 'swagger-ui-react/swagger-ui.css'; +import { Button } from 'insomnia-components'; import { showPrompt } from './modals'; import type { BaseModel } from '../../models'; import * as models from '../../models'; -import { AUTOBIND_CFG, getAppLongName, getAppName } from '../../common/constants'; +import { AUTOBIND_CFG, getAppLongName, getAppName, getAppSynopsis } from '../../common/constants'; import type { HandleImportFileCallback, HandleImportUriCallback, WrapperProps } from './wrapper'; import * as db from '../../common/database'; import chartSrc from '../images/chart.svg'; @@ -17,6 +18,8 @@ type Props = {| wrapperProps: WrapperProps, handleImportFile: HandleImportFileCallback, handleImportUri: HandleImportUriCallback, + header: string, + subHeader: string, |}; type State = {| @@ -126,9 +129,15 @@ class WrapperOnboarding extends React.PureComponent { Help us understand how you use {getAppLongName()} so we can make it better.

- +