Converts ReleaseNotes into redux component

Resolves brave#9448 Auditors: @bsclifton @bridiver Test Plan:
NejcZdovc · Jun 15, 2017 · ee3ba9a · ee3ba9a
1 parent 6478bcd
commit ee3ba9a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 16 deletions.
diff --git a/app/renderer/components/main/main.js b/app/renderer/components/main/main.js
@@ -83,7 +83,6 @@ class Main extends ImmutableComponent {
     this.onHideAutofillAddressPanel = this.onHideAutofillAddressPanel.bind(this)
     this.onHideAutofillCreditCardPanel = this.onHideAutofillCreditCardPanel.bind(this)
     this.onHideNoScript = this.onHideNoScript.bind(this)
-    this.onHideReleaseNotes = this.onHideReleaseNotes.bind(this)
     this.onHideCheckDefaultBrowserDialog = this.onHideCheckDefaultBrowserDialog.bind(this)
     this.onTabContextMenu = this.onTabContextMenu.bind(this)
     this.onFind = this.onFind.bind(this)
@@ -564,10 +563,6 @@ class Main extends ImmutableComponent {
     windowActions.setNoScriptVisible(false)
   }
 
-  onHideReleaseNotes () {
-    windowActions.setReleaseNotesVisible(false)
-  }
-
   onHideCheckDefaultBrowserDialog () {
     windowActions.setModalDialogDetail('checkDefaultBrowserDialog')
   }
@@ -792,9 +787,7 @@ class Main extends ImmutableComponent {
         }
         {
           releaseNotesIsVisible
-          ? <ReleaseNotes
-            metadata={this.props.appState.getIn(['updates', 'metadata'])}
-            onHide={this.onHideReleaseNotes} />
+          ? <ReleaseNotes />
           : null
         }
         {

diff --git a/app/renderer/components/main/releaseNotes.js b/app/renderer/components/main/releaseNotes.js
@@ -4,33 +4,59 @@
 
 const React = require('react')
 const {StyleSheet, css} = require('aphrodite')
+const Immutable = require('immutable')
 
 // Components
-const ImmutableComponent = require('../immutableComponent')
+const ReduxComponent = require('../reduxComponent')
 const Dialog = require('../common/dialog')
 
+// Actions
+const windowActions = require('../../../../js/actions/windowActions')
+
 // Styles
 const commonStyles = require('../styles/commonStyles')
 
-class ReleaseNotes extends ImmutableComponent {
+class ReleaseNotes extends React.Component {
+  constructor (props) {
+    super(props)
+    this.onClick = this.onClick.bind(this)
+  }
+
   onClick (e) {
     e.stopPropagation()
   }
+
+  onHide () {
+    windowActions.setReleaseNotesVisible(false)
+  }
+
+  mergeProps (state, ownProps) {
+    const metadata = state.getIn(['updates', 'metadata'], Immutable.Map())
+
+    const props = {}
+    props.name = metadata.get('name')
+    props.notes = metadata.get('notes')
+
+    return props
+  }
+
   render () {
     const className = css(
       commonStyles.flyoutDialog,
       styles.releaseNotes
     )
 
-    return <Dialog onHide={this.props.onHide} isClickDismiss>
-      <div className={className} onClick={this.onClick.bind(this)}>
-        <h1 className={css(styles.header)}>{this.props.metadata.get('name')}</h1>
-        <div>{this.props.metadata.get('notes')}</div>
+    return <Dialog onHide={this.onHide} isClickDismiss>
+      <div className={className} onClick={this.onClick}>
+        <h1 className={css(styles.header)}>{this.props.name}</h1>
+        <div>{this.props.notes}</div>
       </div>
     </Dialog>
   }
 }
 
+module.exports = ReduxComponent.connect(ReleaseNotes)
+
 const styles = StyleSheet.create({
   releaseNotes: {
     width: 'auto',
@@ -42,5 +68,3 @@ const styles = StyleSheet.create({
     marginBottom: '10px'
   }
 })
-
-module.exports = ReleaseNotes