James Salter
57f5c30af8
Merge pull request #6532 from matrix-org/posthog-analytics
...
Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies
2021-08-04 09:47:39 +01:00
Andrew Morgan
c9c8177f58
Start a call immediately after creating a room via the dial pad ( #6529 )
2021-08-04 09:46:39 +01:00
Jaiwanth
c74d6c6fff
Assign replacements
2021-08-04 12:48:32 +05:30
David Baker
28f5dc483b
Update eslint plugin & fix silly indenting
...
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
2021-08-03 17:07:37 +01:00
Šimon Brandner
a18f41ceed
Fix tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:43:56 +02:00
Šimon Brandner
2a378f30b7
Attempt to fix tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:38:12 +02:00
James Salter
dc7aad1abf
Revert "Revert "Add support for Posthog Analytics under a labs flag""
...
This reverts commit c5ea253181
.
2021-08-03 11:55:02 +01:00
Jaiwanth
b333612dea
Fix comparing MB -> bytes
2021-08-03 14:53:23 +05:30
Jaiwanth
4824c93707
Add a test file
2021-08-03 14:36:21 +05:30
James Salter
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag"
2021-08-03 07:30:02 +01:00
Jaiwanth
46e2f67f54
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-03 10:03:16 +05:30
James Salter
a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics
...
Add support for Posthog Analytics under a labs flag
2021-08-02 14:46:17 +01:00
Michael Telatynski
3c436c9617
update setting naming to match style
2021-07-30 12:20:02 +01:00
Michael Telatynski
9eb0986353
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
src/i18n/strings/en_EN.json
2021-07-30 11:34:52 +01:00
Jaiwanth
17e9cf4d2a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-30 12:17:31 +05:30
Jaiwanth
04edf4103f
Remove unnecessary awaits
2021-07-30 11:46:55 +05:30
Michael Telatynski
d459dbe700
Refactor Space Hierarchy stuff in preparation for pagination
2021-07-29 17:35:15 +01:00
Michael Telatynski
02dbdc5c0a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
src/dispatcher/actions.ts
src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
Michael Telatynski
6f37e8b223
Use getChildren instead of getSpaceSummary as MSC2946 has moved on
2021-07-29 12:16:59 +01:00
Michael Telatynski
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
James Salter
ecbc536a3e
Add copyright header
2021-07-28 14:15:27 +01:00
James Salter
a09e046c18
Update test/PosthogAnalytics-test.ts
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-28 14:11:55 +01:00
James Salter
df7ebb2e7c
Remove commented out block
2021-07-28 14:00:37 +01:00
James Salter
3ff7de3c96
Mock SHA-256 to avoid problems loading crypto on Node 14
2021-07-28 13:44:06 +01:00
James Salter
7cf28de9c9
take 2 at fixing import
2021-07-28 11:32:17 +01:00
James Salter
7c62386915
lint
2021-07-28 11:28:19 +01:00
James Salter
c697079eb4
Fix import
2021-07-28 11:22:40 +01:00
James Salter
bd7e2dee3d
Merge remote-tracking branch 'origin' into posthog-analytics
2021-07-28 11:13:22 +01:00
James Salter
a6df687196
Tidy up interface and add some comments
2021-07-28 09:54:37 +01:00
James Salter
1d81bdc6f9
Interface changes and anonymity fixes
2021-07-28 09:37:08 +01:00
Michael Telatynski
776435f620
Switch all-rooms toggle for spaces to non-feature settings key
2021-07-27 21:17:24 +01:00
Michael Telatynski
0a9d3302ba
Fix home vs all rooms requiring app reload and change default to `home`
...
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
2021-07-27 21:11:47 +01:00
Michael Telatynski
ec173e74e6
Test & Refactor SpaceWatcher to allow all rooms/home change without needing reload
2021-07-27 20:15:40 +01:00
Paulo Pinto
400e772594
Fix formatting
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:53:33 +01:00
Paulo Pinto
3f2dadf0fe
When a single message is unpinned, link to it
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
Paulo Pinto
8fe7df9171
When a single message is pinned, link to it
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
Paulo Pinto
40ead34c08
Add test for textForPinnedEvent
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
Michael Telatynski
755007cbee
Conclude labs flags and write more tests
2021-07-27 14:39:14 +01:00
James Salter
474561600e
Fix hash == ""
2021-07-27 13:31:56 +01:00
Michael Telatynski
c8d9294350
Discard unused utility now that we use Object.fromEntries
2021-07-23 18:40:22 +01:00
James Salter
95f4275807
Add Disabled anonymity, improve tests
2021-07-23 16:47:02 +01:00
Michael Telatynski
5ccd02dd6e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/messages/MImageBody.tsx
2021-07-23 10:42:46 +01:00
Michael Telatynski
f5630acea7
Adhere to better eslint rules
2021-07-23 10:35:10 +01:00
James Salter
6737cfd297
remove superflous dnt clear
2021-07-21 16:10:06 +01:00
James Salter
726b4497b2
Remove redactedCurrentLocation and rely on posthog for DNT
...
* Redact and pass the redacted url as a property. redactedCurrentLocation might have issues with concurrent events
* Remove DNT code and rely on posthog
2021-07-21 16:06:09 +01:00
James Salter
4c6b0d35ad
Improve analytics interface
...
* Make it an error to call it before its initialised, and separately track whether its been enabled
* Use anonmity enum in the public interface
* Properly await upstream calls
* Fix accidental test fixture cross-reliance
2021-07-21 14:58:43 +01:00
James Salter
6da3cc8ca1
Redact sensitive data
2021-07-21 13:48:10 +01:00
Michael Telatynski
390b05617c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
James Salter
4b0cb409a0
Add identifyUser
2021-07-21 08:38:58 +01:00
James Salter
74b0e52f9a
Enforce anon/pseudo-anon via types
2021-07-21 08:23:42 +01:00
James Salter
3135e42586
Add test for silently ignoring messages when not initialised
2021-07-21 07:42:55 +01:00
James Salter
2a48d3c9bc
First pass at a PosthogAnalytics class
2021-07-21 07:40:39 +01:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
Michael Telatynski
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +01:00
Michael Telatynski
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
Michael Telatynski
f7767bf09c
Merge pull request #6393 from robintown/match-avatar-colors
2021-07-17 14:12:29 +01:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
Robin Townsend
eefadf6a46
Fix tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 15:30:26 -04:00
Michael Telatynski
831c482371
Stub out MatrixClient::isUserIgnored for tests
2021-07-15 18:17:07 +01:00
Michael Telatynski
316b21408d
Fix tests
2021-07-15 10:59:52 +01:00
Michael Telatynski
dcb9b9b777
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
Paulo Pinto
6884b2aa6d
Standardise spelling of identity server
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
Paulo Pinto
7a8400e5c7
Standardise spelling and casing of homeserver
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
Travis Ralston
0e2bcb474d
delint
2021-07-12 13:52:10 -06:00
Travis Ralston
ec0f940ef0
Adjust recording waveform behaviour for voice messages
...
Fixes https://github.com/vector-im/element-web/issues/17683
2021-07-12 13:48:01 -06:00
Michael Telatynski
f5f4be88f0
Update tests to expect LinkPreviewGroup behaviour
2021-07-12 08:34:26 +01:00
Šimon Brandner
a90b8f32f1
Add some tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 16:45:04 +02:00
Michael Telatynski
f412fb44a7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/SlashCommands.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
src/createRoom.ts
2021-07-09 08:13:39 +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
Šimon Brandner
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-07-08 13:30:57 +02:00
Michael Telatynski
4a6af5a4d7
fix test missing required prop
2021-07-07 18:12:31 +01:00
Germain
209cafb1f5
Merge pull request #6308 from SimonBrandner/burn-sdk-get-comp-with-fire
2021-07-07 16:30:54 +01:00
Germain Souquet
5fb7dbee3e
Do not generate a lockfile when running in CI
2021-07-07 16:11:47 +02:00
Michael Telatynski
06284fe73d
Update e2e tests
2021-07-06 12:05:06 +01:00
Michael Telatynski
04c923bd75
fix tests by including client field on the Room stub and stubbing getJoinedMemberCount
2021-07-06 11:35:56 +01:00
Michael Telatynski
9d8acd1af0
stub getJoinRule
2021-07-06 10:44:09 +01:00
Michael Telatynski
0ca4a958f7
fix getCapabilities stub
2021-07-06 10:34:50 +01:00
Michael Telatynski
3301763f12
stub getCapabilities in tests
2021-07-06 10:19:33 +01: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
Michael Telatynski
b17d72c399
fix duplicate import
2021-07-02 14:54:10 +01:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11
2021-07-02 11:03:54 +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
David Baker
08176beb58
Kill mock-clock
...
We already import sinon's one in UserActivitytest, so use that here too.
2021-07-01 21:52:15 +01:00
David Baker
543fe6382d
Fix linting in tests
...
Or in the case of one test, disbale just the one rule it breaks
2021-07-01 20:54:04 +01:00
David Baker
ee9be5438e
eslint --fix
2021-07-01 20:43:05 +01:00
Michael Telatynski
e768ecb3d0
Typescript conversion of Composer components and more
2021-06-30 13:01:26 +01:00
J. Ryan Stinnett
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
J. Ryan Stinnett
71116bfa27
Migrate to `eslint-plugin-matrix-org`
...
This migrates to the new plugin form of our custom ESLint configs. As part of
this, some packages are de-duplicated, configs streamlined, etc.
2021-06-29 12:51:13 +01:00
Michael Telatynski
b60c2c5d55
Fix e2e test right panel back behaviour
2021-06-29 10:37:30 +01:00
Germain
53a6089cc9
Merge pull request #6268 from matrix-org/gsouquet/upgrade-puppeteer
2021-06-28 10:28:56 +01:00
Germain Souquet
96857ab7f7
Fix end-to-end tests rejectToast
2021-06-28 09:01:04 +01:00
Germain Souquet
2672516b6a
Upgrade puppeteer to use newer version of Chrome
2021-06-25 14:47:16 +01:00
Šimon Brandner
0df6200dd0
Convert MemberList-test to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:13 +02:00
Travis Ralston
c316eb841a
Merge pull request #6179 from aaronraimist/open-local-addresses
...
Open local addresses section by default when there are no existing local addresses
2021-06-22 14:48:02 -06:00
Michael Telatynski
6e3c647109
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
...
Conflicts:
package.json
src/components/views/spaces/SpacePanel.tsx
src/i18n/strings/en_EN.json
src/stores/SpaceStore.tsx
yarn.lock
2021-06-22 21:15:53 +01:00
Michael Telatynski
59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665
2021-06-22 17:46:57 +01:00
Michael Telatynski
e3e6b74272
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
...
Conflicts:
src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
Michael Telatynski
8a3dc1bbdf
fix tests
2021-06-18 17:56:18 +01:00
Šimon Brandner
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
Michael Telatynski
35e68b8aa5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
2021-06-17 15:45:32 +01:00
Michael Telatynski
017e0ba40f
fix more private field accesses in tests
2021-06-17 15:23:29 +01:00
Šimon Brandner
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-17 15:53:25 +02:00
Germain
48e090abcc
Remove unnecessary comment
2021-06-17 10:20:43 +01:00
Michael Telatynski
e7fde2686f
remove unused imports
2021-06-16 12:12:00 +01:00
Germain Souquet
9f8d04ab9a
Fix passing variable down to evaluate context
2021-06-16 11:39:04 +01:00
Michael Telatynski
bceee7978e
improve naming of tests
2021-06-16 09:30:47 +01:00
Michael Telatynski
9e20e5dfc4
mock new settings in tests
2021-06-16 09:14:07 +01:00
Germain Souquet
19cae42161
Benchmark multiple common user scenario
2021-06-15 15:06:00 +01:00
Germain Souquet
7310d35d7f
Merge branch 'develop' into gsouquet/benchmark-tracking
2021-06-15 11:45:11 +01:00
Michael Telatynski
a63d9220d2
Clear outstanding TODOs
2021-06-15 08:26:46 +01:00
Michael Telatynski
66fce64ee0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
...
Conflicts:
package.json
yarn.lock
2021-06-14 21:39:06 +01:00
Michael Telatynski
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username
2021-06-14 21:34:01 +01:00
Michael Telatynski
2879b9086c
Use alphabet from js-sdk
2021-06-14 21:32:11 +01:00
Michael Telatynski
8fd72fcf79
Iterate algorithm, base it on new js-sdk string lib
2021-06-14 21:28:32 +01:00
Germain Souquet
7000176572
Add workflow steps to track measurements
2021-06-14 14:53:22 +01:00
Michael Telatynski
4af2675e23
stash bigint support
2021-06-14 14:37:05 +01:00
Aaron Raimist
b8458c0ae3
fix test maybe
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-11 23:58:20 -05:00
Michael Telatynski
3d4411390f
write a shedload more tests
2021-06-11 16:28:07 +01:00
Germain Souquet
37484e3fc4
Add TextEncoder polyfill for test run
2021-06-11 12:33:02 +01:00
Michael Telatynski
a4fa2779d4
Iterate lexicographic ordering implementation
2021-06-11 10:33:00 +01:00
Michael Telatynski
21fc386317
Move over to new lexicographic string sorting
2021-06-10 11:40:10 +01:00
Šimon Brandner
fdda534053
Merge branch 'develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 19:23:14 +02:00
Germain Souquet
6e0a908c59
Merge branch 'develop' into gsouquet/react-17
2021-06-09 12:01:35 +01:00
Germain Souquet
d492ee4d8a
Update Enzyme adapter name
2021-06-09 11:57:29 +01:00
Germain
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf
2021-06-09 09:13:56 +01:00
Travis Ralston
692200b9c5
Merge pull request #6145 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/ws-6.2.2
...
Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests
2021-06-08 14:08:24 -06:00
Šimon Brandner
bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username
2021-06-08 17:14:42 +02:00
Michael Telatynski
432373a00e
Merge pull request #5999 from robintown/improved-forwarding-ui
2021-06-08 10:52:06 +01:00
Robin Townsend
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
Aaron Raimist
9fdbd4c120
Merge branch 'develop' into share-room
2021-06-07 17:00:44 -05:00
Aaron Raimist
773af6c7be
Fix test
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:53 -05:00
Šimon Brandner
025148d9fc
Merge branch 'develop' into show-username
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:37:22 +02:00
Robin Townsend
e891d18fa2
Add my email to my copyright notices
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -04:00
Robin Townsend
a06306d560
Merge branch 'develop' into improved-forwarding-ui
2021-06-05 11:04:17 -04:00
Robin Townsend
0f64f4d692
Fix MessagePanel tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 10:49:44 -04:00
dependabot[bot]
c24b239478
Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests
...
Bumps [ws](https://github.com/websockets/ws ) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/commits )
---
updated-dependencies:
- dependency-name: ws
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-05 13:36:25 +00:00
David Baker
31604c13c0
Lint the typescript tests
...
Turns out we hadn't told eslint to lint .ts in tests/
Also fix all the lint errors, including removing a use of assert that
had randomly crept in.
2021-06-04 16:52:50 +01:00
Šimon Brandner
8c533c7f8b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-04 08:09:31 +02:00
Travis Ralston
12e013508d
Merge pull request #6132 from matrix-org/travis/ts-mtxcli
...
Adapt for js-sdk MatrixClient conversion to TS
2021-06-04 00:07:22 -06:00
Šimon Brandner
6eb33ac730
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 07:49:05 +02:00
David Baker
7421efe8f9
Merge pull request #6136 from matrix-org/dbkr/map_phone_number_lookup_to_native
...
Map phone number lookup results to their native rooms
2021-06-03 19:01:46 +01:00
David Baker
8ef95a6237
Interface dispatcher payload
...
& use constant in test
2021-06-03 14:38:13 +01:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms
2021-06-03 08:44:01 +01:00
Šimon Brandner
1c92e31683
Add missing license header
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 19:27:57 +02:00
Šimon Brandner
e0572acb14
Write tests for CallEventGrouper
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 19:22:22 +02:00
David Baker
2c4fa73a45
Map phone number lookup results to their native rooms
...
When dialing a phone number, also look to see if there's a corresponding
native user for the resulting user, and if so, go to the native room
for that user.
2021-06-02 17:39:13 +01:00
Michael Telatynski
da13ec16f3
Merge branch 't3chguy/fix/17529' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
2021-06-02 12:42:55 +01:00