@lookiero/checkout 2.4.1-beta.0 → 3.0.0-beta.0

package/dist/infrastructure/ui/routing/Routing.js

@@ -11,36 +11,36 @@ const Item = lazy(() => import("../views/item/Item").then((module) => ({ default
 const Summary = lazy(() => import("../views/summary/Summary").then((module) => ({ default: module.Summary })));
 const Checkout = lazy(() => import("../views/checkout/Checkout").then((module) => ({ default: module.Checkout })));
 const Feedback = lazy(() => import("../views/feedback/Feedback").then((module) => ({ default: module.Feedback })));
-const Routing = ({ basePath = "", customer, locale, I18n, getAuthToken, onI18nError, onNotAccessible, onOpenMenu, useRedirect, useRoutes = reactRouterUseRoutes, }) => {
+const Routing = ({ basePath = "", customer, locale, I18n, layout, getAuthToken, onI18nError, onNotAccessible, useRedirect, useRoutes = reactRouterUseRoutes, }) => {
     return useRoutes([
         {
             path: "",
             element: (React.createElement(BasePathProvider, { basePath: basePath },
                 React.createElement(CheckoutAccessibilityMiddleware, { customerId: customer?.customerId, onNotAccessible: onNotAccessible },
                     React.createElement(I18n, { loader: React.createElement(Spinner, null), locale: locale, onError: onI18nError },
-                        React.createElement(CheckoutMiddleware, { customerId: customer?.customerId },
-                            React.createElement(App, { country: customer?.country, customerId: customer?.customerId, onOpenMenu: onOpenMenu },
+                        React.createElement(CheckoutMiddleware, { customerId: customer?.customerId, onNotAccessible: onNotAccessible },
+                            React.createElement(App, null,
                                 React.createElement(Outlet, null))))))),
             children: [
                 {
                     path: Routes.ITEM,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
-                        React.createElement(Item, { country: customer?.country, customerId: customer?.customerId }))),
+                        React.createElement(Item, { country: customer?.country, customerId: customer?.customerId, layout: layout }))),
                 },
                 {
                     path: Routes.ITEM_DETAIL,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
-                        React.createElement(Item, { country: customer?.country, customerId: customer?.customerId }))),
+                        React.createElement(Item, { country: customer?.country, customerId: customer?.customerId, layout: layout }))),
                 },
                 {
                     path: Routes.SUMMARY,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
-                        React.createElement(Summary, { country: customer?.country, customerId: customer?.customerId }))),
+                        React.createElement(Summary, { country: customer?.country, customerId: customer?.customerId, layout: layout }))),
                 },
                 {
                     path: Routes.CHECKOUT,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
-                        React.createElement(Checkout, { country: customer?.country, customerId: customer?.customerId, useRedirect: useRedirect },
+                        React.createElement(Checkout, { country: customer?.country, customerId: customer?.customerId, layout: layout, useRedirect: useRedirect },
                             React.createElement(Outlet, null)))),
                     children: [
                         {
@@ -52,7 +52,7 @@ const Routing = ({ basePath = "", customer, locale, I18n, getAuthToken, onI18nEr
                 {
                     path: Routes.FEEDBACK,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
-                        React.createElement(Feedback, { country: customer?.country, customerId: customer?.customerId }))),
+                        React.createElement(Feedback, { country: customer?.country, customerId: customer?.customerId, layout: layout }))),
                 },
                 {
                     path: "*",

package/dist/infrastructure/ui/views/App.d.ts

@@ -1,10 +1,6 @@
 import { FC } from "react";
-import { Country } from "../../../projection/shared/country";
 interface AppProps {
     readonly children: JSX.Element;
-    readonly customerId: string;
-    readonly country: Country;
-    readonly onOpenMenu: () => void;
 }
 declare const App: FC<AppProps>;
 export { App };

package/dist/infrastructure/ui/views/App.js

@@ -6,12 +6,10 @@ import { SafeAreaProvider } from "react-native-safe-area-context";
 import { Notifications } from "../../../shared/notifications/infrastructure/ui/views/Notifications";
 import { MESSAGING_CONTEXT_ID } from "../../delivery/baseBootstrap";
 import { theme } from "../theme/theme";
-import { Navigation } from "./navigation/Navigation";
 const { colorBase } = theme();
-const App = ({ children, customerId, country, onOpenMenu }) => (React.createElement(SafeAreaProvider, null,
+const App = ({ children }) => (React.createElement(SafeAreaProvider, null,
     React.createElement(PortalProvider, null,
         React.createElement(StatusBar, { backgroundColor: colorBase, barStyle: "dark-content", translucent: true }),
         React.createElement(Notifications, { contextId: MESSAGING_CONTEXT_ID }),
-        React.createElement(Navigation, { country: country, customerId: customerId, onOpenMenu: onOpenMenu },
-            React.createElement(AuroraPortalProvider, null, children)))));
+        React.createElement(AuroraPortalProvider, null, children))));
 export { App };

package/dist/infrastructure/ui/views/checkout/Checkout.d.ts

@@ -1,9 +1,11 @@
 import { FC, ReactNode } from "react";
 import { Country } from "../../../../projection/shared/country";
+import { Layout } from "../../components/layouts/layout/Layout";
 interface CheckoutProps {
     readonly children?: ReactNode;
     readonly customerId: string;
     readonly country: Country;
+    readonly layout: Layout;
     readonly useRedirect: () => Record<string, string>;
 }
 declare const Checkout: FC<CheckoutProps>;

package/dist/infrastructure/ui/views/checkout/Checkout.js

@@ -2,27 +2,27 @@ import { Text } from "@lookiero/aurora";
 import { useI18nMessage } from "@lookiero/i18n-react";
 import { QueryStatus } from "@lookiero/messaging-react";
 import React, { useCallback, useMemo } from "react";
-import { View } from "react-native";
+import { ScrollView, View } from "react-native";
 import { useNavigate } from "react-router-native";
 import { CheckoutItemStatus } from "../../../../domain/checkoutItem/model/checkoutItem";
 import { useTrackPageView } from "../../../../shared/tracking/infrastructure/useTrackPageView";
+import { useTrackPressBack } from "../../../../shared/tracking/infrastructure/useTrackPressBack";
 import { useTrackPressContinue } from "../../../../shared/tracking/infrastructure/useTrackPressContinue";
 import { Spinner } from "../../../../shared/ui/components/atoms/spinner/Spinner";
 import { useViewFirstAvailableCheckoutByCustomerId } from "../../../projection/checkout/react/useViewFirstAvailableCheckoutByCustomerId";
 import { useViewPricingByCheckoutId } from "../../../projection/pricing/react/useViewPricingByCheckoutId";
 import { TrackingPage } from "../../../tracking/tracking";
 import { Body } from "../../components/layouts/body/Body";
-import { SafeAreaScrollView } from "../../components/templates/SafeAreaScrollView";
+import { CheckoutHeader } from "../../components/templates/header/checkoutHeader/CheckoutHeader";
 import { I18nMessages } from "../../i18n/i18n";
 import { Routes } from "../../routing/routes";
 import { useBasePath } from "../../routing/useBasePath";
-import { HEADER_HEIGHT } from "../navigation/components/header/Header.style";
 import { ProductVariant } from "../shared/components/productVariant/ProductVariant";
 import { Pricing } from "../summary/components/pricing/Pricing";
 import { style } from "./Checkout.style";
 import { DeliveryBanner } from "./components/deliveryBanner/DeliveryBanner";
 import { PaymentInstrument } from "./components/paymentInstrument/PaymentInstrument";
-const Checkout = ({ children, customerId, country, useRedirect }) => {
+const Checkout = ({ children, customerId, country, layout: Layout, useRedirect }) => {
     const titleText = useI18nMessage({ id: I18nMessages.CHECKOUT_TITLE });
     const [checkout, checkoutStatus] = useViewFirstAvailableCheckoutByCustomerId({ customerId });
     const [pricing, pricingStatus] = useViewPricingByCheckoutId({ checkoutId: checkout?.id });
@@ -44,13 +44,19 @@ const Checkout = ({ children, customerId, country, useRedirect }) => {
     }, [basePath, navigate, trackPressContinue]);
     const checkoutItemsKept = useMemo(() => checkout?.items.filter((checkoutItem) => checkoutItem.status === CheckoutItemStatus.KEPT || checkoutItem.status === CheckoutItemStatus.REPLACED), [checkout?.items]);
     const hasReplacedCheckoutItem = useMemo(() => checkout?.items.some((checkoutItem) => checkoutItem.status === CheckoutItemStatus.REPLACED), [checkout?.items]);
+    const trackPressBack = useTrackPressBack();
+    const handleOnBack = useCallback(() => trackPressBack({
+        page: TrackingPage.CHECKOUT,
+        country,
+        checkoutId: checkout?.id,
+    }), [checkout?.id, country, trackPressBack]);
     const dependenciesLoadedStatuses = [QueryStatus.ERROR, QueryStatus.SUCCESS];
     const dependenciesLoaded = (dependenciesLoadedStatuses.includes(checkoutStatus) || checkout) &&
         dependenciesLoadedStatuses.includes(pricingStatus);
     if (!dependenciesLoaded)
         return React.createElement(Spinner, null);
-    return (React.createElement(React.Fragment, null,
-        React.createElement(SafeAreaScrollView, { scrollerPaddingTop: HEADER_HEIGHT },
+    return (React.createElement(Layout, { header: React.createElement(CheckoutHeader, { onBack: handleOnBack }) },
+        React.createElement(ScrollView, { contentContainerStyle: style.container, showsVerticalScrollIndicator: false },
             React.createElement(Body, { style: { column: style.bodyColumn } },
                 hasReplacedCheckoutItem && (React.createElement(View, { style: style.deliveryBannerContainer },
                     React.createElement(DeliveryBanner, null))),

package/dist/infrastructure/ui/views/checkout/Checkout.style.d.ts

@@ -5,6 +5,9 @@ declare const style: {
     checkoutItemKept: {
         paddingVertical: number;
     };
+    container: {
+        paddingBottom: number;
+    };
     deliveryBannerContainer: {
         marginBottom: number;
     };

package/dist/infrastructure/ui/views/checkout/Checkout.style.js

@@ -8,6 +8,9 @@ const style = StyleSheet.create({
     checkoutItemKept: {
         paddingVertical: spaceM,
     },
+    container: {
+        paddingBottom: spaceXXL,
+    },
     deliveryBannerContainer: {
         marginBottom: spaceXXL,
     },

package/dist/infrastructure/ui/views/feedback/Feedback.d.ts

@@ -1,8 +1,10 @@
 import { FC } from "react";
 import { Country } from "../../../../projection/shared/country";
+import { Layout } from "../../components/layouts/layout/Layout";
 interface FeedbackProps {
     readonly customerId: string;
     readonly country: Country;
+    readonly layout: Layout;
 }
 declare const Feedback: FC<FeedbackProps>;
 export { Feedback };

package/dist/infrastructure/ui/views/feedback/Feedback.js

@@ -1,5 +1,6 @@
 import { CommandStatus, QueryStatus } from "@lookiero/messaging-react";
 import React, { useCallback, useEffect, useRef } from "react";
+import { ScrollView } from "react-native";
 import { CheckoutQuestionType } from "../../../../projection/checkoutQuestion/checkoutQuestion";
 import { useLogger } from "../../../../shared/logging/useLogger";
 import { useTrackChangeFeedback } from "../../../../shared/tracking/infrastructure/useTrackChangeFeedback";
@@ -12,11 +13,9 @@ import { useListCheckoutQuestionsByCheckoutId } from "../../../projection/checko
 import { TrackingPage } from "../../../tracking/tracking";
 import { Body } from "../../components/layouts/body/Body";
 import { CheckoutQuestionFeedbackProvider } from "../../components/organisms/checkoutQuestions/behaviors/useCheckoutQuestionFeedback";
-import { SafeAreaScrollView } from "../../components/templates/SafeAreaScrollView";
-import { HEADER_HEIGHT } from "../navigation/components/header/Header.style";
 import { style } from "./Feedback.style";
 import { CheckoutQuestionsForm } from "./components/checkoutQuestionsForm/CheckoutQuestionsForm";
-const Feedback = ({ customerId, country }) => {
+const Feedback = ({ customerId, country, layout: Layout }) => {
     const logger = useLogger();
     const [checkout, checkoutStatus] = useViewFirstAvailableCheckoutByCustomerId({ customerId });
     const [checkoutQuestions, checkoutQuestionsStatus] = useListCheckoutQuestionsByCheckoutId({
@@ -75,8 +74,9 @@ const Feedback = ({ customerId, country }) => {
     if (!dependenciesLoaded)
         return React.createElement(Spinner, null);
     return (React.createElement(CheckoutQuestionFeedbackProvider, { feedback: {}, onChanged: handleOnChangedFeedback },
-        React.createElement(SafeAreaScrollView, { scrollerPaddingTop: HEADER_HEIGHT },
-            React.createElement(Body, { style: { column: style.bodyColumn } },
-                React.createElement(CheckoutQuestionsForm, { checkoutQuestions: checkoutQuestions || [], submitButtonDisabled: giveCheckoutFeedbackStatus === CommandStatus.LOADING, onSubmit: handleOnSubmit })))));
+        React.createElement(Layout, null,
+            React.createElement(ScrollView, { contentContainerStyle: style.container, showsVerticalScrollIndicator: false },
+                React.createElement(Body, { style: { column: style.bodyColumn } },
+                    React.createElement(CheckoutQuestionsForm, { checkoutQuestions: checkoutQuestions || [], submitButtonDisabled: giveCheckoutFeedbackStatus === CommandStatus.LOADING, onSubmit: handleOnSubmit }))))));
 };
 export { Feedback };

package/dist/infrastructure/ui/views/feedback/Feedback.style.d.ts

@@ -2,5 +2,8 @@ declare const style: {
     bodyColumn: {
         paddingHorizontal: number;
     };
+    container: {
+        paddingBottom: number;
+    };
 };
 export { style };

package/dist/infrastructure/ui/views/feedback/Feedback.style.js

@@ -1,9 +1,12 @@
 import { StyleSheet } from "react-native";
 import { theme } from "../../theme/theme";
-const { spaceXL } = theme();
+const { spaceXL, spaceXXL } = theme();
 const style = StyleSheet.create({
     bodyColumn: {
         paddingHorizontal: spaceXL,
     },
+    container: {
+        paddingBottom: spaceXXL,
+    },
 });
 export { style };

package/dist/infrastructure/ui/views/item/Item.d.ts

@@ -1,8 +1,10 @@
 import { FC } from "react";
 import { Country } from "../../../../projection/shared/country";
+import { Layout } from "../../components/layouts/layout/Layout";
 interface ItemProps {
     readonly customerId: string;
     readonly country: Country;
+    readonly layout: Layout;
 }
 declare const Item: FC<ItemProps>;
 export { Item };

package/dist/infrastructure/ui/views/item/Item.js

@@ -1,9 +1,12 @@
 import { CommandStatus, QueryStatus } from "@lookiero/messaging-react";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useParams } from "react-router-native";
+import { useMatch, useParams } from "react-router-native";
 import { CheckoutItemStatus } from "../../../../domain/checkoutItem/model/checkoutItem";
 import { useLogger } from "../../../../shared/logging/useLogger";
 import { useTrackItemPageView } from "../../../../shared/tracking/infrastructure/useTrackItemPageView";
+import { useTrackPressBack } from "../../../../shared/tracking/infrastructure/useTrackPressBack";
+import { useTrackPressNext } from "../../../../shared/tracking/infrastructure/useTrackPressNext";
+import { useTrackPressPrevious } from "../../../../shared/tracking/infrastructure/useTrackPressPrevious";
 import { useTrackReturnItem } from "../../../../shared/tracking/infrastructure/useTrackReturnItem";
 import { Spinner } from "../../../../shared/ui/components/atoms/spinner/Spinner";
 import { useBookCheckoutBookingForCheckoutItem } from "../../../domain/checkoutBooking/react/useBookCheckoutBookingForCheckoutItem";
@@ -14,10 +17,14 @@ import { useViewIsSizeChangeEnabledByCheckoutId } from "../../../projection/chec
 import { useListReturnQuestionsByCheckoutItemId } from "../../../projection/returnQuestion/react/useListReturnQuestionsByCheckoutItemId";
 import { TrackingPage } from "../../../tracking/tracking";
 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 { Routes } from "../../routing/routes";
+import { useBasePath } from "../../routing/useBasePath";
 import { ReturnQuestionsForm } from "./components/returnQuestionsForm/ReturnQuestionsForm";
 import { ItemWithCustomerDecission, } from "./views/itemWithCustomerDecission/ItemWithCustomerDecission";
 import { ItemWithoutCustomerDecission, } from "./views/itemWithoutCustomerDecission/ItemWithoutCustomerDecission";
-const Item = ({ customerId, country }) => {
+const Item = ({ customerId, country, layout: Layout }) => {
     const logger = useLogger();
     const { id } = useParams();
     const [checkout, checkoutStatus] = useViewFirstAvailableCheckoutByCustomerId({ customerId });
@@ -90,6 +97,31 @@ const Item = ({ customerId, country }) => {
         replaceableFor,
         unique: checkoutItem.productVariant.size.unique,
     });
+    const trackPressNext = useTrackPressNext();
+    const handleOnNext = useCallback(({ from, to }) => trackPressNext({
+        page: TrackingPage.ITEM,
+        country,
+        checkoutId: checkout?.id,
+        from,
+        to,
+    }), [checkout?.id, country, trackPressNext]);
+    const trackPressPrevious = useTrackPressPrevious();
+    const handleOnPrevious = useCallback(({ from, to }) => trackPressPrevious({
+        page: TrackingPage.ITEM,
+        country,
+        checkoutId: checkout?.id,
+        from,
+        to,
+    }), [checkout?.id, country, trackPressPrevious]);
+    const trackPressBack = useTrackPressBack();
+    const handleOnBack = useCallback(() => trackPressBack({
+        page: TrackingPage.ITEM,
+        country,
+        checkoutId: checkout?.id,
+    }), [checkout?.id, country, trackPressBack]);
+    const basePath = useBasePath();
+    const itemDetailRouteMatch = useMatch(`${basePath}/${Routes.ITEM_DETAIL}`);
+    const header = useMemo(() => itemDetailRouteMatch ? (React.createElement(ItemDetailHeader, { onBack: handleOnBack })) : (React.createElement(ItemHeader, { item: checkoutItem, items: checkout?.items, onNext: handleOnNext, onPrevious: handleOnPrevious })), [checkout?.items, checkoutItem, handleOnBack, handleOnNext, handleOnPrevious, itemDetailRouteMatch]);
     const dependenciesLoaded = checkoutStatus !== QueryStatus.LOADING &&
         checkout &&
         checkoutItem &&
@@ -103,7 +135,8 @@ const Item = ({ customerId, country }) => {
         return React.createElement(Spinner, null);
     }
     return (React.createElement(ReturnQuestionFeedbackProvider, { feedback: checkoutItem.feedbacks || {} },
-        checkoutItem.status === CheckoutItemStatus.INITIAL ? (React.createElement(ItemWithoutCustomerDecission, { bookedProductsVariants: bookedProductsVariants, checkoutId: checkout.id, checkoutItem: checkoutItem, country: country, currentProductVariant: currentProductVariant, onReturn: showReturnQuestions })) : (React.createElement(ItemWithCustomerDecission, { checkoutId: checkout.id, checkoutItem: checkoutItem, country: country, currentProductVariant: currentProductVariant, returnQuestions: returnQuestions, onEditFeedback: showReturnQuestions })),
-        React.createElement(ReturnQuestionsForm, { returnQuestions: returnQuestions, visible: returnQuestionsVisible, onClose: hideReturnQuestions, onSubmit: returnItem })));
+        React.createElement(Layout, { header: header },
+            checkoutItem.status === CheckoutItemStatus.INITIAL ? (React.createElement(ItemWithoutCustomerDecission, { bookedProductsVariants: bookedProductsVariants, checkoutId: checkout.id, checkoutItem: checkoutItem, country: country, currentProductVariant: currentProductVariant, onReturn: showReturnQuestions })) : (React.createElement(ItemWithCustomerDecission, { checkoutId: checkout.id, checkoutItem: checkoutItem, country: country, currentProductVariant: currentProductVariant, returnQuestions: returnQuestions, onEditFeedback: showReturnQuestions })),
+            React.createElement(ReturnQuestionsForm, { returnQuestions: returnQuestions, visible: returnQuestionsVisible, onClose: hideReturnQuestions, onSubmit: returnItem }))));
 };
 export { Item };

package/dist/infrastructure/ui/views/item/components/returnQuestionsForm/ReturnQuestionsForm.js

@@ -12,7 +12,7 @@ import { HostDefaultReturnQuestionItem } from "../../../../components/organisms/
 import { HostSelectReturnQuestionItem } from "../../../../components/organisms/returnQuestions/components/hostSelectReturnQuestionItem/HostSelectReturnQuestionItem";
 import { HostStackReturnQuestionItem } from "../../../../components/organisms/returnQuestions/components/hostStackReturnQuestionItem/HostStackReturnQuestionItem";
 import { OptionReturnQuestionItem } from "../../../../components/organisms/returnQuestions/components/optionReturnQuestionItem/OptionReturnQuestionItem";
-import { TEXTAREA_MIN_HEIGHT, TextareaReturnQuestionItem, } from "../../../../components/organisms/returnQuestions/components/textareaReturnQuestionItem/TextareaReturnQuestionItem";
+import { TextareaReturnQuestionItem } from "../../../../components/organisms/returnQuestions/components/textareaReturnQuestionItem/TextareaReturnQuestionItem";
 import { I18nMessages } from "../../../../i18n/i18n";
 import { style } from "./ReturnQuestionsForm.style";
 const RETURN_QUESTION_FORM_PORTAL_HOST_NAME = "return-question-form-portal";
@@ -31,7 +31,7 @@ const ReturnQuestionsForm = ({ returnQuestions, visible, onSubmit, onClose }) =>
     const handleOnSubmit = useCallback(() => onSubmit(feedback), [feedback, onSubmit]);
     return (React.createElement(ReturnQuestionItemProvider, { returnQuestionItems: returnQuestionItems },
         React.createElement(PortalHost, { name: RETURN_QUESTION_FORM_PORTAL_HOST_NAME }),
-        React.createElement(Modal, { extraScrollHeight: TEXTAREA_MIN_HEIGHT, portalHostName: RETURN_QUESTION_FORM_PORTAL_HOST_NAME, testID: "return-questions-form-modal", visible: visible, scroll: true, showCloseButton: true, onClose: onClose },
+        React.createElement(Modal, { portalHostName: RETURN_QUESTION_FORM_PORTAL_HOST_NAME, testID: "return-questions-form-modal", visible: visible, scroll: true, showCloseButton: true, onClose: onClose },
             React.createElement(View, { style: style.returnQuestionsContainer },
                 React.createElement(Text, { level: 2, style: style.title }, titleText),
                 React.createElement(ReturnQuestions, { portalHostName: RETURN_QUESTION_FORM_PORTAL_HOST_NAME, returnQuestions: returnQuestions }),

package/dist/infrastructure/ui/views/item/views/itemWithCustomerDecission/ItemWithCustomerDecission.js

@@ -1,6 +1,6 @@
 import { CommandStatus } from "@lookiero/messaging-react";
 import React, { useCallback } from "react";
-import { View } from "react-native";
+import { ScrollView, View } from "react-native";
 import { CheckoutItemStatus } from "../../../../../../domain/checkoutItem/model/checkoutItem";
 import { useLogger } from "../../../../../../shared/logging/useLogger";
 import { useTrackResetItem } from "../../../../../../shared/tracking/infrastructure/useTrackResetItem";
@@ -8,8 +8,6 @@ import { Spinner } from "../../../../../../shared/ui/components/atoms/spinner/Sp
 import { useResetCheckoutItem } from "../../../../../domain/checkoutItem/react/useResetCheckoutItem";
 import { TrackingPage } from "../../../../../tracking/tracking";
 import { Body } from "../../../../components/layouts/body/Body";
-import { SafeAreaScrollView } from "../../../../components/templates/SafeAreaScrollView";
-import { HEADER_HEIGHT } from "../../../navigation/components/header/Header.style";
 import { CustomerDecissionBanner, } from "../../components/banner/CustomerDecissionBanner";
 import { ReturnQuestionsFeedback } from "../../components/returnQuestionsFeedback/ReturnQuestionsFeedback";
 import { ProductVariant } from "../../views/productVariant/ProductVariant";
@@ -36,7 +34,7 @@ const ItemWithCustomerDecission = ({ country, checkoutId, checkoutItem, returnQu
     if (!dependenciesLoaded) {
         return React.createElement(Spinner, null);
     }
-    return (React.createElement(SafeAreaScrollView, { scrollerPaddingTop: HEADER_HEIGHT },
+    return (React.createElement(ScrollView, { contentContainerStyle: style.container, showsVerticalScrollIndicator: false },
         React.createElement(Body, null,
             React.createElement(CustomerDecissionBanner, { checkoutItemStatus: checkoutItem.status, onPress: resetItem }),
             React.createElement(ProductVariant, { checkoutId: checkoutId, checkoutItem: checkoutItem, country: country, currentProductVariant: currentProductVariant }, checkoutItem.status === CheckoutItemStatus.RETURNED && (React.createElement(View, { style: style.feedbackContainer },

package/dist/infrastructure/ui/views/item/views/itemWithCustomerDecission/ItemWithCustomerDecission.style.d.ts

@@ -1,4 +1,7 @@
 declare const style: {
+    container: {
+        paddingBottom: number;
+    };
     feedbackContainer: {
         borderTopColor: string;
         borderTopWidth: number;

package/dist/infrastructure/ui/views/item/views/itemWithCustomerDecission/ItemWithCustomerDecission.style.js

@@ -1,7 +1,10 @@
 import { StyleSheet } from "react-native";
 import { theme } from "../../../../theme/theme";
-const { borderSize, colorGrayscaleM, spaceXL } = theme();
+const { borderSize, colorGrayscaleM, spaceXL, spaceXXL } = theme();
 const style = StyleSheet.create({
+    container: {
+        paddingBottom: spaceXXL,
+    },
     feedbackContainer: {
         borderTopColor: colorGrayscaleM,
         borderTopWidth: borderSize,

package/dist/infrastructure/ui/views/item/views/itemWithoutCustomerDecission/ItemWithoutCustomerDecission.js

@@ -1,6 +1,6 @@
 import { CommandStatus } from "@lookiero/messaging-react";
 import React, { useCallback, useState } from "react";
-import { Platform } from "react-native";
+import { Platform, ScrollView } from "react-native";
 import "../../../../../../projection/checkout/viewFirstAvailableCheckoutByCustomerId";
 import { useLogger } from "../../../../../../shared/logging/useLogger";
 import { useTrackKeepItem } from "../../../../../../shared/tracking/infrastructure/useTrackKeepItem";
@@ -10,11 +10,10 @@ import { useKeepCheckoutItem } from "../../../../../domain/checkoutItem/react/us
 import { useReplaceCheckoutItem } from "../../../../../domain/checkoutItem/react/useReplaceCheckoutItem";
 import { TrackingPage } from "../../../../../tracking/tracking";
 import { Body } from "../../../../components/layouts/body/Body";
-import { SafeAreaScrollView } from "../../../../components/templates/SafeAreaScrollView";
-import { HEADER_HEIGHT } from "../../../navigation/components/header/Header.style";
 import { ItemActions } from "../../components/itemActions/ItemActions";
 import { SizeWithoutStockModal } from "../../components/sizeWithoutStockModal/SizeWithoutStockModal";
 import { ProductVariant } from "../productVariant/ProductVariant";
+import { style } from "./ItemWithoutCustomerDecission.style";
 const ItemWithoutCustomerDecission = ({ country, checkoutId, checkoutItem, bookedProductsVariants, currentProductVariant, onReturn, }) => {
     const logger = useLogger();
     /* KeepCheckoutItem */
@@ -58,8 +57,9 @@ const ItemWithoutCustomerDecission = ({ country, checkoutId, checkoutItem, booke
     }
     return (React.createElement(React.Fragment, null,
         React.createElement(SizeWithoutStockModal, { visible: sizeWithoutStockModalVisible, onDismiss: handleOnHideSizeWithoutStockModal }),
-        React.createElement(SafeAreaScrollView, { scrollerPaddingTop: HEADER_HEIGHT, footer: React.createElement(ItemActions, { country: country, currentProductVariant: currentProductVariant, productVariants: bookedProductsVariants?.productVariants, onKeep: handleOnKeep, onLayout: handleOnStickyLayout, onReplace: handleOnReplace, onReturn: onReturn, onSizeSelectorPress: handleOnShowSizeWithoutStockModal }) },
+        React.createElement(ScrollView, { contentContainerStyle: style.container, showsVerticalScrollIndicator: false },
             React.createElement(Body, null,
-                React.createElement(ProductVariant, { checkoutId: checkoutId, checkoutItem: checkoutItem, country: country, currentProductVariant: currentProductVariant, style: { content: { paddingBottom: Platform.OS === "web" ? 0 : stickyHeight } } })))));
+                React.createElement(ProductVariant, { checkoutId: checkoutId, checkoutItem: checkoutItem, country: country, currentProductVariant: currentProductVariant, style: { content: { paddingBottom: Platform.OS === "web" ? 0 : stickyHeight } } }))),
+        React.createElement(ItemActions, { country: country, currentProductVariant: currentProductVariant, productVariants: bookedProductsVariants?.productVariants, onKeep: handleOnKeep, onLayout: handleOnStickyLayout, onReplace: handleOnReplace, onReturn: onReturn, onSizeSelectorPress: handleOnShowSizeWithoutStockModal })));
 };
 export { ItemWithoutCustomerDecission };

package/dist/infrastructure/ui/views/item/views/itemWithoutCustomerDecission/ItemWithoutCustomerDecission.style.d.ts

@@ -0,0 +1,6 @@
+declare const style: {
+    container: {
+        paddingBottom: number;
+    };
+};
+export { style };

package/dist/infrastructure/ui/views/item/views/itemWithoutCustomerDecission/ItemWithoutCustomerDecission.style.js

@@ -0,0 +1,9 @@
+import { StyleSheet } from "react-native";
+import { theme } from "../../../../theme/theme";
+const { spaceXXL } = theme();
+const style = StyleSheet.create({
+    container: {
+        paddingBottom: spaceXXL,
+    },
+});
+export { style };

package/dist/infrastructure/ui/views/notFound/NotFound.d.ts

@@ -1,8 +1,10 @@
 import { FC } from "react";
 import { Country } from "../../../../projection/shared/country";
+import { Layout } from "../../components/layouts/layout/Layout";
 interface NotFoundProps {
     readonly customerId: string;
     readonly country: Country;
+    readonly layout: Layout;
 }
 declare const NotFound: FC<NotFoundProps>;
 export { NotFound };

package/dist/infrastructure/ui/views/notFound/NotFound.js

@@ -2,7 +2,7 @@ import { Button, Text } from "@lookiero/aurora";
 import { useI18nMessage } from "@lookiero/i18n-react";
 import { QueryStatus } from "@lookiero/messaging-react";
 import React, { useCallback } from "react";
-import { Image } from "react-native";
+import { Image, ScrollView } from "react-native";
 import { useNavigate } from "react-router-native";
 import { useTrackPageView } from "../../../../shared/tracking/infrastructure/useTrackPageView";
 import { AspectRatioView } from "../../../../shared/ui/components/atoms/aspectRatioView/AspectRatioView";
@@ -10,13 +10,11 @@ import { Spinner } from "../../../../shared/ui/components/atoms/spinner/Spinner"
 import { useViewFirstAvailableCheckoutByCustomerId } from "../../../projection/checkout/react/useViewFirstAvailableCheckoutByCustomerId";
 import { TrackingPage } from "../../../tracking/tracking";
 import { Body } from "../../components/layouts/body/Body";
-import { SafeAreaScrollView } from "../../components/templates/SafeAreaScrollView";
 import { I18nMessages } from "../../i18n/i18n";
 import { Routes } from "../../routing/routes";
 import { useBasePath } from "../../routing/useBasePath";
-import { HEADER_HEIGHT } from "../navigation/components/header/Header.style";
 import { style } from "./NotFound.style";
-const NotFound = ({ customerId, country }) => {
+const NotFound = ({ customerId, country, layout: Layout }) => {
     const descriptionText = useI18nMessage({ id: I18nMessages.NOT_FOUND_DESCRIPTION });
     const buttonText = useI18nMessage({ id: I18nMessages.NOT_FOUND_BUTTON });
     const [checkout, checkoutStatus] = useViewFirstAvailableCheckoutByCustomerId({ customerId });
@@ -32,11 +30,12 @@ const NotFound = ({ customerId, country }) => {
     const dependenciesLoaded = dependenciesLoadedStatuses.includes(checkoutStatus);
     if (!dependenciesLoaded)
         return React.createElement(Spinner, null);
-    return (React.createElement(SafeAreaScrollView, { scrollerPaddingTop: HEADER_HEIGHT, style: { scrollView: style.container } },
-        React.createElement(Body, { style: { column: style.bodyColumn } },
-            React.createElement(AspectRatioView, { aspectRatio: 1.25 },
-                React.createElement(Image, { resizeMode: "contain", source: require("../../../../public/images/not-found.png"), style: style.image, testID: "not-found-image" })),
-            React.createElement(Text, { level: 1, style: style.description }, descriptionText),
-            React.createElement(Button, { onPress: handleOnPress }, buttonText))));
+    return (React.createElement(Layout, null,
+        React.createElement(ScrollView, { contentContainerStyle: style.container, showsVerticalScrollIndicator: false },
+            React.createElement(Body, { style: { column: style.bodyColumn } },
+                React.createElement(AspectRatioView, { aspectRatio: 1.25 },
+                    React.createElement(Image, { resizeMode: "contain", source: require("../../../../public/images/not-found.png"), style: style.image, testID: "not-found-image" })),
+                React.createElement(Text, { level: 1, style: style.description }, descriptionText),
+                React.createElement(Button, { onPress: handleOnPress }, buttonText)))));
 };
 export { NotFound };

package/dist/infrastructure/ui/views/notFound/NotFound.style.d.ts

@@ -4,6 +4,7 @@ declare const style: {
     };
     container: {
         flex: number;
+        paddingBottom: number;
     };
     description: {
         marginBottom: number;

package/dist/infrastructure/ui/views/notFound/NotFound.style.js

@@ -1,12 +1,13 @@
 import { StyleSheet } from "react-native";
 import { theme } from "../../theme/theme";
-const { spaceXL } = theme();
+const { spaceXL, spaceXXL } = theme();
 const style = StyleSheet.create({
     bodyColumn: {
         paddingHorizontal: spaceXL,
     },
     container: {
         flex: 1,
+        paddingBottom: spaceXXL,
     },
     description: {
         marginBottom: spaceXL,

package/dist/infrastructure/ui/views/summary/Summary.d.ts

@@ -1,8 +1,10 @@
 import { FC } from "react";
 import { Country } from "../../../../projection/shared/country";
+import { Layout } from "../../components/layouts/layout/Layout";
 interface SummaryProps {
     readonly customerId: string;
     readonly country: Country;
+    readonly layout: Layout;
 }
 declare const Summary: FC<SummaryProps>;
 export { Summary };

package/dist/infrastructure/ui/views/summary/Summary.js

@@ -2,7 +2,7 @@ import { Text } from "@lookiero/aurora";
 import { useI18nMessage } from "@lookiero/i18n-react";
 import { QueryStatus } from "@lookiero/messaging-react";
 import React, { useCallback, useMemo, useState } from "react";
-import { Platform, View } from "react-native";
+import { Platform, ScrollView, View } from "react-native";
 import { generatePath, useNavigate } from "react-router-native";
 import { CheckoutItemStatus } from "../../../../domain/checkoutItem/model/checkoutItem";
 import { useTrackPageView } from "../../../../shared/tracking/infrastructure/useTrackPageView";
@@ -16,16 +16,14 @@ import { useViewFiveItemsDiscountByCustomerId } from "../../../projection/checko
 import { useViewPricingByCheckoutId } from "../../../projection/pricing/react/useViewPricingByCheckoutId";
 import { TrackingPage } from "../../../tracking/tracking";
 import { Body } from "../../components/layouts/body/Body";
-import { SafeAreaScrollView } from "../../components/templates/SafeAreaScrollView";
 import { I18nMessages } from "../../i18n/i18n";
 import { Routes } from "../../routing/routes";
 import { useBasePath } from "../../routing/useBasePath";
-import { HEADER_HEIGHT } from "../navigation/components/header/Header.style";
 import { style } from "./Summary.style";
 import { CheckoutItemsTabs } from "./components/checkoutItemsTabs/CheckoutItemsTabs";
 import { FiveItemsDiscountBanner } from "./components/fiveItemsDiscountBanner/FiveItemsDiscountBanner";
 import { StickyPricing } from "./components/stickyPricing/StickyPricing";
-const Summary = ({ customerId, country }) => {
+const Summary = ({ customerId, country, layout: Layout }) => {
     const titleText = useI18nMessage({ id: I18nMessages.SUMMARY_TITLE });
     const descriptionText = useI18nMessage({ id: I18nMessages.SUMMARY_DESCRIPTION });
     const [pricingHeight, setPricingHeight] = useState(0);
@@ -83,12 +81,14 @@ const Summary = ({ customerId, country }) => {
         dependenciesLoadedStatuses.includes(fiveItemsDiscountStatus);
     if (!dependenciesLoaded)
         return React.createElement(Spinner, null);
-    return (React.createElement(SafeAreaScrollView, { scrollerPaddingTop: HEADER_HEIGHT, footer: pricing && (React.createElement(StickyPricing, { collapsed: pricingCollapsed, pricing: pricing, totalCheckoutItemsKept: checkoutItemsKept?.length || 0, onLayout: Platform.OS !== "web" ? handleOnPricingLayout : undefined, onPress: handleOnPressPricing, onSubmit: handleOnSubmit })) },
-        React.createElement(Body, { style: { row: { paddingBottom: pricingHeight } } },
-            fiveItemsDiscount !== 0 && React.createElement(FiveItemsDiscountBanner, { fiveItemsDiscount: fiveItemsDiscount }),
-            React.createElement(View, { style: style.content },
-                React.createElement(Text, { level: 3, style: style.title, heading: true }, titleText),
-                React.createElement(Text, { level: 3, style: style.description }, descriptionText)),
-            React.createElement(CheckoutItemsTabs, { checkoutItemsKept: checkoutItemsKept || [], checkoutItemsReturned: checkoutItemsReturned || [], country: country, onChanged: handleOnChangedTab, onPressItem: handleOnPressItem }))));
+    return (React.createElement(Layout, null,
+        React.createElement(ScrollView, { contentContainerStyle: style.container, showsVerticalScrollIndicator: false },
+            React.createElement(Body, { style: { row: { paddingBottom: pricingHeight } } },
+                fiveItemsDiscount !== 0 && React.createElement(FiveItemsDiscountBanner, { fiveItemsDiscount: fiveItemsDiscount }),
+                React.createElement(View, { style: style.content },
+                    React.createElement(Text, { level: 3, style: style.title, heading: true }, titleText),
+                    React.createElement(Text, { level: 3, style: style.description }, descriptionText)),
+                React.createElement(CheckoutItemsTabs, { checkoutItemsKept: checkoutItemsKept || [], checkoutItemsReturned: checkoutItemsReturned || [], country: country, onChanged: handleOnChangedTab, onPressItem: handleOnPressItem }))),
+        pricing && (React.createElement(StickyPricing, { collapsed: pricingCollapsed, pricing: pricing, totalCheckoutItemsKept: checkoutItemsKept?.length || 0, onLayout: Platform.OS !== "web" ? handleOnPricingLayout : undefined, onPress: handleOnPressPricing, onSubmit: handleOnSubmit }))));
 };
 export { Summary };

package/dist/infrastructure/ui/views/summary/Summary.style.d.ts

@@ -1,4 +1,7 @@
 declare const style: {
+    container: {
+        paddingBottom: number;
+    };
     content: {
         paddingHorizontal: number;
     };