fix: android build issues (#139)

Signed-off-by: Timo Glastra <[email protected]>
animo · Aug 15, 2024 · 1f59eda · 1f59eda
1 parent 66ee65d
commit 1f59eda
Show file tree

Hide file tree

Showing 19 changed files with 549 additions and 490 deletions.
diff --git a/apps/ausweis/app.config.js b/apps/ausweis/app.config.js
@@ -54,6 +54,15 @@ const config = {
   },
   plugins: [
     '@animo-id/expo-ausweis-sdk',
+    [
+      'expo-build-properties',
+      {
+        android: {
+          minSdkVersion: 26,
+          useLegacyPackaging: true,
+        },
+      },
+    ],
     [
       'expo-font',
       {

diff --git a/apps/ausweis/index.ts b/apps/ausweis/index.ts
@@ -0,0 +1 @@
+import 'expo-router/entry'
diff --git a/apps/ausweis/package.json b/apps/ausweis/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "ausweis-wallet",
 	"version": "1.5.1",
-	"main": "expo-router/entry",
+	"main": "index.ts",
 	"private": true,
 	"scripts": {
 		"start": "APP_VARIANT=development expo start -c --dev-client",
@@ -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",
@@ -61,6 +61,7 @@
 	"devDependencies": {
 		"@babel/core": "^7.24.4",
 		"@tamagui/babel-plugin": "^1.108.0",
+		"expo-build-properties": "^0.12.5",
 		"typescript": "*"
 	}
 }
diff --git a/apps/ausweis/src/constants.ts b/apps/ausweis/src/constants.ts
@@ -8,7 +8,7 @@ MIICeTCCAiCgAwIBAgIUB5E9QVZtmUYcDtCjKB/H3VQv72gwCgYIKoZIzj0EAwIwgYgxCzAJBgNVBAYT
 
 // https://funke.animo.id
 const animoFunkeRelyingPartyCertificate =
-  'MIIBAzCBq6ADAgECAhArxq0w60RTDK4WY9HzgcvBMAoGCCqGSM49BAMCMAAwIBcNNzAwMTAxMDAwMDAwWhgPMjI4NjExMjAxNzQ2NDBaMAAwOTATBgcqhkjOPQIBBggqhkjOPQMBBwMiAALcD1XzKepFxWMAOqV+ln1fybBt7DRO5CV0f9A6mRp2xaMlMCMwIQYDVR0RBBowGIYWaHR0cHM6Ly9mdW5rZS5hbmltby5pZDAKBggqhkjOPQQDAgNHADBEAiAfvGG6sqrvzIMWYpJB5VLloo9f51loYXSkKxJIOztlNwIgLLSvEl0Dmp5vtj2buZ2nXQ2RBKxiLbc5eYGeMeoUnjk='
+  'MIIBAzCBq6ADAgECAhAcowXbm2aJXPP7Am0/DqMGMAoGCCqGSM49BAMCMAAwIBcNNzAwMTAxMDAwMDAwWhgPMjI4NjExMjAxNzQ2NDBaMAAwOTATBgcqhkjOPQIBBggqhkjOPQMBBwMiAALcD1XzKepFxWMAOqV+ln1fybBt7DRO5CV0f9A6mRp2xaMlMCMwIQYDVR0RBBowGIYWaHR0cHM6Ly9mdW5rZS5hbmltby5pZDAKBggqhkjOPQQDAgNHADBEAiBd0afYRMKslUz1DooFge3Vk2ggZcwlSkTF750rfa7MjAIgGFPM9J6PvAXkvsxUdC1xCcyCQBBrOsLdwqCT4wzTmko='
 
 export const trustedX509Certificates = [bdrPidIssuerCertificate, animoFunkeRelyingPartyCertificate]
 

diff --git a/apps/ausweis/src/features/onboarding/onboardingContext.tsx b/apps/ausweis/src/features/onboarding/onboardingContext.tsx
@@ -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' })

diff --git a/apps/ausweis/tsconfig.json b/apps/ausweis/tsconfig.json
@@ -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"
+	]
 }
diff --git a/apps/paradym/index.ts b/apps/paradym/index.ts
@@ -0,0 +1 @@
+import 'expo-router/entry'
diff --git a/apps/paradym/package.json b/apps/paradym/package.json
@@ -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",
@@ -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",

diff --git a/apps/storybook/package.json b/apps/storybook/package.json
@@ -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",

diff --git a/package.json b/package.json
@@ -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]",

diff --git a/packages/agent/package.json b/packages/agent/package.json
@@ -20,6 +20,7 @@
 		"rxjs": "^7.8.1"
 	},
 	"peerDependencies": {
+		"expo": "*",
 		"@hyperledger/anoncreds-react-native": "*",
 		"@hyperledger/aries-askar-react-native": "*",
 		"@hyperledger/indy-vdr-react-native": "*"

diff --git a/packages/agent/src/agent.ts b/packages/agent/src/agent.ts
@@ -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,

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -29,5 +29,8 @@
 	},
 	"devDependencies": {
 		"@types/fast-text-encoding": "^1.0.3"
+	},
+	"peerDependencies": {
+		"expo": "*"
 	}
 }
diff --git a/packages/app/src/components/CredentialAttributes.tsx b/packages/app/src/components/CredentialAttributes.tsx
@@ -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) && (

diff --git a/packages/app/src/components/CredentialCard.tsx b/packages/app/src/components/CredentialCard.tsx
@@ -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>

diff --git a/packages/scanner/package.json b/packages/scanner/package.json
@@ -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": "*"
 	}
 }
diff --git a/packages/secure-store/package.json b/packages/secure-store/package.json
@@ -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"

diff --git a/packages/ui/src/content/Icon.tsx b/packages/ui/src/content/Icon.tsx
@@ -12,6 +12,7 @@ import {
   IdentificationIcon,
   KeyIcon,
   LockClosedIcon,
+  QrCodeIcon,
   ShieldCheckIcon,
   StarIcon,
 } from 'react-native-heroicons/outline'
@@ -56,4 +57,5 @@ export const HeroIcons = {
   Backspace: wrapHeroIcon(BackspaceIcon),
   ExclamationCircle: wrapHeroIcon(ExclamationCircleIcon),
   CheckCircle: wrapHeroIcon(CheckCircleIcon),
+  Scan: wrapHeroIcon(QrCodeIcon),
 } as const