Merge branch 'master' into knorrium/clean_be_deps
This commit is contained in:
commit
4223bb2047
11
.github/workflows/ci.yml
vendored
11
.github/workflows/ci.yml
vendored
@ -27,12 +27,12 @@ jobs:
|
|||||||
|
|
||||||
- name: Install
|
- name: Install
|
||||||
if: ${{ matrix.flavor == 'dev'}}
|
if: ${{ matrix.flavor == 'dev'}}
|
||||||
run: npm install
|
run: npm ci
|
||||||
working-directory: ${{ matrix.flavor }}/backend
|
working-directory: ${{ matrix.flavor }}/backend
|
||||||
|
|
||||||
- name: Install (Prod dependencies only)
|
- name: Install (Prod dependencies only)
|
||||||
if: ${{ matrix.flavor == 'prod'}}
|
if: ${{ matrix.flavor == 'prod'}}
|
||||||
run: npm install --prod
|
run: npm ci --prod --no-optional
|
||||||
working-directory: ${{ matrix.flavor }}/backend
|
working-directory: ${{ matrix.flavor }}/backend
|
||||||
|
|
||||||
- name: Lint
|
- name: Lint
|
||||||
@ -67,16 +67,17 @@ jobs:
|
|||||||
registry-url: 'https://registry.npmjs.org'
|
registry-url: 'https://registry.npmjs.org'
|
||||||
|
|
||||||
- name: Install (Prod dependencies only)
|
- name: Install (Prod dependencies only)
|
||||||
run: npm install
|
run: npm ci --prod --no-optional
|
||||||
if: ${{ matrix.flavor == 'prod'}}
|
if: ${{ matrix.flavor == 'prod'}}
|
||||||
working-directory: ${{ matrix.flavor }}/frontend
|
working-directory: ${{ matrix.flavor }}/frontend
|
||||||
|
|
||||||
- name: Install
|
- name: Install
|
||||||
if: ${{ matrix.flavor == 'dev'}}
|
if: ${{ matrix.flavor == 'dev'}}
|
||||||
run: npm install
|
run: npm ci
|
||||||
working-directory: ${{ matrix.flavor }}/frontend
|
working-directory: ${{ matrix.flavor }}/frontend
|
||||||
|
|
||||||
- name: Lint
|
- name: Lint
|
||||||
|
if: ${{ matrix.flavor == 'dev'}}
|
||||||
run: npm run lint
|
run: npm run lint
|
||||||
working-directory: ${{ matrix.flavor }}/frontend
|
working-directory: ${{ matrix.flavor }}/frontend
|
||||||
|
|
||||||
|
3
contributors/erikarvstedt.txt
Normal file
3
contributors/erikarvstedt.txt
Normal file
@ -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
|
@ -24,7 +24,7 @@ export class QrcodeComponent implements AfterViewInit {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const opts: QRCode.QRCodeRenderersOptions = {
|
const opts: QRCode.QRCodeRenderersOptions = {
|
||||||
errorCorrectionLevel: 'H',
|
errorCorrectionLevel: 'L',
|
||||||
margin: 0,
|
margin: 0,
|
||||||
color: {
|
color: {
|
||||||
dark: '#000',
|
dark: '#000',
|
||||||
@ -38,7 +38,11 @@ export class QrcodeComponent implements AfterViewInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const address = this.data;
|
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();
|
address.toUpperCase();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user