Commit graph

14471 commits

Author SHA1 Message Date
Šimon Brandner
931bba747a
Replaceable component
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:22:13 +02:00
Šimon Brandner
ef1a1ebe12
TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:21:33 +02:00
Šimon Brandner
e4d1859fb7
Ret type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:21:05 +02:00
Šimon Brandner
4cf4ab2266
Return type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:20:40 +02:00
Šimon Brandner
af7769ce93
Types!
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:20:13 +02:00
Šimon Brandner
86580f3f20
current target
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:19:45 +02:00
Šimon Brandner
6193bc2a82
Types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:19:19 +02:00
Šimon Brandner
fa4977c4da
Use current target
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:18:34 +02:00
Šimon Brandner
bdbd03c4ff
Types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:18:05 +02:00
Šimon Brandner
2a403f6cfe
Remove additional ?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:17:18 +02:00
Šimon Brandner
5fc35565df
More TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:16:53 +02:00
Šimon Brandner
8f8377a71c
Types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:16:01 +02:00
Šimon Brandner
70e94f9af5
Formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:48:43 +02:00
Šimon Brandner
b5baf404be
Don't use as
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:47:37 +02:00
Šimon Brandner
04098dc74c
Remove unnecessary constructor
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:46:45 +02:00
Šimon Brandner
ae5e10ff0c
Burn sdk.getComponent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:45:36 +02:00
Travis Ralston
8278b2273d Copy over the whole feature of changing the state for keywords entirely 2021-07-13 00:23:56 -06:00
Šimon Brandner
cbe94c3c5f
Kill-off sdk.getComponent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:23:01 +02:00
Šimon Brandner
7bd7f704f9
Extend IDialogProps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:20:17 +02:00
Šimon Brandner
2e295a94ed
Don't export IProps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:17:51 +02:00
Travis Ralston
4444ccb079 Appease the linter 2021-07-13 00:02:44 -06:00
Travis Ralston
ff7a18da56 Rewrite Notifications component for modern UI & processing 2021-07-12 23:57:54 -06:00
Travis Ralston
3ae76c84f6 Add a simple TagComposer for the keywords entry 2021-07-12 23:55:08 -06:00
Travis Ralston
9556b61041 Crude conversion of Notifications.js to TS + cut out legacy code
This is to make the file clearer during development and serves no practical purpose
2021-07-12 18:30:42 -06:00
Travis Ralston
5a834fbc06 Convert Spinner to TS 2021-07-12 18:30:42 -06:00
Travis Ralston
436563be7b Change label on notification dropdown for a room
by request of design, to reduce mental load
2021-07-12 18:30:42 -06:00
Travis Ralston
59e48ee0ba Convert NotificationUserSettingsTab to TS 2021-07-12 18:30:42 -06:00
Travis Ralston
e045aa940e Be smart with readonly 2021-07-12 14:11:24 -06:00
Travis Ralston
4c98c0bc23 Increase sample count in voice message thumbnail
Fixes https://github.com/vector-im/element-web/issues/17817

Technically requires https://github.com/matrix-org/matrix-react-sdk/pull/6357 for sample sizing.
2021-07-12 14:02:51 -06:00
Michael Telatynski
ae6eaa5acc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1
 Conflicts:
	src/components/structures/RoomDirectory.tsx
	src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-12 18:58:18 +01:00
Michael Telatynski
d737b4e6ab Use webpack worker-loader to load the IndexedDB worker instead of homegrown hack 2021-07-12 18:43:20 +01:00
J. Ryan Stinnett
1b39dbdb53
Merge pull request #6245 from aaronraimist/string-pl
Do not honor string power levels
2021-07-12 16:01:11 +01:00
J. Ryan Stinnett
130aee0416
Merge pull request #6343 from matrix-org/jryans/customise-aliases
Add alias and directory customisation points
2021-07-12 12:09:17 +01:00
Michael Telatynski
83a4a20cfb
Merge pull request #5679 from SimonBrandner/quit-sticker-picker 2021-07-12 09:31:37 +01:00
Germain
ebd64eb53c
Merge pull request #6350 from SimonBrandner/fix/dont-auto-detect-lang/12366
Don't autodetect language in inline code blocks
2021-07-12 09:28:52 +01:00
Michael Telatynski
f049edf605
Merge branch 'develop' into quit-sticker-picker 2021-07-12 09:26:11 +01:00
Michael Telatynski
33dca81352 Update some more 2021-07-12 09:10:27 +01:00
Michael Telatynski
a645cebb49 Fix setTimeout/setInterval typing 2021-07-12 09:02:46 +01:00
Robin Townsend
b147bcd207 Merge branch 'develop' into text-for-event-perf 2021-07-11 11:35:12 -04:00
Šimon Brandner
cd125506b6
Auto-detect language only if enabled and only for codeblocks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-11 11:18:06 +02:00
Michael Telatynski
e3e7d41d5c only consider valid & loaded url previews for show N more prompt 2021-07-10 19:41:50 +01:00
Michael Telatynski
9b7697c530 fix imports 2021-07-10 16:02:43 +01:00
Michael Telatynski
bd175c6f40 Improve and consolidate typing 2021-07-10 15:43:46 +01:00
Michael Telatynski
829169ec87
Merge pull request #6342 from matrix-org/t3chguy/fix/vrlp
Fix small visual regression with the site name on url previews
2021-07-09 18:05:48 +01:00
J. Ryan Stinnett
ff7f3f47be Add directory publish customisation point
This will help certain environments, such as P2P, where directory publishing can
be allowed freely.
2021-07-09 17:51:18 +01:00
J. Ryan Stinnett
4b9d4ad1e3 Centralise display alias getters 2021-07-09 17:06:54 +01:00
Michael Telatynski
8072007782 Fix small visual regression with the site name on url previews 2021-07-09 14:50:55 +01:00
Šimon Brandner
ba3d7f9bee
Use marked execution
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 15:50:52 +02:00
Šimon Brandner
007548aa7f
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-07-09 15:36:14 +02:00
Germain
a1c3f25fe5
Merge pull request #6340 from SimonBrandner/feature/media-devices 2021-07-09 14:09:11 +01:00
Šimon Brandner
96100ffaf3
Fix styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:19:27 +02:00
Šimon Brandner
dbc37675a0
Simplifie the code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:15:36 +02:00
Šimon Brandner
cd95be147c
Finish TS conversion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 13:45:39 +02:00
Michael Telatynski
2998018876
Merge pull request #6322 from SimonBrandner/feature/remember-server/17739
Remember the last used server for room directory searches
2021-07-09 12:36:54 +01:00
Šimon Brandner
dadfba9075
Add MediaDeviceKindEnum
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 13:08:39 +02:00
Šimon Brandner
866c1b76bd
Basic TS conversion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 12:57:42 +02:00
Šimon Brandner
046b3f325c
Iterate PR
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 12:31:44 +02:00
Šimon Brandner
40954313e4
Merge branch 'feature/remember-server/17739' of https://github.com/SimonBrandner/matrix-react-sdk into feature/remember-server/17739 2021-07-09 10:44:45 +02:00
Šimon Brandner
6dcf860181
Refresh the room list only if validation failed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 10:44:20 +02:00
Šimon Brandner
84b00b5c38
Make the code more readable
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 10:39:02 +02:00
Šimon Brandner
f78ede9324
Merge remote-tracking branch 'upstream/develop' into feature/remember-server/17739 2021-07-09 10:33:24 +02:00
Šimon Brandner
88a5969f2d
Remove a word
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-09 10:32:43 +02:00
Michael Telatynski
ac309a0d08
Merge pull request #6332 from SimonBrandner/fix/focus-composer-reaction/11023 2021-07-09 09:05:54 +01:00
Michael Telatynski
b9be0896f1 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/pins 2021-07-09 07:48:12 +01:00
Šimon Brandner
91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 08:26:19 +02:00
Šimon Brandner
7a1381135a
Simplifie some code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 18:31:47 +02:00
Šimon Brandner
27db0da437
Simpler code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:40:41 +02:00
Šimon Brandner
68d194444a
FocusComposer -> FocusSendMessageComposer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:36:31 +02:00
Šimon Brandner
7734f8aeef
Handle focusing multiple composers
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:33:49 +02:00
Šimon Brandner
b7af39ffff
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:17:34 +02:00
Michael Telatynski
4978c27dd5
Merge pull request #6326 from matrix-org/revert-6135-t3chguy/fix/17494 2021-07-08 14:56:55 +01:00
Michael Telatynski
f8907a6ea4 Fix bug which prevented more than one event getting pinned 2021-07-08 14:48:06 +01:00
Michael Telatynski
8e7e4c9e8d Convert MessageContextMenu to Typescript 2021-07-08 14:47:36 +01:00
Michael Telatynski
00a3f5d469 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494 2021-07-08 13:29:10 +01:00
Michael Telatynski
5d72ea5e19 Fix Space Create menu not disabling the alias field when busy 2021-07-08 13:24:56 +01:00
Michael Telatynski
fc05395dba Don't close settings dialog when opening spaces feedback prompt 2021-07-08 13:24:16 +01:00
Šimon Brandner
14687f3630
Merge remote-tracking branch 'upstream/develop' into fix/focus-composer-reaction/11023 2021-07-08 13:19:46 +02:00
Šimon Brandner
64f32a9fc1
Focus composer after reacting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 13:12:57 +02:00
David Baker
72acd5a611
Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage
Update import location for types
2021-07-08 09:18:31 +01:00
David Baker
086a8cbbb3 Update import location for types
Apparently all the types themselves are fine, even though some of
the function signatures have been updated to return Promises... we
were alreaady await-ing on them.
2021-07-07 20:19:52 +01:00
Michael Telatynski
4ce3723e84 Switch to blurhash-react instead of homegrown component
this has the advantage of resolution scaling logic to do more gpu accelerated scaling
2021-07-07 20:00:31 +01:00
Michael Telatynski
882e66e215 remove stale comment, we include vias now 2021-07-07 18:17:33 +01:00
Michael Telatynski
b9a539eaa2 Improve URL Previews
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
2021-07-07 18:04:30 +01:00
Germain
209cafb1f5
Merge pull request #6308 from SimonBrandner/burn-sdk-get-comp-with-fire 2021-07-07 16:30:54 +01:00
Šimon Brandner
14303a4ca8
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 17:20:31 +02:00
Šimon Brandner
f91b35a0a0
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 17:12:19 +02:00
Michael Telatynski
25dab1eb64
Merge pull request #6307 from matrix-org/t3chguy/fix/17858
Fix instances of the Edit Message Composer's save button being wrongly disabled
2021-07-07 16:03:27 +01:00
Michael Telatynski
30fa5419db
Revert "ignore hash/fragment when de-duplicating links for url previews" 2021-07-07 14:30:08 +01:00
Šimon Brandner
5b5ef5e04c
Handle servers from settings
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 13:59:02 +02:00
Šimon Brandner
255ab49ccb
Handle edge cases
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 13:48:48 +02:00
Šimon Brandner
b94dc2d0e5
Remember the last used server for room directory searches
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 12:14:51 +02:00
Šimon Brandner
1220ad37ce
Remove the usage of symbol
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 12:14:44 +02:00
Šimon Brandner
38a061a2df
Fix ImageView context menu
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-06 20:59:12 +02:00
Germain
7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1 2021-07-06 12:04:18 +01:00
Germain
47b297c2db
Merge pull request #5742 from SimonBrandner/reorganize-preferences 2021-07-05 09:33:21 +01:00
Germain Souquet
925d434d53 Linting fix in TypeScript interface 2021-07-05 09:19:19 +02:00
Robin Townsend
055f3a72ad Fix being able to un-rotate images
Since 0 is falsy, this made it impossible to return images to 0 degrees
of rotation.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-03 15:18:47 -04:00
Germain Souquet
b5ff7eb7d2 Migrate VerificationShowSas to TypeScript 2021-07-03 12:43:18 +01:00
Germain Souquet
103caffb5b Delete unused VerificationQREmojiOPtions 2021-07-03 12:35:14 +01:00
Germain Souquet
a1135783bc Migrate VerificationComplete to TypeScript 2021-07-03 12:32:08 +01:00
Germain Souquet
b18691a1cb Migrate VerificationCancelled to TypeScript 2021-07-03 12:31:10 +01:00
Germain Souquet
e7743e2a57 Migrate RoomScrollStateStore to TypeScript 2021-07-03 12:21:00 +01:00
Germain Souquet
ef4d58c0d9 Migrate SetIntegrationManager to TypeScript 2021-07-03 12:08:56 +01:00
Germain Souquet
ef2848664f Migrate InlineTermsAgreement to TypeScript 2021-07-03 12:03:00 +01:00
Germain Souquet
f4ec197513 Migrate ForgotPassword to TypeScript 2021-07-03 11:55:10 +01:00
Germain Souquet
298a338676 Migrate CompleteSecurity to TypeScript 2021-07-03 11:38:51 +01:00
Germain Souquet
dbd102541e Migrate E2eSetup to TypeScript 2021-07-03 11:37:06 +01:00
Šimon Brandner
68011056cc
Eleventh and final batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 12:24:07 +02:00
Šimon Brandner
5d054519dc
Tenth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:57:05 +02:00
Šimon Brandner
d99874318c
Ninth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:51:23 +02:00
Šimon Brandner
916589e2b9
Eighth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:24:33 +02:00
Šimon Brandner
6e14c290c8
Seventh batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:59:57 +02:00
Šimon Brandner
914de71e9c
Sixth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:44:03 +02:00
Šimon Brandner
ab4cd9d0fd
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:10:17 +02:00
Šimon Brandner
b7ef7d2a47
Fifth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:06:42 +02:00
Šimon Brandner
6702e68778
Revert some changes due to them breaking tests (and hope it will work now)
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 09:36:18 +02:00
Šimon Brandner
b36a727a09
Fourth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 18:15:05 +02:00
Šimon Brandner
799d10b77e
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire 2021-07-02 17:34:56 +02:00
Šimon Brandner
426c79f47d
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:25:30 +02:00
Šimon Brandner
7325abebd9
Third batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:19:01 +02:00
Šimon Brandner
9d569c378e
Second batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:08:27 +02:00
Šimon Brandner
090acc4811
Unused import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:41:36 +02:00
Šimon Brandner
259b36c13d
Remove unused code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:38:44 +02:00
Šimon Brandner
0d8f84c769
Delete lozenge effect
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:35:52 +02:00
Šimon Brandner
9a1b73f867
Convert ReplyTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 14:51:51 +02:00
Šimon Brandner
6645036780
Convert MImageReplyBody to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 14:17:40 +02:00
Šimon Brandner
5d78eb4a75
Member delimiter rules
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 14:01:30 +02:00
Šimon Brandner
5f49b2d374
Missing args
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:55:39 +02:00
Šimon Brandner
869f31deef
Convert MImageBody to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:46:42 +02:00
Šimon Brandner
38710eab88
Export IProps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:31:56 +02:00
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11 2021-07-02 11:03:54 +01:00
Tulir Asokan
598689b059 Run eslint 2021-07-02 12:56:08 +03:00
Tulir Asokan
5240209529 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-02 12:39:51 +03:00
Michael Telatynski
0425b02982
Merge pull request #6295 from matrix-org/t3chguy/ts/10 2021-07-02 09:51:58 +01:00
Michael Telatynski
5d1a1b46f3 Fix instances of the Edit Message Composer's save button being wrongly disabled 2021-07-01 23:48:52 +01:00
David Baker
80f5232217 Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:23:03 +01:00
Michael Telatynski
88f691776f Use sleep from js-sdk as no point duplicating it 2021-07-01 22:55:27 +01:00
Michael Telatynski
c0fab6647d Use defer from js-sdk as it has a better ts definition 2021-07-01 22:50:06 +01:00
David Baker
53b89bbcd9
Merge pull request #6302 from matrix-org/dbkr/tsify_roomheader
Convert RoomHeader to TS
2021-07-01 21:33:11 +01:00
Michael Telatynski
c2545923c1 Use better types to make CI happy 2021-07-01 21:10:37 +01:00
Michael Telatynski
c80ba16ae9
Merge pull request #6296 from matrix-org/t3chguy/fix/17853
Prevent RoomDirectory from exploding when filterString is wrongly nulled
2021-07-01 21:07:35 +01:00
Michael Telatynski
c51e62a62b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/10 2021-07-01 21:01:06 +01:00
David Baker
eb1a22ab19 Add types 2021-07-01 21:00:54 +01:00
David Baker
38ed53d5d1
Oops, don't just blindly insert the commented type
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-01 20:58:51 +01:00
David Baker
3db95d607d
Use semicolons
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-01 20:57:56 +01:00
Michael Telatynski
12cce2a938 delint 2021-07-01 20:51:13 +01:00
Michael Telatynski
1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	src/ContentMessages.tsx
	src/components/structures/UploadBar.tsx
	src/components/views/messages/MImageBody.js
	src/components/views/messages/MStickerBody.js
	src/components/views/messages/MVideoBody.tsx
2021-07-01 20:48:34 +01:00
David Baker
e121e5bf8a nice try, vscode 2021-07-01 19:58:25 +01:00
David Baker
8bbb768825 Convert RoomHeader to TS
Also add a type of OOBData... possibly this should be in the js-sdk,
but threepid invites themselves have a type in react-sdk so it can
live alongside it I guess (also I'm not entirely sure we actually
use it anymore...)
2021-07-01 19:54:05 +01:00
David Baker
9ea4ca39c6 Be more like other arrow functions 2021-07-01 18:54:51 +01:00