feat(native-app): add app widgets to home screen

apps/native/app/src/messages/en.ts

@@ -110,6 +110,7 @@ export const en: TranslatedMessages = {
   'settings.security.appLockTimeoutLabel': 'App lock timeout',
   'settings.security.appLockTimeoutDescription':
     'Time until app lock will appear',
+  'settings.security.appLockTimeoutSeconds': 'sec.',
   'settings.about.groupTitle': 'About',
   'settings.about.versionLabel': 'Version',
   'settings.about.logoutLabel': 'Logout',
@@ -168,7 +169,6 @@ export const en: TranslatedMessages = {
   'home.screenTitle': 'Overview',
   'home.applicationsStatus': 'Applications',
   'home.allApplications': 'Digital applications',
-  'home.inbox': 'Latest in inbox',
   'home.welcomeText': 'Hi',
   'home.goodDay': 'Good day,',
   'home.onboardingModule.card1':
@@ -184,6 +184,18 @@ export const en: TranslatedMessages = {
   'home.vehicleModule.button': 'My vehicles',
   'button.seeAll': 'See all',
 
+  // home options
+  'homeOptions.screenTitle': 'Home screen',
+  'homeOptions.heading.title': 'Configure home screen',
+  'homeOptions.heading.subtitle':
+    'Here you can configure what is displayed on the home screen.',
+  'homeOptions.graphic': 'Display graphic',
+  'homeOptions.inbox': 'Latest in inbox',
+  'homeOptions.licenses': 'Licenses',
+  'homeOptions.applications': 'Applications',
+  'homeOptions.vehicles': 'Vehicles',
+  'homeOptions.airDiscount': 'Air discount scheme',
+
   // inbox
   'inbox.screenTitle': 'Inbox',
   'inbox.bottomTabText': 'Inbox',

apps/native/app/src/messages/is.ts

@@ -109,6 +109,7 @@ export const is = {
   'settings.security.appLockTimeoutLabel': 'Biðtími skjálæsingar',
   'settings.security.appLockTimeoutDescription':
     'Tíminn þar til skjálæsing fer í gang',
+  'settings.security.appLockTimeoutSeconds': 'sek.',
   'settings.about.groupTitle': 'Um appið',
   'settings.about.versionLabel': 'Útgáfa',
   'settings.about.logoutLabel': 'Útskrá',
@@ -169,7 +170,6 @@ export const is = {
   'home.applicationsStatus': 'Staða umsókna',
   'home.allApplications': 'Stafrænar umsóknir',
   'home.welcomeText': 'Hæ',
-  'home.inbox': 'Nýjast í pósthólfinu',
   'home.goodDay': 'Góðan dag,',
   'home.onboardingModule.card1':
     'Nú sérð þú upplýsingar um ökutæki, fasteignir og fjölskyldu þína í appinu til viðbótar við skjöl og skírteini.',
@@ -184,6 +184,18 @@ export const is = {
   'home.vehicleModule.button': 'Mín ökutæki',
   'button.seeAll': 'Sjá allt',
 
+  // home options
+  'homeOptions.screenTitle': 'Heimaskjár',
+  'homeOptions.heading.title': 'Stilla heimaskjá',
+  'homeOptions.heading.subtitle':
+    'Hér er hægt að stilla hvað birtist á heimaskjá.',
+  'homeOptions.graphic': 'Birta myndskreytingu',
+  'homeOptions.inbox': 'Nýjast í pósthólfinu',
+  'homeOptions.licenses': 'Skírteini',
+  'homeOptions.applications': 'Umsóknir',
+  'homeOptions.vehicles': 'Ökutæki',
+  'homeOptions.airDiscount': 'Loftbrú',
+
   // inbox
   'inbox.screenTitle': 'Pósthólf',
   'inbox.bottomTabText': 'Pósthólf',

apps/native/app/src/screens/applications/applications.tsx

@@ -197,11 +197,7 @@ export const ApplicationsScreen: NavigationFunctionComponent = ({
         ListHeaderComponent={
           <View style={{ flex: 1 }}>
             <ApplicationsModule
-              applications={
-                (applicationsRes.data?.applicationApplications ??
-                  []) as Application[]
-              }
-              loading={applicationsRes.loading}
+              {...applicationsRes}
               componentId={componentId}
               hideAction={true}
               hideSeeAllButton={true}

apps/native/app/src/screens/home/air-discount-module.tsx

@@ -0,0 +1,167 @@
+import {
+  Typography,
+  Heading,
+  ChevronRight,
+  ViewPager,
+  EmptyCard,
+  GeneralCardSkeleton,
+} from '@ui'
+
+import React from 'react'
+import { FormattedMessage, useIntl } from 'react-intl'
+import { Image, SafeAreaView, TouchableOpacity } from 'react-native'
+import styled, { useTheme } from 'styled-components/native'
+import { ApolloError } from '@apollo/client'
+
+import illustrationSrc from '../../assets/illustrations/le-jobs-s2.png'
+import { navigateTo } from '../../lib/deep-linking'
+import {
+  GetAirDiscountQuery,
+  useGetAirDiscountQuery,
+} from '../../graphql/types/schema'
+import { AirDiscountCard } from '@ui/lib/card/air-discount-card'
+import { screenWidth } from '../../utils/dimensions'
+
+const Host = styled.View`
+  margin-bottom: ${({ theme }) => theme.spacing[2]}px;
+`
+
+interface AirDiscountModuleProps {
+  data: GetAirDiscountQuery | undefined
+  loading: boolean
+  error?: ApolloError | undefined
+}
+
+const validateAirDiscountInitialData = ({
+  data,
+  loading,
+}: {
+  data: GetAirDiscountQuery | undefined
+  loading: boolean
+}) => {
+  if (loading) {
+    return true
+  }
+
+  const noRights =
+    data?.airDiscountSchemeDiscounts?.filter(
+      (item) => item.user.fund?.credit === 0 && item.user.fund.used === 0,
+    ).length === data?.airDiscountSchemeDiscounts?.length
+
+  // Only show widget initially if the user has air discount rights
+  if (!noRights) {
+    return true
+  }
+
+  return false
+}
+
+const AirDiscountModule = React.memo(
+  ({ data, loading, error }: AirDiscountModuleProps) => {
+    const theme = useTheme()
+    const intl = useIntl()
+
+    if (error && !data) {
+      return null
+    }
+
+    const noRights =
+      data?.airDiscountSchemeDiscounts?.filter(
+        (item) => item.user.fund?.credit === 0 && item.user.fund.used === 0,
+      ).length === data?.airDiscountSchemeDiscounts?.length
+
+    const discounts = data?.airDiscountSchemeDiscounts?.filter(
+      ({ user }) => !(user.fund?.used === 0 && user.fund.credit === 0),
+    )
+
+    const count = discounts?.length ?? 0
+
+    const items = discounts?.slice(0, 3).map(({ discountCode, user }) => (
+      <AirDiscountCard
+        key={`loftbru-item-${discountCode}`}
+        name={user.name}
+        code={discountCode}
+        credit={user.fund?.credit}
+        text={intl.formatMessage(
+          { id: 'airDiscount.remainingFares' },
+          {
+            remaining: user.fund?.credit,
+            total: user.fund?.total,
+          },
+        )}
+        style={
+          count > 1
+            ? {
+                width: screenWidth - theme.spacing[2] * 4,
+                marginLeft: theme.spacing[2],
+              }
+            : {
+                width: '100%',
+              }
+        }
+      />
+    ))
+
+    return (
+      <SafeAreaView
+        style={{
+          marginHorizontal: theme.spacing[2],
+          marginBottom: theme.spacing[2],
+        }}
+      >
+        <Host>
+          <TouchableOpacity
+            disabled={count === 0}
+            onPress={() => navigateTo(`/air-discount`)}
+          >
+            <Heading
+              button={
+                count === 0 ? null : (
+                  <TouchableOpacity
+                    onPress={() => navigateTo('/air-discount')}
+                    style={{
+                      flexDirection: 'row',
+                      alignItems: 'center',
+                    }}
+                  >
+                    <Typography variant="heading5" color={theme.color.blue400}>
+                      <FormattedMessage id="button.seeAll" />
+                    </Typography>
+                    <ChevronRight />
+                  </TouchableOpacity>
+                )
+              }
+            >
+              <FormattedMessage id="homeOptions.airDiscount" />
+            </Heading>
+          </TouchableOpacity>
+          {loading && !data ? (
+            <GeneralCardSkeleton height={146} />
+          ) : (
+            <>
+              {noRights && (
+                <EmptyCard
+                  text={intl.formatMessage({
+                    id: 'airDiscount.emptyListDescription',
+                  })}
+                  image={
+                    <Image source={illustrationSrc} resizeMode="contain" />
+                  }
+                  link={null}
+                />
+              )}
+              {count === 1 && items}
+              {count >= 2 && <ViewPager>{items}</ViewPager>}
+            </>
+          )}
+        </Host>
+      </SafeAreaView>
+    )
+  },
+)
+
+export {
+  AirDiscountModule,
+  useGetAirDiscountQuery,
+  validateAirDiscountInitialData,
+}

apps/native/app/src/screens/home/applications-module.tsx

@@ -13,35 +13,65 @@ import {
 import React from 'react'
 import { useIntl } from 'react-intl'
 import { Image, SafeAreaView, TouchableOpacity } from 'react-native'
+import { useTheme } from 'styled-components'
+import { ApolloError } from '@apollo/client'
+
 import leJobss3 from '../../assets/illustrations/le-jobs-s3.png'
-import { Application } from '../../graphql/types/schema'
+import {
+  ListApplicationsQuery,
+  useListApplicationsQuery,
+} from '../../graphql/types/schema'
 import { navigateTo } from '../../lib/deep-linking'
 import { useBrowser } from '../../lib/use-browser'
 import { getApplicationUrl } from '../../utils/applications-utils'
-import { useTheme } from 'styled-components'
+import { screenWidth } from '../../utils/dimensions'
 
 interface ApplicationsModuleProps {
-  applications: Application[]
+  data: ListApplicationsQuery | undefined
   loading: boolean
+  error?: ApolloError | undefined
   componentId: string
   hideAction?: boolean
   hideSeeAllButton?: boolean
 }
 
-export const ApplicationsModule = React.memo(
+const validateApplicationsInitialData = ({
+  data,
+  loading,
+}: {
+  data: ListApplicationsQuery | undefined
+  loading: boolean
+}) => {
+  if (loading) {
+    return true
+  }
+  // Only show widget initially if there are applications
+  if (data?.applicationApplications?.length !== 0) {
+    return true
+  }
+  return false
+}
+
+const ApplicationsModule = React.memo(
   ({
-    applications,
+    data,
     loading,
+    error,
     componentId,
     hideAction,
     hideSeeAllButton = false,
   }: ApplicationsModuleProps) => {
     const intl = useIntl()
     const theme = useTheme()
+    const applications = data?.applicationApplications ?? []
     const count = applications.length
     const { openBrowser } = useBrowser()
 
-    const children = applications.slice(0, 5).map((application) => (
+    if (error && !data) {
+      return null
+    }
+
+    const items = applications.slice(0, 3).map((application) => (
       <StatusCard
         key={application.id}
         title={application.name ?? ''}
@@ -68,7 +98,7 @@ export const ApplicationsModule = React.memo(
         style={
           count > 1
             ? {
-                width: 283,
+                width: screenWidth - theme.spacing[2] * 4,
                 marginLeft: 16,
               }
             : {}
@@ -80,10 +110,12 @@ export const ApplicationsModule = React.memo(
       <SafeAreaView
         style={{
           marginHorizontal: theme.spacing[2],
-          marginBottom: theme.spacing[2],
         }}
       >
-        <TouchableOpacity onPress={() => navigateTo(`/applications`)}>
+        <TouchableOpacity
+          disabled={count === 0}
+          onPress={() => navigateTo(`/applications`)}
+        >
           <Heading
             button={
               count === 0 || hideSeeAllButton ? null : (
@@ -94,7 +126,7 @@ export const ApplicationsModule = React.memo(
                     alignItems: 'center',
                   }}
                 >
-                  <Typography weight="400" color={blue400}>
+                  <Typography variant="heading5" color={blue400}>
                     {intl.formatMessage({ id: 'button.seeAll' })}
                   </Typography>
                   <ChevronRight />
@@ -105,7 +137,7 @@ export const ApplicationsModule = React.memo(
             {intl.formatMessage({ id: 'home.applicationsStatus' })}
           </Heading>
         </TouchableOpacity>
-        {loading ? (
+        {loading && !data ? (
           <StatusCardSkeleton />
         ) : (
           <>
@@ -136,11 +168,17 @@ export const ApplicationsModule = React.memo(
                 }
               />
             )}
-            {count === 1 && children.slice(0, 1)}
-            {count >= 2 && <ViewPager>{children}</ViewPager>}
+            {count === 1 && items}
+            {count >= 2 && <ViewPager>{items}</ViewPager>}
           </>
         )}
       </SafeAreaView>
     )
   },
 )
+
+export {
+  ApplicationsModule,
+  useListApplicationsQuery,
+  validateApplicationsInitialData,
+}