fix(lint): fix all lint errors/warnings

.eslintrc

@@ -16,7 +16,13 @@
     "jsx-quotes": ["error", "prefer-single"],
     "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
     "jsx-a11y/no-static-element-interactions": 0,
-    "react/forbid-prop-types": 0
+    "jsx-a11y/no-noninteractive-element-interactions": 0,
+    "react/no-array-index-key": 0,
+    "react/forbid-prop-types": 0,
+    "camelcase": 0,
+    "react/require-default-props": 0,
+    "max-len": ["error", 150],
+    "import/no-extraneous-dependencies": 0
   },
   "plugins": [
     "flowtype",

app/main.dev.js

@@ -1,3 +1,4 @@
+/* eslint-disable */
 /* eslint global-require: 1, flowtype-errors/show-errors: 0 */
 
 /**

app/menu.js

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 // @flow
 import { app, Menu, shell, BrowserWindow } from 'electron';
 

app/reducers/channels.js

@@ -119,7 +119,9 @@ channelsSelectors.allChannels = createSelector(
   pendingOpenChannelsSelector,
   pendingClosedChannelsSelector,
   pendingForceClosedChannelsSelector,
-  (channels, pendingOpenChannels, pendingClosedChannels, pendingForcedClosedChannels) => [...channels, ...pendingOpenChannels, ...pendingClosedChannels, ...pendingForcedClosedChannels]
+  (channels, pendingOpenChannels, pendingClosedChannels, pendingForcedClosedChannels) => (
+    [...channels, ...pendingOpenChannels, ...pendingClosedChannels, ...pendingForcedClosedChannels]
+  )
 )
 
 export { channelsSelectors }

app/reducers/form.js

@@ -49,10 +49,10 @@ export function setPubkey(pubkey) {
   }
 }
 
-export function setPaymentRequest(paymentRequest) {
+export function setPaymentRequest(payment_request) {
   return {
     type: SET_PAYMENT_REQUEST,
-    paymentRequest
+    payment_request
   }
 }
 
@@ -70,9 +70,7 @@ const ACTION_HANDLERS = {
   [SET_AMOUNT]: (state, { amount }) => ({ ...state, amount }),
   [SET_MESSAGE]: (state, { message }) => ({ ...state, message }),
   [SET_PUBKEY]: (state, { pubkey }) => ({ ...state, pubkey }),
-  [SET_PAYMENT_REQUEST]: (state, { paymentRequest }) => (
+  [SET_PAYMENT_REQUEST]: (state, { payment_request }) => ({ ...state, payment_request }),
-    { ...state, payment_request: paymentRequest }
-  ),
   [RESET_FORM]: () => (initialState)
 }
 

app/reducers/invoice.js

@@ -83,6 +83,12 @@ export function invoiceSuccessful(invoice) {
   }
 }
 
+export function invoiceFailed() {
+  return {
+    type: INVOICE_FAILED
+  }
+}
+
 export const fetchInvoice = payreq => async (dispatch) => {
   dispatch(getInvoice())
   const invoice = await callApi(`invoice/${payreq}`, 'get')
@@ -91,17 +97,18 @@ export const fetchInvoice = payreq => async (dispatch) => {
     dispatch(receiveFormInvoice(invoice.data))
     return true
   }
-  dispatch(invoicesFailed())
+  dispatch(invoiceFailed())
   return false
 }
 
 export const fetchInvoices = () => async (dispatch) => {
   dispatch(getInvoice())
   const invoices = await callApi('invoices')
-  invoices ?
+  if (invoices) {
     dispatch(receiveInvoices(invoices.data))
-    :
+  } else {
     dispatch(invoiceFailed())
+  }
 
   return invoices
 }
@@ -119,13 +126,6 @@ export const createInvoice = (amount, memo, currency, rate) => async (dispatch)
 
   return invoice
 }
-
-
-export function invoiceFailed() {
-  return {
-    type: INVOICE_FAILED
-  }
-}
 // ------------------------------------
 // Action Handlers
 // ------------------------------------
@@ -136,13 +136,17 @@ const ACTION_HANDLERS = {
 
   [GET_INVOICE]: state => ({ ...state, invoiceLoading: true }),
   [RECEIVE_INVOICE]: (state, { invoice }) => ({ ...state, invoiceLoading: false, invoice }),
-  [RECEIVE_FORM_INVOICE]: (state, { formInvoice }) => ({ ...state, invoiceLoading: false, formInvoice }),
+  [RECEIVE_FORM_INVOICE]: (state, { formInvoice }) => (
+    { ...state, invoiceLoading: false, formInvoice }
+  ),
 
   [GET_INVOICES]: state => ({ ...state, invoiceLoading: true }),
   [RECEIVE_INVOICES]: (state, { invoices }) => ({ ...state, invoiceLoading: false, invoices }),
 
   [SEND_INVOICE]: state => ({ ...state, invoiceLoading: true }),
-  [INVOICE_SUCCESSFUL]: (state, { invoice }) => ({ ...state, invoiceLoading: false, invoices: [invoice, ...state.invoices] }),
+  [INVOICE_SUCCESSFUL]: (state, { invoice }) => (
+    { ...state, invoiceLoading: false, invoices: [invoice, ...state.invoices] }
+  ),
   [INVOICE_FAILED]: state => ({ ...state, invoiceLoading: false, data: null })
 }
 

app/reducers/payment.js

@@ -68,14 +68,15 @@ export const fetchPayments = () => async (dispatch) => {
   return payments
 }
 
-export const payInvoice = paymentRequest => async (dispatch) => {
+export const payInvoice = payment_request => async (dispatch) => {
   dispatch(sendPayment())
-  const payment = await callApi('sendpayment', 'post', { payment_request: paymentRequest })
+  const payment = await callApi('sendpayment', 'post', { payment_request })
 
-  payment ?
+  if (payment) {
     dispatch(fetchPayments())
-    :
+  } else {
     dispatch(paymentFailed())
+  }
 
   return payment
 }

app/reducers/peers.js

@@ -95,7 +95,11 @@ export const fetchPeers = () => async (dispatch) => {
 export const connectRequest = ({ pubkey, host }) => async (dispatch) => {
   dispatch(connectPeer())
   const success = await callApi('connect', 'post', { pubkey, host })
-  success.data ? dispatch(connectSuccess({ pub_key: pubkey, address: host, peer_id: success.data.peer_id })) : dispatch(connectFailure())
+  if (success.data) {
+    dispatch(connectSuccess({ pub_key: pubkey, address: host, peer_id: success.data.peer_id }))
+  } else {
+    dispatch(connectFailure())
+  }
 
   return success
 }
@@ -103,8 +107,11 @@ export const connectRequest = ({ pubkey, host }) => async (dispatch) => {
 export const disconnectRequest = ({ pubkey }) => async (dispatch) => {
   dispatch(disconnectPeer())
   const success = await callApi('disconnect', 'post', { pubkey })
-  console.log('success: ', success)
+  if (success) {
-  success ? dispatch(disconnectSuccess(pubkey)) : dispatch(disconnectFailure())
+    dispatch(disconnectSuccess(pubkey))
+  } else {
+    dispatch(disconnectFailure())
+  }
 
   return success
 }

app/routes/activity/components/Activity.js

@@ -1,6 +1,5 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import CSSTransitionGroup from 'react-transition-group/CSSTransitionGroup'
 import { MdSearch } from 'react-icons/lib/md'
 import Payments from './components/Payments'
 import Invoices from './components/Invoices'
@@ -39,7 +38,7 @@ class Activity extends Component {
     return (
       <div>
         <div className={styles.search}>
-          <label className={`${styles.label} ${styles.input}`}>
+          <label className={`${styles.label} ${styles.input}`} htmlFor='invoiceSearch'>
             <MdSearch />
           </label>
           <input
@@ -48,6 +47,7 @@ class Activity extends Component {
             className={`${styles.text} ${styles.input}`}
             placeholder={tab === 1 ? 'Search transactions by amount, public key, channel' : 'Search requests by memo'}
             type='text'
+            id='invoiceSearch'
           />
         </div>
 
@@ -93,6 +93,8 @@ class Activity extends Component {
 }
 
 Activity.propTypes = {
+  fetchPayments: PropTypes.func.isRequired,
+  fetchInvoices: PropTypes.func.isRequired,
   ticker: PropTypes.object.isRequired,
   searchInvoices: PropTypes.func.isRequired,
   invoices: PropTypes.array.isRequired,

app/routes/activity/components/components/Invoices.js

@@ -77,26 +77,26 @@ const Invoices = ({
         </div>
       </li>
       {
-        invoices.map((invoice, index) =>
+        invoices.map((invoiceItem, index) => (
-          (<li key={index} className={styles.invoice} onClick={() => setInvoice(invoice)}>
+          <li key={index} className={styles.invoice} onClick={() => setInvoice(invoiceItem)}>
             <div className={styles.left}>
-              <div className={styles.path}>{`${invoice.payment_request.substring(0, 75)}...`}</div>
+              <div className={styles.path}>{`${invoiceItem.payment_request.substring(0, 75)}...`}</div>
             </div>
             <div className={styles.center}>
-              <div>{invoice.memo}</div>
+              <div>{invoiceItem.memo}</div>
             </div>
             <div className={styles.right}>
-              <div className={invoice.settled ? styles.settled : null}>
+              <div className={invoiceItem.settled ? styles.settled : null}>
                 {
                   ticker.currency === 'btc' ?
-                    btc.satoshisToBtc(invoice.value)
+                    btc.satoshisToBtc(invoiceItem.value)
                     :
-                    btc.satoshisToUsd(invoice.value, ticker.btcTicker.price_usd)
+                    btc.satoshisToUsd(invoiceItem.value, ticker.btcTicker.price_usd)
                 }
               </div>
             </div>
-          </li>)
+          </li>
-        )
+        ))
       }
     </ul>
   </div>

app/routes/activity/components/components/Modal.js

@@ -1,8 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import ReactModal from 'react-modal'
-import Moment from 'react-moment'
-import 'moment-timezone'
 
 const Modal = ({ isOpen, resetObject, children }) => {
   const customStyles = {

app/routes/activity/components/components/Payments.js

@@ -65,23 +65,23 @@ const Payments = ({
         </div>
       </li>
       {
-        payments.map((payment, index) =>
+        payments.map((paymentItem, index) =>
           (<li key={index} className={styles.payment} onClick={() => setPayment(payment)}>
             <div className={styles.left}>
-              <div className={styles.path}>{payment.path[0]}</div>
+              <div className={styles.path}>{paymentItem.path[0]}</div>
             </div>
             <div className={styles.center}>
               <div className={styles.date}>
-                <Moment format='MMMM Do'>{payment.creation_date * 1000}</Moment>
+                <Moment format='MMMM Do'>{paymentItem.creation_date * 1000}</Moment>
               </div>
             </div>
             <div className={styles.right}>
               <span className={styles.fee}>
                 {
                   ticker.currency === 'btc' ?
-                    btc.satoshisToBtc(payment.fee)
+                    btc.satoshisToBtc(paymentItem.fee)
                     :
-                    btc.satoshisToUsd(payment.fee, ticker.btcTicker.price_usd)
+                    btc.satoshisToUsd(paymentItem.fee, ticker.btcTicker.price_usd)
                 }
               </span>
             </div>
@@ -89,9 +89,9 @@ const Payments = ({
               <span className={styles.value}>
                 {
                   ticker.currency === 'btc' ?
-                    btc.satoshisToBtc(payment.value)
+                    btc.satoshisToBtc(paymentItem.value)
                     :
-                    btc.satoshisToUsd(payment.value, ticker.btcTicker.price_usd)
+                    btc.satoshisToUsd(paymentItem.value, ticker.btcTicker.price_usd)
                 }
               </span>
             </div>

app/routes/app/components/App.js

@@ -1,8 +1,8 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import Form from './components/Form'
-import Nav from './components/Nav.js'
+import Nav from './components/Nav'
-import Socket from './components/Socket.js'
+import Socket from './components/Socket'
 import styles from './App.scss'
 
 export const CHANNEL_DATA = 'CHANNEL_DATA'
@@ -74,6 +74,8 @@ class App extends Component {
 }
 
 App.propTypes = {
+  fetchTicker: PropTypes.func.isRequired,
+  fetchBalance: PropTypes.func.isRequired,
   ticker: PropTypes.object.isRequired,
   balance: PropTypes.object.isRequired,
   invoice: PropTypes.object.isRequired,

app/routes/app/components/components/Form/Form.js

@@ -117,18 +117,9 @@ const Form = ({
 Form.propTypes = {
   form: PropTypes.object.isRequired,
   ticker: PropTypes.object.isRequired,
-  formType: PropTypes.string,
-  amount: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.number
-  ]),
-  message: PropTypes.string,
-  payment_request: PropTypes.string,
   setAmount: PropTypes.func.isRequired,
   setMessage: PropTypes.func.isRequired,
   setPaymentRequest: PropTypes.func.isRequired,
-  currency: PropTypes.string,
-  btcTicker: PropTypes.object,
   isOpen: PropTypes.bool.isRequired,
   close: PropTypes.func.isRequired,
   createInvoice: PropTypes.func.isRequired,

app/routes/app/components/components/Nav.js

@@ -1,5 +1,5 @@
-// @flow
+import React from 'react'
-import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { NavLink } from 'react-router-dom'
 import ReactSVG from 'react-svg'
 import { MdAccountBalanceWallet, MdSettings } from 'react-icons/lib/md'
@@ -7,16 +7,7 @@ import { FaClockO, FaBitcoin, FaDollar } from 'react-icons/lib/fa'
 import { btc } from '../../../../utils'
 import styles from './Nav.scss'
 
-class Nav extends Component {
+const Nav = ({ ticker, balance, setCurrency, formClicked }) => (
-  render() {
-    const {
-      ticker,
-      balance,
-      setCurrency,
-      formClicked
-    } = this.props
-
-    return (
   <nav className={styles.nav}>
     <ul className={styles.info}>
       <li className={`${styles.currencies} ${styles.link}`}>
@@ -95,14 +86,13 @@ class Nav extends Component {
       </div>
     </div>
   </nav>
-    )
+)
-  }
-}
 
 Nav.propTypes = {
-  ticker: React.PropTypes.object.isRequired,
+  ticker: PropTypes.object.isRequired,
-  balance: React.PropTypes.object.isRequired,
+  balance: PropTypes.object.isRequired,
-  formClicked: React.PropTypes.func.isRequired
+  setCurrency: PropTypes.func.isRequired,
+  formClicked: PropTypes.func.isRequired
 }
 
 export default Nav

app/routes/app/containers/AppContainer.js

@@ -3,11 +3,16 @@ import App from '../components/App'
 import { fetchTicker, setCurrency } from '../../../reducers/ticker'
 import { fetchBalance } from '../../../reducers/balance'
 import { fetchInfo } from '../../../reducers/info'
-import { setForm } from '../../../reducers/form'
 import { createInvoice, fetchInvoice } from '../../../reducers/invoice'
 import { payInvoice } from '../../../reducers/payment'
 import { fetchChannels } from '../../../reducers/channels'
-import { setAmount, setMessage, setPubkey, setPaymentRequest } from '../../../reducers/form'
+import {
+  setForm,
+  setAmount,
+  setMessage,
+  setPubkey,
+  setPaymentRequest
+} from '../../../reducers/form'
 
 const mapDispatchToProps = {
   fetchTicker,

app/routes/wallet/components/Wallet.js

@@ -73,7 +73,21 @@ class Wallet extends Component {
 Wallet.propTypes = {
   fetchInfo: PropTypes.func.isRequired,
   fetchPeers: PropTypes.func.isRequired,
-  fetchChannels: PropTypes.func.isRequired
+  fetchChannels: PropTypes.func.isRequired,
+  info: PropTypes.object.isRequired,
+  ticker: PropTypes.object.isRequired,
+  peers: PropTypes.object.isRequired,
+  channels: PropTypes.object.isRequired,
+  setPeer: PropTypes.func.isRequired,
+  setChannel: PropTypes.func.isRequired,
+  peerModalOpen: PropTypes.bool.isRequired,
+  channelModalOpen: PropTypes.bool.isRequired,
+  setPeerForm: PropTypes.func.isRequired,
+  setChannelForm: PropTypes.func.isRequired,
+  connectRequest: PropTypes.func.isRequired,
+  disconnectRequest: PropTypes.func.isRequired,
+  allChannels: PropTypes.array.isRequired,
+  openChannel: PropTypes.func.isRequired
 }
 
 

app/routes/wallet/components/components/Channels/Channels.js

@@ -37,11 +37,11 @@ const Channels = ({
       {
         !channelsLoading ?
           allChannels.map((channel, index) => {
-            if (channel.hasOwnProperty('blocks_till_open')) {
+            if (Object.prototype.hasOwnProperty.call(channel, 'blocks_till_open')) {
               return (
                 <OpenPendingChannel key={index} channel={channel} ticker={ticker} />
               )
-            } else if (channel.hasOwnProperty('closing_txid')) {
+            } else if (Object.prototype.hasOwnProperty.call(channel, 'closing_txid')) {
               return (
                 <ClosedPendingChannel key={index} channel={channel} ticker={ticker} />
               )

app/routes/wallet/components/components/Channels/components/ChannelForm/ChannelForm.js

@@ -7,7 +7,8 @@ import styles from './ChannelForm.scss'
 
 const ChannelForm = ({ form, setForm, ticker, peers, openChannel }) => {
   const submitClicked = () => {
-    const { form: { node_key, local_amt, push_amt }, openChannel, ticker } = this.props
+    const { node_key, local_amt, push_amt } = form
+
     const localamt = ticker.currency === 'btc' ? btc.btcToSatoshis(local_amt) : btc.btcToSatoshis(usd.usdToBtc(local_amt, ticker.btcTicker.price_usd))
     const pushamt = ticker.currency === 'btc' ? btc.btcToSatoshis(push_amt) : btc.btcToSatoshis(usd.usdToBtc(push_amt, ticker.btcTicker.price_usd))
 
@@ -47,17 +48,18 @@ const ChannelForm = ({ form, setForm, ticker, peers, openChannel }) => {
           <h1 className={styles.title}>Open a new channel</h1>
 
           <section className={styles.pubkey}>
-            <label><FaUser /></label>
+            <label htmlFor='nodekey'><FaUser /></label>
             <input
               type='text'
               size=''
               placeholder='Peer public key'
               value={form.node_key}
               onChange={event => setForm({ node_key: event.target.value })}
+              id='nodekey'
             />
           </section>
           <section className={styles.local}>
-            <label>
+            <label htmlFor='localamount'>
               {
                 ticker.currency === 'btc' ?
                   <FaBitcoin />
@@ -71,10 +73,11 @@ const ChannelForm = ({ form, setForm, ticker, peers, openChannel }) => {
               placeholder='Local amount'
               value={form.local_amt}
               onChange={event => setForm({ local_amt: event.target.value })}
+              amount='localamount'
             />
           </section>
           <section className={styles.push}>
-            <label>
+            <label htmlFor='pushamount'>
               {
                 ticker.currency === 'btc' ?
                   <FaBitcoin />
@@ -88,6 +91,7 @@ const ChannelForm = ({ form, setForm, ticker, peers, openChannel }) => {
               placeholder='Push amount'
               value={form.push_amt}
               onChange={event => setForm({ push_amt: event.target.value })}
+              id='pushamount'
             />
           </section>
 
@@ -96,10 +100,16 @@ const ChannelForm = ({ form, setForm, ticker, peers, openChannel }) => {
             {
               peers.length ?
                 peers.map(peer =>
-                  (<li key={peer.peer_id} className={styles.peer} onClick={() => setForm({ node_key: peer.pub_key })}>
+                  (
+                    <li
+                      key={peer.peer_id}
+                      className={styles.peer}
+                      onClick={() => setForm({ node_key: peer.pub_key })}
+                    >
                       <h4>{peer.address}</h4>
                       <h1>{peer.pub_key}</h1>
-                  </li>)
+                    </li>
+                  )
                 )
                 :
                 null

app/routes/wallet/components/components/Channels/components/ChannelModal/ChannelModal.js

@@ -1,11 +1,10 @@
-// @flow
 import { shell } from 'electron'
-import React, { Component } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import ReactModal from 'react-modal'
 import styles from './ChannelModal.scss'
 
-class ChannelModal extends Component {
+const ChannelModal = ({ isOpen, resetChannel, channel }) => {
-  render() {
   const customStyles = {
     overlay: {
       cursor: 'pointer',
@@ -22,8 +21,6 @@ class ChannelModal extends Component {
     }
   }
 
-    const { isOpen, resetChannel, channel } = this.props
-
   return (
     <ReactModal
       isOpen={isOpen}
@@ -86,8 +83,12 @@ class ChannelModal extends Component {
       }
     </ReactModal>
   )
-  }
 }
 
+ChannelModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  resetChannel: PropTypes.func.isRequired,
+  channel: PropTypes.object
+}
 
 export default ChannelModal

app/routes/wallet/components/components/Channels/components/ClosedPendingChannel/ClosedPendingChannel.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
 import { btc } from '../../../../../../../utils'
 import styles from './ClosedPendingChannel.scss'
 
-const ClosedPendingChannel = ({ ticker, channel: { channel, closing_txid }, setChannel }) => (
+const ClosedPendingChannel = ({ ticker, channel: { channel, closing_txid } }) => (
   <li className={styles.channel} onClick={() => shell.openExternal(`https://testnet.smartbit.com.au/tx/${closing_txid}`)}>
     <h1 className={styles.closing}>Status: Closing</h1>
     <div className={styles.left}>
@@ -59,9 +59,7 @@ const ClosedPendingChannel = ({ ticker, channel: { channel, closing_txid }, setC
 
 ClosedPendingChannel.propTypes = {
   ticker: PropTypes.object.isRequired,
-  channel: PropTypes.object.isRequired,
+  channel: PropTypes.object.isRequired
-  closing_txid: PropTypes.string,
-  setChannel: PropTypes.func
 }
 
 export default ClosedPendingChannel

app/routes/wallet/components/components/Channels/components/OpenPendingChannel/OpenPendingChannel.js

@@ -1,4 +1,3 @@
-// @flow
 import { shell } from 'electron'
 import React from 'react'
 import PropTypes from 'prop-types'

app/routes/wallet/components/components/Peers/components/PeerForm/PeerForm.js

@@ -1,14 +1,13 @@
-// @flow
+import React from 'react'
-import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import ReactModal from 'react-modal'
 import styles from './PeerForm.scss'
 
-class PeerForm extends Component {
+const PeerForm = ({ form, setForm, connect }) => {
-  render() {
   const submit = () => {
-      const { form: { pubkey, host } } = this.props
+    const { pubkey, host } = form
 
-      this.props.connect({ pubkey, host }).then((success) => {
+    connect({ pubkey, host }).then((success) => {
       if (success.data) { setForm({ isOpen: false }) }
     })
   }
@@ -29,7 +28,6 @@ class PeerForm extends Component {
     }
   }
 
-    const { form, setForm, connect } = this.props
   return (
     <div>
       <ReactModal
@@ -45,23 +43,25 @@ class PeerForm extends Component {
           <h1 className={styles.title}>Connect to a peer</h1>
 
           <section className={styles.pubkey}>
-              <label>Pubkey</label>
+            <label htmlFor='pubkey'>Pubkey</label>
             <input
               type='text'
               size=''
               placeholder='Public key'
               value={form.pubkey}
               onChange={event => setForm({ pubkey: event.target.value })}
+              id='pubkey'
             />
           </section>
           <section className={styles.local}>
-              <label>Address</label>
+            <label htmlFor='address'>Address</label>
             <input
               type='text'
               size=''
               placeholder='Host address'
               value={form.host}
               onChange={event => setForm({ host: event.target.value })}
+              id='address'
             />
           </section>
 
@@ -74,7 +74,12 @@ class PeerForm extends Component {
       </ReactModal>
     </div>
   )
-  }
+}
+
+PeerForm.propTypes = {
+  form: PropTypes.object.isRequired,
+  setForm: PropTypes.func.isRequired,
+  connect: PropTypes.func.isRequired
 }
 
 export default PeerForm

app/routes/wallet/components/components/Peers/components/PeerModal/PeerModal.js

@@ -1,13 +1,10 @@
-// @flow
+import React from 'react'
-import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import ReactModal from 'react-modal'
 import styles from './PeerModal.scss'
 
-class PeerModal extends Component {
+const PeerModal = ({ isOpen, resetPeer, peer, disconnect }) => {
-  render() {
   const disconnectClicked = () => {
-      const { peer, disconnect } = this.props
-
     disconnect({ pubkey: peer.pub_key })
       .then(success => (success ? resetPeer(null) : null))
   }
@@ -28,8 +25,6 @@ class PeerModal extends Component {
     }
   }
 
-    const { isOpen, resetPeer, peer, disconnect } = this.props
-
   return (
     <ReactModal
       isOpen={isOpen}
@@ -69,8 +64,13 @@ class PeerModal extends Component {
       }
     </ReactModal>
   )
-  }
 }
 
+PeerModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  resetPeer: PropTypes.func.isRequired,
+  peer: PropTypes.object,
+  disconnect: PropTypes.func.isRequired
+}
 
 export default PeerModal

app/store/configureStore.prod.js

@@ -1,16 +1,14 @@
-// @flow
+import { createStore, applyMiddleware } from 'redux'
-import { createStore, applyMiddleware } from 'redux';
+import thunk from 'redux-thunk'
-import thunk from 'redux-thunk';
+import { createBrowserHistory } from 'history'
-import { createBrowserHistory } from 'history';
+import { routerMiddleware } from 'react-router-redux'
-import { routerMiddleware } from 'react-router-redux';
+import rootReducer from '../reducers'
-import rootReducer from '../reducers';
-import type { counterStateType } from '../reducers/counter';
 
 const history = createBrowserHistory();
 const router = routerMiddleware(history);
 const enhancer = applyMiddleware(thunk, router);
 
-function configureStore(initialState?: counterStateType) {
+function configureStore(initialState) {
   return createStore(rootReducer, initialState, enhancer);
 }
 

app/utils/btc.js

@@ -1,26 +1,27 @@
 import sb from 'satoshi-bitcoin'
 
 export function btcToSatoshis(btc) {
-  if (btc == undefined || btc === '') return
+  if (btc === undefined || btc === null || btc === '') return null
 
   return sb.toSatoshi(btc)
 }
 
 export function satoshisToBtc(satoshis) {
-  if (satoshis == undefined || satoshis === '') return
+  if (satoshis === undefined || satoshis === null || satoshis === '') return null
 
   return sb.toBitcoin(satoshis).toFixed(8)
 }
 
+export function btcToUsd(btc, price) {
+  return parseFloat((btc * price).toFixed(2)).toLocaleString('en')
+}
+
 export function satoshisToUsd(satoshis, price) {
-  if (satoshis == undefined || satoshis === '') return
+  if (satoshis === undefined || satoshis === null || satoshis === '') return null
 
   return btcToUsd(satoshisToBtc(satoshis), price)
 }
 
-export function btcToUsd(btc, price) {
-  return parseFloat((btc * price).toFixed(2)).toLocaleString('en')
-}
 
 export default {
   btcToSatoshis,

app/utils/usd.js

@@ -1,5 +1,5 @@
 export function usdToBtc(usd, rate) {
-  if (usd === undefined || usd === '') return null
+  if (usd === undefined || usd === null || usd === '') return null
 
   return (usd / rate).toFixed(8)
 }

test/e2e/e2e.spec.js

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 import { Application } from 'spectron';
 import electronPath from 'electron';
 import path from 'path';

webpack.config.renderer.dev.js

@@ -1,3 +1,4 @@
+/* eslint-disable */
 /* eslint global-require: 0, import/no-dynamic-require: 0 */
 
 /**