Merge branch 'main' into fix/loki-dev

bcgov · Dec 16, 2024 · 39ff419 · 39ff419
2 parents 46b7793 + 66e2955
commit 39ff419
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 35 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -2,7 +2,7 @@ name: Native Build & Test
 
 env:
   appBuildNumber: ${{ github.run_number }}
-  appBuildVersion: "1.0.21"
+  appBuildVersion: "1.0.22"
 
 on:
   workflow_dispatch:

diff --git a/app/container-imp.ts b/app/container-imp.ts
@@ -22,6 +22,7 @@ import {
   PersistentStorage,
   PersistentState,
   defaultConfig,
+  InlineErrorPosition,
 } from '@hyperledger/aries-bifold-core'
 import { RemoteLogger, RemoteLoggerOptions } from '@hyperledger/aries-bifold-remote-logs'
 import { getProofRequestTemplates } from '@hyperledger/aries-bifold-verifier'
@@ -298,6 +299,7 @@ export class AppContainer implements Container {
       { did: 'AcZpBDz3oxmKrpcuPcdKai', id: 'AcZpBDz3oxmKrpcuPcdKai:2:Digital Business Card:1.0.0' },
       { did: 'K9igebFysBL6jcBwR8bKuN', id: 'K9igebFysBL6jcBwR8bKuN:2:Digital Business Card:1.0.0' },
     ])
+    this._container.registerInstance(TOKENS.INLINE_ERRORS, { enabled: true, position: InlineErrorPosition.Below })
     this._container.registerInstance(TOKENS.SCREEN_TERMS, { screen: Terms, version: TermsVersion })
     this._container.registerInstance(TOKENS.SCREEN_DEVELOPER, Developer)
 

diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
@@ -445,7 +445,7 @@ PODS:
   - React-jsinspector (0.72.5)
   - React-logger (0.72.5):
     - glog
-  - "react-native-attestation (1.0.0-alpha.371+9484bf84)":
+  - "react-native-attestation (1.0.0-alpha.391+6f8357ae)":
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - react-native-config (1.5.0):
@@ -936,7 +936,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a
   React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
   React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
-  react-native-attestation: e349eb06dd827fe44fcbe309689312473e425635
+  react-native-attestation: a4fd5220ba42bc4a817e86cfab53d0303f0f9242
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-date-picker: 06a4d96ab525a163c7a90bccd68833d136b0bb13
   react-native-encrypted-storage: db300a3f2f0aba1e818417c1c0a6be549038deb7

diff --git a/app/package.json b/app/package.json
@@ -62,11 +62,11 @@
     "@formatjs/intl-relativetimeformat": "9.3.1",
     "@hyperledger/anoncreds-react-native": "0.2.4",
     "@hyperledger/aries-askar-react-native": "0.2.3",
-    "@hyperledger/aries-bifold-core": "1.0.0-alpha.371",
-    "@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.371",
-    "@hyperledger/aries-bifold-verifier": "1.0.0-alpha.371",
-    "@hyperledger/aries-oca": "1.0.0-alpha.371",
-    "@hyperledger/aries-react-native-attestation": "1.0.0-alpha.371",
+    "@hyperledger/aries-bifold-core": "1.0.0-alpha.391",
+    "@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.391",
+    "@hyperledger/aries-bifold-verifier": "1.0.0-alpha.391",
+    "@hyperledger/aries-oca": "1.0.0-alpha.391",
+    "@hyperledger/aries-react-native-attestation": "1.0.0-alpha.391",
     "@hyperledger/indy-vdr-react-native": "0.2.2",
     "@hyperledger/indy-vdr-shared": "0.2.2",
     "@react-native-async-storage/async-storage": "1.15.11",

diff --git a/app/src/theme.ts b/app/src/theme.ts
@@ -204,13 +204,13 @@ export const TextTheme: ITextTheme = {
     fontFamily: 'BCSans-Regular',
     fontSize: 16,
     fontWeight: 'normal',
-    color: ColorPallet.notification.error,
+    color: ColorPallet.notification.errorText,
   },
   inlineWarningText: {
     fontFamily: 'BCSans-Regular',
     fontSize: 16,
     fontWeight: 'normal',
-    color: ColorPallet.notification.warn,
+    color: ColorPallet.notification.warnText,
   },
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -3253,9 +3253,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-core@npm:1.0.0-alpha.371":
-  version: 1.0.0-alpha.371
-  resolution: "@hyperledger/aries-bifold-core@npm:1.0.0-alpha.371"
+"@hyperledger/aries-bifold-core@npm:1.0.0-alpha.391":
+  version: 1.0.0-alpha.391
+  resolution: "@hyperledger/aries-bifold-core@npm:1.0.0-alpha.391"
   peerDependencies:
     "@credo-ts/anoncreds": 0.5.11
     "@credo-ts/askar": 0.5.11
@@ -3331,57 +3331,57 @@ __metadata:
     uuid: ^9.0.0
   bin:
     bifold: bin/bifold
-  checksum: 9e603224d642beea5b0982b74e21018f89165df19eaecfabbc48ddd2fc91090874a8eab57b068e7f3b39eb3655c60587f0b032779a1598b9a1055d6f452d7948
+  checksum: 8d74a2baab46cd9d3f73bee6c6d89b6591ccc9d0d71af5cc3ef5e7241604c7490255225dfb172a461ec9522071fc8c9a6e244644834268697b4e32f743ad94fc
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.371":
-  version: 1.0.0-alpha.371
-  resolution: "@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.371"
+"@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.391":
+  version: 1.0.0-alpha.391
+  resolution: "@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.391"
   peerDependencies:
     "@credo-ts/core": 0.5.11
     axios: ^1.4.0
     buffer: ^6.0.3
     react: ^18.2.0
     react-native: ^0.72.5
     react-native-logs: ^5.1.0
-  checksum: 267b89b3d4ed28cb2af40a351d48b5c0c14c51447a2a5a046a16a998d4ccaa97976beaa4b1a69145ee3fc7921c56338c24ad845f8bd1c3893f998bb9e0a708b8
+  checksum: aa77574c46cf44b6cb097f77b666241e298189fd39deacbbbe538084ac2860400454939effb5f88be9466c21eca2aaf3030c4eac134be518bbb573bb64556cf9
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.371":
-  version: 1.0.0-alpha.371
-  resolution: "@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.371"
+"@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.391":
+  version: 1.0.0-alpha.391
+  resolution: "@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.391"
   peerDependencies:
     "@credo-ts/anoncreds": 0.5.11
     "@credo-ts/core": 0.5.11
     "@credo-ts/react-hooks": ^0.6.0
     "@hyperledger/anoncreds-shared": 0.2.4
     react: ^18.2.0
-  checksum: d085b93dfe79177215d605f60b1337233881896b115549ee1398d60f46fc1e047d40d145e497c3aaebb13ca2d26d18afa3bf7a35ae8df5982211524840949c19
+  checksum: d23703c83d4bfb1eaf8257c1a06b7f24f622de0de845783bb85f4fddad8f4d8795f8ba0abd4acdfd11700806460c081d1218dba8c257dc2afee8d9f478859f97
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-oca@npm:1.0.0-alpha.371":
-  version: 1.0.0-alpha.371
-  resolution: "@hyperledger/aries-oca@npm:1.0.0-alpha.371"
+"@hyperledger/aries-oca@npm:1.0.0-alpha.391":
+  version: 1.0.0-alpha.391
+  resolution: "@hyperledger/aries-oca@npm:1.0.0-alpha.391"
   dependencies:
     "@credo-ts/anoncreds": "npm:0.5.11"
     "@credo-ts/core": "npm:0.5.11"
     axios: "npm:^1.4.0"
     lodash.startcase: "npm:^4.4.0"
     react-native-fs: "npm:^2.16.6"
-  checksum: 18fa603733a26decc0375a013d7adb3077c6f440e02cae189e969b8bb0fd8f7d78f38f9b3e8f7b1bf1088125c052f166508b603d24d31c34d4ac084c9e183518
+  checksum: 48a4ebea014d127eef9c92c7a419c9bfaa4730eb115ea3660ad727e374ef8ddf94cba1c5151a4616885db990504fc4d88397b092676bc5d1b0baf62d0dfc99fb
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.371":
-  version: 1.0.0-alpha.371
-  resolution: "@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.371"
+"@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.391":
+  version: 1.0.0-alpha.391
+  resolution: "@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.391"
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 63b0daedc62584d125b8d5262a7afc98f0b614af9b62c869dddff5cb7d828f4c060fe6ae86c6b4a9a08cd49445bf2ba00bc590a950e3322b9eaffab378706fc9
+  checksum: 3d8775696ee976a8b7849ae4dc6661149fcd6c682beed5da59af7cd933078f5d250ba8116e6b14a3c94acc6fa22469b32c945f555aa10b8b3028c7588c768aa1
   languageName: node
   linkType: hard
 
@@ -8292,11 +8292,11 @@ __metadata:
     "@formatjs/intl-relativetimeformat": "npm:9.3.1"
     "@hyperledger/anoncreds-react-native": "npm:0.2.4"
     "@hyperledger/aries-askar-react-native": "npm:0.2.3"
-    "@hyperledger/aries-bifold-core": "npm:1.0.0-alpha.371"
-    "@hyperledger/aries-bifold-remote-logs": "npm:1.0.0-alpha.371"
-    "@hyperledger/aries-bifold-verifier": "npm:1.0.0-alpha.371"
-    "@hyperledger/aries-oca": "npm:1.0.0-alpha.371"
-    "@hyperledger/aries-react-native-attestation": "npm:1.0.0-alpha.371"
+    "@hyperledger/aries-bifold-core": "npm:1.0.0-alpha.391"
+    "@hyperledger/aries-bifold-remote-logs": "npm:1.0.0-alpha.391"
+    "@hyperledger/aries-bifold-verifier": "npm:1.0.0-alpha.391"
+    "@hyperledger/aries-oca": "npm:1.0.0-alpha.391"
+    "@hyperledger/aries-react-native-attestation": "npm:1.0.0-alpha.391"
     "@hyperledger/indy-vdr-react-native": "npm:0.2.2"
     "@hyperledger/indy-vdr-shared": "npm:0.2.2"
     "@react-native-async-storage/async-storage": "npm:1.15.11"