diff --git a/src/RemoteConfigContext.tsx b/src/RemoteConfigContext.tsx index 4a185b6e92..7827d021bb 100644 --- a/src/RemoteConfigContext.tsx +++ b/src/RemoteConfigContext.tsx @@ -34,6 +34,7 @@ const RemoteConfigContextProvider: React.FC = ({children}) => { }, []); async function refresh() { + await remoteConfig().reset(); await remoteConfig().fetchAndActivate(); const currentConfig = await getConfig(); setConfig(currentConfig); diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx index 2e1e979790..5ee082aac7 100644 --- a/src/components/button/index.tsx +++ b/src/components/button/index.tsx @@ -5,6 +5,7 @@ import { StyleProp, ViewStyle, TouchableOpacity, + TextStyle, } from 'react-native'; import React from 'react'; import {StyleSheet, Theme} from '../../theme'; @@ -13,6 +14,7 @@ type ButtonProps = { onPress(): void; mode?: 'primary' | 'destructive' | 'secondary'; textContainerStyle?: StyleProp; + textStyle?: StyleProp; IconComponent?: React.ElementType; text: string; } & TouchableOpacityProperties; @@ -24,6 +26,7 @@ const Button: React.FC = ({ disabled, style, textContainerStyle, + textStyle, ...props }) => { const css = useButtonStyle(); @@ -50,7 +53,7 @@ const Button: React.FC = ({ )} - {text} + {text} diff --git a/src/screens/Ticketing/Splash/InviteModal.tsx b/src/screens/Ticketing/Splash/InviteModal.tsx index 0ff45c82e7..a247c1470e 100644 --- a/src/screens/Ticketing/Splash/InviteModal.tsx +++ b/src/screens/Ticketing/Splash/InviteModal.tsx @@ -65,10 +65,12 @@ export default forwardRef(function InviteModal( ) : ( <> - Lukket beta for billettkjøp + + Registrer deg som testpilot for billettkjøp + - Her kan du sende inn invitasjonskode du har fått tilsendt fra - AtB for å melde deg på beta for billettkjøp. + Send oss invitasjonskoden din og bli først ute med å teste + billettkjøp direkte fra reiseappen. (function InviteModal( {hasError && ( )} diff --git a/src/screens/Ticketing/Splash/index.tsx b/src/screens/Ticketing/Splash/index.tsx index e34e8c537a..984e67e683 100644 --- a/src/screens/Ticketing/Splash/index.tsx +++ b/src/screens/Ticketing/Splash/index.tsx @@ -5,12 +5,13 @@ import Header from '../../../ScreenHeader'; import useChatIcon from '../../../chat/use-chat-icon'; import colors from '../../../theme/colors'; import {ShinyTicketBanner} from '../../../assets/svg/illustrations'; -import {StyleSheet} from '../../../theme'; +import {StyleSheet, useStyle} from '../../../theme'; import LogoOutline from '../../../ScreenHeader/LogoOutline'; import {useNavigateHome} from '../../../utils/navigation'; import InviteModal from './InviteModal'; import {Modalize} from 'react-native-modalize'; import {useRemoteConfig} from '../../../RemoteConfigContext'; +import Button from '../../../components/button'; function openOtherTicketingApp() { const url = @@ -23,6 +24,7 @@ function openOtherTicketingApp() { } export default function Splash() { + const styles = useStyles(); const {refresh} = useRemoteConfig(); const chatIcon = useChatIcon(); const {width: windowWidth} = useWindowDimensions(); @@ -44,6 +46,12 @@ export default function Splash() { accessibilityLabel: 'Gå til startskjerm', }} /> + + + Billettkjøp i app kommer snart! @@ -57,41 +65,46 @@ export default function Splash() { AtB Mobillett - - Hvis du har en kode for å melde deg inn i beta for billettkjøp -{' '} - +