@bifold/core 2.2.0 → 2.3.0

package/src/components/views/Banner.tsx

@@ -0,0 +1,174 @@
+import React, { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { StyleSheet, TouchableOpacity, View } from 'react-native'
+import Icon from 'react-native-vector-icons/MaterialCommunityIcons'
+import { DispatchAction } from '../../contexts/reducers/store'
+import { useStore } from '../../contexts/store'
+import { useTheme } from '../../contexts/theme'
+import { testIdWithKey } from '../../utils/testable'
+import { ThemedText } from '../texts/ThemedText'
+
+export interface BannerMessage {
+  id: string
+  title: string
+  type: 'error' | 'warning' | 'info' | 'success'
+  variant: 'summary' | 'detail'
+  dismissible?: boolean
+}
+
+export interface BannerSectionProps extends BannerMessage {
+  expanded?: boolean
+  onDismiss?: () => void
+  onToggle?: () => void
+}
+
+export const Banner: React.FC = () => {
+  const [store, dispatch] = useStore()
+  const [expanded, setExpanded] = useState(false)
+  const bannerMessages = store.preferences.bannerMessages
+  const { t } = useTranslation()
+  const alertMessage: BannerMessage = {
+    id: 'alertMessage',
+    title: t('Banner.AlertsLength', { alerts: bannerMessages.length }),
+    type: 'error',
+    variant: 'summary',
+  }
+
+  const dismissBanner = (key: string) => {
+    dispatch({
+      type: DispatchAction.REMOVE_BANNER_MESSAGE,
+      payload: [key],
+    })
+  }
+  if (!bannerMessages || bannerMessages.length == 0) {
+    return null
+  }
+
+  if (bannerMessages.length === 1) {
+    const message = bannerMessages[0]
+    return (
+      <BannerSection
+        id={message.id}
+        key={message.id}
+        title={message.title}
+        type={message.type}
+        variant="detail"
+        onDismiss={() => dismissBanner(message.id)}
+        dismissible={message.dismissible}
+      />
+    )
+  }
+
+  return (
+    <View>
+      <BannerSection
+        id={alertMessage.id}
+        title={t('Banner.AlertsLength', { alerts: bannerMessages.length })}
+        type={alertMessage.type}
+        variant={alertMessage.variant}
+        expanded={expanded}
+        onToggle={() => setExpanded(!expanded)}
+        dismissible={alertMessage.dismissible}
+      />
+      {expanded &&
+        bannerMessages.map((message) => (
+          <BannerSection
+            id={message.id}
+            key={message.id}
+            title={message.title}
+            type={message.type}
+            variant="detail"
+            onDismiss={() => dismissBanner(message.id)}
+            dismissible={message.dismissible}
+          />
+        ))}
+    </View>
+  )
+}
+
+export const BannerSection: React.FC<BannerSectionProps> = ({
+  title,
+  type,
+  onDismiss,
+  dismissible = true,
+  variant,
+  expanded,
+  onToggle,
+}) => {
+  const { Spacing, ColorPallet } = useTheme()
+  const styles = StyleSheet.create({
+    container: {
+      backgroundColor: ColorPallet.brand.primary,
+      flexDirection: 'row',
+      alignItems: 'center',
+      padding: Spacing.md,
+    },
+    icon: {
+      marginRight: Spacing.md,
+    },
+  })
+
+  const iconName = (type: string): string => {
+    switch (type) {
+      case 'error':
+        return 'alert-circle'
+      case 'warning':
+        return 'alert'
+      case 'info':
+        return 'information'
+      case 'success':
+        return 'check-circle'
+      default:
+        return 'information'
+    }
+  }
+
+  const bannerColor = (type: string): string => {
+    switch (type) {
+      case 'error':
+        return '#CE3E39'
+      case 'warning':
+        return '#F8BB47'
+      case 'info':
+        return '#2E5DD7'
+      case 'success':
+        return '#42814A'
+      default:
+        return '#2E5DD7'
+    }
+  }
+
+  // If more details are needed we might need to push the banner down to accommodate the extra information
+  return (
+    <TouchableOpacity
+      style={{ ...styles.container, backgroundColor: bannerColor(type) }}
+      testID={testIdWithKey(`button-${type}`)}
+      onPress={() => {
+        if (variant === 'summary' && onToggle) {
+          onToggle()
+        } else if (dismissible && onDismiss) {
+          onDismiss()
+        }
+      }}
+    >
+      <Icon
+        name={iconName(type)}
+        size={24}
+        color={type === 'warning' ? ColorPallet.brand.secondaryBackground : ColorPallet.grayscale.white}
+        style={styles.icon}
+        testID={testIdWithKey(`icon-${type}`)}
+      />
+      <ThemedText
+        variant={'bold'}
+        style={{
+          color: type === 'warning' ? ColorPallet.brand.secondaryBackground : ColorPallet.grayscale.white,
+          flex: 1,
+        }}
+        testID={testIdWithKey(`text-${type}`)}
+      >
+        {title}
+      </ThemedText>
+      {variant === 'summary' && <Icon name={expanded ? 'chevron-up' : 'chevron-down'} size={24} color="white" />}
+    </TouchableOpacity>
+  )
+}

package/src/components/views/HeaderWithBanner.tsx

@@ -0,0 +1,17 @@
+import React from 'react'
+import { View } from 'react-native'
+import { StackHeaderProps, Header } from '@react-navigation/stack'
+import { useServices, TOKENS } from '../../container-api'
+
+const HeaderWithBanner: React.FC<StackHeaderProps> = (props) => {
+  const [NotificationBanner] = useServices([TOKENS.COMPONENT_NOTIFICATION_BANNER])
+
+  return (
+    <View>
+      <Header {...props} />
+      <NotificationBanner />
+    </View>
+  )
+}
+
+export default HeaderWithBanner

package/src/components/views/KeyboardView.tsx

@@ -1,25 +1,39 @@
 import React from 'react'
-import { KeyboardAvoidingView, Platform, ScrollView } from 'react-native'
+import { KeyboardAvoidingView, ScrollView } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { useTheme } from '../../contexts/theme'
+import { useHeaderHeight } from '@react-navigation/elements'
 
-const KeyboardView: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+const useSafeHeaderHeight = (): number => {
+  try {
+    return useHeaderHeight()
+  } catch {
+    return 100
+  }
+}
+
+const KeyboardView: React.FC<{ children: React.ReactNode; keyboardAvoiding?: boolean }> = ({
+  children,
+  keyboardAvoiding = true,
+}) => {
   const { ColorPallet } = useTheme()
+  const headerHeight = useSafeHeaderHeight()
   return (
     <SafeAreaView
       style={{ flex: 1, backgroundColor: ColorPallet.brand.primaryBackground }}
       edges={['bottom', 'left', 'right']}
     >
-      <KeyboardAvoidingView
-        style={{ flex: 1 }}
-        // below property is the distance to account for between the top of the screen and the top of the view. It is at most 100 with max zoom + font settings
-        keyboardVerticalOffset={100}
-        behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-      >
+      {keyboardAvoiding ? (
+        <KeyboardAvoidingView style={{ flex: 1 }} keyboardVerticalOffset={headerHeight} behavior="padding">
+          <ScrollView contentContainerStyle={{ flexGrow: 1 }} keyboardShouldPersistTaps={'handled'}>
+            {children}
+          </ScrollView>
+        </KeyboardAvoidingView>
+      ) : (
         <ScrollView contentContainerStyle={{ flexGrow: 1 }} keyboardShouldPersistTaps={'handled'}>
           {children}
         </ScrollView>
-      </KeyboardAvoidingView>
+      )}
     </SafeAreaView>
   )
 }

package/src/container-api.ts

@@ -77,6 +77,7 @@ export const HOOK_TOKENS = {
 
 export const COMPONENT_TOKENS = {
   COMPONENT_HOME_HEADER: 'component.home.header',
+  COMPONENT_NOTIFICATION_BANNER: 'component.notification.banner',
   COMPONENT_HOME_NOTIFICATIONS_EMPTY_LIST: 'component.home.notifications-empty-list',
   COMPONENT_HOME_FOOTER: 'component.home.footer',
   COMPONENT_CRED_EMPTY_LIST: 'component.cred.empty-list',
@@ -215,6 +216,7 @@ export type TokenMapping = {
   [TOKENS.COMPONENT_CRED_LIST_OPTIONS]: React.FC
   [TOKENS.COMPONENT_CRED_LIST_FOOTER]: React.FC<CredentialListFooterProps>
   [TOKENS.COMPONENT_HOME_HEADER]: React.FC
+  [TOKENS.COMPONENT_NOTIFICATION_BANNER]: React.FC
   [TOKENS.COMPONENT_HOME_NOTIFICATIONS_EMPTY_LIST]: React.FC
   [TOKENS.COMPONENT_HOME_FOOTER]: React.FC
   [TOKENS.COMPONENT_CRED_EMPTY_LIST]: React.FC

package/src/container-impl.ts

@@ -15,6 +15,7 @@ import NoNewUpdates from './components/misc/NoNewUpdates'
 import PINHeader from './components/misc/PINHeader'
 import Record from './components/record/Record'
 import HomeFooterView from './components/views/HomeFooterView'
+import { Banner } from './components/views/Banner'
 import HomeHeaderView from './components/views/HomeHeaderView'
 import defaultIndyLedgers from './configs/ledgers/indy'
 import { LocalStorageKeys, PINRules } from './constants'
@@ -153,6 +154,7 @@ export class MainContainer implements Container {
     this._container.registerInstance(TOKENS.COMPONENT_CRED_LIST_OPTIONS, () => null)
     this._container.registerInstance(TOKENS.COMPONENT_CRED_LIST_FOOTER, () => null)
     this._container.registerInstance(TOKENS.COMPONENT_HOME_HEADER, HomeHeaderView)
+    this._container.registerInstance(TOKENS.COMPONENT_NOTIFICATION_BANNER, Banner)
     this._container.registerInstance(TOKENS.COMPONENT_HOME_NOTIFICATIONS_EMPTY_LIST, NoNewUpdates)
     this._container.registerInstance(TOKENS.COMPONENT_HOME_FOOTER, HomeFooterView)
     this._container.registerInstance(TOKENS.COMPONENT_CRED_EMPTY_LIST, EmptyList)

package/src/contexts/network.tsx

@@ -1,7 +1,10 @@
 import { NetInfoStateType, useNetInfo } from '@react-native-community/netinfo'
-import { createContext, useContext, useState, useCallback, PropsWithChildren } from 'react'
+import { createContext, useContext, useState, useCallback, PropsWithChildren, useEffect } from 'react'
 
 import NetInfoModal from '../components/modals/NetInfoModal'
+import { useTranslation } from 'react-i18next'
+import { useStore } from './store'
+import { DispatchAction } from './reducers/store'
 
 export interface NetworkContext {
   silentAssertConnectedNetwork: () => boolean | null
@@ -19,6 +22,9 @@ export const NetworkContext = createContext<NetworkContext>(null as unknown as N
 export const NetworkProvider = ({ children }: PropsWithChildren) => {
   const { isConnected, type, isInternetReachable } = useNetInfo()
   const [isNetInfoModalDisplayed, setIsNetInfoModalDisplayed] = useState<boolean>(false)
+  const { t } = useTranslation()
+  const [hasShown, setHasShown] = useState(false)
+  const [, dispatch] = useStore()
 
   const displayNetInfoModal = useCallback(() => {
     setIsNetInfoModalDisplayed(true)
@@ -62,6 +68,38 @@ export const NetworkProvider = ({ children }: PropsWithChildren) => {
     return isInternetReachable
   }, [isInternetReachable])
 
+  const showNetworkWarning = useCallback(() => {
+    setHasShown(true)
+    dispatch({
+      type: DispatchAction.BANNER_MESSAGES,
+      payload: [
+        {
+          id: 'netinfo-no-internet',
+          title: t('NetInfo.NoInternetConnectionTitle'),
+          type: 'error',
+          variant: 'detail',
+          dismissible: false,
+        },
+      ],
+    })
+  }, [dispatch, t])
+
+  useEffect(() => {
+    const internetReachable = assertInternetReachable()
+    if (internetReachable) {
+      setHasShown(false)
+      dispatch({
+        type: DispatchAction.REMOVE_BANNER_MESSAGE,
+        payload: ['netinfo-no-internet'],
+      })
+    }
+
+    // Strict check for false, null means the network state is not yet known
+    if (internetReachable === false && !hasShown) {
+      showNetworkWarning()
+    }
+  }, [showNetworkWarning, assertInternetReachable, hasShown, dispatch])
+
   return (
     <NetworkContext.Provider
       value={{

package/src/contexts/reducers/store.ts

@@ -28,7 +28,6 @@ enum OnboardingDispatchAction {
   DID_NAME_WALLET = 'onboarding/didNameWallet',
   DID_COMPLETE_ONBOARDING = 'onboarding/didCompleteOnboarding',
   ONBOARDING_VERSION = 'onboarding/onboardingVersion',
-  SET_POST_AUTH_SCREENS = 'onboarding/postAuthScreens',
 }
 
 enum MigrationDispatchAction {
@@ -64,6 +63,8 @@ enum PreferencesDispatchAction {
   SET_SELECTED_MEDIATOR = 'preferences/setSelectedMediator',
   ADD_AVAILABLE_MEDIATOR = 'preferences/addAvailableMediator',
   RESET_MEDIATORS = 'preferences/resetMediators',
+  BANNER_MESSAGES = 'preferences/bannerMessages',
+  REMOVE_BANNER_MESSAGE = 'REMOVE_BANNER_MESSAGE',
 }
 
 enum ToursDispatchAction {
@@ -561,6 +562,34 @@ export const reducer = <S extends State>(state: S, action: ReducerAction<Dispatc
       }
     }
 
+    case PreferencesDispatchAction.BANNER_MESSAGES: {
+      const bannerMessageToAdd = action?.payload ?? []
+      const newBannerMessages = [...state.preferences.bannerMessages, ...bannerMessageToAdd]
+      const preferences: Preferences = {
+        ...state.preferences,
+        bannerMessages: newBannerMessages,
+      }
+      PersistentStorage.storeValueForKey(LocalStorageKeys.Preferences, preferences)
+      return {
+        ...state,
+        preferences,
+      }
+    }
+
+    case PreferencesDispatchAction.REMOVE_BANNER_MESSAGE: {
+      const keysToRemove = action?.payload ?? []
+      const newBannerMessages = state.preferences.bannerMessages.filter((msg) => !keysToRemove.includes(msg.id))
+      const preferences: Preferences = {
+        ...state.preferences,
+        bannerMessages: newBannerMessages,
+      }
+      PersistentStorage.storeValueForKey(LocalStorageKeys.Preferences, preferences)
+      return {
+        ...state,
+        preferences,
+      }
+    }
+
     case OnboardingDispatchAction.ONBOARDING_VERSION: {
       const version = (action?.payload || []).pop()
       const onboarding = {
@@ -678,18 +707,6 @@ export const reducer = <S extends State>(state: S, action: ReducerAction<Dispatc
 
       return newState
     }
-    case OnboardingDispatchAction.SET_POST_AUTH_SCREENS: {
-      const value = (action?.payload || []).pop()
-      const onboarding = {
-        ...state.onboarding,
-        postAuthScreens: value,
-      }
-      const newState = {
-        ...state,
-        onboarding,
-      }
-      return newState
-    }
     case MigrationDispatchAction.DID_MIGRATE_TO_ASKAR: {
       const migration: MigrationState = {
         ...state.migration,

package/src/contexts/store.tsx

@@ -25,7 +25,6 @@ export const defaultState: State = {
     didNameWallet: false,
     onboardingVersion: 0,
     didCompleteOnboarding: false,
-    postAuthScreens: [],
   },
   authentication: {
     didAuthenticate: false,
@@ -60,6 +59,7 @@ export const defaultState: State = {
     autoLockTime: defaultAutoLockTime, // default wallets lockout time to 5 minutes
     availableMediators: [Config.MEDIATOR_URL ?? ''],
     selectedMediator: Config.MEDIATOR_URL ?? '',
+    bannerMessages: [],
   },
   tours: {
     seenToursPrompt: false,

package/src/index.ts

@@ -15,7 +15,6 @@ import CredentialCard from './components/misc/CredentialCard'
 import InfoBox, { InfoBoxType } from './components/misc/InfoBox'
 import ErrorModal from './components/modals/ErrorModal'
 import SafeAreaModal from './components/modals/SafeAreaModal'
-import NetInfo from './components/network/NetInfo'
 import Record from './components/record/Record'
 import InfoTextBox from './components/texts/InfoTextBox'
 import Link from './components/texts/Link'
@@ -189,7 +188,6 @@ export {
   ToastType,
   toastConfig,
   NavContainer,
-  NetInfo,
   OnboardingPages,
   OpenIDCredentialRecordProvider,
   NotificationListItem,

package/src/localization/en/en.json

@@ -944,5 +944,8 @@
     "LearnMore": "Learn what's New",
     "UpdateNow": "Update the app",
     "UpdateLater": "Do this later"
+  },
+  "Banner": {
+    "AlertsLength": "You have {{ alerts }} alerts"
   }
 }

package/src/localization/fr/fr.json

@@ -50,7 +50,6 @@
     "Send": "Envoyer",
     "Reset": "Reset (FR)",
     "ViewJSON": "View JSON Details (FR)"
-
   },
   "Date": {
     "ShortFormat": "D MMM",
@@ -927,5 +926,8 @@
     "LearnMore": "Learn what's New (FR)",
     "UpdateNow": "Update the app (FR)",
     "UpdateLater": "Do this later (FR)"
+  },
+  "Banner": {
+    "AlertsLength": "You have {{ alerts }} alerts (FR)"
   }
 }

package/src/localization/pt-br/pt-br.json

@@ -49,7 +49,6 @@
     "Send": "Enviar",
     "Reset": "Reset (PT-BR)",
     "ViewJSON": "View JSON Details (PT-BR)"
-
   },
   "Date": {
     "ShortFormat": "D MMM",
@@ -905,5 +904,8 @@
     "LearnMore": "Learn what's New (PT-BR)",
     "UpdateNow": "Update the app (PT-BR)",
     "UpdateLater": "Do this later (PT-BR)"
+  },
+  "Banner": {
+    "AlertsLength": "You have {{ alerts }} alerts (PT-BR)"
   }
 }

package/src/modules/history/ui/HistorySettings.tsx

@@ -1,5 +1,4 @@
 import { useAgent } from '@credo-ts/react-hooks'
-import { ParamListBase } from '@react-navigation/core'
 import { StackScreenProps } from '@react-navigation/stack'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -11,14 +10,14 @@ import KeyboardView from '../../../components/views/KeyboardView'
 import { TOKENS, useServices } from '../../../container-api'
 import { useAnimatedComponents } from '../../../contexts/animated-components'
 import { useTheme } from '../../../contexts/theme'
-import { Screens } from '../../../types/navigators'
+import { Screens, SettingStackParams } from '../../../types/navigators'
 import { testIdWithKey } from '../../../utils/testable'
 import { HistoryBlockSelection, IHistoryManager } from '../types'
 
 import SingleSelectBlock from './components/SingleSelectBlock'
 import { ThemedText } from '../../../components/texts/ThemedText'
 
-interface HistorySettingsProps extends StackScreenProps<ParamListBase, Screens.HistorySettings> {}
+interface HistorySettingsProps extends StackScreenProps<SettingStackParams, Screens.HistorySettings> {}
 
 const HistorySettings: React.FC<HistorySettingsProps> = () => {
   const [continueEnabled] = useState(true)

package/src/modules/openid/screens/OpenIDProofChangeCredential.tsx

@@ -97,7 +97,7 @@ const OpenIDProofCredentialSelect: React.FC<Props> = ({ route, navigation }: Pro
             <RecordLoading />
           </View>
         ) : (
-          <ThemedText variant='bold'>{t('ProofRequest.AvailableCards')}</ThemedText>
+          <ThemedText variant={'bold'}>{t('ProofRequest.AvailableCards')}</ThemedText>
         )}
       </View>
     )

package/src/navigators/ContactStack.tsx

@@ -7,10 +7,8 @@ import { useTheme } from '../contexts/theme'
 import Chat from '../screens/Chat'
 import ContactDetails from '../screens/ContactDetails'
 import CredentialDetails from '../screens/CredentialDetails'
-import CredentialOffer from '../screens/CredentialOffer'
 import ListContacts from '../screens/ListContacts'
 import ProofDetails from '../screens/ProofDetails'
-import ProofRequest from '../screens/ProofRequest'
 import RenameContact from '../screens/RenameContact'
 import JSONDetails from '../screens/JSONDetails'
 import WhatAreContacts from '../screens/WhatAreContacts'
@@ -77,11 +75,6 @@ const ContactStack: React.FC = () => {
         component={CredentialDetails}
         options={{ title: t('Screens.CredentialDetails'), ...ScreenOptionsDictionary[Screens.CredentialDetails] }}
       />
-      <Stack.Screen
-        name={Screens.CredentialOffer}
-        component={CredentialOffer}
-        options={{ title: t('Screens.CredentialOffer'), ...ScreenOptionsDictionary[Screens.CredentialOffer] }}
-      />
       <Stack.Screen
         name={Screens.ProofDetails}
         component={ProofDetails}
@@ -91,14 +84,6 @@ const ContactStack: React.FC = () => {
           ...ScreenOptionsDictionary[Screens.ProofDetails],
         })}
       />
-      <Stack.Screen
-        name={Screens.ProofRequest}
-        component={ProofRequest}
-        options={{
-          title: t('Screens.ProofRequest'),
-          ...ScreenOptionsDictionary[Screens.ProofRequest],
-        }}
-      />
     </Stack.Navigator>
   )
 }

package/src/navigators/DeliveryStack.tsx

@@ -6,8 +6,6 @@ import HeaderRightHome from '../components/buttons/HeaderHome'
 import IconButton, { ButtonLocation } from '../components/buttons/IconButton'
 import { useTheme } from '../contexts/theme'
 import Connection from '../screens/Connection'
-import CredentialOffer from '../screens/CredentialOffer'
-import ProofRequest from '../screens/ProofRequest'
 import { DeliveryStackParams, Screens } from '../types/navigators'
 import { testIdWithKey } from '../utils/testable'
 
@@ -38,22 +36,6 @@ const DeliveryStack: React.FC = () => {
       }}
     >
       <Stack.Screen name={Screens.Connection} component={Connection} options={{ ...defaultStackOptions }} />
-      <Stack.Screen
-        name={Screens.ProofRequest}
-        component={ProofRequest}
-        options={{
-          title: t('Screens.ProofRequest'),
-          ...ScreenOptionsDictionary[Screens.ProofRequest],
-        }}
-      />
-      <Stack.Screen
-        name={Screens.CredentialOffer}
-        component={CredentialOffer}
-        options={{
-          title: t('Screens.CredentialOffer'),
-          ...ScreenOptionsDictionary[Screens.CredentialOffer],
-        }}
-      />
       <Stack.Screen
         name={Screens.OpenIDCredentialOffer}
         component={OpenIDCredentialOffer}

package/src/navigators/MainStack.tsx

@@ -11,7 +11,7 @@ import { TOKENS, useServices } from '../container-api'
 import { useTheme } from '../contexts/theme'
 import HistoryStack from '../modules/history/navigation/HistoryStack'
 import Chat from '../screens/Chat'
-import { Screens, Stacks, TabStacks } from '../types/navigators'
+import { RootStackParams, Screens, Stacks, TabStacks } from '../types/navigators'
 import { testIdWithKey } from '../utils/testable'
 import { useStore } from '../contexts/store'
 import { useTour } from '../contexts/tour/tour-context'
@@ -53,7 +53,7 @@ const MainStack: React.FC = () => {
     })
   }, [declinedProofs, agent, store.preferences.useDataRetention])
 
-  const Stack = createStackNavigator()
+  const Stack = createStackNavigator<RootStackParams>()
 
   // This function is to make the fade in behavior of both iOS and
   // Android consistent for the settings menu
@@ -68,7 +68,10 @@ const MainStack: React.FC = () => {
     <View style={{ flex: 1 }} importantForAccessibility={hideElements}>
       <Stack.Navigator
         initialRouteName={Stacks.TabStack}
-        screenOptions={{ ...defaultStackOptions, headerShown: false }}
+        screenOptions={{
+          ...defaultStackOptions,
+          headerShown: false,
+        }}
       >
         <Stack.Screen name={Stacks.TabStack} component={TabStack} />
         <Stack.Screen

package/src/navigators/NotificationStack.tsx

@@ -5,8 +5,6 @@ import { useTranslation } from 'react-i18next'
 import { TOKENS, useServices } from '../container-api'
 import { useTheme } from '../contexts/theme'
 import CredentialDetails from '../screens/CredentialDetails'
-import CredentialOffer from '../screens/CredentialOffer'
-import ProofRequest from '../screens/ProofRequest'
 import { NotificationStackParams, Screens } from '../types/navigators'
 
 import { useDefaultStackOptions } from './defaultStackOptions'
@@ -31,22 +29,6 @@ const NotificationStack: React.FC = () => {
           ...ScreenOptionsDictionary[Screens.CredentialDetails],
         }}
       />
-      <Stack.Screen
-        name={Screens.CredentialOffer}
-        component={CredentialOffer}
-        options={{
-          title: t('Screens.CredentialOffer'),
-          ...ScreenOptionsDictionary[Screens.CredentialOffer],
-        }}
-      />
-      <Stack.Screen
-        name={Screens.ProofRequest}
-        component={ProofRequest}
-        options={{
-          title: t('Screens.ProofRequest'),
-          ...ScreenOptionsDictionary[Screens.ProofRequest],
-        }}
-      />
       {customNotification && (
         <Stack.Screen
           name={Screens.CustomNotification}