Merge branch 'muon' of https://github.com/particl/particl-desktop int…

…o muon

src/app/core-ui/main/main-view.component.ts

@@ -153,6 +153,7 @@ export class MainViewComponent implements OnInit, OnDestroy {
   keyDownEvent(event: any) {
     if (event.metaKey && event.keyCode === 86 && navigator.platform.indexOf('Mac') > -1) {
       document.execCommand('Paste');
+      event.preventDefault();
     }
   }
 

yarn.lock

@@ -432,12 +432,12 @@ amqplib@^0.5.2:
     buffer-more-ints "0.0.2"
     readable-stream "1.x >=1.1.9"
     safe-buffer "^5.0.1"
-
-angular2-qrcode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/angular2-qrcode/-/angular2-qrcode-2.0.1.tgz#1b4e65c302694b5078ca06f71138f7e4367754dc"
+    
+angularx-qrcode@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/angularx-qrcode/-/angularx-qrcode-1.0.1.tgz#9b10423995cd7448ef38843e241407ce7337daad"
   dependencies:
-    qrious "^2.2.0"
+    qrcodejs2 "0.0.2"
 
 ansi-align@^2.0.0:
   version "2.0.0"
@@ -1408,12 +1408,6 @@ caniuse-lite@^1.0.30000791, caniuse-lite@^1.0.30000792:
   version "1.0.30000804"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000804.tgz#8729a143d65378e8936adbb161f550e9c49fc09d"
 
-canvas@^1.6.5:
-  version "1.6.9"
-  resolved "https://registry.yarnpkg.com/canvas/-/canvas-1.6.9.tgz#e3f95cec7b16bf2d6f3fc725c02d940d3258f69b"
-  dependencies:
-    nan "^2.4.0"
-
 capture-stack-trace@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
@@ -7131,11 +7125,9 @@ qjobs@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
 
-qrious@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/qrious/-/qrious-2.3.0.tgz#ca7ce68a82099a67a90e4979f4b1cdf51ef32475"
-  optionalDependencies:
-    canvas "^1.6.5"
+[email protected]:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/qrcodejs2/-/qrcodejs2-0.0.2.tgz#465afe5e39f19facecb932c11f7a186109146ae1"
 
 [email protected], qs@~6.5.1:
   version "6.5.1"