chore: fix nav import and tests (#1200)

Signed-off-by: Jason C. Leach <[email protected]>

packages/legacy/core/App/components/buttons/HeaderHome.tsx

@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 

packages/legacy/core/App/components/buttons/InfoIcon.tsx

@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/components/buttons/SettingsMenu.tsx

@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/components/listItems/NotificationListItem.tsx

@@ -9,7 +9,7 @@ import {
 } from '@credo-ts/core'
 import { useAgent, useConnectionById } from '@credo-ts/react-hooks'
 import { markProofAsViewed } from '@hyperledger/aries-bifold-verifier'
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/components/misc/ConnectionAlert.tsx

@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/components/misc/CredentialCard11.tsx

@@ -1,7 +1,7 @@
 import { CredentialExchangeRecord } from '@credo-ts/core'
 import { BrandingOverlay } from '@hyperledger/aries-oca'
 import { Attribute, CredentialOverlay, Predicate } from '@hyperledger/aries-oca/build/legacy'
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import startCase from 'lodash.startcase'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/components/misc/QRScanner.tsx

@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { View, Modal, Pressable, StyleSheet, Text } from 'react-native'

packages/legacy/core/App/components/modals/CameraDisclosureModal.tsx

@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/components/modals/NotificationModal.tsx

@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/hooks/chat-messages.tsx

@@ -8,7 +8,7 @@ import {
 } from '@credo-ts/core'
 import { useBasicMessagesByConnectionId } from '@credo-ts/react-hooks'
 import { isPresentationReceived } from '@hyperledger/aries-bifold-verifier'
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { Fragment, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -90,9 +90,9 @@ export const useChatMessagesByConnection = (connection: ConnectionRecord): Exten
     const transformedMessages: Array<ExtendedChatMessage> = basicMessages.map((record: BasicMessageRecord) => {
       const role = getMessageEventRole(record)
       // eslint-disable-next-line
-      const linkRegex = /(?:https?\:\/\/\w+(?:\.\w+)+\S*)|(?:[\w\d\.\_\-]+@\w+(?:\.\w+)+)/gmi
+      const linkRegex = /(?:https?\:\/\/\w+(?:\.\w+)+\S*)|(?:[\w\d\.\_\-]+@\w+(?:\.\w+)+)/gim
       // eslint-disable-next-line
-      const mailRegex = /^[\w\d\.\_\-]+@\w+(?:\.\w+)+$/gmi
+      const mailRegex = /^[\w\d\.\_\-]+@\w+(?:\.\w+)+$/gim
       const links = record.content.match(linkRegex) ?? []
       const handleLinkPress = (link: string) => {
         if (link.match(mailRegex)) {

packages/legacy/core/App/navigators/OnboardingStack.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { ParamListBase, RouteConfig, StackNavigationState, useNavigation } from '@react-navigation/core'
+import { ParamListBase, RouteConfig, StackNavigationState, useNavigation } from '@react-navigation/native'
 import { StackNavigationOptions, StackNavigationProp, createStackNavigator } from '@react-navigation/stack'
 import { StackNavigationEventMap } from '@react-navigation/stack/lib/typescript/src/types'
 import React from 'react'

packages/legacy/core/App/navigators/RootStack.tsx

@@ -1,7 +1,7 @@
 import { ProofState } from '@credo-ts/core'
 import { useAgent, useProofByState } from '@credo-ts/react-hooks'
 import { ProofCustomMetadata, ProofMetadata } from '@hyperledger/aries-bifold-verifier'
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackCardStyleInterpolator, StackNavigationProp, createStackNavigator } from '@react-navigation/stack'
 import React, { useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/AttemptLockout.tsx

@@ -1,5 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
-import { CommonActions } from '@react-navigation/native'
+import { useNavigation, CommonActions } from '@react-navigation/native'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'

packages/legacy/core/App/screens/Chat.tsx

@@ -1,6 +1,6 @@
 import { BasicMessageRepository, ConnectionRecord } from '@credo-ts/core'
 import { useAgent, useBasicMessagesByConnectionId, useConnectionById } from '@credo-ts/react-hooks'
-import { useIsFocused, useNavigation } from '@react-navigation/core'
+import { useIsFocused, useNavigation } from '@react-navigation/native'
 import { StackNavigationProp, StackScreenProps } from '@react-navigation/stack'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/ContactDetails.tsx

@@ -1,6 +1,6 @@
 import { CredentialState } from '@credo-ts/core'
 import { useAgent, useConnectionById, useCredentialByState } from '@credo-ts/react-hooks'
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp, StackScreenProps } from '@react-navigation/stack'
 import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/CredentialOffer.tsx

@@ -3,7 +3,7 @@ import { CredentialPreviewAttribute } from '@credo-ts/core'
 import { useCredentialById } from '@credo-ts/react-hooks'
 import { BrandingOverlay } from '@hyperledger/aries-oca'
 import { Attribute, CredentialOverlay } from '@hyperledger/aries-oca/build/legacy'
-import { useIsFocused } from '@react-navigation/core'
+import { useIsFocused } from '@react-navigation/native'
 import { StackScreenProps } from '@react-navigation/stack'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/CredentialOfferAccept.tsx

@@ -1,6 +1,6 @@
 import { CredentialState } from '@credo-ts/core'
 import { useCredentialById } from '@credo-ts/react-hooks'
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { AccessibilityInfo, Modal, ScrollView, StyleSheet, Text, View } from 'react-native'

packages/legacy/core/App/screens/ListCredentials.tsx

@@ -1,8 +1,7 @@
 import { AnonCredsCredentialMetadataKey } from '@credo-ts/anoncreds'
 import { CredentialState } from '@credo-ts/core'
 import { useCredentialByState } from '@credo-ts/react-hooks'
-import { useNavigation } from '@react-navigation/core'
-import { useIsFocused } from '@react-navigation/native'
+import { useNavigation, useIsFocused } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/NameWallet.tsx

@@ -1,5 +1,5 @@
 import { useAgent } from '@credo-ts/react-hooks'
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'

packages/legacy/core/App/screens/Onboarding.tsx

@@ -1,5 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
-import { useFocusEffect } from '@react-navigation/native'
+import { useNavigation, useFocusEffect } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { Ref, useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/PINCreate.tsx

@@ -1,5 +1,4 @@
-import { ParamListBase, useNavigation } from '@react-navigation/core'
-import { CommonActions } from '@react-navigation/native'
+import { CommonActions, ParamListBase, useNavigation } from '@react-navigation/native'
 import { StackNavigationProp, StackScreenProps } from '@react-navigation/stack'
 import React, { useState, useRef, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/PINEnter.tsx

@@ -1,5 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
-import { CommonActions } from '@react-navigation/native'
+import { useNavigation, CommonActions } from '@react-navigation/native'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard, StyleSheet, Text, Image, View, DeviceEventEmitter } from 'react-native'

packages/legacy/core/App/screens/Preface.tsx

@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/ProofRequest.tsx

@@ -8,7 +8,7 @@ import {
 import { CredentialExchangeRecord, DifPexInputDescriptorToCredentials, ProofState } from '@credo-ts/core'
 import { useConnectionById, useProofById } from '@credo-ts/react-hooks'
 import { Attribute, Predicate } from '@hyperledger/aries-oca/build/legacy'
-import { useIsFocused } from '@react-navigation/core'
+import { useIsFocused } from '@react-navigation/native'
 import moment from 'moment'
 import React, { useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/ProofRequestAccept.tsx

@@ -1,6 +1,6 @@
 import { ProofState } from '@credo-ts/core'
 import { useProofById } from '@credo-ts/react-hooks'
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Modal, ScrollView, StyleSheet, Text, View } from 'react-native'

packages/legacy/core/App/screens/ProofRequesting.tsx

@@ -10,8 +10,7 @@ import {
   linkProofWithTemplate,
   sendProofRequest,
 } from '@hyperledger/aries-bifold-verifier'
-import { useIsFocused } from '@react-navigation/core'
-import { useFocusEffect } from '@react-navigation/native'
+import { useIsFocused, useFocusEffect } from '@react-navigation/native'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import {

packages/legacy/core/App/screens/PushNotification.tsx

@@ -1,5 +1,5 @@
 import { useAgent } from '@credo-ts/react-hooks'
-import { CommonActions, ParamListBase, useNavigation } from '@react-navigation/core'
+import { CommonActions, ParamListBase, useNavigation } from '@react-navigation/native'
 import { StackNavigationProp, StackScreenProps } from '@react-navigation/stack'
 import React, { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/RenameContact.tsx

@@ -1,5 +1,5 @@
 import { useConnectionById } from '@credo-ts/react-hooks'
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackScreenProps } from '@react-navigation/stack'
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/Splash.tsx

@@ -4,8 +4,7 @@ import { useAgent } from '@credo-ts/react-hooks'
 import { agentDependencies } from '@credo-ts/react-native'
 import { RemoteOCABundleResolver } from '@hyperledger/aries-oca/build/legacy'
 import { GetCredentialDefinitionRequest, GetSchemaRequest } from '@hyperledger/indy-vdr-shared'
-import { useNavigation } from '@react-navigation/core'
-import { CommonActions } from '@react-navigation/native'
+import { useNavigation, CommonActions } from '@react-navigation/native'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { DeviceEventEmitter, StyleSheet } from 'react-native'

packages/legacy/core/App/screens/Terms.tsx

@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/screens/UseBiometry.tsx

@@ -1,4 +1,4 @@
-import { CommonActions, useNavigation } from '@react-navigation/core'
+import { CommonActions, useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { useState, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'

packages/legacy/core/App/types/navigators.ts

@@ -1,5 +1,5 @@
 import { CredentialExchangeRecord } from '@credo-ts/core'
-import { NavigatorScreenParams } from '@react-navigation/core'
+import { NavigatorScreenParams } from '@react-navigation/native'
 import { StackNavigationOptions } from '@react-navigation/stack'
 
 export enum Screens {

packages/legacy/core/__mocks__/@react-navigation/native.ts

@@ -0,0 +1,45 @@
+// import { useFocusEffect } from '@react-navigation/native'
+
+const navigate = jest.fn()
+const dispatch = jest.fn()
+const replace = jest.fn()
+const navigation = {
+  __timestamp: process.hrtime(),
+  navigate,
+  replace,
+  setOptions: jest.fn(),
+  getParent: () => {
+    return {
+      navigate,
+      dispatch,
+      replace,
+    }
+  },
+  getState: jest.fn(() => ({
+    index: jest.fn(),
+  })),
+  goBack: jest.fn(),
+  pop: jest.fn(),
+  reset: jest.fn(),
+  isFocused: () => true,
+  dispatch,
+}
+
+const useNavigation = () => {
+  return navigation
+}
+
+const useIsFocused = () => {
+  return true
+}
+
+const CommonActions = {
+  navigate: jest.fn(),
+  reset: jest.fn(),
+  goBack: jest.fn(),
+}
+
+const useFocusEffect = jest.fn()
+const createNavigatorFactory = jest.fn()
+
+export { useNavigation, useIsFocused, useFocusEffect, createNavigatorFactory, CommonActions }

packages/legacy/core/__tests__/components/CameraDisclosureModal.test.tsx

@@ -1,16 +1,10 @@
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import { render, fireEvent, act } from '@testing-library/react-native'
 import React from 'react'
 import CameraDisclosureModal from '../../App/components/modals/CameraDisclosureModal'
 import { testIdWithKey } from '../../App/utils/testable'
 
 let requestCameraUse = jest.fn(() => Promise.resolve(true))
-jest.mock('@react-navigation/core', () => {
-  return require('../../__mocks__/custom/@react-navigation/core')
-})
-jest.mock('@react-navigation/native', () => {
-  return require('../../__mocks__/custom/@react-navigation/native')
-})
 
 describe('CameraDisclosureModal Component', () => {
   beforeAll(() => {

packages/legacy/core/__tests__/components/CredentialCard11.test.tsx

@@ -16,13 +16,6 @@ jest.mock('../../App/container-api')
 jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter')
 jest.mock('@react-native-community/netinfo', () => mockRNCNetInfo)
 jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper')
-jest.mock('@react-navigation/core', () => {
-  return require('../../__mocks__/custom/@react-navigation/core')
-})
-jest.mock('@react-navigation/native', () => {
-  return require('../../__mocks__/custom/@react-navigation/native')
-})
-
 jest.mock('@hyperledger/anoncreds-react-native', () => ({}))
 jest.mock('@hyperledger/aries-askar-react-native', () => ({}))
 jest.mock('@hyperledger/indy-vdr-react-native', () => ({}))

packages/legacy/core/__tests__/components/HeaderRightHome.test.tsx

@@ -3,13 +3,6 @@ import React from 'react'
 
 import HeaderRightHome from '../../App/components/buttons/HeaderHome'
 
-jest.mock('@react-navigation/core', () => {
-  return require('../../__mocks__/custom/@react-navigation/core')
-})
-jest.mock('@react-navigation/native', () => {
-  return require('../../__mocks__/custom/@react-navigation/native')
-})
-
 describe('Header Right Home Component', () => {
   test('Renders correctly', () => {
     const tree = render(<HeaderRightHome />)

packages/legacy/core/__tests__/components/NewQRView.test.tsx

@@ -6,15 +6,9 @@ import NewQRView from '../../App/components/misc/NewQRView'
 import { ConfigurationContext } from '../../App/contexts/configuration'
 import { StoreProvider, defaultState } from '../../App/contexts/store'
 import { testIdWithKey } from '../../App/utils/testable'
-import { useNavigation } from '../../__mocks__/custom/@react-navigation/core'
+import { useNavigation } from '@react-navigation/native'
 import configurationContext from '../contexts/configuration'
 
-jest.mock('@react-navigation/core', () => {
-  return require('../../__mocks__/custom/@react-navigation/core')
-})
-jest.mock('@react-navigation/native', () => {
-  return require('../../__mocks__/custom/@react-navigation/native')
-})
 jest.mock('react-native-orientation-locker', () => {
   return require('../../__mocks__/custom/react-native-orientation-locker')
 })

packages/legacy/core/__tests__/screens/Chat.test.tsx

@@ -16,13 +16,6 @@ import { BasicMessageMetadata } from '../../App/types/metadata'
 import configurationContext from '../contexts/configuration'
 import navigationContext from '../contexts/navigation'
 
-jest.mock('@react-navigation/core', () => {
-  return require('../../__mocks__/custom/@react-navigation/core')
-})
-jest.mock('@react-navigation/native', () => {
-  return require('../../__mocks__/custom/@react-navigation/native')
-})
-
 const props = { params: { connectionId: '1' } }
 
 const connection = new ConnectionRecord({