@bifold/core 2.2.1 → 2.3.0

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

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}

package/src/navigators/OnboardingScreens.ts

@@ -1,8 +1,8 @@
-import { TFunction } from 'i18next'
-import { TransitionPresets, StackNavigationOptions, StackScreenProps } from '@react-navigation/stack'
 import { ParamListBase, RouteConfig, StackNavigationState } from '@react-navigation/native'
-import { Screens, ScreenOptionsType } from '../types/navigators'
+import { StackNavigationOptions, TransitionPresets } from '@react-navigation/stack'
 import type { StackNavigationEventMap } from '@react-navigation/stack/lib/typescript/src/types'
+import { TFunction } from 'i18next'
+import { ScreenOptionsType, Screens } from '../types/navigators'
 
 type ScreenOptions = RouteConfig<
   ParamListBase,
@@ -13,14 +13,14 @@ type ScreenOptions = RouteConfig<
 >
 
 interface ScreenComponents {
-  SplashScreen: React.FC<StackScreenProps<ParamListBase>>
-  Preface: React.FC<StackScreenProps<ParamListBase>>
+  SplashScreen: React.FC
+  Preface: React.FC
   UpdateAvailableScreen: React.FC
-  Terms: React.FC<StackScreenProps<ParamListBase>>
-  NameWallet: React.FC<StackScreenProps<ParamListBase>>
-  Biometry: React.FC<StackScreenProps<ParamListBase>>
-  PushNotifications: React.FC<StackScreenProps<ParamListBase>>
-  AttemptLockout: React.FC<StackScreenProps<ParamListBase>>
+  Terms: React.FC
+  NameWallet: React.FC
+  Biometry: React.FC
+  PushNotifications: React.FC
+  AttemptLockout: React.FC
   OnboardingScreen: React.FC
   CreatePINScreen: React.FC
   EnterPINScreen: React.FC

package/src/screens/Chat.tsx

@@ -21,7 +21,7 @@ import { Role } from '../types/chat'
 import { BasicMessageMetadata, basicMessageCustomMetadata } from '../types/metadata'
 import { RootStackParams, ContactStackParams, Screens, Stacks } from '../types/navigators'
 import { getConnectionName } from '../utils/helpers'
-import { KeyboardAvoidingView } from 'react-native'
+import { KeyboardAvoidingView, Platform } from 'react-native'
 
 type ChatProps = StackScreenProps<ContactStackParams, Screens.Chat> | StackScreenProps<RootStackParams, Screens.Chat>
 
@@ -108,7 +108,11 @@ const Chat: React.FC<ChatProps> = ({ route }) => {
 
   return (
     <SafeAreaView edges={['bottom', 'left', 'right']} style={{ flex: 1, paddingTop: 20 }}>
-      <KeyboardAvoidingView style={{ flex: 1 }} behavior="padding" keyboardVerticalOffset={headerHeight}>
+      <KeyboardAvoidingView
+        style={{ flex: 1 }}
+        behavior={Platform.OS === 'ios' ? undefined : 'padding'}
+        keyboardVerticalOffset={headerHeight}
+      >
         <GiftedChat
           keyboardShouldPersistTaps={'handled'}
           messages={chatMessages}

package/src/screens/CredentialDetails.tsx

@@ -22,7 +22,7 @@ import { TOKENS, useServices } from '../container-api'
 import { useTheme } from '../contexts/theme'
 import { BifoldError } from '../types/error'
 import { CredentialMetadata, credentialCustomMetadata } from '../types/metadata'
-import { RootStackParams, Screens, Stacks } from '../types/navigators'
+import { ContactStackParams, NotificationStackParams, RootStackParams, Screens, Stacks } from '../types/navigators'
 import { ModalUsage } from '../types/remove'
 import { credentialTextColor, getCredentialIdentifiers, isValidAnonCredsCredential } from '../utils/credential'
 import { formatTime, useCredentialConnectionLabel } from '../utils/helpers'
@@ -36,7 +36,10 @@ import CredentialDetailSecondaryHeader from '../components/views/CredentialDetai
 import { ThemedText } from '../components/texts/ThemedText'
 import CardWatermark from '../components/misc/CardWatermark'
 
-type CredentialDetailsProps = StackScreenProps<RootStackParams, Screens.CredentialDetails>
+type CredentialDetailsProps = StackScreenProps<
+  RootStackParams & ContactStackParams & NotificationStackParams,
+  Screens.CredentialDetails
+>
 
 const paddingHorizontal = 24
 const paddingVertical = 16

package/src/screens/PINChange.tsx

@@ -1,4 +1,4 @@
-import { ParamListBase, useNavigation } from '@react-navigation/native'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp, StackScreenProps } from '@react-navigation/stack'
 import React, { useCallback, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -13,7 +13,6 @@ import {
   View,
 } from 'react-native'
 
-// eslint-disable-next-line import/no-named-as-default
 import { ButtonType } from '../components/buttons/Button-api'
 import PINInput from '../components/inputs/PINInput'
 import PINValidationHelper from '../components/misc/PINValidationHelper'
@@ -29,11 +28,11 @@ import usePreventScreenCapture from '../hooks/screen-capture'
 import { usePINValidation } from '../hooks/usePINValidation'
 import { HistoryCardType, HistoryRecord } from '../modules/history/types'
 import { BifoldError } from '../types/error'
-import { OnboardingStackParams, Screens } from '../types/navigators'
+import { OnboardingStackParams, Screens, SettingStackParams } from '../types/navigators'
 import { useAppAgent } from '../utils/agent'
 import { testIdWithKey } from '../utils/testable'
 
-const PINChange: React.FC<StackScreenProps<ParamListBase, Screens.ChangePIN>> = () => {
+const PINChange: React.FC<StackScreenProps<SettingStackParams, Screens.ChangePIN>> = () => {
   const { agent } = useAppAgent()
   const { checkWalletPIN, rekeyWallet } = useAuth()
   const [PIN, setPIN] = useState('')

package/src/screens/PINEnter.tsx

@@ -19,7 +19,6 @@ import { useStore } from '../contexts/store'
 import { useTheme } from '../contexts/theme'
 import { useDeveloperMode } from '../hooks/developer-mode'
 import { useLockout } from '../hooks/lockout'
-import { useGotoPostAuthScreens } from '../hooks/onboarding'
 import usePreventScreenCapture from '../hooks/screen-capture'
 import { BifoldError } from '../types/error'
 import { testIdWithKey } from '../utils/testable'
@@ -61,7 +60,6 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated }) => {
     setDevModalVisible(true)
   }
   const { incrementDeveloperMenuCounter } = useDeveloperMode(onDevModeTriggered)
-  const gotoPostAuthScreens = useGotoPostAuthScreens()
   const isContinueDisabled = inlineMessages.enabled ? !continueEnabled : !continueEnabled || PIN.length < minPINLength
   usePreventScreenCapture(preventScreenCapture)
 
@@ -89,9 +87,8 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated }) => {
         payload: [{ loginAttempts: 0 }],
       })
       setAuthenticated(true)
-      gotoPostAuthScreens()
     }
-  }, [getWalletSecret, dispatch, setAuthenticated, gotoPostAuthScreens])
+  }, [getWalletSecret, dispatch, setAuthenticated])
 
   useEffect(() => {
     const handle = InteractionManager.runAfterInteractions(async () => {
@@ -189,7 +186,6 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated }) => {
           payload: [{ displayNotification: false }],
         })
         setAuthenticated(true)
-        gotoPostAuthScreens()
       } catch (err: unknown) {
         const error = new BifoldError(
           t('Error.Title1041'),
@@ -207,7 +203,6 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated }) => {
       getLockoutPenalty,
       dispatch,
       setAuthenticated,
-      gotoPostAuthScreens,
       t,
       attemptLockout,
       inlineMessages,

package/src/screens/Terms.tsx

@@ -27,25 +27,14 @@ const Terms: React.FC = () => {
   const navigation = useNavigation<StackNavigationProp<OnboardingStackParams>>()
   const { OnboardingTheme, TextTheme } = useTheme()
   const [Button] = useServices([TOKENS.COMP_BUTTON])
+
   const onSubmitPressed = useCallback(() => {
     dispatch({
       type: DispatchAction.DID_AGREE_TO_TERMS,
       payload: [{ DidAgreeToTerms: TermsVersion }],
     })
+  }, [dispatch])
 
-    if (!(agreedToPreviousTerms && store.onboarding.didCreatePIN)) {
-      navigation.navigate(Screens.CreatePIN)
-    } else if (store.onboarding.postAuthScreens.length) {
-      const screens: string[] = store.onboarding.postAuthScreens
-      screens.shift()
-      dispatch({ type: DispatchAction.SET_POST_AUTH_SCREENS, payload: [screens] })
-      if (screens.length) {
-        navigation.navigate(screens[0] as never)
-      } else {
-        dispatch({ type: DispatchAction.DID_COMPLETE_ONBOARDING, payload: [true] })
-      }
-    }
-  }, [dispatch, agreedToPreviousTerms, navigation, store.onboarding.postAuthScreens, store.onboarding.didCreatePIN])
   const style = StyleSheet.create({
     container: {
       ...OnboardingTheme.container,
@@ -60,6 +49,7 @@ const Terms: React.FC = () => {
       marginBottom: 20,
     },
   })
+
   const onBackPressed = () => {
     //TODO:(jl) goBack() does not unwind the navigation stack but rather goes
     //back to the splash screen. Needs fixing before the following code will

package/src/services/logger.ts

@@ -35,34 +35,34 @@ export class BifoldLogger extends BaseLogger {
   }
 
   public test(message: string, data?: object | undefined): void {
-    this._log?.test(message, data)
+    this._log?.test({ message, data })
   }
 
   public trace(message: string, data?: object | undefined): void {
-    this._log?.trace(message, data)
+    this._log?.trace({ message, data })
   }
 
   public debug(message: string, data?: object | undefined): void {
-    this._log?.debug(message, data)
+    this._log?.debug({ message, data })
   }
 
   public info(message: string, data?: object | undefined): void {
-    this._log?.info(message, data)
+    this._log?.info({ message, data })
   }
 
   public warn(message: string, data?: object | undefined): void {
-    this._log?.warn(message, data)
+    this._log?.warn({ message, data })
   }
 
   public error(message: string, data?: object | undefined): void {
-    this._log?.error(message, data)
+    this._log?.error({ message, data })
   }
 
   public fatal(message: string, data?: object | undefined): void {
-    this._log?.fatal(message, data)
+    this._log?.fatal({ message, data })
   }
 
   public report(bifoldError: BifoldError): void {
-    this._log?.info('No remote logging configured, report not sent for error:', bifoldError)
+    this._log?.info({ message: 'No remote logging configured, report not sent for error:', data: bifoldError.message })
   }
 }

package/src/types/navigators.ts

@@ -86,6 +86,7 @@ export type RootStackParams = {
   [Stacks.TabStack]: NavigatorScreenParams<TabStackParams>
   [Screens.Chat]: { connectionId: string }
   [Stacks.ConnectStack]: NavigatorScreenParams<ConnectStackParams>
+  [Stacks.ConnectionStack]: NavigatorScreenParams<DeliveryStackParams>
   [Stacks.SettingStack]: NavigatorScreenParams<SettingStackParams>
   [Stacks.ContactStack]: NavigatorScreenParams<ContactStackParams>
   [Stacks.ProofRequestsStack]: NavigatorScreenParams<ProofRequestsStackParams>

package/src/types/state.ts

@@ -1,4 +1,4 @@
-import { BannerMessage } from 'components/views/Banner'
+import { BannerMessage } from '../components/views/Banner'
 
 export interface Onboarding {
   didSeePreface: boolean
@@ -10,7 +10,6 @@ export interface Onboarding {
   didNameWallet: boolean
   onboardingVersion: number
   didCompleteOnboarding: boolean
-  postAuthScreens: string[]
 }
 
 export interface Migration {

package/lib/commonjs/hooks/onboarding.js

@@ -1,23 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useGotoPostAuthScreens = void 0;
-var _react = require("react");
-var _core = require("@react-navigation/core");
-var _store = require("../contexts/store");
-const useGotoPostAuthScreens = () => {
-  const [store] = (0, _store.useStore)();
-  const navigation = (0, _core.useNavigation)();
-  return (0, _react.useCallback)(() => {
-    if (store.onboarding.postAuthScreens.length) {
-      const screen = store.onboarding.postAuthScreens[0];
-      if (screen) {
-        navigation.navigate(screen);
-      }
-    }
-  }, [store.onboarding.postAuthScreens, navigation]);
-};
-exports.useGotoPostAuthScreens = useGotoPostAuthScreens;
-//# sourceMappingURL=onboarding.js.map

package/lib/commonjs/hooks/onboarding.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_react","require","_core","_store","useGotoPostAuthScreens","store","useStore","navigation","useNavigation","useCallback","onboarding","postAuthScreens","length","screen","navigate","exports"],"sourceRoot":"../../../src","sources":["hooks/onboarding.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AAEO,MAAMG,sBAAsB,GAAGA,CAAA,KAAM;EAC1C,MAAM,CAACC,KAAK,CAAC,GAAG,IAAAC,eAAQ,EAAC,CAAC;EAC1B,MAAMC,UAAU,GAAG,IAAAC,mBAAa,EAAC,CAAC;EAClC,OAAO,IAAAC,kBAAW,EAAC,MAAM;IACvB,IAAIJ,KAAK,CAACK,UAAU,CAACC,eAAe,CAACC,MAAM,EAAE;MAC3C,MAAMC,MAAM,GAAGR,KAAK,CAACK,UAAU,CAACC,eAAe,CAAC,CAAC,CAAC;MAClD,IAAIE,MAAM,EAAE;QACVN,UAAU,CAACO,QAAQ,CAACD,MAAe,CAAC;MACtC;IACF;EACF,CAAC,EAAE,CAACR,KAAK,CAACK,UAAU,CAACC,eAAe,EAAEJ,UAAU,CAAC,CAAC;AACpD,CAAC;AAAAQ,OAAA,CAAAX,sBAAA,GAAAA,sBAAA","ignoreList":[]}

package/lib/module/hooks/onboarding.js

@@ -1,16 +0,0 @@
-import { useCallback } from 'react';
-import { useNavigation } from '@react-navigation/core';
-import { useStore } from '../contexts/store';
-export const useGotoPostAuthScreens = () => {
-  const [store] = useStore();
-  const navigation = useNavigation();
-  return useCallback(() => {
-    if (store.onboarding.postAuthScreens.length) {
-      const screen = store.onboarding.postAuthScreens[0];
-      if (screen) {
-        navigation.navigate(screen);
-      }
-    }
-  }, [store.onboarding.postAuthScreens, navigation]);
-};
-//# sourceMappingURL=onboarding.js.map

package/lib/module/hooks/onboarding.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["useCallback","useNavigation","useStore","useGotoPostAuthScreens","store","navigation","onboarding","postAuthScreens","length","screen","navigate"],"sourceRoot":"../../../src","sources":["hooks/onboarding.ts"],"mappings":"AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,aAAa,QAAQ,wBAAwB;AACtD,SAASC,QAAQ,QAAQ,mBAAmB;AAE5C,OAAO,MAAMC,sBAAsB,GAAGA,CAAA,KAAM;EAC1C,MAAM,CAACC,KAAK,CAAC,GAAGF,QAAQ,CAAC,CAAC;EAC1B,MAAMG,UAAU,GAAGJ,aAAa,CAAC,CAAC;EAClC,OAAOD,WAAW,CAAC,MAAM;IACvB,IAAII,KAAK,CAACE,UAAU,CAACC,eAAe,CAACC,MAAM,EAAE;MAC3C,MAAMC,MAAM,GAAGL,KAAK,CAACE,UAAU,CAACC,eAAe,CAAC,CAAC,CAAC;MAClD,IAAIE,MAAM,EAAE;QACVJ,UAAU,CAACK,QAAQ,CAACD,MAAe,CAAC;MACtC;IACF;EACF,CAAC,EAAE,CAACL,KAAK,CAACE,UAAU,CAACC,eAAe,EAAEF,UAAU,CAAC,CAAC;AACpD,CAAC","ignoreList":[]}

package/lib/typescript/src/hooks/onboarding.d.ts

@@ -1,2 +0,0 @@
-export declare const useGotoPostAuthScreens: () => () => void;
-//# sourceMappingURL=onboarding.d.ts.map

package/lib/typescript/src/hooks/onboarding.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"onboarding.d.ts","sourceRoot":"","sources":["../../../../src/hooks/onboarding.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB,kBAWlC,CAAA"}

package/src/hooks/onboarding.ts

@@ -1,16 +0,0 @@
-import { useCallback } from 'react'
-import { useNavigation } from '@react-navigation/core'
-import { useStore } from '../contexts/store'
-
-export const useGotoPostAuthScreens = () => {
-  const [store] = useStore()
-  const navigation = useNavigation()
-  return useCallback(() => {
-    if (store.onboarding.postAuthScreens.length) {
-      const screen = store.onboarding.postAuthScreens[0]
-      if (screen) {
-        navigation.navigate(screen as never)
-      }
-    }
-  }, [store.onboarding.postAuthScreens, navigation])
-}