diff --git a/apps/native/app/src/messages/en.ts b/apps/native/app/src/messages/en.ts index 0aae6912ca2e..680d23ed7967 100644 --- a/apps/native/app/src/messages/en.ts +++ b/apps/native/app/src/messages/en.ts @@ -176,7 +176,7 @@ export const en: TranslatedMessages = { 'home.onboardingModule.card2': 'The app’s purpose is to provide faster access to your documents, applications, and other dealings with governmental institutions.', 'home.onboardingModule.card3': - 'If you have comments or suggestions about something that is missing or that could be improved, feel free to contact us via email at', + 'If you have comments or suggestions about something that is missing or that could be improved, feel free to contact us via email at island@island.is', 'home.onboardingModule.card4': 'We encourage our users to read Digital Iceland’s privacy policy on', 'home.vehicleModule.summary': diff --git a/apps/native/app/src/messages/is.ts b/apps/native/app/src/messages/is.ts index ad2a7fdb961b..813656b4383b 100644 --- a/apps/native/app/src/messages/is.ts +++ b/apps/native/app/src/messages/is.ts @@ -176,7 +176,7 @@ export const is = { 'home.onboardingModule.card2': 'Markmiðið með appinu er að þú hafir í hendi þér það sem þú þarfnast hverju sinni í samskiptum við hið opinbera.', 'home.onboardingModule.card3': - 'Hafir þú athugasemdir eða ábendingar um eitthvað sem vantar eða sem má betur fara viljum við gjarnan fá frá þér línu á', + 'Hafir þú athugasemdir eða ábendingar um eitthvað sem vantar eða sem má betur fara viljum við gjarnan fá frá þér línu á island@island.is', 'home.onboardingModule.card4': 'Notendum er bent á að kynna sér stefnu Stafræns Íslands um meðferð persónuupplýsinga á', 'home.vehicleModule.summary': diff --git a/apps/native/app/src/screens/air-discount/air-discount.tsx b/apps/native/app/src/screens/air-discount/air-discount.tsx index ac3db1a9bfdf..971b7b711686 100644 --- a/apps/native/app/src/screens/air-discount/air-discount.tsx +++ b/apps/native/app/src/screens/air-discount/air-discount.tsx @@ -8,7 +8,7 @@ import { Typography, } from '@ui' import React from 'react' -import { SafeAreaView, ScrollView, View } from 'react-native' +import { Image, SafeAreaView, ScrollView, View } from 'react-native' import { NavigationFunctionComponent } from 'react-native-navigation' import { FormattedMessage, useIntl } from 'react-intl' import styled, { useTheme } from 'styled-components/native' @@ -22,6 +22,7 @@ import { AirDiscountCard } from '@ui/lib/card/air-discount-card' import { Bullet } from '@ui/lib/bullet/bullet' import { useConnectivityIndicator } from '../../hooks/use-connectivity-indicator' import { AirfaresUsageTable } from './airfares-usage-table' +import externalLinkIcon from '../../assets/icons/external-link.png' const BulletList = styled.View` margin-vertical: 12px; @@ -152,7 +153,8 @@ export const AirDiscountScreen: NavigationFunctionComponent = ({ + />{' '} + diff --git a/apps/native/app/src/screens/home/inbox-module.tsx b/apps/native/app/src/screens/home/inbox-module.tsx index b0b4ce872f33..73ac02f007c5 100644 --- a/apps/native/app/src/screens/home/inbox-module.tsx +++ b/apps/native/app/src/screens/home/inbox-module.tsx @@ -124,7 +124,6 @@ const InboxModule = React.memo(({ data, loading, error }: InboxModuleProps) => { publicationDate={item.publicationDate} id={`${item.id}-${index}`} unread={!item.opened} - bookmarked={item.bookmarked} senderName={item.sender.name} icon={ item.sender.name && getOrganizationLogoUrl(item.sender.name, 75) diff --git a/apps/native/app/src/screens/home/onboarding-module.tsx b/apps/native/app/src/screens/home/onboarding-module.tsx index 7e09052f6f30..62eca38b932a 100644 --- a/apps/native/app/src/screens/home/onboarding-module.tsx +++ b/apps/native/app/src/screens/home/onboarding-module.tsx @@ -67,7 +67,6 @@ export const OnboardingModule = React.memo(() => { dark: '#150920', light: theme.color.purple100, }} - link={{ url: 'mailto:island@island.is', title: 'island@island.is' }} /> (false) - useEffect(() => setStarred(!!bookmarked), [bookmarked]) return ( { - toggleAction(!bookmarked ? 'bookmark' : 'unbookmark', id) - setStarred(!bookmarked) - }} urgent={!!isUrgent} icon={icon} /> diff --git a/apps/native/app/src/ui/lib/list/list-item.tsx b/apps/native/app/src/ui/lib/list/list-item.tsx index 7f49e88ee343..675f565bd77b 100644 --- a/apps/native/app/src/ui/lib/list/list-item.tsx +++ b/apps/native/app/src/ui/lib/list/list-item.tsx @@ -1,11 +1,9 @@ import { Label, Typography } from '@ui' import React, { isValidElement } from 'react' import { FormattedDate, useIntl } from 'react-intl' -import { Image, ImageSourcePropType, Pressable } from 'react-native' -import styled, { useTheme } from 'styled-components/native' +import { Image, ImageSourcePropType } from 'react-native' +import styled from 'styled-components/native' -import StarFilled from '../../../assets/icons/star-filled.png' -import Star from '../../../assets/icons/star.png' import { dynamicColor } from '../../utils' const Host = styled.SafeAreaView<{ unread?: boolean }>` @@ -61,16 +59,6 @@ const Title = styled.View` const Cell = styled.View`` -const StarImage = styled.Image<{ active?: boolean }>` - tint-color: ${dynamicColor(({ active, theme }) => ({ - dark: active ? theme.color.blue400 : theme.color.dark300, - light: active ? theme.color.blue400 : theme.color.dark300, - }))}; - width: 16px; - height: 16px; - margin-top: -4px; -` - interface ListItemAction { id: string text: string @@ -84,8 +72,6 @@ interface ListItemProps { unread?: boolean actions?: ListItemAction[] icon?: ImageSourcePropType | React.ReactNode - onStarPress?(): void - starred?: boolean urgent?: boolean } @@ -94,13 +80,10 @@ export function ListItem({ subtitle, date, icon, - onStarPress, - starred = false, unread = false, urgent = false, }: ListItemProps) { const intl = useIntl() - const theme = useTheme() return ( @@ -144,12 +127,6 @@ export function ListItem({ {intl.formatMessage({ id: 'inbox.urgent' })} )} - - -