Stop rogue verification toast if you verify during login

Fixes https://github.com/vector-im/riot-web/issues/12057

src/components/structures/ToastContainer.js

@@ -23,9 +23,7 @@ export default class ToastContainer extends React.Component {
     constructor() {
         super();
         this.state = {toasts: ToastStore.sharedInstance().getToasts()};
-    }
 
-    componentDidMount() {
         ToastStore.sharedInstance().on('update', this._onToastStoreUpdate);
     }
 

src/components/views/toasts/VerificationRequestToast.js

@@ -39,6 +39,13 @@ export default class VerificationRequestToast extends React.PureComponent {
             this.setState({counter});
         }, 1000);
         request.on("change", this._checkRequestIsPending);
+        // We should probably have a separate class managing the active verification toasts,
+        // rather than monitoring this in the toast component itself, since we'll get problems
+        // like the toasdt not going away when the verification is cancelled unless it's the
+        // one on the top (ie. the one that's mounted).
+        // As a quick & dirty fix, check the toast is still relevant when it mounts (this prevents
+        // a toast hanging around after logging in if you did a verification as part of login).
+        this._checkRequestIsPending();
     }
 
     componentWillUnmount() {