From b4cb6e1087807336b2e2b17a4eff6709b3780939 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 31 Mar 2020 17:32:50 +1100 Subject: [PATCH] Typescript 3.7 --- package.json | 2 +- ts/components/session/SessionPasswordModal.tsx | 8 ++------ yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index ee6822cbc..b24f224e5 100644 --- a/package.json +++ b/package.json @@ -192,7 +192,7 @@ "tslint": "5.13.0", "tslint-microsoft-contrib": "6.0.0", "tslint-react": "3.6.0", - "typescript": "3.3.3333", + "typescript": "3.7", "webpack": "4.4.1" }, "engines": { diff --git a/ts/components/session/SessionPasswordModal.tsx b/ts/components/session/SessionPasswordModal.tsx index 9a991d2e7..ea418f521 100644 --- a/ts/components/session/SessionPasswordModal.tsx +++ b/ts/components/session/SessionPasswordModal.tsx @@ -134,13 +134,9 @@ export class SessionPasswordModal extends React.Component { } private async setPassword(onSuccess: any) { - if (!this.passwordInput.current || !this.passwordInputConfirm.current) { - return; - } - // Trim leading / trailing whitespace for UX - const enteredPassword = String(this.passwordInput.current.value).trim(); - const enteredPasswordConfirm = String(this.passwordInputConfirm.current.value).trim(); + const enteredPassword = String(this.passwordInput.current?.value).trim(); + const enteredPasswordConfirm = String(this.passwordInputConfirm.current?.value).trim(); if (enteredPassword.length === 0 || enteredPasswordConfirm.length === 0) { return; diff --git a/yarn.lock b/yarn.lock index ff06052c3..49c7af3ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10553,10 +10553,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@3.3.3333: - version "3.3.3333" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6" - integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw== +typescript@3.7: + version "3.7.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae" + integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw== uc.micro@^1.0.1: version "1.0.6"