Skip to content

Commit 849c028

Browse files
bryce-mcmathbryce-mcmath
authored
fix: hanging cred offer, console warns (#2126)
Signed-off-by: Bryce McMath <bryce.j.mcmath@gmail.com>
1 parent 4e91e5d commit 849c028

File tree

8 files changed

+405
-75
lines changed

8 files changed

+405
-75
lines changed

‎app/App.tsx‎

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import {
22
Stacks,
33
Screens,
44
AgentProvider,
5+
AnimatedComponentsProvider,
6+
animatedComponents,
57
TourProvider,
68
AuthProvider,
79
toastConfig,
@@ -18,7 +20,9 @@ import {
1820
ContainerProvider,
1921
MainContainer,
2022
} from '@hyperledger/aries-bifold-core'
23+
import { RootStackParams } from '@hyperledger/aries-bifold-core/lib/typescript/App/types/navigators'
2124
import { useNavigation } from '@react-navigation/native'
25+
import { StackNavigationProp } from '@react-navigation/stack'
2226
import React, { useEffect, useState, useMemo } from 'react'
2327
import { useTranslation } from 'react-i18next'
2428
import { Linking, StatusBar } from 'react-native'
@@ -51,7 +55,7 @@ const App = () => {
5155
}, [])
5256
const [surveyVisible, setSurveyVisible] = useState(false)
5357
const { t } = useTranslation()
54-
const { navigate } = useNavigation()
58+
const { navigate } = useNavigation<StackNavigationProp<RootStackParams>>()
5559
const toggleSurveyVisibility = () => setSurveyVisible(!surveyVisible)
5660

5761
const helpLink = 'https://www2.gov.bc.ca/gov/content/governments/government-id/bc-wallet/help'
@@ -97,13 +101,13 @@ const App = () => {
97101
title: t('Settings.TermsOfUse'),
98102
accessibilityLabel: t('Settings.TermsOfUse'),
99103
testID: testIdWithKey('TermsOfUse'),
100-
onPress: () => navigate(Stacks.SettingStack as never, { screen: Screens.Terms } as never),
104+
onPress: () => navigate(Stacks.SettingStack, { screen: Screens.Terms }),
101105
},
102106
{
103107
title: t('Settings.IntroductionToTheApp'),
104108
accessibilityLabel: t('Settings.IntroductionToTheApp'),
105109
testID: testIdWithKey('IntroductionToTheApp'),
106-
onPress: () => navigate(Stacks.SettingStack as never, { screen: Screens.Onboarding } as never),
110+
onPress: () => navigate(Stacks.SettingStack, { screen: Screens.Onboarding }),
107111
},
108112
{
109113
title: t('Settings.PlayWithBCWallet'),
@@ -128,37 +132,39 @@ const App = () => {
128132
<StoreProvider initialState={initialState} reducer={reducer}>
129133
<AgentProvider agent={undefined}>
130134
<ThemeProvider value={theme}>
131-
<ConfigurationProvider value={configuration}>
132-
<AuthProvider>
133-
<NetworkProvider>
134-
<StatusBar
135-
barStyle="light-content"
136-
hidden={false}
137-
backgroundColor={theme.ColorPallet.brand.primary}
138-
translucent={false}
139-
/>
140-
<NetInfo />
141-
<ErrorModal />
142-
<WebDisplay
143-
destinationUrl={surveyMonkeyUrl}
144-
exitUrl={surveyMonkeyExitUrl}
145-
visible={surveyVisible}
146-
onClose={toggleSurveyVisibility}
147-
/>
148-
<TourProvider
149-
homeTourSteps={homeTourSteps}
150-
credentialsTourSteps={credentialsTourSteps}
151-
credentialOfferTourSteps={credentialOfferTourSteps}
152-
proofRequestTourSteps={proofRequestTourSteps}
153-
overlayColor={'black'}
154-
overlayOpacity={0.7}
155-
>
156-
<RootStack />
157-
</TourProvider>
158-
<Toast topOffset={15} config={toastConfig} />
159-
</NetworkProvider>
160-
</AuthProvider>
161-
</ConfigurationProvider>
135+
<AnimatedComponentsProvider value={animatedComponents}>
136+
<ConfigurationProvider value={configuration}>
137+
<AuthProvider>
138+
<NetworkProvider>
139+
<StatusBar
140+
barStyle="light-content"
141+
hidden={false}
142+
backgroundColor={theme.ColorPallet.brand.primary}
143+
translucent={false}
144+
/>
145+
<NetInfo />
146+
<ErrorModal />
147+
<WebDisplay
148+
destinationUrl={surveyMonkeyUrl}
149+
exitUrl={surveyMonkeyExitUrl}
150+
visible={surveyVisible}
151+
onClose={toggleSurveyVisibility}
152+
/>
153+
<TourProvider
154+
homeTourSteps={homeTourSteps}
155+
credentialsTourSteps={credentialsTourSteps}
156+
credentialOfferTourSteps={credentialOfferTourSteps}
157+
proofRequestTourSteps={proofRequestTourSteps}
158+
overlayColor={'black'}
159+
overlayOpacity={0.7}
160+
>
161+
<RootStack />
162+
</TourProvider>
163+
<Toast topOffset={15} config={toastConfig} />
164+
</NetworkProvider>
165+
</AuthProvider>
166+
</ConfigurationProvider>
167+
</AnimatedComponentsProvider>
162168
</ThemeProvider>
163169
</AgentProvider>
164170
</StoreProvider>

‎app/AppStorybook.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { initLanguages } from '@hyperledger/aries-bifold-core'
1+
// import { initLanguages } from '@hyperledger/aries-bifold-core'
22
import React from 'react'
33
import { LogBox } from 'react-native'
44

5-
import bcwallet from './src'
5+
// import bcwallet from './src'
66
import StorybookUIRoot from './storybook'
77

8-
const { localization } = bcwallet
8+
// const { localization } = bcwallet
99

10-
initLanguages(localization)
10+
// initLanguages(localization)
1111

1212
LogBox.ignoreAllLogs()
1313

‎app/container-imp.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,4 +274,9 @@ export class AppContainer implements Container {
274274
public resolve<K extends keyof TokenMapping>(token: K): TokenMapping[K] {
275275
return this._container.resolve(token) as TokenMapping[K]
276276
}
277+
public resolveAll<K extends keyof TokenMapping, T extends K[]>(
278+
tokens: [...T]
279+
): { [I in keyof T]: TokenMapping[T[I]] } {
280+
return tokens.map((key) => this.resolve(key)!) as { [I in keyof T]: TokenMapping[T[I]] }
281+
}
277282
}

‎app/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ PODS:
445445
- React-jsinspector (0.72.5)
446446
- React-logger (0.72.5):
447447
- glog
448-
- "react-native-attestation (1.0.0-alpha.297+ea2300f5)":
448+
- "react-native-attestation (1.0.0-alpha.302+81e3d8d3)":
449449
- RCT-Folly (= 2021.07.22.00)
450450
- React-Core
451451
- react-native-config (1.5.0):
@@ -931,7 +931,7 @@ SPEC CHECKSUMS:
931931
React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a
932932
React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
933933
React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
934-
react-native-attestation: 376c47997ba33b29cf64a9cc8f9f625b62f3447b
934+
react-native-attestation: 694ef56303d348e7c9465bba955921017e10ae53
935935
react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
936936
react-native-encrypted-storage: db300a3f2f0aba1e818417c1c0a6be549038deb7
937937
react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a

‎app/metro.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config')
12
const fs = require('fs')
23
const path = require('path')
34
const escape = require('escape-string-regexp')
@@ -32,7 +33,6 @@ for (const packageDir of packageDirs) {
3233
}, extraNodeModules)
3334
}
3435

35-
const { getDefaultConfig } = require('metro-config')
3636
module.exports = (async () => {
3737
const {
3838
resolver: { sourceExts, assetExts },
@@ -58,5 +58,5 @@ module.exports = (async () => {
5858
watchFolders,
5959
}
6060

61-
return metroConfig
61+
return mergeConfig(getDefaultConfig(__dirname), metroConfig)
6262
})()

‎app/package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"@credo-ts/drpc": "0.5.9",
4848
"@credo-ts/indy-sdk-to-askar-migration": "0.5.9",
4949
"@credo-ts/indy-vdr": "0.5.9",
50+
"@credo-ts/openid4vc": "0.5.9",
5051
"@credo-ts/push-notifications": "0.7.0",
5152
"@credo-ts/question-answer": "0.5.9",
5253
"@credo-ts/react-hooks": "0.6.0",
@@ -61,11 +62,11 @@
6162
"@formatjs/intl-relativetimeformat": "9.3.1",
6263
"@hyperledger/anoncreds-react-native": "0.2.2",
6364
"@hyperledger/aries-askar-react-native": "0.2.3",
64-
"@hyperledger/aries-bifold-core": "1.0.0-alpha.297",
65-
"@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.297",
66-
"@hyperledger/aries-bifold-verifier": "1.0.0-alpha.297",
67-
"@hyperledger/aries-oca": "1.0.0-alpha.297",
68-
"@hyperledger/aries-react-native-attestation": "1.0.0-alpha.297",
65+
"@hyperledger/aries-bifold-core": "1.0.0-alpha.302",
66+
"@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.302",
67+
"@hyperledger/aries-bifold-verifier": "1.0.0-alpha.302",
68+
"@hyperledger/aries-oca": "1.0.0-alpha.302",
69+
"@hyperledger/aries-react-native-attestation": "1.0.0-alpha.302",
6970
"@hyperledger/indy-vdr-react-native": "0.2.2",
7071
"@hyperledger/indy-vdr-shared": "0.2.2",
7172
"@react-native-async-storage/async-storage": "1.15.11",

‎app/src/hooks/notifications.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export const useNotifications = (): Array<BasicMessageRecord | CredentialRecord
7777

7878
const notificationsWithCustom = [...custom, ...notif]
7979
setNotifications(notificationsWithCustom as never[])
80-
}, [credsReceived, credsDone, basicMessages, nonAttestationProofs])
80+
}, [offers, credsReceived, credsDone, basicMessages, nonAttestationProofs])
8181

8282
useEffect(() => {
8383
const validProofsDone = proofsDone.filter((proof: ProofExchangeRecord) => {

0 commit comments

Comments
 (0)