@lookiero/checkout 7.0.0-beta.0 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lookiero/checkout",
-  "version": "7.0.0-beta.0",
+  "version": "7.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "sideEffects": "false",

package/src/ExpoRoot.tsx

@@ -117,14 +117,7 @@ setPaymentsBridge({
 
 const kameleoonConfig: KameleoonEnvironment = {
   siteCode: "aplm4v3ckn",
-  experiments: {
-    newFeedback: {
-      id: "245000",
-      variations: {
-        v1: "964072",
-      },
-    },
-  },
+  experiments: {},
 };
 
 // const { Component: Messaging } = checkoutMockBootstrap();

package/src/infrastructure/ab-testing/kameleoonEnvironment.ts

@@ -1,13 +1,9 @@
-interface Experiment {
-  readonly id: string;
-  readonly variations: Record<string, string>;
-}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface Experiments {}
 
 interface KameleoonEnvironment {
   readonly siteCode: string;
-  readonly experiments: {
-    readonly newFeedback: Experiment;
-  };
+  readonly experiments: Experiments;
 }
 
 export type { KameleoonEnvironment };

package/src/infrastructure/ui/components/organisms/returnQuestions/components/hostDefaultReturnQuestionItem/HostDefaultReturnQuestionItem.style.ts

@@ -4,16 +4,10 @@ import { theme } from "@lookiero/sty-psp-ui";
 const { colorBgBase, space4, space6 } = theme();
 
 const style = StyleSheet.create({
-  allOptionsTitle: {
-    display: "none",
-  },
-  formTitle: {
-    paddingLeft: space6,
-  },
   title: {
     backgroundColor: colorBgBase,
     paddingBottom: space4,
-    paddingRight: space6,
+    paddingHorizontal: space6,
     paddingTop: space6,
   },
 });

package/src/infrastructure/ui/components/organisms/returnQuestions/components/hostDefaultReturnQuestionItem/HostDefaultReturnQuestionItem.test.tsx

@@ -12,11 +12,6 @@ jest.mock("../../behaviors/useReturnQuestionFeedback", () => ({
   useReturnQuestionFeedbackForReturnQuestion: () => ({ feedback: "", onChange: mockOnChange }),
 }));
 
-jest.mock("../../../../../hooks/useNewFeedbackExperiment", () => ({
-  ...jest.requireActual("../../../../../hooks/useNewFeedbackExperiment"),
-  useNewFeedbackExperiment: () => "control",
-}));
-
 const returnQuestion: ReturnQuestionProjection = {
   id: "9251dc2c-d76a-484d-9299-346929af932f",
   name: "size_large",

package/src/infrastructure/ui/components/organisms/returnQuestions/components/hostDefaultReturnQuestionItem/HostDefaultReturnQuestionItem.tsx

@@ -1,10 +1,6 @@
 import React from "react";
 import { Text, View } from "@lookiero/aurora";
 import { useI18nMessage } from "@lookiero/i18n-react";
-import {
-  NewFeedbackExperimentVariation,
-  useNewFeedbackExperiment,
-} from "../../../../../hooks/useNewFeedbackExperiment";
 import { I18nMessages } from "../../../../../i18n/i18n";
 import { ReturnQuestionItem, ReturnQuestionItemProps } from "../ReturnQuestionItem";
 import { style } from "./HostDefaultReturnQuestionItem.style";
@@ -13,21 +9,10 @@ const HostDefaultReturnQuestionItem: ReturnQuestionItem = ({ returnQuestion, chi
   const titleText = useI18nMessage({ id: returnQuestion.name });
   const isAllOptions = returnQuestion.name === I18nMessages.RETURN_QUESTION_MAIN_ALL_OPINION;
 
-  /* Kameleoon experiment */
-  const newFeedbackVariation = useNewFeedbackExperiment();
-  const isReturnPage = newFeedbackVariation === NewFeedbackExperimentVariation.RETURN_PAGE;
-  /* Kameleoon experiment */
-
   return (
     <>
-      {titleText && titleText !== " " ? (
-        <View
-          style={[
-            style.title,
-            isAllOptions ? style.allOptionsTitle : undefined,
-            isReturnPage ? style.formTitle : undefined,
-          ]}
-        >
+      {titleText && titleText !== " " && !isAllOptions ? (
+        <View style={style.title}>
           <Text level={3} action>
             {titleText}
           </Text>

package/src/infrastructure/ui/components/organisms/returnQuestions/components/textareaReturnQuestionItem/TextareaReturnQuestionItem.test.tsx

@@ -12,11 +12,6 @@ jest.mock("../../behaviors/useReturnQuestionFeedback", () => ({
   useReturnQuestionFeedbackForReturnQuestion: () => ({ feedback: "", onChange: mockOnChange }),
 }));
 
-jest.mock("../../../../../hooks/useNewFeedbackExperiment", () => ({
-  ...jest.requireActual("../../../../../hooks/useNewFeedbackExperiment"),
-  useNewFeedbackExperiment: () => "control",
-}));
-
 const returnQuestionParent = {
   id: "0ad1dba8-b02c-4121-a1e3-981f1c30800d",
 } as ReturnQuestionProjection;

package/src/infrastructure/ui/components/organisms/returnQuestions/components/textareaReturnQuestionItem/TextareaReturnQuestionItem.tsx

@@ -2,10 +2,6 @@ import React, { useCallback, useMemo } from "react";
 import { View } from "@lookiero/aurora";
 import { useIntl } from "@lookiero/i18n-react";
 import { InputField } from "../../../../../../../shared/ui/components/molecules/inputField/InputField";
-import {
-  NewFeedbackExperimentVariation,
-  useNewFeedbackExperiment,
-} from "../../../../../hooks/useNewFeedbackExperiment";
 import { useReturnQuestionFeedbackForReturnQuestion } from "../../behaviors/useReturnQuestionFeedback";
 import { ReturnQuestionItem, ReturnQuestionItemProps } from "../ReturnQuestionItem";
 import { style } from "./TextareaReturnQuestionItem.style";
@@ -17,11 +13,6 @@ const TextareaReturnQuestionItem: ReturnQuestionItem = ({
 }: ReturnQuestionItemProps) => {
   const { formatMessage } = useIntl();
 
-  /* Kameleoon experiment */
-  const newFeedbackVariation = useNewFeedbackExperiment();
-  const isReturnPage = newFeedbackVariation === NewFeedbackExperimentVariation.RETURN_PAGE;
-  /* Kameleoon experiment */
-
   const placeholderText = useMemo(
     () => (returnQuestion.placeholder ? formatMessage({ id: returnQuestion.placeholder }) : ""),
     [formatMessage, returnQuestion.placeholder],
@@ -33,18 +24,18 @@ const TextareaReturnQuestionItem: ReturnQuestionItem = ({
     [onChange, returnQuestionParent.id],
   );
 
-  const fieldComponent = (
-    <InputField
-      label={placeholderText}
-      placeholder={placeholderText}
-      testID={testID}
-      value={feedback}
-      multiline
-      onChange={handleOnChange}
-    />
+  return (
+    <View style={style.wrapper}>
+      <InputField
+        label={placeholderText}
+        placeholder={placeholderText}
+        testID={testID}
+        value={feedback}
+        multiline
+        onChange={handleOnChange}
+      />
+    </View>
   );
-
-  return isReturnPage ? <View style={style.wrapper}>{fieldComponent}</View> : fieldComponent;
 };
 
 export { TextareaReturnQuestionItem };

package/src/infrastructure/ui/routing/Routing.tsx

@@ -8,7 +8,6 @@ import { Customer } from "../../../projection/shared/customer";
 import { Order } from "../../../projection/shared/order";
 import { Subscription } from "../../../projection/shared/subscription";
 import { KameleoonEnvironment } from "../../ab-testing/kameleoonEnvironment";
-import { NewFeedbackExperimentProvider } from "../hooks/useNewFeedbackExperiment";
 import { StaticInfoProvider } from "../hooks/useStaticInfo";
 import { App } from "../views/App";
 import { Checkout } from "../views/checkout/Checkout";
@@ -64,11 +63,9 @@ const Routing: FC<RoutingProps> = ({
             <I18n loader={<Spinner />} locale={locale} onError={onI18nError}>
               <Kameleoon loader={<Spinner />} siteCode={kameleoon.siteCode}>
                 <CheckoutMiddleware customerId={customer?.customerId as string} onNotAccessible={onNotAccessible}>
-                  <NewFeedbackExperimentProvider>
-                    <App>
-                      <Outlet />
-                    </App>
-                  </NewFeedbackExperimentProvider>
+                  <App>
+                    <Outlet />
+                  </App>
                 </CheckoutMiddleware>
               </Kameleoon>
             </I18n>

package/src/infrastructure/ui/views/checkout/Checkout.tsx

@@ -1,7 +1,7 @@
 import React, { FC, ReactNode, useCallback, useMemo, useState } from "react";
 import { LayoutRectangle, Platform, ScrollView, View } from "react-native";
 import { useNavigate } from "react-router-native";
-import { Box, Button, Layout, Spinner, Text, useDevice } from "@lookiero/aurora";
+import { Box, Button, Layout as AuroraLayout, Spinner, Text, useDevice } from "@lookiero/aurora";
 import { useI18nMessage } from "@lookiero/i18n-react";
 import { QueryStatus } from "@lookiero/messaging-react";
 import { Layout as UiLayout, Sticky } from "@lookiero/sty-psp-ui";
@@ -30,7 +30,7 @@ interface CheckoutProps {
   readonly useRedirect: () => Record<string, string>;
 }
 
-const Checkout: FC<CheckoutProps> = ({ children, layout: UiLayout, useRedirect }) => {
+const Checkout: FC<CheckoutProps> = ({ children, layout: Layout, useRedirect }) => {
   const {
     customer: { customerId, country, segment },
   } = useStaticInfo();
@@ -99,7 +99,7 @@ const Checkout: FC<CheckoutProps> = ({ children, layout: UiLayout, useRedirect }
   }
 
   return (
-    <UiLayout
+    <Layout
       header={<CheckoutHeader onBack={handleOnBack} />}
       scrollEnabled={false}
       style={{
@@ -110,7 +110,7 @@ const Checkout: FC<CheckoutProps> = ({ children, layout: UiLayout, useRedirect }
       <ScrollView showsVerticalScrollIndicator={false}>
         {hasReplacedCheckoutItem && <DeliveryBanner />}
 
-        <Layout
+        <AuroraLayout
           fullWidth={!screen.L}
           style={[screen.L && style.desktopLayoutSpacing, !screen.L && { paddingBottom: pricingHeight }]}
         >
@@ -158,7 +158,7 @@ const Checkout: FC<CheckoutProps> = ({ children, layout: UiLayout, useRedirect }
               </View>
             ) : null}
           </Box>
-        </Layout>
+        </AuroraLayout>
       </ScrollView>
 
       {pricing && !screen.L ? (
@@ -172,7 +172,7 @@ const Checkout: FC<CheckoutProps> = ({ children, layout: UiLayout, useRedirect }
       ) : null}
 
       {children}
-    </UiLayout>
+    </Layout>
   );
 };
 

package/src/infrastructure/ui/views/feedback/Feedback.tsx

@@ -2,7 +2,7 @@ import React, { FC, useCallback, useEffect, useRef } from "react";
 import { Spinner } from "@lookiero/aurora";
 import { CommandStatus, QueryStatus } from "@lookiero/messaging-react";
 import { useLogger } from "@lookiero/sty-psp-logging";
-import { Layout, useScreenSize } from "@lookiero/sty-psp-ui";
+import { Layout as UiLayout, useScreenSize } from "@lookiero/sty-psp-ui";
 import { CheckoutFeedbackProjection } from "../../../../projection/checkoutFeedback/checkoutFeedback";
 import { CheckoutQuestionType } from "../../../../projection/checkoutQuestion/checkoutQuestion";
 import { useGiveCheckoutFeedback } from "../../../domain/checkoutFeedback/react/useGiveCheckoutFeedback";
@@ -28,7 +28,7 @@ interface HandleOnChangedFeedbackFunction {
 }
 
 interface FeedbackProps {
-  readonly layout: Layout;
+  readonly layout: UiLayout;
 }
 
 const Feedback: FC<FeedbackProps> = ({ layout: Layout }) => {

package/src/infrastructure/ui/views/item/Item.test.tsx

@@ -1,4 +1,4 @@
-import { fireEvent, RenderAPI, waitFor, screen, within } from "@testing-library/react-native";
+import { fireEvent, RenderAPI, waitFor, screen } from "@testing-library/react-native";
 import React from "react";
 import { CommandStatus, QueryStatus } from "@lookiero/messaging-react";
 import { Segment } from "@lookiero/sty-psp-segment";
@@ -9,7 +9,6 @@ import { useBookCheckoutBookingForCheckoutItem } from "../../../domain/checkoutB
 import { useKeepCheckoutItem } from "../../../domain/checkoutItem/react/useKeepCheckoutItem";
 import { useReplaceCheckoutItem } from "../../../domain/checkoutItem/react/useReplaceCheckoutItem";
 import { useResetCheckoutItem } from "../../../domain/checkoutItem/react/useResetCheckoutItem";
-import { useReturnCheckoutItem } from "../../../domain/checkoutItem/react/useReturnCheckoutItem";
 import { bookedProductsVariants as mockBookedProductsVariants } from "../../../projection/bookedProductsVariants/bookedProductsVariants.mock";
 import { useViewBookedProductsVariantsForCheckoutItem } from "../../../projection/bookedProductsVariants/react/useViewBookedProductsVariantsForCheckoutItem";
 import { checkout } from "../../../projection/checkout/checkout.mock";
@@ -32,10 +31,11 @@ jest.mock("../../hooks/useStaticInfo", () => ({
   useStaticInfo: () => ({ customer: { customerId, country, segment } }),
 }));
 
+const mockNavigate = jest.fn();
 jest.mock("react-router-native", () => ({
   ...jest.requireActual("react-router-native"),
   useLocation: () => jest.fn(),
-  useNavigate: () => jest.fn(),
+  useNavigate: () => mockNavigate,
   useMatch: () => false,
   useParams: () => ({ id: mockFirstCheckoutItemId }),
 }));
@@ -45,7 +45,6 @@ jest.mock("../../../projection/checkout/react/useViewIsSizeChangeEnabledByChecko
 jest.mock("../../../projection/returnQuestion/react/useListReturnQuestionsByCheckoutItemId");
 jest.mock("../../../projection/bookedProductsVariants/react/useViewBookedProductsVariantsForCheckoutItem");
 jest.mock("../../../domain/checkoutBooking/react/useBookCheckoutBookingForCheckoutItem");
-jest.mock("../../../domain/checkoutItem/react/useReturnCheckoutItem");
 jest.mock("../../../domain/checkoutItem/react/useKeepCheckoutItem");
 jest.mock("../../../domain/checkoutItem/react/useReplaceCheckoutItem");
 jest.mock("../../../domain/checkoutItem/react/useResetCheckoutItem");
@@ -60,17 +59,8 @@ jest.mock("../../../tracking/useTrackKeepItem", () => ({
 jest.mock("../../../tracking/useTrackReplaceItem", () => ({
   useTrackReplaceItem: () => jest.fn(),
 }));
-const mockTrackReturnItem = jest.fn();
-jest.mock("../../../tracking/useTrackReturnItem", () => ({
-  useTrackReturnItem: () => mockTrackReturnItem,
-}));
 jest.mock("../../../tracking/useTrackItemPageView");
 
-jest.mock("../../hooks/useNewFeedbackExperiment", () => ({
-  ...jest.requireActual("../../hooks/useNewFeedbackExperiment"),
-  useNewFeedbackExperiment: () => "control",
-}));
-
 const mockCheckout = checkout({
   items: [
     { id: mockFirstCheckoutItemId, status: CheckoutItemStatus.INITIAL },
@@ -87,8 +77,6 @@ interface RenderItemFunction {
 
 const renderItem: RenderItemFunction = () => render(<Item layout={DummyLayout} />);
 
-beforeEach(() => mockTrackReturnItem.mockClear());
-
 beforeAll(() => {
   jest.useFakeTimers();
 });
@@ -110,8 +98,6 @@ describe("Item view", () => {
     ]);
     const mockBookCheckoutBookingForCheckoutItem = jest.fn();
     (useBookCheckoutBookingForCheckoutItem as jest.Mock).mockReturnValue([mockBookCheckoutBookingForCheckoutItem]);
-    const mockReturnCheckoutItem = jest.fn();
-    (useReturnCheckoutItem as jest.Mock).mockReturnValue([mockReturnCheckoutItem, CommandStatus.IDLE]);
     (useKeepCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useReplaceCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useResetCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
@@ -133,8 +119,6 @@ describe("Item view", () => {
     ]);
     const mockBookCheckoutBookingForCheckoutItem = jest.fn();
     (useBookCheckoutBookingForCheckoutItem as jest.Mock).mockReturnValue([mockBookCheckoutBookingForCheckoutItem]);
-    const mockReturnCheckoutItem = jest.fn();
-    (useReturnCheckoutItem as jest.Mock).mockReturnValue([mockReturnCheckoutItem, CommandStatus.IDLE]);
     (useKeepCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useReplaceCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useResetCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
@@ -156,31 +140,6 @@ describe("Item view", () => {
     ]);
     const mockBookCheckoutBookingForCheckoutItem = jest.fn();
     (useBookCheckoutBookingForCheckoutItem as jest.Mock).mockReturnValue([mockBookCheckoutBookingForCheckoutItem]);
-    const mockReturnCheckoutItem = jest.fn();
-    (useReturnCheckoutItem as jest.Mock).mockReturnValue([mockReturnCheckoutItem, CommandStatus.IDLE]);
-    (useKeepCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
-    (useReplaceCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
-    (useResetCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
-
-    const { findByTestId } = renderItem();
-    const spinner = await findByTestId("spinner");
-
-    expect(spinner).toBeDefined();
-  });
-
-  it("renders a Spinner while 'returning' the item", async () => {
-    (useViewFiveItemsDiscountByCustomerId as jest.Mock).mockReturnValue([5, QueryStatus.SUCCESS]);
-    (useViewFirstAvailableCheckoutByCustomerId as jest.Mock).mockReturnValue([mockCheckout, QueryStatus.SUCCESS]);
-    (useViewIsSizeChangeEnabledByCheckoutId as jest.Mock).mockReturnValue([true, QueryStatus.SUCCESS]);
-    (useListReturnQuestionsByCheckoutItemId as jest.Mock).mockReturnValue([mockReturnQuestions, QueryStatus.SUCCESS]);
-    (useViewBookedProductsVariantsForCheckoutItem as jest.Mock).mockReturnValue([
-      mockBookedProductsVariants,
-      QueryStatus.SUCCESS,
-    ]);
-    const mockBookCheckoutBookingForCheckoutItem = jest.fn();
-    (useBookCheckoutBookingForCheckoutItem as jest.Mock).mockReturnValue([mockBookCheckoutBookingForCheckoutItem]);
-    const mockReturnCheckoutItem = jest.fn();
-    (useReturnCheckoutItem as jest.Mock).mockReturnValue([mockReturnCheckoutItem, CommandStatus.LOADING]);
     (useKeepCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useReplaceCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useResetCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
@@ -202,8 +161,6 @@ describe("Item view", () => {
     ]);
     const mockBookCheckoutBookingForCheckoutItem = jest.fn();
     (useBookCheckoutBookingForCheckoutItem as jest.Mock).mockReturnValue([mockBookCheckoutBookingForCheckoutItem]);
-    const mockReturnCheckoutItem = jest.fn();
-    (useReturnCheckoutItem as jest.Mock).mockReturnValue([mockReturnCheckoutItem, CommandStatus.IDLE]);
     (useKeepCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useReplaceCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useResetCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
@@ -225,8 +182,6 @@ describe("Item view", () => {
     (useViewBookedProductsVariantsForCheckoutItem as jest.Mock).mockReturnValue([null, QueryStatus.SUCCESS]);
     const mockBookCheckoutBookingForCheckoutItem = jest.fn();
     (useBookCheckoutBookingForCheckoutItem as jest.Mock).mockReturnValue([mockBookCheckoutBookingForCheckoutItem]);
-    const mockReturnCheckoutItem = jest.fn();
-    (useReturnCheckoutItem as jest.Mock).mockReturnValue([mockReturnCheckoutItem, CommandStatus.IDLE]);
     (useKeepCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useReplaceCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useResetCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
@@ -247,8 +202,6 @@ describe("Item view", () => {
     ]);
     const mockBookCheckoutBookingForCheckoutItem = jest.fn();
     (useBookCheckoutBookingForCheckoutItem as jest.Mock).mockReturnValue([mockBookCheckoutBookingForCheckoutItem]);
-    const mockReturnCheckoutItem = jest.fn();
-    (useReturnCheckoutItem as jest.Mock).mockReturnValue([mockReturnCheckoutItem, CommandStatus.IDLE]);
     (useKeepCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useReplaceCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useResetCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
@@ -258,7 +211,7 @@ describe("Item view", () => {
     expect(mockBookCheckoutBookingForCheckoutItem).not.toHaveBeenCalled();
   });
 
-  it("calls returnCheckoutItem and trackReturnCheckoutItem when pressing the return-button", async () => {
+  it("calls navigate to return page when pressing the return-button", async () => {
     (useViewFiveItemsDiscountByCustomerId as jest.Mock).mockReturnValue([5, QueryStatus.SUCCESS]);
     (useViewFirstAvailableCheckoutByCustomerId as jest.Mock).mockReturnValue([mockCheckout, QueryStatus.SUCCESS]);
     (useViewIsSizeChangeEnabledByCheckoutId as jest.Mock).mockReturnValue([true, QueryStatus.SUCCESS]);
@@ -269,26 +222,17 @@ describe("Item view", () => {
     ]);
     const mockBookCheckoutBookingForCheckoutItem = jest.fn();
     (useBookCheckoutBookingForCheckoutItem as jest.Mock).mockReturnValue([mockBookCheckoutBookingForCheckoutItem]);
-    const mockReturnCheckoutItem = jest.fn();
-    (useReturnCheckoutItem as jest.Mock).mockReturnValue([mockReturnCheckoutItem, CommandStatus.IDLE]);
     (useKeepCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useReplaceCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
     (useResetCheckoutItem as jest.Mock).mockReturnValue([jest.fn(), CommandStatus.IDLE]);
 
-    const { findByText, findByTestId } = renderItem();
+    const { findByText } = renderItem();
 
     const returnButton = await findByText(I18nMessages.ITEM_RETURN_BUTTON);
 
     fireEvent.press(returnButton);
 
-    const modal = await findByTestId("return-questions-form-modal");
-
-    const submitButton = await within(modal).findByText(I18nMessages.RETURN_QUESTIONS_SUBMIT_BUTTON);
-
-    fireEvent.press(submitButton);
-
-    expect(mockReturnCheckoutItem).toHaveBeenCalled();
-    expect(mockTrackReturnItem).toHaveBeenCalled();
+    expect(mockNavigate).toHaveBeenCalled();
   });
 
   it("shows discount banner when the user have purchased items", async () => {

package/src/infrastructure/ui/views/item/Item.tsx

@@ -1,7 +1,7 @@
-import React, { FC, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React, { FC, useCallback, useEffect, useMemo, useRef } from "react";
 import { generatePath, useMatch, useNavigate, useParams } from "react-router-native";
 import { Box, Spinner } from "@lookiero/aurora";
-import { CommandStatus, QueryStatus } from "@lookiero/messaging-react";
+import { QueryStatus } from "@lookiero/messaging-react";
 import { useLogger } from "@lookiero/sty-psp-logging";
 import { useScreenSize } from "@lookiero/sty-psp-ui";
 import { Layout } from "@lookiero/sty-psp-ui";
@@ -11,9 +11,7 @@ import {
   ProductVariantProjection,
 } from "../../../../projection/bookedProductsVariants/bookedProductsVariants";
 import { CheckoutItemProjection } from "../../../../projection/checkoutItem/checkoutItem";
-import { FeedbackProjection } from "../../../../projection/feedback/feedback";
 import { useBookCheckoutBookingForCheckoutItem } from "../../../domain/checkoutBooking/react/useBookCheckoutBookingForCheckoutItem";
-import { useReturnCheckoutItem } from "../../../domain/checkoutItem/react/useReturnCheckoutItem";
 import { useViewBookedProductsVariantsForCheckoutItem } from "../../../projection/bookedProductsVariants/react/useViewBookedProductsVariantsForCheckoutItem";
 import { useViewFirstAvailableCheckoutByCustomerId } from "../../../projection/checkout/react/useViewFirstAvailableCheckoutByCustomerId";
 import { useViewFiveItemsDiscountByCustomerId } from "../../../projection/checkout/react/useViewFiveItemsDiscountByCustomerId";
@@ -24,17 +22,14 @@ import { useTrackItemPageView } from "../../../tracking/useTrackItemPageView";
 import { useTrackPressBack } from "../../../tracking/useTrackPressBack";
 import { useTrackPressNext } from "../../../tracking/useTrackPressNext";
 import { useTrackPressPrevious } from "../../../tracking/useTrackPressPrevious";
-import { useTrackReturnItem } from "../../../tracking/useTrackReturnItem";
 import { FiveItemsDiscountBanner } from "../../components/atoms/fiveItemsDiscountBanner/FiveItemsDiscountBanner";
 import { ReturnQuestionFeedbackProvider } from "../../components/organisms/returnQuestions/behaviors/useReturnQuestionFeedback";
 import { ItemDetailHeader } from "../../components/templates/header/itemDetailHeader/ItemDetailHeader";
 import { ItemHeader } from "../../components/templates/header/itemHeader/ItemHeader";
-import { NewFeedbackExperimentVariation, useNewFeedbackExperiment } from "../../hooks/useNewFeedbackExperiment";
 import { useStaticInfo } from "../../hooks/useStaticInfo";
 import { Routes } from "../../routing/routes";
 import { useBasePath } from "../../routing/useBasePath";
 import { style } from "./Item.style";
-import { ReturnQuestionsForm } from "./components/returnQuestionsForm/ReturnQuestionsForm";
 import {
   CheckoutItemWithCustomerDecission,
   ItemWithCustomerDecission,
@@ -78,11 +73,6 @@ const Item: FC<ItemProps> = ({ layout: Layout }) => {
   const [checkout, checkoutStatus] = useViewFirstAvailableCheckoutByCustomerId({ customerId });
   const checkoutItem = checkout?.items.find((checkoutItem) => checkoutItem.id === id) as CheckoutItemProjection;
 
-  /* Kameleoon experiment */
-  const newFeedbackVariation = useNewFeedbackExperiment();
-  const redirectToReturnPage = newFeedbackVariation === NewFeedbackExperimentVariation.RETURN_PAGE;
-  /* Kameleoon experiment */
-
   /* SizeChange and Booking */
   const [isSizeChangeEnabled, sizeChangeEnabledStatus] = useViewIsSizeChangeEnabledByCheckoutId({
     checkoutId: checkout?.id,
@@ -111,32 +101,9 @@ const Item: FC<ItemProps> = ({ layout: Layout }) => {
   const [returnQuestions] = useListReturnQuestionsByCheckoutItemId({
     checkoutItemId: checkoutItem.id,
   });
-  const [returnQuestionsVisible, setReturnQuestionsVisible] = useState(false);
-  const showReturnQuestions = useCallback(() => setReturnQuestionsVisible(true), []);
-  const hideReturnQuestions = useCallback(() => setReturnQuestionsVisible(false), []);
   const goToReturnPage = useCallback(() => {
     navigate(`${basePath}/${generatePath(Routes.RETURN, { id: checkoutItem.id })}`);
   }, [basePath, checkoutItem.id, navigate]);
-
-  const [returnCheckoutItem, returnCheckoutItemStatus] = useReturnCheckoutItem({
-    checkoutItemId: checkoutItem.id,
-    logger,
-  });
-  const trackReturnItem = useTrackReturnItem({
-    page: TrackingPage.ITEM,
-    country,
-    segment,
-    checkoutId: checkout?.id,
-    checkoutItemId: checkoutItem.id,
-  });
-  const returnItem = useCallback(
-    async (feedbacks: FeedbackProjection) => {
-      hideReturnQuestions();
-      returnCheckoutItem({ feedbacks });
-      trackReturnItem();
-    },
-    [hideReturnQuestions, returnCheckoutItem, trackReturnItem],
-  );
   /* ReturnCheckoutItem */
 
   const currentProductVariant: ProductVariantProjection = useMemo(
@@ -242,8 +209,7 @@ const Item: FC<ItemProps> = ({ layout: Layout }) => {
     bookedProductsVariantsStatus !== QueryStatus.LOADING &&
     fiveItemsDiscountStatus !== QueryStatus.LOADING &&
     sizeChangeEnabledStatus !== QueryStatus.LOADING &&
-    (isBookingRequired ? checkout.checkoutBookingId && bookedProductsVariants : true) &&
-    returnCheckoutItemStatus !== CommandStatus.LOADING;
+    (isBookingRequired ? checkout.checkoutBookingId && bookedProductsVariants : true);
 
   if (!dependenciesLoaded) {
     return <Spinner testID="spinner" />;
@@ -266,7 +232,7 @@ const Item: FC<ItemProps> = ({ layout: Layout }) => {
             checkoutId={checkout.id}
             checkoutItem={checkoutItem as CheckoutItemWithoutCustomerDecission}
             currentProductVariant={currentProductVariant}
-            onReturn={redirectToReturnPage ? goToReturnPage : showReturnQuestions}
+            onReturn={goToReturnPage}
           />
         ) : (
           <ItemWithCustomerDecission
@@ -274,19 +240,10 @@ const Item: FC<ItemProps> = ({ layout: Layout }) => {
             checkoutItem={checkoutItem as CheckoutItemWithCustomerDecission}
             currentProductVariant={currentProductVariant}
             returnQuestions={returnQuestions}
-            onEditFeedback={redirectToReturnPage ? goToReturnPage : showReturnQuestions}
+            onEditFeedback={goToReturnPage}
           />
         )}
       </Layout>
-
-      {!redirectToReturnPage ? (
-        <ReturnQuestionsForm
-          returnQuestions={returnQuestions}
-          visible={returnQuestionsVisible}
-          onClose={hideReturnQuestions}
-          onSubmit={returnItem}
-        />
-      ) : null}
     </ReturnQuestionFeedbackProvider>
   );
 };

package/src/infrastructure/ui/views/return/Return.test.tsx

@@ -0,0 +1,54 @@
+import React from "react";
+import { CommandStatus, QueryStatus } from "@lookiero/messaging-react";
+import { Country } from "@lookiero/sty-psp-locale";
+import { Segment } from "@lookiero/sty-psp-segment";
+import { DummyLayout } from "@lookiero/sty-psp-ui";
+import { CheckoutItemStatus } from "../../../../domain/checkoutItem/model/checkoutItem";
+import { useReturnCheckoutItem } from "../../../domain/checkoutItem/react/useReturnCheckoutItem";
+import { checkout } from "../../../projection/checkout/checkout.mock";
+import { useViewFirstAvailableCheckoutByCustomerId } from "../../../projection/checkout/react/useViewFirstAvailableCheckoutByCustomerId";
+import { useListReturnQuestionsByCheckoutItemId } from "../../../projection/returnQuestion/react/useListReturnQuestionsByCheckoutItemId";
+import { returnQuestions as mockReturnQuestions } from "../../../projection/returnQuestion/returnQuestions.mock";
+import { render } from "../../test/render";
+import { Return } from "./Return";
+
+const customerId = "a8fff6d7-708c-41a7-b42a-58c5706d33df";
+const country = Country.ES;
+const segment = Segment.WOMEN;
+const mockCheckout = checkout({
+  items: [
+    { status: CheckoutItemStatus.KEPT },
+    { status: CheckoutItemStatus.RETURNED },
+    { status: CheckoutItemStatus.REPLACED },
+  ],
+});
+const mockFirstCheckoutItemId = mockCheckout.items[0]?.id;
+
+jest.mock("../../hooks/useStaticInfo", () => ({
+  useStaticInfo: () => ({ customer: { customerId, country, segment } }),
+}));
+
+jest.mock("react-router-native", () => ({
+  ...jest.requireActual("react-router-native"),
+  useLocation: () => jest.fn(),
+  useNavigate: () => jest.fn(),
+  useMatch: () => false,
+  useParams: () => ({ id: mockFirstCheckoutItemId }),
+}));
+
+jest.mock("../../../projection/checkout/react/useViewFirstAvailableCheckoutByCustomerId");
+jest.mock("../../../projection/returnQuestion/react/useListReturnQuestionsByCheckoutItemId");
+jest.mock("../../../domain/checkoutItem/react/useReturnCheckoutItem");
+
+describe("Return", () => {
+  test("renders correctly", async () => {
+    (useViewFirstAvailableCheckoutByCustomerId as jest.Mock).mockReturnValue([mockCheckout, QueryStatus.SUCCESS]);
+    (useListReturnQuestionsByCheckoutItemId as jest.Mock).mockReturnValue([mockReturnQuestions, QueryStatus.SUCCESS]);
+    const mockReturnCheckoutItem = jest.fn();
+    (useReturnCheckoutItem as jest.Mock).mockReturnValue([mockReturnCheckoutItem, CommandStatus.IDLE]);
+
+    const { findByTestId } = render(<Return layout={DummyLayout} />);
+
+    expect(await findByTestId("return-questions-form")).toBeTruthy();
+  });
+});