Merge branch 'development' into feature/PL-bug-fixes

blockchain · May 8, 2018 · e97a087 · e97a087
2 parents 2696471 + 893e050
commit e97a087
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Faq/template.js b/packages/blockchain-wallet-v4-frontend/src/components/Faq/template.js
@@ -68,8 +68,6 @@ const Faq = (props) => {
 
 Faq.propTypes = {
   filteredContent: PropTypes.array.isRequired,
-  onFilter: PropTypes.func.isRequired,
-  filterText: PropTypes.string.isRequired,
   handleTrayRightToggle: PropTypes.func.isRequired
 }
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/index.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/index.js
@@ -3,6 +3,7 @@ import { connect } from 'react-redux'
 import { compose, bindActionCreators } from 'redux'
 import { Route, Redirect } from 'react-router-dom'
 import ui from 'redux-ui'
+import { reset } from 'redux-form'
 
 import { actions, selectors } from 'data'
 import WalletLayout from './template'
@@ -27,6 +28,7 @@ class WalletLayoutContainer extends React.PureComponent {
           trayRightOpen={ui.trayRightOpen}
           trayRightContent={ui.trayRightContent}
           handleTrayRightToggle={(content, fromClickOutside) => {
+            this.props.resetFaqForm()
             if (fromClickOutside) {
               updateUI({ trayRightOpen: false })
             } else if (content && ui.trayRightOpen && ui.trayRightContent !== content) {
@@ -51,6 +53,7 @@ const mapStateToProps = (state) => ({
 })
 
 const mapDispatchToProps = (dispatch) => ({
+  resetFaqForm: () => dispatch(reset('faq')),
   kvStoreBchActions: bindActionCreators(actions.core.kvStore.bch, dispatch),
   kvStoreEthereumActions: bindActionCreators(actions.core.kvStore.ethereum, dispatch),
   kvStoreShapeshiftActions: bindActionCreators(actions.core.kvStore.shapeShift, dispatch),