diff --git a/client/blocks/eligibility-warnings/warning-list.tsx b/client/blocks/eligibility-warnings/warning-list.tsx index 0c4a73086fe41e..2fd89369a4a467 100644 --- a/client/blocks/eligibility-warnings/warning-list.tsx +++ b/client/blocks/eligibility-warnings/warning-list.tsx @@ -1,8 +1,7 @@ -import { Card } from '@automattic/components'; +import { Card, Badge } from '@automattic/components'; import { localize, LocalizeProps, translate } from 'i18n-calypso'; import { Fragment } from 'react'; import ActionPanelLink from 'calypso/components/action-panel/link'; -import Badge from 'calypso/components/badge'; import ExternalLink from 'calypso/components/external-link'; import type { DomainNames, EligibilityWarning } from 'calypso/state/automated-transfer/selectors'; diff --git a/client/blocks/importer/components/domain-info/index.tsx b/client/blocks/importer/components/domain-info/index.tsx index d0fb30b41fd7fb..8fb8f5d6fc86d0 100644 --- a/client/blocks/importer/components/domain-info/index.tsx +++ b/client/blocks/importer/components/domain-info/index.tsx @@ -1,7 +1,7 @@ /* eslint-disable wpcalypso/jsx-classname-namespace */ +import { Badge } from '@automattic/components'; import { __ } from '@wordpress/i18n'; -import Badge from 'calypso/components/badge'; import './style.scss'; interface Props { diff --git a/client/components/advanced-credentials/host-selection/index.tsx b/client/components/advanced-credentials/host-selection/index.tsx index 58a7ebcc95ce7b..95861825403668 100644 --- a/client/components/advanced-credentials/host-selection/index.tsx +++ b/client/components/advanced-credentials/host-selection/index.tsx @@ -1,9 +1,8 @@ -import { Gridicon } from '@automattic/components'; +import { Gridicon, Badge } from '@automattic/components'; import { useMobileBreakpoint } from '@automattic/viewport-react'; import { useQuery } from '@tanstack/react-query'; import { useTranslate } from 'i18n-calypso'; import { FunctionComponent, useMemo } from 'react'; -import Badge from 'calypso/components/badge'; import { settingsPath } from 'calypso/lib/jetpack/paths'; import wpcom from 'calypso/lib/wp'; import { useDispatch, useSelector } from 'calypso/state'; diff --git a/client/components/domains/connect-domain-step/index.jsx b/client/components/domains/connect-domain-step/index.jsx index 32145001b06f26..eb72d563277c0d 100644 --- a/client/components/domains/connect-domain-step/index.jsx +++ b/client/components/domains/connect-domain-step/index.jsx @@ -1,4 +1,4 @@ -import { Gridicon } from '@automattic/components'; +import { Badge, Gridicon } from '@automattic/components'; import { BackButton } from '@automattic/onboarding'; import { sprintf } from '@wordpress/i18n'; import { useI18n } from '@wordpress/react-i18n'; @@ -6,7 +6,6 @@ import page from 'page'; import PropTypes from 'prop-types'; import { useState, useEffect, useRef, useCallback } from 'react'; import { connect, useDispatch } from 'react-redux'; -import Badge from 'calypso/components/badge'; import ConnectDomainStepSupportInfoLink from 'calypso/components/domains/connect-domain-step/connect-domain-step-support-info-link'; import DomainTransferRecommendation from 'calypso/components/domains/domain-transfer-recommendation'; import TwoColumnsLayout from 'calypso/components/domains/layout/two-columns-layout'; diff --git a/client/components/domains/domain-registration-suggestion/index.jsx b/client/components/domains/domain-registration-suggestion/index.jsx index cd94bcf2bb2b2b..56d92005c65f55 100644 --- a/client/components/domains/domain-registration-suggestion/index.jsx +++ b/client/components/domains/domain-registration-suggestion/index.jsx @@ -1,4 +1,4 @@ -import { Gridicon } from '@automattic/components'; +import { Badge, Gridicon } from '@automattic/components'; import formatCurrency from '@automattic/format-currency'; import { localizeUrl } from '@automattic/i18n-utils'; import classNames from 'classnames'; @@ -7,7 +7,6 @@ import { get, includes } from 'lodash'; import PropTypes from 'prop-types'; import { Component } from 'react'; import { connect } from 'react-redux'; -import Badge from 'calypso/components/badge'; import { parseMatchReasons, VALID_MATCH_REASONS, diff --git a/client/components/domains/domain-registration-suggestion/premium-badge/index.jsx b/client/components/domains/domain-registration-suggestion/premium-badge/index.jsx index ae9200b62b7184..a98c99e02503f9 100644 --- a/client/components/domains/domain-registration-suggestion/premium-badge/index.jsx +++ b/client/components/domains/domain-registration-suggestion/premium-badge/index.jsx @@ -1,7 +1,7 @@ +import { Badge } from '@automattic/components'; import classNames from 'classnames'; import { localize } from 'i18n-calypso'; import { Component } from 'react'; -import Badge from 'calypso/components/badge'; import InfoPopover from 'calypso/components/info-popover'; import './style.scss'; diff --git a/client/components/domains/domain-transfer-recommendation/index.jsx b/client/components/domains/domain-transfer-recommendation/index.jsx index 6a168dfaad56c6..0e495c5c08bc57 100644 --- a/client/components/domains/domain-transfer-recommendation/index.jsx +++ b/client/components/domains/domain-transfer-recommendation/index.jsx @@ -1,7 +1,6 @@ -import { Button, Card } from '@automattic/components'; +import { Badge, Button, Card } from '@automattic/components'; import { localizeUrl } from '@automattic/i18n-utils'; import { __ } from '@wordpress/i18n'; -import Badge from 'calypso/components/badge'; import CardHeading from 'calypso/components/card-heading'; import { INCOMING_DOMAIN_TRANSFER } from 'calypso/lib/url/support'; diff --git a/client/components/domains/use-my-domain/transfer-or-connect/option-content.jsx b/client/components/domains/use-my-domain/transfer-or-connect/option-content.jsx index df8a2ae3b0905b..683fadb771713e 100644 --- a/client/components/domains/use-my-domain/transfer-or-connect/option-content.jsx +++ b/client/components/domains/use-my-domain/transfer-or-connect/option-content.jsx @@ -1,9 +1,8 @@ -import { Button, Gridicon } from '@automattic/components'; +import { Badge, Button, Gridicon } from '@automattic/components'; import { useLocalizeUrl } from '@automattic/i18n-utils'; import { __ } from '@wordpress/i18n'; import classNames from 'classnames'; import PropTypes from 'prop-types'; -import Badge from 'calypso/components/badge'; import '../style.scss'; diff --git a/client/components/gsuite/gsuite-price/index.jsx b/client/components/gsuite/gsuite-price/index.jsx index 8a99b512c5f8ba..44b85b3bcfeccc 100644 --- a/client/components/gsuite/gsuite-price/index.jsx +++ b/client/components/gsuite/gsuite-price/index.jsx @@ -1,7 +1,7 @@ +import { Badge } from '@automattic/components'; import classNames from 'classnames'; import { useTranslate } from 'i18n-calypso'; import PropTypes from 'prop-types'; -import Badge from 'calypso/components/badge'; import { getAnnualPrice, getMonthlyPrice } from 'calypso/lib/gsuite'; import './style.scss'; diff --git a/client/components/jetpack/backup-badge/index.jsx b/client/components/jetpack/backup-badge/index.jsx index bc7c8e187fbe2b..f40c58e8635dd9 100644 --- a/client/components/jetpack/backup-badge/index.jsx +++ b/client/components/jetpack/backup-badge/index.jsx @@ -1,7 +1,6 @@ -import { ScreenReaderText } from '@automattic/components'; +import { Badge, ScreenReaderText } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; import moment from 'moment'; -import Badge from 'calypso/components/badge'; import { getBackupWarnings } from 'calypso/lib/jetpack/backup-utils'; import { useLatestBackupAttempt } from 'calypso/my-sites/backup/status/hooks'; diff --git a/client/components/jetpack/backup-card/index.tsx b/client/components/jetpack/backup-card/index.tsx index cae35d9322a846..434189d5bfb1c9 100644 --- a/client/components/jetpack/backup-card/index.tsx +++ b/client/components/jetpack/backup-card/index.tsx @@ -1,11 +1,10 @@ -import { Button, Card } from '@automattic/components'; +import { Badge, Button, Card } from '@automattic/components'; import classNames from 'classnames'; import { useTranslate } from 'i18n-calypso'; import { useRef, FunctionComponent, useState, useCallback } from 'react'; import ActivityActor, { SIZE_S } from 'calypso/components/activity-card/activity-actor'; import ActivityDescription from 'calypso/components/activity-card/activity-description'; import ActivityMedia from 'calypso/components/activity-card/activity-media'; -import Badge from 'calypso/components/badge'; import cloudIcon from 'calypso/components/jetpack/daily-backup-status/status-card/icons/cloud-success.svg'; import useGetDisplayDate from 'calypso/components/jetpack/daily-backup-status/use-get-display-date'; import { useLocalizedMoment } from 'calypso/components/localized-moment'; diff --git a/client/components/jetpack/scan-badge/index.tsx b/client/components/jetpack/scan-badge/index.tsx index 41239c2ca43ee4..a55b4af08babb3 100644 --- a/client/components/jetpack/scan-badge/index.tsx +++ b/client/components/jetpack/scan-badge/index.tsx @@ -1,7 +1,6 @@ -import { ScreenReaderText } from '@automattic/components'; +import { Badge, ScreenReaderText } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; import { FunctionComponent } from 'react'; -import Badge from 'calypso/components/badge'; import './style.scss'; interface Props { diff --git a/client/components/jetpack/threat-item-subheader/index.tsx b/client/components/jetpack/threat-item-subheader/index.tsx index ff769227bcab20..d499e006a3ec93 100644 --- a/client/components/jetpack/threat-item-subheader/index.tsx +++ b/client/components/jetpack/threat-item-subheader/index.tsx @@ -1,8 +1,8 @@ +import { Badge } from '@automattic/components'; import classnames from 'classnames'; import { useTranslate } from 'i18n-calypso'; import moment from 'moment'; import * as React from 'react'; -import Badge from 'calypso/components/badge'; import { Threat } from 'calypso/components/jetpack/threat-item/types'; import { getThreatPayloadSubtitle, diff --git a/client/components/promo-section/promo-card/index.tsx b/client/components/promo-section/promo-card/index.tsx index 33f400b5c68ee6..405475beaf8b4e 100644 --- a/client/components/promo-section/promo-card/index.tsx +++ b/client/components/promo-section/promo-card/index.tsx @@ -1,4 +1,4 @@ -import { Gridicon } from '@automattic/components'; +import { Badge, Gridicon } from '@automattic/components'; import classNames from 'classnames'; import { TranslateResult } from 'i18n-calypso'; import { Children, cloneElement, FunctionComponent, isValidElement } from 'react'; @@ -6,7 +6,6 @@ import ActionPanel from 'calypso/components/action-panel'; import ActionPanelBody from 'calypso/components/action-panel/body'; import ActionPanelFigure from 'calypso/components/action-panel/figure'; import ActionPanelTitle from 'calypso/components/action-panel/title'; -import Badge from 'calypso/components/badge'; import PromoCardCta from './cta'; import type { ReactElement } from 'react'; diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/contact-list/item.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/contact-list/item.tsx index 79812ed6c94ce7..a15650e8136be8 100644 --- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/contact-list/item.tsx +++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/contact-list/item.tsx @@ -1,8 +1,7 @@ -import { Card, Button } from '@automattic/components'; +import { Badge, Card, Button } from '@automattic/components'; import { Icon, moreHorizontal } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; import { useState, useRef, useContext, useCallback } from 'react'; -import Badge from 'calypso/components/badge'; import PopoverMenu from 'calypso/components/popover-menu'; import PopoverMenuItem from 'calypso/components/popover-menu/item'; import DashboardDataContext from '../../sites-overview/dashboard-data-context'; diff --git a/client/jetpack-cloud/sections/partner-portal/invoices-list-card/index.tsx b/client/jetpack-cloud/sections/partner-portal/invoices-list-card/index.tsx index 3b4b7cdc096360..deba6458d1f69e 100644 --- a/client/jetpack-cloud/sections/partner-portal/invoices-list-card/index.tsx +++ b/client/jetpack-cloud/sections/partner-portal/invoices-list-card/index.tsx @@ -1,8 +1,7 @@ -import { Button, Gridicon } from '@automattic/components'; +import { Badge, Button, Gridicon } from '@automattic/components'; import formatCurrency from '@automattic/format-currency'; import { useTranslate } from 'i18n-calypso'; import { memo, useCallback } from 'react'; -import Badge from 'calypso/components/badge'; import FormattedDate from 'calypso/components/formatted-date'; import { useLocalizedMoment } from 'calypso/components/localized-moment'; import InvoicesListRow from 'calypso/jetpack-cloud/sections/partner-portal/invoices-list-row'; diff --git a/client/jetpack-cloud/sections/partner-portal/license-preview/index.tsx b/client/jetpack-cloud/sections/partner-portal/license-preview/index.tsx index a372411b3fe34c..c98107e8bb7a52 100644 --- a/client/jetpack-cloud/sections/partner-portal/license-preview/index.tsx +++ b/client/jetpack-cloud/sections/partner-portal/license-preview/index.tsx @@ -1,11 +1,10 @@ import { getUrlParts } from '@automattic/calypso-url'; -import { Button, Gridicon } from '@automattic/components'; +import { Badge, Button, Gridicon } from '@automattic/components'; import { getQueryArg, removeQueryArgs } from '@wordpress/url'; import classnames from 'classnames'; import { useTranslate } from 'i18n-calypso'; import page from 'page'; import { useCallback, useEffect, useState } from 'react'; -import Badge from 'calypso/components/badge'; import FormattedDate from 'calypso/components/formatted-date'; import LicenseDetails from 'calypso/jetpack-cloud/sections/partner-portal/license-details'; import LicenseListItem from 'calypso/jetpack-cloud/sections/partner-portal/license-list-item'; diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/launchpad/sidebar.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/launchpad/sidebar.tsx index 584feb58904340..3760f3cc47249d 100644 --- a/client/landing/stepper/declarative-flow/internals/steps-repository/launchpad/sidebar.tsx +++ b/client/landing/stepper/declarative-flow/internals/steps-repository/launchpad/sidebar.tsx @@ -1,5 +1,5 @@ import { PLAN_PERSONAL, PLAN_PREMIUM } from '@automattic/calypso-products'; -import { Gridicon, CircularProgressBar } from '@automattic/components'; +import { Badge, Gridicon, CircularProgressBar } from '@automattic/components'; import { OnboardSelect, useLaunchpad } from '@automattic/data-stores'; import { Launchpad } from '@automattic/launchpad'; import { isBlogOnboardingFlow } from '@automattic/onboarding'; @@ -7,7 +7,6 @@ import { useSelect } from '@wordpress/data'; import { useRef, useState } from '@wordpress/element'; import { Icon, copy } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; -import Badge from 'calypso/components/badge'; import ClipboardButton from 'calypso/components/forms/clipboard-button'; import Tooltip from 'calypso/components/tooltip'; import { NavigationControls } from 'calypso/landing/stepper/declarative-flow/internals/types'; diff --git a/client/layout/sidebar/item.jsx b/client/layout/sidebar/item.jsx index b118e7788f7459..e0727ffa124404 100644 --- a/client/layout/sidebar/item.jsx +++ b/client/layout/sidebar/item.jsx @@ -1,9 +1,8 @@ -import { Gridicon } from '@automattic/components'; +import { Badge, Gridicon } from '@automattic/components'; import classnames from 'classnames'; import PropTypes from 'prop-types'; import { useEffect } from 'react'; import { useSelector } from 'react-redux'; -import Badge from 'calypso/components/badge'; import Count from 'calypso/components/count'; import MaterialIcon from 'calypso/components/material-icon'; import TranslatableString from 'calypso/components/translatable/proptype'; diff --git a/client/me/purchases/manage-purchase/index.tsx b/client/me/purchases/manage-purchase/index.tsx index 5049c70ffc539c..be36018e7b0995 100644 --- a/client/me/purchases/manage-purchase/index.tsx +++ b/client/me/purchases/manage-purchase/index.tsx @@ -37,7 +37,15 @@ import { AKISMET_UPGRADES_PRODUCTS_MAP, JETPACK_STARTER_UPGRADE_MAP, } from '@automattic/calypso-products'; -import { Spinner, Button, Card, CompactCard, ProductIcon, Gridicon } from '@automattic/components'; +import { + Badge, + Spinner, + Button, + Card, + CompactCard, + ProductIcon, + Gridicon, +} from '@automattic/components'; import classNames from 'classnames'; import { localize, LocalizeProps } from 'i18n-calypso'; import page from 'page'; @@ -46,7 +54,6 @@ import { connect } from 'react-redux'; import { SupportedSlugs } from 'calypso/../packages/components/src/product-icon/config'; import googleWorkspaceIcon from 'calypso/assets/images/email-providers/google-workspace/icon.svg'; import AsyncLoad from 'calypso/components/async-load'; -import Badge from 'calypso/components/badge'; import QueryCanonicalTheme from 'calypso/components/data/query-canonical-theme'; import QuerySiteDomains from 'calypso/components/data/query-site-domains'; import QuerySitePurchases from 'calypso/components/data/query-site-purchases'; diff --git a/client/my-sites/add-ons/components/add-ons-card.tsx b/client/my-sites/add-ons/components/add-ons-card.tsx index 45f82432f37b13..3893b33d60a600 100644 --- a/client/my-sites/add-ons/components/add-ons-card.tsx +++ b/client/my-sites/add-ons/components/add-ons-card.tsx @@ -1,10 +1,9 @@ import { PRODUCT_1GB_SPACE } from '@automattic/calypso-products'; -import { Button, Gridicon, Spinner } from '@automattic/components'; +import { Badge, Button, Gridicon, Spinner } from '@automattic/components'; import styled from '@emotion/styled'; import { Card, CardBody, CardFooter, CardHeader } from '@wordpress/components'; import { Icon } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; -import Badge from 'calypso/components/badge'; import type { AddOnMeta } from '../hooks/use-add-ons'; export interface Props { diff --git a/client/my-sites/checkout/upsell-nudge/professional-email-upsell/index.tsx b/client/my-sites/checkout/upsell-nudge/professional-email-upsell/index.tsx index 7cd5cead6d7af4..58eb6de12fff48 100644 --- a/client/my-sites/checkout/upsell-nudge/professional-email-upsell/index.tsx +++ b/client/my-sites/checkout/upsell-nudge/professional-email-upsell/index.tsx @@ -1,5 +1,5 @@ import { TITAN_MAIL_MONTHLY_SLUG, TITAN_MAIL_YEARLY_SLUG } from '@automattic/calypso-products'; -import { Gridicon } from '@automattic/components'; +import { Badge, Gridicon } from '@automattic/components'; import formatCurrency from '@automattic/format-currency'; import { MOBILE_BREAKPOINT } from '@automattic/viewport'; import { useBreakpoint } from '@automattic/viewport-react'; @@ -7,7 +7,6 @@ import classNames from 'classnames'; import i18n, { useTranslate } from 'i18n-calypso'; import { useState } from 'react'; import poweredByTitanLogo from 'calypso/assets/images/email-providers/titan/powered-by-titan-caps.svg'; -import Badge from 'calypso/components/badge'; import PageViewTracker from 'calypso/lib/analytics/page-view-tracker'; import { titanMailMonthly, titanMailYearly } from 'calypso/lib/cart-values/cart-items'; import { BillingIntervalToggle } from 'calypso/my-sites/email/email-providers-comparison/billing-interval-toggle'; diff --git a/client/my-sites/customer-home/cards/tasks/site-setup-list/current-task-item.jsx b/client/my-sites/customer-home/cards/tasks/site-setup-list/current-task-item.jsx index 31f49391e3116f..592f0b7acdf7ba 100644 --- a/client/my-sites/customer-home/cards/tasks/site-setup-list/current-task-item.jsx +++ b/client/my-sites/customer-home/cards/tasks/site-setup-list/current-task-item.jsx @@ -1,7 +1,6 @@ -import { Button, Gridicon } from '@automattic/components'; +import { Badge, Button, Gridicon } from '@automattic/components'; import classnames from 'classnames'; import { translate } from 'i18n-calypso'; -import Badge from 'calypso/components/badge'; const CurrentTaskItem = ( { currentTask, skipTask, startTask, useAccordionLayout } ) => { return ( diff --git a/client/my-sites/customer-home/cards/tasks/task.tsx b/client/my-sites/customer-home/cards/tasks/task.tsx index 0f264366a27464..929fc57cd66af9 100644 --- a/client/my-sites/customer-home/cards/tasks/task.tsx +++ b/client/my-sites/customer-home/cards/tasks/task.tsx @@ -1,11 +1,10 @@ -import { Button, Gridicon, Spinner } from '@automattic/components'; +import { Badge, Button, Gridicon, Spinner } from '@automattic/components'; import { isDesktop } from '@automattic/viewport'; import { useInstanceId } from '@wordpress/compose'; import classnames from 'classnames'; import { useTranslate } from 'i18n-calypso'; import { useEffect, useRef, useState } from 'react'; import { connect } from 'react-redux'; -import Badge from 'calypso/components/badge'; import PopoverMenu from 'calypso/components/popover-menu'; import PopoverMenuItem from 'calypso/components/popover-menu/item'; import useSkipCurrentViewMutation from 'calypso/data/home/use-skip-current-view-mutation'; diff --git a/client/my-sites/domains/domain-management/list/domain-row.jsx b/client/my-sites/domains/domain-management/list/domain-row.jsx index bbe6331b3fb8f4..c3a314303e3bcd 100644 --- a/client/my-sites/domains/domain-management/list/domain-row.jsx +++ b/client/my-sites/domains/domain-management/list/domain-row.jsx @@ -1,4 +1,4 @@ -import { Button, Spinner } from '@automattic/components'; +import { Badge, Button, Spinner } from '@automattic/components'; import { Icon, home, info, redo } from '@wordpress/icons'; import classnames from 'classnames'; import { localize } from 'i18n-calypso'; @@ -7,7 +7,6 @@ import page from 'page'; import PropTypes from 'prop-types'; import { PureComponent } from 'react'; import { connect } from 'react-redux'; -import Badge from 'calypso/components/badge'; import { useMyDomainInputMode } from 'calypso/components/domains/connect-domain-step/constants'; import EllipsisMenu from 'calypso/components/ellipsis-menu'; import FormCheckbox from 'calypso/components/forms/form-checkbox'; diff --git a/client/my-sites/domains/domain-management/list/free-domain-item.jsx b/client/my-sites/domains/domain-management/list/free-domain-item.jsx index b4278b503ec1eb..1b072e0c097614 100644 --- a/client/my-sites/domains/domain-management/list/free-domain-item.jsx +++ b/client/my-sites/domains/domain-management/list/free-domain-item.jsx @@ -1,13 +1,12 @@ /* eslint-disable wpcalypso/jsx-classname-namespace */ -import { Spinner } from '@automattic/components'; +import { Badge, Spinner } from '@automattic/components'; import { createInterpolateElement, useState } from '@wordpress/element'; import { __, sprintf } from '@wordpress/i18n'; import { Icon, edit, home } from '@wordpress/icons'; import PropTypes from 'prop-types'; import { createElement } from 'react'; import SiteAddressChanger from 'calypso/blocks/site-address-changer'; -import Badge from 'calypso/components/badge'; import EllipsisMenu from 'calypso/components/ellipsis-menu'; import PopoverMenuItem from 'calypso/components/popover-menu/item'; diff --git a/client/my-sites/domains/domain-management/settings/settings-header.tsx b/client/my-sites/domains/domain-management/settings/settings-header.tsx index 452c560ee7c749..2d77633f508864 100644 --- a/client/my-sites/domains/domain-management/settings/settings-header.tsx +++ b/client/my-sites/domains/domain-management/settings/settings-header.tsx @@ -1,9 +1,9 @@ +import { Badge } from '@automattic/components'; import { Circle, SVG } from '@wordpress/components'; import { home, Icon, info } from '@wordpress/icons'; import { useI18n } from '@wordpress/react-i18n'; import classnames from 'classnames'; import { useTranslate } from 'i18n-calypso'; -import Badge from 'calypso/components/badge'; import FormattedHeader from 'calypso/components/formatted-header'; import { useCurrentRoute } from 'calypso/components/route'; import { resolveDomainStatus } from 'calypso/lib/domains'; diff --git a/client/my-sites/earn/ads/payments.jsx b/client/my-sites/earn/ads/payments.jsx index 4a0b0cd6356c24..8628e5c26ee002 100644 --- a/client/my-sites/earn/ads/payments.jsx +++ b/client/my-sites/earn/ads/payments.jsx @@ -1,10 +1,9 @@ -import { Card } from '@automattic/components'; +import { Badge, Card } from '@automattic/components'; import classNames from 'classnames'; import { localize } from 'i18n-calypso'; import PropTypes from 'prop-types'; import { Component } from 'react'; import { connect } from 'react-redux'; -import Badge from 'calypso/components/badge'; import QueryWordadsPayments from 'calypso/components/data/query-wordads-payments'; import QueryWordadsSettings from 'calypso/components/data/query-wordads-settings'; import Notice from 'calypso/components/notice'; diff --git a/client/my-sites/earn/memberships/products.jsx b/client/my-sites/earn/memberships/products.jsx index eeb1bfb5002ff8..8eef6a2a5ce703 100644 --- a/client/my-sites/earn/memberships/products.jsx +++ b/client/my-sites/earn/memberships/products.jsx @@ -3,13 +3,12 @@ import { FEATURE_PREMIUM_CONTENT_CONTAINER, FEATURE_RECURRING_PAYMENTS, } from '@automattic/calypso-products'; -import { Button, CompactCard, Gridicon } from '@automattic/components'; +import { Badge, Button, CompactCard, Gridicon } from '@automattic/components'; import formatCurrency from '@automattic/format-currency'; import { localize } from 'i18n-calypso'; import { Component } from 'react'; import { connect } from 'react-redux'; import UpsellNudge from 'calypso/blocks/upsell-nudge'; -import Badge from 'calypso/components/badge'; import QueryMembershipProducts from 'calypso/components/data/query-memberships'; import QueryMembershipsSettings from 'calypso/components/data/query-memberships-settings'; import EllipsisMenu from 'calypso/components/ellipsis-menu'; diff --git a/client/my-sites/email/email-management/home/email-plan-mailboxes-list.jsx b/client/my-sites/email/email-management/home/email-plan-mailboxes-list.jsx index 809e22f7f8ef64..23fb9f674d8b4d 100644 --- a/client/my-sites/email/email-management/home/email-plan-mailboxes-list.jsx +++ b/client/my-sites/email/email-management/home/email-plan-mailboxes-list.jsx @@ -1,8 +1,7 @@ -import { CompactCard, Gridicon } from '@automattic/components'; +import { Badge, CompactCard, Gridicon } from '@automattic/components'; import classNames from 'classnames'; import { useTranslate } from 'i18n-calypso'; import PropTypes from 'prop-types'; -import Badge from 'calypso/components/badge'; import MaterialIcon from 'calypso/components/material-icon'; import SectionHeader from 'calypso/components/section-header'; import { isRecentlyRegistered } from 'calypso/lib/domains/utils'; diff --git a/client/my-sites/email/email-management/home/email-plan/index.jsx b/client/my-sites/email/email-management/home/email-plan/index.jsx index 2b2871b62909e6..edd98de3c10290 100644 --- a/client/my-sites/email/email-management/home/email-plan/index.jsx +++ b/client/my-sites/email/email-management/home/email-plan/index.jsx @@ -1,10 +1,10 @@ import config from '@automattic/calypso-config'; +import { Badge } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; import page from 'page'; import PropTypes from 'prop-types'; import { useDispatch, useSelector } from 'react-redux'; import titleCase from 'to-title-case'; -import Badge from 'calypso/components/badge'; import DocumentHead from 'calypso/components/data/document-head'; import QuerySitePurchases from 'calypso/components/data/query-site-purchases'; import HeaderCake from 'calypso/components/header-cake'; diff --git a/client/my-sites/hosting/github/deployment-card/deployment-status-badge.tsx b/client/my-sites/hosting/github/deployment-card/deployment-status-badge.tsx index 71bda175fa5486..a3ace871e903cb 100644 --- a/client/my-sites/hosting/github/deployment-card/deployment-status-badge.tsx +++ b/client/my-sites/hosting/github/deployment-card/deployment-status-badge.tsx @@ -1,6 +1,6 @@ +import { Badge } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; import { useMemo } from 'react'; -import Badge from 'calypso/components/badge'; import type { BadgeType } from '@automattic/components'; interface DeploymentStatusBadgeProps { diff --git a/client/my-sites/hosting/github/github-card-heading/index.tsx b/client/my-sites/hosting/github/github-card-heading/index.tsx index 228b3c12b928e2..5e3fa436ddb8be 100644 --- a/client/my-sites/hosting/github/github-card-heading/index.tsx +++ b/client/my-sites/hosting/github/github-card-heading/index.tsx @@ -1,5 +1,5 @@ +import { Badge } from '@automattic/components'; import { translate } from 'i18n-calypso'; -import Badge from 'calypso/components/badge'; import CardHeading from 'calypso/components/card-heading'; import SocialLogo from 'calypso/components/social-logo'; import './style.scss'; diff --git a/client/my-sites/marketing/connections/service.jsx b/client/my-sites/marketing/connections/service.jsx index a72c014362ec74..ec7498750e5cb0 100644 --- a/client/my-sites/marketing/connections/service.jsx +++ b/client/my-sites/marketing/connections/service.jsx @@ -1,5 +1,6 @@ import config from '@automattic/calypso-config'; import { FEATURE_SOCIAL_MASTODON_CONNECTION } from '@automattic/calypso-products'; +import { Badge } from '@automattic/components'; import { localizeUrl } from '@automattic/i18n-utils'; import requestExternalAccess from '@automattic/request-external-access'; import classnames from 'classnames'; @@ -8,7 +9,6 @@ import { isEqual, find, some, get } from 'lodash'; import PropTypes from 'prop-types'; import { Component, cloneElement } from 'react'; import { connect } from 'react-redux'; -import Badge from 'calypso/components/badge'; import ExternalLink from 'calypso/components/external-link'; import FoldableCard from 'calypso/components/foldable-card'; import Notice from 'calypso/components/notice'; diff --git a/client/my-sites/migrate/components/import-type-choice/index.jsx b/client/my-sites/migrate/components/import-type-choice/index.jsx index 004e0948ba0281..a6b9a03ba0f75b 100644 --- a/client/my-sites/migrate/components/import-type-choice/index.jsx +++ b/client/my-sites/migrate/components/import-type-choice/index.jsx @@ -1,8 +1,8 @@ +import { Badge } from '@automattic/components'; import classNames from 'classnames'; import { findKey, map } from 'lodash'; import PropTypes from 'prop-types'; import { Component } from 'react'; -import Badge from 'calypso/components/badge'; import FormRadio from 'calypso/components/forms/form-radio'; import './style.scss'; diff --git a/client/my-sites/migrate/components/sites-block/index.jsx b/client/my-sites/migrate/components/sites-block/index.jsx index dfdbbf6680cd07..4051cd3c3d891f 100644 --- a/client/my-sites/migrate/components/sites-block/index.jsx +++ b/client/my-sites/migrate/components/sites-block/index.jsx @@ -1,11 +1,10 @@ import { getUrlParts } from '@automattic/calypso-url'; -import { Gridicon, Spinner } from '@automattic/components'; +import { Badge, Gridicon, Spinner } from '@automattic/components'; import classNames from 'classnames'; import { localize } from 'i18n-calypso'; import PropTypes from 'prop-types'; import { Component } from 'react'; import Site from 'calypso/blocks/site'; -import Badge from 'calypso/components/badge'; import FormLabel from 'calypso/components/forms/form-label'; import FormTextInput from 'calypso/components/forms/form-text-input'; import './style.scss'; diff --git a/client/my-sites/plan-price/index.tsx b/client/my-sites/plan-price/index.tsx index 4e24dcbaf3368e..0a2b76c4e6d146 100644 --- a/client/my-sites/plan-price/index.tsx +++ b/client/my-sites/plan-price/index.tsx @@ -1,8 +1,8 @@ +import { Badge } from '@automattic/components'; import { getCurrencyObject } from '@automattic/format-currency'; import classNames from 'classnames'; import { useTranslate } from 'i18n-calypso'; import { Component, createElement } from 'react'; -import Badge from 'calypso/components/badge'; import './style.scss'; diff --git a/client/my-sites/plugins/plugin-details-header/index.jsx b/client/my-sites/plugins/plugin-details-header/index.jsx index 3f0cea485befde..2ad39fcf06580c 100644 --- a/client/my-sites/plugins/plugin-details-header/index.jsx +++ b/client/my-sites/plugins/plugin-details-header/index.jsx @@ -1,6 +1,6 @@ +import { Badge } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; import { useSelector } from 'react-redux'; -import Badge from 'calypso/components/badge'; import { useLocalizedMoment } from 'calypso/components/localized-moment'; import { formatNumberMetric } from 'calypso/lib/format-number-compact'; import { preventWidows } from 'calypso/lib/formatting'; diff --git a/client/my-sites/plugins/plugins-browser-item/index.jsx b/client/my-sites/plugins/plugins-browser-item/index.jsx index 723b8393ba8e13..ea450707aabe6e 100644 --- a/client/my-sites/plugins/plugins-browser-item/index.jsx +++ b/client/my-sites/plugins/plugins-browser-item/index.jsx @@ -1,12 +1,11 @@ import { WPCOM_FEATURES_INSTALL_PLUGINS } from '@automattic/calypso-products'; -import { Gridicon } from '@automattic/components'; +import { Badge, Gridicon } from '@automattic/components'; import { useLocalizeUrl } from '@automattic/i18n-utils'; import { Icon, info } from '@wordpress/icons'; import classnames from 'classnames'; import { getLocaleSlug, useTranslate } from 'i18n-calypso'; import { useMemo, useCallback, useEffect } from 'react'; import { useSelector } from 'react-redux'; -import Badge from 'calypso/components/badge'; import { recordTracksEvent } from 'calypso/lib/analytics/tracks'; import { getSoftwareSlug } from 'calypso/lib/plugins/utils'; import version_compare from 'calypso/lib/version-compare'; diff --git a/client/my-sites/plugins/plugins-browser-item/preinstalled-premium-plugin-browser-item-pricing.jsx b/client/my-sites/plugins/plugins-browser-item/preinstalled-premium-plugin-browser-item-pricing.jsx index efa25721de0b10..c79d9d6978d49d 100644 --- a/client/my-sites/plugins/plugins-browser-item/preinstalled-premium-plugin-browser-item-pricing.jsx +++ b/client/my-sites/plugins/plugins-browser-item/preinstalled-premium-plugin-browser-item-pricing.jsx @@ -1,7 +1,6 @@ -import { Gridicon } from '@automattic/components'; +import { Badge, Gridicon } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; import { useSelector } from 'react-redux'; -import Badge from 'calypso/components/badge'; import { IntervalLength } from 'calypso/my-sites/marketplace/components/billing-interval-switcher/constants'; import { PluginPrice } from 'calypso/my-sites/plugins/plugin-price'; import { getSelectedSiteId } from 'calypso/state/ui/selectors'; diff --git a/client/my-sites/promote-post-i2/components/campaign-item-details/index.tsx b/client/my-sites/promote-post-i2/components/campaign-item-details/index.tsx index 0d810e9707ba0a..e5ad0844b124b7 100644 --- a/client/my-sites/promote-post-i2/components/campaign-item-details/index.tsx +++ b/client/my-sites/promote-post-i2/components/campaign-item-details/index.tsx @@ -1,6 +1,7 @@ import config from '@automattic/calypso-config'; import './style.scss'; import { + Badge, Button, Dialog, Gridicon, @@ -12,7 +13,6 @@ import { __, sprintf } from '@wordpress/i18n'; import { useTranslate } from 'i18n-calypso'; import moment from 'moment/moment'; import { useState } from 'react'; -import Badge from 'calypso/components/badge'; import Breadcrumb, { Item } from 'calypso/components/breadcrumb'; import InlineSupportLink from 'calypso/components/inline-support-link'; import Main from 'calypso/components/main'; @@ -220,6 +220,7 @@ export default function CampaignItemDetails( props: Props ) { label: __( 'Contact support' ), onClick: async () => { setShowErrorDialog( false ); + // eslint-disable-next-line wpcalypso/i18n-unlocalized-url window.open( 'https://wordpress.com/support/', '_blank' ); }, }, @@ -324,6 +325,7 @@ export default function CampaignItemDetails( props: Props ) { components: { wpcomTos: ( { setShowErrorDialog( false ); + // eslint-disable-next-line wpcalypso/i18n-unlocalized-url window.open( 'https://wordpress.com/support/', '_blank' ); }, }, @@ -316,6 +316,7 @@ export default function CampaignItem( { campaign, expanded, onClickCampaign }: P components: { wpcomTos: (