chore(deps): react-native-keychain upgrade + migrate to @interaxyz fork

__mocks__/react-native-keychain.ts → __mocks__/@interaxyz/react-native-keychain.ts

@@ -28,6 +28,14 @@ const keychainMock = {
     SECURE_HARDWARE: 'SECURE_HARDWARE',
     ANY: 'ANY',
   },
+  STORAGE_TYPE: {
+    FB: 'MOCK_FacebookConceal',
+    AES: 'MOCK_KeystoreAESCBC',
+    AES_CBC: 'MOCK_KeystoreAESCBC',
+    AES_GCM_NO_AUTH: 'MOCK_KeystoreAESGCM_NoAuth',
+    AES_GCM: 'MOCK_KeystoreAESGCM',
+    RSA: 'MOCK_KeystoreRSAECB',
+  },
   setGenericPassword: jest.fn(async (username, password, options) => {
     mockedItems.set(options.service, { username, password, options })
     return true

android/app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
+apply plugin: 'kotlin-android'
 
 import com.android.build.OutputFile
 import groovy.json.JsonSlurper

ios/Podfile.lock

@@ -783,7 +783,8 @@ PODS:
   - RNGestureHandler (2.21.2):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
-  - RNKeychain (8.2.0):
+  - RNKeychain (9.2.2):
+    - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - RNLocalize (3.3.0):
     - React-Core
@@ -947,7 +948,7 @@ DEPENDENCIES:
   - "RNFBRemoteConfig (from `../node_modules/@react-native-firebase/remote-config`)"
   - RNFS (from `../node_modules/react-native-fs`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
-  - RNKeychain (from `../node_modules/react-native-keychain`)
+  - "RNKeychain (from `../node_modules/@interaxyz/react-native-keychain`)"
   - RNLocalize (from `../node_modules/react-native-localize`)
   - RNPermissions (from `../node_modules/react-native-permissions`)
   - RNPersonaInquiry2 (from `../node_modules/react-native-persona`)
@@ -1170,7 +1171,7 @@ EXTERNAL SOURCES:
   RNGestureHandler:
     :path: "../node_modules/react-native-gesture-handler"
   RNKeychain:
-    :path: "../node_modules/react-native-keychain"
+    :path: "../node_modules/@interaxyz/react-native-keychain"
   RNLocalize:
     :path: "../node_modules/react-native-localize"
   RNPermissions:
@@ -1317,7 +1318,7 @@ SPEC CHECKSUMS:
   RNFBRemoteConfig: 1c92f072b1772b91663247b07a711cd4e9e191e8
   RNFS: 89de7d7f4c0f6bafa05343c578f61118c8282ed8
   RNGestureHandler: b81313e62e717cc165ea3b99436aa305d04c57b4
-  RNKeychain: bbe2f6d5cc008920324acb49ef86ccc03d3b38e4
+  RNKeychain: 91dc223bc77e3bb8576a3c75cdd28863bc2cb26e
   RNLocalize: d024afa9204c13885e61dc88b8190651bcaabac9
   RNPermissions: 1d002266e43df33d7080d5355a64b7d12bdb5e75
   RNPersonaInquiry2: 4202f797d7a172af2908f271954123858abe47bf

package.json

@@ -77,6 +77,7 @@
     "@fiatconnect/fiatconnect-types": "^13.3.10",
     "@gorhom/bottom-sheet": "^5.0.6",
     "@interaxyz/react-navigation-bottom-sheet": "^0.3.2",
+    "@interaxyz/react-native-keychain": "^9.2.2",
     "@interaxyz/react-native-webview": "^13.13.4",
     "@json-rpc-tools/utils": "^1.7.6",
     "@noble/secp256k1": "^1.7.1",
@@ -149,7 +150,6 @@
     "react-native-gesture-handler": "^2.21.2",
     "react-native-haptic-feedback": "^2.3.3",
     "react-native-in-app-review": "^4.3.3",
-    "react-native-keychain": "^8.2.0",
     "react-native-launch-arguments": "^4.0.2",
     "react-native-linear-gradient": "^2.8.3",
     "react-native-localize": "^3.3.0",

src/account/ProfileSubmenu.test.tsx

@@ -1,26 +1,26 @@
+import * as Keychain from '@interaxyz/react-native-keychain'
+import { act, fireEvent, render, waitFor } from '@testing-library/react-native'
+import { FetchMock } from 'jest-fetch-mock/types'
 import * as React from 'react'
 import 'react-native'
 import { Provider } from 'react-redux'
 import ProfileSubmenu from 'src/account/ProfileSubmenu'
 import { Screens } from 'src/navigator/Screens'
+import Logger from 'src/utils/Logger'
+import networkConfig from 'src/web3/networkConfig'
 import MockedNavigator from 'test/MockedNavigator'
-import { FetchMock } from 'jest-fetch-mock/types'
 import { createMockStore, getMockStackScreenProps } from 'test/utils'
 import { mockE164Number } from 'test/values'
-import networkConfig from 'src/web3/networkConfig'
-import { act, fireEvent, render, waitFor } from '@testing-library/react-native'
-import * as Keychain from 'react-native-keychain'
 const mockFetch = fetch as FetchMock
 const mockedKeychain = jest.mocked(Keychain)
-import Logger from 'src/utils/Logger'
 
 jest.mock('src/utils/Logger')
 
 mockedKeychain.getGenericPassword.mockResolvedValue({
   username: 'some username',
   password: 'someSignedMessage',
   service: 'some service',
-  storage: 'some string',
+  storage: Keychain.STORAGE_TYPE.RSA,
 })
 
 describe('ProfileSubmenu', () => {

src/account/SecuritySubmenu.test.tsx

@@ -1,28 +1,28 @@
+import * as Keychain from '@interaxyz/react-native-keychain'
+import { BIOMETRY_TYPE } from '@interaxyz/react-native-keychain'
+import { act, fireEvent, render, waitFor } from '@testing-library/react-native'
+import { FetchMock } from 'jest-fetch-mock/types'
 import * as React from 'react'
 import 'react-native'
 import { Provider } from 'react-redux'
-import SecuritySubmenu from 'src/account/SecuritySubmenu'
-import { Screens } from 'src/navigator/Screens'
-import MockedNavigator from 'test/MockedNavigator'
-import { createMockStore } from 'test/utils'
-import { fireEvent, render, waitFor, act } from '@testing-library/react-native'
-import { ensurePincode, navigate } from 'src/navigator/NavigationService'
-import { FetchMock } from 'jest-fetch-mock/types'
-import * as Keychain from 'react-native-keychain'
-import { setAnalyticsEnabled } from 'src/app/actions'
-import { showError } from 'src/alert/actions'
-import { ErrorMessages } from 'src/app/ErrorMessages'
 import { setPincodeSuccess } from 'src/account/actions'
-import { mockE164Number } from 'test/values'
-import { BIOMETRY_TYPE } from 'react-native-keychain'
 import { PincodeType } from 'src/account/reducer'
-import { removeStoredPin, setPincodeWithBiometry } from 'src/pincode/authentication'
+import SecuritySubmenu from 'src/account/SecuritySubmenu'
+import { showError } from 'src/alert/actions'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { SettingsEvents } from 'src/analytics/Events'
-import { getFeatureGate } from 'src/statsig/index'
+import { setAnalyticsEnabled } from 'src/app/actions'
+import { ErrorMessages } from 'src/app/ErrorMessages'
 import { deleteKeylessBackupStarted, hideDeleteKeylessBackupError } from 'src/keylessBackup/slice'
 import { KeylessBackupDeleteStatus } from 'src/keylessBackup/types'
+import { ensurePincode, navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
+import { removeStoredPin, setPincodeWithBiometry } from 'src/pincode/authentication'
+import { getFeatureGate } from 'src/statsig/index'
 import networkConfig from 'src/web3/networkConfig'
+import MockedNavigator from 'test/MockedNavigator'
+import { createMockStore } from 'test/utils'
+import { mockE164Number } from 'test/values'
 
 const mockedEnsurePincode = jest.mocked(ensurePincode)
 const mockFetch = fetch as FetchMock
@@ -31,7 +31,7 @@ mockedKeychain.getGenericPassword.mockResolvedValue({
   username: 'some username',
   password: 'someSignedMessage',
   service: 'some service',
-  storage: 'some string',
+  storage: Keychain.STORAGE_TYPE.RSA,
 })
 
 jest.mock('src/analytics/AppAnalytics')

src/account/saga.test.ts

@@ -1,5 +1,5 @@
+import * as Keychain from '@interaxyz/react-native-keychain'
 import { FetchMock } from 'jest-fetch-mock/types'
-import * as Keychain from 'react-native-keychain'
 import { expectSaga } from 'redux-saga-test-plan'
 import * as matchers from 'redux-saga-test-plan/matchers'
 import { throwError } from 'redux-saga-test-plan/providers'
@@ -103,7 +103,7 @@ describe('generateSignedMessage', () => {
       username: 'some username',
       password: 'someSignedMessage',
       service: 'some service',
-      storage: 'some string',
+      storage: Keychain.STORAGE_TYPE.RSA,
     })
 
     await expectSaga(generateSignedMessage)

src/app/actions.ts

@@ -1,4 +1,4 @@
-import { BIOMETRY_TYPE } from 'react-native-keychain'
+import { BIOMETRY_TYPE } from '@interaxyz/react-native-keychain'
 import { RemoteConfigValues } from 'src/app/saga'
 import { Screens } from 'src/navigator/Screens'
 

src/app/reducers.ts

@@ -1,5 +1,5 @@
+import { BIOMETRY_TYPE } from '@interaxyz/react-native-keychain'
 import { Platform } from 'react-native'
-import { BIOMETRY_TYPE } from 'react-native-keychain'
 import { Actions, ActionTypes, AppState } from 'src/app/actions'
 import { CeloNewsConfig } from 'src/celoNews/types'
 import { DEEP_LINK_URL_SCHEME } from 'src/config'

src/app/saga.test.ts

@@ -1,4 +1,4 @@
-import { BIOMETRY_TYPE } from 'react-native-keychain'
+import { BIOMETRY_TYPE } from '@interaxyz/react-native-keychain'
 import * as RNLocalize from 'react-native-localize'
 import { expectSaga } from 'redux-saga-test-plan'
 import * as matchers from 'redux-saga-test-plan/matchers'

src/app/saga.ts

@@ -1,8 +1,8 @@
+import * as Keychain from '@interaxyz/react-native-keychain'
 import locales from 'locales'
 import { AppState, Platform } from 'react-native'
 import DeviceInfo from 'react-native-device-info'
 import InAppReview from 'react-native-in-app-review'
-import * as Keychain from 'react-native-keychain'
 import { findBestLanguageTag } from 'react-native-localize'
 import { eventChannel } from 'redux-saga'
 import AppAnalytics from 'src/analytics/AppAnalytics'

src/backup/BackupPhrase.test.tsx

@@ -1,7 +1,7 @@
+import * as Keychain from '@interaxyz/react-native-keychain'
 import { fireEvent, render } from '@testing-library/react-native'
 import * as React from 'react'
 import 'react-native'
-import * as Keychain from 'react-native-keychain'
 import { Provider } from 'react-redux'
 import BackupPhrase from 'src/backup/BackupPhrase'
 import { navigate } from 'src/navigator/NavigationService'

src/onboarding/registration/EnableBiometry.test.tsx

@@ -1,11 +1,11 @@
+import { BIOMETRY_TYPE } from '@interaxyz/react-native-keychain'
 import { act, fireEvent, render } from '@testing-library/react-native'
 import * as React from 'react'
-import { BIOMETRY_TYPE } from 'react-native-keychain'
 import { Provider } from 'react-redux'
 import { setPincodeSuccess } from 'src/account/actions'
 import { PincodeType } from 'src/account/reducer'
-import { OnboardingEvents } from 'src/analytics/Events'
 import AppAnalytics from 'src/analytics/AppAnalytics'
+import { OnboardingEvents } from 'src/analytics/Events'
 import { Screens } from 'src/navigator/Screens'
 import EnableBiometry from 'src/onboarding/registration/EnableBiometry'
 import { goToNextOnboardingScreen } from 'src/onboarding/steps'

src/onboarding/registration/EnableBiometry.tsx

@@ -1,9 +1,9 @@
+import * as Keychain from '@interaxyz/react-native-keychain'
 import { useHeaderHeight } from '@react-navigation/elements'
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React, { useEffect, useLayoutEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Image, ScrollView, StyleSheet, Text, View } from 'react-native'
-import * as Keychain from 'react-native-keychain'
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'
 import { setPincodeSuccess } from 'src/account/actions'
 import { PincodeType } from 'src/account/reducer'

src/onboarding/steps.test.ts

@@ -1,4 +1,4 @@
-import { BIOMETRY_TYPE } from 'react-native-keychain'
+import { BIOMETRY_TYPE } from '@interaxyz/react-native-keychain'
 import { initializeAccount } from 'src/account/actions'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { navigate, navigateClearingStack, popToScreen } from 'src/navigator/NavigationService'

src/onboarding/steps.ts

@@ -1,4 +1,4 @@
-import { BIOMETRY_TYPE } from 'react-native-keychain'
+import { BIOMETRY_TYPE } from '@interaxyz/react-native-keychain'
 import { createSelector } from 'reselect'
 import { initializeAccount } from 'src/account/actions'
 import {

src/pincode/PincodeLock.test.tsx

@@ -1,6 +1,6 @@
+import { BIOMETRY_TYPE } from '@interaxyz/react-native-keychain'
 import { act, fireEvent, render, waitFor } from '@testing-library/react-native'
 import * as React from 'react'
-import { BIOMETRY_TYPE } from 'react-native-keychain'
 import { Provider } from 'react-redux'
 import { PincodeType } from 'src/account/reducer'
 import { appUnlock } from 'src/app/actions'

src/pincode/PincodeSet.tsx

@@ -1,11 +1,11 @@
 /**
  * This is a reactnavigation SCREEN, which we use to set a PIN.
  */
+import { BIOMETRY_TYPE } from '@interaxyz/react-native-keychain'
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import * as React from 'react'
 import { WithTranslation } from 'react-i18next'
 import { StyleSheet } from 'react-native'
-import { BIOMETRY_TYPE } from 'react-native-keychain'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { connect } from 'react-redux'
 import { initializeAccount, setPincodeSuccess } from 'src/account/actions'