diff --git a/.changeset/five-days-film.md b/.changeset/five-days-film.md
new file mode 100644
index 00000000000..200313ef37b
--- /dev/null
+++ b/.changeset/five-days-film.md
@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+update e2e voucher code creation tests
diff --git a/.changeset/funny-badgers-begin.md b/.changeset/funny-badgers-begin.md
new file mode 100644
index 00000000000..ed3c4b47d22
--- /dev/null
+++ b/.changeset/funny-badgers-begin.md
@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": minor
+---
+
+Delay home queries to be non-blocking for the UI
diff --git a/cypress.config.js b/cypress.config.js
index 384450108a5..a7a6a49ebdb 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -14,7 +14,7 @@ module.exports = defineConfig({
   screenshotsFolder: "cypress/reports/mochareports",
   screenshotOnRunFailure: true,
   experimentalMemoryManagement: true,
-  numTestsKeptInMemory: 0,
+  numTestsKeptInMemory: 8,
   retries: {
     runMode: 2,
     openMode: 0,
diff --git a/cypress/elements/discounts/vouchers.js b/cypress/elements/discounts/vouchers.js
index 74fc77534d1..e4c0ec36c54 100644
--- a/cypress/elements/discounts/vouchers.js
+++ b/cypress/elements/discounts/vouchers.js
@@ -1,6 +1,9 @@
 export const VOUCHERS_SELECTORS = {
   createVoucherButton: "[data-test-id='create-voucher']",
-  voucherCodeInput: "[name='code']",
+  manualVoucherItem: "[data-test-id='manual']",
+  voucherCodeConfirmButton: "[data-test-id='confirm-button']",
+  voucherCodeAddButton: "[data-test-id='add-code-button']",
+  voucherCodeNameInput: "[data-test-id='enter-code-input']",
   discountRadioButtons: "[name='discountType']",
   percentageDiscountRadioButton:
     "[name='discountType'][value='VALUE_PERCENTAGE']",
@@ -17,12 +20,12 @@ export const VOUCHERS_SELECTORS = {
     usageLimitCheckbox: '[data-test-id="has-usage-limit"]',
     usageLimitTextField: '[data-test-id="usage-limit"]',
     applyOncePerCustomerCheckbox: '[data-test-id="apply-once-per-customer"]',
-    onlyForStaffCheckbox: '[data-test-id="only-for-staff"]'
+    onlyForStaffCheckbox: '[data-test-id="only-for-staff"]',
   },
   requirements: {
     minOrderValueCheckbox: '[name="requirementsPicker"][value="ORDER"]',
     minAmountOfItemsCheckbox: '[name="requirementsPicker"][value="ITEM"]',
     minCheckoutItemsQuantityInput: '[name="minCheckoutItemsQuantity"]',
-    minOrderValueInput: '[name="minSpent"]'
-  }
+    minOrderValueInput: '[name="minSpent"]',
+  },
 };
diff --git a/cypress/support/customCommands/user/index.js b/cypress/support/customCommands/user/index.js
index 0e62fd78cc6..18717a28c6d 100644
--- a/cypress/support/customCommands/user/index.js
+++ b/cypress/support/customCommands/user/index.js
@@ -19,10 +19,10 @@ Cypress.Commands.add("loginInShop", () => {
 });
 
 Cypress.Commands.add("visitHomePageLoggedViaApi", user => {
-  cy.addAliasToGraphRequest("Home")
+  cy.addAliasToGraphRequest("UserDetails")
     .loginUserViaRequest("auth", user)
     .visit(urlList.homePage)
-    .waitForRequestAndCheckIfNoErrors("@Home");
+    .waitForRequestAndCheckIfNoErrors("@UserDetails");
 });
 
 Cypress.Commands.add(
diff --git a/cypress/support/pages/discounts/vouchersPage.js b/cypress/support/pages/discounts/vouchersPage.js
index 8728da31ff0..1bd90b9c0e4 100644
--- a/cypress/support/pages/discounts/vouchersPage.js
+++ b/cypress/support/pages/discounts/vouchersPage.js
@@ -25,10 +25,11 @@ export function createVoucher({
 }) {
   cy.get(VOUCHERS_SELECTORS.createVoucherButton).click();
   selectChannelInDetailsPages(channelName);
-  cy.get(VOUCHERS_SELECTORS.voucherCodeInput)
-    .type(voucherCode)
-    .get(discountOption)
-    .click();
+  cy.get(VOUCHERS_SELECTORS.voucherCodeAddButton).click();
+  cy.get(VOUCHERS_SELECTORS.manualVoucherItem).click();
+  cy.get(VOUCHERS_SELECTORS.voucherCodeNameInput).type(voucherCode);
+  cy.get(VOUCHERS_SELECTORS.voucherCodeConfirmButton).click();
+  cy.get(discountOption).click();
   if (discountOption !== discountOptions.SHIPPING) {
     cy.get(VOUCHERS_SELECTORS.discountValueInputs).type(voucherValue, {
       force: true,
diff --git a/cypress/support/pages/homePage.js b/cypress/support/pages/homePage.js
index 09abf4a0cae..f501eafa5e6 100644
--- a/cypress/support/pages/homePage.js
+++ b/cypress/support/pages/homePage.js
@@ -4,11 +4,9 @@ import { HOMEPAGE_SELECTORS } from "../../elements/homePage/homePage-selectors";
 export function changeChannel(channelName) {
   cy.get(HEADER_SELECTORS.channelSelect)
     .click()
-    .addAliasToGraphRequest("Home")
     .get(HEADER_SELECTORS.channelSelectList)
     .contains(channelName)
-    .click()
-    .wait("@Home");
+    .click();
 }
 
 export function expectWelcomeMessageIncludes(name) {
@@ -21,37 +19,37 @@ export function expectWelcomeMessageIncludes(name) {
 
 export function getOrdersReadyToFulfillRegex(
   ordersReadyToFulfillBefore,
-  quantityOfNewOrders
+  quantityOfNewOrders,
 ) {
   const allOrdersReadyToFulfill =
     ordersReadyToFulfillBefore + quantityOfNewOrders;
   const notANumberRegex = "\\D*";
   return new RegExp(
-    `${notANumberRegex}${allOrdersReadyToFulfill}${notANumberRegex}`
+    `${notANumberRegex}${allOrdersReadyToFulfill}${notANumberRegex}`,
   );
 }
 
 export function getOrdersReadyForCaptureRegex(
   ordersReadyForCaptureBefore,
-  quantityOfNewOrders
+  quantityOfNewOrders,
 ) {
   const allOrdersReadyForCapture =
     ordersReadyForCaptureBefore + quantityOfNewOrders;
   const notANumberRegex = "\\D*";
   return new RegExp(
-    `${notANumberRegex}${allOrdersReadyForCapture}${notANumberRegex}`
+    `${notANumberRegex}${allOrdersReadyForCapture}${notANumberRegex}`,
   );
 }
 
 export function getProductsOutOfStockRegex(
   productsOutOfStockBefore,
-  quantityOfNewProducts
+  quantityOfNewProducts,
 ) {
   const allProductsOutOfStock =
     productsOutOfStockBefore + quantityOfNewProducts;
   const notANumberRegex = "\\D*";
   return new RegExp(
-    `${notANumberRegex}${allProductsOutOfStock}${notANumberRegex}`
+    `${notANumberRegex}${allProductsOutOfStock}${notANumberRegex}`,
   );
 }
 
@@ -67,7 +65,7 @@ export function getSalesAmountRegex(salesAmountBefore, addedAmount) {
   const totalAmountWithSeparators = `${totalAmountIntegerWithThousandsSeparator}${decimalSeparator}${totalAmountDecimalValue}`;
   const notANumberRegex = "\\D*";
   return new RegExp(
-    `${notANumberRegex}${totalAmountWithSeparators}${notANumberRegex}`
+    `${notANumberRegex}${totalAmountWithSeparators}${notANumberRegex}`,
   );
 }
 
diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json
index 870ce9fbaa7..cebe2a2f46b 100644
--- a/locale/defaultMessages.json
+++ b/locale/defaultMessages.json
@@ -214,6 +214,9 @@
     "context": "section description",
     "string": "Strategy defines the preference of warehouses for stock allocations and reservations."
   },
+  "/Fa+RP": {
+    "string": "Couldn't load top products"
+  },
   "/ILyIf": {
     "context": "tax classes menu header",
     "string": "Tax class label"
@@ -241,6 +244,9 @@
     "context": "page label",
     "string": "Hidden"
   },
+  "/U8FUp": {
+    "string": "Couldn't load activities"
+  },
   "/V7UOC": {
     "context": "unassign category from sale and save, button",
     "string": "Unassign and save"
diff --git a/src/components/SubMenu/SubMenu.tsx b/src/components/SubMenu/SubMenu.tsx
index aca49397c71..6661c3129d0 100644
--- a/src/components/SubMenu/SubMenu.tsx
+++ b/src/components/SubMenu/SubMenu.tsx
@@ -33,7 +33,12 @@ export const SubMenu = ({ menuItems }: SubMenuProps) => {
             borderBottomWidth={1}
             borderColor="neutralPlain"
           >
-            <Text variant="bodyStrong">{title}</Text>
+            <Text
+              data-test-id={String(title).toLowerCase()}
+              variant="bodyStrong"
+            >
+              {title}
+            </Text>
             <Text>{description}</Text>
           </List.Item>
         );
diff --git a/src/discounts/components/VoucherCodesAddButton/VoucherCodesAddButton.tsx b/src/discounts/components/VoucherCodesAddButton/VoucherCodesAddButton.tsx
index 37c9d5ccb62..282b5e8b446 100644
--- a/src/discounts/components/VoucherCodesAddButton/VoucherCodesAddButton.tsx
+++ b/src/discounts/components/VoucherCodesAddButton/VoucherCodesAddButton.tsx
@@ -55,6 +55,7 @@ export const VoucherCodesAddButton = ({
     <Popover open={isSubMenuOpen} onOpenChange={setSubMenuOpen}>
       <Popover.Trigger>
         <Button
+          data-test-id="add-code-button"
           type="button"
           backgroundColor="interactiveNeutralDefault"
           color="textNeutralContrasted"
diff --git a/src/discounts/components/VoucherCodesManualDialog/VoucherCodesManualDialog.tsx b/src/discounts/components/VoucherCodesManualDialog/VoucherCodesManualDialog.tsx
index 1eb5c047876..d818cd2e38a 100644
--- a/src/discounts/components/VoucherCodesManualDialog/VoucherCodesManualDialog.tsx
+++ b/src/discounts/components/VoucherCodesManualDialog/VoucherCodesManualDialog.tsx
@@ -55,6 +55,7 @@ export const VoucherCodesManualDialog = ({
         </DashboardModal.Title>
         <Box display="grid" gap={3} __width={390}>
           <Input
+            data-test-id="enter-code-input"
             name="code"
             type="text"
             size="small"
@@ -73,6 +74,7 @@ export const VoucherCodesManualDialog = ({
             {intl.formatMessage(buttonMessages.back)}
           </Button>
           <ConfirmButton
+            data-test-id="confirm-button"
             transitionState={confirmButtonTransitionState}
             onClick={handleSubmit}
           >
diff --git a/src/graphql/hooks.generated.ts b/src/graphql/hooks.generated.ts
index 63dd3823b4b..1cd20eac590 100644
--- a/src/graphql/hooks.generated.ts
+++ b/src/graphql/hooks.generated.ts
@@ -8843,8 +8843,8 @@ export function useCustomerGiftCardListLazyQuery(baseOptions?: ApolloReactHooks.
 export type CustomerGiftCardListQueryHookResult = ReturnType<typeof useCustomerGiftCardListQuery>;
 export type CustomerGiftCardListLazyQueryHookResult = ReturnType<typeof useCustomerGiftCardListLazyQuery>;
 export type CustomerGiftCardListQueryResult = Apollo.QueryResult<Types.CustomerGiftCardListQuery, Types.CustomerGiftCardListQueryVariables>;
-export const HomeDocument = gql`
-    query Home($channel: String!, $datePeriod: DateRangeInput!, $hasPermissionToManageProducts: Boolean!, $hasPermissionToManageOrders: Boolean!) {
+export const HomeAnaliticsDocument = gql`
+    query HomeAnalitics($channel: String!, $datePeriod: DateRangeInput!, $hasPermissionToManageOrders: Boolean!) {
   salesToday: ordersTotal(period: TODAY, channel: $channel) @include(if: $hasPermissionToManageOrders) {
     gross {
       amount
@@ -8854,18 +8854,93 @@ export const HomeDocument = gql`
   ordersToday: orders(filter: {created: $datePeriod}, channel: $channel) @include(if: $hasPermissionToManageOrders) {
     totalCount
   }
-  ordersToFulfill: orders(filter: {status: READY_TO_FULFILL}, channel: $channel) @include(if: $hasPermissionToManageOrders) {
-    totalCount
-  }
-  ordersToCapture: orders(filter: {status: READY_TO_CAPTURE}, channel: $channel) @include(if: $hasPermissionToManageOrders) {
-    totalCount
-  }
-  productsOutOfStock: products(
-    filter: {stockAvailability: OUT_OF_STOCK}
-    channel: $channel
-  ) {
-    totalCount
+}
+    `;
+
+/**
+ * __useHomeAnaliticsQuery__
+ *
+ * To run a query within a React component, call `useHomeAnaliticsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useHomeAnaliticsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useHomeAnaliticsQuery({
+ *   variables: {
+ *      channel: // value for 'channel'
+ *      datePeriod: // value for 'datePeriod'
+ *      hasPermissionToManageOrders: // value for 'hasPermissionToManageOrders'
+ *   },
+ * });
+ */
+export function useHomeAnaliticsQuery(baseOptions: ApolloReactHooks.QueryHookOptions<Types.HomeAnaliticsQuery, Types.HomeAnaliticsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return ApolloReactHooks.useQuery<Types.HomeAnaliticsQuery, Types.HomeAnaliticsQueryVariables>(HomeAnaliticsDocument, options);
+      }
+export function useHomeAnaliticsLazyQuery(baseOptions?: ApolloReactHooks.LazyQueryHookOptions<Types.HomeAnaliticsQuery, Types.HomeAnaliticsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return ApolloReactHooks.useLazyQuery<Types.HomeAnaliticsQuery, Types.HomeAnaliticsQueryVariables>(HomeAnaliticsDocument, options);
+        }
+export type HomeAnaliticsQueryHookResult = ReturnType<typeof useHomeAnaliticsQuery>;
+export type HomeAnaliticsLazyQueryHookResult = ReturnType<typeof useHomeAnaliticsLazyQuery>;
+export type HomeAnaliticsQueryResult = Apollo.QueryResult<Types.HomeAnaliticsQuery, Types.HomeAnaliticsQueryVariables>;
+export const HomeActivitiesDocument = gql`
+    query HomeActivities($hasPermissionToManageOrders: Boolean!) {
+  activities: homepageEvents(last: 10) @include(if: $hasPermissionToManageOrders) {
+    edges {
+      node {
+        amount
+        composedId
+        date
+        email
+        emailType
+        id
+        message
+        orderNumber
+        oversoldItems
+        quantity
+        type
+        user {
+          id
+          email
+        }
+      }
+    }
   }
+}
+    `;
+
+/**
+ * __useHomeActivitiesQuery__
+ *
+ * To run a query within a React component, call `useHomeActivitiesQuery` and pass it any options that fit your needs.
+ * When your component renders, `useHomeActivitiesQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useHomeActivitiesQuery({
+ *   variables: {
+ *      hasPermissionToManageOrders: // value for 'hasPermissionToManageOrders'
+ *   },
+ * });
+ */
+export function useHomeActivitiesQuery(baseOptions: ApolloReactHooks.QueryHookOptions<Types.HomeActivitiesQuery, Types.HomeActivitiesQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return ApolloReactHooks.useQuery<Types.HomeActivitiesQuery, Types.HomeActivitiesQueryVariables>(HomeActivitiesDocument, options);
+      }
+export function useHomeActivitiesLazyQuery(baseOptions?: ApolloReactHooks.LazyQueryHookOptions<Types.HomeActivitiesQuery, Types.HomeActivitiesQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return ApolloReactHooks.useLazyQuery<Types.HomeActivitiesQuery, Types.HomeActivitiesQueryVariables>(HomeActivitiesDocument, options);
+        }
+export type HomeActivitiesQueryHookResult = ReturnType<typeof useHomeActivitiesQuery>;
+export type HomeActivitiesLazyQueryHookResult = ReturnType<typeof useHomeActivitiesLazyQuery>;
+export type HomeActivitiesQueryResult = Apollo.QueryResult<Types.HomeActivitiesQuery, Types.HomeActivitiesQueryVariables>;
+export const HomeTopProductsDocument = gql`
+    query HomeTopProducts($channel: String!, $hasPermissionToManageProducts: Boolean!) {
   productTopToday: reportProductSales(period: TODAY, first: 5, channel: $channel) @include(if: $hasPermissionToManageProducts) {
     edges {
       node {
@@ -8893,60 +8968,82 @@ export const HomeDocument = gql`
       }
     }
   }
-  activities: homepageEvents(last: 10) @include(if: $hasPermissionToManageOrders) {
-    edges {
-      node {
-        amount
-        composedId
-        date
-        email
-        emailType
-        id
-        message
-        orderNumber
-        oversoldItems
-        quantity
-        type
-        user {
-          id
-          email
-        }
+}
+    `;
+
+/**
+ * __useHomeTopProductsQuery__
+ *
+ * To run a query within a React component, call `useHomeTopProductsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useHomeTopProductsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useHomeTopProductsQuery({
+ *   variables: {
+ *      channel: // value for 'channel'
+ *      hasPermissionToManageProducts: // value for 'hasPermissionToManageProducts'
+ *   },
+ * });
+ */
+export function useHomeTopProductsQuery(baseOptions: ApolloReactHooks.QueryHookOptions<Types.HomeTopProductsQuery, Types.HomeTopProductsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return ApolloReactHooks.useQuery<Types.HomeTopProductsQuery, Types.HomeTopProductsQueryVariables>(HomeTopProductsDocument, options);
       }
-    }
+export function useHomeTopProductsLazyQuery(baseOptions?: ApolloReactHooks.LazyQueryHookOptions<Types.HomeTopProductsQuery, Types.HomeTopProductsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return ApolloReactHooks.useLazyQuery<Types.HomeTopProductsQuery, Types.HomeTopProductsQueryVariables>(HomeTopProductsDocument, options);
+        }
+export type HomeTopProductsQueryHookResult = ReturnType<typeof useHomeTopProductsQuery>;
+export type HomeTopProductsLazyQueryHookResult = ReturnType<typeof useHomeTopProductsLazyQuery>;
+export type HomeTopProductsQueryResult = Apollo.QueryResult<Types.HomeTopProductsQuery, Types.HomeTopProductsQueryVariables>;
+export const HomeNotificationsDocument = gql`
+    query homeNotifications($channel: String!, $hasPermissionToManageOrders: Boolean!) {
+  ordersToFulfill: orders(filter: {status: READY_TO_FULFILL}, channel: $channel) @include(if: $hasPermissionToManageOrders) {
+    totalCount
+  }
+  ordersToCapture: orders(filter: {status: READY_TO_CAPTURE}, channel: $channel) @include(if: $hasPermissionToManageOrders) {
+    totalCount
+  }
+  productsOutOfStock: products(
+    filter: {stockAvailability: OUT_OF_STOCK}
+    channel: $channel
+  ) {
+    totalCount
   }
 }
     `;
 
 /**
- * __useHomeQuery__
+ * __useHomeNotificationsQuery__
  *
- * To run a query within a React component, call `useHomeQuery` and pass it any options that fit your needs.
- * When your component renders, `useHomeQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * To run a query within a React component, call `useHomeNotificationsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useHomeNotificationsQuery` returns an object from Apollo Client that contains loading, error, and data properties
  * you can use to render your UI.
  *
  * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
  *
  * @example
- * const { data, loading, error } = useHomeQuery({
+ * const { data, loading, error } = useHomeNotificationsQuery({
  *   variables: {
  *      channel: // value for 'channel'
- *      datePeriod: // value for 'datePeriod'
- *      hasPermissionToManageProducts: // value for 'hasPermissionToManageProducts'
  *      hasPermissionToManageOrders: // value for 'hasPermissionToManageOrders'
  *   },
  * });
  */
-export function useHomeQuery(baseOptions: ApolloReactHooks.QueryHookOptions<Types.HomeQuery, Types.HomeQueryVariables>) {
+export function useHomeNotificationsQuery(baseOptions: ApolloReactHooks.QueryHookOptions<Types.HomeNotificationsQuery, Types.HomeNotificationsQueryVariables>) {
         const options = {...defaultOptions, ...baseOptions}
-        return ApolloReactHooks.useQuery<Types.HomeQuery, Types.HomeQueryVariables>(HomeDocument, options);
+        return ApolloReactHooks.useQuery<Types.HomeNotificationsQuery, Types.HomeNotificationsQueryVariables>(HomeNotificationsDocument, options);
       }
-export function useHomeLazyQuery(baseOptions?: ApolloReactHooks.LazyQueryHookOptions<Types.HomeQuery, Types.HomeQueryVariables>) {
+export function useHomeNotificationsLazyQuery(baseOptions?: ApolloReactHooks.LazyQueryHookOptions<Types.HomeNotificationsQuery, Types.HomeNotificationsQueryVariables>) {
           const options = {...defaultOptions, ...baseOptions}
-          return ApolloReactHooks.useLazyQuery<Types.HomeQuery, Types.HomeQueryVariables>(HomeDocument, options);
+          return ApolloReactHooks.useLazyQuery<Types.HomeNotificationsQuery, Types.HomeNotificationsQueryVariables>(HomeNotificationsDocument, options);
         }
-export type HomeQueryHookResult = ReturnType<typeof useHomeQuery>;
-export type HomeLazyQueryHookResult = ReturnType<typeof useHomeLazyQuery>;
-export type HomeQueryResult = Apollo.QueryResult<Types.HomeQuery, Types.HomeQueryVariables>;
+export type HomeNotificationsQueryHookResult = ReturnType<typeof useHomeNotificationsQuery>;
+export type HomeNotificationsLazyQueryHookResult = ReturnType<typeof useHomeNotificationsLazyQuery>;
+export type HomeNotificationsQueryResult = Apollo.QueryResult<Types.HomeNotificationsQuery, Types.HomeNotificationsQueryVariables>;
 export const MenuCreateDocument = gql`
     mutation MenuCreate($input: MenuCreateInput!) {
   menuCreate(input: $input) {
diff --git a/src/graphql/types.generated.ts b/src/graphql/types.generated.ts
index ee1084f3472..3799b06281c 100644
--- a/src/graphql/types.generated.ts
+++ b/src/graphql/types.generated.ts
@@ -10277,15 +10277,37 @@ export type CustomerGiftCardListQueryVariables = Exact<{
 
 export type CustomerGiftCardListQuery = { __typename: 'Query', giftCards: { __typename: 'GiftCardCountableConnection', edges: Array<{ __typename: 'GiftCardCountableEdge', node: { __typename: 'GiftCard', id: string, last4CodeChars: string, expiryDate: any | null, isActive: boolean, currentBalance: { __typename: 'Money', amount: number, currency: string } } }> } | null };
 
-export type HomeQueryVariables = Exact<{
+export type HomeAnaliticsQueryVariables = Exact<{
   channel: Scalars['String'];
   datePeriod: DateRangeInput;
+  hasPermissionToManageOrders: Scalars['Boolean'];
+}>;
+
+
+export type HomeAnaliticsQuery = { __typename: 'Query', salesToday: { __typename: 'TaxedMoney', gross: { __typename: 'Money', amount: number, currency: string } } | null, ordersToday: { __typename: 'OrderCountableConnection', totalCount: number | null } | null };
+
+export type HomeActivitiesQueryVariables = Exact<{
+  hasPermissionToManageOrders: Scalars['Boolean'];
+}>;
+
+
+export type HomeActivitiesQuery = { __typename: 'Query', activities: { __typename: 'OrderEventCountableConnection', edges: Array<{ __typename: 'OrderEventCountableEdge', node: { __typename: 'OrderEvent', amount: number | null, composedId: string | null, date: any | null, email: string | null, emailType: OrderEventsEmailsEnum | null, id: string, message: string | null, orderNumber: string | null, oversoldItems: Array<string> | null, quantity: number | null, type: OrderEventsEnum | null, user: { __typename: 'User', id: string, email: string } | null } }> } | null };
+
+export type HomeTopProductsQueryVariables = Exact<{
+  channel: Scalars['String'];
   hasPermissionToManageProducts: Scalars['Boolean'];
+}>;
+
+
+export type HomeTopProductsQuery = { __typename: 'Query', productTopToday: { __typename: 'ProductVariantCountableConnection', edges: Array<{ __typename: 'ProductVariantCountableEdge', node: { __typename: 'ProductVariant', id: string, quantityOrdered: number | null, revenue: { __typename: 'TaxedMoney', gross: { __typename: 'Money', amount: number, currency: string } } | null, attributes: Array<{ __typename: 'SelectedAttribute', values: Array<{ __typename: 'AttributeValue', id: string, name: string | null }> }>, product: { __typename: 'Product', id: string, name: string, thumbnail: { __typename: 'Image', url: string } | null } } }> } | null };
+
+export type HomeNotificationsQueryVariables = Exact<{
+  channel: Scalars['String'];
   hasPermissionToManageOrders: Scalars['Boolean'];
 }>;
 
 
-export type HomeQuery = { __typename: 'Query', salesToday: { __typename: 'TaxedMoney', gross: { __typename: 'Money', amount: number, currency: string } } | null, ordersToday: { __typename: 'OrderCountableConnection', totalCount: number | null } | null, ordersToFulfill: { __typename: 'OrderCountableConnection', totalCount: number | null } | null, ordersToCapture: { __typename: 'OrderCountableConnection', totalCount: number | null } | null, productsOutOfStock: { __typename: 'ProductCountableConnection', totalCount: number | null } | null, productTopToday: { __typename: 'ProductVariantCountableConnection', edges: Array<{ __typename: 'ProductVariantCountableEdge', node: { __typename: 'ProductVariant', id: string, quantityOrdered: number | null, revenue: { __typename: 'TaxedMoney', gross: { __typename: 'Money', amount: number, currency: string } } | null, attributes: Array<{ __typename: 'SelectedAttribute', values: Array<{ __typename: 'AttributeValue', id: string, name: string | null }> }>, product: { __typename: 'Product', id: string, name: string, thumbnail: { __typename: 'Image', url: string } | null } } }> } | null, activities: { __typename: 'OrderEventCountableConnection', edges: Array<{ __typename: 'OrderEventCountableEdge', node: { __typename: 'OrderEvent', amount: number | null, composedId: string | null, date: any | null, email: string | null, emailType: OrderEventsEmailsEnum | null, id: string, message: string | null, orderNumber: string | null, oversoldItems: Array<string> | null, quantity: number | null, type: OrderEventsEnum | null, user: { __typename: 'User', id: string, email: string } | null } }> } | null };
+export type HomeNotificationsQuery = { __typename: 'Query', ordersToFulfill: { __typename: 'OrderCountableConnection', totalCount: number | null } | null, ordersToCapture: { __typename: 'OrderCountableConnection', totalCount: number | null } | null, productsOutOfStock: { __typename: 'ProductCountableConnection', totalCount: number | null } | null };
 
 export type MenuCreateMutationVariables = Exact<{
   input: MenuCreateInput;
diff --git a/src/home/components/HomeActivityCard/HomeActivityCard.tsx b/src/home/components/HomeActivityCard/HomeActivityCard.tsx
index 7877d1bd29c..1abfebf0499 100644
--- a/src/home/components/HomeActivityCard/HomeActivityCard.tsx
+++ b/src/home/components/HomeActivityCard/HomeActivityCard.tsx
@@ -1,8 +1,7 @@
 import { DashboardCard } from "@dashboard/components/Card";
 import { DateTime } from "@dashboard/components/Date";
-import Skeleton from "@dashboard/components/Skeleton";
-import { Activities } from "@dashboard/home/types";
-import { Box, List, Text, useTheme } from "@saleor/macaw-ui-next";
+import { Activities, HomeData } from "@dashboard/home/types";
+import { Box, List, Skeleton, Text, useTheme } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
@@ -10,7 +9,7 @@ import { renderCollection } from "../../../misc";
 import { getActivityMessage } from "./activityMessages";
 
 interface HomeActivityCardProps {
-  activities: Activities;
+  activities: HomeData<Activities>;
   testId?: string;
 }
 
@@ -20,20 +19,50 @@ export const HomeActivityCard = ({
 }: HomeActivityCardProps) => {
   const intl = useIntl();
   const { themeValues } = useTheme();
+  const title = intl.formatMessage({
+    id: "BXkF8Z",
+    defaultMessage: "Activity",
+    description: "header",
+  });
+
+  if (activities.hasError) {
+    return (
+      <DashboardCard data-test-id={testId}>
+        <DashboardCard.Title>{title}</DashboardCard.Title>
+        <DashboardCard.Content>
+          <Text color="textNeutralSubdued">
+            <FormattedMessage
+              id="/U8FUp"
+              defaultMessage="Couldn't load activities"
+            />
+          </Text>
+        </DashboardCard.Content>
+      </DashboardCard>
+    );
+  }
+
+  if (activities.loading) {
+    return (
+      <DashboardCard data-test-id={testId}>
+        <DashboardCard.Title>{title}</DashboardCard.Title>
+        <DashboardCard.Content>
+          <Box display="flex" flexDirection="column" gap={5}>
+            <Skeleton />
+            <Skeleton __width="80%" />
+            <Skeleton />
+          </Box>
+        </DashboardCard.Content>
+      </DashboardCard>
+    );
+  }
 
   return (
     <DashboardCard data-test-id={testId}>
-      <DashboardCard.Title>
-        {intl.formatMessage({
-          id: "BXkF8Z",
-          defaultMessage: "Activity",
-          description: "header",
-        })}
-      </DashboardCard.Title>
+      <DashboardCard.Title>{title}</DashboardCard.Title>
       <DashboardCard.Content>
         <List>
           {renderCollection(
-            activities,
+            activities.data,
             (activity, activityId) => (
               <List.Item
                 key={activityId}
diff --git a/src/home/components/HomeActivityCard/activityMessages.ts b/src/home/components/HomeActivityCard/activityMessages.ts
index e41d49f795e..adeede757aa 100644
--- a/src/home/components/HomeActivityCard/activityMessages.ts
+++ b/src/home/components/HomeActivityCard/activityMessages.ts
@@ -1,5 +1,5 @@
 // @ts-strict-ignore
-import { HomeQuery, OrderEventsEnum } from "@dashboard/graphql";
+import { HomeActivitiesQuery, OrderEventsEnum } from "@dashboard/graphql";
 import { defineMessages, IntlShape } from "react-intl";
 
 const messages = defineMessages({
@@ -22,7 +22,7 @@ const messages = defineMessages({
 });
 
 export const getActivityMessage = (
-  activity: HomeQuery["activities"]["edges"][0]["node"],
+  activity: HomeActivitiesQuery["activities"]["edges"][0]["node"],
   intl: IntlShape,
 ) => {
   switch (activity.type) {
diff --git a/src/home/components/HomeNotificationList/HomeNotificationList.tsx b/src/home/components/HomeNotificationList/HomeNotificationList.tsx
index 44caa9c31b6..61f239040b8 100644
--- a/src/home/components/HomeNotificationList/HomeNotificationList.tsx
+++ b/src/home/components/HomeNotificationList/HomeNotificationList.tsx
@@ -1,5 +1,6 @@
 import RequirePermissions from "@dashboard/components/RequirePermissions";
 import { PermissionEnum } from "@dashboard/graphql";
+import { HomeData, Notifications } from "@dashboard/home/types";
 import { List } from "@saleor/macaw-ui-next";
 import React from "react";
 import { useIntl } from "react-intl";
@@ -13,9 +14,7 @@ import {
 } from "./utils";
 
 interface HomeNotificationTableProps {
-  ordersToCapture: number;
-  ordersToFulfill: number;
-  productsOutOfStock: number;
+  notifications: HomeData<Notifications>;
   createNewChannelHref: string;
   ordersToFulfillHref: string;
   ordersToCaptureHref: string;
@@ -24,24 +23,30 @@ interface HomeNotificationTableProps {
 }
 
 export const HomeNotificationList = ({
+  notifications,
   createNewChannelHref,
   ordersToFulfillHref,
   ordersToCaptureHref,
   productsOutOfStockHref,
-  ordersToCapture,
-  ordersToFulfill,
-  productsOutOfStock,
+
   noChannel,
 }: HomeNotificationTableProps) => {
   const intl = useIntl();
 
+  if (notifications.hasError) {
+    return null;
+  }
+
   return (
     <List>
       {noChannel && (
         <RequirePermissions
           requiredPermissions={[PermissionEnum.MANAGE_CHANNELS]}
         >
-          <HomeNotificationListItem linkUrl={createNewChannelHref}>
+          <HomeNotificationListItem
+            loading={notifications.loading}
+            linkUrl={createNewChannelHref}
+          >
             {intl.formatMessage(messages.createNewChannel)}
           </HomeNotificationListItem>
         </RequirePermissions>
@@ -49,17 +54,22 @@ export const HomeNotificationList = ({
 
       <RequirePermissions requiredPermissions={[PermissionEnum.MANAGE_ORDERS]}>
         <HomeNotificationListItem
+          loading={notifications.loading}
           linkUrl={ordersToFulfillHref}
           dataTestId="orders-to-fulfill"
         >
-          {getOrderToFulfillText(ordersToFulfill, intl)}
+          {getOrderToFulfillText(notifications.data.ordersToFulfill ?? 0, intl)}
         </HomeNotificationListItem>
 
         <HomeNotificationListItem
+          loading={notifications.loading}
           linkUrl={ordersToCaptureHref}
           dataTestId="orders-to-capture"
         >
-          {getOrdersToCaptureText(ordersToCapture, intl)}
+          {getOrdersToCaptureText(
+            notifications.data.ordersToCapture ?? 0,
+            intl,
+          )}
         </HomeNotificationListItem>
       </RequirePermissions>
 
@@ -67,10 +77,14 @@ export const HomeNotificationList = ({
         requiredPermissions={[PermissionEnum.MANAGE_PRODUCTS]}
       >
         <HomeNotificationListItem
+          loading={notifications.loading}
           linkUrl={productsOutOfStockHref}
           dataTestId="products-out-of-stock"
         >
-          {getProductsOutOfStockText(productsOutOfStock, intl)}
+          {getProductsOutOfStockText(
+            notifications.data.productsOutOfStock ?? 0,
+            intl,
+          )}
         </HomeNotificationListItem>
       </RequirePermissions>
     </List>
diff --git a/src/home/components/HomeNotificationList/HomeNotificationListItem.tsx b/src/home/components/HomeNotificationList/HomeNotificationListItem.tsx
index ac7a202e035..712eabe908e 100644
--- a/src/home/components/HomeNotificationList/HomeNotificationListItem.tsx
+++ b/src/home/components/HomeNotificationList/HomeNotificationListItem.tsx
@@ -2,6 +2,7 @@ import {
   Box,
   ChevronRightIcon,
   List,
+  Skeleton,
   sprinkles,
   Text,
 } from "@saleor/macaw-ui-next";
@@ -12,32 +13,60 @@ interface HomeNotificationListItemProps {
   dataTestId?: string;
   linkUrl: string;
   children: ReactNode;
+  loading: boolean;
 }
 
 export const HomeNotificationListItem = ({
   dataTestId,
   linkUrl,
   children,
-}: HomeNotificationListItemProps) => (
-  <List.Item
-    borderColor="neutralPlain"
-    borderWidth={1}
-    borderBottomStyle="solid"
-    data-test-id={dataTestId}
-  >
-    <Link
-      className={sprinkles({ width: "100%", paddingX: 3, paddingY: 4 })}
-      to={linkUrl}
-    >
-      <Box
-        display="flex"
-        justifyContent="space-between"
-        alignItems="center"
-        width="100%"
+  loading,
+}: HomeNotificationListItemProps) => {
+  if (loading) {
+    return (
+      <Listitem dataTestId={dataTestId}>
+        <Box width="100%" paddingX={3} paddingY={6}>
+          <Skeleton />
+        </Box>
+      </Listitem>
+    );
+  }
+
+  return (
+    <Listitem dataTestId={dataTestId}>
+      <Link
+        className={sprinkles({ width: "100%", paddingX: 3, paddingY: 4 })}
+        to={linkUrl}
       >
-        <Text size="small">{children}</Text>
-        <ChevronRightIcon />
-      </Box>
-    </Link>
-  </List.Item>
-);
+        <Box
+          display="flex"
+          justifyContent="space-between"
+          alignItems="center"
+          width="100%"
+        >
+          <Text size="small">{children}</Text>
+          <ChevronRightIcon />
+        </Box>
+      </Link>
+    </Listitem>
+  );
+};
+
+function Listitem({
+  children,
+  dataTestId,
+}: {
+  children: ReactNode;
+  dataTestId?: string;
+}) {
+  return (
+    <List.Item
+      borderColor="neutralPlain"
+      borderWidth={1}
+      borderBottomStyle="solid"
+      data-test-id={dataTestId}
+    >
+      {children}
+    </List.Item>
+  );
+}
diff --git a/src/home/components/HomePage/HomePage.stories.tsx b/src/home/components/HomePage/HomePage.stories.tsx
index 37a5bf7e8b9..598f2b8f1ec 100644
--- a/src/home/components/HomePage/HomePage.stories.tsx
+++ b/src/home/components/HomePage/HomePage.stories.tsx
@@ -2,28 +2,53 @@
 import placeholderImage from "@assets/images/placeholder60x60.png";
 import { adminUserPermissions } from "@dashboard/fixtures";
 import { PermissionEnum } from "@dashboard/graphql";
-import { shop as shopFixture } from "@dashboard/home/fixtures";
+import {
+  activities,
+  analitics,
+  notifications,
+  topProducts as topProductsFixture,
+} from "@dashboard/home/fixtures";
 import { mapEdgesToItems } from "@dashboard/utils/maps";
 import React from "react";
 
 import { MockedUserProvider } from "../../../../.storybook/helpers";
 import HomePageComponent, { HomePageProps } from "./HomePage";
 
-const shop = shopFixture(placeholderImage);
+const productTopToday = topProductsFixture(placeholderImage);
 
 const homePageProps: Omit<HomePageProps, "classes"> = {
-  activities: mapEdgesToItems(shop.activities),
+  activities: {
+    data: mapEdgesToItems(activities),
+    loading: false,
+    hasError: false,
+  },
+  notifications: {
+    data: {
+      ordersToCapture: notifications.ordersToCapture.totalCount,
+      ordersToFulfill: notifications.ordersToFulfill.totalCount,
+      productsOutOfStock: notifications.productsOutOfStock.totalCount,
+    },
+    loading: false,
+    hasError: false,
+  },
+  analitics: {
+    data: {
+      orders: analitics.ordersToday.totalCount,
+      sales: analitics.salesToday.gross,
+    },
+    loading: false,
+    hasError: false,
+  },
   noChannel: false,
   createNewChannelHref: "",
   ordersToFulfillHref: "",
   ordersToCaptureHref: "",
   productsOutOfStockHref: "",
-  orders: shop.ordersToday.totalCount,
-  ordersToCapture: shop.ordersToCapture.totalCount,
-  ordersToFulfill: shop.ordersToFulfill.totalCount,
-  productsOutOfStock: shop.productsOutOfStock.totalCount,
-  sales: shop.salesToday.gross,
-  topProducts: mapEdgesToItems(shop.productTopToday),
+  topProducts: {
+    data: mapEdgesToItems(productTopToday),
+    loading: false,
+    hasError: false,
+  },
   userName: "admin@example.com",
 };
 
@@ -46,19 +71,69 @@ export const Default = () => <HomePage {...homePageProps} />;
 export const Loading = () => (
   <HomePage
     {...homePageProps}
-    activities={undefined}
-    orders={undefined}
-    ordersToCapture={undefined}
-    ordersToFulfill={undefined}
-    productsOutOfStock={undefined}
-    sales={undefined}
-    topProducts={undefined}
-    userName={undefined}
+    activities={{
+      data: [],
+      loading: true,
+      hasError: false,
+    }}
+    notifications={{
+      data: {},
+      loading: true,
+      hasError: false,
+    }}
+    analitics={{
+      data: {},
+      loading: true,
+      hasError: false,
+    }}
+    topProducts={{
+      data: [],
+      loading: true,
+      hasError: false,
+    }}
+  />
+);
+
+export const Error = () => (
+  <HomePage
+    {...homePageProps}
+    activities={{
+      data: [],
+      loading: false,
+      hasError: true,
+    }}
+    notifications={{
+      data: {},
+      loading: false,
+      hasError: true,
+    }}
+    analitics={{
+      data: {},
+      loading: false,
+      hasError: true,
+    }}
+    topProducts={{
+      data: [],
+      loading: false,
+      hasError: true,
+    }}
   />
 );
 
 export const NoData = () => (
-  <HomePage {...homePageProps} topProducts={[]} activities={[]} />
+  <HomePage
+    {...homePageProps}
+    topProducts={{
+      data: [],
+      loading: false,
+      hasError: false,
+    }}
+    activities={{
+      data: [],
+      loading: false,
+      hasError: false,
+    }}
+  />
 );
 
 export const NoPermissions = () => (
diff --git a/src/home/components/HomePage/HomePage.tsx b/src/home/components/HomePage/HomePage.tsx
index 6ac5b2a0821..56e8eb47ce2 100644
--- a/src/home/components/HomePage/HomePage.tsx
+++ b/src/home/components/HomePage/HomePage.tsx
@@ -3,10 +3,15 @@ import CardSpacer from "@dashboard/components/CardSpacer";
 import { DetailPageLayout } from "@dashboard/components/Layouts";
 import Money from "@dashboard/components/Money";
 import RequirePermissions from "@dashboard/components/RequirePermissions";
-import Skeleton from "@dashboard/components/Skeleton";
-import { HomeQuery, PermissionEnum } from "@dashboard/graphql";
-import { Activities, ProductTopToday } from "@dashboard/home/types";
-import { Box } from "@saleor/macaw-ui-next";
+import { PermissionEnum } from "@dashboard/graphql";
+import {
+  Activities,
+  Analitics,
+  HomeData,
+  Notifications,
+  ProductTopToday,
+} from "@dashboard/home/types";
+import { Box, Skeleton } from "@saleor/macaw-ui-next";
 import React from "react";
 import { useIntl } from "react-intl";
 
@@ -18,13 +23,10 @@ import { HomeProductList } from "../HomeProductList";
 import { homePageMessages } from "./messages";
 
 export interface HomePageProps {
-  activities: Activities;
-  orders: number | null;
-  ordersToCapture: number | null;
-  ordersToFulfill: number | null;
-  productsOutOfStock: number;
-  sales: NonNullable<HomeQuery["salesToday"]>["gross"];
-  topProducts: ProductTopToday | null;
+  activities: HomeData<Activities>;
+  analitics: HomeData<Analitics>;
+  topProducts: HomeData<ProductTopToday>;
+  notifications: HomeData<Notifications>;
   userName: string;
   createNewChannelHref: string;
   ordersToFulfillHref: string;
@@ -36,17 +38,14 @@ export interface HomePageProps {
 const HomePage: React.FC<HomePageProps> = props => {
   const {
     userName,
-    orders,
-    sales,
+    analitics,
     topProducts,
     activities,
     createNewChannelHref,
     ordersToFulfillHref,
     ordersToCaptureHref,
     productsOutOfStockHref,
-    ordersToCapture = 0,
-    ordersToFulfill = 0,
-    productsOutOfStock = 0,
+    notifications,
     noChannel,
   } = props;
   const intl = useIntl();
@@ -70,10 +69,10 @@ const HomePage: React.FC<HomePageProps> = props => {
                 title={intl.formatMessage(homePageMessages.salesCardTitle)}
                 testId="sales-analytics"
               >
-                {noChannel ? (
+                {noChannel || analitics.hasError ? (
                   0
-                ) : sales ? (
-                  <Money money={sales} />
+                ) : !analitics.loading ? (
+                  <Money money={analitics.data.sales} />
                 ) : (
                   <Skeleton style={{ width: "5em" }} />
                 )}
@@ -82,10 +81,10 @@ const HomePage: React.FC<HomePageProps> = props => {
                 title={intl.formatMessage(homePageMessages.ordersCardTitle)}
                 testId="orders-analytics"
               >
-                {noChannel ? (
+                {noChannel || analitics.hasError ? (
                   0
-                ) : orders !== undefined ? (
-                  orders
+                ) : !analitics.loading ? (
+                  analitics.data.orders
                 ) : (
                   <Skeleton style={{ width: "5em" }} />
                 )}
@@ -97,9 +96,7 @@ const HomePage: React.FC<HomePageProps> = props => {
             ordersToFulfillHref={ordersToFulfillHref}
             ordersToCaptureHref={ordersToCaptureHref}
             productsOutOfStockHref={productsOutOfStockHref}
-            ordersToCapture={ordersToCapture ?? 0}
-            ordersToFulfill={ordersToFulfill ?? 0}
-            productsOutOfStock={productsOutOfStock}
+            notifications={notifications}
             noChannel={noChannel}
           />
           <CardSpacer />
diff --git a/src/home/components/HomeProductList/HomeProductList.tsx b/src/home/components/HomeProductList/HomeProductList.tsx
index d82a7c08060..263e96d6483 100644
--- a/src/home/components/HomeProductList/HomeProductList.tsx
+++ b/src/home/components/HomeProductList/HomeProductList.tsx
@@ -1,8 +1,7 @@
 import Money from "@dashboard/components/Money";
-import Skeleton from "@dashboard/components/Skeleton";
-import { ProductTopToday } from "@dashboard/home/types";
+import { HomeData, ProductTopToday } from "@dashboard/home/types";
 import { productVariantEditUrl } from "@dashboard/products/urls";
-import { Box, Text } from "@saleor/macaw-ui-next";
+import { Box, Skeleton, Text } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
@@ -12,7 +11,7 @@ import { generateAttributesInfo } from "./variant";
 
 interface HomeProductListProps {
   testId?: string;
-  topProducts: ProductTopToday;
+  topProducts: HomeData<ProductTopToday>;
 }
 
 export const HomeProductList = ({
@@ -20,19 +19,51 @@ export const HomeProductList = ({
   testId,
 }: HomeProductListProps) => {
   const intl = useIntl();
+  const title = intl.formatMessage({
+    id: "e08xWz",
+    defaultMessage: "Top products",
+    description: "header",
+  });
+
+  if (topProducts.hasError) {
+    return (
+      <Box data-test-id={testId}>
+        <Text variant="heading" display="block" paddingTop={7} marginBottom={2}>
+          {title}
+        </Text>
+        <Text color="textNeutralSubdued">
+          <FormattedMessage
+            id="/Fa+RP"
+            defaultMessage="Couldn't load top products"
+          />
+        </Text>
+      </Box>
+    );
+  }
+
+  if (topProducts.loading) {
+    return (
+      <Box data-test-id={testId}>
+        <Text variant="heading" display="block" paddingTop={7} marginBottom={2}>
+          {title}
+        </Text>
+        <Box display="flex" flexDirection="column">
+          <ProductListSkeleton />
+          <ProductListSkeleton />
+          <ProductListSkeleton />
+        </Box>
+      </Box>
+    );
+  }
 
   return (
     <Box data-test-id={testId}>
       <Text variant="heading" display="block" paddingTop={7} marginBottom={2}>
-        {intl.formatMessage({
-          id: "e08xWz",
-          defaultMessage: "Top products",
-          description: "header",
-        })}
+        {title}
       </Text>
       <Box>
         {renderCollection(
-          topProducts,
+          topProducts.data,
           variant => (
             <HomeProductListItem
               key={variant ? variant.id : "skeleton"}
@@ -115,3 +146,17 @@ export const HomeProductList = ({
 
 HomeProductList.displayName = "HomeProductList";
 export default HomeProductList;
+
+function ProductListSkeleton() {
+  return (
+    <Box
+      borderColor="neutralPlain"
+      borderWidth={1}
+      borderBottomStyle="solid"
+      paddingX={3}
+      paddingY={6}
+    >
+      <Skeleton />
+    </Box>
+  );
+}
diff --git a/src/home/fixtures.ts b/src/home/fixtures.ts
index d357a16010a..49836570245 100644
--- a/src/home/fixtures.ts
+++ b/src/home/fixtures.ts
@@ -1,430 +1,439 @@
 // @ts-strict-ignore
-import { HomeQuery, OrderEventsEnum } from "@dashboard/graphql";
+import {
+  HomeActivitiesQuery,
+  HomeAnaliticsQuery,
+  HomeNotificationsQuery,
+  HomeTopProductsQuery,
+  OrderEventsEnum,
+} from "@dashboard/graphql";
 
-export const shop: (placeholderImage: string) => HomeQuery = (
-  placeholderImage: string,
-) => ({
+export const notifications: HomeNotificationsQuery = {
   __typename: "Query",
-  activities: {
-    __typename: "OrderEventCountableConnection",
-    edges: [
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-09-14T16:10:27.137126+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDoxOA==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED_FROM_DRAFT,
-          user: {
-            __typename: "User",
-            email: "admin@example.com",
-            id: "VXNlcjoyMQ==",
-          },
+  ordersToCapture: {
+    __typename: "OrderCountableConnection",
+    totalCount: 0,
+  },
+  ordersToFulfill: {
+    __typename: "OrderCountableConnection",
+    totalCount: 1,
+  },
+
+  productsOutOfStock: {
+    __typename: "ProductCountableConnection",
+    totalCount: 0,
+  },
+};
+
+export const activities: HomeActivitiesQuery["activities"] = {
+  __typename: "OrderEventCountableConnection",
+  edges: [
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-09-14T16:10:27.137126+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDoxOA==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED_FROM_DRAFT,
+        user: {
+          __typename: "User",
+          email: "admin@example.com",
+          id: "VXNlcjoyMQ==",
         },
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-03T13:28:46.325279+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDozNQ==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED,
-          user: null,
-        },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-03T13:28:46.325279+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDozNQ==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED,
+        user: null,
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-03T13:29:01.837496+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDozNw==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.ORDER_FULLY_PAID,
-          user: null,
-        },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-03T13:29:01.837496+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDozNw==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.ORDER_FULLY_PAID,
+        user: null,
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-04T01:01:51.243723+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo1OA==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED_FROM_DRAFT,
-          user: {
-            __typename: "User",
-            email: "admin@example.com",
-            id: "VXNlcjoyMQ==",
-          },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-04T01:01:51.243723+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo1OA==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED_FROM_DRAFT,
+        user: {
+          __typename: "User",
+          email: "admin@example.com",
+          id: "VXNlcjoyMQ==",
         },
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-04T19:36:18.831561+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo2Nw==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED_FROM_DRAFT,
-          user: {
-            __typename: "User",
-            email: "admin@example.com",
-            id: "VXNlcjoyMQ==",
-          },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-04T19:36:18.831561+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo2Nw==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED_FROM_DRAFT,
+        user: {
+          __typename: "User",
+          email: "admin@example.com",
+          id: "VXNlcjoyMQ==",
         },
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-04T19:38:01.420365+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo2OA==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED_FROM_DRAFT,
-          user: {
-            __typename: "User",
-            email: "admin@example.com",
-            id: "VXNlcjoyMQ==",
-          },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-04T19:38:01.420365+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo2OA==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED_FROM_DRAFT,
+        user: {
+          __typename: "User",
+          email: "admin@example.com",
+          id: "VXNlcjoyMQ==",
         },
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-05T12:30:57.268592+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo3MQ==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED_FROM_DRAFT,
-          user: {
-            __typename: "User",
-            email: "admin@example.com",
-            id: "VXNlcjoyMQ==",
-          },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-05T12:30:57.268592+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo3MQ==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED_FROM_DRAFT,
+        user: {
+          __typename: "User",
+          email: "admin@example.com",
+          id: "VXNlcjoyMQ==",
         },
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-08T09:50:42.622253+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo3Mw==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED,
-          user: null,
-        },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-08T09:50:42.622253+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo3Mw==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED,
+        user: null,
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-12T15:51:11.665838+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo3Nw==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED_FROM_DRAFT,
-          user: {
-            __typename: "User",
-            email: "admin@example.com",
-            id: "VXNlcjoyMQ==",
-          },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-12T15:51:11.665838+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo3Nw==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED_FROM_DRAFT,
+        user: {
+          __typename: "User",
+          email: "admin@example.com",
+          id: "VXNlcjoyMQ==",
         },
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-12T15:51:11.665838+00:00",
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-12T15:51:11.665838+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo3Nw==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED_FROM_DRAFT,
+        user: {
+          __typename: "User",
           email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo3Nw==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED_FROM_DRAFT,
-          user: {
-            __typename: "User",
-            email: null,
-            id: "VXNlcjoyMQ==",
-          },
+          id: "VXNlcjoyMQ==",
         },
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-25T11:25:58.843860+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo3OA==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED,
-          user: null,
-        },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-25T11:25:58.843860+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo3OA==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED,
+        user: null,
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-26T09:34:57.580167+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo4MA==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.PLACED,
-          user: null,
-        },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-26T09:34:57.580167+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo4MA==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.PLACED,
+        user: null,
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-26T09:38:02.440061+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo4Mg==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.ORDER_FULLY_PAID,
-          user: null,
-        },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-26T09:38:02.440061+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo4Mg==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.ORDER_FULLY_PAID,
+        user: null,
       },
-      {
-        __typename: "OrderEventCountableEdge",
-        node: {
-          __typename: "OrderEvent",
-          amount: null,
-          composedId: null,
-          date: "2018-10-26T09:38:02.467443+00:00",
-          email: null,
-          emailType: null,
-          id: "T3JkZXJFdmVudDo4NA==",
-          message: null,
-          orderNumber: "15",
-          oversoldItems: null,
-          quantity: null,
-          type: OrderEventsEnum.ORDER_FULLY_PAID,
-          user: null,
-        },
+    },
+    {
+      __typename: "OrderEventCountableEdge",
+      node: {
+        __typename: "OrderEvent",
+        amount: null,
+        composedId: null,
+        date: "2018-10-26T09:38:02.467443+00:00",
+        email: null,
+        emailType: null,
+        id: "T3JkZXJFdmVudDo4NA==",
+        message: null,
+        orderNumber: "15",
+        oversoldItems: null,
+        quantity: null,
+        type: OrderEventsEnum.ORDER_FULLY_PAID,
+        user: null,
       },
-    ],
-  },
-  ordersToCapture: {
-    __typename: "OrderCountableConnection",
-    totalCount: 0,
-  },
-  ordersToFulfill: {
-    __typename: "OrderCountableConnection",
-    totalCount: 1,
-  },
-  ordersToday: {
-    __typename: "OrderCountableConnection",
-    totalCount: 1,
-  },
-  productTopToday: {
-    __typename: "ProductVariantCountableConnection",
-    edges: [
-      {
-        __typename: "ProductVariantCountableEdge",
-        node: {
-          __typename: "ProductVariant",
-          attributes: [
-            {
-              __typename: "SelectedAttribute",
-              values: [
-                {
-                  __typename: "AttributeValue",
-                  id: "QXR0cmlidXRlVmFsdWU6OTI=",
-                  name: "XL",
-                  sortOrder: 0,
-                },
-              ],
-            },
-          ],
-          id: "UHJvZHVjdFZhcmlhbnQ6NDM=",
-          product: {
-            __typename: "Product",
-            id: "UHJvZHVjdDo4",
-            name: "Black Hoodie",
-            thumbnail: {
-              __typename: "Image",
-              url: placeholderImage,
-            },
+    },
+  ],
+};
+
+export const topProducts: (
+  placeholderImage: string,
+) => HomeTopProductsQuery["productTopToday"] = (placeholderImage: string) => ({
+  __typename: "ProductVariantCountableConnection",
+  edges: [
+    {
+      __typename: "ProductVariantCountableEdge",
+      node: {
+        __typename: "ProductVariant",
+        attributes: [
+          {
+            __typename: "SelectedAttribute",
+            values: [
+              {
+                __typename: "AttributeValue",
+                id: "QXR0cmlidXRlVmFsdWU6OTI=",
+                name: "XL",
+                sortOrder: 0,
+              },
+            ],
+          },
+        ],
+        id: "UHJvZHVjdFZhcmlhbnQ6NDM=",
+        product: {
+          __typename: "Product",
+          id: "UHJvZHVjdDo4",
+          name: "Black Hoodie",
+          thumbnail: {
+            __typename: "Image",
+            url: placeholderImage,
           },
-          quantityOrdered: 1,
-          revenue: {
-            __typename: "TaxedMoney",
-            gross: {
-              __typename: "Money",
-              amount: 37.65,
-              currency: "USD",
-            },
+        },
+        quantityOrdered: 1,
+        revenue: {
+          __typename: "TaxedMoney",
+          gross: {
+            __typename: "Money",
+            amount: 37.65,
+            currency: "USD",
           },
         },
       },
-      {
-        __typename: "ProductVariantCountableEdge",
-        node: {
-          __typename: "ProductVariant",
-          attributes: [
-            {
-              __typename: "SelectedAttribute",
-              values: [
-                {
-                  __typename: "AttributeValue",
-                  id: "QXR0cmlidXRlVmFsdWU6OTI2=",
-                  name: "2l",
-                  sortOrder: 0,
-                },
-              ],
-            },
-          ],
-          id: "UHJvZHVjdFZhcmlhbnQ6NDM=2",
-          product: {
-            __typename: "Product",
-            id: "UHJvZHVjdDo4",
-            name: "Bean Juice",
-            thumbnail: {
-              __typename: "Image",
-              url: placeholderImage,
-            },
+    },
+    {
+      __typename: "ProductVariantCountableEdge",
+      node: {
+        __typename: "ProductVariant",
+        attributes: [
+          {
+            __typename: "SelectedAttribute",
+            values: [
+              {
+                __typename: "AttributeValue",
+                id: "QXR0cmlidXRlVmFsdWU6OTI2=",
+                name: "2l",
+                sortOrder: 0,
+              },
+            ],
+          },
+        ],
+        id: "UHJvZHVjdFZhcmlhbnQ6NDM=2",
+        product: {
+          __typename: "Product",
+          id: "UHJvZHVjdDo4",
+          name: "Bean Juice",
+          thumbnail: {
+            __typename: "Image",
+            url: placeholderImage,
           },
-          quantityOrdered: 1,
-          revenue: {
-            __typename: "TaxedMoney",
-            gross: {
-              __typename: "Money",
-              amount: 37.65,
-              currency: "USD",
-            },
+        },
+        quantityOrdered: 1,
+        revenue: {
+          __typename: "TaxedMoney",
+          gross: {
+            __typename: "Money",
+            amount: 37.65,
+            currency: "USD",
           },
         },
       },
-      {
-        __typename: "ProductVariantCountableEdge",
-        node: {
-          __typename: "ProductVariant",
-          attributes: [
-            {
-              __typename: "SelectedAttribute",
-              values: [
-                {
-                  __typename: "AttributeValue",
-                  id: "QXR0cmlidXRlVmFsdWU6OTI=3",
-                  name: "L",
-                  sortOrder: 0,
-                },
-              ],
-            },
-          ],
-          id: "UHJvZHVjdFZhcmlhbnQ6NDM=3",
-          product: {
-            __typename: "Product",
-            id: "UHJvZHVjdDo4",
-            name: "Black Hoodie",
-            thumbnail: {
-              __typename: "Image",
-              url: placeholderImage,
-            },
+    },
+    {
+      __typename: "ProductVariantCountableEdge",
+      node: {
+        __typename: "ProductVariant",
+        attributes: [
+          {
+            __typename: "SelectedAttribute",
+            values: [
+              {
+                __typename: "AttributeValue",
+                id: "QXR0cmlidXRlVmFsdWU6OTI=3",
+                name: "L",
+                sortOrder: 0,
+              },
+            ],
+          },
+        ],
+        id: "UHJvZHVjdFZhcmlhbnQ6NDM=3",
+        product: {
+          __typename: "Product",
+          id: "UHJvZHVjdDo4",
+          name: "Black Hoodie",
+          thumbnail: {
+            __typename: "Image",
+            url: placeholderImage,
           },
-          quantityOrdered: 1,
-          revenue: {
-            __typename: "TaxedMoney",
-            gross: {
-              __typename: "Money",
-              amount: 37.65,
-              currency: "USD",
-            },
+        },
+        quantityOrdered: 1,
+        revenue: {
+          __typename: "TaxedMoney",
+          gross: {
+            __typename: "Money",
+            amount: 37.65,
+            currency: "USD",
           },
         },
       },
-    ],
-  },
-  productsOutOfStock: {
-    __typename: "ProductCountableConnection",
-    totalCount: 0,
-  },
+    },
+  ],
+});
+
+export const analitics: HomeAnaliticsQuery = {
+  __typename: "Query",
   salesToday: {
     __typename: "TaxedMoney",
     gross: {
@@ -433,4 +442,8 @@ export const shop: (placeholderImage: string) => HomeQuery = (
       currency: "USD",
     },
   },
-});
+  ordersToday: {
+    __typename: "OrderCountableConnection",
+    totalCount: 1,
+  },
+};
diff --git a/src/home/queries.ts b/src/home/queries.ts
index de097bfa358..b831fc0226e 100644
--- a/src/home/queries.ts
+++ b/src/home/queries.ts
@@ -1,10 +1,9 @@
 import { gql } from "@apollo/client";
 
-export const home = gql`
-  query Home(
+export const homeAnalitics = gql`
+  query HomeAnalitics(
     $channel: String!
     $datePeriod: DateRangeInput!
-    $hasPermissionToManageProducts: Boolean!
     $hasPermissionToManageOrders: Boolean!
   ) {
     salesToday: ordersTotal(period: TODAY, channel: $channel)
@@ -18,24 +17,41 @@ export const home = gql`
       @include(if: $hasPermissionToManageOrders) {
       totalCount
     }
-    ordersToFulfill: orders(
-      filter: { status: READY_TO_FULFILL }
-      channel: $channel
-    ) @include(if: $hasPermissionToManageOrders) {
-      totalCount
-    }
-    ordersToCapture: orders(
-      filter: { status: READY_TO_CAPTURE }
-      channel: $channel
-    ) @include(if: $hasPermissionToManageOrders) {
-      totalCount
-    }
-    productsOutOfStock: products(
-      filter: { stockAvailability: OUT_OF_STOCK }
-      channel: $channel
-    ) {
-      totalCount
+  }
+`;
+
+export const homeActivities = gql`
+  query HomeActivities($hasPermissionToManageOrders: Boolean!) {
+    activities: homepageEvents(last: 10)
+      @include(if: $hasPermissionToManageOrders) {
+      edges {
+        node {
+          amount
+          composedId
+          date
+          email
+          emailType
+          id
+          message
+          orderNumber
+          oversoldItems
+          quantity
+          type
+          user {
+            id
+            email
+          }
+        }
+      }
     }
+  }
+`;
+
+export const homeTopProducts = gql`
+  query HomeTopProducts(
+    $channel: String!
+    $hasPermissionToManageProducts: Boolean!
+  ) {
     productTopToday: reportProductSales(
       period: TODAY
       first: 5
@@ -67,27 +83,31 @@ export const home = gql`
         }
       }
     }
-    activities: homepageEvents(last: 10)
-      @include(if: $hasPermissionToManageOrders) {
-      edges {
-        node {
-          amount
-          composedId
-          date
-          email
-          emailType
-          id
-          message
-          orderNumber
-          oversoldItems
-          quantity
-          type
-          user {
-            id
-            email
-          }
-        }
-      }
+  }
+`;
+
+export const homeNotifications = gql`
+  query homeNotifications(
+    $channel: String!
+    $hasPermissionToManageOrders: Boolean!
+  ) {
+    ordersToFulfill: orders(
+      filter: { status: READY_TO_FULFILL }
+      channel: $channel
+    ) @include(if: $hasPermissionToManageOrders) {
+      totalCount
+    }
+    ordersToCapture: orders(
+      filter: { status: READY_TO_CAPTURE }
+      channel: $channel
+    ) @include(if: $hasPermissionToManageOrders) {
+      totalCount
+    }
+    productsOutOfStock: products(
+      filter: { stockAvailability: OUT_OF_STOCK }
+      channel: $channel
+    ) {
+      totalCount
     }
   }
 `;
diff --git a/src/home/types.ts b/src/home/types.ts
index aca07b69469..56293d0df02 100644
--- a/src/home/types.ts
+++ b/src/home/types.ts
@@ -1,7 +1,30 @@
-import { HomeQuery } from "@dashboard/graphql";
+import {
+  HomeActivitiesQuery,
+  HomeAnaliticsQuery,
+  HomeTopProductsQuery,
+} from "@dashboard/graphql";
 import { RelayToFlat } from "@dashboard/types";
 
-export type Activities = RelayToFlat<NonNullable<HomeQuery["activities"]>>;
+export type Activities = RelayToFlat<
+  NonNullable<HomeActivitiesQuery["activities"]>
+>;
 export type ProductTopToday = RelayToFlat<
-  NonNullable<HomeQuery["productTopToday"]>
+  NonNullable<HomeTopProductsQuery["productTopToday"]>
 >;
+
+export interface Analitics {
+  orders: number | null;
+  sales: NonNullable<HomeAnaliticsQuery["salesToday"]>["gross"];
+}
+
+export interface Notifications {
+  ordersToCapture: number | null;
+  ordersToFulfill: number | null;
+  productsOutOfStock: number;
+}
+
+export interface HomeData<T> {
+  data: T;
+  loading: boolean;
+  hasError: boolean;
+}
diff --git a/src/home/views/index.tsx b/src/home/views/index.tsx
index 30e815a8b27..4d6e11b52ce 100644
--- a/src/home/views/index.tsx
+++ b/src/home/views/index.tsx
@@ -7,7 +7,10 @@ import {
   OrderStatusFilter,
   PermissionEnum,
   StockAvailability,
-  useHomeQuery,
+  useHomeActivitiesQuery,
+  useHomeAnaliticsQuery,
+  useHomeNotificationsQuery,
+  useHomeTopProductsQuery,
 } from "@dashboard/graphql";
 import { mapEdgesToItems } from "@dashboard/utils/maps";
 import React from "react";
@@ -24,28 +27,91 @@ const HomeSection = () => {
   const noChannel = !channel && typeof channel !== "undefined";
 
   const userPermissions = user?.userPermissions || [];
+  const hasPermissionToManageOrders = hasPermissions(userPermissions, [
+    PermissionEnum.MANAGE_ORDERS,
+  ]);
+  const hasPermissionToManageProducts = hasPermissions(userPermissions, [
+    PermissionEnum.MANAGE_PRODUCTS,
+  ]);
 
-  const { data } = useHomeQuery({
-    displayLoader: true,
+  const {
+    data: homeActivities,
+    loading: homeActivitiesLoading,
+    error: homeActivitiesError,
+  } = useHomeActivitiesQuery({
+    skip: noChannel,
+    variables: {
+      hasPermissionToManageOrders,
+    },
+  });
+
+  const {
+    data: homeTopProducts,
+    loading: homeTopProductsLoading,
+    error: homeTopProductsError,
+  } = useHomeTopProductsQuery({
+    skip: noChannel,
+    variables: {
+      channel: channel?.slug,
+      hasPermissionToManageProducts,
+    },
+  });
+
+  const {
+    data: homeNotificationsData,
+    loading: homeNotificationsLoaing,
+    error: homeNotificationsError,
+  } = useHomeNotificationsQuery({
+    skip: noChannel,
+    variables: {
+      channel: channel?.slug,
+      hasPermissionToManageOrders,
+    },
+  });
+
+  const {
+    data: homeAnaliticsData,
+    loading: homeAnaliticsLoading,
+    error: homeAnaliticsError,
+  } = useHomeAnaliticsQuery({
     skip: noChannel,
     variables: {
       channel: channel?.slug,
       datePeriod: getDatePeriod(1),
-      hasPermissionToManageOrders: hasPermissions(userPermissions, [
-        PermissionEnum.MANAGE_ORDERS,
-      ]),
-      hasPermissionToManageProducts: hasPermissions(userPermissions, [
-        PermissionEnum.MANAGE_PRODUCTS,
-      ]),
+      hasPermissionToManageOrders,
     },
   });
 
   return (
     <HomePage
-      activities={mapEdgesToItems(data?.activities)?.reverse()}
-      orders={data?.ordersToday?.totalCount}
-      sales={data?.salesToday?.gross}
-      topProducts={mapEdgesToItems(data?.productTopToday)}
+      activities={{
+        data: mapEdgesToItems(homeActivities?.activities)?.reverse(),
+        loading: homeActivitiesLoading,
+        hasError: !!homeActivitiesError,
+      }}
+      topProducts={{
+        data: mapEdgesToItems(homeTopProducts?.productTopToday),
+        loading: homeTopProductsLoading,
+        hasError: !!homeTopProductsError,
+      }}
+      notifications={{
+        data: {
+          ordersToCapture: homeNotificationsData?.ordersToCapture?.totalCount,
+          ordersToFulfill: homeNotificationsData?.ordersToFulfill?.totalCount,
+          productsOutOfStock:
+            homeNotificationsData?.productsOutOfStock.totalCount,
+        },
+        loading: homeNotificationsLoaing,
+        hasError: !!homeNotificationsError,
+      }}
+      analitics={{
+        data: {
+          orders: homeAnaliticsData?.ordersToday?.totalCount,
+          sales: homeAnaliticsData?.salesToday?.gross,
+        },
+        loading: homeAnaliticsLoading,
+        hasError: !!homeAnaliticsError,
+      }}
       createNewChannelHref={channelsListUrl()}
       ordersToCaptureHref={orderListUrl({
         status: [OrderStatusFilter.READY_TO_CAPTURE],
@@ -59,9 +125,6 @@ const HomeSection = () => {
         stockStatus: StockAvailability.OUT_OF_STOCK,
         channel: channel?.slug,
       })}
-      ordersToCapture={data?.ordersToCapture?.totalCount}
-      ordersToFulfill={data?.ordersToFulfill?.totalCount}
-      productsOutOfStock={data?.productsOutOfStock.totalCount}
       userName={getUserName(user, true)}
       noChannel={noChannel}
     />