From ece0e829a4d2c764d60c6882547b1ca03e15cabf Mon Sep 17 00:00:00 2001 From: Filipe Santos <48060475+fc-santos@users.noreply.github.com> Date: Wed, 8 Jan 2025 12:15:52 -0500 Subject: [PATCH] =?UTF-8?q?chore:=20mise=20=C3=A0=20jour=20du=20bifold=20v?= =?UTF-8?q?ers=20la=20version=20408=20(#188)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fc-santos --- ...core-npm-1.0.0-alpha.408-536a3ba353.patch} | 40 +++++++---- app/ios/Podfile.lock | 6 +- app/package.json | 10 +-- app/src/navigators/RootStack.tsx | 13 ++-- yarn.lock | 66 +++++++++++-------- 5 files changed, 77 insertions(+), 58 deletions(-) rename .yarn/patches/{@hyperledger-aries-bifold-core-npm-1.0.0-alpha.390-ed7c059614.patch => @hyperledger-aries-bifold-core-npm-1.0.0-alpha.408-536a3ba353.patch} (75%) diff --git a/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.390-ed7c059614.patch b/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.408-536a3ba353.patch similarity index 75% rename from .yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.390-ed7c059614.patch rename to .yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.408-536a3ba353.patch index 789b27c5e..921c0e9d1 100644 --- a/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.390-ed7c059614.patch +++ b/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.408-536a3ba353.patch @@ -21,7 +21,7 @@ index 1c8a86091e207b58a620be00db905b4ba7d06539..b3b630f911d116a0f6ce441c0aae3abe const navigation = useNavigation>() const [store, dispatch] = useStore() diff --git a/App/screens/Home.tsx b/App/screens/Home.tsx -index ad946ed3ee1af79bbdc90fa70e30eefd6782128c..c6e493347c07bf806ba0615ae4d8be519b401129 100644 +index ad946ed3ee1af79bbdc90fa70e30eefd6782128c..9ca4b9918f313a23cb3bb2682decd50cc44170a7 100644 --- a/App/screens/Home.tsx +++ b/App/screens/Home.tsx @@ -40,6 +40,8 @@ const Home: React.FC = () => { @@ -59,25 +59,28 @@ index ad946ed3ee1af79bbdc90fa70e30eefd6782128c..c6e493347c07bf806ba0615ae4d8be51 + notification={item} /> + ) } else if (item.type === 'CustomNotification' && customNotification) { ++ component = ( ++ ++ ) ++ } else { component = ( ) - } else { +- } else { - component = -+ component = ( -+ -+ ) } return component - }, [customNotification, NotificationListItem]) @@ -85,3 +88,16 @@ index ad946ed3ee1af79bbdc90fa70e30eefd6782128c..c6e493347c07bf806ba0615ae4d8be51 useEffect(() => { const shouldShowTour = enableToursConfig && store.tours.enableTours && !store.tours.seenHomeTour +diff --git a/App/types/proof-items.ts b/App/types/proof-items.ts +index fc4db0531ba9274f65b5ff1563c7c7f18c20a840..cfc9d66233935fa186772fc729f01244f0f64abe 100644 +--- a/App/types/proof-items.ts ++++ b/App/types/proof-items.ts +@@ -1,7 +1,7 @@ + import { AnonCredsCredentialsForProofRequest } from '@credo-ts/anoncreds' + import { CredentialExchangeRecord } from '@credo-ts/core' + import { Attribute, Predicate } from '@hyperledger/aries-oca/build/legacy' +-import { DescriptorMetadata } from 'utils/anonCredsProofRequestMapper' ++import { DescriptorMetadata } from '../utils/anonCredsProofRequestMapper' + + export type CredentialDataForProof = { + groupedProof: (ProofCredentialPredicates & ProofCredentialAttributes)[], diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock index 2ff254402..d60967174 100644 --- a/app/ios/Podfile.lock +++ b/app/ios/Podfile.lock @@ -330,7 +330,7 @@ PODS: - React-jsinspector (0.72.5) - React-logger (0.72.5): - glog - - "react-native-attestation (1.0.0-alpha.390+e4bb384b)": + - "react-native-attestation (1.0.0-alpha.408+f72c911c)": - RCT-Folly (= 2021.07.22.00) - React-Core - react-native-config (1.5.0): @@ -784,7 +784,7 @@ SPEC CHECKSUMS: React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4 - react-native-attestation: 9d8aa426e42094570aaa8c1d98bdc3d975a8a5c0 + react-native-attestation: 0d10781cce3c5124f2128059e0b3e5c0707d7c7d react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727 react-native-encrypted-storage: db300a3f2f0aba1e818417c1c0a6be549038deb7 react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a @@ -832,4 +832,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: ceed3b0bd7ccc2be2dc6aeb4c03e653fd0e18591 -COCOAPODS: 1.13.0 +COCOAPODS: 1.16.2 diff --git a/app/package.json b/app/package.json index a1c37e9c1..5bd8737b4 100644 --- a/app/package.json +++ b/app/package.json @@ -62,11 +62,11 @@ "@formatjs/intl-relativetimeformat": "9.3.1", "@hyperledger/anoncreds-react-native": "0.2.4", "@hyperledger/aries-askar-react-native": "0.2.3", - "@hyperledger/aries-bifold-core": "patch:@hyperledger/aries-bifold-core@npm%3A1.0.0-alpha.390#~/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.390-ed7c059614.patch", - "@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.390", - "@hyperledger/aries-bifold-verifier": "1.0.0-alpha.390", - "@hyperledger/aries-oca": "1.0.0-alpha.390", - "@hyperledger/aries-react-native-attestation": "1.0.0-alpha.390", + "@hyperledger/aries-bifold-core": "patch:@hyperledger/aries-bifold-core@npm%3A1.0.0-alpha.408#~/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.408-536a3ba353.patch", + "@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.408", + "@hyperledger/aries-bifold-verifier": "1.0.0-alpha.408", + "@hyperledger/aries-oca": "1.0.0-alpha.408", + "@hyperledger/aries-react-native-attestation": "1.0.0-alpha.408", "@hyperledger/indy-vdr-react-native": "0.2.2", "@hyperledger/indy-vdr-shared": "0.2.2", "@react-native-async-storage/async-storage": "1.15.11", diff --git a/app/src/navigators/RootStack.tsx b/app/src/navigators/RootStack.tsx index 6e6a0fb8e..c128742e4 100644 --- a/app/src/navigators/RootStack.tsx +++ b/app/src/navigators/RootStack.tsx @@ -6,7 +6,6 @@ import { ConnectStack, ContactStack, DeliveryStack, - DispatchAction, EventTypes, IconButton, NotificationStack, @@ -67,14 +66,10 @@ const RootStack: React.FC = () => { const loadStateErrorDescription = t('Error.Message1044') useEffect(() => { - loadState(dispatch) - .then(() => { - dispatch({ type: DispatchAction.STATE_LOADED }) - }) - .catch((err: unknown) => { - const error = new BifoldError(loadStateErrorTitle, loadStateErrorDescription, (err as Error).message, 1001) - DeviceEventEmitter.emit(EventTypes.ERROR_ADDED, error) - }) + loadState(dispatch).catch((err: unknown) => { + const error = new BifoldError(loadStateErrorTitle, loadStateErrorDescription, (err as Error).message, 1001) + DeviceEventEmitter.emit(EventTypes.ERROR_ADDED, error) + }) }, [dispatch, loadState]) const mainStack = () => { diff --git a/yarn.lock b/yarn.lock index 7cb8ac5d9..8bbe32a16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3236,9 +3236,9 @@ __metadata: languageName: node linkType: hard -"@hyperledger/aries-bifold-core@npm:1.0.0-alpha.390": - version: 1.0.0-alpha.390 - resolution: "@hyperledger/aries-bifold-core@npm:1.0.0-alpha.390" +"@hyperledger/aries-bifold-core@npm:1.0.0-alpha.408, @hyperledger/aries-bifold-core@npm:^1.0.0-alpha.408+f72c911c": + version: 1.0.0-alpha.408 + resolution: "@hyperledger/aries-bifold-core@npm:1.0.0-alpha.408" peerDependencies: "@credo-ts/anoncreds": 0.5.11 "@credo-ts/askar": 0.5.11 @@ -3314,13 +3314,13 @@ __metadata: uuid: ^9.0.0 bin: bifold: bin/bifold - checksum: 61bad618c3df7b79e687d05265859622a377e3c22ee1118fe3612b83de124f08f67ed8ef3cea706d7c3329bee43d4d2a49d607b7fae5b97ce1012686512e0e8f + checksum: eaab46dfbd010aab9d656bb606fbafad0a4ebc23936ccfc09df95407357bbd640abd91c769cf5032da8cc1cc3a4416148651e966360e4f1f49aa3a1bdf85b382 languageName: node linkType: hard -"@hyperledger/aries-bifold-core@patch:@hyperledger/aries-bifold-core@npm%3A1.0.0-alpha.390#~/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.390-ed7c059614.patch": - version: 1.0.0-alpha.390 - resolution: "@hyperledger/aries-bifold-core@patch:@hyperledger/aries-bifold-core@npm%3A1.0.0-alpha.390#~/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.390-ed7c059614.patch::version=1.0.0-alpha.390&hash=7a84b1" +"@hyperledger/aries-bifold-core@patch:@hyperledger/aries-bifold-core@npm%3A1.0.0-alpha.408#~/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.408-536a3ba353.patch": + version: 1.0.0-alpha.408 + resolution: "@hyperledger/aries-bifold-core@patch:@hyperledger/aries-bifold-core@npm%3A1.0.0-alpha.408#~/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.408-536a3ba353.patch::version=1.0.0-alpha.408&hash=acb676" peerDependencies: "@credo-ts/anoncreds": 0.5.11 "@credo-ts/askar": 0.5.11 @@ -3396,13 +3396,21 @@ __metadata: uuid: ^9.0.0 bin: bifold: bin/bifold - checksum: d0fe46aa670178acd1eba14c419b9317f01a97c631175bc76e1e4c4a1970f452f15ebb15ddf69b50299a4d9238510259b1f782b84cfd1de491d744ae64f0dd24 + checksum: cc23886c69540ce3eca3aa87a9502dd25de2f72bc9160eec0a57668913a2344f0c36175925a1be3a16e5b15bc73d7f713b57b8f83969f5a4c7b4fd2f60ce1aee languageName: node linkType: hard -"@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.390": - version: 1.0.0-alpha.390 - resolution: "@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.390" +"@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.408": + version: 1.0.0-alpha.408 + resolution: "@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.408" + dependencies: + "@credo-ts/core": "npm:0.5.11" + "@hyperledger/aries-bifold-core": "npm:^1.0.0-alpha.408+f72c911c" + axios: "npm:^1.4.0" + buffer: "npm:^6.0.3" + react: "npm:18.2.0" + react-native: "npm:0.72.5" + react-native-logs: "npm:^5.1.0" peerDependencies: "@credo-ts/core": 0.5.11 axios: ^1.4.0 @@ -3410,43 +3418,43 @@ __metadata: react: ^18.2.0 react-native: ^0.72.5 react-native-logs: ^5.1.0 - checksum: bf0aee9cb0fd86121903f67a63e0de6b1581cfaacf7881c39b2dbd97aec35a4dbeec735acd1c0c8256f03c6b580315ebbad79963293a6d254bacb886736caefd + checksum: 6706511154ebe84def3589b421f88d73e445a8606e639ac728dce8ec491e7fb656cbe9524ecefbfb44b6cf60d2ef1447154a79e253cf7e6ca47285c4f7335e0d languageName: node linkType: hard -"@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.390": - version: 1.0.0-alpha.390 - resolution: "@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.390" +"@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.408": + version: 1.0.0-alpha.408 + resolution: "@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.408" peerDependencies: "@credo-ts/anoncreds": 0.5.11 "@credo-ts/core": 0.5.11 "@credo-ts/react-hooks": ^0.6.0 "@hyperledger/anoncreds-shared": 0.2.4 react: ^18.2.0 - checksum: 76d3c6904133e3c2ca13064a7aec48cf8d2f75b5dde4578829259f34309ec689d5c6f5b9be2c3f9a0a8d6e7034eaa883066b6771e9bd80f3971c5a09c05ece99 + checksum: 13feab2d687d7f563bf8b22b6c9cff9438643094a4e3e197ee17321b78693655557da6f32b5e69acabec44e83ed6aa4f37a8aa6ef7aeca7a4a979033ee108639 languageName: node linkType: hard -"@hyperledger/aries-oca@npm:1.0.0-alpha.390": - version: 1.0.0-alpha.390 - resolution: "@hyperledger/aries-oca@npm:1.0.0-alpha.390" +"@hyperledger/aries-oca@npm:1.0.0-alpha.408": + version: 1.0.0-alpha.408 + resolution: "@hyperledger/aries-oca@npm:1.0.0-alpha.408" dependencies: "@credo-ts/anoncreds": "npm:0.5.11" "@credo-ts/core": "npm:0.5.11" axios: "npm:^1.4.0" lodash.startcase: "npm:^4.4.0" react-native-fs: "npm:^2.16.6" - checksum: 4214f203f8c8dbb91b5cc9c8128196d96df6b46ba7e6de315ec5b93362d849bd641138384d3097293f75f904c41020ceb4725f07928d9596619723c1070f8d68 + checksum: c85e56b69cdaac9829643202605a9795d186f7fc7bfdd5f531b5976539e2246b65a371fc426cd1b393312f6b02be0a29b5aa7b73ec14581118281044f2b7fb0d languageName: node linkType: hard -"@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.390": - version: 1.0.0-alpha.390 - resolution: "@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.390" +"@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.408": + version: 1.0.0-alpha.408 + resolution: "@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.408" peerDependencies: react: "*" react-native: "*" - checksum: 10c94d799fe622eb0372f2ec21e6b10ee0e4d81b8acbd041130dd8ad2e225e7836504e65001ed2875ddc572de670a9494239ac432d0482ad5d6f405c76d2c8d6 + checksum: ec087462298db14bee1207a90b288e828d8374a51a2ac39f59b860c415a58359ef49a06e78dc831340c37dad3686ac2709432db1b97632c5ba80c553beec2dd0 languageName: node linkType: hard @@ -19804,11 +19812,11 @@ __metadata: "@formatjs/intl-relativetimeformat": "npm:9.3.1" "@hyperledger/anoncreds-react-native": "npm:0.2.4" "@hyperledger/aries-askar-react-native": "npm:0.2.3" - "@hyperledger/aries-bifold-core": "patch:@hyperledger/aries-bifold-core@npm%3A1.0.0-alpha.390#~/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.390-ed7c059614.patch" - "@hyperledger/aries-bifold-remote-logs": "npm:1.0.0-alpha.390" - "@hyperledger/aries-bifold-verifier": "npm:1.0.0-alpha.390" - "@hyperledger/aries-oca": "npm:1.0.0-alpha.390" - "@hyperledger/aries-react-native-attestation": "npm:1.0.0-alpha.390" + "@hyperledger/aries-bifold-core": "patch:@hyperledger/aries-bifold-core@npm%3A1.0.0-alpha.408#~/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.408-536a3ba353.patch" + "@hyperledger/aries-bifold-remote-logs": "npm:1.0.0-alpha.408" + "@hyperledger/aries-bifold-verifier": "npm:1.0.0-alpha.408" + "@hyperledger/aries-oca": "npm:1.0.0-alpha.408" + "@hyperledger/aries-react-native-attestation": "npm:1.0.0-alpha.408" "@hyperledger/indy-vdr-react-native": "npm:0.2.2" "@hyperledger/indy-vdr-shared": "npm:0.2.2" "@react-native-async-storage/async-storage": "npm:1.15.11"