diff --git a/__snapshots__/features/venue/pages/Venue/Venue.native.test.tsx.native-snap b/__snapshots__/features/venue/pages/Venue/Venue.native.test.tsx.native-snap index b9f59ff9f92..e592a9a17c0 100644 --- a/__snapshots__/features/venue/pages/Venue/Venue.native.test.tsx.native-snap +++ b/__snapshots__/features/venue/pages/Venue/Venue.native.test.tsx.native-snap @@ -38,6 +38,7 @@ exports[` should match snapshot 1`] = ` [ { "flexDirection": "column", + "marginBottom": 24, "marginHorizontal": 0, "marginTop": 0, }, @@ -199,10 +200,9 @@ exports[` should match snapshot 1`] = ` [ { "color": "#161617", - "fontFamily": "Montserrat-Bold", - "fontSize": 16, - "lineHeight": 25.6, - "maxWidth": "100%", + "fontFamily": "Montserrat-SemiBold", + "fontSize": 12, + "lineHeight": 19.2, }, ] } @@ -452,8 +452,8 @@ exports[` should match snapshot 1`] = ` { "color": "#161617", "fontFamily": "Montserrat-Bold", - "fontSize": 15, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 25.6, "maxWidth": "100%", }, ] @@ -548,14 +548,67 @@ exports[` should match snapshot 1`] = ` } > + + should match snapshot 1`] = ` ] } > - - + + + + + + + + + + + + - + Toutes les offres + + + + + + - - - - - - - - - - - - Cinéma - - - - Bac Nord - VF - - - Dès le 18 août 2021 - - - Gratuit - - - - - - - - - - - - - - - - - - - - - - Cinéma - - - - Black Widow - VF - - - Dès le 18 août 2021 - - - Gratuit - - - - - - - - - - - - - - - - - - - - - Cinéma - - - - Titane - VF - - - Dès le 18 août 2021 - - - Gratuit - - - - - - - - - - - - - - - - - - - - - - - - - - Cinéma - - - - Bac Nord - VF - - - Dès le 18 août 2021 - - - Gratuit - - - - - - - - - - - - - - - - - - - - - - - - - - - - Toutes les offres - - - - - - - - - - - - - - - - - - - - - Livre - - - - Test - - - - - - - - - - - - - - - - - - - - - - - Black Widow - VF - - - Dès le 18 août 2021 - - - Gratuit - - - - - - - - - - Cinéma - - - - - - - - - - - - - - - - - Titane - VF - - - Dès le 18 août 2021 - - - Gratuit - - - - - - - - - - Cinéma - - - - - - - - - - - - - - - - - - - - - - Livre - - - - Test - - - - - - - - - - - - - - - - - - - - - - - - - - Test - - - - - - - - - - - - - - - - - - - - - Test - - - - - - - - - categoryIcon-SVG-Mock - - - - - - - - Livre - - - - - - - - - - - - - - - - - - - - - Test - - - - - - - - - categoryIcon-SVG-Mock - - - - - - - - Livre - - - - - - - - - - - - - - - - - - - - - - - - - - - undefined-SVG-Mock - - - - - - - - Fan de lecture ? - - - Reçois nos recos lecture, nos jeux-concours et le meilleur de l’actu littéraire ! - - - - - undefined-Lottie-Mock - - - - Suivre le thème - - - - - - - - - - - - - - - - Passe le bon plan ! - - - - - - - - - - undefined-SVG-Mock - - - - - - Envoyer sur -Instagram - - - - - - - - - - - undefined-SVG-Mock - - - - - - Envoyer sur -WhatsApp - - - - - - - - - - - undefined-SVG-Mock - - - - - - Envoyer sur -iMessage - - - - - - - - - - - - undefined-SVG-Mock - - - - - - - Plus -d’options - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - animated-icon-back-SVG-Mock - - - - - - - final-animated-icon-back-SVG-Mock - - - - - - - - - - Le Petit Rintintin 1 - - - - - - - - - - animated-icon-share-SVG-Mock - - - - - - - final-animated-icon-share-SVG-Mock - - - - - - - - - - - - - - - - - button-icon-left-SVG-Mock - - - - - - Rechercher une offre - - - - - - - - -`; - -exports[` should match snapshot with practical information 1`] = ` - - - - - - - - - - undefined-SVG-Mock - - - - - - - - - Librairie - - - - - - - Le Petit Rintintin 1 - - - - - Adresse - - - 1 boulevard Poissonnière, 75000 Paris - - - - - - - - - button-icon-left-SVG-Mock - - - - - - Copier l’adresse - - - - - - - - - - button-icon-left-SVG-Mock - - - - - - Voir l’itinéraire - - - - - - - - - - - - - - - - - - - - Offres disponibles - - - - - - - - - Infos pratiques - - - - - - - - - - - - - Modalités de retrait - - - - How to withdraw, https://test.com - - - - - - Description - - - - https://pass.culture.fr/ lorem ipsum consectetur adipisicing elit. Debitis officiis maiores quia unde, hic quisquam odit ea quo ipsam possimus, labore nesciunt numquam. Id itaque in sed sapiente blanditiis necessitatibus. consectetur adipisicing elit. Debitis officiis maiores quia unde, hic quisquam odit ea quo ipsam possimus, consectetur adipisicing elit. Debitis officiis maiores quia unde, hic quisquam odit ea quo ipsam possimus, - - - - - - Contact - - - - - - - - button-icon-left-SVG-Mock - - - - - - contact@venue.com - - - - - - - - - button-icon-left-SVG-Mock - - - - - - +33102030405 - - - - - - - - - button-icon-left-SVG-Mock - - - - - - https://my@website.com - - - - - - - - Accessibilité - - - - - - - - - - undefined-SVG-Mock - - - - + } + > + - - valid-icon-SVG-Mock - + + + + + + + + + + + + + Cinéma + + + + Bac Nord - VF + + + Dès le 18 août 2021 + + + Gratuit + + + + + + + + + + + + + + + + + + + + + + Cinéma + + + + Black Widow - VF + + + Dès le 18 août 2021 + + + Gratuit + + + + + + + + + + + + + + + + + + + + + Cinéma + + + + Titane - VF + + + Dès le 18 août 2021 + + + Gratuit + + + + + + + + + + + + + + + + + + + + + + + + + + Cinéma + + + + Bac Nord - VF + + + Dès le 18 août 2021 + + + Gratuit + + + + + + + + + + + + - - - - Handicap visuel - + + + + - - - - undefined-SVG-Mock - - - - - - - invalid-icon-SVG-Mock - - - + Test + - - - Handicap psychique ou cognitif - - - - - - - undefined-SVG-Mock - - - - - - - invalid-icon-SVG-Mock - - - - - - - Handicap moteur - - - - - - - - - - undefined-SVG-Mock - - - - - - - invalid-icon-SVG-Mock - + + + + + + + + + + + + + + + Livre + + + + Test + + + + + + + + + + categoryIcon-SVG-Mock + + + + + + + + + + + + + + + + + + + + + + Livre + + + + Test + + + + + + + + + + categoryIcon-SVG-Mock + + + + + + + + + + - + - - - Handicap auditif - - + + + + + + + - - + > + + + + undefined-SVG-Mock + + + + + + - Horaires d’ouverture + Fan de lecture ? - + > + Reçois nos recos lecture, nos jeux-concours et le meilleur de l’actu littéraire ! + - - - Lundi - - - 09:00 - 19:00 - - - - - Mardi - - - 09:00 - 12:00 / 14:00 - 19:00 - - - + - - Mercredi - - - 09:00 - 12:00 / 14:00 - 19:00 - + } + accessibilityValue={ + { + "max": undefined, + "min": undefined, + "now": undefined, + "text": undefined, + } + } + accessible={true} + collapsable={false} + focusable={true} + onClick={[Function]} + onResponderGrant={[Function]} + onResponderMove={[Function]} + onResponderRelease={[Function]} + onResponderTerminate={[Function]} + onResponderTerminationRequest={[Function]} + onStartShouldSetResponder={[Function]} + style={ + { + "alignItems": "center", + "alignSelf": "flex-start", + "backgroundColor": "#ffffff", + "borderColor": "#90949D", + "borderRadius": 24, + "borderWidth": 1, + "flexDirection": "row", + "height": "auto", + "justifyContent": "center", + "opacity": 1, + "paddingHorizontal": 12, + "paddingVertical": 4, + "userSelect": "auto", + "width": "auto", + } + } + testID="Suivre le thème" + > + + undefined-Lottie-Mock - - Jeudi - - - 09:00 - 12:00 / 14:00 - 19:00 - - - + - - Vendredi - - - 09:00 - 19:00 - - - + + + + + + + + + + + + + - - Samedi - - - Fermé - - + Passe le bon plan ! + - - Dimanche - - - Fermé - + + + + + + + undefined-SVG-Mock + + + + + + Envoyer sur +Instagram + + + + + + + + + + + undefined-SVG-Mock + + + + + + Envoyer sur +WhatsApp + + + + + + + + + + + undefined-SVG-Mock + + + + + + Envoyer sur +iMessage + + + + + + + + + + + + undefined-SVG-Mock + + + + + + + Plus +d’options + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + animated-icon-back-SVG-Mock + + + + + + + final-animated-icon-back-SVG-Mock + + + + + + + + + + Le Petit Rintintin 1 + + + + + + + + + + animated-icon-share-SVG-Mock + + + + + + + final-animated-icon-share-SVG-Mock + + + + + + + + + > + + + + button-icon-left-SVG-Mock + + + + + + Rechercher une offre + + + + + + + + +`; + +exports[` should match snapshot with practical information 1`] = ` + + + + should match snapshot with practical information 1`] = ` style={ [ { + "alignItems": "center", "backgroundColor": "#F1F1F4", - "height": 8, + "justifyContent": "center", + }, + { + "height": 188, + "width": 960, }, ] } - /> + testID="defaultVenueBackground" + > + + + + undefined-SVG-Mock + + + + + should match snapshot with practical information 1`] = ` - - - - - - - - should match snapshot with practical information 1`] = ` { "color": "#161617", "fontFamily": "Montserrat-Bold", - "fontSize": 15, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 25.6, "maxWidth": "100%", }, ] @@ -8542,8 +5219,8 @@ exports[` should match snapshot with practical information 1`] = ` { "color": "#161617", "fontFamily": "Montserrat-Bold", - "fontSize": 15, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 25.6, "maxWidth": "100%", }, ] @@ -9164,8 +5841,8 @@ exports[` should match snapshot with practical information 1`] = ` { "color": "#161617", "fontFamily": "Montserrat-Bold", - "fontSize": 15, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 25.6, "maxWidth": "100%", }, ] @@ -9272,8 +5949,8 @@ exports[` should match snapshot with practical information 1`] = ` { "color": "#161617", "fontFamily": "Montserrat-Bold", - "fontSize": 15, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 25.6, "maxWidth": "100%", }, ] @@ -9381,8 +6058,8 @@ exports[` should match snapshot with practical information 1`] = ` { "color": "#161617", "fontFamily": "Montserrat-Bold", - "fontSize": 15, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 25.6, "maxWidth": "100%", }, ] @@ -10681,7 +7358,7 @@ exports[` should match snapshot with practical information 1`] = ` style={ [ { - "marginHorizontal": 24, + "paddingHorizontal": 24, }, ] } diff --git a/src/features/offer/components/MoviesScreeningCalendar/hook/getVenueMovieOffers.ts b/src/features/offer/components/MoviesScreeningCalendar/hook/getVenueMovieOffers.ts index c1a3ebf53f3..013e963d16e 100644 --- a/src/features/offer/components/MoviesScreeningCalendar/hook/getVenueMovieOffers.ts +++ b/src/features/offer/components/MoviesScreeningCalendar/hook/getVenueMovieOffers.ts @@ -5,7 +5,7 @@ export const getVenueMovieOffers = ( selectedDate: Date, offersWithStocks: OffersStocksResponseV2 | undefined ) => { - const movieOffers = offersWithStocks?.offers.filter( + const movieOffers = offersWithStocks?.offers?.filter( (offer) => offer.subcategoryId === SubcategoryIdEnum.SEANCE_CINE ) diff --git a/src/features/venue/components/VenueContent/VenueContent.tsx b/src/features/venue/components/VenueContent/VenueContent.tsx index 7c89d8de2fb..7be0ed33475 100644 --- a/src/features/venue/components/VenueContent/VenueContent.tsx +++ b/src/features/venue/components/VenueContent/VenueContent.tsx @@ -11,7 +11,8 @@ import { VenueCTA } from 'features/venue/components/VenueCTA/VenueCTA' import { VenueHeader } from 'features/venue/components/VenueHeader/VenueHeader' import { VenueWebMetaHeader } from 'features/venue/components/VenueWebMetaHeader' import { useNavigateToSearchWithVenueOffers } from 'features/venue/helpers/useNavigateToSearchWithVenueOffers' -import { analytics, isCloseToBottom } from 'libs/analytics' +import { isCloseToBottom } from 'libs/analytics' +import { analytics } from 'libs/analytics/provider' import { useRemoteConfigContext } from 'libs/firebase/remoteConfig/RemoteConfigProvider' import { useFunctionOnce } from 'libs/hooks' import { BatchEvent, BatchProfile } from 'libs/react-native-batch' @@ -95,7 +96,7 @@ export const VenueContent: React.FunctionComponent = ({ { flexDirection: isLargeScreen ? 'row' : 'column', marginTop: isLargeScreen ? getSpacing(8) : 0, marginHorizontal: isLargeScreen ? getSpacing(18) : 0, + marginBottom: isLargeScreen ? getSpacing(10) : getSpacing(6), } })