mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 20:41:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
24843 commits 219 branches 562 tags 474 MiB
Commit graph

72 commits

Author SHA1 Message Date
Michael Telatynski
f45c584c8a Correct the GenericToast props to show the two modes of operation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 19:13:59 +01:00
Michael Telatynski
14cee41360 Convert things to Typescript and re-use a generic component 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 13:29:53 +01:00
Travis Ralston
798e7a1f86 Merge branch 'develop' into travis/dispatcher-types 2020-05-15 09:56:02 -06:00
Travis Ralston
90a898d03f Move dispatcher into a subdirectory 
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
 2020-05-13 21:07:50 -06:00
Bruno Windels
8a1b381635 remove UI for upgrading 4S to sym enc 2020-05-12 14:29:11 +02:00
David Baker
3240b3bd60 Add device name to unverified session toast 2020-04-30 16:09:38 +01:00
David Baker
683d6804ca Update toast copy again 
Fixes https://github.com/vector-im/riot-web/issues/13447
 2020-04-29 19:07:10 +01:00
David Baker
a70efea69e Treat sessions that are there when we log in as old 
Use the bulk 'review' toast for sessions that existed at the time
of login, rather than considering them all to be new.

Also cheeky unrelated proptypes fix.

Fixes https://github.com/vector-im/riot-web/issues/13443
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1360
 2020-04-29 17:16:04 +01:00
David Baker
283a15c0b3 Lint 2020-04-29 15:54:32 +01:00
David Baker
9ac4fa92fd Update (bulk) unverified device toast copy 
Fixes https://github.com/vector-im/riot-web/issues/13444
 2020-04-29 15:31:41 +01:00
David Baker
eceb8edfbc
Merge pull request #4511 from matrix-org/dbkr/another_round_of_toast 
Separate toasts for existing & new device verification
 2020-04-29 12:09:37 +01:00
David Baker
126d81912b Remove await for some more getStoredDevice() calls 2020-04-29 11:02:22 +01:00
J. Ryan Stinnett
4adbfce92d
Merge pull request #4502 from matrix-org/jryans/set-up-button-text 
Fix set up encryption toast to have use "set up" as action
 2020-04-29 10:57:24 +01:00
David Baker
6f25f2eaec Add the other toast component 2020-04-29 10:44:51 +01:00
David Baker
719faed2ff Separate toasts for existing & new device verification 
Separate device verification toasts into ones for devices that were
there when the app loaded and a separate toast for each device that
has appeared since.

Reverts part of https://github.com/matrix-org/matrix-react-sdk/pull/4506
(clicking a device from your own UserInfo now triggers the legacy
verification flow again).

Fixes https://github.com/vector-im/riot-web/issues/13422
Fixes https://github.com/vector-im/riot-web/issues/13418
 2020-04-28 18:35:16 +01:00
David Baker
7e956514a2 Lint 2020-04-27 20:35:39 +01:00
J. Ryan Stinnett
b396096cd2 Fix set up encryption toast to have use "set up" as action 
This changes the "set up encryption" toast to use "set up" as the primary action
button, instead of "upgrade". Other toasts that do use text about upgrading will
keep their primary action text of "upgrade" as before.

Fixes https://github.com/vector-im/riot-web/issues/13231
 2020-04-27 18:35:51 +01:00
David Baker
a5ee99b858 Aggregate device verification toasts into one toast 
'Review' now opens the only place we can verify our own devices:
our user info.
 2020-04-27 18:33:54 +01:00
David Baker
bce22c620f Don't show spinner over encryption setup dialogs 
Fixes https://github.com/vector-im/riot-web/issues/13051
 2020-04-07 13:08:18 +01:00
Bruno Windels
364421b088 adjust self-verification copy in incoming verif req toast 2020-04-03 17:04:58 +02:00
David Baker
8a64caa925 Merge branch 'dbkr/wait_for_upgrade_to_complete' into dbkr/ssss_upgrade_copy 2020-03-26 11:14:33 +00:00
David Baker
95828ce751 Remove duplicate import 2020-03-26 11:13:57 +00:00
David Baker
8532c72fce Update copy on SSSS symmetric upgrade toast 
Fixes https://github.com/vector-im/riot-web/issues/12881
 2020-03-26 11:12:00 +00:00
David Baker
4586971a82 Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_upgrade_to_complete 2020-03-26 11:10:07 +00:00
David Baker
be50f80314 Wait for SSSS upgrade to complete 
and show a spinner while it completes
 2020-03-24 19:02:57 +00:00
Bruno Windels
3e59127d12 use SetupEncryptionBody to show a dialog from "Verify this session" 2020-03-24 16:39:43 +01:00
Bruno Windels
13a4f4190f Revert "also enable 4s when accepting a verification request" 
This reverts commit ab2e3a3465.
 2020-03-11 10:11:54 +01:00
Bruno Windels
ab2e3a3465 also enable 4s when accepting a verification request 2020-03-10 16:54:49 +01:00
Bruno Windels
17d55abed7
Merge pull request #4126 from matrix-org/bwindels/verifuifeedbackonlag 
Improve UI feedback while waiting for network
 2020-02-25 17:08:06 +00:00
Bruno Windels
569d5b6156 show right panel before waiting for .ready event to send 2020-02-25 13:13:31 +01:00
Zoe
9ed83b8648 Show a warning dialog when user indicates a new session wasn't them 2020-02-25 11:37:01 +00:00
Bruno Windels
3ec0301f9d use canAccept in toast, which takes local echo into account 2020-02-13 17:28:10 +01:00
Bruno Windels
1ff1575b42 remove dead code 2020-02-10 16:59:47 +01:00
Bruno Windels
1a5bed5a10 open a to_device request in a modal instead of the right panel 1st room 2020-02-07 15:56:10 +01:00
Bruno Windels
049a6d2064 hide toast when request is accepted 
if this is a .request > .ready request, dismissing when in .ready is what we want, as that is how you accept the request
if this is a .start request, we shouldn't dismiss

so only add .ready to the phases to hide the toast, not .started
 2020-02-07 15:49:44 +01:00
Bruno Windels
fa13bb9689 make the verif toast work with to_device request that do .request/.ready 2020-02-07 15:49:36 +01:00
Zoe
fab54ab936
Merge pull request #3998 from matrix-org/zip/12038-toast-timeouts 
Fix verification toast to close at 0s
 2020-02-04 09:30:47 +00:00
J. Ryan Stinnett
02cada7cc6 First pass of copy changes 2020-01-31 12:15:19 +00:00
Zoe
36d7b8e3ed don't close in UI, a js-sdk event will do that 2020-01-31 09:59:24 +00:00
Zoe
99b04a6f70 lint 2020-01-30 15:41:26 +00:00
Zoe
49d2ed8906 ... and take action when the counter reaches zero in verification toast 2020-01-30 15:37:44 +00:00
Zoe
7e98ea79d2 Fix verification toast timeouts to not stick at 0 
Fixes: https://github.com/vector-im/riot-web/issues/12038
 2020-01-30 15:31:20 +00:00
J. Ryan Stinnett
81ee27f41e Replace device with session in UI text 
This replaces "device" with "session" throughout user-visible text at the React
layer. Variable names and comments are left as-is for now.
 2020-01-29 15:52:32 +00:00
J. Ryan Stinnett
725ec1dda6
Merge pull request #3978 from matrix-org/jryans/cs-polish 
Change new session toast to unverified
 2020-01-29 15:33:19 +00:00
J. Ryan Stinnett
b5914f5c2b Fix later button 2020-01-29 15:14:56 +00:00
J. Ryan Stinnett
f12fe984e5 Change new session toast to unverified 
This also changes text to show the device ID and name in the toast.

Fixes https://github.com/vector-im/riot-web/issues/11916
 2020-01-29 15:00:04 +00:00
Bruno Windels
c4f1659116 don't dismiss toasts for device verification 
as they are immediately started
 2020-01-29 15:27:26 +01:00
Michael Telatynski
76e61b9948 Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration 2020-01-28 17:19:59 +00:00
Michael Telatynski
c93b080434 delint 2020-01-28 11:17:53 +00:00
J. Ryan Stinnett
67358e06bf Use annotations and imports 2020-01-28 10:10:37 +00:00