From 92d409ec04509d6387c1a710602e4f72576e2a52 Mon Sep 17 00:00:00 2001 From: Jorge Osorio Date: Mon, 17 Feb 2025 10:37:23 +0100 Subject: [PATCH] Remove extra dependencies --- .../SelectTravelTokenScreenComponent.tsx | 34 ---- src/stacks-hierarchy/RootStack.tsx | 5 - ...kenOnPhoneRequiredForFareProductScreen.tsx | 182 ------------------ .../Root_PurchaseOverviewScreen.tsx | 11 +- .../components/PurchaseMessage.tsx | 15 -- src/stacks-hierarchy/navigation-types.ts | 7 - .../screens/subscreens/TravelToken.ts | 13 -- 7 files changed, 9 insertions(+), 258 deletions(-) delete mode 100644 src/stacks-hierarchy/Root_ActiveTokenOnPhoneRequiredForFareProductScreen.tsx delete mode 100644 src/stacks-hierarchy/Root_PurchaseOverviewScreen/components/PurchaseMessage.tsx diff --git a/src/select-travel-token-screen/SelectTravelTokenScreenComponent.tsx b/src/select-travel-token-screen/SelectTravelTokenScreenComponent.tsx index 5222b1a4c9..01a2f57a4a 100644 --- a/src/select-travel-token-screen/SelectTravelTokenScreenComponent.tsx +++ b/src/select-travel-token-screen/SelectTravelTokenScreenComponent.tsx @@ -9,7 +9,6 @@ import { } from '@atb/mobile-token'; import {StyleSheet, Theme, useThemeContext} from '@atb/theme'; import {ThemedTokenPhone, ThemedTokenTravelCard} from '@atb/theme/ThemedAssets'; -import {useFareContracts} from '@atb/ticketing'; import {dictionary, TravelTokenTexts, useTranslation} from '@atb/translations'; import {animateNextChange} from '@atb/utils/animation'; import React, {useCallback, useEffect, useState} from 'react'; @@ -17,12 +16,6 @@ import {ActivityIndicator, View} from 'react-native'; import {ScrollView} from 'react-native-gesture-handler'; import {RadioGroupSection} from '@atb/components/sections'; import {useRemoteConfigContext} from '@atb/RemoteConfigContext'; -import { - findReferenceDataById, - isOfFareProductRef, - useFirestoreConfigurationContext, -} from '@atb/configuration'; -import {useTimeContext} from '@atb/time'; import {getDeviceNameWithUnitInfo} from './utils'; import {TokenToggleInfo} from '@atb/token-toggle-info'; import {useTokenToggleDetailsQuery} from '@atb/mobile-token/use-token-toggle-details'; @@ -36,16 +29,11 @@ export const SelectTravelTokenScreenComponent = ({onAfterSave}: Props) => { const {theme} = useThemeContext(); const {disable_travelcard} = useRemoteConfigContext(); - const {fareProductTypeConfigs, preassignedFareProducts} = - useFirestoreConfigurationContext(); - const {completeOnboardingSection} = useOnboardingContext(); const {tokens} = useMobileTokenContext(); const toggleMutation = useToggleTokenMutation(); const {data} = useTokenToggleDetailsQuery(); - - const {serverNow} = useTimeContext(); const inspectableToken = tokens.find((t) => t.isInspectable); const [selectedType, setSelectedType] = useState( @@ -56,28 +44,6 @@ export const SelectTravelTokenScreenComponent = ({onAfterSave}: Props) => { inspectableToken, ); - const {fareContracts: availableFareContracts} = useFareContracts( - {availability: 'available'}, - serverNow, - ); - - const availableTravelRights = availableFareContracts.flatMap( - (fc) => fc.travelRights, - ); - - // Filter for unique travel rights config types - availableTravelRights.map((travelRight) => { - const preassignedFareProduct = findReferenceDataById( - preassignedFareProducts, - isOfFareProductRef(travelRight) ? travelRight.fareProductRef : '', - ); - - return ( - preassignedFareProduct && - fareProductTypeConfigs.find((c) => c.type === preassignedFareProduct.type) - ); - }); - useEffect(() => { // Whenever a user enters this screen, the onboarding is done. // This useEffect is needed for when onboarding was skipped because of diff --git a/src/stacks-hierarchy/RootStack.tsx b/src/stacks-hierarchy/RootStack.tsx index a8fe840a58..3078755710 100644 --- a/src/stacks-hierarchy/RootStack.tsx +++ b/src/stacks-hierarchy/RootStack.tsx @@ -43,7 +43,6 @@ import {Root_LoginPhoneInputScreen} from '@atb/stacks-hierarchy/Root_LoginPhoneI import {Root_LoginConfirmCodeScreen} from '@atb/stacks-hierarchy/Root_LoginConfirmCodeScreen'; import {Root_LoginRequiredForFareProductScreen} from '@atb/stacks-hierarchy/Root_LoginRequiredForFareProductScreen'; import {Root_ConfirmationScreen} from './Root_ConfirmationScreen'; -import {Root_ActiveTokenOnPhoneRequiredForFareProductScreen} from '@atb/stacks-hierarchy/Root_ActiveTokenOnPhoneRequiredForFareProductScreen'; import { LoadingScreen, LoadingScreenBoundary, @@ -388,10 +387,6 @@ export const RootStack = () => { name="Root_ConfirmationScreen" component={Root_ConfirmationScreen} /> - theme.color.background.accent[0]; - -type Props = - RootStackScreenProps<'Root_ActiveTokenOnPhoneRequiredForFareProductScreen'>; - -export const Root_ActiveTokenOnPhoneRequiredForFareProductScreen = ({ - navigation, - route, -}: Props) => { - const {t} = useTranslation(); - const styles = useThemeStyles(); - const focusRef = useFocusOnLoad(); - const {nextScreen} = route.params; - - const {tokens} = useMobileTokenContext(); - const toggleMutation = useToggleTokenMutation(); - const [selectedToken, setSelectedToken] = useState(); - const mobileTokens = tokens.filter((t) => t.type === 'mobile'); - - const {theme} = useThemeContext(); - const themeColor = getThemeColor(theme); - - useEffect(() => { - if (toggleMutation.isSuccess) { - navigation.navigate(nextScreen.screen, nextScreen.params as any); - } - }, [navigation, toggleMutation.isSuccess, nextScreen]); - - const onSave = useCallback(async () => { - if (selectedToken) { - if (selectedToken.isInspectable) { - navigation.navigate(nextScreen.screen, nextScreen.params as any); - return; - } - toggleMutation.mutate({ - tokenId: selectedToken.id, - bypassRestrictions: true, - }); - } - }, [toggleMutation, selectedToken, nextScreen, navigation]); - - return ( - - - - - - - {t(ActiveTokenRequiredTexts.ticketNotAvailable)} - - - {t(ActiveTokenRequiredTexts.travelCard)} - - - - - - {t(ActiveTokenRequiredTexts.switchToMobile)} - - - {mobileTokens?.length ? ( - - type="spacious" - style={styles.selectDeviceSection} - items={mobileTokens} - keyExtractor={(token) => token.id} - itemToText={(token) => getDeviceNameWithUnitInfo(t, token)} - selected={selectedToken} - onSelect={setSelectedToken} - headerText={t( - TravelTokenTexts.toggleToken.radioBox.phone.selection.heading, - )} - /> - ) : ( - - )} - - {toggleMutation.isError && ( - - )} - - - {t(ActiveTokenRequiredTexts.actionMessage)} - - {toggleMutation.isLoading ? ( - - ) : ( -