Merge branch 'develop' into 'master'

Develop See merge request papers/airgap/airgap-vault!456
airgap-it · Jun 30, 2023 · 6c318b3 · 6c318b3
2 parents 2afb19e + 147df5f
commit 6c318b3
Show file tree

Hide file tree

Showing 39 changed files with 2,919 additions and 3,253 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -1,5 +1,6 @@
-Chrome >=60
-Firefox >=63
+Chrome >=79
+ChromeAndroid >=79
+Firefox >=70
 Edge >=79
-Safari >=13
-iOS >=13
+Safari >=14
+iOS >=14
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -139,11 +139,8 @@ jobs:
           path: ./*
           key: prebuild-${{ runner.os }}-${{ github.sha }}
 
-      - name: 🔧 Disable pure getters
-        run: yarn run disable-pure-getters
-
-      - name: 🔧 Configure mangle
-        run: yarn run configure-mangle
+      - name: 🔧 Prepare prod build
+        run: yarn run prepare-prod-build
 
       - name: 🔧 Apply diagnostic modules
         run: yarn run apply-diagnostic-modules

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -109,7 +109,7 @@ build_ios:
     - export DEVELOPER_DIR=$XCODE_PATH
     - nvm use 16.19.1
     - yarn install --frozen-lockfile
-    - yarn configure-mangle
+    - yarn prepare-prod-build
     - yarn apply-diagnostic-modules # manually remove unused cordova-diagnostic-plugin modules
     - yarn ionic info
     - yarn ionic build --prod

diff --git a/angular.json b/angular.json
@@ -1,7 +1,6 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
-  "defaultProject": "app",
   "newProjectRoot": "projects",
   "projects": {
     "app": {
@@ -191,8 +190,10 @@
     }
   },
   "cli": {
-    "defaultCollection": "@ionic/angular-toolkit",
-    "analytics": false
+    "analytics": false,
+    "schematicCollections": [
+      "@ionic/angular-toolkit"
+    ]
   },
   "schematics": {
     "@ionic/angular-toolkit:component": {

diff --git a/build/android/Dockerfile b/build/android/Dockerfile
@@ -30,7 +30,6 @@ COPY . /app
 ARG BUILD_NR
 RUN sed -i -e "s/versionCode 1/versionCode $BUILD_NR/g" /app/android/app/build.gradle
 
-# disable pure getters due to https://github.com/angular/angular-cli/issues/11439
 # configure mangle (keep_fnames) for bitcoinjs https://github.com/bitcoinjs/bitcoinjs-lib/issues/959
 # remove unused cordova-diagnostic-plugin features
 # jetify dependencies
@@ -43,7 +42,7 @@ RUN sed -i -e "s/versionCode 1/versionCode $BUILD_NR/g" /app/android/app/build.g
 # this has nothing to do with debug!!!:
 # copy release-apk
 # sign using debug key
-RUN yarn configure-mangle \
+RUN yarn prepare-prod-build \
     && yarn apply-diagnostic-modules \
     && yarn jetifier \
     && yarn ionic build --prod \

diff --git a/package.json b/package.json
@@ -28,62 +28,62 @@
     "prettier": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
     "remove-sapling": "replace './assets/sapling/sapling-' './assets/no-sapling-web/sapling-' ./src/app/app.component.ts",
     "prepare-prod-build": "yarn configure-mangle",
-    "disable-pure-getters": "echo 'noop' >> /dev/null",
-    "configure-mangle": "replace 'keepNames: isPlatformServer' 'keepNames: true' ./node_modules/@angular-devkit/build-angular/src/webpack/configs/common.js ",
+    "configure-mangle": "replace 'keepNames: isPlatformServer' 'keepNames: true' ./node_modules/@angular-devkit/build-angular/src/tools/webpack/configs/common.js ",
     "electron": "yarn --cwd electron/ run start",
     "electron:install": "yarn --cwd electron/ install --",
     "install-test-dependencies": "node install-test-deps.js",
     "install-build-dependencies": "node install-build-deps.js",
     "apply-diagnostic-modules": "node apply-diagnostic-modules.js"
   },
   "resolutions": {
-    "@airgap/aeternity": "0.13.16",
-    "@airgap/astar": "0.13.16",
-    "@airgap/bitcoin": "0.13.16",
-    "@airgap/coinlib-core": "0.13.16",
-    "@airgap/coreum": "0.13.16",
-    "@airgap/cosmos": "0.13.16",
-    "@airgap/cosmos-core": "0.13.16",
-    "@airgap/crypto": "0.13.16",
-    "@airgap/ethereum": "0.13.16",
-    "@airgap/groestlcoin": "0.13.16",
-    "@airgap/icp": "0.13.16",
-    "@airgap/module-kit": "0.13.16",
-    "@airgap/moonbeam": "0.13.16",
-    "@airgap/optimism": "0.13.16",
-    "@airgap/polkadot": "0.13.16",
-    "@airgap/serializer": "0.13.16",
-    "@airgap/substrate": "0.13.16",
-    "@airgap/tezos": "0.13.16"
+    "@airgap/aeternity": "0.13.17",
+    "@airgap/astar": "0.13.17",
+    "@airgap/bitcoin": "0.13.17",
+    "@airgap/coinlib-core": "0.13.17",
+    "@airgap/coreum": "0.13.17",
+    "@airgap/cosmos": "0.13.17",
+    "@airgap/cosmos-core": "0.13.17",
+    "@airgap/crypto": "0.13.17",
+    "@airgap/ethereum": "0.13.17",
+    "@airgap/groestlcoin": "0.13.17",
+    "@airgap/icp": "0.13.17",
+    "@airgap/module-kit": "0.13.17",
+    "@airgap/moonbeam": "0.13.17",
+    "@airgap/optimism": "0.13.17",
+    "@airgap/polkadot": "0.13.17",
+    "@airgap/serializer": "0.13.17",
+    "@airgap/substrate": "0.13.17",
+    "@airgap/tezos": "0.13.17"
   },
   "dependencies": {
-    "@airgap/aeternity": "0.13.16",
-    "@airgap/angular-core": "0.0.38",
-    "@airgap/angular-ngrx": "0.0.38",
-    "@airgap/astar": "0.13.16",
-    "@airgap/bitcoin": "0.13.16",
-    "@airgap/coinlib-core": "0.13.16",
-    "@airgap/coreum": "0.13.16",
-    "@airgap/cosmos": "0.13.16",
-    "@airgap/cosmos-core": "0.13.16",
-    "@airgap/crypto": "0.13.16",
-    "@airgap/ethereum": "0.13.16",
-    "@airgap/groestlcoin": "0.13.16",
-    "@airgap/icp": "0.13.16",
-    "@airgap/module-kit": "0.13.16",
-    "@airgap/moonbeam": "0.13.16",
-    "@airgap/optimism": "0.13.16",
-    "@airgap/polkadot": "0.13.16",
+    "@airgap/aeternity": "0.13.17",
+    "@airgap/angular-core": "0.0.39",
+    "@airgap/angular-ngrx": "0.0.39",
+    "@airgap/astar": "0.13.17",
+    "@airgap/bitcoin": "0.13.17",
+    "@airgap/coinlib-core": "0.13.17",
+    "@airgap/coreum": "0.13.17",
+    "@airgap/cosmos": "0.13.17",
+    "@airgap/cosmos-core": "0.13.17",
+    "@airgap/crypto": "0.13.17",
+    "@airgap/ethereum": "0.13.17",
+    "@airgap/groestlcoin": "0.13.17",
+    "@airgap/icp": "0.13.17",
+    "@airgap/module-kit": "0.13.17",
+    "@airgap/moonbeam": "0.13.17",
+    "@airgap/optimism": "0.13.17",
+    "@airgap/polkadot": "0.13.17",
     "@airgap/sapling-wasm": "0.0.7",
-    "@airgap/serializer": "0.13.16",
-    "@airgap/substrate": "0.13.16",
-    "@airgap/tezos": "0.13.16",
-    "@angular/common": "13.2.5",
-    "@angular/core": "13.2.5",
-    "@angular/forms": "13.2.5",
-    "@angular/platform-browser": "13.2.5",
-    "@angular/platform-browser-dynamic": "13.2.5",
-    "@angular/router": "13.2.5",
+    "@airgap/serializer": "0.13.17",
+    "@airgap/substrate": "0.13.17",
+    "@airgap/tezos": "0.13.17",
+    "@angular/cdk": "^14.2.7",
+    "@angular/common": "16.1.1",
+    "@angular/core": "16.1.1",
+    "@angular/forms": "16.1.1",
+    "@angular/platform-browser": "16.1.1",
+    "@angular/platform-browser-dynamic": "16.1.1",
+    "@angular/router": "16.1.1",
     "@capacitor/android": "^5.0.0",
     "@capacitor/app": "^5.0.0",
     "@capacitor/app-launcher": "^5.0.0",
@@ -101,22 +101,23 @@
     "@ionic-native/core": "5.36.0",
     "@ionic-native/device-motion": "5.36.0",
     "@ionic-native/diagnostic": "5.36.0",
-    "@ionic/angular": "6.0.10",
-    "@ionic/core": "6.0.10",
-    "@ionic/storage": "2.2.0",
-    "@keystonehq/bc-ur-registry": "0.4.4",
-    "@keystonehq/bc-ur-registry-eth": "0.7.5",
+    "@ionic/angular": "^7.0.12",
+    "@ionic/core": "^7.0.12",
+    "@ionic/storage": "^4.0.0",
+    "@ionic/storage-angular": "^4.0.0",
+    "@keystonehq/bc-ur-registry": "0.6.3",
+    "@keystonehq/bc-ur-registry-eth": "0.19.1",
     "@ngraveio/bc-ur": "1.1.6",
-    "@ngrx/component": "^12.5.1",
-    "@ngrx/component-store": "^12.5.1",
-    "@ngrx/effects": "^10.1.2",
-    "@ngrx/store": "^10.1.2",
-    "@ngx-translate/core": "^13.0.0",
-    "@zxing/browser": "0.0.8",
-    "@zxing/library": "0.18.4",
-    "@zxing/ngx-scanner": "3.1.3",
+    "@ngrx/component": "^16.0.1",
+    "@ngrx/component-store": "^16.0.1",
+    "@ngrx/effects": "^16.0.1",
+    "@ngrx/store": "^16.0.1",
+    "@ngx-translate/core": "^15.0.0",
+    "@zxing/browser": "0.1.4",
+    "@zxing/library": "^0.20.0",
+    "@zxing/ngx-scanner": "^16.0.0",
     "angular2-uuid": "^1.1.1",
-    "angularx-qrcode": "^11.0.0",
+    "angularx-qrcode": "^16.0.0",
     "axios": "^0.24.0",
     "bignumber.js": "^9.0.0",
     "bip32": "^2.0.6",
@@ -135,61 +136,62 @@
     "localforage-cordovasqlitedriver": "^1.8.0",
     "moment": "^2.27.0",
     "myetherwallet-blockies": "^0.1.1",
-    "ngx-moment": "^5.0.0",
+    "ngx-moment": "^6.0.2",
     "process": "0.11.10",
-    "rxjs": "~6.6.7",
+    "rxjs": "^7.8.1",
     "secrets.js-grempe": "^1.1.0",
     "stream-http": "^3.2.0",
+    "swiper": "^9.4.1",
     "tslib": "^1.10.0",
     "uuid": "^8.3.2",
     "wif": "^2.0.6",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.13.1"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "0.1302.5",
-    "@angular-devkit/build-angular": "13.2.5",
-    "@angular-devkit/core": "13.2.5",
-    "@angular-devkit/schematics": "13.2.5",
-    "@angular/cli": "13.2.5",
-    "@angular/compiler": "13.2.5",
-    "@angular/compiler-cli": "13.2.5",
-    "@angular/language-service": "13.2.5",
+    "@angular-devkit/architect": "0.1601.0",
+    "@angular-devkit/build-angular": "16.1.0",
+    "@angular-devkit/core": "16.1.0",
+    "@angular-devkit/schematics": "16.1.0",
+    "@angular/cli": "16.1.0",
+    "@angular/compiler": "16.1.1",
+    "@angular/compiler-cli": "16.1.1",
+    "@angular/language-service": "16.1.1",
     "@capacitor/cli": "^5.0.0",
-    "@ionic/angular-toolkit": "6.0.0",
-    "@ionic/cli": "6.18.2",
+    "@ionic/angular-toolkit": "^9.0.0",
+    "@ionic/cli": "^7.1.1",
     "@types/emscripten": "^1.39.6",
-    "@types/node": "17.0.21",
+    "@types/node": "20.3.1",
     "browserify": "^17.0.0",
     "crypto-browserify": "3.12.0",
     "jetifier": "1.6.6",
     "path-browserify": "1.0.1",
     "replace": "1.2.1",
     "sonarqube-scanner": "2.8.1",
     "stream-browserify": "3.0.0",
-    "typescript": "4.4.4"
+    "typescript": "4.9.5"
   },
   "buildDependencies": {
-    "@angular-devkit/architect": "0.1302.5",
-    "@angular-devkit/build-angular": "13.2.5",
-    "@angular-devkit/core": "13.2.5",
-    "@angular-devkit/schematics": "13.2.5",
-    "@angular/cli": "13.2.5",
-    "@angular/compiler": "13.2.5",
-    "@angular/compiler-cli": "13.2.5",
-    "@angular/language-service": "13.2.5",
-    "@capacitor/cli": "3.2.5",
-    "@ionic/angular-toolkit": "6.0.0",
-    "@ionic/cli": "6.18.2",
+    "@angular-devkit/architect": "0.1601.0",
+    "@angular-devkit/build-angular": "16.1.0",
+    "@angular-devkit/core": "16.1.0",
+    "@angular-devkit/schematics": "16.1.0",
+    "@angular/cli": "16.1.0",
+    "@angular/compiler": "16.1.1",
+    "@angular/compiler-cli": "16.1.1",
+    "@angular/language-service": "16.1.1",
+    "@capacitor/cli": "^5.0.0",
+    "@ionic/angular-toolkit": "^9.0.0",
+    "@ionic/cli": "^7.1.1",
     "@types/emscripten": "^1.39.6",
-    "@types/node": "17.0.21",
+    "@types/node": "20.3.1",
     "browserify": "^17.0.0",
     "crypto-browserify": "3.12.0",
     "jetifier": "1.6.6",
     "path-browserify": "1.0.1",
     "replace": "1.2.1",
     "sonarqube-scanner": "2.8.1",
     "stream-browserify": "3.0.0",
-    "typescript": "4.4.4"
+    "typescript": "4.9.5"
   },
   "testDependencies": {
     "@types/core-js": "^2.5.0",
@@ -240,5 +242,6 @@
       "cordova.plugins.diagnostic": {},
       "cordova-plugin-device-motion": {}
     }
-  }
+  },
+  "packageManager": "yarn@1.22.19"
 }
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -237,7 +237,7 @@ const routes: Routes = [
 ]
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules, relativeLinkResolution: 'corrected' })],
+  imports: [RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })],
   exports: [RouterModule]
 })
 export class AppRoutingModule {}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -20,6 +20,7 @@ import { StatusBarPlugin, Style } from '@capacitor/status-bar'
 import { ModalController, Platform } from '@ionic/angular'
 import { TranslateService } from '@ngx-translate/core'
 import { first } from 'rxjs/operators'
+import { register } from 'swiper/element/bundle'
 
 import { SecurityUtilsPlugin } from './capacitor-plugins/definitions'
 import { SECURITY_UTILS_PLUGIN } from './capacitor-plugins/injection-tokens'
@@ -43,6 +44,9 @@ const defer = (fn: () => void) => {
   setTimeout(fn, 200)
 }
 
+// Swiper
+register()
+
 @Component({
   selector: 'airgap-root',
   templateUrl: 'app.component.html'