Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Convert MatrixChat to a TypeScript class #4462

Merged
merged 11 commits into from
Apr 30, 2020
Merged

Convert MatrixChat to a TypeScript class #4462

merged 11 commits into from
Apr 30, 2020

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Apr 22, 2020 •
edited
Loading

Needs merging in lock-step with element-hq/element-web#13329

t3chguy added 4 commits April 22, 2020 11:55
@t3chguy
Convert MatrixChat to an ES6 Class Component
89345c9 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Convert promise utility module to tyepscript
d915e61 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
C
01abb61 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
delint
54e976f 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy marked this pull request as ready for review April 22, 2020 12:22
@t3chguy t3chguy requested a review from a team April 22, 2020 12:22
@turt2live turt2live requested review from turt2live and removed request for a team April 22, 2020 20:21
turt2live
turt2live approved these changes Apr 22, 2020
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks fine. I'd recommend that we hold off on merging this if possible until after the release, just in case we need to make more dual-branch PRs against MatrixChat

src/@types/global.d.ts Show resolved Hide resolved
src/components/structures/MatrixChat.tsx Outdated Show resolved Hide resolved
src/components/structures/MatrixChat.tsx Outdated Show resolved Hide resolved
src/components/structures/MatrixChat.tsx Show resolved Hide resolved
src/components/structures/MatrixChat.tsx Show resolved Hide resolved
src/components/structures/MatrixChat.tsx Outdated Show resolved Hide resolved
@t3chguy
Copy link
Member Author

t3chguy commented Apr 23, 2020

I'd recommend that we hold off on merging this if possible until after the release, just in case we need to make more dual-branch PRs against MatrixChat

Hmm, it might be a dependency for my App Load Errors PR to land due to the typescript typing relying on MatrixChat :/

t3chguy added 2 commits April 23, 2020 10:12
@t3chguy
iterate PR
4cf2341 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
e06b5f8 
… t3chguy/app_load4
@t3chguy t3chguy mentioned this pull request Apr 23, 2020
Merged
2 tasks
@t3chguy
Make Screens an enum
f649291 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@jryans
Copy link
Collaborator

jryans commented Apr 23, 2020

I'd recommend that we hold off on merging this if possible until after the release, just in case we need to make more dual-branch PRs against MatrixChat

Hmm, it might be a dependency for my App Load Errors PR to land due to the typescript typing relying on MatrixChat :/

From my perspective, the cross-signing rate of change in MatrixChat over the course of the project has been low and it would be nice to conclude the app load work, so I am okay with accepting the risk of possible increased complexity for release PRs in this file. (I'm happy to assist reworking any PRs that do touch the file if they arise, but I do not expect them to.)

t3chguy added 2 commits April 23, 2020 16:11
@t3chguy
Discard unused CompatibilityPage.js in react-sdk
e3ba9c9 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Revert "Discard unused CompatibilityPage.js in react-sdk"
531de19 
This reverts commit e3ba9c9

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy requested a review from turt2live April 23, 2020 15:12
turt2live
turt2live approved these changes Apr 27, 2020
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a few nits but seems fine.

Didn't realize this was pending my review, sorry. Was expecting the switch to be done in its own PR ._.

src/components/structures/MatrixChat.tsx Outdated Show resolved Hide resolved
src/components/structures/MatrixChat.tsx Outdated Show resolved Hide resolved
src/components/structures/MatrixChat.tsx Outdated Show resolved Hide resolved
src/components/structures/MatrixChat.tsx Outdated Show resolved Hide resolved
t3chguy added 2 commits April 27, 2020 23:59
@t3chguy
Revert "Make Screens an enum"
2792988 
This reverts commit f649291

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Merge branches 'develop' and 't3chguy/app_load4' of github.com:matrix…
9c916cc 
…-org/matrix-react-sdk into t3chguy/app_load4

� Conflicts:
�	src/components/structures/MatrixChat.tsx
@t3chguy t3chguy merged commit c19338b into develop Apr 30, 2020
@t3chguy t3chguy deleted the t3chguy/app_load4 branch May 25, 2020 18:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@turt2live turt2live turt2live approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@t3chguy @jryans @danielgrad @turt2live