Fetch upstream (#88)

* fix: person credential workflow fix (bcgov#960) * update bifold submodule (bcgov#961) Signed-off-by: wadeking98 <[email protected]> * feat: added person credential to preview notification screen with v1.1 branding (bcgov#959) Signed-off-by: wadeking98 <[email protected]> * fix: match logoSec sizing to bifold, run lint (bcgov#963) Signed-off-by: Bryce McMath <[email protected]> * fix: person credential workflow pt. 2 (bcgov#973) * chore: update bifold submodule (bcgov#977) Signed-off-by: Bryce McMath <[email protected]> * chore: bump version number to 1.0.8 (bcgov#982) Signed-off-by: Bryce McMath <[email protected]> * chore: remove flipper, update bifold submodule (bcgov#985) Signed-off-by: Bryce McMath <[email protected]> * fix: add scroll to splash screen for larger font and display size (bcgov#993) Signed-off-by: Bryce McMath <[email protected]> * chore: update bifold submodule (bcgov#998) Signed-off-by: Bryce McMath <[email protected]> * fix: change product name to BCWallet from AriesBifold (bcgov#994) Signed-off-by: Bryce McMath <[email protected]> * chore: add storybook to bc-wallet-mobile (bcgov#991) Signed-off-by: Clécio Varjão <[email protected]> Signed-off-by: Bryce McMath <[email protected]> Co-authored-by: Clécio Varjão <[email protected]> * fix: android and ios build and pipeline issues (bcgov#1006) Signed-off-by: Bryce McMath <[email protected]> * fix: possible fix for android crashing (bcgov#1007) Signed-off-by: Bryce McMath <[email protected]> * ci: update GHA (bcgov#1009) Signed-off-by: Clécio Varjão <[email protected]> * Updated Smoke test in build pipeline for new iOS app name (bcgov#1010) Signed-off-by: Sheldon Regular <[email protected]> * chore: update GHA build file name and watched files on PR (bcgov#1011) Signed-off-by: Bryce McMath <[email protected]> * Support for bifold new monorepo structure (bcgov#1012) Signed-off-by: Clécio Varjão <[email protected]> * chore: update bifold submodule (bcgov#1020) Signed-off-by: Bryce McMath <[email protected]> * chore: peg ios build to xcode 14.2 Signed-off-by: Jason C. Leach <[email protected]> * updated branding for traction agent (bcgov#1025) Signed-off-by: wadeking98 <[email protected]> * chore: update bifold submodule (bcgov#1027) Signed-off-by: Bryce McMath <[email protected]> * chore: add patch to support xcode 14.3 (bcgov#1023) Signed-off-by: Jason C. Leach <[email protected]> * Small fix Signed-off-by: Jean-Christophe <[email protected]> * Fix occurence of bcwallet Signed-off-by: Jean-Christophe <[email protected]> * Fix android setup - portefeuilleqc reference Signed-off-by: Jean-Christophe <[email protected]> --------- Signed-off-by: wadeking98 <[email protected]> Signed-off-by: Bryce McMath <[email protected]> Signed-off-by: Clécio Varjão <[email protected]> Signed-off-by: Sheldon Regular <[email protected]> Signed-off-by: Jason C. Leach <[email protected]> Signed-off-by: Jean-Christophe <[email protected]> Co-authored-by: Akiff Manji <[email protected]> Co-authored-by: Wade King <[email protected]> Co-authored-by: Bryce McMath <[email protected]> Co-authored-by: Clécio Varjão <[email protected]> Co-authored-by: Sheldon Regular <[email protected]> Co-authored-by: Jason C. Leach <[email protected]>
CQEN-QDCE · Apr 13, 2023 · e8a8ddd · e8a8ddd
1 parent 692fff9
commit e8a8ddd
Show file tree

Hide file tree

Showing 48 changed files with 32,527 additions and 71,082 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -12,10 +12,13 @@ on:
     paths:
       - app/**
       - bifold
+      - .github/workflows/**
   pull_request:
     branches: [main]
     paths:
       - app/**
+      - bifold
+      - .github/workflows/**
 
 jobs:
   check-android-secrets:
@@ -162,15 +165,14 @@ jobs:
           scripts/makekc.sh ${{ secrets.KEYCHIAN_PASSWD }}
 
       - name: Update ledgers
-        if: github.ref_name == 'main' && needs.check-ios-secrets.outputs.isReleaseBuild == 'true'
         run: |
           node bifold/scripts/make-blocks.js
 
           # the ledgers file should be about 344K
           ls -lah ledgers.json
 
-          mv ledgers.json bifold/core/configs/ledgers/indy/ledgers.json
-          shasum bifold/core/configs/ledgers/indy/ledgers.json
+          mv ledgers.json bifold/packages/legacy/core/configs/ledgers/indy/ledgers.json
+          shasum bifold/packages/legacy/core/configs/ledgers/indy/ledgers.json
 
       - name: Release build
         if: github.ref_name == 'main' && needs.check-ios-secrets.outputs.isReleaseBuild == 'true'
@@ -278,10 +280,10 @@ jobs:
           ls -lah ledgers.json
           # note md5
           shasum ledgers.json
-          shasum bifold/core/configs/ledgers/indy/ledgers.json
+          shasum bifold/packages/legacy/core/configs/ledgers/indy/ledgers.json
 
-          mv ledgers.json bifold/core/configs/ledgers/indy/ledgers.json
-          shasum bifold/core/configs/ledgers/indy/ledgers.json
+          mv ledgers.json bifold/packages/legacy/core/configs/ledgers/indy/ledgers.json
+          shasum bifold/packages/legacy/core/configs/ledgers/indy/ledgers.json
 
       - name: Cache node modules
         uses: actions/cache@v1
@@ -337,6 +339,8 @@ jobs:
           VERSION_CODE: ${{ env.appBuildNumber }}
           VERSION_NAME: ${{ env.appBuildVersion }}
         run: |
+          cp ../node_modules/react-native-vector-icons/Fonts/* ./app/src/main/assets/fonts/ && \
+          ( cd ../ && npx react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle  --verbose ) && \
           ./gradlew bundleRelease
 
       - name: Ship to Google Play
@@ -376,10 +380,10 @@ jobs:
       matrix:
         include:
           - mobile-platform: "-p Android"
-            app-file-name: "-a AriesBifold-${{ github.run_number }}.aab"
+            app-file-name: "-a QCWallet-${{ github.run_number }}.aab"
             report-project: "android-one-device-smoke"
           - mobile-platform: "-p iOS"
-            app-file-name: "-a AriesBifold-${{ github.run_number }}.ipa"
+            app-file-name: "-a QCWallet-${{ github.run_number }}.ipa"
             report-project: "ios-one-device-smoke"
     timeout-minutes: 60
     steps:
@@ -426,7 +430,7 @@ jobs:
           DEVICE_CLOUD_KEY: "-k ${{ secrets.LAMBDA_ACCESS_KEY }}"
           MOBILE_PLATFORM: ${{ matrix.mobile-platform }}
           APP_FILE_NAME: ${{ matrix.app-file-name }}
-          TEST_SCOPE: "-t @bc_wallet -t @SmokeTest"
+          TEST_SCOPE: "-t @qc_wallet -t @SmokeTest"
           REPORT_PROJECT: ${{ matrix.report-project }}
 
       - name: Upload smoke-test results to Allure

diff --git a/.gitignore b/.gitignore
@@ -28,16 +28,15 @@ local.properties
 
 # aries-bifold should be cloned separately
 aries-bifold/
-storybook/
 *.code-workspace
 
 # 3rd-party
 app/ios/Pods/*
 !app/ios/Pods/Frameworks
 
-# ?
-app/patches/*.patch
-!app/patches/@aries-framework*.patch
+# This patch must be dynamically generated by something
+# so its excluded.
+app/patches/react-native-gifted-chat*.patch
 
 # xcode
 xcuserdata/

diff --git a/app/.npmrc b/app/.npmrc
@@ -0,0 +1 @@
+legacy-peer-deps=true
diff --git a/app/App.tsx b/app/App.tsx
@@ -23,10 +23,10 @@ import { Linking, StatusBar } from 'react-native'
 import SplashScreen from 'react-native-splash-screen'
 import Toast from 'react-native-toast-message'
 
-import bcwallet from './src'
+import qcwallet from './src'
 import { initialState, reducer } from './src/store'
 
-const { theme, localization, configuration } = bcwallet
+const { theme, localization, configuration } = qcwallet
 
 initLanguages(localization)
 

diff --git a/app/AppStorybook.tsx b/app/AppStorybook.tsx
@@ -0,0 +1,18 @@
+import { initLanguages } from 'aries-bifold'
+import React from 'react'
+import { LogBox } from 'react-native'
+
+import qcwallet from './src'
+import StorybookUIRoot from './storybook'
+
+const { localization } = qcwallet
+
+initLanguages(localization)
+
+LogBox.ignoreAllLogs()
+
+const Base = () => {
+  return <StorybookUIRoot />
+}
+
+export default Base
diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
@@ -221,19 +221,6 @@ dependencies {
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-      exclude group:'com.facebook.fbjni'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
-
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";
         debugImplementation files(hermesPath + "hermes-debug.aar")

diff --git a/app/android/app/src/debug/java/com/ariesbifold/ReactNativeFlipper.java b/app/android/app/src/debug/java/com/ariesbifold/ReactNativeFlipper.java
diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml
@@ -39,7 +39,7 @@
         <category android:name="android.intent.category.DEFAULT"/>
         <category android:name="android.intent.category.BROWSABLE"/>
         <data android:scheme="didcomm"/>
-        <data android:scheme="bcwallet"/>
+        <data android:scheme="qcwallet"/>
       </intent-filter>
     </activity>
   </application>

diff --git a/app/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/app/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
diff --git a/.../ca/bc/gov/bifoldwallet/MainActivity.java → ...ava/ca/qc/gouv/QCWallet/MainActivity.java b/.../ca/bc/gov/bifoldwallet/MainActivity.java → ...ava/ca/qc/gouv/QCWallet/MainActivity.java
@@ -24,6 +24,6 @@ protected void onCreate(Bundle savedInstanceState) {
     }
   }
   protected String getMainComponentName() {
-    return "BCWallet";
+    return "QCWallet";
   }
 }
diff --git a/.../bc/gov/bifoldwallet/MainApplication.java → .../ca/qc/gouv/QCWallet/MainApplication.java b/.../bc/gov/bifoldwallet/MainApplication.java → .../ca/qc/gouv/QCWallet/MainApplication.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
+import com.oblador.vectoricons.VectorIconsPackage;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
@@ -44,30 +45,6 @@ public ReactNativeHost getReactNativeHost() {
   public void onCreate() {
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
-    // initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-  }
-
-  private static void initializeFlipper(
-  Context context, ReactInstanceManager reactInstanceManager) {
-    if (BuildConfig.DEBUG) {
-      try {
-        /*
-         We use reflection here to pick up the class that initializes Flipper,
-        since Flipper library is not available in release mode
-        */
-        Class<?> aClass = Class.forName("ca.qc.gouv.portefeuilleqc.ReactNativeFlipper");
-        aClass
-            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
-            .invoke(null, context, reactInstanceManager);
-      } catch (ClassNotFoundException e) {
-        e.printStackTrace();
-      } catch (NoSuchMethodException e) {
-        e.printStackTrace();
-      } catch (IllegalAccessException e) {
-        e.printStackTrace();
-      } catch (InvocationTargetException e) {
-        e.printStackTrace();
-      }
-    }
   }
 }
+
diff --git a/app/android/build.gradle b/app/android/build.gradle
@@ -2,11 +2,11 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "30.0.2"
+        buildToolsVersion = "31.0.0"
         minSdkVersion = 21
         compileSdkVersion = 31
         targetSdkVersion = 31
-        ndkVersion = "21.4.7075529"
+        ndkVersion = "25.1.8937393"
         // The setting `androidXBrowser` is temporary until it can be fixed in 
         // the npm package `react-native-inappbrowser-reborn` v3.7.0.
         // Ref. https://github.com/proyecto26/react-native-inappbrowser/issues/386
@@ -17,7 +17,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath("com.android.tools.build:gradle:7.2.1")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/app/android/gradle.properties b/app/android/gradle.properties
@@ -25,6 +25,4 @@
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-# Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.99.0
 org.gradle.jvmargs=-Xmx4096m
diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Mar 28 09:27:49 PDT 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/app/app.json b/app/app.json
@@ -1,4 +1,4 @@
 {
-  "name": "BCWallet",
+  "name": "QCWallet",
   "displayName": "Portefeuille QC"
 }
diff --git a/app/index.js b/app/index.js
@@ -26,9 +26,8 @@ import { AppRegistry } from 'react-native'
 
 import App from './App'
 import { name as appName } from './app.json'
-import bcwallet from './src/'
-
-const { theme } = bcwallet
+import qcwallet from './src/'
+const { theme } = qcwallet
 
 const { ColorPallet } = theme
 
@@ -51,5 +50,4 @@ const Base = () => {
     </NavigationContainer>
   )
 }
-
 AppRegistry.registerComponent(appName, () => Base)
diff --git a/app/indexStorybook.js b/app/indexStorybook.js
@@ -0,0 +1,7 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { AppRegistry } from 'react-native'
+
+import { name as appName } from './app.json'
+import StorybookUIRoot from './storybook'
+
+AppRegistry.registerComponent(appName, () => StorybookUIRoot)
diff --git a/app/ios/AriesBifold.xcodeproj/project.pbxproj b/app/ios/AriesBifold.xcodeproj/project.pbxproj
@@ -54,7 +54,7 @@
 		00E356EE1AD99517003FC87E /* AriesBifoldTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AriesBifoldTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* AriesBifoldTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AriesBifoldTests.m; sourceTree = "<group>"; };
-		13B07F961A680F5B00A75B9A /* AriesBifold.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AriesBifold.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		13B07F961A680F5B00A75B9A /* QCWallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QCWallet.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>"; };
@@ -183,7 +183,7 @@
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				13B07F961A680F5B00A75B9A /* AriesBifold.app */,
+				13B07F961A680F5B00A75B9A /* QCWallet.app */,
 				00E356EE1AD99517003FC87E /* AriesBifoldTests.xctest */,
 			);
 			name = Products;
@@ -244,7 +244,7 @@
 			);
 			name = AriesBifold;
 			productName = AriesBifold;
-			productReference = 13B07F961A680F5B00A75B9A /* AriesBifold.app */;
+			productReference = 13B07F961A680F5B00A75B9A /* QCWallet.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */