@lookiero/checkout 11.2.0 → 11.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/ExpoRoot.js +1 -1
- package/dist/src/infrastructure/ui/components/organisms/checkoutQuestions/components/buttonCheckoutQuestionItem/ButtonCheckoutQuestionItem.js +4 -3
- package/dist/src/infrastructure/ui/components/organisms/checkoutQuestions/components/buttonCheckoutQuestionItem/ButtonCheckoutQuestionItem.style.d.ts +3 -0
- package/dist/src/infrastructure/ui/components/organisms/checkoutQuestions/components/buttonCheckoutQuestionItem/ButtonCheckoutQuestionItem.style.js +3 -0
- package/dist/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/IconCheckoutQuestionItem.js +1 -1
- package/dist/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/IconCheckoutQuestionItem.style.d.ts +1 -0
- package/dist/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/IconCheckoutQuestionItem.style.js +2 -1
- package/dist/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/icons/Happy.js +5 -5
- package/dist/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/icons/Normal.js +5 -5
- package/dist/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/icons/Sad.js +5 -5
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/hostDefaultReturnQuestionItem/HostDefaultReturnQuestionItem.js +2 -1
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/hostSelectReturnQuestionItem/HostSelectReturnQuestionItem.js +2 -3
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/hostStackReturnQuestionItem/modal/HostStackReturnQuestionItem.js +2 -2
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/hostStackReturnQuestionItem/modal/HostStackReturnQuestionItem.style.d.ts +3 -0
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/hostStackReturnQuestionItem/modal/HostStackReturnQuestionItem.style.js +4 -1
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/modalOptionReturnQuestionItems/ModalOptionReturnQuestionItems.js +2 -2
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/modalOptionReturnQuestionItems/ModalOptionReturnQuestionItems.style.d.ts +1 -0
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/modalOptionReturnQuestionItems/ModalOptionReturnQuestionItems.style.js +2 -1
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/radioReturnQuestionItem/RadioReturnQuestionItem.js +7 -3
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/radioReturnQuestionItem/RadioReturnQuestionItem.style.d.ts +9 -1
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/radioReturnQuestionItem/RadioReturnQuestionItem.style.js +10 -2
- package/dist/src/infrastructure/ui/components/organisms/returnQuestions/components/textareaReturnQuestionItem/TextareaReturnQuestionItem.js +1 -1
- package/dist/src/infrastructure/ui/components/templates/header/checkoutHeader/CheckoutHeader.js +3 -2
- package/dist/src/infrastructure/ui/components/templates/header/itemDetailHeader/ItemDetailHeader.js +3 -2
- package/dist/src/infrastructure/ui/components/templates/header/itemHeader/ItemHeader.js +4 -3
- package/dist/src/infrastructure/ui/views/checkout/Checkout.js +10 -9
- package/dist/src/infrastructure/ui/views/checkout/components/deliveryBanner/DeliveryBanner.js +4 -3
- package/dist/src/infrastructure/ui/views/item/components/getOutOfCheckoutModal/GetOutOfCheckoutModal.js +4 -4
- package/dist/src/infrastructure/ui/views/item/components/getOutOfCheckoutModal/GetOutOfCheckoutModal.style.d.ts +2 -0
- package/dist/src/infrastructure/ui/views/item/components/getOutOfCheckoutModal/GetOutOfCheckoutModal.style.js +2 -0
- package/dist/src/infrastructure/ui/views/item/components/productVariantDescription/ProductVariantDescription.js +4 -4
- package/dist/src/infrastructure/ui/views/item/components/productVariantDescription/ProductVariantDescription.style.d.ts +5 -2
- package/dist/src/infrastructure/ui/views/item/components/productVariantDescription/ProductVariantDescription.style.js +6 -3
- package/dist/src/infrastructure/ui/views/item/components/returnQuestionsFeedback/ReturnQuestionsFeedback.js +2 -1
- package/dist/src/infrastructure/ui/views/item/components/selectModal/SelectModal.js +2 -2
- package/dist/src/infrastructure/ui/views/item/components/selectModal/SelectModal.style.d.ts +3 -0
- package/dist/src/infrastructure/ui/views/item/components/selectModal/SelectModal.style.js +4 -1
- package/dist/src/infrastructure/ui/views/return/components/productVariantPreview/ProductVariantPreview.js +7 -7
- package/dist/src/infrastructure/ui/views/return/components/productVariantPreview/ProductVariantPreview.style.d.ts +3 -0
- package/dist/src/infrastructure/ui/views/return/components/productVariantPreview/ProductVariantPreview.style.js +4 -1
- package/dist/src/infrastructure/ui/views/return/components/returnQuestionsForm/ReturnQuestionsForm.js +9 -6
- package/dist/src/infrastructure/ui/views/shared/components/productVariant/ProductVariant.js +4 -4
- package/dist/src/infrastructure/ui/views/shared/components/productVariant/ProductVariant.style.d.ts +3 -0
- package/dist/src/infrastructure/ui/views/shared/components/productVariant/ProductVariant.style.js +4 -1
- package/dist/src/infrastructure/ui/views/summary/Summary.js +10 -9
- package/dist/src/infrastructure/ui/views/summary/components/collapsiblePricing/CollapsiblePricing.js +2 -1
- package/dist/src/infrastructure/ui/views/summaryTabs/components/checkoutItemsTabs/CheckoutItemsTabs.js +8 -5
- package/dist/src/version.d.ts +1 -1
- package/dist/src/version.js +1 -1
- package/package.json +1 -1
- package/src/ExpoRoot.tsx +2 -1
- package/src/infrastructure/ui/components/organisms/checkoutQuestions/components/buttonCheckoutQuestionItem/ButtonCheckoutQuestionItem.style.ts +3 -0
- package/src/infrastructure/ui/components/organisms/checkoutQuestions/components/buttonCheckoutQuestionItem/ButtonCheckoutQuestionItem.tsx +5 -3
- package/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/IconCheckoutQuestionItem.style.ts +2 -1
- package/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/IconCheckoutQuestionItem.tsx +1 -0
- package/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/icons/Happy.tsx +5 -5
- package/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/icons/Normal.tsx +5 -5
- package/src/infrastructure/ui/components/organisms/checkoutQuestions/components/iconCheckoutQuestionItem/icons/Sad.tsx +5 -5
- package/src/infrastructure/ui/components/organisms/returnQuestions/components/hostDefaultReturnQuestionItem/HostDefaultReturnQuestionItem.tsx +2 -1
- package/src/infrastructure/ui/components/organisms/returnQuestions/components/hostSelectReturnQuestionItem/HostSelectReturnQuestionItem.tsx +2 -3
- package/src/infrastructure/ui/components/organisms/returnQuestions/components/hostStackReturnQuestionItem/modal/HostStackReturnQuestionItem.style.ts +4 -1
- package/src/infrastructure/ui/components/organisms/returnQuestions/components/hostStackReturnQuestionItem/modal/HostStackReturnQuestionItem.tsx +2 -2
- package/src/infrastructure/ui/components/organisms/returnQuestions/components/modalOptionReturnQuestionItems/ModalOptionReturnQuestionItems.style.ts +2 -1
- package/src/infrastructure/ui/components/organisms/returnQuestions/components/modalOptionReturnQuestionItems/ModalOptionReturnQuestionItems.tsx +2 -2
- package/src/infrastructure/ui/components/organisms/returnQuestions/components/radioReturnQuestionItem/RadioReturnQuestionItem.style.ts +10 -2
- package/src/infrastructure/ui/components/organisms/returnQuestions/components/radioReturnQuestionItem/RadioReturnQuestionItem.tsx +20 -12
- package/src/infrastructure/ui/components/organisms/returnQuestions/components/textareaReturnQuestionItem/TextareaReturnQuestionItem.tsx +1 -1
- package/src/infrastructure/ui/components/templates/header/checkoutHeader/CheckoutHeader.tsx +3 -2
- package/src/infrastructure/ui/components/templates/header/checkoutHeader/__snapshots__/CheckoutHeader.test.tsx.snap +31 -80
- package/src/infrastructure/ui/components/templates/header/itemDetailHeader/ItemDetailHeader.tsx +3 -2
- package/src/infrastructure/ui/components/templates/header/itemDetailHeader/__snapshots__/ItemDetailHeader.test.tsx.snap +31 -80
- package/src/infrastructure/ui/components/templates/header/itemHeader/ItemHeader.tsx +4 -3
- package/src/infrastructure/ui/components/templates/header/itemHeader/__snapshots__/ItemHeader.test.tsx.snap +62 -160
- package/src/infrastructure/ui/views/checkout/Checkout.tsx +12 -11
- package/src/infrastructure/ui/views/checkout/components/deliveryBanner/DeliveryBanner.tsx +4 -3
- package/src/infrastructure/ui/views/item/components/getOutOfCheckoutModal/GetOutOfCheckoutModal.style.ts +2 -0
- package/src/infrastructure/ui/views/item/components/getOutOfCheckoutModal/GetOutOfCheckoutModal.tsx +4 -4
- package/src/infrastructure/ui/views/item/components/productVariantDescription/ProductVariantDescription.style.ts +6 -3
- package/src/infrastructure/ui/views/item/components/productVariantDescription/ProductVariantDescription.tsx +4 -4
- package/src/infrastructure/ui/views/item/components/returnQuestionsFeedback/ReturnQuestionsFeedback.tsx +2 -1
- package/src/infrastructure/ui/views/item/components/selectModal/SelectModal.style.ts +5 -1
- package/src/infrastructure/ui/views/item/components/selectModal/SelectModal.tsx +2 -3
- package/src/infrastructure/ui/views/return/components/productVariantPreview/ProductVariantPreview.style.ts +4 -1
- package/src/infrastructure/ui/views/return/components/productVariantPreview/ProductVariantPreview.tsx +7 -7
- package/src/infrastructure/ui/views/return/components/productVariantPreview/__snapshots__/ProductVariantPreview.test.tsx.snap +11 -12
- package/src/infrastructure/ui/views/return/components/returnQuestionsForm/ReturnQuestionsForm.tsx +10 -8
- package/src/infrastructure/ui/views/shared/components/productVariant/ProductVariant.style.ts +6 -2
- package/src/infrastructure/ui/views/shared/components/productVariant/ProductVariant.tsx +4 -4
- package/src/infrastructure/ui/views/shared/components/productVariant/__snapshots__/ProductVariant.test.tsx.snap +18 -0
- package/src/infrastructure/ui/views/summary/Summary.tsx +12 -11
- package/src/infrastructure/ui/views/summary/components/collapsiblePricing/CollapsiblePricing.tsx +2 -1
- package/src/infrastructure/ui/views/summary/components/collapsiblePricing/__snapshots__/CollapsiblePricing.test.tsx.snap +22 -6
- package/src/infrastructure/ui/views/summaryTabs/components/checkoutItemsTabs/CheckoutItemsTabs.tsx +8 -5
- package/src/infrastructure/ui/views/summaryTabs/components/checkoutItemsTabs/__snapshots__/CheckoutItemsTabs.test.tsx.snap +36 -0
package/src/infrastructure/ui/views/return/components/returnQuestionsForm/ReturnQuestionsForm.tsx
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { PortalHost } from "@gorhom/portal";
|
|
2
2
|
import React, { FC, useCallback, useMemo } from "react";
|
|
3
|
-
import { Platform } from "react-native";
|
|
3
|
+
import { Platform, View } from "react-native";
|
|
4
4
|
import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
|
|
5
5
|
import { generatePath, useNavigate } from "react-router-native";
|
|
6
|
-
import { Box, Button, Layout as AuroraLayout, Spinner, Text
|
|
6
|
+
import { Box, Button, Layout as AuroraLayout, Spinner, Text } from "@lookiero/aurora";
|
|
7
7
|
import { useI18nMessage } from "@lookiero/i18n-react";
|
|
8
8
|
import { CommandStatus } from "@lookiero/messaging-react";
|
|
9
9
|
import { Country } from "@lookiero/sty-psp-locale";
|
|
10
10
|
import { useLogger } from "@lookiero/sty-psp-logging";
|
|
11
11
|
import { Segment } from "@lookiero/sty-psp-segment";
|
|
12
|
-
import { Layout as UiLayout } from "@lookiero/sty-psp-ui";
|
|
12
|
+
import { Layout as UiLayout, useScreenSize } from "@lookiero/sty-psp-ui";
|
|
13
13
|
import { CheckoutProjection } from "../../../../../../projection/checkout/checkout";
|
|
14
14
|
import { CheckoutItemProjection } from "../../../../../../projection/checkoutItem/checkoutItem";
|
|
15
15
|
import { ReturnQuestionType } from "../../../../../../projection/returnQuestion/returnQuestion.constants";
|
|
@@ -67,7 +67,9 @@ const ReturnQuestionsForm: FC<ReturnQuestionsFormProps> = ({
|
|
|
67
67
|
const navigate = useNavigate();
|
|
68
68
|
const { basePath } = useStaticInfo();
|
|
69
69
|
const logger = useLogger();
|
|
70
|
-
const
|
|
70
|
+
const screenSize = useScreenSize();
|
|
71
|
+
const isDektopScreen = screenSize === "L";
|
|
72
|
+
const isMobileScreen = screenSize === "S";
|
|
71
73
|
|
|
72
74
|
const style = useMemo(() => returnQuestionsFormStyle(), []);
|
|
73
75
|
|
|
@@ -163,11 +165,11 @@ const ReturnQuestionsForm: FC<ReturnQuestionsFormProps> = ({
|
|
|
163
165
|
>
|
|
164
166
|
<View style={style.background}>
|
|
165
167
|
<AuroraLayout
|
|
166
|
-
fullWidth={!
|
|
167
|
-
style={[style.layout,
|
|
168
|
+
fullWidth={!isDektopScreen}
|
|
169
|
+
style={[style.layout, isDektopScreen ? style.desktopLayoutSpacing : undefined]}
|
|
168
170
|
>
|
|
169
171
|
<Box size={{ L: "2/3" }}>
|
|
170
|
-
<View style={[style.info, !
|
|
172
|
+
<View style={[style.info, !isMobileScreen && style.desktopInfo]}>
|
|
171
173
|
<Text level={3} heading>
|
|
172
174
|
{titleText}
|
|
173
175
|
</Text>
|
|
@@ -181,7 +183,7 @@ const ReturnQuestionsForm: FC<ReturnQuestionsFormProps> = ({
|
|
|
181
183
|
returnQuestions={returnQuestions}
|
|
182
184
|
/>
|
|
183
185
|
|
|
184
|
-
<View style={[style.submit, !
|
|
186
|
+
<View style={[style.submit, !isMobileScreen && style.submitDesktop]}>
|
|
185
187
|
<Button testID="return-questions-button" onPress={handleOnSubmit}>
|
|
186
188
|
{submitButtonText}
|
|
187
189
|
</Button>
|
package/src/infrastructure/ui/views/shared/components/productVariant/ProductVariant.style.ts
CHANGED
|
@@ -6,12 +6,13 @@ const IMAGE_HEIGHT = 132;
|
|
|
6
6
|
|
|
7
7
|
const style = () => {
|
|
8
8
|
const {
|
|
9
|
-
colorBgSurface,
|
|
10
9
|
borderRadius3,
|
|
11
10
|
borderRadiusFull,
|
|
12
11
|
borderWidth2,
|
|
13
|
-
colorBorderInput,
|
|
14
12
|
colorBgPrimaryLight,
|
|
13
|
+
colorBgSurface,
|
|
14
|
+
colorBorderInput,
|
|
15
|
+
colorTextMedium,
|
|
15
16
|
space05,
|
|
16
17
|
space1,
|
|
17
18
|
space2,
|
|
@@ -54,6 +55,9 @@ const style = () => {
|
|
|
54
55
|
paddingHorizontal: space2,
|
|
55
56
|
paddingTop: space1,
|
|
56
57
|
},
|
|
58
|
+
text: {
|
|
59
|
+
color: colorTextMedium,
|
|
60
|
+
},
|
|
57
61
|
});
|
|
58
62
|
};
|
|
59
63
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import React, { FC, useMemo } from "react";
|
|
2
2
|
import { ImageStyle, Pressable, StyleProp, View } from "react-native";
|
|
3
|
-
import {
|
|
3
|
+
import { Text } from "@lookiero/aurora";
|
|
4
4
|
import { useI18nMessage } from "@lookiero/i18n-react";
|
|
5
5
|
import { Country } from "@lookiero/sty-psp-locale";
|
|
6
|
-
import { LazyImage } from "@lookiero/sty-psp-ui";
|
|
6
|
+
import { Icon, LazyImage } from "@lookiero/sty-psp-ui";
|
|
7
7
|
import { CheckoutItemStatus } from "../../../../../../domain/checkoutItem/model/checkoutItem";
|
|
8
8
|
import { ColorProjection, MediaProjection } from "../../../../../../projection/checkoutItem/checkoutItem";
|
|
9
9
|
import { PriceProjection } from "../../../../../../projection/price/price";
|
|
@@ -69,13 +69,13 @@ const ProductVariant: FC<ProductVariantProps> = ({
|
|
|
69
69
|
|
|
70
70
|
<View style={style.descriptionContainer}>
|
|
71
71
|
<View style={style.infoProductVariant}>
|
|
72
|
-
<Text
|
|
72
|
+
<Text level={2} style={style.text} detail>
|
|
73
73
|
{brand}
|
|
74
74
|
</Text>
|
|
75
75
|
<Text level={2} detail>
|
|
76
76
|
{name}
|
|
77
77
|
</Text>
|
|
78
|
-
<Text
|
|
78
|
+
<Text level={2} style={style.text} detail>
|
|
79
79
|
{sizeProjection.unique ? uniqueText : size({ size: sizeProjection, country })} / {colorLabel}
|
|
80
80
|
</Text>
|
|
81
81
|
|
|
@@ -339,10 +339,19 @@ exports[`ProductVariant component matches the snapshot for a non-unique size: no
|
|
|
339
339
|
"fontStyle": "normal",
|
|
340
340
|
"fontWeight": "normal",
|
|
341
341
|
"height": 24,
|
|
342
|
+
"letterSpacing": -0.2,
|
|
343
|
+
"lineHeight": 24,
|
|
344
|
+
"minHeight": 24,
|
|
345
|
+
"minWidth": 24,
|
|
346
|
+
"paddingBottom": 0,
|
|
347
|
+
"paddingLeft": 0,
|
|
348
|
+
"paddingRight": 0,
|
|
349
|
+
"paddingTop": 0,
|
|
342
350
|
"width": 24,
|
|
343
351
|
},
|
|
344
352
|
]
|
|
345
353
|
}
|
|
354
|
+
testID="icon"
|
|
346
355
|
>
|
|
347
356
|
|
|
348
357
|
</Text>
|
|
@@ -689,10 +698,19 @@ exports[`ProductVariant component matches the snapshot for an unique size: uniqu
|
|
|
689
698
|
"fontStyle": "normal",
|
|
690
699
|
"fontWeight": "normal",
|
|
691
700
|
"height": 24,
|
|
701
|
+
"letterSpacing": -0.2,
|
|
702
|
+
"lineHeight": 24,
|
|
703
|
+
"minHeight": 24,
|
|
704
|
+
"minWidth": 24,
|
|
705
|
+
"paddingBottom": 0,
|
|
706
|
+
"paddingLeft": 0,
|
|
707
|
+
"paddingRight": 0,
|
|
708
|
+
"paddingTop": 0,
|
|
692
709
|
"width": 24,
|
|
693
710
|
},
|
|
694
711
|
]
|
|
695
712
|
}
|
|
713
|
+
testID="icon"
|
|
696
714
|
>
|
|
697
715
|
|
|
698
716
|
</Text>
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import React, { FC, ReactNode, useCallback, useEffect, useMemo, useState } from "react";
|
|
2
2
|
import { LayoutRectangle, Platform, ScrollView, View } from "react-native";
|
|
3
3
|
import { generatePath, useMatch, useNavigate } from "react-router-native";
|
|
4
|
-
import { Box, Text, Layout as AuroraLayout,
|
|
4
|
+
import { Box, Text, Layout as AuroraLayout, Spinner } from "@lookiero/aurora";
|
|
5
5
|
import { useI18nMessage } from "@lookiero/i18n-react";
|
|
6
6
|
import { QueryStatus } from "@lookiero/messaging-react";
|
|
7
|
-
import { Layout as UiLayout, Sticky } from "@lookiero/sty-psp-ui";
|
|
7
|
+
import { Layout as UiLayout, Sticky, useScreenSize } from "@lookiero/sty-psp-ui";
|
|
8
8
|
import { CheckoutItemStatus } from "../../../../domain/checkoutItem/model/checkoutItem";
|
|
9
9
|
import { useViewFirstAvailableCheckoutByCustomerId } from "../../../projection/checkout/react/useViewFirstAvailableCheckoutByCustomerId";
|
|
10
10
|
import { useViewFiveItemsDiscountByCustomerId } from "../../../projection/checkout/react/useViewFiveItemsDiscountByCustomerId";
|
|
@@ -31,7 +31,8 @@ const Summary: FC<SummaryProps> = ({ layout: Layout, children }) => {
|
|
|
31
31
|
customer: { customerId, country, segment },
|
|
32
32
|
basePath,
|
|
33
33
|
} = useStaticInfo();
|
|
34
|
-
const
|
|
34
|
+
const screenSize = useScreenSize();
|
|
35
|
+
const isDesktopScreen = screenSize === "L";
|
|
35
36
|
|
|
36
37
|
const style = useMemo(() => summaryStyle(), []);
|
|
37
38
|
|
|
@@ -123,12 +124,12 @@ const Summary: FC<SummaryProps> = ({ layout: Layout, children }) => {
|
|
|
123
124
|
{fiveItemsDiscount !== 0 && <FiveItemsDiscountBanner fiveItemsDiscount={fiveItemsDiscount} />}
|
|
124
125
|
|
|
125
126
|
<AuroraLayout
|
|
126
|
-
fullWidth={!
|
|
127
|
-
style={[
|
|
127
|
+
fullWidth={!isDesktopScreen}
|
|
128
|
+
style={[isDesktopScreen && style.desktopLayoutSpacing, !isDesktopScreen && { paddingBottom: pricingHeight }]}
|
|
128
129
|
>
|
|
129
|
-
<Box size={{ L: "2/3" }} style={
|
|
130
|
-
<View style={[style.contentWrapper,
|
|
131
|
-
<View style={!
|
|
130
|
+
<Box size={{ L: "2/3" }} style={isDesktopScreen && style.desktopListSpacing}>
|
|
131
|
+
<View style={[style.contentWrapper, isDesktopScreen && style.desktopContentWrapper]}>
|
|
132
|
+
<View style={!isDesktopScreen && style.mobileInfo}>
|
|
132
133
|
<Text level={3} style={style.title} heading>
|
|
133
134
|
{titleText}
|
|
134
135
|
</Text>
|
|
@@ -141,8 +142,8 @@ const Summary: FC<SummaryProps> = ({ layout: Layout, children }) => {
|
|
|
141
142
|
</View>
|
|
142
143
|
</Box>
|
|
143
144
|
|
|
144
|
-
{pricing &&
|
|
145
|
-
<Box size={{ L: "1/3" }} style={[style.resume,
|
|
145
|
+
{pricing && isDesktopScreen ? (
|
|
146
|
+
<Box size={{ L: "1/3" }} style={[style.resume, isDesktopScreen ? style.desktopResume : style.mobileResume]}>
|
|
146
147
|
<View style={style.princingWrapper}>
|
|
147
148
|
<CollapsiblePricing
|
|
148
149
|
collapsed={false}
|
|
@@ -158,7 +159,7 @@ const Summary: FC<SummaryProps> = ({ layout: Layout, children }) => {
|
|
|
158
159
|
</AuroraLayout>
|
|
159
160
|
</ScrollView>
|
|
160
161
|
|
|
161
|
-
{pricing && !
|
|
162
|
+
{pricing && !isDesktopScreen ? (
|
|
162
163
|
<Sticky style={style.sticky} onLayout={Platform.OS !== "web" ? handleOnPricingLayout : undefined}>
|
|
163
164
|
<Body>
|
|
164
165
|
<CollapsiblePricing
|
package/src/infrastructure/ui/views/summary/components/collapsiblePricing/CollapsiblePricing.tsx
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import React, { FC, useMemo } from "react";
|
|
2
2
|
import { Pressable, View } from "react-native";
|
|
3
3
|
import Animated, { useAnimatedStyle, useSharedValue, withTiming } from "react-native-reanimated";
|
|
4
|
-
import { Button,
|
|
4
|
+
import { Button, Text } from "@lookiero/aurora";
|
|
5
5
|
import { useI18nMessage } from "@lookiero/i18n-react";
|
|
6
|
+
import { Icon } from "@lookiero/sty-psp-ui";
|
|
6
7
|
import { PricingProjection } from "../../../../../../projection/pricing/pricing";
|
|
7
8
|
import { Price } from "../../../../components/atoms/price/Price";
|
|
8
9
|
import { DOMAIN, I18nMessages } from "../../../../i18n/i18n";
|
|
@@ -77,11 +77,19 @@ exports[`Pricing component matches the snapshot for collaped pricing: collapsed
|
|
|
77
77
|
{
|
|
78
78
|
"color": "#0C0A0A",
|
|
79
79
|
"fontFamily": "auroraicons",
|
|
80
|
-
"fontSize":
|
|
80
|
+
"fontSize": 24,
|
|
81
81
|
"fontStyle": "normal",
|
|
82
82
|
"fontWeight": "normal",
|
|
83
|
-
"height":
|
|
84
|
-
"
|
|
83
|
+
"height": 24,
|
|
84
|
+
"letterSpacing": -0.2,
|
|
85
|
+
"lineHeight": 24,
|
|
86
|
+
"minHeight": 24,
|
|
87
|
+
"minWidth": 24,
|
|
88
|
+
"paddingBottom": 0,
|
|
89
|
+
"paddingLeft": 0,
|
|
90
|
+
"paddingRight": 0,
|
|
91
|
+
"paddingTop": 0,
|
|
92
|
+
"width": 24,
|
|
85
93
|
},
|
|
86
94
|
]
|
|
87
95
|
}
|
|
@@ -421,11 +429,19 @@ exports[`Pricing component matches the snapshot for non-collaped pricing: non-co
|
|
|
421
429
|
{
|
|
422
430
|
"color": "#0C0A0A",
|
|
423
431
|
"fontFamily": "auroraicons",
|
|
424
|
-
"fontSize":
|
|
432
|
+
"fontSize": 24,
|
|
425
433
|
"fontStyle": "normal",
|
|
426
434
|
"fontWeight": "normal",
|
|
427
|
-
"height":
|
|
428
|
-
"
|
|
435
|
+
"height": 24,
|
|
436
|
+
"letterSpacing": -0.2,
|
|
437
|
+
"lineHeight": 24,
|
|
438
|
+
"minHeight": 24,
|
|
439
|
+
"minWidth": 24,
|
|
440
|
+
"paddingBottom": 0,
|
|
441
|
+
"paddingLeft": 0,
|
|
442
|
+
"paddingRight": 0,
|
|
443
|
+
"paddingTop": 0,
|
|
444
|
+
"width": 24,
|
|
429
445
|
},
|
|
430
446
|
]
|
|
431
447
|
}
|
package/src/infrastructure/ui/views/summaryTabs/components/checkoutItemsTabs/CheckoutItemsTabs.tsx
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import React, { FC, useCallback, useMemo } from "react";
|
|
2
2
|
import { View } from "react-native";
|
|
3
|
-
import { Text
|
|
3
|
+
import { Text } from "@lookiero/aurora";
|
|
4
4
|
import { useI18nMessage } from "@lookiero/i18n-react";
|
|
5
5
|
import { Country } from "@lookiero/sty-psp-locale";
|
|
6
|
-
import { RenderItemFunction, Tabs } from "@lookiero/sty-psp-ui";
|
|
6
|
+
import { RenderItemFunction, Tabs, useScreenSize } from "@lookiero/sty-psp-ui";
|
|
7
7
|
import { CheckoutItemStatus } from "../../../../../../domain/checkoutItem/model/checkoutItem";
|
|
8
8
|
import {
|
|
9
9
|
CheckoutItemProductVariantProjection,
|
|
@@ -64,7 +64,7 @@ const CheckoutItemsTabs: FC<CheckoutItemsTabsProps> = ({
|
|
|
64
64
|
onPressItem,
|
|
65
65
|
onChanged,
|
|
66
66
|
}) => {
|
|
67
|
-
const
|
|
67
|
+
const screenSize = useScreenSize();
|
|
68
68
|
|
|
69
69
|
const style = useMemo(() => checkoutItemsTabsStyle(), []);
|
|
70
70
|
|
|
@@ -135,8 +135,11 @@ const CheckoutItemsTabs: FC<CheckoutItemsTabsProps> = ({
|
|
|
135
135
|
defaultIndex={tabIndex}
|
|
136
136
|
tabLabels={[`${keepTabText} (${checkoutItemsKept.length})`, `${returnTabText} (${checkoutItemsReturned.length})`]}
|
|
137
137
|
style={{
|
|
138
|
-
carousel: [style.carousel,
|
|
139
|
-
tabList: {
|
|
138
|
+
carousel: [style.carousel, screenSize === "L" && style.carouselDesktop],
|
|
139
|
+
tabList: {
|
|
140
|
+
tabList: [style.tabList, screenSize === "L" && style.tabListDesktop],
|
|
141
|
+
tab: { tabText: style.tabText },
|
|
142
|
+
},
|
|
140
143
|
}}
|
|
141
144
|
onChanged={onChanged}
|
|
142
145
|
>
|
|
@@ -626,10 +626,19 @@ exports[`CheckoutItemTabs component matches the snapshot 1`] = `
|
|
|
626
626
|
"fontStyle": "normal",
|
|
627
627
|
"fontWeight": "normal",
|
|
628
628
|
"height": 24,
|
|
629
|
+
"letterSpacing": -0.2,
|
|
630
|
+
"lineHeight": 24,
|
|
631
|
+
"minHeight": 24,
|
|
632
|
+
"minWidth": 24,
|
|
633
|
+
"paddingBottom": 0,
|
|
634
|
+
"paddingLeft": 0,
|
|
635
|
+
"paddingRight": 0,
|
|
636
|
+
"paddingTop": 0,
|
|
629
637
|
"width": 24,
|
|
630
638
|
},
|
|
631
639
|
]
|
|
632
640
|
}
|
|
641
|
+
testID="icon"
|
|
633
642
|
>
|
|
634
643
|
|
|
635
644
|
</Text>
|
|
@@ -982,10 +991,19 @@ exports[`CheckoutItemTabs component matches the snapshot 1`] = `
|
|
|
982
991
|
"fontStyle": "normal",
|
|
983
992
|
"fontWeight": "normal",
|
|
984
993
|
"height": 24,
|
|
994
|
+
"letterSpacing": -0.2,
|
|
995
|
+
"lineHeight": 24,
|
|
996
|
+
"minHeight": 24,
|
|
997
|
+
"minWidth": 24,
|
|
998
|
+
"paddingBottom": 0,
|
|
999
|
+
"paddingLeft": 0,
|
|
1000
|
+
"paddingRight": 0,
|
|
1001
|
+
"paddingTop": 0,
|
|
985
1002
|
"width": 24,
|
|
986
1003
|
},
|
|
987
1004
|
]
|
|
988
1005
|
}
|
|
1006
|
+
testID="icon"
|
|
989
1007
|
>
|
|
990
1008
|
|
|
991
1009
|
</Text>
|
|
@@ -1320,10 +1338,19 @@ exports[`CheckoutItemTabs component matches the snapshot 1`] = `
|
|
|
1320
1338
|
"fontStyle": "normal",
|
|
1321
1339
|
"fontWeight": "normal",
|
|
1322
1340
|
"height": 24,
|
|
1341
|
+
"letterSpacing": -0.2,
|
|
1342
|
+
"lineHeight": 24,
|
|
1343
|
+
"minHeight": 24,
|
|
1344
|
+
"minWidth": 24,
|
|
1345
|
+
"paddingBottom": 0,
|
|
1346
|
+
"paddingLeft": 0,
|
|
1347
|
+
"paddingRight": 0,
|
|
1348
|
+
"paddingTop": 0,
|
|
1323
1349
|
"width": 24,
|
|
1324
1350
|
},
|
|
1325
1351
|
]
|
|
1326
1352
|
}
|
|
1353
|
+
testID="icon"
|
|
1327
1354
|
>
|
|
1328
1355
|
|
|
1329
1356
|
</Text>
|
|
@@ -1676,10 +1703,19 @@ exports[`CheckoutItemTabs component matches the snapshot 1`] = `
|
|
|
1676
1703
|
"fontStyle": "normal",
|
|
1677
1704
|
"fontWeight": "normal",
|
|
1678
1705
|
"height": 24,
|
|
1706
|
+
"letterSpacing": -0.2,
|
|
1707
|
+
"lineHeight": 24,
|
|
1708
|
+
"minHeight": 24,
|
|
1709
|
+
"minWidth": 24,
|
|
1710
|
+
"paddingBottom": 0,
|
|
1711
|
+
"paddingLeft": 0,
|
|
1712
|
+
"paddingRight": 0,
|
|
1713
|
+
"paddingTop": 0,
|
|
1679
1714
|
"width": 24,
|
|
1680
1715
|
},
|
|
1681
1716
|
]
|
|
1682
1717
|
}
|
|
1718
|
+
testID="icon"
|
|
1683
1719
|
>
|
|
1684
1720
|
|
|
1685
1721
|
</Text>
|