Merge branch 'master' into fix_electrum_api

.github/workflows/ci.yml

@@ -27,12 +27,12 @@ jobs:
 
       - name: Install
         if: ${{ matrix.flavor == 'dev'}}
-        run: npm install
+        run: npm ci
         working-directory: ${{ matrix.flavor }}/backend
 
       - name: Install (Prod dependencies only)
         if: ${{ matrix.flavor == 'prod'}}
-        run: npm install --prod
+        run: npm ci --prod --no-optional
         working-directory: ${{ matrix.flavor }}/backend
 
       - name: Lint 
@@ -67,16 +67,17 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install (Prod dependencies only)
-        run: npm install
+        run: npm ci --prod --no-optional
         if: ${{ matrix.flavor == 'prod'}}
         working-directory: ${{ matrix.flavor }}/frontend
 
       - name: Install
         if: ${{ matrix.flavor == 'dev'}}
-        run: npm install
+        run: npm ci
         working-directory: ${{ matrix.flavor }}/frontend
 
       - name: Lint
+        if: ${{ matrix.flavor == 'dev'}}
         run: npm run lint
         working-directory: ${{ matrix.flavor }}/frontend
 

contributors/erikarvstedt.txt

@@ -0,0 +1,3 @@
+I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of July 6, 2022.
+
+Signed: erikarvstedt

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

@@ -24,7 +24,7 @@ export class QrcodeComponent implements AfterViewInit {
       return;
     }
     const opts: QRCode.QRCodeRenderersOptions = {
-      errorCorrectionLevel: 'H',
+      errorCorrectionLevel: 'L',
       margin: 0,
       color: {
         dark: '#000',
@@ -38,7 +38,11 @@ export class QrcodeComponent implements AfterViewInit {
     }
 
     const address = this.data;
-    if (this.data.indexOf('bc1') === 0 || this.data.indexOf('tb1') === 0) {
+    if (
+      this.data.indexOf('bc1') === 0 ||
+      this.data.indexOf('tb1') === 0 ||
+      this.data.indexOf('bcrt1') === 0
+    ) {
       address.toUpperCase();
     }