Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openwallet-foundation/bifold-wallet
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 743c7dc1738cbf6ee7dbc4a0c6ed8547b3fd74b4
Choose a base ref
..
head repository: openwallet-foundation/bifold-wallet
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c28f2d9853c9e606e9e63d628dd6bfefca6027aa
Choose a head ref
Showing with 1,943 additions and 4,038 deletions.
  1. +1 −1 .github/workflows/main.yaml
  2. +34 −0 .yarn/patches/@credo-ts-core-npm-0.5.11-9122d8c9b8.patch
  3. +0 −58 .yarn/patches/@credo-ts-core-npm-0.5.13-725ab940d0.patch
  4. 0 ...{@credo-ts-indy-vdr-npm-0.5.13-007d41ad5c.patch → @credo-ts-indy-vdr-npm-0.5.11-ced84362c9.patch}
  5. +2 −2 package.json
  6. +0 −1 packages/legacy/app/index.js
  7. +26 −8 packages/legacy/app/ios/Podfile.lock
  8. +9 −10 packages/legacy/app/package.json
  9. +4 −14 packages/legacy/core/App/components/misc/CredentialCard.tsx
  10. +13 −6 packages/legacy/core/App/components/views/HomeFooterView.tsx
  11. +1 −0 packages/legacy/core/App/contexts/auth.tsx
  12. +1 −3 packages/legacy/core/App/hooks/notifications.ts
  13. +2 −2 packages/legacy/core/App/modules/openid/components/OpenIDCredentialCard.tsx
  14. +21 −106 packages/legacy/core/App/modules/openid/context/OpenIDCredentialRecordProvider.tsx
  15. +45 −218 packages/legacy/core/App/modules/openid/display.tsx
  16. +2 −4 packages/legacy/core/App/modules/openid/displayProof.tsx
  17. +6 −19 packages/legacy/core/App/modules/openid/hooks/openid.tsx
  18. +7 −7 packages/legacy/core/App/modules/openid/metadata.tsx
  19. +0 −281 packages/legacy/core/App/modules/openid/offerResolve.tsx
  20. +166 −0 packages/legacy/core/App/modules/openid/resolver.tsx
  21. +4 −11 packages/legacy/core/App/modules/openid/resolverProof.tsx
  22. +12 −29 packages/legacy/core/App/modules/openid/screens/OpenIDCredentialDetails.tsx
  23. +5 −5 packages/legacy/core/App/modules/openid/screens/OpenIDCredentialOffer.tsx
  24. +46 −108 packages/legacy/core/App/modules/openid/screens/OpenIDProofPresentation.tsx
  25. +2 −12 packages/legacy/core/App/modules/openid/types.tsx
  26. +0 −66 packages/legacy/core/App/modules/openid/utils/utils.tsx
  27. +0 −6 packages/legacy/core/App/navigators/defaultLayoutOptions.tsx
  28. +0 −6 packages/legacy/core/App/navigators/defaultStackOptions.tsx
  29. +1 −4 packages/legacy/core/App/screens/Connection.tsx
  30. +3 −13 packages/legacy/core/App/screens/ListCredentials.tsx
  31. +3 −3 packages/legacy/core/App/screens/ProofRequestAccept.tsx
  32. +1 −3 packages/legacy/core/App/services/logger.ts
  33. +2 −6 packages/legacy/core/App/types/credentials.ts
  34. +4 −4 packages/legacy/core/App/types/navigators.ts
  35. +8 −15 packages/legacy/core/App/utils/oca.ts
  36. +18 −18 packages/legacy/core/package.json
  37. +2 −2 packages/oca/package.json
  38. +2 −2 packages/remote-logs/package.json
  39. +1 −3 packages/remote-logs/src/logger.ts
  40. +2 −3 packages/remote-logs/src/transports.ts
  41. +4 −4 packages/verifier/package.json
  42. +1,483 −2,975 yarn.lock
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Native Build & Test

env:
cacheId: '9' # increment to expire the cache
cacheId: '8' # increment to expire the cache

on:
pull_request:
34 changes: 34 additions & 0 deletions .yarn/patches/@credo-ts-core-npm-0.5.11-9122d8c9b8.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/build/agent/Agent.js b/build/agent/Agent.js
index c80ba74c75de6418b7c874364d2c6a3552e322e9..1727fa4c08c80c95f9c154c3f678de2f1c2c362e 100644
--- a/build/agent/Agent.js
+++ b/build/agent/Agent.js
@@ -104,6 +104,7 @@ class Agent extends BaseAgent_1.BaseAgent {
}
async initialize() {
const stop$ = this.dependencyManager.resolve(constants_1.InjectionSymbols.Stop$);
+ stop$.next(false);
// Listen for new messages (either from transports or somewhere else in the framework / extensions)
// We create this before doing any other initialization, so the initialization could already receive messages
this.messageSubscription = this.eventEmitter
diff --git a/build/transport/WsOutboundTransport.js b/build/transport/WsOutboundTransport.js
index ab9df20f9fedc4def4f486b9431ac669e899e609..2e9e43a528fab6a01e52d54506891060adb917cc 100644
--- a/build/transport/WsOutboundTransport.js
+++ b/build/transport/WsOutboundTransport.js
@@ -43,7 +43,16 @@ class WsOutboundTransport {
this.transportTable.forEach((socket) => {
socket.removeEventListener('message', this.handleMessageEvent);
if (socket.readyState !== this.WebSocketClass.CLOSED) {
- stillOpenSocketClosingPromises.push(new Promise((resolve) => socket.once('close', resolve)));
+ stillOpenSocketClosingPromises.push(
+ new Promise((resolve) => {
+ const closeHandler = () => {
+ socket.removeEventListener('close', closeHandler)
+ resolve()
+ }
+
+ socket.addEventListener('close', closeHandler)
+ })
+ );
socket.close();
}
});
58 changes: 0 additions & 58 deletions .yarn/patches/@credo-ts-core-npm-0.5.13-725ab940d0.patch

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -61,8 +61,8 @@
"@react-navigation/native": "6.0.6",
"@react-navigation/stack": "6.0.11",
"@types/node": "16.9.6",
"@credo-ts/core@0.5.13": "patch:@credo-ts/core@npm%3A0.5.13#./.yarn/patches/@credo-ts-core-npm-0.5.13-725ab940d0.patch",
"@credo-ts/indy-vdr@0.5.13": "patch:@credo-ts/indy-vdr@npm%3A0.5.13#./.yarn/patches/@credo-ts-indy-vdr-npm-0.5.13-007d41ad5c.patch",
"@credo-ts/core": "patch:@credo-ts/core@npm%3A0.5.11#./.yarn/patches/@credo-ts-core-npm-0.5.11-9122d8c9b8.patch",
"@credo-ts/indy-vdr": "patch:@credo-ts/indy-vdr@npm%3A0.5.11#./.yarn/patches/@credo-ts-indy-vdr-npm-0.5.11-ced84362c9.patch",
"@credo-ts/react-hooks": "patch:@credo-ts/react-hooks@npm%3A0.6.0#./.yarn/patches/@credo-ts-react-hooks-npm-0.6.0-3c59ce13d2.patch",
"@sphereon/pex": "patch:@sphereon/pex@npm%3A3.3.3#./.yarn/patches/@sphereon-pex-npm-3.3.3-144d9252ec.patch",
"@hyperledger/indy-vdr-react-native@0.2.2": "patch:@hyperledger/indy-vdr-react-native@npm%3A0.2.2#./.yarn/patches/@hyperledger-indy-vdr-react-native-npm-0.2.2-627d424b96.patch",
1 change: 0 additions & 1 deletion packages/legacy/app/index.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@
/**
* @format
*/
import 'fast-text-encoding' // polyfill for TextEncoder and TextDecoder
import 'react-native-gesture-handler'
// remove these when updated to react-native 0.65.0
import '@formatjs/intl-getcanonicallocales/polyfill'
34 changes: 26 additions & 8 deletions packages/legacy/app/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -900,9 +900,9 @@ PODS:
- React-Mapbuffer (0.73.6):
- glog
- React-debug
- react-native-config (1.5.5):
- react-native-config/App (= 1.5.5)
- react-native-config/App (1.5.5):
- react-native-config (1.5.3):
- react-native-config/App (= 1.5.3)
- react-native-config/App (1.5.3):
- React-Core
- react-native-encrypted-storage (4.0.3):
- React-Core
@@ -919,7 +919,7 @@ PODS:
- react-native-tcp-socket (6.2.0):
- CocoaAsyncSocket
- React-Core
- react-native-webview (13.13.4):
- react-native-webview (13.13.2):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
@@ -1113,7 +1113,25 @@ PODS:
- React-Core
- RNPermissions (4.1.5):
- React-Core
- RNReanimated (3.14.0):
- RNReanimated (3.16.7):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
- ReactCommon/turbomodule/core
- RNReanimated/reanimated (= 3.16.7)
- RNReanimated/worklets (= 3.16.7)
- RNReanimated/reanimated (3.16.7):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
- ReactCommon/turbomodule/core
- RNReanimated/reanimated/apple (= 3.16.7)
- RNReanimated/reanimated/apple (3.16.7):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
- ReactCommon/turbomodule/core
- RNReanimated/worklets (3.16.7):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
@@ -1411,15 +1429,15 @@ SPEC CHECKSUMS:
React-jsinspector: 85583ef014ce53d731a98c66a0e24496f7a83066
React-logger: 55764cd993880c6f887505854581c9faf68feff2
React-Mapbuffer: 15dfcfeb4428d8799cce75e7fe85b18b706029e0
react-native-config: 644074ab88db883fcfaa584f03520ec29589d7df
react-native-config: ea75335a7cca1d3326de1da384227e580a7c082e
react-native-encrypted-storage: 569d114e329b1c2c2d9f8c84bcdbe4478dda2258
react-native-get-random-values: d16467cf726c618e9c7a8c3c39c31faa2244bbba
react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
react-native-orientation-locker: cc6f357b289a2e0dd2210fea0c52cb8e0727fdaa
react-native-safe-area-context: 667324e20fb3dd9c39c12d6036675ed90099bcd5
react-native-splash-screen: 95994222cc95c236bd3cdc59fe45ed5f27969594
react-native-tcp-socket: 61379457d7e702e83e28c213b6e085ac079e480f
react-native-webview: 065ace7829588381d19aeba794f9dd2e28e21349
react-native-webview: 8fd271a5b5c027fd640f00465aeac44bfa16d5a9
React-nativeconfig: b4d4e9901d4cabb57be63053fd2aa6086eb3c85f
React-NativeModulesApple: 541d64309a3037060cc416db5c8a63ee5884048e
React-perflogger: 5f49905de275bac07ac7ea7f575a70611fa988f2
@@ -1449,7 +1467,7 @@ SPEC CHECKSUMS:
RNKeychain: bbe2f6d5cc008920324acb49ef86ccc03d3b38e4
RNLocalize: 8bf466de4c92d4721b254aabe1ff0a1456e7b9f4
RNPermissions: 7fcfd9df7f70de24605ac7b8cc0e22852a1688ee
RNReanimated: 0726f9db0aabe7531e5f0b8df8e2be2c11795334
RNReanimated: 88dfb3d4b761e093b5a794a893785e15f96db949
RNScreens: e0f79783ce405f4362c29d098b19fe7e241f11a9
RNSVG: 36ab724902de0406127ef8d63d940c055e2a1442
RNVectorIcons: 76364622e6f8e55bb456705582cde20f55ef889c
19 changes: 9 additions & 10 deletions packages/legacy/app/package.json
Original file line number Diff line number Diff line change
@@ -20,16 +20,16 @@
"test": "echo 'nothing to do'"
},
"dependencies": {
"@credo-ts/anoncreds": "0.5.13",
"@credo-ts/askar": "0.5.13",
"@credo-ts/core": "0.5.13",
"@credo-ts/indy-sdk-to-askar-migration": "0.5.13",
"@credo-ts/indy-vdr": "0.5.13",
"@credo-ts/openid4vc": "0.5.13",
"@credo-ts/anoncreds": "0.5.11",
"@credo-ts/askar": "0.5.11",
"@credo-ts/core": "0.5.11",
"@credo-ts/indy-sdk-to-askar-migration": "0.5.11",
"@credo-ts/indy-vdr": "0.5.11",
"@credo-ts/openid4vc": "0.5.11",
"@credo-ts/push-notifications": "^0.7.0",
"@credo-ts/question-answer": "0.5.13",
"@credo-ts/question-answer": "0.5.11",
"@credo-ts/react-hooks": "^0.6.0",
"@credo-ts/react-native": "0.5.13",
"@credo-ts/react-native": "0.5.11",
"@formatjs/intl-datetimeformat": "4.2.4",
"@formatjs/intl-displaynames": "5.2.4",
"@formatjs/intl-getcanonicallocales": "1.7.3",
@@ -53,7 +53,6 @@
"@react-navigation/stack": "^6.3.21",
"axios": "^1.4.0",
"base-64": "^1.0.0",
"fast-text-encoding": "^1.0.6",
"i18next": "^21.4.0",
"lodash.flatten": "^4.4.0",
"lodash.startcase": "^4.4.0",
@@ -81,7 +80,7 @@
"react-native-orientation-locker": "^1.6.0",
"react-native-permissions": "^4.0.1",
"react-native-qrcode-svg": "6.2.0",
"react-native-reanimated": "3.14.0",
"react-native-reanimated": "^3.6.0",
"react-native-safe-area-context": "^3.2.0",
"react-native-scalable-image": "^1.1.0",
"react-native-screens": "4.4.0",
18 changes: 4 additions & 14 deletions packages/legacy/core/App/components/misc/CredentialCard.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CredentialExchangeRecord, MdocRecord, SdJwtVcRecord, W3cCredentialRecord } from '@credo-ts/core'
import { CredentialExchangeRecord, W3cCredentialRecord } from '@credo-ts/core'
import { Attribute, BrandingOverlayType, CredentialOverlay, Predicate } from '@hyperledger/aries-oca/build/legacy'
import React, { useEffect, useState } from 'react'
import { ViewStyle } from 'react-native'
@@ -57,16 +57,12 @@ const CredentialCard: React.FC<CredentialCardProps> = ({
return
}

const resolveOverlay = async (w3cCred: W3cCredentialRecord | SdJwtVcRecord | MdocRecord) => {
const resolveOverlay = async (w3cCred: W3cCredentialRecord) => {
const brandingOverlay = await resolveBundleForCredential(w3cCred)
setOverlay(brandingOverlay)
}

if (
credential instanceof W3cCredentialRecord ||
credential instanceof SdJwtVcRecord ||
credential instanceof MdocRecord
) {
if (credential instanceof W3cCredentialRecord) {
resolveOverlay(credential)
const credentialDisplay = getCredentialForDisplay(credential)
if (credentialDisplay.display.primary_overlay_attribute) {
@@ -131,11 +127,7 @@ const CredentialCard: React.FC<CredentialCardProps> = ({
}
}

if (
credential instanceof W3cCredentialRecord ||
credential instanceof SdJwtVcRecord ||
credential instanceof MdocRecord
) {
if (credential instanceof W3cCredentialRecord) {
return (
<CredentialCard11
credential={undefined}
@@ -147,8 +139,6 @@ const CredentialCard: React.FC<CredentialCardProps> = ({
elevated={proof}
displayItems={displayItems}
hideSlice={true}
hasAltCredentials={hasAltCredentials}
handleAltCredChange={handleAltCredChange}
extraOverlayParameter={extraOverlayAttribute}
brandingOverlayType={bundleResolver.getBrandingOverlayType()}
/>
19 changes: 13 additions & 6 deletions packages/legacy/core/App/components/views/HomeFooterView.tsx
Original file line number Diff line number Diff line change
@@ -14,16 +14,15 @@ interface HomeFooterViewProps {

const HomeFooterView: React.FC<HomeFooterViewProps> = ({ children }) => {
const { openIdState } = useOpenIDCredentials()
const { w3cCredentialRecords, sdJwtVcRecords } = openIdState
const { w3cCredentialRecords } = openIdState
const credentials = [
...useCredentialByState(CredentialState.CredentialReceived),
...useCredentialByState(CredentialState.Done),
...w3cCredentialRecords,
...sdJwtVcRecords,
]
const { HomeTheme, TextTheme, Assets } = useTheme()
const { t } = useTranslation()

const styles = StyleSheet.create({
container: {
paddingHorizontal: offset,
@@ -65,14 +64,22 @@ const HomeFooterView: React.FC<HomeFooterViewProps> = ({ children }) => {
</Text>
)
} else {
credentialMsg = <Text style={[TextTheme.bold]}>{t('Home.NoCredentials')}</Text>
scanReminder = <Text>{t('Home.ScanOfferAddCard')}</Text>
credentialMsg = (
<Text style={[TextTheme.bold]}>
{t('Home.NoCredentials')}
</Text>
)
scanReminder = (
<Text>
{t('Home.ScanOfferAddCard')}
</Text>
)
}

return (
<>
<View style={styles.imageContainer}>
<Assets.svg.homeCenterImg {...{ width: '30%' }} />
<Assets.svg.homeCenterImg {...{ width: '30%', }} />
</View>

<View style={styles.messageContainer}>
1 change: 1 addition & 0 deletions packages/legacy/core/App/contexts/auth.tsx
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
import '@hyperledger/aries-askar-react-native'

import 'reflect-metadata'

import { AskarWallet } from '@credo-ts/askar' // is this enough instead of line number 2
import { ConsoleLogger, LogLevel, SigningProviderRegistry } from '@credo-ts/core'
import { useAgent } from '@credo-ts/react-hooks'
4 changes: 1 addition & 3 deletions packages/legacy/core/App/hooks/notifications.ts
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ import {
BasicMessageRecord,
CredentialExchangeRecord as CredentialRecord,
CredentialState,
MdocRecord,
ProofExchangeRecord,
ProofState,
SdJwtVcRecord,
@@ -34,7 +33,6 @@ export type NotificationReturnType = Array<
| CustomNotification
| SdJwtVcRecord
| W3cCredentialRecord
| MdocRecord
| OpenId4VPRequestRecord
>

@@ -87,7 +85,7 @@ export const useNotifications = ({
}
})

const openIDCreds: Array<SdJwtVcRecord | W3cCredentialRecord | MdocRecord | OpenId4VPRequestRecord> = []
const openIDCreds: Array<SdJwtVcRecord | W3cCredentialRecord | OpenId4VPRequestRecord> = []
if (openIDCredRecieved) {
openIDCreds.push(openIDCredRecieved)
}
Original file line number Diff line number Diff line change
@@ -17,15 +17,15 @@ import { testIdWithKey } from '../../../utils/testable'
import { credentialTextColor, toImageSource } from '../../../utils/credential'
import { useTheme } from '../../../contexts/theme'
import { SvgUri } from 'react-native-svg'
import { MdocRecord, SdJwtVcRecord, W3cCredentialRecord } from '@credo-ts/core'
import { W3cCredentialRecord } from '@credo-ts/core'
import { getCredentialForDisplay } from '../display'
import { BifoldError } from '../../../types/error'
import { EventTypes } from '../../../constants'
import { getAttributeField } from '../utils/utils'

interface CredentialCardProps {
credentialDisplay?: W3cCredentialDisplay
credentialRecord?: W3cCredentialRecord | SdJwtVcRecord | MdocRecord
credentialRecord?: W3cCredentialRecord
onPress?: GenericFn
style?: ViewStyle
}
Loading