From e33b6eadc419f9133c742b377e368fbd3f137c67 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Dec 2021 11:50:56 +1100 Subject: [PATCH 1/2] bump typescript to 4.5.4 --- package.json | 2 +- stylesheets/_modal.scss | 1 + ts/components/conversation/SessionRecording.tsx | 3 +++ tsconfig.json | 1 + yarn.lock | 8 ++++---- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 210c3022c..10549e376 100644 --- a/package.json +++ b/package.json @@ -212,7 +212,7 @@ "tslint": "5.19.0", "tslint-microsoft-contrib": "6.0.0", "tslint-react": "3.6.0", - "typescript": "^4.2.3", + "typescript": "4.5.4", "webpack": "5.30.0", "webpack-cli": "4.6.0", "webpack-dev-server": "3.11.2" diff --git a/stylesheets/_modal.scss b/stylesheets/_modal.scss index 4f0de6cb8..3ec76b9d1 100644 --- a/stylesheets/_modal.scss +++ b/stylesheets/_modal.scss @@ -29,6 +29,7 @@ .session-modal { .contact-selection-list { width: 100%; + min-width: 300px; } } diff --git a/ts/components/conversation/SessionRecording.tsx b/ts/components/conversation/SessionRecording.tsx index 6656bcc22..10f2f4798 100644 --- a/ts/components/conversation/SessionRecording.tsx +++ b/ts/components/conversation/SessionRecording.tsx @@ -316,6 +316,9 @@ export class SessionRecording extends React.Component { */ private updateAudioElementAndDuration() { // init audio element + if (!this.audioBlobMp3) { + return; + } const audioURL = window.URL.createObjectURL(this.audioBlobMp3); this.audioElement = new Audio(audioURL); diff --git a/tsconfig.json b/tsconfig.json index 10af61338..6ca185694 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -39,6 +39,7 @@ // "typeRoots": [], // List of folders to include type definitions from. // "types": [], // Type declaration files to be included in compilation. // "allowSyntheticDefaultImports": true, // Allow default imports from modules with no default export. This does not affect code emit, just typechecking. + "useUnknownInCatchVariables": false, "esModuleInterop": true // Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. // "preserveSymlinks": true, // Do not resolve the real path of symlinks. diff --git a/yarn.lock b/yarn.lock index 3b5accb09..235351d23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9961,10 +9961,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3" - integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw== +typescript@4.5.4: + version "4.5.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8" + integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg== typings-for-css-modules-loader@^1.7.0: version "1.7.0" From 18e13b9b9891bf6f0f61a14222f26ae5e5d579fb Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Dec 2021 11:54:56 +1100 Subject: [PATCH 2/2] move confirm action on right on all dialogs --- ts/components/SessionWrapperModal.tsx | 11 +++++------ ts/components/dialog/AdminLeaveClosedGroupDialog.tsx | 2 +- ts/components/dialog/SessionNicknameDialog.tsx | 2 +- ts/components/dialog/SessionPasswordDialog.tsx | 3 +-- ts/components/dialog/SessionSeedModal.tsx | 3 +-- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ts/components/SessionWrapperModal.tsx b/ts/components/SessionWrapperModal.tsx index c317132e6..32123f14b 100644 --- a/ts/components/SessionWrapperModal.tsx +++ b/ts/components/SessionWrapperModal.tsx @@ -108,17 +108,16 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => { {props.children}
- {onConfirm ? ( - - {confirmText || window.i18n('ok')} - - ) : null} - {onClose && showClose ? ( {cancelText || window.i18n('close')} ) : null} + {onConfirm ? ( + + {confirmText || window.i18n('ok')} + + ) : null}
diff --git a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx index 84c2bde89..c38086bc1 100644 --- a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx +++ b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx @@ -37,8 +37,8 @@ export const AdminLeaveClosedGroupDialog = (props: Props) => {

{warningAsAdmin}

- +
); diff --git a/ts/components/dialog/SessionNicknameDialog.tsx b/ts/components/dialog/SessionNicknameDialog.tsx index 846076405..6739b11ab 100644 --- a/ts/components/dialog/SessionNicknameDialog.tsx +++ b/ts/components/dialog/SessionNicknameDialog.tsx @@ -70,12 +70,12 @@ export const SessionNicknameDialog = (props: Props) => { />
+ -
); diff --git a/ts/components/dialog/SessionPasswordDialog.tsx b/ts/components/dialog/SessionPasswordDialog.tsx index bf2feb4af..e492fe52c 100644 --- a/ts/components/dialog/SessionPasswordDialog.tsx +++ b/ts/components/dialog/SessionPasswordDialog.tsx @@ -104,13 +104,12 @@ export class SessionPasswordDialog extends React.Component { {this.showError()}
+ - -
); diff --git a/ts/components/dialog/SessionSeedModal.tsx b/ts/components/dialog/SessionSeedModal.tsx index 38930869b..43bafc71d 100644 --- a/ts/components/dialog/SessionSeedModal.tsx +++ b/ts/components/dialog/SessionSeedModal.tsx @@ -71,9 +71,8 @@ const Password = (props: PasswordProps) => {
- - +
);