{ translate( 'Want more help? We have a full {{link}}guide to resetting your password{{/link}}.', - { components: { link: } } + { components: { link: } } ) }
diff --git a/client/account-recovery/reset-password/transaction-id-form/index.jsx b/client/account-recovery/reset-password/transaction-id-form/index.jsx index 093c5c1110dd3..24579db833315 100644 --- a/client/account-recovery/reset-password/transaction-id-form/index.jsx +++ b/client/account-recovery/reset-password/transaction-id-form/index.jsx @@ -11,7 +11,7 @@ import { identity } from 'lodash'; /** * Internal dependencies */ -import support from 'lib/url/support'; +import { ACCOUNT_RECOVERY } from 'lib/url/support'; import Card from 'components/card'; import Button from 'components/button'; import FormLabel from 'components/forms/form-label'; @@ -52,7 +52,7 @@ export class TransactionIdFormComponent extends Component { { components: { strong: , - helpLink: , + helpLink: , }, } ) } @@ -66,7 +66,7 @@ export class TransactionIdFormComponent extends Component { '{{helpLink}}Need help to find your transaction id?{{/helpLink}}', { components: { - helpLink: , + helpLink: , }, } ) } diff --git a/client/blocks/credit-card-form/index.jsx b/client/blocks/credit-card-form/index.jsx index f96b3255c15ba..12f122179d727 100644 --- a/client/blocks/credit-card-form/index.jsx +++ b/client/blocks/credit-card-form/index.jsx @@ -22,7 +22,7 @@ import notices from 'notices'; import { validateCardDetails } from 'lib/credit-card-details'; import ValidationErrorList from 'notices/validation-error-list'; import wpcomFactory from 'lib/wp'; -import support from 'lib/url/support'; +import { AUTO_RENEWAL, MANAGE_PURCHASES } from 'lib/url/support'; const wpcom = wpcomFactory.undocumented(); @@ -289,14 +289,10 @@ const CreditCardForm = createReactClass( { ), autoRenewalSupportPage: ( - + ), managePurchasesSupportPage: ( - + ), }, } diff --git a/client/components/domains/transfer-domain-step/index.jsx b/client/components/domains/transfer-domain-step/index.jsx index 7ccd6bea8beec..d5dc4e8760531 100644 --- a/client/components/domains/transfer-domain-step/index.jsx +++ b/client/components/domains/transfer-domain-step/index.jsx @@ -26,7 +26,7 @@ import { composeAnalytics, recordGoogleEvent, recordTracksEvent } from 'state/an import { getSelectedSite } from 'state/ui/selectors'; import FormTextInputWithAffixes from 'components/forms/form-text-input-with-affixes'; import TransferDomainPrecheck from './transfer-domain-precheck'; -import support from 'lib/url/support'; +import { INCOMING_DOMAIN_TRANSFER, MAP_EXISTING_DOMAIN } from 'lib/url/support'; import HeaderCake from 'components/header-cake'; import Button from 'components/button'; @@ -132,7 +132,7 @@ class TransferDomainStep extends React.Component { components: { a: ( @@ -179,7 +179,7 @@ class TransferDomainStep extends React.Component { ) } diff --git a/client/components/domains/transfer-domain-step/transfer-domain-precheck.jsx b/client/components/domains/transfer-domain-step/transfer-domain-precheck.jsx index dd453c90859cf..716ac0350cc1d 100644 --- a/client/components/domains/transfer-domain-step/transfer-domain-precheck.jsx +++ b/client/components/domains/transfer-domain-step/transfer-domain-precheck.jsx @@ -20,7 +20,12 @@ import Notice from 'components/notice'; import { recordTracksEvent } from 'state/analytics/actions'; import FormattedHeader from 'components/formatted-header'; import { checkInboundTransferStatus } from 'lib/domains'; -import support from 'lib/url/support'; +import { + CALYPSO_CONTACT, + INCOMING_DOMAIN_TRANSFER_PREPARE_AUTH_CODE, + INCOMING_DOMAIN_TRANSFER_PREPARE_PRIVACY, + INCOMING_DOMAIN_TRANSFER_PREPARE_UNLOCK, +} from 'lib/url/support'; import TransferRestrictionMessage from 'components/domains/transfer-domain-step/transfer-restriction-message'; class TransferDomainPrecheck extends React.PureComponent { @@ -197,7 +202,7 @@ class TransferDomainPrecheck extends React.PureComponent { br:{ translate( 'You will have to {{link}}set up your plan manually{{/link}}.', { components: { - link: , + link: , }, } ) }
diff --git a/client/my-sites/checkout/checkout/checkout.jsx b/client/my-sites/checkout/checkout/checkout.jsx index 35bff8d25e409..043618d1723ab 100644 --- a/client/my-sites/checkout/checkout/checkout.jsx +++ b/client/my-sites/checkout/checkout/checkout.jsx @@ -22,7 +22,11 @@ import { cartItems } from 'lib/cart-values'; import { clearSitePlans } from 'state/sites/plans/actions'; import { clearPurchases } from 'state/purchases/actions'; import DomainDetailsForm from './domain-details-form'; -import { domainMapping } from 'lib/cart-values/cart-items'; +import { + domainMapping, + planItem as getCartItemForPlan, + themeItem, +} from 'lib/cart-values/cart-items'; import { fetchReceiptCompleted } from 'state/receipts/actions'; import { getExitCheckoutUrl } from 'lib/checkout'; import { hasDomainDetails } from 'lib/store-transactions'; @@ -36,22 +40,24 @@ import QueryStoredCards from 'components/data/query-stored-cards'; import QueryGeo from 'components/data/query-geo'; import SecurePaymentForm from './secure-payment-form'; import SecurePaymentFormPlaceholder from './secure-payment-form-placeholder'; -import supportPaths from 'lib/url/support'; -import { themeItem } from 'lib/cart-values/cart-items'; +import { AUTO_RENEWAL } from 'lib/url/support'; import { RECEIVED_WPCOM_RESPONSE, SUBMITTING_WPCOM_REQUEST, } from 'lib/store-transactions/step-types'; import upgradesActions from 'lib/upgrades/actions'; -import { getContactDetailsCache, isEligibleForCheckoutToChecklist } from 'state/selectors'; +import { + getContactDetailsCache, + getCurrentUserPaymentMethods, + isDomainOnlySite, + isEligibleForCheckoutToChecklist, +} from 'state/selectors'; import { getStoredCards } from 'state/stored-cards/selectors'; import { isValidFeatureKey, getUpgradePlanSlugFromPath } from 'lib/plans'; -import { planItem as getCartItemForPlan } from 'lib/cart-values/cart-items'; import { recordViewCheckout } from 'lib/analytics/ad-tracking'; import { recordApplePayStatus } from 'lib/apple-pay'; import { requestSite } from 'state/sites/actions'; import { isNewSite } from 'state/sites/selectors'; -import { isDomainOnlySite, getCurrentUserPaymentMethods } from 'state/selectors'; import { getSelectedSite, getSelectedSiteId, getSelectedSiteSlug } from 'state/ui/selectors'; import { getCurrentUserCountryCode } from 'state/current-user/selectors'; import { canAddGoogleApps } from 'lib/domains'; @@ -380,9 +386,7 @@ const Checkout = createReactClass( { productName: renewalItem.product_name, }, components: { - a: ( - - ), + a: , }, } ), diff --git a/client/my-sites/checkout/checkout/domain-details-form.jsx b/client/my-sites/checkout/checkout/domain-details-form.jsx index ab98140f3a21b..6684b1e6bc4bf 100644 --- a/client/my-sites/checkout/checkout/domain-details-form.jsx +++ b/client/my-sites/checkout/checkout/domain-details-form.jsx @@ -59,7 +59,7 @@ import GAppsFieldset from 'my-sites/domains/components/domain-form-fieldsets/g-a import RegionAddressFieldsets from 'my-sites/domains/components/domain-form-fieldsets/region-address-fieldsets'; import NoticeErrorMessage from 'my-sites/checkout/checkout/notice-error-message'; import notices from 'notices'; -import support from 'lib/url/support'; +import { CALYPSO_CONTACT } from 'lib/url/support'; const debug = debugFactory( 'calypso:my-sites:upgrades:checkout:domain-details' ); const wpcom = wp.undocumented(); @@ -482,7 +482,7 @@ export class DomainDetailsForm extends PureComponent { 'Please try again or {{contactSupportLink}}contact support{{/contactSupportLink}}.', { components: { - contactSupportLink: , + contactSupportLink: , firstErrorName:{ translate( 'Sending request…' ) }
} { domainStateMessage &&{ domainStateMessage }
} { this.renderBody( domain ) } - + { translate( 'Learn More.' ) }