Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: make it possible to choose tcard or mobile when no inspectable token #4379

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: make it possible to choose tcard or mobile when no inspectable token #4379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/translations/components/TravelTokenBox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,17 @@ const TravelTokenBoxTexts = {
'Vel kor du vil bruke billettane dine',
),
noInspectableToken: _(
'Billetter må brukes på enten et t:kort eller en mobil, og det ser ikke ut som du har valgt en av dem.\n\nGå til **Min profil, Bytt mellom t:kort / mobil** for å velge.',
`Tickets must be used on either a t:card or a phone, and it looks like you haven't chosen one. Go to **My profile, switch between t:card / phone** to select`,
`Billettar må brukast på enten eit t:kort eller ein mobil, og det ser ikkje ut som du har valt ein av dei.\n\nGå til **Mi profil, Bytt mellom t:kort / mobil** for å velje.`,
'Billetter må brukes på enten et t:kort eller en mobil, og det ser ikke ut som du har valgt en av dem.\n\nTrykk på knappen under for å velge.',
`Tickets must be used on either a t:card or a phone, and it looks like you haven't chosen one.\n\nTap the button below to choose.`,
`Billettar må brukast på enten eit t:kort eller ein mobil, og det ser ikkje ut som du har valt ein av dei.\n\nTrykk på knappen under for å velje.`,
),
},
change: _('Endre', 'Change', 'Endre'),
choose: _(
'Velg t:kort eller mobil',
'Choose t:card or phone',
'Vel t:kort eller mobil',
),
};

export default orgSpecificTranslations(TravelTokenBoxTexts, {
Expand Down
23 changes: 16 additions & 7 deletions src/travel-token-box/TravelTokenBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,22 @@ export function TravelTokenBox({
const inspectableToken = tokens.find((t) => t.isInspectable);
if (!inspectableToken)
return (
<MessageInfoBox
type="warning"
isMarkdown={true}
title={t(TravelTokenBoxTexts.errorMessages.noInspectableTokenTitle)}
message={t(TravelTokenBoxTexts.errorMessages.noInspectableToken)}
style={styles.errorMessage}
/>
<View>
<MessageInfoBox
type="warning"
isMarkdown={true}
title={t(TravelTokenBoxTexts.errorMessages.noInspectableTokenTitle)}
message={t(TravelTokenBoxTexts.errorMessages.noInspectableToken)}
style={styles.errorMessage}
/>
<Button
mode="secondary"
backgroundColor={interactiveColor}
onPress={onPressChangeButton}
text={t(TravelTokenBoxTexts.choose)}
testID="continueWithoutChangingTravelTokenButton"
/>
</View>
);

const isTravelCard = inspectableToken.type === 'travel-card';
Expand Down
Loading