Merge branch 'main' into fix/deep-links

Signed-off-by: Bryce McMath <[email protected]>

app/android/app/src/main/java/ca/bc/gov/BCWallet/MainActivity.java

@@ -7,9 +7,17 @@
 import androidx.core.app.NotificationManagerCompat;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.os.Bundle;
 
 public class MainActivity extends ReactActivity {
 
+  // react-native-screens override
+  // https://github.com/software-mansion/react-native-screens#android
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+      super.onCreate(null);
+  }
+
   /**
    * Detects changes in device orientation and sends them to JavaScript by broadcasting an event.
    * This is used to support the camera on different tablet orientations.

app/ios/AriesBifold.xcodeproj/project.pbxproj

@@ -10,7 +10,6 @@
 		00E356F31AD99517003FC87E /* AriesBifoldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* AriesBifoldTests.m */; };
 		0D918A04FB9191A76C945BBC /* libPods-AriesBifold.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B4B0A0C2D9BEF581AD105207 /* libPods-AriesBifold.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
-		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		1A157F462BACCDEA00E30CDB /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1A157F452BACCDEA00E30CDB /* PrivacyInfo.xcprivacy */; };
 		2F9994AE2A8D83CB004E773E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2F9994AD2A8D83CB004E773E /* GoogleService-Info.plist */; };
@@ -41,7 +40,6 @@
 		13B07F961A680F5B00A75B9A /* BCWallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BCWallet.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = AriesBifold/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = AriesBifold/AppDelegate.m; sourceTree = "<group>"; };
-		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = AriesBifold/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = AriesBifold/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = AriesBifold/main.m; sourceTree = "<group>"; };
 		1A157F452BACCDEA00E30CDB /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
@@ -105,7 +103,6 @@
 				1A72D9212B217145008DE489 /* AriesBifold.entitlements */,
 				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
 				13B07FB01A68108700A75B9A /* AppDelegate.m */,
-				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
 				13B07FB71A68108700A75B9A /* main.m */,
@@ -284,7 +281,6 @@
 				56A83D5F27D95E24002FE8FE /* BCSans-Regular.ttf in Resources */,
 				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
 				566FB1F2273B158E003E9BEE /* Media.xcassets in Resources */,
-				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -538,6 +534,7 @@
 			baseConfigurationReference = 6228B39BEBDEB177D0C79D99 /* Pods-AriesBifold.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = AriesBifold/AriesBifold.entitlements;
 				CURRENT_PROJECT_VERSION = 444;
@@ -576,6 +573,7 @@
 			baseConfigurationReference = CD48035C19AD8C07DE719567 /* Pods-AriesBifold.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = AriesBifold/AriesBifold.entitlements;
 				CURRENT_PROJECT_VERSION = 1;
@@ -674,7 +672,8 @@
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
-					" ",
+					"-Wl",
+					"-ld_classic",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -742,7 +741,8 @@
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
-					" ",
+					"-Wl",
+					"-ld_classic",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;

app/ios/AriesBifold/AppDelegate.m

@@ -17,6 +17,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   // They will be passed down to the ViewController used by React Native.
   self.initialProps = @{};
 
+  // Because certain file operations can reset resource values, we
+  // excluded file’s resource values each time the application starts.
   [self excludeDotAFJFolderFromBackup];
 
   return [super application:application didFinishLaunchingWithOptions:launchOptions];
@@ -68,8 +70,10 @@ - (void)excludeDotAFJFolderFromBackup {
                                         forKey:NSURLIsExcludedFromBackupKey 
                                          error:&error];
 
-    if (!success) {
-        NSLog(@"Error excluding folder %@ from backup: %@", folderName, error);
+    if (success) {
+      NSLog(@"Excluded folder %@ from backup.", folderName);
+    } else {
+      NSLog(@"Error excluding folder %@ from backup: %@", folderName, error);
     }
 }
 

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.366+2397235e)":
+  - "react-native-attestation (1.0.0-alpha.370+498de1ea)":
     - 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: 8089ba31bd4570abacc16a9ffc82418cd6664750
+  react-native-attestation: d69a5a13040f0803d0cd45ce86289cf347250258
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-date-picker: 06a4d96ab525a163c7a90bccd68833d136b0bb13
   react-native-encrypted-storage: db300a3f2f0aba1e818417c1c0a6be549038deb7

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.366",
-    "@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.366",
-    "@hyperledger/aries-bifold-verifier": "1.0.0-alpha.366",
-    "@hyperledger/aries-oca": "1.0.0-alpha.366",
-    "@hyperledger/aries-react-native-attestation": "1.0.0-alpha.366",
+    "@hyperledger/aries-bifold-core": "1.0.0-alpha.370",
+    "@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.370",
+    "@hyperledger/aries-bifold-verifier": "1.0.0-alpha.370",
+    "@hyperledger/aries-oca": "1.0.0-alpha.370",
+    "@hyperledger/aries-react-native-attestation": "1.0.0-alpha.370",
     "@hyperledger/indy-vdr-react-native": "0.2.2",
     "@hyperledger/indy-vdr-shared": "0.2.2",
     "@react-native-async-storage/async-storage": "1.15.11",

app/src/theme.ts

@@ -14,6 +14,7 @@ import React from 'react'
 import { StyleSheet } from 'react-native'
 
 import Logo from './assets/img/logo-with-text.svg'
+import { IInlineInputMessage } from '@hyperledger/aries-bifold-core/lib/typescript/App/theme'
 
 export const borderRadius = 4
 export const heavyOpacity = 0.7
@@ -80,6 +81,8 @@ const BrandColors: IBrandColors = {
   headerText: GrayscaleColors.white,
   buttonText: GrayscaleColors.white,
   tabBarInactive: GrayscaleColors.white,
+  inlineError: '',
+  inlineWarning: '',
 }
 
 export const ColorPallet: IColorPallet = {
@@ -197,6 +200,18 @@ export const TextTheme: ITextTheme = {
     fontWeight: 'normal',
     color: ColorPallet.grayscale.darkGrey,
   },
+  inlineErrorText: {
+    fontFamily: 'BCSans-Regular',
+    fontSize: 16,
+    fontWeight: 'normal',
+    color: ColorPallet.notification.error,
+  },
+  inlineWarningText: {
+    fontFamily: 'BCSans-Regular',
+    fontSize: 16,
+    fontWeight: 'normal',
+    color: ColorPallet.notification.warn,
+  },
 }
 
 export const Inputs: IInputs = StyleSheet.create({
@@ -720,6 +735,13 @@ export const Assets: IAssets = {
   },
 }
 
+const InputInlineMessage: IInlineInputMessage = {
+  inlineErrorText: { ...TextTheme.inlineErrorText },
+  InlineErrorIcon: Assets.svg.iconError,
+  inlineWarningText: { ...TextTheme.inlineWarningText },
+  InlineWarningIcon: Assets.svg.iconWarning,
+}
+
 export const defaultTheme: ITheme = {
   ColorPallet,
   TextTheme,
@@ -740,4 +762,5 @@ export const defaultTheme: ITheme = {
   PINEnterTheme,
   PINInputTheme,
   Assets,
+  InputInlineMessage,
 }

yarn.lock

@@ -3253,9 +3253,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-core@npm:1.0.0-alpha.366":
-  version: 1.0.0-alpha.366
-  resolution: "@hyperledger/aries-bifold-core@npm:1.0.0-alpha.366"
+"@hyperledger/aries-bifold-core@npm:1.0.0-alpha.370":
+  version: 1.0.0-alpha.370
+  resolution: "@hyperledger/aries-bifold-core@npm:1.0.0-alpha.370"
   peerDependencies:
     "@credo-ts/anoncreds": 0.5.11
     "@credo-ts/askar": 0.5.11
@@ -3290,6 +3290,7 @@ __metadata:
     "@react-navigation/native": 6.0.6
     "@react-navigation/stack": 6.0.11
     axios: ^1.4.0
+    base-64: ^1.0.0
     i18next: ^21.4.0
     lodash.flatten: ^4.4.0
     lodash.startcase: ^4.4.0
@@ -3309,14 +3310,14 @@ __metadata:
     react-native-fs: ^2.16.6
     react-native-gesture-handler: ^1.10.3
     react-native-get-random-values: ^1.7.0
-    react-native-gifted-chat: "*"
+    react-native-gifted-chat: 2.4.0
     react-native-keychain: ^8.1.1
     react-native-localize: ^2.2.4
     react-native-logs: ^5.1.0
     react-native-orientation-locker: "*"
     react-native-permissions: ^4.0.1
-    react-native-qrcode-svg: ^6.2.0
-    react-native-reanimated: ^3.4.2
+    react-native-qrcode-svg: 6.2.0
+    react-native-reanimated: 3.4.2
     react-native-safe-area-context: ^3.2.0
     react-native-screens: ^3.24.0
     react-native-splash-screen: ^3.3.0
@@ -3330,57 +3331,57 @@ __metadata:
     uuid: ^9.0.0
   bin:
     bifold: bin/bifold
-  checksum: 15d19e08238db08e3df95a3a92a387c9dafd3d4b2d395bb8eadbc2e9f89a612aa6c793ffd1bb11d30558329d92a0be2e6c901c5e5073b6ce61f4473a06aafefb
+  checksum: 51af00fcd6452db44a354c032dd9f702fcc1d4630831e0dfabdbeaecc65a838513d8e3c410b3ce78e095c85244f474fa8362f3a576efa30c1a2da5dee37a61c2
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.366":
-  version: 1.0.0-alpha.366
-  resolution: "@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.366"
+"@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.370":
+  version: 1.0.0-alpha.370
+  resolution: "@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.370"
   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: 097d53218a0bfbc72a510dbacd1aa08217e1cbab8938065246808e24887ca054b60afb55dd2c445dea35009876879f2c640fac27900b320da87fd9b43d74c4aa
+  checksum: 04e795d12e2143b8b60dd748966a121682e71d9b496646dcbd546aaf2d9f8d2c1481d67ea68f8371824649f3cef531da62734299073f72be183b98e02489f74f
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.366":
-  version: 1.0.0-alpha.366
-  resolution: "@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.366"
+"@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.370":
+  version: 1.0.0-alpha.370
+  resolution: "@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.370"
   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: 3b1551ae92293e60d720dffa86804e9a204dfbe2bb52924c8fbec0f738ec29260e8f678145413a39b91e973a5b1bb360b3e804b6723b8ae40c0f1d957841d043
+  checksum: 164c61e1dc8ee0f5e77fa5cfb140d58302b40992bf70d91cd5c17dcf5d05d66ba0ac210f58571177825e5db0bef0c0d8c8758545ce4e5879d109cabddba48d9f
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-oca@npm:1.0.0-alpha.366":
-  version: 1.0.0-alpha.366
-  resolution: "@hyperledger/aries-oca@npm:1.0.0-alpha.366"
+"@hyperledger/aries-oca@npm:1.0.0-alpha.370":
+  version: 1.0.0-alpha.370
+  resolution: "@hyperledger/aries-oca@npm:1.0.0-alpha.370"
   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: 362938f1a8b8f83c823ac8d42c30dd5d0b2220026db3b5ba8dc276e5ad58bf1f8b7f16f461c5b9b9d4ef88fda325d538bf042852dbcdaa6e3b7d4bb47a8d6b26
+  checksum: f830121a05046d594d4487de0bcc639f60e749ff4b46ff6f810f75199e3fa533b3366fabaf534e57d931dcabd26b2e41f9ffc97e9ff900e660e7ab38f1d5ce6e
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.366":
-  version: 1.0.0-alpha.366
-  resolution: "@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.366"
+"@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.370":
+  version: 1.0.0-alpha.370
+  resolution: "@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.370"
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 1e53b21855228a69b36e28770e05797be79dcc3022d89d400ba0f6cf3cbb260815f27f02b933dd15ff06afbfb4477ae512f1ca84639e88a7832daa31a4422e6f
+  checksum: 5430262831acddaa29d430015def9c5ceb591e7b804b673ae3d65b15132e1a4bdd51af4f5f5cd515667d4c1bfc016325ca0eb263360aa34e17eb4585c2f833e3
   languageName: node
   linkType: hard
 
@@ -8291,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.366"
-    "@hyperledger/aries-bifold-remote-logs": "npm:1.0.0-alpha.366"
-    "@hyperledger/aries-bifold-verifier": "npm:1.0.0-alpha.366"
-    "@hyperledger/aries-oca": "npm:1.0.0-alpha.366"
-    "@hyperledger/aries-react-native-attestation": "npm:1.0.0-alpha.366"
+    "@hyperledger/aries-bifold-core": "npm:1.0.0-alpha.370"
+    "@hyperledger/aries-bifold-remote-logs": "npm:1.0.0-alpha.370"
+    "@hyperledger/aries-bifold-verifier": "npm:1.0.0-alpha.370"
+    "@hyperledger/aries-oca": "npm:1.0.0-alpha.370"
+    "@hyperledger/aries-react-native-attestation": "npm:1.0.0-alpha.370"
     "@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"