Merge branch 'develop' into 'master'

Develop See merge request papers/airgap/airgap-vault!338
airgap-it · Apr 8, 2022 · 7df4dcc · 7df4dcc
2 parents 8900bb5 + 955546b
commit 7df4dcc
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/ios/App/App.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/App/App.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,16 +1,14 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "AirGapSapling",
-        "repositoryURL": "https://github.com/airgap-it/airgap-sapling",
-        "state": {
-          "branch": null,
-          "revision": "c6606fce5d84cea678414681b13ef5efb3629a7e",
-          "version": "0.0.6"
-        }
+  "pins" : [
+    {
+      "identity" : "airgap-sapling",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/airgap-it/airgap-sapling",
+      "state" : {
+        "revision" : "00848f05c305c9997c8f7325527ddc20de7edd2b",
+        "version" : "0.0.7"
       }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 2
 }
diff --git a/ios/App/App/Camera/CameraPreview.swift b/ios/App/App/Camera/CameraPreview.swift
@@ -41,6 +41,7 @@ public class CameraPreview: CAPPlugin {
                     if let webView = self.webView {
                         webView.isOpaque = false
                         webView.backgroundColor = UIColor.clear
+                        webView.scrollView.backgroundColor = UIColor.clear
 
                         webView.superview?.addSubview(self.previewView)
                         webView.superview?.bringSubviewToFront(webView)

diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -12,6 +12,7 @@ def capacitor_pods
   pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
   pod 'CapacitorAppLauncher', :path => '../../node_modules/@capacitor/app-launcher'
   pod 'CapacitorClipboard', :path => '../../node_modules/@capacitor/clipboard'
+  pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
   pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
   pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'

diff --git a/package.json b/package.json
@@ -37,9 +37,9 @@
     "apply-diagnostic-modules": "node apply-diagnostic-modules.js"
   },
   "dependencies": {
-    "@airgap/angular-core": "0.0.27",
-    "@airgap/angular-ngrx": "0.0.27",
-    "@airgap/coinlib-core": "0.13.0",
+    "@airgap/angular-core": "0.0.28",
+    "@airgap/angular-ngrx": "0.0.28",
+    "@airgap/coinlib-core": "0.13.1",
     "@airgap/sapling-wasm": "0.0.7",
     "@angular/common": "^11.2.9",
     "@angular/core": "^11.2.9",
@@ -83,7 +83,7 @@
     "cordova-plugin-audioinput": "1.0.1",
     "cordova-plugin-compat": "1.2.0",
     "cordova-plugin-device-motion": "^2.0.1",
-    "cordova-plugin-qrscanner": "3.0.1",
+    "cordova-plugin-qrscanner-11": "3.0.3",
     "cordova-sqlite-storage": "^6.0.0",
     "cordova.plugins.diagnostic": "4.0.10",
     "core-js": "^3.10.1",

diff --git a/yarn.lock b/yarn.lock
@@ -2,24 +2,24 @@
 # yarn lockfile v1
 
 
-"@airgap/[email protected].27":
-  version "0.0.27"
-  resolved "https://registry.yarnpkg.com/@airgap/angular-core/-/angular-core-0.0.27.tgz#dce627883f5204395a462e9bd8232b3abd65ae59"
-  integrity sha512-jqvdd8O3iZWE6pN9ISxsIGdAs7NZaX/rAvEK2iKdOYJAtJMF5bPKjFT8unU/NRHD3zEykz14u9dvU59VN9596Q==
+"@airgap/[email protected].28":
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/@airgap/angular-core/-/angular-core-0.0.28.tgz#97727df138f3afb492b217aee09671f8c0003031"
+  integrity sha512-bXL7TVZM09DfKE6R37AKY9kIdpbaQl9w2yMy4eWT/7dv1NY3uzxD6y6HJsaWZM7g5JZicCZJaWLVBkYWrVRTxQ==
   dependencies:
     tslib "^2.2.0"
 
-"@airgap/[email protected].27":
-  version "0.0.27"
-  resolved "https://registry.yarnpkg.com/@airgap/angular-ngrx/-/angular-ngrx-0.0.27.tgz#58d2e96e390481c1e381a8d3fce7518deed25d6c"
-  integrity sha512-P1dTpp8/NPhNdGy7aAIl1hsYvklrt4eo2DeLC4BQB8nxqAFNxZKsKb1MmqttJ2QuZwjIAwfKhmqGg1seY210RQ==
+"@airgap/[email protected].28":
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/@airgap/angular-ngrx/-/angular-ngrx-0.0.28.tgz#5110121aa43170bec048235d9a21b7ee079dc099"
+  integrity sha512-pybBxK+nQ6yxAgZJ72trlcXG3OIRMo+L1Wc6dVAl1hc19jNT3+9Q9CKysV2y4wdvoUZ+1mUhBLQbbh6uTT7Oww==
   dependencies:
     tslib "^2.2.0"
 
-"@airgap/[email protected].0":
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/@airgap/coinlib-core/-/coinlib-core-0.13.0.tgz#0f45310fbd3b03386c4d439bb70db3118a728f01"
-  integrity sha512-MWrORGoqIhqwhrMfdfL/ynOHs5Hru6Zk0BLjIcQIPFOlKElzPFgX2VK9YxLfKh1bCgQ11atOOePwvbNLTwihug==
+"@airgap/[email protected].1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@airgap/coinlib-core/-/coinlib-core-0.13.1.tgz#ab40e79b2e6adc1a844ce4b7caccdd6003d5f88e"
+  integrity sha512-dEIHSgUlBYsiXZmcH6uqaQL8kz2NqcGV4pXs+PGz1emo4y+StzSY+IxHj2wyF3R3TkMh7Cf5HWUJDhIKjX32iA==
   dependencies:
     "@airgap/sapling-wasm" "0.0.5"
     "@ethereumjs/common" "2.6.0"
@@ -3546,10 +3546,10 @@ cordova-plugin-device-motion@^2.0.1:
   resolved "https://registry.npmjs.org/cordova-plugin-device-motion/-/cordova-plugin-device-motion-2.0.1.tgz"
   integrity sha1-f22XTE64/Frljpqt1j2fpQLt7G0=
 
-[email protected].1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/cordova-plugin-qrscanner/-/cordova-plugin-qrscanner-3.0.1.tgz"
-  integrity sha512-xrwOP3nD+VmRSiV0w7chZ5PLw2YwpI9vtLdeoGNYLLzmmjjYbyIof+x9vOEOgjtwrg9S61rukmOZhQAmkzaosA==
+cordova-plugin-qrscanner-11@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/cordova-plugin-qrscanner-11/-/cordova-plugin-qrscanner-11-3.0.3.tgz#1360844a7f447d1fb2ae34aa5d4a76847d394fa7"
+  integrity sha512-eKl+3Tv1FTR28l6Nbwm4x0m2erNy5ThwDXhI8gaT64cGcN84Ojy8c3JV9SCZZGyrHLSKTd4NlGVH4904I+EYwg==
   dependencies:
     qrcode-reader "^1.0.4"
     webrtc-adapter "^3.1.4"