diff --git a/.changeset/tiny-pots-fly.md b/.changeset/tiny-pots-fly.md new file mode 100644 index 0000000000..70d3d19a43 --- /dev/null +++ b/.changeset/tiny-pots-fly.md @@ -0,0 +1,7 @@ +--- +'@commercetools-frontend/application-shell': patch +'@commercetools-frontend/assets': patch +'@commercetools-frontend/i18n': patch +--- + +Removing the rebranding modal pup-up. diff --git a/packages/application-shell/src/components/theme-switcher/messages.ts b/packages/application-shell/src/components/theme-switcher/messages.ts deleted file mode 100644 index da6fa653cf..0000000000 --- a/packages/application-shell/src/components/theme-switcher/messages.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { defineMessages } from 'react-intl'; - -export default defineMessages({ - title: { - id: 'NewColoursSchemaAnnouncementDialog.title', - defaultMessage: "We've refreshed our Merchant Center!", - }, - content: { - id: 'NewColoursSchemaAnnouncementDialog.content', - defaultMessage: - "From the new colors to an updated navigation, we've made a few changes to improve your experience within Merchant Center. You will also find that we are taking steps to ensure a consistent look and feel across all of our user tooling, from the Merchant Center to the Frontend Studio. Check out the updates!", - }, -}); diff --git a/packages/application-shell/src/components/theme-switcher/new-colors-schema-announcement-dialog.tsx b/packages/application-shell/src/components/theme-switcher/new-colors-schema-announcement-dialog.tsx deleted file mode 100644 index 550fc5b5b0..0000000000 --- a/packages/application-shell/src/components/theme-switcher/new-colors-schema-announcement-dialog.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import { useState } from 'react'; -import { FormattedMessage, useIntl } from 'react-intl'; -import { InfoDialog } from '@commercetools-frontend/application-components'; -import mcRecolouringAnnouncementSVG from '@commercetools-frontend/assets/images/mc-recolouring-announcement.svg'; -import Spacings from '@commercetools-uikit/spacings'; -import Text from '@commercetools-uikit/text'; -import { STORAGE_KEYS } from '../../constants'; -import messages from './messages'; - -const NewColoursSchemaAnnouncementDialog = () => { - const intl = useIntl(); - - const [ - hasUserSeenRecolouringNotificationDialog, - setHasUserSeenRecolouringNotificationDialog, - ] = useState( - window.localStorage.getItem( - STORAGE_KEYS.IS_RECOLOURING_NOTIFICATION_CLOSED - ) === 'true' - ); - - const handleCloseDialog = () => { - window.localStorage.setItem( - STORAGE_KEYS.IS_RECOLOURING_NOTIFICATION_CLOSED, - 'true' - ); - setHasUserSeenRecolouringNotificationDialog(true); - }; - - return !hasUserSeenRecolouringNotificationDialog ? ( - - - merchant center redesign announcement - - - - - - ) : null; -}; - -export default NewColoursSchemaAnnouncementDialog; diff --git a/packages/application-shell/src/components/theme-switcher/theme-switcher.tsx b/packages/application-shell/src/components/theme-switcher/theme-switcher.tsx index f98860e05b..7be4d3b071 100644 --- a/packages/application-shell/src/components/theme-switcher/theme-switcher.tsx +++ b/packages/application-shell/src/components/theme-switcher/theme-switcher.tsx @@ -1,17 +1,11 @@ -import { lazy } from 'react'; import { themesOverrides } from '@commercetools-frontend/application-components'; import { ThemeProvider } from '@commercetools-uikit/design-system'; -const NewColoursSchemaAnnouncementDialog = lazy( - () => import('./new-colors-schema-announcement-dialog') -); - const ThemeSwitcher = () => { const theme = 'default'; return ( <> - ); }; diff --git a/packages/application-shell/src/constants.ts b/packages/application-shell/src/constants.ts index ed8e1cc830..990f550f81 100644 --- a/packages/application-shell/src/constants.ts +++ b/packages/application-shell/src/constants.ts @@ -2,10 +2,6 @@ export const DIMENSIONS = { header: '56px', } as const; -export const STORAGE_KEYS = { - IS_RECOLOURING_NOTIFICATION_CLOSED: 'isRecolouringNotificationClosed', -} as const; - export const NAVBAR = { expanderHeight: '50px', expanderSize: '40px', diff --git a/packages/assets/images/mc-recolouring-announcement.svg b/packages/assets/images/mc-recolouring-announcement.svg deleted file mode 100644 index 542cb549f9..0000000000 --- a/packages/assets/images/mc-recolouring-announcement.svg +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/cypress/src/add-commands/login.ts b/packages/cypress/src/add-commands/login.ts index 10cce0bd38..d693f2cd09 100644 --- a/packages/cypress/src/add-commands/login.ts +++ b/packages/cypress/src/add-commands/login.ts @@ -279,13 +279,6 @@ function loginByOidc( STORAGE_KEYS.SESSION_SCOPE, sessionScope ); - // To hide the dialog for the rebranding colors. - // TODO: remove once the dialog has been removed from App Kit. - win.localStorage.setItem( - 'isRecolouringNotificationClosed', - String(true) - ); - if (commandOptions.onBeforeLoad) { commandOptions.onBeforeLoad(win); } diff --git a/packages/i18n/data/core.json b/packages/i18n/data/core.json index cbed7d2ec8..35dd31caa4 100644 --- a/packages/i18n/data/core.json +++ b/packages/i18n/data/core.json @@ -207,12 +207,6 @@ "NavBar.MCSupport.title": { "string": "Support" }, - "NewColoursSchemaAnnouncementDialog.content": { - "string": "From the new colors to an updated navigation, we've made a few changes to improve your experience within Merchant Center. You will also find that we are taking steps to ensure a consistent look and feel across all of our user tooling, from the Merchant Center to the Frontend Studio. Check out the updates!" - }, - "NewColoursSchemaAnnouncementDialog.title": { - "string": "We've refreshed our Merchant Center!" - }, "Notification.hideNotification": { "developer_comment": "Label for button to hide notification", "string": "Hide notification"