Commit graph

4 commits

Author SHA1 Message Date
Michael Telatynski
c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3
 Conflicts:
	src/@types/global.d.ts
	src/components/structures/ToastContainer.tsx
2020-05-26 13:38:17 +01:00
Michael Telatynski
4e67e46863 fix countSeen
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 14:29:30 +01:00
Michael Telatynski
c464abaa49 Iterate toast count indicator more logically
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 14:28:01 +01:00
Michael Telatynski
dc37469808 Convert ToastContainer and ToastStore to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 12:47:40 +01:00
Renamed from src/components/structures/ToastContainer.js (Browse further)