@lookiero/checkout 8.14.0 → 8.17.0

package/src/infrastructure/ui/components/organisms/returnQuestions/components/returnQuestionFeedbackItem/ReturnQuestionFeedbackItem.test.tsx

@@ -1,6 +1,8 @@
 import React from "react";
-import { ReturnQuestionProjection } from "../../../../../../../projection/returnQuestion/returnQuestion";
-import { ReturnQuestionType } from "../../../../../../../projection/returnQuestion/returnQuestion.constants";
+import {
+  ReturnQuestionProjection,
+  ReturnQuestionType,
+} from "../../../../../../../projection/returnQuestion/returnQuestion";
 import { feedback as mockFeedback } from "../../../../../../projection/feedback/feedback.mock";
 import { I18nMessages } from "../../../../../i18n/i18n";
 import { render } from "../../../../../test/render";
@@ -10,34 +12,40 @@ jest.mock("../../behaviors/useReturnQuestionFeedback", () => ({
   useReturnQuestionFeedback: () => mockFeedback,
 }));
 
-const returnQuestion: ReturnQuestionProjection<ReturnQuestionType.HOST_DEFAULT> = {
+const returnQuestion: ReturnQuestionProjection = {
   id: "0ad1dba8-b02c-4121-a1e3-981f1c30800d",
-  translationKey: "size_title",
-  type: ReturnQuestionType.HOST_DEFAULT,
+  name: "size_title",
+  placeholder: "",
+  type: ReturnQuestionType.HOST_STACK,
   children: [
     {
       id: "9251dc2c-d76a-484d-9299-346929af932f",
-      translationKey: "size_large",
+      name: "size_large",
+      placeholder: "",
       type: ReturnQuestionType.OPTION,
       children: [
         {
           id: "542c4d24-e1da-484f-8c3a-7d89ee135adc",
-          translationKey: "",
-          type: ReturnQuestionType.HOST_DEFAULT,
+          name: "",
+          placeholder: "",
+          type: ReturnQuestionType.HOST_STACK,
           children: [
             {
               id: "68c0bb98-b00a-4b86-af43-528fe903cb69",
-              translationKey: "size_overall",
+              name: "size_overall",
+              placeholder: "",
               type: ReturnQuestionType.OPTION,
             },
             {
               id: "85e84a77-461c-41e6-8544-95b5294d0b80",
-              translationKey: "size_trousers_too_long",
+              name: "size_trousers_too_long",
+              placeholder: "",
               type: ReturnQuestionType.OPTION,
             },
             {
               id: "29441d25-8d9f-471e-a13e-a03f61c88091",
-              translationKey: "size_fit_cut_does_not_fit",
+              name: "size_fit_cut_does_not_fit",
+              placeholder: "",
               type: ReturnQuestionType.OPTION,
             },
           ],
@@ -46,17 +54,11 @@ const returnQuestion: ReturnQuestionProjection<ReturnQuestionType.HOST_DEFAULT>
     },
   ],
 };
-const returnQuestionUnanswered: ReturnQuestionProjection<ReturnQuestionType.HOST_DEFAULT> = {
+const returnQuestionUnanswered: ReturnQuestionProjection = {
   id: "fd7ff4a0-78ed-4c0d-aa4d-64962739c322",
-  translationKey: "style_title",
-  type: ReturnQuestionType.HOST_DEFAULT,
-  children: [
-    {
-      id: "68c0bb98-b00a-4b86-af43-528fe903cb69",
-      translationKey: "size_overall",
-      type: ReturnQuestionType.OPTION,
-    },
-  ],
+  name: "style_title",
+  placeholder: "",
+  type: ReturnQuestionType.HOST_STACK,
 };
 
 describe("ReturnQuestionFeedbackItem component (ReturnQuestions organism)", () => {
@@ -68,7 +70,7 @@ describe("ReturnQuestionFeedbackItem component (ReturnQuestions organism)", () =
       />,
     );
 
-    expect(getByText(returnQuestion.translationKey)).toBeTruthy();
+    expect(getByText(returnQuestion.name)).toBeTruthy();
     expect(getByText("size_large / size_overall")).toBeTruthy();
   });
 
@@ -80,7 +82,7 @@ describe("ReturnQuestionFeedbackItem component (ReturnQuestions organism)", () =
       />,
     );
 
-    expect(getByText(returnQuestionUnanswered.translationKey)).toBeTruthy();
+    expect(getByText(returnQuestionUnanswered.name)).toBeTruthy();
     expect(getByText(I18nMessages.FEEDBACK_UNANSWERED)).toBeTruthy();
   });
 });

package/src/infrastructure/ui/components/organisms/returnQuestions/components/returnQuestionFeedbackItem/ReturnQuestionFeedbackItem.tsx

@@ -1,17 +1,15 @@
-/* eslint-disable react/prop-types */
 import React, { useCallback } from "react";
 import { View } from "react-native";
 import { Text } from "@lookiero/aurora";
 import { useI18nMessage, useIntl } from "@lookiero/i18n-react";
-import { ReturnQuestionType } from "../../../../../../../projection/returnQuestion/returnQuestion.constants";
 import { I18nMessages } from "../../../../../i18n/i18n";
 import { useReturnQuestionFeedback } from "../../behaviors/useReturnQuestionFeedback";
 import { feedbackForReturnQuestion } from "../../util/returnQuestionFeedback";
-import { ReturnQuestionItem } from "../ReturnQuestionItem";
+import { ReturnQuestionItem, ReturnQuestionItemProps } from "../ReturnQuestionItem";
 import { style } from "./ReturnQuestionFeedbackItem.style";
 
-const ReturnQuestionFeedbackItem: ReturnQuestionItem<ReturnQuestionType.HOST_DEFAULT> = ({ returnQuestion }) => {
-  const titleText = useI18nMessage({ id: returnQuestion.translationKey });
+const ReturnQuestionFeedbackItem: ReturnQuestionItem = ({ returnQuestion }: ReturnQuestionItemProps) => {
+  const titleText = useI18nMessage({ id: returnQuestion.name });
   const unansweredText = useI18nMessage({ id: I18nMessages.FEEDBACK_UNANSWERED });
 
   const returnQuestionFeedback = useReturnQuestionFeedback();

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

@@ -1,7 +1,9 @@
 import { fireEvent } from "@testing-library/react-native";
 import React from "react";
-import { ReturnQuestionProjection } from "../../../../../../../projection/returnQuestion/returnQuestion";
-import { ReturnQuestionType } from "../../../../../../../projection/returnQuestion/returnQuestion.constants";
+import {
+  ReturnQuestionProjection,
+  ReturnQuestionType,
+} from "../../../../../../../projection/returnQuestion/returnQuestion";
 import { render } from "../../../../../test/render";
 import { TextareaReturnQuestionItem } from "./TextareaReturnQuestionItem";
 
@@ -13,13 +15,31 @@ jest.mock("../../behaviors/useReturnQuestionFeedback", () => ({
 const returnQuestionParent = {
   id: "0ad1dba8-b02c-4121-a1e3-981f1c30800d",
 } as ReturnQuestionProjection;
-const returnQuestion: ReturnQuestionProjection<ReturnQuestionType.TEXTAREA> = {
-  id: "1123a37d-bc00-43a4-9d28-cee1dfaf356c",
-  translationKey: "comment_textarea",
-  type: ReturnQuestionType.TEXTAREA,
-  metadata: {
-    placeholder: "comment_textarea_placeholder",
-  },
+const returnQuestion: ReturnQuestionProjection = {
+  id: "9251dc2c-d76a-484d-9299-346929af932f",
+  name: "size_large",
+  placeholder: "",
+  type: ReturnQuestionType.OPTION,
+  children: [
+    {
+      id: "68c0bb98-b00a-4b86-af43-528fe903cb69",
+      name: "size_overall",
+      placeholder: "",
+      type: ReturnQuestionType.OPTION,
+    },
+    {
+      id: "85e84a77-461c-41e6-8544-95b5294d0b80",
+      name: "size_trousers_too_long",
+      placeholder: "",
+      type: ReturnQuestionType.OPTION,
+    },
+    {
+      id: "29441d25-8d9f-471e-a13e-a03f61c88091",
+      name: "size_fit_cut_does_not_fit",
+      placeholder: "",
+      type: ReturnQuestionType.OPTION,
+    },
+  ],
 };
 
 describe("TextareaReturnQuestionItem component (ReturnQuestions organism)", () => {

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

@@ -1,23 +1,21 @@
-/* eslint-disable react/prop-types */
 import React, { useCallback, useMemo } from "react";
 import { View } from "@lookiero/aurora";
 import { useIntl } from "@lookiero/i18n-react";
-import { ReturnQuestionType } from "../../../../../../../projection/returnQuestion/returnQuestion.constants";
 import { InputField } from "../../../../../../../shared/ui/components/molecules/inputField/InputField";
 import { useReturnQuestionFeedbackForReturnQuestion } from "../../behaviors/useReturnQuestionFeedback";
-import { ReturnQuestionItem } from "../ReturnQuestionItem";
+import { ReturnQuestionItem, ReturnQuestionItemProps } from "../ReturnQuestionItem";
 import { style } from "./TextareaReturnQuestionItem.style";
 
-const TextareaReturnQuestionItem: ReturnQuestionItem<ReturnQuestionType.TEXTAREA> = ({
+const TextareaReturnQuestionItem: ReturnQuestionItem = ({
   returnQuestion,
   returnQuestionParent,
   testID,
-}) => {
+}: ReturnQuestionItemProps) => {
   const { formatMessage } = useIntl();
 
   const placeholderText = useMemo(
-    () => (returnQuestion.metadata.placeholder ? formatMessage({ id: returnQuestion.metadata.placeholder }) : ""),
-    [formatMessage, returnQuestion.metadata.placeholder],
+    () => (returnQuestion.placeholder ? formatMessage({ id: returnQuestion.placeholder }) : ""),
+    [formatMessage, returnQuestion.placeholder],
   );
 
   const { feedback, onChange } = useReturnQuestionFeedbackForReturnQuestion({ returnQuestion: returnQuestionParent });

package/src/infrastructure/ui/components/organisms/returnQuestions/util/__snapshots__/returnQuestionFeedback.test.ts.snap

@@ -13,15 +13,14 @@ exports[`returnQuestionFeedback utils return the deepest returnQuestion with fee
     "children": [
       {
         "id": "1123a37d-bc00-43a4-9d28-cee1dfaf356c",
-        "metadata": {
-          "placeholder": "comment_textarea_placeholder",
-        },
-        "translationKey": "comment_textarea",
+        "name": "comment_textarea",
+        "placeholder": "comment_textarea_placeholder",
         "type": "TEXTAREA",
       },
     ],
     "id": "ce3e8d57-5eea-4dd3-bef4-2e811a143612",
-    "translationKey": "comment_title",
+    "name": "comment_title",
+    "placeholder": "",
     "type": "HOST_TEXTAREA",
   },
   false,

package/src/infrastructure/ui/components/organisms/returnQuestions/util/returnQuestionFeedback.ts

@@ -1,17 +1,6 @@
+import { isUuid } from "@lookiero/sty-psp-uuid";
 import { FeedbackProjection } from "../../../../../../projection/feedback/feedback";
 import { ReturnQuestionProjection } from "../../../../../../projection/returnQuestion/returnQuestion";
-import {
-  returnQuestionHasChildren,
-  returnQuestionWithTranslationKey,
-} from "../../../../../../projection/returnQuestion/returnQuestion.typeguard";
-
-type Uuid = string;
-
-const REGEX =
-  /^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;
-const isUuid = (value: string): value is Uuid => {
-  return typeof value === "string" && REGEX.test(value);
-};
 
 interface RecursiveFeedbackForReturnQuestionFunctionArgs {
   readonly feedback: FeedbackProjection;
@@ -36,16 +25,14 @@ const feedbackForReturnQuestion: RecursiveFeedbackForReturnQuestionFunction = ({
     const returnQuestionFeedback = feedback[returnQuestionId];
 
     if (isUuid(returnQuestionFeedback as string)) {
-      const feebackReturnQuestionChild =
-        returnQuestionHasChildren(returnQuestion) &&
-        returnQuestion.children?.find((childReturnQuestion) => childReturnQuestion.id === returnQuestionFeedback);
+      const feebackReturnQuestionChild = returnQuestion.children?.find(
+        (childReturnQuestion) => childReturnQuestion.id === returnQuestionFeedback,
+      );
 
       if (feebackReturnQuestionChild) {
         return [
           ...acc,
-          ...(returnQuestionWithTranslationKey(feebackReturnQuestionChild)
-            ? [translate(feebackReturnQuestionChild.translationKey)]
-            : []),
+          translate(feebackReturnQuestionChild?.name),
           ...feedbackForReturnQuestion({ feedback, returnQuestion: feebackReturnQuestionChild, translate, acc }),
         ];
       }
@@ -57,15 +44,13 @@ const feedbackForReturnQuestion: RecursiveFeedbackForReturnQuestionFunction = ({
   }
 
   return (
-    (returnQuestionHasChildren(returnQuestion) &&
-      returnQuestion.children?.reduce(
-        (acc, childReturnQuestion) => [
-          ...acc,
-          ...feedbackForReturnQuestion({ feedback, returnQuestion: childReturnQuestion, translate, acc }),
-        ],
-        [] as string[],
-      )) ||
-    []
+    returnQuestion.children?.reduce(
+      (acc, childReturnQuestion) => [
+        ...acc,
+        ...feedbackForReturnQuestion({ feedback, returnQuestion: childReturnQuestion, translate, acc }),
+      ],
+      [] as string[],
+    ) || []
   );
 };
 
@@ -92,9 +77,9 @@ const deepestReturnQuestionWithFeedbackForReturnQuestion: RecursiveDeepestReturn
     const returnQuestionFeedback = feedback[returnQuestionId];
 
     if (isUuid(returnQuestionFeedback as string)) {
-      const feebackReturnQuestionChild =
-        returnQuestionHasChildren(returnQuestion) &&
-        returnQuestion.children?.find((childReturnQuestion) => childReturnQuestion.id === returnQuestionFeedback);
+      const feebackReturnQuestionChild = returnQuestion.children?.find(
+        (childReturnQuestion) => childReturnQuestion.id === returnQuestionFeedback,
+      );
 
       if (feebackReturnQuestionChild) {
         return deepestReturnQuestionWithFeedbackForReturnQuestion({
@@ -110,11 +95,9 @@ const deepestReturnQuestionWithFeedbackForReturnQuestion: RecursiveDeepestReturn
     return [returnQuestion, false];
   }
 
-  const feebackReturnQuestionChild =
-    returnQuestionHasChildren(returnQuestion) &&
-    returnQuestion.children?.find((childReturnQuestion) =>
-      Object.keys(feedback).find((id) => id === childReturnQuestion.id),
-    );
+  const feebackReturnQuestionChild = returnQuestion.children?.find((childReturnQuestion) =>
+    Object.keys(feedback).find((id) => id === childReturnQuestion.id),
+  );
 
   if (feebackReturnQuestionChild) {
     return deepestReturnQuestionWithFeedbackForReturnQuestion({
@@ -124,11 +107,7 @@ const deepestReturnQuestionWithFeedbackForReturnQuestion: RecursiveDeepestReturn
     });
   }
 
-  const hasChildren = Boolean(
-    returnQuestionHasChildren(returnQuestion) && returnQuestion.children && returnQuestion.children.length > 0,
-  );
-
-  return [deepestReturnQuestion, !hasChildren];
+  return [deepestReturnQuestion, !returnQuestion.children || returnQuestion.children.length === 0];
 };
 
 export { feedbackForReturnQuestion, deepestReturnQuestionWithFeedbackForReturnQuestion };

package/src/infrastructure/ui/views/item/components/productVariantSlider/__snapshots__/ProductVariantSlider.test.tsx.snap

@@ -77,7 +77,8 @@ exports[`ProductVariantSlider matches the snapshot 1`] = `
             style={{}}
           >
             <View
-              animatedStyle={
+              collapsable={false}
+              jestAnimatedStyle={
                 {
                   "value": {
                     "transform": [
@@ -88,7 +89,6 @@ exports[`ProductVariantSlider matches the snapshot 1`] = `
                   },
                 }
               }
-              collapsable={false}
               style={
                 {
                   "flex": 1,
@@ -105,16 +105,17 @@ exports[`ProductVariantSlider matches the snapshot 1`] = `
               testID="carousel-track"
             >
               <View
+                collapsable={false}
+                jestAnimatedStyle={
+                  {
+                    "value": {},
+                  }
+                }
                 style={
-                  [
-                    {
-                      "flex": 1,
-                    },
-                    undefined,
-                    {
-                      "width": 300,
-                    },
-                  ]
+                  {
+                    "flex": 1,
+                    "width": 300,
+                  }
                 }
                 testID="carousel-item"
               >
@@ -231,14 +232,14 @@ exports[`ProductVariantSlider matches the snapshot 1`] = `
                         </View>
                       </View>
                       <Image
-                        animatedStyle={
+                        collapsable={false}
+                        jestAnimatedStyle={
                           {
                             "value": {
                               "opacity": 0,
                             },
                           }
                         }
-                        collapsable={false}
                         onLoad={[Function]}
                         resizeMode="stretch"
                         source={
@@ -263,16 +264,17 @@ exports[`ProductVariantSlider matches the snapshot 1`] = `
                 </View>
               </View>
               <View
+                collapsable={false}
+                jestAnimatedStyle={
+                  {
+                    "value": {},
+                  }
+                }
                 style={
-                  [
-                    {
-                      "flex": 1,
-                    },
-                    undefined,
-                    {
-                      "width": 300,
-                    },
-                  ]
+                  {
+                    "flex": 1,
+                    "width": 300,
+                  }
                 }
                 testID="carousel-item"
               >
@@ -389,14 +391,14 @@ exports[`ProductVariantSlider matches the snapshot 1`] = `
                         </View>
                       </View>
                       <Image
-                        animatedStyle={
+                        collapsable={false}
+                        jestAnimatedStyle={
                           {
                             "value": {
                               "opacity": 0,
                             },
                           }
                         }
-                        collapsable={false}
                         onLoad={[Function]}
                         resizeMode="stretch"
                         source={

package/src/infrastructure/ui/views/item/components/returnQuestionsFeedback/ReturnQuestionsFeedback.tsx

@@ -2,8 +2,10 @@ import React, { FC } from "react";
 import { View } from "react-native";
 import { ButtonIcon, Text } from "@lookiero/aurora";
 import { useI18nMessage } from "@lookiero/i18n-react";
-import { ReturnQuestionProjection } from "../../../../../../projection/returnQuestion/returnQuestion";
-import { ReturnQuestionType } from "../../../../../../projection/returnQuestion/returnQuestion.constants";
+import {
+  ReturnQuestionProjection,
+  ReturnQuestionType,
+} from "../../../../../../projection/returnQuestion/returnQuestion";
 import { ReturnQuestions } from "../../../../components/organisms/returnQuestions/ReturnQuestions";
 import {
   ReturnQuestionItemProvider,