Merge pull request #4711 from alextsg/network-remove-provider-engine

Fix notice screen incorrectly disabling Accept button after multiple …

1 files changed, 15 insertions, 2 deletions

diff --git a/old-ui/app/components/notice.js b/old-ui/app/components/notice.js
index 09d461c7b..1ec254555 100644
--- a/old-ui/app/components/notice.js
+++ b/old-ui/app/components/notice.js
@@ -116,12 +116,25 @@ Notice.prototype.render = function () {
   )
 }
 
+Notice.prototype.setInitialDisclaimerState = function () {
+  if (document.getElementsByClassName('notice-box')[0].clientHeight < 310) {
+    this.setState({disclaimerDisabled: false})
+  }
+}
+
 Notice.prototype.componentDidMount = function () {
   // eslint-disable-next-line react/no-find-dom-node
   var node = findDOMNode(this)
   linker.setupListener(node)
-  if (document.getElementsByClassName('notice-box')[0].clientHeight < 310) {
-    this.setState({disclaimerDisabled: false})
+  this.setInitialDisclaimerState()
+}
+
+Notice.prototype.componentDidUpdate = function (prevProps) {
+  const { notice: { id } = {} } = this.props
+  const { notice: { id: prevNoticeId } = {} } = prevProps
+
+  if (id !== prevNoticeId) {
+    this.setInitialDisclaimerState()
   }
 }