From 13574206def2b1cd3534987e5c13891d736528b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Seln=C3=A6s?= Date: Tue, 27 Jun 2023 16:15:42 +0200 Subject: [PATCH] Make recent fare contracts spinner appear immediately (#3690) --- .../RecentFareContracts/RecentFareContracts.tsx | 10 +++++++--- .../TicketTabNav_PurchaseTabScreen.tsx | 10 ++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/stacks-hierarchy/Root_TabNavigatorStack/TabNav_TicketingStack/Ticketing_TicketTabNavStack/TicketTabNav_PurchaseTabScreen/Components/RecentFareContracts/RecentFareContracts.tsx b/src/stacks-hierarchy/Root_TabNavigatorStack/TabNav_TicketingStack/Ticketing_TicketTabNavStack/TicketTabNav_PurchaseTabScreen/Components/RecentFareContracts/RecentFareContracts.tsx index c311dc7ae4..8beedbdf28 100644 --- a/src/stacks-hierarchy/Root_TabNavigatorStack/TabNav_TicketingStack/Ticketing_TicketTabNavStack/TicketTabNav_PurchaseTabScreen/Components/RecentFareContracts/RecentFareContracts.tsx +++ b/src/stacks-hierarchy/Root_TabNavigatorStack/TabNav_TicketingStack/Ticketing_TicketTabNavStack/TicketTabNav_PurchaseTabScreen/Components/RecentFareContracts/RecentFareContracts.tsx @@ -5,7 +5,6 @@ import {TicketingTexts, useTranslation} from '@atb/translations'; import RecentFareContractsTexts from '@atb/translations/screens/subscreens/RecentFareContractsTexts'; import React, {useMemo} from 'react'; import {ActivityIndicator, ScrollView, View} from 'react-native'; -import {useRecentFareContracts} from '../../use-recent-fare-contracts'; import {RecentFareContractComponent} from './RecentFareContractComponent'; import {useFirestoreConfiguration} from '@atb/configuration/FirestoreConfigurationContext'; import {FareProductTypeConfig} from '@atb/configuration'; @@ -13,17 +12,22 @@ import {RecentFareContract} from '../../types'; import {useTicketingState} from '@atb/ticketing'; type Props = { + recentFareContracts: RecentFareContract[]; + loading: boolean; onSelect: ( rfc: RecentFareContract, fareProductTypeConfig: FareProductTypeConfig, ) => void; }; -export const RecentFareContracts = ({onSelect}: Props) => { +export const RecentFareContracts = ({ + recentFareContracts, + loading, + onSelect, +}: Props) => { const styles = useStyles(); const {theme} = useTheme(); const {t} = useTranslation(); - const {recentFareContracts, loading} = useRecentFareContracts(); const {fareProductTypeConfigs} = useFirestoreConfiguration(); const {customerProfile} = useTicketingState(); diff --git a/src/stacks-hierarchy/Root_TabNavigatorStack/TabNav_TicketingStack/Ticketing_TicketTabNavStack/TicketTabNav_PurchaseTabScreen/TicketTabNav_PurchaseTabScreen.tsx b/src/stacks-hierarchy/Root_TabNavigatorStack/TabNav_TicketingStack/Ticketing_TicketTabNavStack/TicketTabNav_PurchaseTabScreen/TicketTabNav_PurchaseTabScreen.tsx index 8ea3dcb30d..756777f769 100644 --- a/src/stacks-hierarchy/Root_TabNavigatorStack/TabNav_TicketingStack/Ticketing_TicketTabNavStack/TicketTabNav_PurchaseTabScreen/TicketTabNav_PurchaseTabScreen.tsx +++ b/src/stacks-hierarchy/Root_TabNavigatorStack/TabNav_TicketingStack/Ticketing_TicketTabNavStack/TicketTabNav_PurchaseTabScreen/TicketTabNav_PurchaseTabScreen.tsx @@ -26,7 +26,7 @@ export const TicketTabNav_PurchaseTabScreen = ({navigation}: Props) => { const {abtCustomerId, authenticationType} = useAuthState(); const isSignedInAsAbtCustomer = !!abtCustomerId; const {theme} = useTheme(); - const {recentFareContracts} = useRecentFareContracts(); + const {recentFareContracts, loading} = useRecentFareContracts(); const hasRecentFareContracts = enable_recent_tickets && !!recentFareContracts.length; const styles = useStyles(); @@ -135,9 +135,11 @@ export const TicketTabNav_PurchaseTabScreen = ({navigation}: Props) => { return isSignedInAsAbtCustomer ? ( - {hasRecentFareContracts && ( - - )} +