oh intellij

support-frontend/assets/helpers/page/analyticsAndConsent.ts

@@ -3,13 +3,13 @@
 import type { ConsentState } from '@guardian/libs';
 import { cmp, getCookie, onConsent } from '@guardian/libs';
 import ophan from 'ophan';
+import type { Participations } from 'helpers/abTests/models';
 import type { IsoCountry } from 'helpers/internationalisation/country';
 import type { ReferrerAcquisitionData } from 'helpers/tracking/acquisitions';
 import * as googleTagManager from 'helpers/tracking/googleTagManager';
 import { init as initQuantumMetric } from 'helpers/tracking/quantumMetric';
 import { isPostDeployUser } from 'helpers/user/user';
 import { init as initLogger } from 'helpers/utilities/logger';
-import type { Participations } from '../abTests/models';
 import {
 	setReferrerDataInLocalStorage,
 	trackAbTests,

support-frontend/assets/helpers/page/page.ts

@@ -1,6 +1,7 @@
 // ----- Imports ----- //
 import * as abTest from 'helpers/abTests/abtest';
 import { getAmountsTestVariant } from 'helpers/abTests/abtest';
+import type { Participations } from 'helpers/abTests/models';
 import { Country } from 'helpers/internationalisation/classes/country';
 import { CountryGroup } from 'helpers/internationalisation/classes/countryGroup';
 import type { IsoCountry } from 'helpers/internationalisation/country';
@@ -11,7 +12,6 @@ import {
 	sendConsentToOphan,
 } from 'helpers/page/analyticsAndConsent';
 import { getReferrerAcquisitionData } from 'helpers/tracking/acquisitions';
-import type { Participations } from '../abTests/models';
 import { getSettings } from '../globalsAndSwitches/globals';
 
 function setUpTrackingAndConsents(participations: Participations): void {

support-frontend/assets/helpers/redux/commonState/state.ts

@@ -1,4 +1,5 @@
 import { getFallbackAmounts } from 'helpers/abTests/helpers';
+import type { Participations } from 'helpers/abTests/models';
 import type { SelectedAmountsVariant } from 'helpers/contributions';
 import { getSettings } from 'helpers/globalsAndSwitches/globals';
 import type { Settings } from 'helpers/globalsAndSwitches/settings';
@@ -12,7 +13,6 @@ import type {
 	Campaign,
 	ReferrerAcquisitionData,
 } from 'helpers/tracking/acquisitions';
-import type { Participations } from '../../abTests/models';
 
 export type Internationalisation = {
 	currencyId: IsoCurrency;

support-frontend/assets/helpers/redux/utils/setup.ts

@@ -1,5 +1,6 @@
 import * as abTest from 'helpers/abTests/abtest';
 import { getAmountsTestVariant } from 'helpers/abTests/abtest';
+import type { Participations } from 'helpers/abTests/models';
 import { getSettings } from 'helpers/globalsAndSwitches/globals';
 import type { Settings } from 'helpers/globalsAndSwitches/settings';
 import { Country } from 'helpers/internationalisation/classes/country';
@@ -14,7 +15,6 @@ import {
 	getReferrerAcquisitionData,
 } from 'helpers/tracking/acquisitions';
 import { getAllQueryParamsWithExclusions } from 'helpers/urls/url';
-import type { Participations } from '../../abTests/models';
 import type { SelectedAmountsVariant } from '../../contributions';
 import type { CommonState, Internationalisation } from '../commonState/state';
 

support-frontend/assets/helpers/tracking/acquisitions.ts

@@ -2,6 +2,7 @@
 
 import { viewId } from 'ophan';
 import { testIsActive } from 'helpers/abTests/abtest';
+import { type Participations } from 'helpers/abTests/models';
 import { get as getCookie } from 'helpers/storage/cookie';
 import * as storage from 'helpers/storage/storage';
 import {
@@ -10,7 +11,6 @@ import {
 	getQueryParameter,
 } from 'helpers/urls/url';
 import { deserialiseJsonObject } from 'helpers/utilities/utilities';
-import type { Participations } from '../abTests/models';
 
 // ----- Types ----- //
 

support-frontend/assets/helpers/tracking/quantumMetric.ts

@@ -1,5 +1,6 @@
 import { loadScript } from '@guardian/libs';
 import { viewId } from 'ophan';
+import type { Participations } from 'helpers/abTests/models';
 import type { ContributionType } from 'helpers/contributions';
 import type { PaymentMethod } from 'helpers/forms/paymentMethods';
 import type { IsoCurrency } from 'helpers/internationalisation/currency';
@@ -8,7 +9,6 @@ import type { BillingPeriod } from 'helpers/productPrice/billingPeriods';
 import type { ProductPrice } from 'helpers/productPrice/productPrices';
 import type { SubscriptionProduct } from 'helpers/productPrice/subscriptions';
 import { logException } from 'helpers/utilities/logger';
-import type { Participations } from '../abTests/models';
 import type { ReferrerAcquisitionData } from './acquisitions';
 import {
 	canRunQuantumMetric,

support-frontend/assets/helpers/tracking/trackingOphan.ts

@@ -1,9 +1,9 @@
 // ----- Imports ----- //
 import * as ophan from 'ophan';
 import { testIsActive } from 'helpers/abTests/abtest';
+import type { Participations } from 'helpers/abTests/models';
 import { getLocal, setLocal } from 'helpers/storage/storage';
 import type { ReferrerAcquisitionData } from 'helpers/tracking/acquisitions';
-import type { Participations } from '../abTests/models';
 
 // ----- Types ----- //
 // These are to match Thrift definitions which can be found here:

support-frontend/assets/pages/[countryGroupId]/components/checkoutComponent.tsx

@@ -41,6 +41,7 @@ import { AddressFields } from 'components/subscriptionCheckouts/address/addressF
 import type { PostcodeFinderResult } from 'components/subscriptionCheckouts/address/postcodeLookup';
 import { findAddressesForPostcode } from 'components/subscriptionCheckouts/address/postcodeLookup';
 import { getAmountsTestVariant } from 'helpers/abTests/abtest';
+import type { Participations } from 'helpers/abTests/models';
 import { isContributionsOnlyCountry } from 'helpers/contributions';
 import { simpleFormatAmount } from 'helpers/forms/checkouts';
 import {
@@ -95,7 +96,6 @@ import {
 	PaymentTsAndCs,
 	SummaryTsAndCs,
 } from 'pages/supporter-plus-landing/components/paymentTsAndCs';
-import type { Participations } from '../../../helpers/abTests/models';
 import {
 	formatMachineDate,
 	formatUserDate,

support-frontend/assets/pages/[countryGroupId]/components/oneTimeCheckoutComponent.tsx

@@ -34,6 +34,7 @@ import { SecureTransactionIndicator } from 'components/secureTransactionIndicato
 import Signout from 'components/signout/signout';
 import { StripeCardForm } from 'components/stripeCardForm/stripeCardForm';
 import { getAmountsTestVariant } from 'helpers/abTests/abtest';
+import type { Participations } from 'helpers/abTests/models';
 import { config } from 'helpers/contributions';
 import { simpleFormatAmount } from 'helpers/forms/checkouts';
 import { appropriateErrorMessage } from 'helpers/forms/errorReasons';
@@ -80,7 +81,6 @@ import { FinePrint } from 'pages/supporter-plus-landing/components/finePrint';
 import { GuardianTsAndCs } from 'pages/supporter-plus-landing/components/guardianTsAndCs';
 import { PatronsMessage } from 'pages/supporter-plus-landing/components/patronsMessage';
 import { TsAndCsFooterLinks } from 'pages/supporter-plus-landing/components/paymentTsAndCs';
-import type { Participations } from '../../../helpers/abTests/models';
 import { setThankYouOrder } from '../checkout/helpers/sessionStorage';
 import {
 	doesNotContainExtendedEmojiOrLeadingSpace,

support-frontend/assets/pages/[countryGroupId]/components/thankYouComponent.tsx

@@ -7,6 +7,7 @@ import { Header } from 'components/headers/simpleHeader/simpleHeader';
 import { PageScaffold } from 'components/page/pageScaffold';
 import type { ThankYouModuleType } from 'components/thankYou/thankYouModule';
 import { getThankYouModuleData } from 'components/thankYou/thankYouModuleData';
+import type { Participations } from 'helpers/abTests/models';
 import type { ContributionType } from 'helpers/contributions';
 import type { AppConfig } from 'helpers/globalsAndSwitches/window';
 import { Country } from 'helpers/internationalisation/classes/country';
@@ -34,7 +35,6 @@ import ThankYouFooter from 'pages/supporter-plus-thank-you/components/thankYouFo
 import ThankYouHeader from 'pages/supporter-plus-thank-you/components/thankYouHeader/thankYouHeader';
 import { getGuardianAdLiteDate } from 'pages/weekly-subscription-checkout/helpers/deliveryDays';
 import { ThankYouModules } from '../../../components/thankYou/thankyouModules';
-import type { Participations } from '../../../helpers/abTests/models';
 import {
 	getReturnAddress,
 	getThankYouOrder,

support-frontend/assets/pages/[countryGroupId]/landingPage.tsx

@@ -1,11 +1,11 @@
 import { getAmountsTestVariant } from 'helpers/abTests/abtest';
+import type { Participations } from 'helpers/abTests/models';
 import { Country } from 'helpers/internationalisation/classes/country';
 import type { IsoCountry } from 'helpers/internationalisation/country';
 import { type GeoId, getGeoIdConfig } from 'pages/geoIdConfig';
 import { threeTierCheckoutEnabled } from 'pages/supporter-plus-landing/setup/threeTierChecks';
 import { ContributionsOnlyLanding } from 'pages/supporter-plus-landing/twoStepPages/contributionsOnlyLanding';
 import { ThreeTierLanding } from 'pages/supporter-plus-landing/twoStepPages/threeTierLanding';
-import type { Participations } from '../../helpers/abTests/models';
 
 type Props = {
 	geoId: GeoId;

support-frontend/assets/pages/paper-subscription-landing/paperSubscriptionLandingProps.ts

@@ -1,10 +1,10 @@
+import type { Participations } from 'helpers/abTests/models';
 import {
 	getProductPrices,
 	getPromotionCopy,
 } from 'helpers/globalsAndSwitches/globals';
 import type { ProductPrices } from 'helpers/productPrice/productPrices';
 import type { PromotionCopy } from 'helpers/productPrice/promotions';
-import type { Participations } from '../../helpers/abTests/models';
 
 export type PaperLandingPropTypes = {
 	productPrices: ProductPrices | null | undefined;

support-frontend/assets/pages/subscriptions-landing/components/subscriptionsProduct.tsx

@@ -1,9 +1,9 @@
 import cx from 'classnames';
 import type { ReactNode } from 'react';
 import SubscriptionsProductDescription from 'components/subscriptionsProductDescription/subscriptionsProductDescription';
+import type { Participations } from 'helpers/abTests/models';
 import 'helpers/types/option';
 import type { ProductButton } from 'pages/subscriptions-landing/copy/subscriptionCopy';
-import type { Participations } from '../../../helpers/abTests/models';
 
 type PropTypes = {
 	title: string;

support-frontend/assets/pages/subscriptions-landing/copy/subscriptionCopy.tsx

@@ -4,6 +4,7 @@ import DigitalPackshotHero from 'components/packshots/digital-packshot-hero';
 import GuardianWeeklyPackShotHero from 'components/packshots/guardian-weekly-packshot-hero';
 import PaperPackshot from 'components/packshots/paper-packshot';
 // images
+import type { Participations } from 'helpers/abTests/models';
 import type { CountryGroupId } from 'helpers/internationalisation/countryGroup';
 import { GBPCountries } from 'helpers/internationalisation/countryGroup';
 import { currencies, detect } from 'helpers/internationalisation/currency';
@@ -22,7 +23,6 @@ import {
 	guardianWeeklyLanding,
 	paperSubsUrl,
 } from 'helpers/urls/routes';
-import type { Participations } from '../../../helpers/abTests/models';
 import type { PriceCopy, PricingCopy } from '../subscriptionsLandingProps';
 
 // types

support-frontend/assets/pages/subscriptions-landing/subscriptionsLandingProps.ts

@@ -1,11 +1,11 @@
 // ----- Imports ----- //
+import type { Participations } from 'helpers/abTests/models';
 import { getGlobal } from 'helpers/globalsAndSwitches/globals';
 import { CountryGroup } from 'helpers/internationalisation/classes/countryGroup';
 import type { CountryGroupId } from 'helpers/internationalisation/countryGroup';
 import type { SubscriptionProduct } from 'helpers/productPrice/subscriptions';
 import type { ReferrerAcquisitionData } from 'helpers/tracking/acquisitions';
 import { getReferrerAcquisitionData } from 'helpers/tracking/acquisitions';
-import type { Participations } from '../../helpers/abTests/models';
 
 export type PriceCopy = {
 	price: number;

support-frontend/assets/pages/subscriptions-redemption/api.ts

@@ -1,3 +1,4 @@
+import type { Participations } from 'helpers/abTests/models';
 import { fetchJson } from 'helpers/async/fetch';
 import { appropriateErrorMessage } from 'helpers/forms/errorReasons';
 import { postRegularPaymentRequest } from 'helpers/forms/paymentIntegrations/readerRevenueApis';
@@ -26,7 +27,6 @@ import type { Option } from 'helpers/types/option';
 import { routes } from 'helpers/urls/routes';
 import { getOrigin } from 'helpers/urls/url';
 import type { Stage } from 'pages/subscriptions-redemption/subscriptionsRedemptionReducer';
-import type { Participations } from '../../helpers/abTests/models';
 
 type ValidationResult = {
 	valid: boolean;

support-frontend/assets/pages/supporter-plus-landing/components/threeTierCard.tsx

@@ -13,6 +13,7 @@ import {
 	LinkButton,
 } from '@guardian/source/react-components';
 import { BenefitsCheckList } from 'components/checkoutBenefits/benefitsCheckList';
+import type { Participations } from 'helpers/abTests/models';
 import type { RegularContributionType } from 'helpers/contributions';
 import { simpleFormatAmount } from 'helpers/forms/checkouts';
 import type { CountryGroupId } from 'helpers/internationalisation/countryGroup';
@@ -28,7 +29,6 @@ import {
 } from 'helpers/productCatalog';
 import type { Promotion } from 'helpers/productPrice/promotions';
 import { recurringContributionPeriodMap } from 'helpers/utilities/timePeriods';
-import type { Participations } from '../../../helpers/abTests/models';
 import { ThreeTierLozenge } from './threeTierLozenge';
 
 export type ThreeTierCardProps = {

support-frontend/assets/pages/supporter-plus-landing/components/threeTierCards.tsx

@@ -1,11 +1,11 @@
 import { css } from '@emotion/react';
 import { between, from, space } from '@guardian/source/foundations';
+import type { Participations } from 'helpers/abTests/models';
 import type { RegularContributionType } from 'helpers/contributions';
 import type { CountryGroupId } from 'helpers/internationalisation/countryGroup';
 import type { IsoCurrency } from 'helpers/internationalisation/currency';
 import type { ProductDescription } from 'helpers/productCatalog';
 import type { Promotion } from 'helpers/productPrice/promotions';
-import type { Participations } from '../../../helpers/abTests/models';
 import { ThreeTierCard } from './threeTierCard';
 
 export type ThreeTierCardsProps = {

support-frontend/assets/pages/supporter-plus-landing/setup/threeTierChecks.ts

@@ -1,6 +1,6 @@
+import type { Participations } from 'helpers/abTests/models';
 import type { SelectedAmountsVariant } from 'helpers/contributions';
 import { isContributionsOnlyCountry } from 'helpers/contributions';
-import type { Participations } from '../../../helpers/abTests/models';
 
 export const threeTierCheckoutEnabled = (
 	abParticipations: Participations,

support-frontend/assets/pages/supporter-plus-landing/twoStepPages/threeTierLanding.tsx

@@ -21,6 +21,7 @@ import { Header } from 'components/headers/simpleHeader/simpleHeader';
 import { PageScaffold } from 'components/page/pageScaffold';
 import { PaymentFrequencyButtons } from 'components/paymentFrequencyButtons/paymentFrequencyButtons';
 import { getAmountsTestVariant } from 'helpers/abTests/abtest';
+import type { Participations } from 'helpers/abTests/models';
 import {
 	countdownSwitchOn,
 	getCampaignSettings,
@@ -53,7 +54,6 @@ import type { Promotion } from 'helpers/productPrice/promotions';
 import { getPromotion } from 'helpers/productPrice/promotions';
 import type { GeoId } from 'pages/geoIdConfig';
 import { getGeoIdConfig } from 'pages/geoIdConfig';
-import type { Participations } from '../../../helpers/abTests/models';
 import Countdown from '../components/countdown';
 import { LandingPageBanners } from '../components/landingPageBanners';
 import { OneOffCard } from '../components/oneOffCard';

support-frontend/assets/pages/weekly-subscription-landing/weeklySubscriptionLandingProps.ts

@@ -1,3 +1,4 @@
+import type { Participations } from 'helpers/abTests/models';
 import {
 	getGlobal,
 	getProductPrices,
@@ -9,7 +10,6 @@ import type { IsoCountry } from 'helpers/internationalisation/country';
 import type { CountryGroupId } from 'helpers/internationalisation/countryGroup';
 import type { ProductPrices } from 'helpers/productPrice/productPrices';
 import type { PromotionCopy } from 'helpers/productPrice/promotions';
-import type { Participations } from '../../helpers/abTests/models';
 
 export type WeeklyLandingPropTypes = {
 	countryId: IsoCountry;