Merge branch 'master' into nymkappa/bugfix/historical-price-bitcoin-only

frontend/src/app/components/qrcode/qrcode.component.html

@@ -1,4 +1,4 @@
 <div class="holder" [ngStyle]="{'width': size, 'height': size}">
   <img *ngIf="imageUrl" [src]="imageUrl">
-  <canvas #canvas></canvas>
+  <canvas #canvas [style]="{'border': border + 'px solid white'}"></canvas>
 </div>

frontend/src/app/components/qrcode/qrcode.component.ts

@@ -12,6 +12,7 @@ export class QrcodeComponent implements AfterViewInit {
   @Input() data: string;
   @Input() size = 125;
   @Input() imageUrl: string;
+  @Input() border = 0;
   @ViewChild('canvas') canvas: ElementRef;
 
   qrcodeObject: any;