diff --git a/packages/webapp/src/mocks/factories/subscription.ts b/packages/webapp/src/mocks/factories/subscription.ts
index 17a514741..ca01ddb67 100644
--- a/packages/webapp/src/mocks/factories/subscription.ts
+++ b/packages/webapp/src/mocks/factories/subscription.ts
@@ -3,6 +3,7 @@ import { MockPayloadGenerator, RelayMockEnvironment } from 'relay-test-utils';
 
 import SubscriptionActivePlanDetailsQuery from '../../modules/subscription/__generated__/subscriptionActivePlanDetailsQuery.graphql';
 import subscriptionPlansAllQueryGraphql from '../../modules/subscription/__generated__/subscriptionPlansAllQuery.graphql';
+import { SUBSCRIPTION_PLANS_ALL_QUERY } from '../../routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.graphql';
 import { STRIPE_SUBSCRIPTION_QUERY } from '../../shared/components/finances/stripe/stripePaymentMethodSelector/stripePaymentMethodSelector.graphql';
 import { SUBSCRIPTION_ACTIVE_PLAN_DETAILS_QUERY } from '../../shared/hooks/finances/useSubscriptionPlanDetails/useSubscriptionPlanDetails.graphql';
 import {
@@ -96,16 +97,21 @@ export const fillSubscriptionScheduleQueryWithPhases = (
 };
 
 export const fillSubscriptionPlansAllQuery = (env: RelayMockEnvironment, data: SubscriptionPlan[] = []) => {
-  env.mock.queueOperationResolver((operation: OperationDescriptor) =>
-    MockPayloadGenerator.generate(operation, {
-      SubscriptionPlanConnection: () => connectionFromArray(data),
-    })
-  );
-  env.mock.queuePendingOperation(subscriptionPlansAllQueryGraphql, {});
+  if (env) {
+    env.mock.queueOperationResolver((operation: OperationDescriptor) =>
+      MockPayloadGenerator.generate(operation, {
+        SubscriptionPlanConnection: () => connectionFromArray(data),
+      })
+    );
+    env.mock.queuePendingOperation(subscriptionPlansAllQueryGraphql, {});
+  }
+
+  return composeMockedListQueryResult(SUBSCRIPTION_PLANS_ALL_QUERY, 'allSubscriptionPlans', 'SubscriptionPlanType', {
+    data,
+  });
 };
 
 // Apollo Mocks
-
 export const fillAllPaymentsMethodsQuery = (data: Partial<Subscription>[]) =>
   composeMockedListQueryResult(STRIPE_SUBSCRIPTION_QUERY, 'allPaymentMethods', 'StripePaymentMethodType', {
     data,
diff --git a/packages/webapp/src/modules/subscription/subscription.queries.ts b/packages/webapp/src/modules/subscription/subscription.queries.ts
index 64bfdabac..55a3af920 100644
--- a/packages/webapp/src/modules/subscription/subscription.queries.ts
+++ b/packages/webapp/src/modules/subscription/subscription.queries.ts
@@ -1,30 +1,5 @@
 import graphql from 'babel-plugin-relay/macro';
 
-graphql`
-  fragment subscriptionPlanItemFragment on SubscriptionPlanType {
-    id
-    pk
-    product {
-      id
-      name
-    }
-    unitAmount
-  }
-`;
-
-graphql`
-  query subscriptionPlansAllQuery {
-    allSubscriptionPlans(first: 100) {
-      edges {
-        node {
-          id
-          ...subscriptionPlanItemFragment
-        }
-      }
-    }
-  }
-`;
-
 graphql`
   query subscriptionActivePlanDetailsQuery {
     activeSubscription {
diff --git a/packages/webapp/src/routes/finances/cancelSubscription/cancelSubscription.graphql.ts b/packages/webapp/src/routes/finances/cancelSubscription/cancelSubscription.graphql.ts
index cd33255ba..b89e9e449 100644
--- a/packages/webapp/src/routes/finances/cancelSubscription/cancelSubscription.graphql.ts
+++ b/packages/webapp/src/routes/finances/cancelSubscription/cancelSubscription.graphql.ts
@@ -11,27 +11,27 @@ export const SUBSCRIPTION_CANCEL_MUTATION = gql(/* GraphQL */ `
   }
 `);
 
-gql(/* GraphQL */ `
-  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {
-    phases {
-      startDate
-      endDate
-      trialEnd
-      item {
-        price {
-          ...subscriptionPlanItemFragment
-        }
-        quantity
-      }
-    }
-    subscription {
-      startDate
-      trialEnd
-      trialStart
-    }
-    canActivateTrial
-    defaultPaymentMethod {
-      ...stripePaymentMethodFragment
-    }
-  }
-`);
+// gql(/* GraphQL */ `
+//   fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {
+//     phases {
+//       startDate
+//       endDate
+//       trialEnd
+//       item {
+//         price {
+//           ...subscriptionPlanItemFragment
+//         }
+//         quantity
+//       }
+//     }
+//     subscription {
+//       startDate
+//       trialEnd
+//       trialStart
+//     }
+//     canActivateTrial
+//     defaultPaymentMethod {
+//       ...stripePaymentMethodFragment
+//     }
+//   }
+// `);
diff --git a/packages/webapp/src/routes/finances/editSubscription/__tests__/editSubscription.component.spec.tsx b/packages/webapp/src/routes/finances/editSubscription/__tests__/editSubscription.component.spec.tsx
index fe40d112b..df4174f9c 100644
--- a/packages/webapp/src/routes/finances/editSubscription/__tests__/editSubscription.component.spec.tsx
+++ b/packages/webapp/src/routes/finances/editSubscription/__tests__/editSubscription.component.spec.tsx
@@ -5,7 +5,11 @@ import { OperationDescriptor } from 'react-relay/hooks';
 import { Route, Routes } from 'react-router-dom';
 import { MockPayloadGenerator, RelayMockEnvironment } from 'relay-test-utils';
 
-import { fillSubscriptionScheduleQuery, subscriptionPlanFactory } from '../../../../mocks/factories';
+import {
+  fillSubscriptionPlansAllQuery,
+  fillSubscriptionScheduleQuery,
+  subscriptionPlanFactory,
+} from '../../../../mocks/factories';
 import { snackbarActions } from '../../../../modules/snackbar';
 import subscriptionPlansAllQueryGraphql from '../../../../modules/subscription/__generated__/subscriptionPlansAllQuery.graphql';
 import { SubscriptionPlanName } from '../../../../shared/services/api/subscription/types';
@@ -92,13 +96,14 @@ describe('EditSubscription: Component', () => {
     it('should show success message and redirect to my subscription page', async () => {
       const relayEnvironment = getRelayEnv();
       const requestMock = fillCurrentSubscriptionQuery(relayEnvironment);
+      const requestPlansMock = fillSubscriptionPlansAllQuery(relayEnvironment, [mockMonthlyPlan]);
       const requestMockMutation = fillChangeSubscriptionMutation();
 
       const routerProps = createMockRouterProps(['home']);
       render(<Component />, {
         relayEnvironment,
         routerProps,
-        apolloMocks: (defaultMock) => defaultMock.concat(requestMock, requestMockMutation),
+        apolloMocks: (defaultMock) => defaultMock.concat(requestMock, requestMockMutation, requestPlansMock),
       });
 
       await userEvent.click(await screen.findByText(/monthly/i));
@@ -123,13 +128,14 @@ describe('EditSubscription: Component', () => {
 
       const requestMock = fillCurrentSubscriptionQuery(relayEnvironment);
       const errorMessage = 'Missing payment method';
+      const requestPlansMock = fillSubscriptionPlansAllQuery(relayEnvironment, [mockMonthlyPlan]);
       const requestMockMutation = fillChangeSubscriptionMutation([new GraphQLError(errorMessage)]);
 
       const routerProps = createMockRouterProps(['home']);
       render(<Component />, {
         relayEnvironment,
         routerProps,
-        apolloMocks: (defaultMock) => defaultMock.concat(requestMock, requestMockMutation),
+        apolloMocks: (defaultMock) => defaultMock.concat(requestMock, requestMockMutation, requestPlansMock),
       });
 
       await userEvent.click(await screen.findByText(/monthly/i));
diff --git a/packages/webapp/src/routes/finances/editSubscription/subscriptionPlanItem/__tests__/subscriptionPlanItem.component.spec.tsx b/packages/webapp/src/routes/finances/editSubscription/subscriptionPlanItem/__tests__/subscriptionPlanItem.component.spec.tsx
index 7a2310d6f..38f954fb0 100644
--- a/packages/webapp/src/routes/finances/editSubscription/subscriptionPlanItem/__tests__/subscriptionPlanItem.component.spec.tsx
+++ b/packages/webapp/src/routes/finances/editSubscription/subscriptionPlanItem/__tests__/subscriptionPlanItem.component.spec.tsx
@@ -1,40 +1,46 @@
+import { useQuery } from '@apollo/client';
 import { screen, waitFor } from '@testing-library/react';
-import { useLazyLoadQuery } from 'react-relay';
-import { MockPayloadGenerator } from 'relay-test-utils';
-import { OperationDescriptor } from 'react-relay/hooks';
 import userEvent from '@testing-library/user-event';
-import { Route, Routes } from 'react-router-dom';
 import { append } from 'ramda';
+import { OperationDescriptor } from 'react-relay/hooks';
+import { Route, Routes } from 'react-router-dom';
+import { MockPayloadGenerator } from 'relay-test-utils';
 
-import { SubscriptionPlanItem, SubscriptionPlanItemProps } from '../subscriptionPlanItem.component';
 import {
+  fillSubscriptionPlansAllQuery,
   fillSubscriptionScheduleQuery,
   subscriptionFactory,
   subscriptionPhaseFactory,
   subscriptionPlanFactory,
 } from '../../../../../mocks/factories';
+import subscriptionPlansAllQueryGraphql from '../../../../../modules/subscription/__generated__/subscriptionPlansAllQuery.graphql';
 import { SubscriptionPlanName } from '../../../../../shared/services/api/subscription/types';
-import { render } from '../../../../../tests/utils/rendering';
-import subscriptionPlansAllQueryGraphql, {
-  subscriptionPlansAllQuery,
-} from '../../../../../modules/subscription/__generated__/subscriptionPlansAllQuery.graphql';
 import { mapConnection } from '../../../../../shared/utils/graphql';
-import { useActiveSubscriptionDetails } from '../../../activeSubscriptionContext/activeSubscriptionContext.hooks';
-import { ActiveSubscriptionContext } from '../../../activeSubscriptionContext/activeSubscriptionContext.component';
-import { getRelayEnv as getBaseRelayEnv } from '../../../../../tests/utils/relay';
 import { connectionFromArray } from '../../../../../tests/utils/fixtures';
+import { getRelayEnv as getBaseRelayEnv } from '../../../../../tests/utils/relay';
+import { render } from '../../../../../tests/utils/rendering';
+import { ActiveSubscriptionContext } from '../../../activeSubscriptionContext/activeSubscriptionContext.component';
+import { useActiveSubscriptionDetails } from '../../../activeSubscriptionContext/activeSubscriptionContext.hooks';
+import { SUBSCRIPTION_PLANS_ALL_QUERY } from '../../subscriptionPlans/subscriptionPlans.graphql';
+import { SubscriptionPlanItem, SubscriptionPlanItemProps } from '../subscriptionPlanItem.component';
 
 describe('SubscriptionPlanItem: Component', () => {
   const defaultProps: Pick<SubscriptionPlanItemProps, 'onSelect'> = { onSelect: () => jest.fn() };
 
   const Component = (props: Partial<SubscriptionPlanItemProps>) => {
-    const data = useLazyLoadQuery<subscriptionPlansAllQuery>(subscriptionPlansAllQueryGraphql, {});
     const { activeSubscription } = useActiveSubscriptionDetails();
+    const { data } = useQuery(SUBSCRIPTION_PLANS_ALL_QUERY);
 
-    const plans = mapConnection((plan) => plan, data.allSubscriptionPlans);
+    const plans = mapConnection((plan) => plan, data?.allSubscriptionPlans);
 
     return (
-      <SubscriptionPlanItem {...defaultProps} plan={plans[0]} activeSubscription={activeSubscription} {...props} />
+      <SubscriptionPlanItem
+        {...defaultProps}
+        plan={plans[0]}
+        activeSubscription={activeSubscription}
+        loading={false}
+        {...props}
+      />
     );
   };
 
@@ -67,41 +73,32 @@ describe('SubscriptionPlanItem: Component', () => {
     return relayEnvironment;
   };
 
-  const freePlan = subscriptionPlanFactory({
-    id: 'plan_free',
-    product: { name: SubscriptionPlanName.FREE },
-  });
-
   const monthlyPlan = subscriptionPlanFactory({
     id: 'plan_monthly',
+    pk: 'price_monthly',
     product: { name: SubscriptionPlanName.MONTHLY },
   });
 
-  const yearlyPlan = subscriptionPlanFactory({ id: 'plan_yearly', product: { name: SubscriptionPlanName.YEARLY } });
-
   const subscriptionWithMonthlyPlan = subscriptionFactory({
     phases: [subscriptionPhaseFactory({ item: { price: monthlyPlan } })],
   });
 
-  const subscriptionMigrationToYearly = subscriptionFactory({
-    phases: [
-      subscriptionPhaseFactory({ item: { price: monthlyPlan } }),
-      subscriptionPhaseFactory({ item: { price: yearlyPlan } }),
-    ],
-  });
-
   it('should render name', async () => {
     const relayEnvironment = getRelayEnv();
-    fillSubscriptionScheduleQuery(relayEnvironment, subscriptionWithMonthlyPlan);
-    render(<Wrapper />, { relayEnvironment });
+    const requestPlansMock = fillSubscriptionPlansAllQuery(relayEnvironment, [monthlyPlan]);
+    render(<Wrapper />, {
+      relayEnvironment,
+      apolloMocks: append(requestPlansMock),
+    });
+
     expect(await screen.findByText(/monthly/i)).toBeInTheDocument();
   });
 
   it('should render plan price', async () => {
     const relayEnvironment = getRelayEnv();
-    fillSubscriptionScheduleQuery(relayEnvironment, subscriptionWithMonthlyPlan);
-    render(<Wrapper />, { relayEnvironment });
-    expect(await screen.findByText(/2\.5 USD/i)).toBeInTheDocument();
+    const requestPlansMock = fillSubscriptionPlansAllQuery(relayEnvironment, [monthlyPlan]);
+    render(<Wrapper />, { relayEnvironment, apolloMocks: append(requestPlansMock) });
+    expect(await screen.findByText(/10 USD/i)).toBeInTheDocument();
   });
 
   describe('button is clicked', () => {
@@ -109,8 +106,11 @@ describe('SubscriptionPlanItem: Component', () => {
       it('should call onSelect', async () => {
         const onSelect = jest.fn();
         const relayEnvironment = getRelayEnv();
-        fillSubscriptionScheduleQuery(relayEnvironment, subscriptionMigrationToYearly);
-        const { waitForApolloMocks } = render(<Wrapper onSelect={onSelect} />, { relayEnvironment });
+        const requestPlansMock = fillSubscriptionPlansAllQuery(relayEnvironment, [monthlyPlan]);
+        const { waitForApolloMocks } = render(<Wrapper onSelect={onSelect} />, {
+          relayEnvironment,
+          apolloMocks: append(requestPlansMock),
+        });
         await waitForApolloMocks();
         await userEvent.click(screen.getByText(/select/i));
         await waitFor(() => {
@@ -124,10 +124,11 @@ describe('SubscriptionPlanItem: Component', () => {
         const onSelect = jest.fn();
         const relayEnvironment = getRelayEnv();
         const requestMock = fillSubscriptionScheduleQuery(relayEnvironment, subscriptionWithMonthlyPlan);
+        const requestPlansMock = fillSubscriptionPlansAllQuery(relayEnvironment, [monthlyPlan]);
 
         const { waitForApolloMocks } = render(<Wrapper onSelect={onSelect} />, {
           relayEnvironment,
-          apolloMocks: append(requestMock),
+          apolloMocks: (defaultMocks) => defaultMocks.concat(requestMock, requestPlansMock),
         });
         await waitForApolloMocks();
 
@@ -140,16 +141,11 @@ describe('SubscriptionPlanItem: Component', () => {
       it('should call onSelect', async () => {
         const onSelect = jest.fn();
         const relayEnvironment = getRelayEnv();
-        fillSubscriptionScheduleQuery(
+        const requestPlansMock = fillSubscriptionPlansAllQuery(relayEnvironment, [monthlyPlan]);
+        const { waitForApolloMocks } = render(<Wrapper onSelect={onSelect} />, {
           relayEnvironment,
-          subscriptionFactory({
-            phases: [
-              subscriptionPhaseFactory({ item: { price: monthlyPlan } }),
-              subscriptionPhaseFactory({ item: { price: freePlan } }),
-            ],
-          })
-        );
-        const { waitForApolloMocks } = render(<Wrapper onSelect={onSelect} />, { relayEnvironment });
+          apolloMocks: append(requestPlansMock),
+        });
         await waitForApolloMocks();
         await userEvent.click(screen.getByText(/select/i));
         expect(onSelect).toHaveBeenCalled();
diff --git a/packages/webapp/src/routes/finances/editSubscription/subscriptionPlanItem/subscriptionPlanItem.component.tsx b/packages/webapp/src/routes/finances/editSubscription/subscriptionPlanItem/subscriptionPlanItem.component.tsx
index 821dcb6e8..661751bea 100644
--- a/packages/webapp/src/routes/finances/editSubscription/subscriptionPlanItem/subscriptionPlanItem.component.tsx
+++ b/packages/webapp/src/routes/finances/editSubscription/subscriptionPlanItem/subscriptionPlanItem.component.tsx
@@ -1,17 +1,15 @@
 import { FormattedMessage } from 'react-intl';
-import { useFragment } from 'react-relay';
 
-import subscriptionPlanItemFragmentGraphql, {
-  subscriptionPlanItemFragment$key,
-} from '../../../../modules/subscription/__generated__/subscriptionPlanItemFragment.graphql';
 import { useActiveSubscriptionDetailsData } from '../../../../shared/hooks/finances/useActiveSubscriptionDetailsData/useActiveSubscriptionDetailsData';
 import { useSubscriptionPlanDetails } from '../../../../shared/hooks/finances/useSubscriptionPlanDetails';
+import { FragmentType, useFragment } from '../../../../shared/services/graphqlApi/__generated/gql';
 import { StripeSubscriptionQueryQuery } from '../../../../shared/services/graphqlApi/__generated/gql/graphql';
+import { SUBSRIPTION_PLAN_ITEM_FRAGMENT } from '../subscriptionPlans/subscriptionPlans.graphql';
 import { Container, Content, Feature, FeaturesList, Name, SelectButton } from './subscriptionPlanItem.styles';
 
 export type SubscriptionPlanItemProps = {
-  plan: subscriptionPlanItemFragment$key;
-  onSelect: (id: string | null) => void;
+  plan: FragmentType<typeof SUBSRIPTION_PLAN_ITEM_FRAGMENT>;
+  onSelect: (id: string | null | undefined) => void;
   className?: string;
   activeSubscription: StripeSubscriptionQueryQuery['activeSubscription'];
   loading: boolean;
@@ -24,13 +22,15 @@ export const SubscriptionPlanItem = ({
   activeSubscription,
   loading,
 }: SubscriptionPlanItemProps) => {
-  const data = useFragment<subscriptionPlanItemFragment$key>(subscriptionPlanItemFragmentGraphql, plan);
+  const data = useFragment(SUBSRIPTION_PLAN_ITEM_FRAGMENT, plan);
   const { name, price, features, isFree } = useSubscriptionPlanDetails(data);
   const { isTrialEligible, activeSubscriptionIsCancelled, activeSubscriptionPlan, nextSubscriptionPlanDetails } =
     useActiveSubscriptionDetailsData(activeSubscription);
   const isActive = activeSubscriptionPlan.name === name && !activeSubscriptionIsCancelled;
   const isScheduledForNextPeriod = nextSubscriptionPlanDetails.name === name;
 
+  const handleSelect = () => onSelect(data.pk);
+
   return (
     <Container isActive={isActive} className={className}>
       <Content>
@@ -51,7 +51,7 @@ export const SubscriptionPlanItem = ({
         </FeaturesList>
       </Content>
 
-      <SelectButton onClick={() => onSelect(data.pk)} disabled={isScheduledForNextPeriod || isFree || loading}>
+      <SelectButton onClick={handleSelect} disabled={isScheduledForNextPeriod || isFree || loading}>
         <FormattedMessage
           defaultMessage="Select ({price} USD)"
           id="Change plan item / Select button"
diff --git a/packages/webapp/src/routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.component.tsx b/packages/webapp/src/routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.component.tsx
index d4108fb46..37656fdcd 100644
--- a/packages/webapp/src/routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.component.tsx
+++ b/packages/webapp/src/routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.component.tsx
@@ -1,35 +1,34 @@
-import { Suspense, useEffect } from 'react';
-import { useQueryLoader } from 'react-relay';
+import { useQuery } from '@apollo/client';
 
-import subscriptionPlansAllQueryGraphql, {
-  subscriptionPlansAllQuery,
-} from '../../../../modules/subscription/__generated__/subscriptionPlansAllQuery.graphql';
+import { mapConnection } from '../../../../shared/utils/graphql';
 import { useActiveSubscriptionDetails } from '../../activeSubscriptionContext/activeSubscriptionContext.hooks';
-import { SubscriptionPlansContent } from './subscriptionPlans.content';
+import { SUBSCRIPTION_PLANS_ALL_QUERY } from './subscriptionPlans.graphql';
+import { PlanItem, Plans } from './subscriptionPlans.styles';
 
 export type SubscriptionPlansProps = {
-  onPlanSelection: (id: string | null) => void;
+  onPlanSelection: (id: string | null | undefined) => void;
   loading: boolean;
 };
 
 export const SubscriptionPlans = ({ onPlanSelection, loading }: SubscriptionPlansProps) => {
-  const [plansQueryRef, loadPlansQuery] = useQueryLoader<subscriptionPlansAllQuery>(subscriptionPlansAllQueryGraphql);
   const { activeSubscription } = useActiveSubscriptionDetails();
 
-  useEffect(() => {
-    loadPlansQuery({});
-  }, [loadPlansQuery]);
-
-  if (!plansQueryRef) return null;
+  const { data } = useQuery(SUBSCRIPTION_PLANS_ALL_QUERY);
 
   return (
-    <Suspense fallback={null}>
-      <SubscriptionPlansContent
-        queryRef={plansQueryRef}
-        onPlanSelection={onPlanSelection}
-        activeSubscription={activeSubscription}
-        loading={loading}
-      />
-    </Suspense>
+    <Plans>
+      {mapConnection(
+        (plan) => (
+          <PlanItem
+            key={plan.id}
+            plan={plan}
+            onSelect={onPlanSelection}
+            activeSubscription={activeSubscription}
+            loading={loading}
+          />
+        ),
+        data?.allSubscriptionPlans
+      )}
+    </Plans>
   );
 };
diff --git a/packages/webapp/src/routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.content.tsx b/packages/webapp/src/routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.content.tsx
deleted file mode 100644
index b4dd46ec1..000000000
--- a/packages/webapp/src/routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.content.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { PreloadedQuery, usePreloadedQuery } from 'react-relay';
-
-import subscriptionPlansAllQueryGraphql, {
-  subscriptionPlansAllQuery,
-} from '../../../../modules/subscription/__generated__/subscriptionPlansAllQuery.graphql';
-import { StripeSubscriptionQueryQuery } from '../../../../shared/services/graphqlApi/__generated/gql/graphql';
-import { mapConnection } from '../../../../shared/utils/graphql';
-import { PlanItem, Plans } from './subscriptionPlans.styles';
-
-export type SubscriptionPlansContentProps = {
-  queryRef: PreloadedQuery<subscriptionPlansAllQuery>;
-  onPlanSelection: (id: string | null) => void;
-  activeSubscription: StripeSubscriptionQueryQuery['activeSubscription'];
-  loading: boolean;
-};
-
-export const SubscriptionPlansContent = ({
-  queryRef,
-  onPlanSelection,
-  activeSubscription,
-  loading,
-}: SubscriptionPlansContentProps) => {
-  const { allSubscriptionPlans } = usePreloadedQuery(subscriptionPlansAllQueryGraphql, queryRef);
-
-  return (
-    <Plans>
-      {mapConnection((plan) => {
-        return (
-          <PlanItem
-            key={plan.id}
-            plan={plan}
-            onSelect={onPlanSelection}
-            activeSubscription={activeSubscription}
-            loading={loading}
-          />
-        );
-      }, allSubscriptionPlans)}
-    </Plans>
-  );
-};
diff --git a/packages/webapp/src/routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.graphql.ts b/packages/webapp/src/routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.graphql.ts
new file mode 100644
index 000000000..4417ce60d
--- /dev/null
+++ b/packages/webapp/src/routes/finances/editSubscription/subscriptionPlans/subscriptionPlans.graphql.ts
@@ -0,0 +1,26 @@
+import { gql } from '../../../../shared/services/graphqlApi/__generated/gql';
+
+export const SUBSCRIPTION_PLANS_ALL_QUERY = gql(/* GraphQL */ `
+  query subscriptionPlansAllQuery {
+    allSubscriptionPlans(first: 100) {
+      edges {
+        node {
+          id
+          ...subscriptionPlanItemFragment
+        }
+      }
+    }
+  }
+`);
+
+export const SUBSRIPTION_PLAN_ITEM_FRAGMENT = gql(/* GraphQL */ `
+  fragment subscriptionPlanItemFragment on SubscriptionPlanType {
+    id
+    pk
+    product {
+      id
+      name
+    }
+    unitAmount
+  }
+`);
diff --git a/packages/webapp/src/shared/components/finances/stripe/stripePaymentMethodSelector/stripePaymentMethodSelector.graphql.ts b/packages/webapp/src/shared/components/finances/stripe/stripePaymentMethodSelector/stripePaymentMethodSelector.graphql.ts
index 466d9c5df..f034ed742 100644
--- a/packages/webapp/src/shared/components/finances/stripe/stripePaymentMethodSelector/stripePaymentMethodSelector.graphql.ts
+++ b/packages/webapp/src/shared/components/finances/stripe/stripePaymentMethodSelector/stripePaymentMethodSelector.graphql.ts
@@ -22,7 +22,7 @@ export const STRIPE_SUBSCRIPTION_QUERY = gql(/* GraphQL */ `
     }
 
     activeSubscription {
-      ...subscriptionActiveSubscriptionFragment_
+      ...subscriptionActiveSubscriptionFragment
       id
       __typename
     }
@@ -46,7 +46,7 @@ export const STRIPE_UPDATE_PAYMENT_METHOD_MUTATION = gql(/* GraphQL */ `
   mutation stripeUpdateDefaultPaymentMethodMutation($input: UpdateDefaultPaymentMethodMutationInput!) {
     updateDefaultPaymentMethod(input: $input) {
       activeSubscription {
-        ...subscriptionActiveSubscriptionFragment_
+        ...subscriptionActiveSubscriptionFragment
         id
       }
       paymentMethodEdge {
diff --git a/packages/webapp/src/shared/hooks/finances/useActiveSubscriptionDetailsData/useActiveSubscriptionDetailsData.graphql.ts b/packages/webapp/src/shared/hooks/finances/useActiveSubscriptionDetailsData/useActiveSubscriptionDetailsData.graphql.ts
index a9080d210..0c0f27766 100644
--- a/packages/webapp/src/shared/hooks/finances/useActiveSubscriptionDetailsData/useActiveSubscriptionDetailsData.graphql.ts
+++ b/packages/webapp/src/shared/hooks/finances/useActiveSubscriptionDetailsData/useActiveSubscriptionDetailsData.graphql.ts
@@ -1,14 +1,14 @@
 import { gql } from '../../../services/graphqlApi/__generated/gql';
 
 export const SUBSCRIPTION_ACTIVE_FRAGMENT = gql(/* GraphQL */ `
-  fragment subscriptionActiveSubscriptionFragment_ on SubscriptionScheduleType {
+  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {
     phases {
       startDate
       endDate
       trialEnd
       item {
         price {
-          ...subscriptionPlanItemFragment_
+          ...subscriptionPlanItemFragment
           id
         }
         quantity
@@ -27,7 +27,7 @@ export const SUBSCRIPTION_ACTIVE_FRAGMENT = gql(/* GraphQL */ `
     }
   }
 
-  fragment subscriptionPlanItemFragment_ on SubscriptionPlanType {
+  fragment subscriptionPlanItemFragment on SubscriptionPlanType {
     id
     pk
     product {
diff --git a/packages/webapp/src/shared/hooks/finances/useSubscriptionPlanDetails/useSubscriptionPlanDetails.graphql.ts b/packages/webapp/src/shared/hooks/finances/useSubscriptionPlanDetails/useSubscriptionPlanDetails.graphql.ts
index e51047a6a..a111f2eb9 100644
--- a/packages/webapp/src/shared/hooks/finances/useSubscriptionPlanDetails/useSubscriptionPlanDetails.graphql.ts
+++ b/packages/webapp/src/shared/hooks/finances/useSubscriptionPlanDetails/useSubscriptionPlanDetails.graphql.ts
@@ -1,14 +1,14 @@
 import { gql } from '../../../../shared/services/graphqlApi/__generated/gql';
 
 export const SUBSCRIPTION_ACTIVE_FRAGMENT = gql(/* GraphQL */ `
-  fragment subscriptionActiveSubscriptionFragment_ on SubscriptionScheduleType {
+  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {
     phases {
       startDate
       endDate
       trialEnd
       item {
         price {
-          ...subscriptionPlanItemFragment_
+          ...subscriptionPlanItemFragment
           id
         }
         quantity
@@ -27,7 +27,7 @@ export const SUBSCRIPTION_ACTIVE_FRAGMENT = gql(/* GraphQL */ `
     }
   }
 
-  fragment subscriptionPlanItemFragment_ on SubscriptionPlanType {
+  fragment subscriptionPlanItemFragment on SubscriptionPlanType {
     id
     pk
     product {
@@ -49,7 +49,7 @@ export const SUBSCRIPTION_ACTIVE_FRAGMENT = gql(/* GraphQL */ `
 export const SUBSCRIPTION_ACTIVE_PLAN_DETAILS_QUERY = gql(/* GraphQL */ `
   query subscriptionActivePlanDetailsQuery_ {
     activeSubscription {
-      ...subscriptionActiveSubscriptionFragment_
+      ...subscriptionActiveSubscriptionFragment
       id
     }
   }
diff --git a/packages/webapp/src/shared/hooks/finances/useSubscriptionPlanDetails/useSubscriptionPlanDetails.hook.ts b/packages/webapp/src/shared/hooks/finances/useSubscriptionPlanDetails/useSubscriptionPlanDetails.hook.ts
index 4bd5f3597..13d140abb 100644
--- a/packages/webapp/src/shared/hooks/finances/useSubscriptionPlanDetails/useSubscriptionPlanDetails.hook.ts
+++ b/packages/webapp/src/shared/hooks/finances/useSubscriptionPlanDetails/useSubscriptionPlanDetails.hook.ts
@@ -1,13 +1,13 @@
-import { useIntl } from 'react-intl';
-import { times } from 'ramda';
 import { useQuery } from '@apollo/client';
+import { times } from 'ramda';
+import { useIntl } from 'react-intl';
 
-import { SubscriptionPlan, SubscriptionPlanName } from '../../../services/api/subscription/types';
-import { subscriptionPlanItemFragment$data } from '../../../../modules/subscription/__generated__/subscriptionPlanItemFragment.graphql';
-import { STRIPE_SUBSCRIPTION_QUERY } from '../../../components/finances/stripe/stripePaymentMethodSelector/stripePaymentMethodSelector.graphql';
 import { ActiveSubscriptionDetailsContextType } from '../../../../routes/finances/activeSubscriptionContext/activeSubscriptionContext.hooks';
+import { STRIPE_SUBSCRIPTION_QUERY } from '../../../components/finances/stripe/stripePaymentMethodSelector/stripePaymentMethodSelector.graphql';
+import { SubscriptionPlan, SubscriptionPlanName } from '../../../services/api/subscription/types';
+import { SubscriptionPlanItemFragmentFragment } from '../../../services/graphqlApi/__generated/gql/graphql';
 
-export const useSubscriptionPlanDetails = (plan?: subscriptionPlanItemFragment$data | SubscriptionPlan) => {
+export const useSubscriptionPlanDetails = (plan?: SubscriptionPlanItemFragmentFragment | SubscriptionPlan) => {
   const intl = useIntl();
 
   const examplePlanFeatureItem = intl.formatMessage({
diff --git a/packages/webapp/src/shared/services/graphqlApi/__generated/gql/gql.ts b/packages/webapp/src/shared/services/graphqlApi/__generated/gql/gql.ts
index 739b53a36..36be2ee00 100644
--- a/packages/webapp/src/shared/services/graphqlApi/__generated/gql/gql.ts
+++ b/packages/webapp/src/shared/services/graphqlApi/__generated/gql/gql.ts
@@ -28,8 +28,6 @@ const documents = {
     "\n  query stripeAllChargesQuery {\n    allCharges {\n      edges {\n        node {\n          id\n          ...stripeChargeFragment\n        }\n      }\n    }\n  }\n": types.StripeAllChargesQueryDocument,
     "\n  fragment stripePaymentIntentFragment on StripePaymentIntentType {\n    id\n    amount\n    clientSecret\n    currency\n    pk\n  }\n": types.StripePaymentIntentFragmentFragmentDoc,
     "\n  query stripePaymentIntentQuery($id: ID!) {\n    paymentIntent(id: $id) {\n      ...stripePaymentIntentFragment\n    }\n  }\n": types.StripePaymentIntentQueryDocument,
-    "\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n": types.SubscriptionPlanItemFragmentFragmentDoc,
-    "\n  query subscriptionPlansAllQuery {\n    allSubscriptionPlans(first: 100) {\n      edges {\n        node {\n          id\n          ...subscriptionPlanItemFragment\n        }\n      }\n    }\n  }\n": types.SubscriptionPlansAllQueryDocument,
     "\n  query subscriptionActivePlanDetailsQuery {\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment\n    }\n  }\n": types.SubscriptionActivePlanDetailsQueryDocument,
     "\n  mutation addCrudDemoItemMutation($input: CreateCrudDemoItemMutationInput!) {\n    createCrudDemoItem(input: $input) {\n      crudDemoItemEdge {\n        node {\n          id\n          name\n        }\n      }\n    }\n  }\n": types.AddCrudDemoItemMutationDocument,
     "\n  query crudDemoItemDetailsQuery($id: ID!) {\n    crudDemoItem(id: $id) {\n      id\n      name\n    }\n  }\n": types.CrudDemoItemDetailsQueryDocument,
@@ -50,25 +48,26 @@ const documents = {
     "\n      mutation documentsListCreateMutation($input: CreateDocumentDemoItemMutationInput!, $connections: [ID!]!) {\n        createDocumentDemoItem(input: $input) {\n          documentDemoItemEdge @appendEdge(connections: $connections) {\n            node {\n              createdAt\n              file {\n                name\n                url\n              }\n            }\n          }\n        }\n      }\n    ": types.DocumentsListCreateMutationDocument,
     "\n    mutation documentsDeleteMutation($input: DeleteDocumentDemoItemMutationInput!, $connections: [ID!]!) {\n      deleteDocumentDemoItem(input: $input) {\n        deletedIds @deleteEdge(connections: $connections)\n      }\n    }\n  ": types.DocumentsDeleteMutationDocument,
     "\n  mutation subscriptionCancelActiveSubscriptionMutation($input: CancelActiveSubscriptionMutationInput!) {\n    cancelActiveSubscription(input: $input) {\n      subscriptionSchedule {\n        ...subscriptionActiveSubscriptionFragment\n        id\n      }\n    }\n  }\n": types.SubscriptionCancelActiveSubscriptionMutationDocument,
-    "\n  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment\n    }\n  }\n": types.SubscriptionActiveSubscriptionFragmentFragmentDoc,
     "\n  mutation stripeCreateSetupIntentMutation_($input: CreateSetupIntentMutationInput!) {\n    createSetupIntent(input: $input) {\n      setupIntent {\n        id\n        ...stripeSetupIntentFragment\n      }\n    }\n  }\n\n  fragment stripeSetupIntentFragment on StripeSetupIntentType {\n    id\n    clientSecret\n  }\n": types.StripeCreateSetupIntentMutation_Document,
     "\n  mutation subscriptionChangeActiveSubscriptionMutation($input: ChangeActiveSubscriptionMutationInput!) {\n    changeActiveSubscription(input: $input) {\n      subscriptionSchedule {\n        ...subscriptionActiveSubscriptionFragment\n        id\n      }\n    }\n  }\n": types.SubscriptionChangeActiveSubscriptionMutationDocument,
+    "\n  query subscriptionPlansAllQuery {\n    allSubscriptionPlans(first: 100) {\n      edges {\n        node {\n          id\n          ...subscriptionPlanItemFragment\n        }\n      }\n    }\n  }\n": types.SubscriptionPlansAllQueryDocument,
+    "\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n": types.SubscriptionPlanItemFragmentFragmentDoc,
     "\n  mutation loginFormMutation($input: ObtainTokenMutationInput!) {\n    tokenAuth(input: $input) {\n      access\n      refresh\n    }\n  }\n": types.LoginFormMutationDocument,
     "\n  mutation authSignupMutation($input: SingUpMutationInput!) {\n    signUp(input: $input) {\n      access\n      refresh\n    }\n  }\n": types.AuthSignupMutationDocument,
     "\n  mutation stripeCreatePaymentIntentMutation_($input: CreatePaymentIntentMutationInput!) {\n    createPaymentIntent(input: $input) {\n      paymentIntent {\n        ...stripePaymentIntentFragment\n        id\n      }\n    }\n  }\n": types.StripeCreatePaymentIntentMutation_Document,
     "\n  mutation stripeUpdatePaymentIntentMutation_($input: UpdatePaymentIntentMutationInput!) {\n    updatePaymentIntent(input: $input) {\n      paymentIntent {\n        ...stripePaymentIntentFragment\n        id\n      }\n    }\n  }\n": types.StripeUpdatePaymentIntentMutation_Document,
-    "\n  query stripeSubscriptionQuery {\n    allPaymentMethods(first: 100) {\n      edges {\n        node {\n          id\n          pk\n          type\n          card\n          billingDetails\n          ...stripePaymentMethodFragment\n          __typename\n        }\n        cursor\n      }\n      pageInfo {\n        endCursor\n        hasNextPage\n      }\n    }\n\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment_\n      id\n      __typename\n    }\n  }\n": types.StripeSubscriptionQueryDocument,
+    "\n  query stripeSubscriptionQuery {\n    allPaymentMethods(first: 100) {\n      edges {\n        node {\n          id\n          pk\n          type\n          card\n          billingDetails\n          ...stripePaymentMethodFragment\n          __typename\n        }\n        cursor\n      }\n      pageInfo {\n        endCursor\n        hasNextPage\n      }\n    }\n\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment\n      id\n      __typename\n    }\n  }\n": types.StripeSubscriptionQueryDocument,
     "\n  mutation stripeDeletePaymentMethodMutation($input: DeletePaymentMethodMutationInput!) {\n    deletePaymentMethod(input: $input) {\n      deletedIds\n      activeSubscription {\n        defaultPaymentMethod {\n          ...stripePaymentMethodFragment\n        }\n      }\n    }\n  }\n": types.StripeDeletePaymentMethodMutationDocument,
-    "\n  mutation stripeUpdateDefaultPaymentMethodMutation($input: UpdateDefaultPaymentMethodMutationInput!) {\n    updateDefaultPaymentMethod(input: $input) {\n      activeSubscription {\n        ...subscriptionActiveSubscriptionFragment_\n        id\n      }\n      paymentMethodEdge {\n        node {\n          # commented only because of the broken apollo types: need to fix it after migration\n          #          ...stripePaymentMethodFragment @relay(mask: false)\n          ...stripePaymentMethodFragment\n          id\n        }\n      }\n    }\n  }\n": types.StripeUpdateDefaultPaymentMethodMutationDocument,
+    "\n  mutation stripeUpdateDefaultPaymentMethodMutation($input: UpdateDefaultPaymentMethodMutationInput!) {\n    updateDefaultPaymentMethod(input: $input) {\n      activeSubscription {\n        ...subscriptionActiveSubscriptionFragment\n        id\n      }\n      paymentMethodEdge {\n        node {\n          # commented only because of the broken apollo types: need to fix it after migration\n          #          ...stripePaymentMethodFragment @relay(mask: false)\n          ...stripePaymentMethodFragment\n          id\n        }\n      }\n    }\n  }\n": types.StripeUpdateDefaultPaymentMethodMutationDocument,
     "\n  mutation notificationMutation($input: UpdateNotificationMutationInput!) {\n    updateNotification(input: $input) {\n      hasUnreadNotifications\n      notificationEdge {\n        node {\n          id\n          readAt\n        }\n      }\n    }\n  }\n": types.NotificationMutationDocument,
     "\n  query notificationsListQuery($count: Int = 20, $cursor: String) {\n    ...notificationsListContentFragment\n    ...notificationsButtonContent\n  }\n": types.NotificationsListQueryDocument,
     "\n  subscription notificationsListSubscription {\n    notificationCreated {\n      edges {\n        node {\n          id\n          type\n          createdAt\n          readAt\n          data\n        }\n      }\n    }\n  }\n": types.NotificationsListSubscriptionDocument,
     "\n  fragment notificationsButtonContent on Query {\n    hasUnreadNotifications\n  }\n": types.NotificationsButtonContentFragmentDoc,
     "\n  fragment notificationsListContentFragment on Query {\n    hasUnreadNotifications\n    allNotifications(first: $count, after: $cursor) {\n      edges {\n        node {\n          id\n          data\n          createdAt\n          readAt\n          type\n        }\n      }\n      pageInfo {\n        endCursor\n        hasNextPage\n      }\n    }\n  }\n": types.NotificationsListContentFragmentFragmentDoc,
     "\n  mutation notificationsListMarkAsReadMutation($input: MarkReadAllNotificationsMutationInput!) {\n    markReadAllNotifications(input: $input) {\n      ok\n    }\n  }\n": types.NotificationsListMarkAsReadMutationDocument,
-    "\n  fragment subscriptionActiveSubscriptionFragment_ on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment_\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment_ on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n": types.SubscriptionActiveSubscriptionFragment_FragmentDoc,
-    "\n  fragment subscriptionActiveSubscriptionFragment_ on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment_\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment_ on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n\n  fragment stripePaymentMethodFragment_ on StripePaymentMethodType {\n    id\n    pk\n    type\n    card\n    billingDetails\n  }\n": types.SubscriptionActiveSubscriptionFragment_FragmentDoc,
-    "\n  query subscriptionActivePlanDetailsQuery_ {\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment_\n      id\n    }\n  }\n": types.SubscriptionActivePlanDetailsQuery_Document,
+    "\n  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n": types.SubscriptionActiveSubscriptionFragmentFragmentDoc,
+    "\n  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n\n  fragment stripePaymentMethodFragment_ on StripePaymentMethodType {\n    id\n    pk\n    type\n    card\n    billingDetails\n  }\n": types.SubscriptionActiveSubscriptionFragmentFragmentDoc,
+    "\n  query subscriptionActivePlanDetailsQuery_ {\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment\n      id\n    }\n  }\n": types.SubscriptionActivePlanDetailsQuery_Document,
     "\n      mutation useFavoriteDemoItemListCreateMutation(\n        $input: CreateFavoriteContentfulDemoItemMutationInput!\n        $connections: [ID!]!\n      ) {\n        createFavoriteContentfulDemoItem(input: $input) {\n          contentfulDemoItemFavoriteEdge @appendEdge(connections: $connections) {\n            node {\n              ...useFavoriteDemoItem_item @relay(mask: false)\n            }\n          }\n        }\n      }\n    ": types.UseFavoriteDemoItemListCreateMutationDocument,
     "\n      mutation useFavoriteDemoItemListDeleteMutation(\n        $input: DeleteFavoriteContentfulDemoItemMutationInput!\n        $connections: [ID!]!\n      ) {\n        deleteFavoriteContentfulDemoItem(input: $input) {\n          deletedIds @deleteEdge(connections: $connections)\n        }\n      }\n    ": types.UseFavoriteDemoItemListDeleteMutationDocument,
     "\n  fragment useFavoriteDemoItem_item on ContentfulDemoItemFavoriteType {\n    item {\n      pk\n    }\n  }\n": types.UseFavoriteDemoItem_ItemFragmentDoc,
@@ -149,14 +148,6 @@ export function gql(source: "\n  fragment stripePaymentIntentFragment on StripeP
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function gql(source: "\n  query stripePaymentIntentQuery($id: ID!) {\n    paymentIntent(id: $id) {\n      ...stripePaymentIntentFragment\n    }\n  }\n"): (typeof documents)["\n  query stripePaymentIntentQuery($id: ID!) {\n    paymentIntent(id: $id) {\n      ...stripePaymentIntentFragment\n    }\n  }\n"];
-/**
- * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
- */
-export function gql(source: "\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n"): (typeof documents)["\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n"];
-/**
- * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
- */
-export function gql(source: "\n  query subscriptionPlansAllQuery {\n    allSubscriptionPlans(first: 100) {\n      edges {\n        node {\n          id\n          ...subscriptionPlanItemFragment\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query subscriptionPlansAllQuery {\n    allSubscriptionPlans(first: 100) {\n      edges {\n        node {\n          id\n          ...subscriptionPlanItemFragment\n        }\n      }\n    }\n  }\n"];
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -240,15 +231,19 @@ export function gql(source: "\n  mutation subscriptionCancelActiveSubscriptionMu
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function gql(source: "\n  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment\n    }\n  }\n"): (typeof documents)["\n  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment\n    }\n  }\n"];
+export function gql(source: "\n  mutation stripeCreateSetupIntentMutation_($input: CreateSetupIntentMutationInput!) {\n    createSetupIntent(input: $input) {\n      setupIntent {\n        id\n        ...stripeSetupIntentFragment\n      }\n    }\n  }\n\n  fragment stripeSetupIntentFragment on StripeSetupIntentType {\n    id\n    clientSecret\n  }\n"): (typeof documents)["\n  mutation stripeCreateSetupIntentMutation_($input: CreateSetupIntentMutationInput!) {\n    createSetupIntent(input: $input) {\n      setupIntent {\n        id\n        ...stripeSetupIntentFragment\n      }\n    }\n  }\n\n  fragment stripeSetupIntentFragment on StripeSetupIntentType {\n    id\n    clientSecret\n  }\n"];
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function gql(source: "\n  mutation stripeCreateSetupIntentMutation_($input: CreateSetupIntentMutationInput!) {\n    createSetupIntent(input: $input) {\n      setupIntent {\n        id\n        ...stripeSetupIntentFragment\n      }\n    }\n  }\n\n  fragment stripeSetupIntentFragment on StripeSetupIntentType {\n    id\n    clientSecret\n  }\n"): (typeof documents)["\n  mutation stripeCreateSetupIntentMutation_($input: CreateSetupIntentMutationInput!) {\n    createSetupIntent(input: $input) {\n      setupIntent {\n        id\n        ...stripeSetupIntentFragment\n      }\n    }\n  }\n\n  fragment stripeSetupIntentFragment on StripeSetupIntentType {\n    id\n    clientSecret\n  }\n"];
+export function gql(source: "\n  mutation subscriptionChangeActiveSubscriptionMutation($input: ChangeActiveSubscriptionMutationInput!) {\n    changeActiveSubscription(input: $input) {\n      subscriptionSchedule {\n        ...subscriptionActiveSubscriptionFragment\n        id\n      }\n    }\n  }\n"): (typeof documents)["\n  mutation subscriptionChangeActiveSubscriptionMutation($input: ChangeActiveSubscriptionMutationInput!) {\n    changeActiveSubscription(input: $input) {\n      subscriptionSchedule {\n        ...subscriptionActiveSubscriptionFragment\n        id\n      }\n    }\n  }\n"];
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function gql(source: "\n  mutation subscriptionChangeActiveSubscriptionMutation($input: ChangeActiveSubscriptionMutationInput!) {\n    changeActiveSubscription(input: $input) {\n      subscriptionSchedule {\n        ...subscriptionActiveSubscriptionFragment\n        id\n      }\n    }\n  }\n"): (typeof documents)["\n  mutation subscriptionChangeActiveSubscriptionMutation($input: ChangeActiveSubscriptionMutationInput!) {\n    changeActiveSubscription(input: $input) {\n      subscriptionSchedule {\n        ...subscriptionActiveSubscriptionFragment\n        id\n      }\n    }\n  }\n"];
+export function gql(source: "\n  query subscriptionPlansAllQuery {\n    allSubscriptionPlans(first: 100) {\n      edges {\n        node {\n          id\n          ...subscriptionPlanItemFragment\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query subscriptionPlansAllQuery {\n    allSubscriptionPlans(first: 100) {\n      edges {\n        node {\n          id\n          ...subscriptionPlanItemFragment\n        }\n      }\n    }\n  }\n"];
+/**
+ * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function gql(source: "\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n"): (typeof documents)["\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n"];
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -268,7 +263,7 @@ export function gql(source: "\n  mutation stripeUpdatePaymentIntentMutation_($in
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function gql(source: "\n  query stripeSubscriptionQuery {\n    allPaymentMethods(first: 100) {\n      edges {\n        node {\n          id\n          pk\n          type\n          card\n          billingDetails\n          ...stripePaymentMethodFragment\n          __typename\n        }\n        cursor\n      }\n      pageInfo {\n        endCursor\n        hasNextPage\n      }\n    }\n\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment_\n      id\n      __typename\n    }\n  }\n"): (typeof documents)["\n  query stripeSubscriptionQuery {\n    allPaymentMethods(first: 100) {\n      edges {\n        node {\n          id\n          pk\n          type\n          card\n          billingDetails\n          ...stripePaymentMethodFragment\n          __typename\n        }\n        cursor\n      }\n      pageInfo {\n        endCursor\n        hasNextPage\n      }\n    }\n\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment_\n      id\n      __typename\n    }\n  }\n"];
+export function gql(source: "\n  query stripeSubscriptionQuery {\n    allPaymentMethods(first: 100) {\n      edges {\n        node {\n          id\n          pk\n          type\n          card\n          billingDetails\n          ...stripePaymentMethodFragment\n          __typename\n        }\n        cursor\n      }\n      pageInfo {\n        endCursor\n        hasNextPage\n      }\n    }\n\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment\n      id\n      __typename\n    }\n  }\n"): (typeof documents)["\n  query stripeSubscriptionQuery {\n    allPaymentMethods(first: 100) {\n      edges {\n        node {\n          id\n          pk\n          type\n          card\n          billingDetails\n          ...stripePaymentMethodFragment\n          __typename\n        }\n        cursor\n      }\n      pageInfo {\n        endCursor\n        hasNextPage\n      }\n    }\n\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment\n      id\n      __typename\n    }\n  }\n"];
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -276,7 +271,7 @@ export function gql(source: "\n  mutation stripeDeletePaymentMethodMutation($inp
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function gql(source: "\n  mutation stripeUpdateDefaultPaymentMethodMutation($input: UpdateDefaultPaymentMethodMutationInput!) {\n    updateDefaultPaymentMethod(input: $input) {\n      activeSubscription {\n        ...subscriptionActiveSubscriptionFragment_\n        id\n      }\n      paymentMethodEdge {\n        node {\n          # commented only because of the broken apollo types: need to fix it after migration\n          #          ...stripePaymentMethodFragment @relay(mask: false)\n          ...stripePaymentMethodFragment\n          id\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  mutation stripeUpdateDefaultPaymentMethodMutation($input: UpdateDefaultPaymentMethodMutationInput!) {\n    updateDefaultPaymentMethod(input: $input) {\n      activeSubscription {\n        ...subscriptionActiveSubscriptionFragment_\n        id\n      }\n      paymentMethodEdge {\n        node {\n          # commented only because of the broken apollo types: need to fix it after migration\n          #          ...stripePaymentMethodFragment @relay(mask: false)\n          ...stripePaymentMethodFragment\n          id\n        }\n      }\n    }\n  }\n"];
+export function gql(source: "\n  mutation stripeUpdateDefaultPaymentMethodMutation($input: UpdateDefaultPaymentMethodMutationInput!) {\n    updateDefaultPaymentMethod(input: $input) {\n      activeSubscription {\n        ...subscriptionActiveSubscriptionFragment\n        id\n      }\n      paymentMethodEdge {\n        node {\n          # commented only because of the broken apollo types: need to fix it after migration\n          #          ...stripePaymentMethodFragment @relay(mask: false)\n          ...stripePaymentMethodFragment\n          id\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  mutation stripeUpdateDefaultPaymentMethodMutation($input: UpdateDefaultPaymentMethodMutationInput!) {\n    updateDefaultPaymentMethod(input: $input) {\n      activeSubscription {\n        ...subscriptionActiveSubscriptionFragment\n        id\n      }\n      paymentMethodEdge {\n        node {\n          # commented only because of the broken apollo types: need to fix it after migration\n          #          ...stripePaymentMethodFragment @relay(mask: false)\n          ...stripePaymentMethodFragment\n          id\n        }\n      }\n    }\n  }\n"];
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -304,15 +299,15 @@ export function gql(source: "\n  mutation notificationsListMarkAsReadMutation($i
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function gql(source: "\n  fragment subscriptionActiveSubscriptionFragment_ on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment_\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment_ on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n"): (typeof documents)["\n  fragment subscriptionActiveSubscriptionFragment_ on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment_\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment_ on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n"];
+export function gql(source: "\n  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n"): (typeof documents)["\n  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n"];
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function gql(source: "\n  fragment subscriptionActiveSubscriptionFragment_ on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment_\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment_ on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n\n  fragment stripePaymentMethodFragment_ on StripePaymentMethodType {\n    id\n    pk\n    type\n    card\n    billingDetails\n  }\n"): (typeof documents)["\n  fragment subscriptionActiveSubscriptionFragment_ on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment_\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment_ on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n\n  fragment stripePaymentMethodFragment_ on StripePaymentMethodType {\n    id\n    pk\n    type\n    card\n    billingDetails\n  }\n"];
+export function gql(source: "\n  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n\n  fragment stripePaymentMethodFragment_ on StripePaymentMethodType {\n    id\n    pk\n    type\n    card\n    billingDetails\n  }\n"): (typeof documents)["\n  fragment subscriptionActiveSubscriptionFragment on SubscriptionScheduleType {\n    phases {\n      startDate\n      endDate\n      trialEnd\n      item {\n        price {\n          ...subscriptionPlanItemFragment\n          id\n        }\n        quantity\n      }\n    }\n    subscription {\n      startDate\n      trialEnd\n      trialStart\n      id\n    }\n    canActivateTrial\n    defaultPaymentMethod {\n      ...stripePaymentMethodFragment_\n      id\n    }\n  }\n\n  fragment subscriptionPlanItemFragment on SubscriptionPlanType {\n    id\n    pk\n    product {\n      id\n      name\n    }\n    unitAmount\n  }\n\n  fragment stripePaymentMethodFragment_ on StripePaymentMethodType {\n    id\n    pk\n    type\n    card\n    billingDetails\n  }\n"];
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function gql(source: "\n  query subscriptionActivePlanDetailsQuery_ {\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment_\n      id\n    }\n  }\n"): (typeof documents)["\n  query subscriptionActivePlanDetailsQuery_ {\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment_\n      id\n    }\n  }\n"];
+export function gql(source: "\n  query subscriptionActivePlanDetailsQuery_ {\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment\n      id\n    }\n  }\n"): (typeof documents)["\n  query subscriptionActivePlanDetailsQuery_ {\n    activeSubscription {\n      ...subscriptionActiveSubscriptionFragment\n      id\n    }\n  }\n"];
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/packages/webapp/src/shared/services/graphqlApi/__generated/gql/graphql.ts b/packages/webapp/src/shared/services/graphqlApi/__generated/gql/graphql.ts
index 618000fad..acaa75562 100644
--- a/packages/webapp/src/shared/services/graphqlApi/__generated/gql/graphql.ts
+++ b/packages/webapp/src/shared/services/graphqlApi/__generated/gql/graphql.ts
@@ -2694,16 +2694,6 @@ export type StripePaymentIntentQueryQuery = { __typename?: 'Query', paymentInten
     & { ' $fragmentRefs'?: { 'StripePaymentIntentFragmentFragment': StripePaymentIntentFragmentFragment } }
   ) | null };
 
-export type SubscriptionPlanItemFragmentFragment = { __typename?: 'SubscriptionPlanType', id: string, pk?: string | null, unitAmount?: number | null, product: { __typename?: 'StripeProductType', id: string, name: string } } & { ' $fragmentName'?: 'SubscriptionPlanItemFragmentFragment' };
-
-export type SubscriptionPlansAllQueryQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type SubscriptionPlansAllQueryQuery = { __typename?: 'Query', allSubscriptionPlans?: { __typename?: 'SubscriptionPlanConnection', edges: Array<{ __typename?: 'SubscriptionPlanEdge', node?: (
-        { __typename?: 'SubscriptionPlanType', id: string }
-        & { ' $fragmentRefs'?: { 'SubscriptionPlanItemFragmentFragment': SubscriptionPlanItemFragmentFragment } }
-      ) | null } | null> } | null };
-
 export type SubscriptionActivePlanDetailsQueryQueryVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -2842,14 +2832,6 @@ export type SubscriptionCancelActiveSubscriptionMutationMutation = { __typename?
       & { ' $fragmentRefs'?: { 'SubscriptionActiveSubscriptionFragmentFragment': SubscriptionActiveSubscriptionFragmentFragment } }
     ) | null } | null };
 
-export type SubscriptionActiveSubscriptionFragmentFragment = { __typename?: 'SubscriptionScheduleType', canActivateTrial?: boolean | null, phases?: Array<{ __typename?: 'SubscriptionSchedulePhaseType', startDate?: any | null, endDate?: string | null, trialEnd?: string | null, item?: { __typename?: 'SubscriptionSchedulePhaseItemType', quantity?: number | null, price?: (
-        { __typename?: 'SubscriptionPlanType' }
-        & { ' $fragmentRefs'?: { 'SubscriptionPlanItemFragmentFragment': SubscriptionPlanItemFragmentFragment } }
-      ) | null } | null } | null> | null, subscription?: { __typename?: 'StripeSubscriptionType', startDate?: any | null, trialEnd?: any | null, trialStart?: any | null } | null, defaultPaymentMethod?: (
-    { __typename?: 'StripePaymentMethodType' }
-    & { ' $fragmentRefs'?: { 'StripePaymentMethodFragmentFragment': StripePaymentMethodFragmentFragment } }
-  ) | null } & { ' $fragmentName'?: 'SubscriptionActiveSubscriptionFragmentFragment' };
-
 export type StripeCreateSetupIntentMutation_MutationVariables = Exact<{
   input: CreateSetupIntentMutationInput;
 }>;
@@ -2872,6 +2854,16 @@ export type SubscriptionChangeActiveSubscriptionMutationMutation = { __typename?
       & { ' $fragmentRefs'?: { 'SubscriptionActiveSubscriptionFragmentFragment': SubscriptionActiveSubscriptionFragmentFragment } }
     ) | null } | null };
 
+export type SubscriptionPlansAllQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type SubscriptionPlansAllQueryQuery = { __typename?: 'Query', allSubscriptionPlans?: { __typename?: 'SubscriptionPlanConnection', edges: Array<{ __typename?: 'SubscriptionPlanEdge', node?: (
+        { __typename?: 'SubscriptionPlanType', id: string }
+        & { ' $fragmentRefs'?: { 'SubscriptionPlanItemFragmentFragment': SubscriptionPlanItemFragmentFragment } }
+      ) | null } | null> } | null };
+
+export type SubscriptionPlanItemFragmentFragment = { __typename?: 'SubscriptionPlanType', id: string, pk?: string | null, unitAmount?: number | null, product: { __typename?: 'StripeProductType', id: string, name: string } } & { ' $fragmentName'?: 'SubscriptionPlanItemFragmentFragment' };
+
 export type LoginFormMutationMutationVariables = Exact<{
   input: ObtainTokenMutationInput;
 }>;
@@ -2914,7 +2906,7 @@ export type StripeSubscriptionQueryQuery = { __typename?: 'Query', allPaymentMet
         & { ' $fragmentRefs'?: { 'StripePaymentMethodFragmentFragment': StripePaymentMethodFragmentFragment } }
       ) | null } | null>, pageInfo: { __typename?: 'PageInfo', endCursor?: string | null, hasNextPage: boolean } } | null, activeSubscription?: (
     { __typename: 'SubscriptionScheduleType', id: string }
-    & { ' $fragmentRefs'?: { 'SubscriptionActiveSubscriptionFragment_Fragment': SubscriptionActiveSubscriptionFragment_Fragment } }
+    & { ' $fragmentRefs'?: { 'SubscriptionActiveSubscriptionFragmentFragment': SubscriptionActiveSubscriptionFragmentFragment } }
   ) | null };
 
 export type StripeDeletePaymentMethodMutationMutationVariables = Exact<{
@@ -2934,7 +2926,7 @@ export type StripeUpdateDefaultPaymentMethodMutationMutationVariables = Exact<{
 
 export type StripeUpdateDefaultPaymentMethodMutationMutation = { __typename?: 'ApiMutation', updateDefaultPaymentMethod?: { __typename?: 'UpdateDefaultPaymentMethodMutationPayload', activeSubscription?: (
       { __typename?: 'SubscriptionScheduleType', id: string }
-      & { ' $fragmentRefs'?: { 'SubscriptionActiveSubscriptionFragment_Fragment': SubscriptionActiveSubscriptionFragment_Fragment } }
+      & { ' $fragmentRefs'?: { 'SubscriptionActiveSubscriptionFragmentFragment': SubscriptionActiveSubscriptionFragmentFragment } }
     ) | null, paymentMethodEdge?: { __typename?: 'PaymentMethodEdge', node?: (
         { __typename?: 'StripePaymentMethodType', id: string }
         & { ' $fragmentRefs'?: { 'StripePaymentMethodFragmentFragment': StripePaymentMethodFragmentFragment } }
@@ -2974,15 +2966,13 @@ export type NotificationsListMarkAsReadMutationMutationVariables = Exact<{
 
 export type NotificationsListMarkAsReadMutationMutation = { __typename?: 'ApiMutation', markReadAllNotifications?: { __typename?: 'MarkReadAllNotificationsMutationPayload', ok?: boolean | null } | null };
 
-export type SubscriptionActiveSubscriptionFragment_Fragment = { __typename?: 'SubscriptionScheduleType', canActivateTrial?: boolean | null, phases?: Array<{ __typename?: 'SubscriptionSchedulePhaseType', startDate?: any | null, endDate?: string | null, trialEnd?: string | null, item?: { __typename?: 'SubscriptionSchedulePhaseItemType', quantity?: number | null, price?: (
+export type SubscriptionActiveSubscriptionFragmentFragment = { __typename?: 'SubscriptionScheduleType', canActivateTrial?: boolean | null, phases?: Array<{ __typename?: 'SubscriptionSchedulePhaseType', startDate?: any | null, endDate?: string | null, trialEnd?: string | null, item?: { __typename?: 'SubscriptionSchedulePhaseItemType', quantity?: number | null, price?: (
         { __typename?: 'SubscriptionPlanType', id: string }
-        & { ' $fragmentRefs'?: { 'SubscriptionPlanItemFragment_Fragment': SubscriptionPlanItemFragment_Fragment } }
+        & { ' $fragmentRefs'?: { 'SubscriptionPlanItemFragmentFragment': SubscriptionPlanItemFragmentFragment } }
       ) | null } | null } | null> | null, subscription?: { __typename?: 'StripeSubscriptionType', startDate?: any | null, trialEnd?: any | null, trialStart?: any | null, id: string } | null, defaultPaymentMethod?: (
     { __typename?: 'StripePaymentMethodType', id: string }
     & { ' $fragmentRefs'?: { 'StripePaymentMethodFragment_Fragment': StripePaymentMethodFragment_Fragment } }
-  ) | null } & { ' $fragmentName'?: 'SubscriptionActiveSubscriptionFragment_Fragment' };
-
-export type SubscriptionPlanItemFragment_Fragment = { __typename?: 'SubscriptionPlanType', id: string, pk?: string | null, unitAmount?: number | null, product: { __typename?: 'StripeProductType', id: string, name: string } } & { ' $fragmentName'?: 'SubscriptionPlanItemFragment_Fragment' };
+  ) | null } & { ' $fragmentName'?: 'SubscriptionActiveSubscriptionFragmentFragment' };
 
 export type StripePaymentMethodFragment_Fragment = { __typename?: 'StripePaymentMethodType', id: string, pk?: string | null, type: PaymentMethodType, card?: any | null, billingDetails?: any | null } & { ' $fragmentName'?: 'StripePaymentMethodFragment_Fragment' };
 
@@ -2991,7 +2981,7 @@ export type SubscriptionActivePlanDetailsQuery_QueryVariables = Exact<{ [key: st
 
 export type SubscriptionActivePlanDetailsQuery_Query = { __typename?: 'Query', activeSubscription?: (
     { __typename?: 'SubscriptionScheduleType', id: string }
-    & { ' $fragmentRefs'?: { 'SubscriptionActiveSubscriptionFragment_Fragment': SubscriptionActiveSubscriptionFragment_Fragment } }
+    & { ' $fragmentRefs'?: { 'SubscriptionActiveSubscriptionFragmentFragment': SubscriptionActiveSubscriptionFragmentFragment } }
   ) | null };
 
 export type UseFavoriteDemoItemListCreateMutationMutationVariables = Exact<{
@@ -3031,13 +3021,11 @@ export const StripePaymentIntentFragmentFragmentDoc = {"kind":"Document","defini
 export const CrudDemoItemListItemFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"crudDemoItemListItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CrudDemoItemType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]} as unknown as DocumentNode<CrudDemoItemListItemFragment, unknown>;
 export const DemoItemListItem_ItemFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"demoItemListItem_item"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"DemoItem"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"image"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}}]}}]} as unknown as DocumentNode<DemoItemListItem_ItemFragment, unknown>;
 export const DocumentListItemFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"documentListItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"DocumentDemoItemType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"file"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]} as unknown as DocumentNode<DocumentListItemFragment, unknown>;
-export const SubscriptionActiveSubscriptionFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SubscriptionScheduleType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"startDate"}},{"kind":"Field","name":{"kind":"Name","value":"endDate"}},{"kind":"Field","name":{"kind":"Name","value":"trialEnd"}},{"kind":"Field","name":{"kind":"Name","value":"item"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"price"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionPlanItemFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"subscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"startDate"}},{"kind":"Field","name":{"kind":"Name","value":"trialEnd"}},{"kind":"Field","name":{"kind":"Name","value":"trialStart"}}]}},{"kind":"Field","name":{"kind":"Name","value":"canActivateTrial"}},{"kind":"Field","name":{"kind":"Name","value":"defaultPaymentMethod"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentMethodFragment"}}]}}]}},...SubscriptionPlanItemFragmentFragmentDoc.definitions,...StripePaymentMethodFragmentFragmentDoc.definitions]} as unknown as DocumentNode<SubscriptionActiveSubscriptionFragmentFragment, unknown>;
 export const StripeSetupIntentFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"stripeSetupIntentFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StripeSetupIntentType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"clientSecret"}}]}}]} as unknown as DocumentNode<StripeSetupIntentFragmentFragment, unknown>;
 export const NotificationsButtonContentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"notificationsButtonContent"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasUnreadNotifications"}}]}}]} as unknown as DocumentNode<NotificationsButtonContentFragment, unknown>;
 export const NotificationsListContentFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"notificationsListContentFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasUnreadNotifications"}},{"kind":"Field","name":{"kind":"Name","value":"allNotifications"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"Variable","name":{"kind":"Name","value":"count"}}},{"kind":"Argument","name":{"kind":"Name","value":"after"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"data"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"readAt"}},{"kind":"Field","name":{"kind":"Name","value":"type"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"endCursor"}},{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}}]}}]}}]}}]} as unknown as DocumentNode<NotificationsListContentFragmentFragment, unknown>;
-export const SubscriptionPlanItemFragment_FragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"subscriptionPlanItemFragment_"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SubscriptionPlanType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"pk"}},{"kind":"Field","name":{"kind":"Name","value":"product"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"unitAmount"}}]}}]} as unknown as DocumentNode<SubscriptionPlanItemFragment_Fragment, unknown>;
 export const StripePaymentMethodFragment_FragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"stripePaymentMethodFragment_"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StripePaymentMethodType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"pk"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"card"}},{"kind":"Field","name":{"kind":"Name","value":"billingDetails"}}]}}]} as unknown as DocumentNode<StripePaymentMethodFragment_Fragment, unknown>;
-export const SubscriptionActiveSubscriptionFragment_FragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment_"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SubscriptionScheduleType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"startDate"}},{"kind":"Field","name":{"kind":"Name","value":"endDate"}},{"kind":"Field","name":{"kind":"Name","value":"trialEnd"}},{"kind":"Field","name":{"kind":"Name","value":"item"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"price"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionPlanItemFragment_"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"subscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"startDate"}},{"kind":"Field","name":{"kind":"Name","value":"trialEnd"}},{"kind":"Field","name":{"kind":"Name","value":"trialStart"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"canActivateTrial"}},{"kind":"Field","name":{"kind":"Name","value":"defaultPaymentMethod"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentMethodFragment_"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}},...SubscriptionPlanItemFragment_FragmentDoc.definitions,...StripePaymentMethodFragment_FragmentDoc.definitions]} as unknown as DocumentNode<SubscriptionActiveSubscriptionFragment_Fragment, unknown>;
+export const SubscriptionActiveSubscriptionFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SubscriptionScheduleType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"startDate"}},{"kind":"Field","name":{"kind":"Name","value":"endDate"}},{"kind":"Field","name":{"kind":"Name","value":"trialEnd"}},{"kind":"Field","name":{"kind":"Name","value":"item"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"price"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionPlanItemFragment"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"subscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"startDate"}},{"kind":"Field","name":{"kind":"Name","value":"trialEnd"}},{"kind":"Field","name":{"kind":"Name","value":"trialStart"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"canActivateTrial"}},{"kind":"Field","name":{"kind":"Name","value":"defaultPaymentMethod"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentMethodFragment_"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}},...SubscriptionPlanItemFragmentFragmentDoc.definitions,...StripePaymentMethodFragment_FragmentDoc.definitions]} as unknown as DocumentNode<SubscriptionActiveSubscriptionFragmentFragment, unknown>;
 export const UseFavoriteDemoItem_ItemFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"useFavoriteDemoItem_item"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ContentfulDemoItemFavoriteType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"item"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"pk"}}]}}]}}]} as unknown as DocumentNode<UseFavoriteDemoItem_ItemFragment, unknown>;
 export const CommonQueryCurrentUserQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"commonQueryCurrentUserQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"currentUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"commonQueryCurrentUserFragment"}}]}}]}},...CommonQueryCurrentUserFragmentFragmentDoc.definitions]} as unknown as DocumentNode<CommonQueryCurrentUserQueryQuery, CommonQueryCurrentUserQueryQueryVariables>;
 export const AuthUpdateUserProfileMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"authUpdateUserProfileMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateCurrentUserMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateCurrentUser"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"userProfile"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"commonQueryCurrentUserFragment"}}]}}]}}]}}]}},...CommonQueryCurrentUserFragmentFragmentDoc.definitions]} as unknown as DocumentNode<AuthUpdateUserProfileMutationMutation, AuthUpdateUserProfileMutationMutationVariables>;
@@ -3050,7 +3038,6 @@ export const StripeCreateSetupIntentMutationDocument = {"kind":"Document","defin
 export const StripeAllPaymentMethodsQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"stripeAllPaymentMethodsQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"allPaymentMethods"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"100"}}],"directives":[{"kind":"Directive","name":{"kind":"Name","value":"connection"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"key"},"value":{"kind":"StringValue","value":"stripe_allPaymentMethods","block":false}}]}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentMethodFragment"}}]}}]}}]}}]}},...StripePaymentMethodFragmentFragmentDoc.definitions]} as unknown as DocumentNode<StripeAllPaymentMethodsQueryQuery, StripeAllPaymentMethodsQueryQueryVariables>;
 export const StripeAllChargesQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"stripeAllChargesQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"allCharges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripeChargeFragment"}}]}}]}}]}}]}},...StripeChargeFragmentFragmentDoc.definitions]} as unknown as DocumentNode<StripeAllChargesQueryQuery, StripeAllChargesQueryQueryVariables>;
 export const StripePaymentIntentQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"stripePaymentIntentQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"paymentIntent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentIntentFragment"}}]}}]}},...StripePaymentIntentFragmentFragmentDoc.definitions]} as unknown as DocumentNode<StripePaymentIntentQueryQuery, StripePaymentIntentQueryQueryVariables>;
-export const SubscriptionPlansAllQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"subscriptionPlansAllQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"allSubscriptionPlans"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"100"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionPlanItemFragment"}}]}}]}}]}}]}},...SubscriptionPlanItemFragmentFragmentDoc.definitions]} as unknown as DocumentNode<SubscriptionPlansAllQueryQuery, SubscriptionPlansAllQueryQueryVariables>;
 export const SubscriptionActivePlanDetailsQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"subscriptionActivePlanDetailsQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment"}}]}}]}},...SubscriptionActiveSubscriptionFragmentFragmentDoc.definitions]} as unknown as DocumentNode<SubscriptionActivePlanDetailsQueryQuery, SubscriptionActivePlanDetailsQueryQueryVariables>;
 export const AddCrudDemoItemMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"addCrudDemoItemMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateCrudDemoItemMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createCrudDemoItem"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"crudDemoItemEdge"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]}}]} as unknown as DocumentNode<AddCrudDemoItemMutationMutation, AddCrudDemoItemMutationMutationVariables>;
 export const CrudDemoItemDetailsQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"crudDemoItemDetailsQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"crudDemoItem"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]} as unknown as DocumentNode<CrudDemoItemDetailsQueryQuery, CrudDemoItemDetailsQueryQueryVariables>;
@@ -3070,18 +3057,19 @@ export const DocumentsDeleteMutationDocument = {"kind":"Document","definitions":
 export const SubscriptionCancelActiveSubscriptionMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"subscriptionCancelActiveSubscriptionMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CancelActiveSubscriptionMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cancelActiveSubscription"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"subscriptionSchedule"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}},...SubscriptionActiveSubscriptionFragmentFragmentDoc.definitions]} as unknown as DocumentNode<SubscriptionCancelActiveSubscriptionMutationMutation, SubscriptionCancelActiveSubscriptionMutationMutationVariables>;
 export const StripeCreateSetupIntentMutation_Document = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"stripeCreateSetupIntentMutation_"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateSetupIntentMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createSetupIntent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setupIntent"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripeSetupIntentFragment"}}]}}]}}]}},...StripeSetupIntentFragmentFragmentDoc.definitions]} as unknown as DocumentNode<StripeCreateSetupIntentMutation_Mutation, StripeCreateSetupIntentMutation_MutationVariables>;
 export const SubscriptionChangeActiveSubscriptionMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"subscriptionChangeActiveSubscriptionMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ChangeActiveSubscriptionMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"changeActiveSubscription"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"subscriptionSchedule"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}},...SubscriptionActiveSubscriptionFragmentFragmentDoc.definitions]} as unknown as DocumentNode<SubscriptionChangeActiveSubscriptionMutationMutation, SubscriptionChangeActiveSubscriptionMutationMutationVariables>;
+export const SubscriptionPlansAllQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"subscriptionPlansAllQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"allSubscriptionPlans"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"100"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionPlanItemFragment"}}]}}]}}]}}]}},...SubscriptionPlanItemFragmentFragmentDoc.definitions]} as unknown as DocumentNode<SubscriptionPlansAllQueryQuery, SubscriptionPlansAllQueryQueryVariables>;
 export const LoginFormMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"loginFormMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ObtainTokenMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"tokenAuth"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"access"}},{"kind":"Field","name":{"kind":"Name","value":"refresh"}}]}}]}}]} as unknown as DocumentNode<LoginFormMutationMutation, LoginFormMutationMutationVariables>;
 export const AuthSignupMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"authSignupMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SingUpMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"signUp"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"access"}},{"kind":"Field","name":{"kind":"Name","value":"refresh"}}]}}]}}]} as unknown as DocumentNode<AuthSignupMutationMutation, AuthSignupMutationMutationVariables>;
 export const StripeCreatePaymentIntentMutation_Document = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"stripeCreatePaymentIntentMutation_"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreatePaymentIntentMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createPaymentIntent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"paymentIntent"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentIntentFragment"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}},...StripePaymentIntentFragmentFragmentDoc.definitions]} as unknown as DocumentNode<StripeCreatePaymentIntentMutation_Mutation, StripeCreatePaymentIntentMutation_MutationVariables>;
 export const StripeUpdatePaymentIntentMutation_Document = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"stripeUpdatePaymentIntentMutation_"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdatePaymentIntentMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updatePaymentIntent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"paymentIntent"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentIntentFragment"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}},...StripePaymentIntentFragmentFragmentDoc.definitions]} as unknown as DocumentNode<StripeUpdatePaymentIntentMutation_Mutation, StripeUpdatePaymentIntentMutation_MutationVariables>;
-export const StripeSubscriptionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"stripeSubscriptionQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"allPaymentMethods"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"100"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"pk"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"card"}},{"kind":"Field","name":{"kind":"Name","value":"billingDetails"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentMethodFragment"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}}]}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"endCursor"}},{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"activeSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment_"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}}]}}]}},...StripePaymentMethodFragmentFragmentDoc.definitions,...SubscriptionActiveSubscriptionFragment_FragmentDoc.definitions]} as unknown as DocumentNode<StripeSubscriptionQueryQuery, StripeSubscriptionQueryQueryVariables>;
+export const StripeSubscriptionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"stripeSubscriptionQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"allPaymentMethods"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"100"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"pk"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"card"}},{"kind":"Field","name":{"kind":"Name","value":"billingDetails"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentMethodFragment"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}}]}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"endCursor"}},{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"activeSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}}]}}]}},...StripePaymentMethodFragmentFragmentDoc.definitions,...SubscriptionActiveSubscriptionFragmentFragmentDoc.definitions]} as unknown as DocumentNode<StripeSubscriptionQueryQuery, StripeSubscriptionQueryQueryVariables>;
 export const StripeDeletePaymentMethodMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"stripeDeletePaymentMethodMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeletePaymentMethodMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deletePaymentMethod"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deletedIds"}},{"kind":"Field","name":{"kind":"Name","value":"activeSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"defaultPaymentMethod"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentMethodFragment"}}]}}]}}]}}]}},...StripePaymentMethodFragmentFragmentDoc.definitions]} as unknown as DocumentNode<StripeDeletePaymentMethodMutationMutation, StripeDeletePaymentMethodMutationMutationVariables>;
-export const StripeUpdateDefaultPaymentMethodMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"stripeUpdateDefaultPaymentMethodMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateDefaultPaymentMethodMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateDefaultPaymentMethod"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment_"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"paymentMethodEdge"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentMethodFragment"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]}},...SubscriptionActiveSubscriptionFragment_FragmentDoc.definitions,...StripePaymentMethodFragmentFragmentDoc.definitions]} as unknown as DocumentNode<StripeUpdateDefaultPaymentMethodMutationMutation, StripeUpdateDefaultPaymentMethodMutationMutationVariables>;
+export const StripeUpdateDefaultPaymentMethodMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"stripeUpdateDefaultPaymentMethodMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateDefaultPaymentMethodMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateDefaultPaymentMethod"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"paymentMethodEdge"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"stripePaymentMethodFragment"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]}},...SubscriptionActiveSubscriptionFragmentFragmentDoc.definitions,...StripePaymentMethodFragmentFragmentDoc.definitions]} as unknown as DocumentNode<StripeUpdateDefaultPaymentMethodMutationMutation, StripeUpdateDefaultPaymentMethodMutationMutationVariables>;
 export const NotificationMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"notificationMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateNotificationMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateNotification"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasUnreadNotifications"}},{"kind":"Field","name":{"kind":"Name","value":"notificationEdge"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"readAt"}}]}}]}}]}}]}}]} as unknown as DocumentNode<NotificationMutationMutation, NotificationMutationMutationVariables>;
 export const NotificationsListQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"notificationsListQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"count"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"20"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"notificationsListContentFragment"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"notificationsButtonContent"}}]}},...NotificationsListContentFragmentFragmentDoc.definitions,...NotificationsButtonContentFragmentDoc.definitions]} as unknown as DocumentNode<NotificationsListQueryQuery, NotificationsListQueryQueryVariables>;
 export const NotificationsListSubscriptionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"notificationsListSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"notificationCreated"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"readAt"}},{"kind":"Field","name":{"kind":"Name","value":"data"}}]}}]}}]}}]}}]} as unknown as DocumentNode<NotificationsListSubscriptionSubscription, NotificationsListSubscriptionSubscriptionVariables>;
 export const NotificationsListMarkAsReadMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"notificationsListMarkAsReadMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"MarkReadAllNotificationsMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"markReadAllNotifications"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}}]}}]}}]} as unknown as DocumentNode<NotificationsListMarkAsReadMutationMutation, NotificationsListMarkAsReadMutationMutationVariables>;
-export const SubscriptionActivePlanDetailsQuery_Document = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"subscriptionActivePlanDetailsQuery_"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment_"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}},...SubscriptionActiveSubscriptionFragment_FragmentDoc.definitions]} as unknown as DocumentNode<SubscriptionActivePlanDetailsQuery_Query, SubscriptionActivePlanDetailsQuery_QueryVariables>;
+export const SubscriptionActivePlanDetailsQuery_Document = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"subscriptionActivePlanDetailsQuery_"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"subscriptionActiveSubscriptionFragment"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}},...SubscriptionActiveSubscriptionFragmentFragmentDoc.definitions]} as unknown as DocumentNode<SubscriptionActivePlanDetailsQuery_Query, SubscriptionActivePlanDetailsQuery_QueryVariables>;
 export const UseFavoriteDemoItemListCreateMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"useFavoriteDemoItemListCreateMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateFavoriteContentfulDemoItemMutationInput"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connections"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createFavoriteContentfulDemoItem"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"contentfulDemoItemFavoriteEdge"},"directives":[{"kind":"Directive","name":{"kind":"Name","value":"appendEdge"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"connections"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connections"}}}]}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"useFavoriteDemoItem_item"},"directives":[{"kind":"Directive","name":{"kind":"Name","value":"relay"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"mask"},"value":{"kind":"BooleanValue","value":false}}]}]}]}}]}}]}}]}},...UseFavoriteDemoItem_ItemFragmentDoc.definitions]} as unknown as DocumentNode<UseFavoriteDemoItemListCreateMutationMutation, UseFavoriteDemoItemListCreateMutationMutationVariables>;
 export const UseFavoriteDemoItemListDeleteMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"useFavoriteDemoItemListDeleteMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeleteFavoriteContentfulDemoItemMutationInput"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connections"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteFavoriteContentfulDemoItem"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deletedIds"},"directives":[{"kind":"Directive","name":{"kind":"Name","value":"deleteEdge"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"connections"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connections"}}}]}]}]}}]}}]} as unknown as DocumentNode<UseFavoriteDemoItemListDeleteMutationMutation, UseFavoriteDemoItemListDeleteMutationMutationVariables>;
 export const UseFavoriteDemoItemListQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"useFavoriteDemoItemListQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"allContentfulDemoItemFavorites"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"100"}}],"directives":[{"kind":"Directive","name":{"kind":"Name","value":"connection"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"key"},"value":{"kind":"StringValue","value":"useFavoriteDemoItemListQuery__allContentfulDemoItemFavorites","block":false}}]}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"useFavoriteDemoItem_item"},"directives":[{"kind":"Directive","name":{"kind":"Name","value":"relay"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"mask"},"value":{"kind":"BooleanValue","value":false}}]}]}]}}]}}]}}]}},...UseFavoriteDemoItem_ItemFragmentDoc.definitions]} as unknown as DocumentNode<UseFavoriteDemoItemListQueryQuery, UseFavoriteDemoItemListQueryQueryVariables>;
\ No newline at end of file
diff --git a/packages/webapp/src/tests/utils/fixtures.ts b/packages/webapp/src/tests/utils/fixtures.ts
index 0325d9aff..762254394 100644
--- a/packages/webapp/src/tests/utils/fixtures.ts
+++ b/packages/webapp/src/tests/utils/fixtures.ts
@@ -56,6 +56,7 @@ export const composeMockedQueryResult = (
     data,
     errors,
   };
+
   return {
     request: {
       query,
@@ -90,6 +91,7 @@ export const composeMockedListQueryResult = (
     },
     ...additionalData,
   } as Record<string, any>;
+
   return composeMockedQueryResult(query, {
     variables,
     data: composedData,