From e6cbe7156ed62bcc198a6e68485125a70e38a772 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Thu, 27 Oct 2022 12:49:59 +0200 Subject: [PATCH 1/5] [PS-1646] Resolve biometrics auto prompt not working (#3815) --- apps/desktop/src/app/accounts/lock.component.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/desktop/src/app/accounts/lock.component.ts b/apps/desktop/src/app/accounts/lock.component.ts index 5cb28802796..433bd79172e 100644 --- a/apps/desktop/src/app/accounts/lock.component.ts +++ b/apps/desktop/src/app/accounts/lock.component.ts @@ -65,13 +65,15 @@ export class LockComponent extends BaseLockComponent { // eslint-disable-next-line rxjs-angular/prefer-takeuntil this.route.queryParams.subscribe((params) => { - if (this.supportsBiometric && params.promptBiometric && autoPromptBiometric) { - setTimeout(async () => { - if (await ipcRenderer.invoke("windowVisible")) { - this.unlockBiometric(); - } - }, 1000); - } + setTimeout(async () => { + if (!params.promptBiometric || !this.supportsBiometric || !autoPromptBiometric) { + return; + } + + if (await ipcRenderer.invoke("windowVisible")) { + this.unlockBiometric(); + } + }, 1000); }); this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => { this.ngZone.run(() => { From 4ff1a25634f276877d346591fef5518024c90ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ch=C4=99ci=C5=84ski?= Date: Thu, 27 Oct 2022 13:22:28 +0200 Subject: [PATCH 2/5] Move renovate.json to .github folder (#3905) --- renovate.json => .github/renovate.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename renovate.json => .github/renovate.json (100%) diff --git a/renovate.json b/.github/renovate.json similarity index 100% rename from renovate.json rename to .github/renovate.json From 27426dec318743afc34a0f7adebb06191a9b1dc7 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Thu, 27 Oct 2022 14:25:10 +0200 Subject: [PATCH 3/5] [SM-266] Remove fetch, webcrypto and custom-elements polyfills (#3672) --- apps/web/src/polyfills.ts | 2 -- apps/web/src/scss/styles.scss | 4 +-- package-lock.json | 50 ----------------------------------- package.json | 4 --- 4 files changed, 2 insertions(+), 58 deletions(-) diff --git a/apps/web/src/polyfills.ts b/apps/web/src/polyfills.ts index 0691f05659b..e6de94a5639 100644 --- a/apps/web/src/polyfills.ts +++ b/apps/web/src/polyfills.ts @@ -10,6 +10,4 @@ if (process.env.NODE_ENV === "production") { } // Other polyfills -require("whatwg-fetch"); -require("webcrypto-shim"); require("date-input-polyfill"); diff --git a/apps/web/src/scss/styles.scss b/apps/web/src/scss/styles.scss index ab99056dae3..0003f521c7b 100644 --- a/apps/web/src/scss/styles.scss +++ b/apps/web/src/scss/styles.scss @@ -36,8 +36,8 @@ @import "~bootstrap/scss/_close"; //@import "~bootstrap/scss/_toasts"; @import "~bootstrap/scss/_modal"; -@import "~bootstrap/scss/_tooltip"; -@import "~bootstrap/scss/_popover"; +// @import "~bootstrap/scss/_tooltip"; +// @import "~bootstrap/scss/_popover"; // @import "~bootstrap/scss/_carousel"; // @import "~bootstrap/scss/_spinners"; @import "~bootstrap/scss/_utilities"; diff --git a/package-lock.json b/package-lock.json index 8cd2b29dabf..1c3ec8f5d13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,7 +63,6 @@ "sweetalert2": "^10.16.6", "tldts": "^5.7.84", "utf-8-validate": "^5.0.9", - "whatwg-fetch": "^3.6.2", "zone.js": "^0.11.4", "zxcvbn": "^4.4.2" }, @@ -103,11 +102,9 @@ "@types/papaparse": "^5.3.2", "@types/proper-lockfile": "^4.1.2", "@types/retry": "^0.12.2", - "@types/webcrypto": "^0.0.28", "@types/zxcvbn": "^4.4.1", "@typescript-eslint/eslint-plugin": "^5.22.0", "@typescript-eslint/parser": "^5.22.0", - "@webcomponents/custom-elements": "^1.5.0", "autoprefixer": "^10.4.7", "buffer": "^6.0.3", "chromatic": "^6.5.6", @@ -167,7 +164,6 @@ "typescript": "4.6.4", "url": "^0.11.0", "util": "^0.12.4", - "webcrypto-shim": "^0.1.7", "webpack": "^5.64.4", "webpack-cli": "^4.9.1", "webpack-dev-server": "^4.9.3", @@ -13245,12 +13241,6 @@ "@types/node": "*" } }, - "node_modules/@types/webcrypto": { - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/@types/webcrypto/-/webcrypto-0.0.28.tgz", - "integrity": "sha512-jzAoSUvqA+183nJO/Sc73CREQJsv+p77WJdn532GqA3YXQzlwRwHhClVa7U4O8iB2sJSR7G3v6f1mJFNkwA9YQ==", - "dev": true - }, "node_modules/@types/webpack": { "version": "4.41.32", "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz", @@ -13880,12 +13870,6 @@ "@xtuc/long": "4.2.2" } }, - "node_modules/@webcomponents/custom-elements": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@webcomponents/custom-elements/-/custom-elements-1.5.0.tgz", - "integrity": "sha512-c+7jPQCs9h/BYVcZ2Kna/3tsl3A/9EyXfvWjp5RiTDm1OpTcbZaCa1z4RNcTe/hUtXaqn64JjNW1yrWT+rZ8gg==", - "dev": true - }, "node_modules/@webpack-cli/configtest": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", @@ -42229,12 +42213,6 @@ "node": ">= 8" } }, - "node_modules/webcrypto-shim": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/webcrypto-shim/-/webcrypto-shim-0.1.7.tgz", - "integrity": "sha512-JAvAQR5mRNRxZW2jKigWMjCMkjSdmP5cColRP1U/pTg69VgHXEi1orv5vVpJ55Zc5MIaPc1aaurzd9pjv2bveg==", - "dev": true - }, "node_modules/webidl-conversions": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", @@ -42697,11 +42675,6 @@ "node": ">=0.10.0" } }, - "node_modules/whatwg-fetch": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz", - "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==" - }, "node_modules/whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", @@ -53105,12 +53078,6 @@ "@types/node": "*" } }, - "@types/webcrypto": { - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/@types/webcrypto/-/webcrypto-0.0.28.tgz", - "integrity": "sha512-jzAoSUvqA+183nJO/Sc73CREQJsv+p77WJdn532GqA3YXQzlwRwHhClVa7U4O8iB2sJSR7G3v6f1mJFNkwA9YQ==", - "dev": true - }, "@types/webpack": { "version": "4.41.32", "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz", @@ -53605,12 +53572,6 @@ "@xtuc/long": "4.2.2" } }, - "@webcomponents/custom-elements": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@webcomponents/custom-elements/-/custom-elements-1.5.0.tgz", - "integrity": "sha512-c+7jPQCs9h/BYVcZ2Kna/3tsl3A/9EyXfvWjp5RiTDm1OpTcbZaCa1z4RNcTe/hUtXaqn64JjNW1yrWT+rZ8gg==", - "dev": true - }, "@webpack-cli/configtest": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", @@ -75589,12 +75550,6 @@ "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", "dev": true }, - "webcrypto-shim": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/webcrypto-shim/-/webcrypto-shim-0.1.7.tgz", - "integrity": "sha512-JAvAQR5mRNRxZW2jKigWMjCMkjSdmP5cColRP1U/pTg69VgHXEi1orv5vVpJ55Zc5MIaPc1aaurzd9pjv2bveg==", - "dev": true - }, "webidl-conversions": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", @@ -75906,11 +75861,6 @@ } } }, - "whatwg-fetch": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz", - "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==" - }, "whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", diff --git a/package.json b/package.json index 220c3198a4a..c814877516d 100644 --- a/package.json +++ b/package.json @@ -67,11 +67,9 @@ "@types/papaparse": "^5.3.2", "@types/proper-lockfile": "^4.1.2", "@types/retry": "^0.12.2", - "@types/webcrypto": "^0.0.28", "@types/zxcvbn": "^4.4.1", "@typescript-eslint/eslint-plugin": "^5.22.0", "@typescript-eslint/parser": "^5.22.0", - "@webcomponents/custom-elements": "^1.5.0", "autoprefixer": "^10.4.7", "buffer": "^6.0.3", "chromatic": "^6.5.6", @@ -131,7 +129,6 @@ "typescript": "4.6.4", "url": "^0.11.0", "util": "^0.12.4", - "webcrypto-shim": "^0.1.7", "webpack": "^5.64.4", "webpack-cli": "^4.9.1", "webpack-dev-server": "^4.9.3", @@ -187,7 +184,6 @@ "sweetalert2": "^10.16.6", "tldts": "^5.7.84", "utf-8-validate": "^5.0.9", - "whatwg-fetch": "^3.6.2", "zone.js": "^0.11.4", "zxcvbn": "^4.4.2" }, From 7fa0231616d3a2245c6fa209c2f8fa667d34abff Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Thu, 27 Oct 2022 14:35:37 +0200 Subject: [PATCH 4/5] [SM-298] Migrate search icon to bit icon component (#3823) --- .../report-card/report-card.component.html | 2 +- apps/web/src/app/send/send.component.html | 2 +- apps/web/src/app/send/send.component.ts | 2 ++ apps/web/src/app/vault/ciphers.component.html | 2 +- apps/web/src/app/vault/ciphers.component.ts | 2 ++ apps/web/src/images/search-web-dark.svg | 34 ------------------- apps/web/src/images/search-web-light.svg | 34 ------------------- apps/web/src/scss/base.scss | 6 ---- libs/components/src/icon/icon.component.ts | 6 ++-- libs/components/src/icon/icons/index.ts | 5 +-- libs/components/src/icon/icons/search.ts | 18 ++++++++++ 11 files changed, 29 insertions(+), 84 deletions(-) delete mode 100644 apps/web/src/images/search-web-dark.svg delete mode 100644 apps/web/src/images/search-web-light.svg create mode 100644 libs/components/src/icon/icons/search.ts diff --git a/apps/web/src/app/reports/report-card/report-card.component.html b/apps/web/src/app/reports/report-card/report-card.component.html index 2ea7d88cb04..6fc33a46d5b 100644 --- a/apps/web/src/app/reports/report-card/report-card.component.html +++ b/apps/web/src/app/reports/report-card/report-card.component.html @@ -7,7 +7,7 @@ class="tw-flex tw-h-28 tw-bg-background-alt2 tw-text-center tw-text-primary-300" [ngClass]="{ 'tw-grayscale': disabled }" > -
+

{{ title }}

diff --git a/apps/web/src/app/send/send.component.html b/apps/web/src/app/send/send.component.html index a5460a7dfae..b0ccca88dc4 100644 --- a/apps/web/src/app/send/send.component.html +++ b/apps/web/src/app/send/send.component.html @@ -179,7 +179,7 @@ {{ "loading" | i18n }} - +

{{ "noSendsInList" | i18n }}

- +