Merge branch 'develop' of github.com:cardano-foundation/cf-identity-w…

…allet into feature/DTIS-724-linking-of-IPEX-flows-to-contacts

.github/workflows/docker-builds.yaml

@@ -1,12 +1,6 @@
 name: Build and publish docker artifacts
 
 on:
-  push:
-    branches:
-      - main
-      - develop
-  pull_request:
-    types: [ opened, synchronize ]
   workflow_dispatch:
 
 env:

android/app/capacitor.build.gradle

@@ -21,6 +21,7 @@ dependencies {
     implementation project(':capacitor-share')
     implementation project(':capacitor-splash-screen')
     implementation project(':capacitor-status-bar')
+    implementation project(':capacitor-native-settings')
 
 }
 

android/capacitor.settings.gradle

@@ -37,3 +37,6 @@ project(':capacitor-splash-screen').projectDir = new File('../node_modules/@capa
 
 include ':capacitor-status-bar'
 project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
+
+include ':capacitor-native-settings'
+project(':capacitor-native-settings').projectDir = new File('../node_modules/capacitor-native-settings/android')

ios/App/App/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSCameraUsageDescription</key>
-	<string>To be able to scan barcodes</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -26,6 +24,15 @@
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>To be able to scan barcodes</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>This app uses Face ID to secure your data and provide faster access.</string>
 	<key>UIFileSharingEnabled</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
@@ -71,12 +78,5 @@
 			</dict>
 		</dict>
 	</array>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-			<key>NSAllowsArbitraryLoads</key>
-			<true/>
-	</dict>
-	<key>NSFaceIDUsageDescription</key>
-    <string>This app uses Face ID to secure your data and provide faster access.</string>
 </dict>
 </plist>

ios/App/Podfile

@@ -23,6 +23,7 @@ def capacitor_pods
   pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
   pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
   pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
+  pod 'CapacitorNativeSettings', :path => '../../node_modules/capacitor-native-settings'
 end
 
 target 'App' do

ios/App/Podfile.lock

@@ -19,7 +19,9 @@ PODS:
   - CapacitorCordova (5.7.4)
   - CapacitorKeyboard (5.0.8):
     - Capacitor
-  - CapacitorPreferences (5.0.7):
+  - CapacitorNativeSettings (5.0.1):
+    - Capacitor
+  - CapacitorPreferences (5.0.8):
     - Capacitor
   - CapacitorScreenOrientation (5.0.7):
     - Capacitor
@@ -47,6 +49,7 @@ DEPENDENCIES:
   - "CapacitorCommunitySqlite (from `../../node_modules/@capacitor-community/sqlite`)"
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorKeyboard (from `../../node_modules/@capacitor/keyboard`)"
+  - CapacitorNativeSettings (from `../../node_modules/capacitor-native-settings`)
   - "CapacitorPreferences (from `../../node_modules/@capacitor/preferences`)"
   - "CapacitorScreenOrientation (from `../../node_modules/@capacitor/screen-orientation`)"
   - "CapacitorShare (from `../../node_modules/@capacitor/share`)"
@@ -78,6 +81,8 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorKeyboard:
     :path: "../../node_modules/@capacitor/keyboard"
+  CapacitorNativeSettings:
+    :path: "../../node_modules/capacitor-native-settings"
   CapacitorPreferences:
     :path: "../../node_modules/@capacitor/preferences"
   CapacitorScreenOrientation:
@@ -99,7 +104,8 @@ SPEC CHECKSUMS:
   CapacitorCommunitySqlite: 6e2754dde799d618a8e75e409ccc67ec9c189460
   CapacitorCordova: a6e87fccc0307dee7aec1560ec9398485f2b0ce7
   CapacitorKeyboard: aec619a578235c6ce279075009a2689c2cf5c42c
-  CapacitorPreferences: 77ac427e98db83bace772455f8ba447430382c4c
+  CapacitorNativeSettings: 6e94ed3c0465206756f320df18efc52f053ce3c7
+  CapacitorPreferences: 9e59596c5fd9915ed45279d1fda68978c5706401
   CapacitorScreenOrientation: cc638c369cb2b1dfc55f8265485a8b4e0b3cafd9
   CapacitorShare: c6a1ebbf0114ff9e863b966cd6052678fa25d480
   CapacitorSplashScreen: dd3de3f3644710fa2a697cfb91ec262eece4d242
@@ -108,6 +114,6 @@ SPEC CHECKSUMS:
   SQLCipher: f2e96b3822e3006b379181a0e4fd145f6de29b56
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: 376fee91162e07308901c11bbed7e5bb1df1add6
+PODFILE CHECKSUM: f17d8c92af7514371ab66701e64dde4c13796c54
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2

jest.config.ts

@@ -27,15 +27,13 @@ export default {
     "tsx",
     "json",
     "node",
-    "yaml"
+    "yaml",
   ],
   moduleNameMapper: {
     "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$":
       "<rootDir>/src/ui/__mocks__/fileMock.ts",
     "\\.(css|scss)$": "<rootDir>/src/ui/__mocks__/styleMock.ts",
     // Jest cannot import the browser version so we can map in the NodeJS version instead.
-    "@dcspark/cardano-multiplatform-lib-browser":
-      "@dcspark/cardano-multiplatform-lib-nodejs",
   },
   testEnvironment: "jsdom",
   testMatch: ["**/src/**/?(*.)+(test).[tj]s?(x)"],

package.json

@@ -25,12 +25,12 @@
     "@capacitor/core": "^5.0.0",
     "@capacitor/ios": "^5.0.0",
     "@capacitor/keyboard": "^5.0.0",
+    "@capacitor/preferences": "^5.0.0",
     "@capacitor/screen-orientation": "^5.0.7",
     "@capacitor/share": "^5.0.0",
     "@capacitor/splash-screen": "^5.0.0",
     "@capacitor/status-bar": "^5.0.7",
-    "@dcspark/cardano-multiplatform-lib-browser": "^3.1.2",
-    "@fabianbormann/cardano-peer-connect": "^1.2.16",
+    "@fabianbormann/cardano-peer-connect": "^1.2.17",
     "@ionic/react": "^7.5.4",
     "@ionic/react-router": "^7.5.4",
     "@ionic/storage": "^3.0.6",
@@ -56,9 +56,9 @@
   "devDependencies": {
     "@capacitor/assets": "^3.0.1",
     "@capacitor/cli": "^5.0.0",
-    "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.2",
     "@faker-js/faker": "^8.4.1",
     "@ionic/react-test-utils": "^0.4.0",
+    "@peculiar/webcrypto": "^1.5.0",
     "@testing-library/dom": "^9.3.1",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^13.3.0",
@@ -101,6 +101,7 @@
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "expect-webdriverio": "^4.9.3",
+    "fake-indexeddb": "^6.0.0",
     "html-webpack-plugin": "^5.5.0",
     "husky": "^8.0.3",
     "jest": "^29.5.0",