Merge branch 'develop' into fix-leave-space-at-bottom

This commit is contained in:
Hanadi 2022-11-03 12:47:55 +01:00 committed by GitHub
commit 82bd02c865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -76,7 +76,7 @@ interface HTMLInputEvent extends Event {
target: HTMLInputElement & EventTarget;
}
const singleMxcUpload = async (): Promise<any> => {
const singleMxcUpload = async (): Promise<string | null> => {
return new Promise((resolve) => {
const fileSelector = document.createElement('input');
fileSelector.setAttribute('type', 'file');
@ -85,8 +85,13 @@ const singleMxcUpload = async (): Promise<any> => {
Modal.createDialog(UploadConfirmDialog, {
file,
onFinished: (shouldContinue) => {
resolve(shouldContinue ? MatrixClientPeg.get().uploadContent(file) : null);
onFinished: async (shouldContinue) => {
if (shouldContinue) {
const { content_uri: uri } = await MatrixClientPeg.get().uploadContent(file);
resolve(uri);
} else {
resolve(null);
}
},
});
};