Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: android build issues #139

Merged
merged 3 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions apps/ausweis/app.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ const config = {
},
plugins: [
'@animo-id/expo-ausweis-sdk',
[
'expo-build-properties',
{
android: {
minSdkVersion: 26,
useLegacyPackaging: true,
},
},
],
[
'expo-font',
{
Expand Down
1 change: 1 addition & 0 deletions apps/ausweis/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'expo-router/entry'
5 changes: 3 additions & 2 deletions apps/ausweis/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ausweis-wallet",
"version": "1.5.1",
"main": "expo-router/entry",
"main": "index.ts",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is needed as otherwise it can't find expo-router (it looks in node_modules, but should look in ../../node_modules). importing it in the index.ts file works

"private": true,
"scripts": {
"start": "APP_VARIANT=development expo start -c --dev-client",
Expand Down Expand Up @@ -47,7 +47,7 @@
"expo-system-ui": "~3.0.6",
"expo-updates": "~0.25.16",
"react": "*",
"react-native": "0.74.2",
"react-native": "*",
"react-native-argon2": "^2.0.1",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "~2.16.2",
Expand All @@ -61,6 +61,7 @@
"devDependencies": {
"@babel/core": "^7.24.4",
"@tamagui/babel-plugin": "^1.108.0",
"expo-build-properties": "^0.12.5",
"typescript": "*"
}
}
2 changes: 1 addition & 1 deletion apps/ausweis/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ MIICeTCCAiCgAwIBAgIUB5E9QVZtmUYcDtCjKB/H3VQv72gwCgYIKoZIzj0EAwIwgYgxCzAJBgNVBAYT

// https://funke.animo.id
const animoFunkeRelyingPartyCertificate =
'MIIBAzCBq6ADAgECAhArxq0w60RTDK4WY9HzgcvBMAoGCCqGSM49BAMCMAAwIBcNNzAwMTAxMDAwMDAwWhgPMjI4NjExMjAxNzQ2NDBaMAAwOTATBgcqhkjOPQIBBggqhkjOPQMBBwMiAALcD1XzKepFxWMAOqV+ln1fybBt7DRO5CV0f9A6mRp2xaMlMCMwIQYDVR0RBBowGIYWaHR0cHM6Ly9mdW5rZS5hbmltby5pZDAKBggqhkjOPQQDAgNHADBEAiAfvGG6sqrvzIMWYpJB5VLloo9f51loYXSkKxJIOztlNwIgLLSvEl0Dmp5vtj2buZ2nXQ2RBKxiLbc5eYGeMeoUnjk='
'MIIBAzCBq6ADAgECAhAcowXbm2aJXPP7Am0/DqMGMAoGCCqGSM49BAMCMAAwIBcNNzAwMTAxMDAwMDAwWhgPMjI4NjExMjAxNzQ2NDBaMAAwOTATBgcqhkjOPQIBBggqhkjOPQMBBwMiAALcD1XzKepFxWMAOqV+ln1fybBt7DRO5CV0f9A6mRp2xaMlMCMwIQYDVR0RBBowGIYWaHR0cHM6Ly9mdW5rZS5hbmltby5pZDAKBggqhkjOPQQDAgNHADBEAiBd0afYRMKslUz1DooFge3Vk2ggZcwlSkTF750rfa7MjAIgGFPM9J6PvAXkvsxUdC1xCcyCQBBrOsLdwqCT4wzTmko='
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is now : MIIBBTCBq6ADAgECAhAar4TMiACrMSPwZ04DngKaMAoGCCqGSM49BAMCMAAwIBcNNzAwMTAxMDAwMDAwWhgPMjI4NjExMjAxNzQ2NDBaMAAwOTATBgcqhkjOPQIBBggqhkjOPQMBBwMiAALcD1XzKepFxWMAOqV+ln1fybBt7DRO5CV0f9A6mRp2xaMlMCMwIQYDVR0RBBowGIYWaHR0cHM6Ly9mdW5rZS5hbmltby5pZDAKBggqhkjOPQQDAgNJADBGAiEA1pSuByfgYpXmUjs+OGIJvqeHXCtTXiMxZDKe7bH7ySUCIQDyLR+EfdKPgj83FGUB9sERjfrCH9sH6QwI0TPAJSGicA==


export const trustedX509Certificates = [bdrPidIssuerCertificate, animoFunkeRelyingPartyCertificate]

Expand Down
1 change: 0 additions & 1 deletion apps/ausweis/src/features/onboarding/onboardingContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ export function OnboardingContextProvider({

const onEnterPin: ReceivePidUseCaseOptions['onEnterPin'] = useCallback(
(options) => {
console.log('options', options, idCardPin)
if (!idCardPin) {
// We need to hide the NFC modal on iOS, as we first need to ask the user for the pin again
sendCommand({ cmd: 'INTERRUPT' })
Expand Down
7 changes: 6 additions & 1 deletion apps/ausweis/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,10 @@
"@ausweis/*": ["./apps/ausweis/src/*"]
}
},
"include": ["./src/**/*.ts", "./src/**/*.tsx", "tamagui.config.ts"]
"include": [
"./src/**/*.ts",
"./src/**/*.tsx",
"tamagui.config.ts",
"index.ts"
]
}
1 change: 1 addition & 0 deletions apps/paradym/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'expo-router/entry'
4 changes: 2 additions & 2 deletions apps/paradym/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "paradym-wallet",
"version": "1.5.0",
"main": "expo-router/entry",
"main": "index.ts",
"private": true,
"scripts": {
"start": "APP_VARIANT=development pnpm expo start -c --dev-client",
Expand Down Expand Up @@ -39,7 +39,7 @@
"expo-system-ui": "~3.0.6",
"expo-updates": "~0.25.16",
"react": "*",
"react-native": "0.74.2",
"react-native": "*",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "~2.16.2",
"react-native-get-random-values": "~1.11.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"expo-system-ui": "~3.0.6",
"react": "*",
"react-device-frameset": "^1.3.4",
"react-native": "0.74.2",
"react-native": "*",
"react-native-gesture-handler": "~2.16.2",
"react-native-get-random-values": "~1.11.0",
"react-native-reanimated": "~3.10.1",
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
"@credo-ts/react-native": "0.5.10",

"@animo-id/expo-secure-environment": "0.1.0-alpha.2",
"@animo-id/expo-ausweis-sdk": "0.0.1-alpha.7"
"@animo-id/expo-ausweis-sdk": "0.0.1-alpha.7",

"react-native": "0.74.5"
},
"patchedDependencies": {
"@credo-ts/[email protected]": "patches/@[email protected]",
Expand Down
1 change: 1 addition & 0 deletions packages/agent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"rxjs": "^7.8.1"
},
"peerDependencies": {
"expo": "*",
"@hyperledger/anoncreds-react-native": "*",
"@hyperledger/aries-askar-react-native": "*",
"@hyperledger/indy-vdr-react-native": "*"
Expand Down
2 changes: 1 addition & 1 deletion packages/agent/src/agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export const initializeAusweisAgent = async ({
keyDerivationMethod: keyDerivation === 'raw' ? KeyDerivationMethod.Raw : KeyDerivationMethod.Argon2IMod,
},
autoUpdateStorageOnStartup: true,
// logger: appLogger(LogLevel.debug),
logger: appLogger(LogLevel.debug),
},
modules: {
ariesAskar: askarModule,
Expand Down
3 changes: 3 additions & 0 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,8 @@
},
"devDependencies": {
"@types/fast-text-encoding": "^1.0.3"
},
"peerDependencies": {
"expo": "*"
}
}
4 changes: 2 additions & 2 deletions packages/app/src/components/CredentialAttributes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ export function CredentialAttributes({ subject, disableHeader = false }: Credent

return (
<YStack g="md">
{tables.map((table) => (
<YStack key={table.depth} g="md" pt={table.parent ? 0 : '$2'}>
{tables.map((table, index) => (
<YStack key={`${table.parent}-${table.depth}-${table.title}-${index}`} g="md" pt={table.parent ? 0 : '$2'}>
<XStack gap="$2">
{table.depth > 1 && <LucideIcons.CornerDownRight size="$1" />}
{(!disableHeader || table.title) && (
Expand Down
11 changes: 10 additions & 1 deletion packages/app/src/components/CredentialCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,16 @@ export function CredentialCard({
borderColor="$borderTranslucent"
position="relative"
>
<Card padded width="100%" br="$8" pressStyle={getPressStyle()} h="$16" onPress={onPress} overflow="hidden">
<Card
padded
width="100%"
br="$8"
backgroundColor="transparent"
pressStyle={getPressStyle()}
h="$16"
onPress={onPress}
overflow="hidden"
>
<Card.Header padding={0}>
<XStack jc="space-between">
<XStack pr="$4">{icon}</XStack>
Expand Down
4 changes: 2 additions & 2 deletions packages/scanner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"@react-native-masked-view/masked-view": "0.3.1",
"@types/react": "~18.2.79",
"expo-barcode-scanner": "~13.0.1",
"react-native": "0.74.2"
"react-native": "*"
},
"peerDependencies": {
"@react-native-masked-view/masked-view": "0.3.1",
"expo-barcode-scanner": "~13.0.1",
"react-native": "0.74.2"
"react-native": "*"
}
}
2 changes: 1 addition & 1 deletion packages/secure-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"peerDependencies": {
"@hyperledger/aries-askar-react-native": "*",
"expo-secure-store": "~13.0.1",
"react-native": "0.74.2",
"react-native": "*",
"react-native-argon2": "^2.0.1",
"react-native-get-random-values": "~1.11.0",
"react-native-keychain": "^8.2.0"
Expand Down
2 changes: 2 additions & 0 deletions packages/ui/src/content/Icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
IdentificationIcon,
KeyIcon,
LockClosedIcon,
QrCodeIcon,
ShieldCheckIcon,
StarIcon,
} from 'react-native-heroicons/outline'
Expand Down Expand Up @@ -56,4 +57,5 @@ export const HeroIcons = {
Backspace: wrapHeroIcon(BackspaceIcon),
ExclamationCircle: wrapHeroIcon(ExclamationCircleIcon),
CheckCircle: wrapHeroIcon(CheckCircleIcon),
Scan: wrapHeroIcon(QrCodeIcon),
} as const
Loading