Merge pull request #3434 from evhan55/bug/multiple-alerts-locale-switch

evhan55 · web-flow · commit fc746728b307 · 2018-10-19T14:50:19.000-04:00
Resolves #3336: Prevent multiple peripheral alerts after language switch
diff --git a/src/lib/vm-listener-hoc.jsx b/src/lib/vm-listener-hoc.jsx
@@ -55,6 +55,7 @@ const vmListenerHOC = function (WrappedComponent) {
             }
         }
         componentWillUnmount () {
+            this.props.vm.removeListener('PERIPHERAL_DISCONNECT_ERROR', this.props.onShowAlert);
             if (this.props.attachKeyboardEvents) {
                 document.removeEventListener('keydown', this.handleKeyDown);
                 document.removeEventListener('keyup', this.handleKeyUp);

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ const vmListenerHOC = function (WrappedComponent) {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`componentWillUnmount () {`
	`58`	`+ this.props.vm.removeListener('PERIPHERAL_DISCONNECT_ERROR', this.props.onShowAlert);`
`58`	`59`	`if (this.props.attachKeyboardEvents) {`
`59`	`60`	`document.removeEventListener('keydown', this.handleKeyDown);`
`60`	`61`	`document.removeEventListener('keyup', this.handleKeyUp);`