Bruno Windels
3292991491
provide specific label for when accepting/declining is in progress
...
also distuingish between cancelling and declining
2020-02-13 17:29:38 +01:00
Bruno Windels
3eb07465f7
use canAccept in tile, which takes local echo into account
2020-02-13 17:29:13 +01:00
Bruno Windels
413a149b47
disable "Accept"/"Decline" buttons on verif tile after clicking
...
to avoid sending double events
2020-02-07 15:50:42 +01:00
David Baker
39e9bffe1f
Make encryption events into bubble-style tiles
...
Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/
Fixes https://github.com/vector-im/riot-web/issues/12006
2020-01-30 20:03:26 +00:00
Michael Telatynski
342fcb09c4
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
...
Conflicts:
src/components/views/right_panel/VerificationPanel.js
src/components/views/toasts/VerificationRequestToast.js
2020-01-24 16:19:41 +00:00
Michael Telatynski
7a5e172b88
Apply a huge part of the decorations and copy
2020-01-24 16:16:46 +00:00
Bruno Windels
6cce65a2a5
fix lint
2020-01-24 12:08:47 +01:00
Bruno Windels
2483337e89
don't use removed .event property anymore on verification request
2020-01-24 11:59:01 +01:00
Bruno Windels
716c8ba68f
pr feedback
2020-01-17 17:02:31 +01:00
Travis Ralston
d1fcef1211
Merge branch 'develop' into bwindels/verification-right-panel
2020-01-16 13:23:32 -07:00
Travis Ralston
fde32f13a5
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
Bruno Windels
7a88a94936
fixes!
2020-01-03 13:50:13 +01:00
Bruno Windels
52c7c5b837
render done tile as accepted
2020-01-03 13:50:13 +01:00
Bruno Windels
b49c471f05
render empty tiles when no request
2020-01-03 13:50:13 +01:00
Bruno Windels
1aebc95793
slightly better copy
2020-01-03 13:50:13 +01:00
Bruno Windels
9e4b65de6a
fixup after rebase
2020-01-03 13:42:18 +01:00
Bruno Windels
d8a38e6b74
WIP
2020-01-03 13:42:17 +01:00
Travis Ralston
042bd35d79
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
Travis Ralston
806d728d59
Import from the js-sdk's src/ directory
...
Because ES6 and such.
2019-12-22 21:14:33 -07:00
Travis Ralston
d56f0f2a25
Convert many imports to handle ES6 exports
...
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
2019-12-22 21:04:42 -07:00
J. Ryan Stinnett
3ac0deebab
Use static modals for verification
...
Verification with cross-signing may requiring asking for your secret storage
passphrase, which is displayed in it's own modal on top of flows. For now while
verification takes in modals also, mark the verification ones as static so they
don't lose state when secret storage appears on top mid-flow.
2019-12-13 13:55:28 +00:00
Bruno Windels
309633181d
use FormButton in verification request tile too and dedupe styles
2019-11-22 16:32:50 +01:00
Bruno Windels
0d2f9c4215
add verification request tile + styling
2019-11-07 19:54:56 +01:00
