diff --git a/.eslintrc b/.eslintrc
index 096e0b74..be435af2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -17,6 +17,14 @@
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"jsx-a11y/no-static-element-interactions": 0,
"jsx-a11y/no-noninteractive-element-interactions": 0,
+ "jsx-a11y/click-events-have-key-events": 0,
+ "jsx-a11y/label-has-for": [ 2, {
+ "components": [ "Label" ],
+ "required": {
+ "every": [ "id" ]
+ },
+ "allowChildren": false
+ }],
"react/no-array-index-key": 0,
"react/forbid-prop-types": 0,
"camelcase": 0,
diff --git a/app/components/ChannelForm/ChannelForm.js b/app/components/ChannelForm/ChannelForm.js
deleted file mode 100644
index 5b25cde0..00000000
--- a/app/components/ChannelForm/ChannelForm.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import ReactModal from 'react-modal'
-
-import { FaClose } from 'react-icons/lib/fa'
-
-import StepOne from './StepOne'
-import StepTwo from './StepTwo'
-import StepThree from './StepThree'
-import StepFour from './StepFour'
-import Footer from './Footer'
-
-import styles from './ChannelForm.scss'
-
-const ChannelForm = ({
- channelform,
- openChannel,
- closeChannelForm,
- changeStep,
- setNodeKey,
- setLocalAmount,
- setPushAmount,
- channelFormHeader,
- channelFormProgress,
- stepTwoIsValid,
- peers
-}) => {
- const renderStep = () => {
- const { step } = channelform
-
- switch (step) {
- case 1:
- return document.body}
- className={styles.modal}
- >
-
-
-
-
- {channelFormHeader}
-
-
-
-
- {renderStep()}
-
-
- openChannel({ pubkey: channelform.node_key, local_amt: channelform.local_amt, push_amt: channelform.push_amt })}
- />
-
- )
-}
-
-ChannelForm.propTypes = {
- channelform: PropTypes.object.isRequired,
- openChannel: PropTypes.func.isRequired,
- closeChannelForm: PropTypes.func.isRequired,
- changeStep: PropTypes.func.isRequired,
- setNodeKey: PropTypes.func.isRequired,
- setLocalAmount: PropTypes.func.isRequired,
- setPushAmount: PropTypes.func.isRequired,
- channelFormHeader: PropTypes.string.isRequired,
- channelFormProgress: PropTypes.number.isRequired,
- stepTwoIsValid: PropTypes.bool.isRequired,
- peers: PropTypes.array.isRequired
-}
-
-export default ChannelForm
diff --git a/app/components/ChannelForm/ChannelForm.scss b/app/components/ChannelForm/ChannelForm.scss
deleted file mode 100644
index 4e7ecdce..00000000
--- a/app/components/ChannelForm/ChannelForm.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-@import '../../variables.scss';
-
-.modal {
- width: 40%;
- margin: 50px auto;
- position: absolute;
- top: auto;
- left: 20%;
- right: 0;
- bottom: auto;
- background: $white;
- outline: none;
- z-index: -2;
- border: 1px solid $darkgrey;
-}
-
-.modalClose {
- position: absolute;
- top: -13px;
- right: -13px;
- display: block;
- font-size: 16px;
- line-height: 27px;
- width: 32px;
- height: 32px;
- background: $white;
- border-radius: 50%;
- color: $darkestgrey;
- cursor: pointer;
- text-align: center;
- z-index: 2;
- transition: all 0.25s;
-}
-
-.modalClose:hover {
- background: $darkgrey;
-}
-
-.header {
- padding: 20px;
- background: $lightgrey;
- text-align: center;
- font-family: 'Jigsaw Light';
- text-transform: uppercase;
- position: relative;
- z-index: -2;
-}
-
-.progress {
- transition: all 0.2s ease;
- background: $main;
- position: absolute;
- height: 100%;
- top: 0;
- left: 0;
- z-index: -1;
-}
diff --git a/app/components/ChannelForm/Footer.js b/app/components/ChannelForm/Footer.js
deleted file mode 100644
index cba26b01..00000000
--- a/app/components/ChannelForm/Footer.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import styles from './Footer.scss'
-
-const Footer = ({
- step, changeStep, stepTwoIsValid, submit
-}) => {
- if (step === 1) { return null }
-
- // See if the next button on step 2 should be active
- const nextIsInactive = step === 2 && !stepTwoIsValid
-
- // Function that's called when the user clicks "next" in the form
- const nextFunc = () => {
- if (nextIsInactive) { return }
-
- changeStep(step + 1)
- }
-
- const rightButtonText = step === 4 ? 'Submit' : 'Next'
- const rightButtonOnClick = step === 4 ? () => submit() : nextFunc
-
- return (
-
-
-
changeStep(step - 1)}>
- Back
-
-
-
-
- {rightButtonText}
-
-
-
-
-
Peer
- {node_key}
-
-
-
-
-
Local Amount
- {local_amt}
-
-
-
Push Amount
- {push_amt}
-
-
-
-
-
-
-
-
-
- {peers.length > 0 &&
- peers.map(peer => (
- this.peerClicked(peer)}
- >
- {peer.address}
- {peer.pub_key}
-
- ))}
-
-
-
-
Push Amount
-
- The push amount is the amount of bitcoin (if any at all) you'd like
- to "push" to the other side of the channel when it opens.
- This amount will be set on the remote side of the channel as part of the initial commitment state.
-
-
-
-
-
-
-
Local Amount
-
- Local amount is the amount of bitcoin that you would like to commit to the channel.
- This is the amount that will be sent in an on-chain transaction to open your Lightning channel.
-
-
-
-
-
-
-
-
-
- Remote Pubkey
- {channel.remote_pubkey}
-
-
- Channel Point
- {channel.channel_point}
-
-
-
-
- Capacity
-
- {
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(channel.capacity)
- :
- btc.satoshisToUsd(channel.capacity, currentTicker.price_usd)
- }
-
-
-
-
- Local
-
- {
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(channel.local_balance)
- :
- btc.satoshisToUsd(channel.local_balance, currentTicker.price_usd)
- }
-
-
-
- Remote
-
- {
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(channel.remote_balance)
- :
- btc.satoshisToUsd(channel.remote_balance, currentTicker.price_usd)
- }
-
-
-
-
-
-)
-
-Channel.propTypes = {
- ticker: PropTypes.object.isRequired,
- channel: PropTypes.object.isRequired,
- closeChannel: PropTypes.func.isRequired,
- currentTicker: PropTypes.object.isRequired
-}
-
-export default Channel
diff --git a/app/components/Channels/Channel.scss b/app/components/Channels/Channel.scss
deleted file mode 100644
index e985cf8e..00000000
--- a/app/components/Channels/Channel.scss
+++ /dev/null
@@ -1,125 +0,0 @@
-@import '../../variables.scss';
-
-.channel {
- position: relative;
- background: $white;
- margin: 5px 0;
- padding: 10px;
- border-top: 1px solid $white;
- cursor: pointer;
- transition: all 0.25s;
- box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
-
- &:hover {
- opacity: 0.75;
- box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
- }
-
- &:first-child {
- border: none;
- }
-
- .header {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
-
- .status, .active, .notactive {
- padding: 10px;
- text-transform: uppercase;
- font-weight: bold;
- font-size: 10px;
- }
-
- .status {
- color: $main;
- }
-
- .active i, .notactive i {
- margin-left: 5px;
- }
-
- .active {
- color: $green;
- }
-
- .notactive {
- color: $red;
- }
-
- .close {
- padding: 10px;
- font-size: 10px;
- text-transform: uppercase;
- color: $red;
- cursor: pointer;
-
- &:hover {
- color: lighten($red, 10%);
- text-decoration: underline;
- }
- }
- }
-
- .content {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- }
-
-
- .left, .right {
- padding: 0 10px;
- margin-bottom: 5;
-
- section {
- margin-bottom: 20px;
-
- span {
- text-transform: uppercase;
- letter-spacing: 1.6px;
- color: $black;
- font-size: 10px;
- font-weight: bold;
- }
-
- h2 {
- font-size: 30px;
- padding: 5px 0;
- color: $main;
- }
-
- h4 {
- margin-top: 5px;
- }
- }
- }
-
- .left {
- flex: 7;
- }
-
- .right {
- flex: 3;
-
- .capacity {
- text-align: center;
- margin-bottom: 10px;
- }
-
- .balances {
- display: flex;
- justify-content: space-between;
-
- section {
- flex: 5;
- text-align: center;
-
- h4 {
- color: $main;
- font-size: 16px;
- }
- }
- }
- }
-}
diff --git a/app/components/Channels/ChannelForm.js b/app/components/Channels/ChannelForm.js
deleted file mode 100644
index 9f6cfd87..00000000
--- a/app/components/Channels/ChannelForm.js
+++ /dev/null
@@ -1,128 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import ReactModal from 'react-modal'
-import { FaUser } from 'react-icons/lib/fa'
-import CurrencyIcon from 'components/CurrencyIcon'
-import { usd, btc } from 'utils'
-import styles from './ChannelForm.scss'
-
-const ChannelForm = ({
- form, setForm, ticker, peers, openChannel, currentTicker
-}) => {
- const submitClicked = () => {
- const { node_key, local_amt, push_amt } = form
-
- const localamt = ticker.currency === 'usd' ? btc.btcToSatoshis(usd.usdToBtc(local_amt, currentTicker.price_usd)) : btc.btcToSatoshis(local_amt)
- const pushamt = ticker.currency === 'usd' ? btc.btcToSatoshis(usd.usdToBtc(push_amt, currentTicker.price_usd)) : btc.btcToSatoshis(push_amt)
-
- openChannel({ pubkey: node_key, localamt, pushamt })
- // setForm({ isOpen: false })
- }
-
- const customStyles = {
- overlay: {
- cursor: 'pointer',
- overflowY: 'auto'
- },
- content: {
- top: 'auto',
- left: '20%',
- right: '0',
- bottom: 'auto',
- width: '40%',
- margin: '50px auto',
- padding: '40px'
- }
- }
-
- return (
-
-
setForm({ isOpen: false })}
- parentSelector={() => document.body}
- style={customStyles}
- >
-
-
Open a new channel
-
-
-
-
-
-
- Connected Peers
- {
- peers.length ?
- peers.map(peer =>
- (
- setForm({ node_key: peer.pub_key })}
- >
- {peer.address}
- {peer.pub_key}
-
- ))
- :
- null
- }
-
-
-
-
-
resetChannel(null)}
- parentSelector={() => document.body}
- style={customStyles}
- >
- {
- channel ?
-
-
- {channel.remote_pubkey}
- shell.openExternal(`${explorerLinkBase}/tx/${channel.channel_point.split(':')[0]}`)}
- >
- {channel.channel_point}
-
-
-
-
-
- {channel.capacity}
- Capacity
-
-
-
- {channel.local_balance}
- Local
-
-
- {channel.remote_balance}
- Remote
-
-
-
-
-
- Sent
- {channel.total_satoshis_sent}
- Received
- {channel.total_satoshis_received}
- Updates
- {channel.num_updates}
-
-
-
-
-
- )
-}
-
-ChannelModal.propTypes = {
- isOpen: PropTypes.bool.isRequired,
- resetChannel: PropTypes.func.isRequired,
- channel: PropTypes.object,
- explorerLinkBase: PropTypes.string.isRequired,
- closeChannel: PropTypes.func.isRequired
-}
-
-export default ChannelModal
diff --git a/app/components/Channels/ChannelModal.scss b/app/components/Channels/ChannelModal.scss
deleted file mode 100644
index 93e5cd13..00000000
--- a/app/components/Channels/ChannelModal.scss
+++ /dev/null
@@ -1,124 +0,0 @@
-@import '../../variables.scss';
-
-.modalChannel {
- padding: 40px;
-}
-
-.header {
- margin-bottom: 50px;
-
- h1 {
- color: $black;
- text-align: center;
- margin-bottom: 5px;
- font-weight: bold;
- }
-
- h2 {
- color: $darkestgrey;
- font-size: 14px;
- text-align: center;
-
- &:hover {
- color: $main;
- text-decoration: underline;
- }
- }
-}
-
-.balances {
- .capacity {
- text-align: center;
- align-items: center;
-
- h3 {
- color: $main;
- font-size: 40px;
- }
-
- span {
- color: $black;
- font-size: 16px;
- }
- }
-
- .balance {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
-
- .local, .remote {
- flex: 5;
- padding: 10px 30px;
- text-align: center;
-
- h4 {
- font-size: 20px;
- color: $main;
- }
-
- span {
- color: $black;
- font-size: 12px;
- }
- }
- }
-}
-
-.details {
- width: 75%;
- margin: 20px auto;
-
- dt {
- text-align: left;
- float: left;
- clear: left;
- font-weight: 500;
- padding: 20px 35px 19px 0;
- color: $black;
- font-weight: bold;
- }
-
- dd {
- text-align: right;
- font-weight: 400;
- padding: 19px 0;
- margin-left: 0;
- border-top: 1px solid $darkgrey;
- }
-}
-
-.close {
- text-align: center;
-
- div {
- width: 35%;
- margin: 0 auto;
- cursor: pointer;
- height: 55px;
- min-height: 55px;
- text-transform: none;
- font-size: 18px;
- transition: opacity .2s ease-out;
- background: $red;
- color: $white;
- border: none;
- font-weight: 500;
- padding: 0;
- text-align: center;
- line-height: 55px;
- transition: all 0.25s;
- border-radius: 5px;
-
- &:hover {
- background: darken($red, 10%);
- }
- }
-}
-
-.active {
- color: $darkestgrey;
- text-align: center;
- margin-top: 50px;
- text-transform: uppercase;
-}
diff --git a/app/components/Channels/Channels.js b/app/components/Channels/Channels.js
deleted file mode 100644
index 43e47371..00000000
--- a/app/components/Channels/Channels.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { TiPlus } from 'react-icons/lib/ti'
-import { FaRepeat } from 'react-icons/lib/fa'
-import ChannelModal from './ChannelModal'
-import ChannelForm from './ChannelForm'
-import Channel from './Channel'
-import OpenPendingChannel from './OpenPendingChannel'
-import ClosedPendingChannel from './ClosedPendingChannel'
-import styles from './Channels.scss'
-
-const Channels = ({
- fetchChannels,
- ticker,
- peers,
- channelsLoading,
- modalChannel,
- setChannel,
- channelModalOpen,
- channelForm,
- setChannelForm,
- allChannels,
- openChannel,
- closeChannel,
- currentTicker,
- explorerLinkBase
-}) => {
- const refreshClicked = (event) => {
- // store event in icon so we dont get an error when react clears it
- const icon = event.currentTarget
-
- // fetch channels
- fetchChannels()
-
- // clear animation after the second so we can reuse it
- setTimeout(() => { icon.style.animation = '' }, 1000)
-
- // spin icon for 1 sec
- icon.style.animation = 'spin 1000ms linear 1'
- }
-
- return (
-
-
-
-
-
Channels
-
-
-
setChannelForm({ isOpen: true })}
- >
-
-
-
- {
- !channelsLoading ?
- allChannels.map((channel, index) => {
- if (Object.prototype.hasOwnProperty.call(channel, 'blocks_till_open')) {
- return (
-
-
shell.openExternal(`${explorerLinkBase}/tx/${closing_txid}`)}>
- Closing Channel...
-
-
- Remote Pubkey
- {channel.remote_node_pub}
-
-
- Channel Point
- {channel.channel_point}
-
-
-
-
- Capacity
-
- {
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(channel.capacity)
- :
- btc.satoshisToUsd(channel.capacity, currentTicker.price_usd)
- }
-
-
-
-
-
- {
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(channel.local_balance)
- :
- btc.satoshisToUsd(channel.local_balance, currentTicker.price_usd)
- }
-
- Local
-
-
-
- {
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(channel.remote_balance)
- :
- btc.satoshisToUsd(channel.remote_balance, currentTicker.price_usd)
- }
-
- Remote
-
-
-
-)
-
-ClosedPendingChannel.propTypes = {
- ticker: PropTypes.object.isRequired,
- channel: PropTypes.object.isRequired,
- currentTicker: PropTypes.object.isRequired,
- explorerLinkBase: PropTypes.string.isRequired
-}
-
-export default ClosedPendingChannel
diff --git a/app/components/Channels/ClosedPendingChannel.scss b/app/components/Channels/ClosedPendingChannel.scss
deleted file mode 100644
index 8dbc037a..00000000
--- a/app/components/Channels/ClosedPendingChannel.scss
+++ /dev/null
@@ -1,95 +0,0 @@
-@import '../../variables.scss';
-
-.channel {
- position: relative;
- background: $white;
- padding: 10px;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- border-top: 1px solid $grey;
- cursor: pointer;
- transition: all 0.25s;
- opacity: 0.5;
-
- &:hover {
- opacity: 0.35;
- }
-
- &:first-child {
- border: none;
- }
-
- .closing {
- color: $red;
- position: absolute;
- top: 0;
- left: 10px;
- padding: 10px;
- text-transform: uppercase;
- font-weight: bold;
- font-size: 10px;
- }
-
- .left, .right {
- padding: 0 10px;
- margin-bottom: 5;
- margin-top: 25px;
-
- section {
- margin-bottom: 20px;
-
- span {
- text-transform: uppercase;
- letter-spacing: 1.6px;
- color: $black;
- font-size: 10px;
- font-weight: bold;
- }
-
- h2 {
- font-size: 30px;
- padding: 5px 0;
- color: $main;
- }
-
- h4 {
- margin-top: 5px;
- }
- }
- }
-
- .left {
- flex: 7;
- border-right: 1px solid $grey;
- }
-
- .right {
- flex: 3;
-
- .capacity {
- text-align: center;
- border-bottom: 1px solid $grey;
- margin-bottom: 10px;
- }
-
- .balances {
- display: flex;
- justify-content: space-between;
-
- section {
- flex: 5;
- text-align: center;
-
- h4 {
- color: $main;
- font-size: 16px;
- }
-
- &:first-child {
- border-right: 1px solid $grey;
- }
- }
- }
- }
-}
diff --git a/app/components/Channels/OpenPendingChannel.js b/app/components/Channels/OpenPendingChannel.js
deleted file mode 100644
index 50778d16..00000000
--- a/app/components/Channels/OpenPendingChannel.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import { shell } from 'electron'
-import React from 'react'
-import PropTypes from 'prop-types'
-import { btc } from 'utils'
-import styles from './OpenPendingChannel.scss'
-
-const OpenPendingChannel = ({
- ticker, channel, currentTicker, explorerLinkBase
-}) => (
- shell.openExternal(`${explorerLinkBase}/tx/${channel.channel.channel_point.split(':')[0]}`)}>
-
-
Opening Channel...
- Blocks till open: {channel.blocks_till_open}
-
-
-
- Remote Pubkey
- {channel.channel.remote_node_pub}
-
-
- Channel Point
- {channel.channel.channel_point}
-
-
-
-
- Capacity
-
- {
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(channel.channel.capacity)
- :
- btc.satoshisToUsd(channel.channel.capacity, currentTicker.price_usd)
- }
-
-
-
-
-
- {
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(channel.channel.local_balance)
- :
- btc.satoshisToUsd(channel.channel.local_balance, currentTicker.price_usd)
- }
-
- Local
-
-
-
- {
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(channel.channel.remote_balance)
- :
- btc.satoshisToUsd(channel.channel.remote_balance, currentTicker.price_usd)
- }
-
- Remote
-
-
-
-)
-
-OpenPendingChannel.propTypes = {
- ticker: PropTypes.object.isRequired,
- channel: PropTypes.object.isRequired,
- currentTicker: PropTypes.object.isRequired,
- explorerLinkBase: PropTypes.string.isRequired
-}
-
-export default OpenPendingChannel
diff --git a/app/components/Channels/OpenPendingChannel.scss b/app/components/Channels/OpenPendingChannel.scss
deleted file mode 100644
index 6378d213..00000000
--- a/app/components/Channels/OpenPendingChannel.scss
+++ /dev/null
@@ -1,98 +0,0 @@
-@import '../../variables.scss';
-
-.channel {
- position: relative;
- background: $lightgrey;
- padding: 10px;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- border-top: 1px solid $grey;
- cursor: pointer;
- transition: all 0.25s;
- opacity: 0.5;
-
- .pending {
- position: absolute;
- top: 0;
- left: 10px;
- padding: 10px;
- text-transform: uppercase;
- font-weight: bold;
-
- h1 {
- color: $main;
- font-size: 10px;
- }
-
- span {
- font-size: 8px;
- }
- }
-
- &:first-child {
- border: none;
- }
-
- .left, .right {
- padding: 0 10px;
- margin-bottom: 5;
- margin-top: 40px;
-
- section {
- margin-bottom: 20px;
-
- span {
- text-transform: uppercase;
- letter-spacing: 1.6px;
- color: $black;
- font-size: 10px;
- font-weight: bold;
- }
-
- h2 {
- font-size: 30px;
- padding: 5px 0;
- color: $main;
- }
-
- h4 {
- margin-top: 5px;
- }
- }
- }
-
- .left {
- flex: 7;
- border-right: 1px solid $grey;
- }
-
- .right {
- flex: 3;
-
- .capacity {
- text-align: center;
- border-bottom: 1px solid $grey;
- margin-bottom: 10px;
- }
-
- .balances {
- display: flex;
- justify-content: space-between;
-
- section {
- flex: 5;
- text-align: center;
-
- h4 {
- color: $main;
- font-size: 16px;
- }
-
- &:first-child {
- border-right: 1px solid $grey;
- }
- }
- }
- }
-}
diff --git a/app/components/Channels/index.js b/app/components/Channels/index.js
deleted file mode 100644
index a92a7218..00000000
--- a/app/components/Channels/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Channels from './Channels'
-
-export default Channels
diff --git a/app/components/Contacts/ClosingContact.js b/app/components/Contacts/ClosingContact.js
index 9ae07b64..15a18632 100644
--- a/app/components/Contacts/ClosingContact.js
+++ b/app/components/Contacts/ClosingContact.js
@@ -33,7 +33,7 @@ const ClosingContact = ({ channel }) => (
)
ClosingContact.propTypes = {
-
+ channel: PropTypes.object.isRequired
}
export default ClosingContact
diff --git a/app/components/Contacts/ContactModal.js b/app/components/Contacts/ContactModal.js
index 63fd8b91..664cf920 100644
--- a/app/components/Contacts/ContactModal.js
+++ b/app/components/Contacts/ContactModal.js
@@ -124,7 +124,12 @@ const ContactModal = ({
}
ContactModal.propTypes = {
-
+ channel: PropTypes.object,
+ isOpen: PropTypes.bool.isRequired,
+ closeContactModal: PropTypes.func.isRequired,
+ channelNodes: PropTypes.array.isRequired,
+ closeChannel: PropTypes.func.isRequired,
+ closingChannelIds: PropTypes.array.isRequired
}
export default ContactModal
diff --git a/app/components/Contacts/ContactsForm.js b/app/components/Contacts/ContactsForm.js
index 03eece42..8123641f 100644
--- a/app/components/Contacts/ContactsForm.js
+++ b/app/components/Contacts/ContactsForm.js
@@ -133,7 +133,6 @@ class ContactsForm extends React.Component {
className={styles.searchInput}
value={contactsform.searchQuery}
onChange={event => updateContactFormSearchQuery(event.target.value)}
- autoFocus
/>
@@ -166,7 +165,7 @@ class ContactsForm extends React.Component {
{
showManualForm &&
-
Hm, looks like we can't see that contact from here. Want to try and manually connect?
+
Hm, looks like we can’t see that contact from here. Want to try and manually connect?
-
- )
-}
-
-Donut.propTypes = {
-}
-
-export default Donut
diff --git a/app/components/Contacts/Donut.scss b/app/components/Contacts/Donut.scss
deleted file mode 100644
index 260ee9eb..00000000
--- a/app/components/Contacts/Donut.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@import '../../variables.scss';
-
-.donutchartTrack{
- fill: transparent;
- stroke: $lightgrey;
- stroke-width: 26;
-}
-.donutchartIndicator {
- fill: transparent;
- stroke: $main;
- stroke-width: 26;
- stroke-dasharray: 0 10000;
- transition: stroke-dasharray .3s ease;
-}
-
-.donutchart {
- margin: 0 auto;
- border-radius: 50%;
- display: block;
-}
diff --git a/app/components/Contacts/LoadingContact.js b/app/components/Contacts/LoadingContact.js
index 313e7f4e..19770345 100644
--- a/app/components/Contacts/LoadingContact.js
+++ b/app/components/Contacts/LoadingContact.js
@@ -1,7 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
import { FaCircle } from 'react-icons/lib/fa'
-import { btc } from 'utils'
import styles from './Contact.scss'
const LoadingContact = ({ pubkey, isClosing }) => (
@@ -29,7 +28,8 @@ const LoadingContact = ({ pubkey, isClosing }) => (
)
LoadingContact.propTypes = {
-
+ pubkey: PropTypes.string.isRequired,
+ isClosing: PropTypes.bool.isRequired
}
export default LoadingContact
diff --git a/app/components/Contacts/OfflineContact.js b/app/components/Contacts/OfflineContact.js
index 0e042b9c..2b4621b6 100644
--- a/app/components/Contacts/OfflineContact.js
+++ b/app/components/Contacts/OfflineContact.js
@@ -27,7 +27,8 @@ const OfflineContact = ({ channel, openContactModal }) => (
)
OfflineContact.propTypes = {
-
+ channel: PropTypes.object.isRequired,
+ openContactModal: PropTypes.func.isRequired
}
export default OfflineContact
diff --git a/app/components/Contacts/OnlineContact.js b/app/components/Contacts/OnlineContact.js
index d36ce29a..5c98f5f5 100644
--- a/app/components/Contacts/OnlineContact.js
+++ b/app/components/Contacts/OnlineContact.js
@@ -27,7 +27,8 @@ const OnlineContact = ({ channel, openContactModal }) => (
)
OnlineContact.propTypes = {
-
+ channel: PropTypes.object.isRequired,
+ openContactModal: PropTypes.func.isRequired
}
export default OnlineContact
diff --git a/app/components/Contacts/PendingContact.js b/app/components/Contacts/PendingContact.js
index 5ede3f9e..7502e8b2 100644
--- a/app/components/Contacts/PendingContact.js
+++ b/app/components/Contacts/PendingContact.js
@@ -33,7 +33,7 @@ const PendingContact = ({ channel }) => (
)
PendingContact.propTypes = {
-
+ channel: PropTypes.object.isRequired
}
export default PendingContact
diff --git a/app/components/Form/RequestForm.js b/app/components/Form/RequestForm.js
index 0f793e45..7844dbba 100644
--- a/app/components/Form/RequestForm.js
+++ b/app/components/Form/RequestForm.js
@@ -28,7 +28,9 @@ const RequestForm = ({
/>
setPeer(peer)}>
- {peer.address}
- {peer.pub_key}
-
-)
-
-Peer.propTypes = {
- peer: PropTypes.shape({
- address: PropTypes.string.isRequired,
- pub_key: PropTypes.string.isRequired
- }).isRequired,
- setPeer: PropTypes.func.isRequired
-}
-
-export default Peer
diff --git a/app/components/Peers/Peer.scss b/app/components/Peers/Peer.scss
deleted file mode 100644
index c7e2ed0d..00000000
--- a/app/components/Peers/Peer.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@import '../../variables.scss';
-
-.peer {
- position: relative;
- margin: 5px 0;
- padding: 10px;
- border-top: 1px solid $white;
- cursor: pointer;
- transition: all 0.25s;
- list-style: none;
- box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
- transition: 0.3s;
-
- &:hover {
- opacity: 0.75;
- box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
- }
-
- &:first-child {
- border: none;
- }
-
- h4, h1 {
- margin: 10px 0;
- }
-
- h4 {
- font-size: 14px;
- font-weight: bold;
- color: $black;
- }
-
- h1 {
- font-size: 18px;
- font-weight: 200;
- color: $main;
- }
-}
diff --git a/app/components/Peers/PeerForm.js b/app/components/Peers/PeerForm.js
deleted file mode 100644
index b1a9472e..00000000
--- a/app/components/Peers/PeerForm.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import ReactModal from 'react-modal'
-import { FaClose } from 'react-icons/lib/fa'
-import styles from './PeerForm.scss'
-
-const PeerForm = ({ form, setForm, connect }) => {
- const submit = () => {
- const { pubkey, host } = form
- connect({ pubkey, host })
- }
-
- return (
-
-
setForm({ isOpen: false })}
- parentSelector={() => document.body}
- className={styles.modal}
- >
- setForm({ isOpen: false })} className={styles.modalClose}>
-
-
- event.charCode === 13 && submit()}>
-
Connect to a peer
-
-
-
-
-
-
-
resetPeer(null)}
- parentSelector={() => document.body}
- style={customStyles}
- >
-
- resetPeer(null)}>
-
-
- {
- peer &&
-
-
- {peer.address}
- {peer.pub_key}
-
-
-
-
- Satoshis Received
- {peer.sat_recv}
- Satoshis Sent
- {peer.sat_sent}
- Bytes Received
- {peer.bytes_recv}
- Bytes Sent
- {peer.bytes_sent}
-
-
-
disconnect({ pubkey: peer.pub_key })}>
-
Disconnect peer
-
-
- )
-}
-
-PeerModal.propTypes = {
- isOpen: PropTypes.bool.isRequired,
- resetPeer: PropTypes.func.isRequired,
- peer: PropTypes.object,
- disconnect: PropTypes.func.isRequired
-}
-
-export default PeerModal
diff --git a/app/components/Peers/PeerModal.scss b/app/components/Peers/PeerModal.scss
deleted file mode 100644
index 91ae0086..00000000
--- a/app/components/Peers/PeerModal.scss
+++ /dev/null
@@ -1,75 +0,0 @@
-@import '../../variables.scss';
-
-.closeContainer {
- background: $lightgrey;
- text-align: right;
- padding: 10px;
-
- span {
- color: $darkestgrey;
- font-size: 20px;
- cursor: pointer;
- }
-}
-
-.header {
- background: $lightgrey;
- padding: 20px;
-
- h1 {
- color: $black;
- text-align: center;
- margin-bottom: 20px;
- font-weight: bold;
- }
-
- h2 {
- color: $darkestgrey;
- font-size: 12px;
- text-align: center;
- }
-}
-
-.details {
- dl {
- padding: 40px 40px 40px 40px;
- }
-
- dt {
- text-align: left;
- float: left;
- clear: left;
- font-weight: 500;
- padding: 20px 35px 19px 0;
- color: $black;
- font-weight: bold;
- }
-
- dd {
- text-align: right;
- font-weight: 400;
- padding: 30px 0 10px 0;
- margin-left: 0;
- border-bottom: 1px solid $darkgrey;
- }
-}
-
-.close {
- text-align: center;
- padding-bottom: 40px;
-
- div {
- margin: 0 auto;
- cursor: pointer;
- font-size: 18px;
- color: $red;
- border: none;
- padding: 0;
- text-align: center;
- transition: all 0.25s;
-
- &:hover {
- color: lighten($red, 10%);
- }
- }
-}
diff --git a/app/lnd/methods/channelController.js b/app/lnd/methods/channelController.js
index adc95d2c..5085af22 100644
--- a/app/lnd/methods/channelController.js
+++ b/app/lnd/methods/channelController.js
@@ -2,7 +2,6 @@ import bitcore from 'bitcore-lib'
import find from 'lodash/find'
import { listPeers, connectPeer } from './peersController'
import pushopenchannel from '../push/openchannel'
-import pushclosechannel from '../push/closechannel'
const BufferUtil = bitcore.util.buffer
@@ -14,48 +13,39 @@ const BufferUtil = bitcore.util.buffer
* @return {[type]} [description]
*/
export function connectAndOpen(lnd, meta, event, payload) {
- console.log('payload: ', payload)
-
const { pubkey, host, localamt } = payload
const channelPayload = {
node_pubkey: BufferUtil.hexToBuffer(pubkey),
- local_funding_amount: Number(localamt),
- num_confs: 1
+ local_funding_amount: Number(localamt)
}
return new Promise((resolve, reject) => {
listPeers(lnd, meta)
.then(({ peers }) => {
- console.log('peers: ', peers)
-
const peer = find(peers, { pub_key: pubkey })
if (peer) {
- console.log('already have the peer. can open the channel now')
const call = lnd.openChannel(channelPayload, meta)
call.on('data', data => event.sender.send('pushchannelupdated', { pubkey, data }))
call.on('error', error => event.sender.send('pushchannelerror', { pubkey, error: error.toString() }))
} else {
- console.log('connect to the peer first')
connectPeer(lnd, meta, { pubkey, host })
- .then((data) => {
- console.log('connectPeer data: ', data)
-
+ .then(() => {
const call = lnd.openChannel(channelPayload, meta)
call.on('data', data => event.sender.send('pushchannelupdated', { pubkey, data }))
call.on('error', error => event.sender.send('pushchannelerror', { pubkey, error: error.toString() }))
})
.catch((err) => {
- console.log('connect peer err: ', err)
event.sender.send('pushchannelerror', { pubkey, error: err.toString() })
+ reject(err)
})
}
})
.catch((err) => {
- console.log('list peer err: ', err)
event.sender.send('pushchannelerror', { pubkey, error: err.toString() })
+ reject(err)
})
})
}
@@ -68,7 +58,6 @@ export function connectAndOpen(lnd, meta, event, payload) {
* @return {[type]} [description]
*/
export function openChannel(lnd, meta, event, payload) {
- console.log('opening the channel')
const { pubkey, localamt, pushamt } = payload
const res = {
node_pubkey: BufferUtil.hexToBuffer(pubkey),
@@ -123,7 +112,7 @@ export function listChannels(lnd, meta) {
* @return {[type]} [description]
*/
export function closeChannel(lnd, meta, event, payload) {
- const chan_id = payload.chan_id
+ const { chan_id } = payload
const tx = payload.channel_point.funding_txid.match(/.{2}/g).reverse().join('')
const res = {
channel_point: {
diff --git a/app/lnd/methods/index.js b/app/lnd/methods/index.js
index f45ad419..1e48ac59 100644
--- a/app/lnd/methods/index.js
+++ b/app/lnd/methods/index.js
@@ -119,7 +119,7 @@ export default function (lnd, meta, event, msg, data) {
Object.assign(newinvoice, {
memo: data.memo,
value: data.value,
- r_hash: new Buffer(newinvoice.r_hash, 'hex').toString('hex'),
+ r_hash: Buffer.from(newinvoice.r_hash, 'hex').toString('hex'),
creation_date: Date.now() / 1000
})
))
@@ -198,8 +198,8 @@ export default function (lnd, meta, event, msg, data) {
// Connects to a peer if we aren't connected already and then attempt to open a channel
// {} = data
channelController.connectAndOpen(lnd, meta, event, data)
- .then((data) => {
- console.log('connectAndOpen data: ', data)
+ .then((channelData) => {
+ console.log('connectAndOpen data: ', channelData)
// event.sender.send('connectSuccess', { pub_key: data.pubkey, address: data.host, peer_id })
})
.catch((error) => {
diff --git a/app/lnd/methods/paymentsController.js b/app/lnd/methods/paymentsController.js
index e9afd981..b79b8cb0 100644
--- a/app/lnd/methods/paymentsController.js
+++ b/app/lnd/methods/paymentsController.js
@@ -8,11 +8,11 @@ export function sendPaymentSync(lnd, meta, { paymentRequest }) {
return new Promise((resolve, reject) => {
lnd.sendPaymentSync({ payment_request: paymentRequest }, meta, (error, data) => {
if (error) {
- reject({ error })
+ reject({ error }) // eslint-disable-line
return
}
- if (!data || !data.payment_route) { reject({ error: data.payment_error }) }
+ if (!data || !data.payment_route) { reject({ error: data.payment_error }) } // eslint-disable-line
resolve(data)
})
diff --git a/app/lnd/subscribe/channelgraph.js b/app/lnd/subscribe/channelgraph.js
index 47b1aec7..2defd7b2 100644
--- a/app/lnd/subscribe/channelgraph.js
+++ b/app/lnd/subscribe/channelgraph.js
@@ -1,11 +1,6 @@
export default function subscribeToChannelGraph(mainWindow, lnd, meta) {
- console.log('subscribeChannelGraph is happening')
-
-
const call = lnd.subscribeChannelGraph({}, meta)
call.on('data', channelGraphData => mainWindow.send('channelGraphData', { channelGraphData }))
- call.on('end', () => console.log('channel graph end'))
- call.on('error', error => console.log('channelgraph error: ', error))
call.on('status', channelGraphStatus => mainWindow.send('channelGraphStatus', { channelGraphStatus }))
}
diff --git a/app/reducers/channels.js b/app/reducers/channels.js
index 8af72d42..2f0092df 100644
--- a/app/reducers/channels.js
+++ b/app/reducers/channels.js
@@ -153,14 +153,10 @@ export const receiveChannels = (event, { channels, pendingChannels }) => dispatc
// Send IPC event for opening a channel
export const openChannel = ({
- pubkey, host, local_amt, push_amt
+ pubkey, host, local_amt
}) => (dispatch) => {
const localamt = btc.btcToSatoshis(local_amt)
- console.log('localamt: ', localamt)
- console.log('pubkey: ', pubkey)
- console.log('host: ', host)
-
dispatch(openingChannel())
dispatch(addLoadingPubkey(pubkey))
@@ -170,28 +166,24 @@ export const openChannel = ({
// TODO: Decide how to handle streamed updates for channels
// Receive IPC event for openChannel
export const channelSuccessful = () => (dispatch) => {
- console.log('CHANNEL channelSuccessful')
dispatch(fetchChannels())
dispatch(closeChannelForm())
dispatch(resetChannelForm())
}
// Receive IPC event for updated channel
-export const pushchannelupdated = (event, { pubkey, data }) => (dispatch) => {
- console.log('PUSH CHANNEL UPDATED: ', data)
+export const pushchannelupdated = (event, { pubkey }) => (dispatch) => {
dispatch(fetchChannels())
dispatch(removeLoadingPubkey(pubkey))
}
// Receive IPC event for channel end
export const pushchannelend = event => (dispatch) => { // eslint-disable-line
- console.log('PUSH CHANNEL END: ')
dispatch(fetchChannels())
}
// Receive IPC event for channel error
export const pushchannelerror = (event, { pubkey, error }) => (dispatch) => {
- console.log('PUSH CHANNEL ERROR: ', error)
dispatch(openingFailure())
dispatch(setError(error))
dispatch(removeLoadingPubkey(pubkey))
@@ -199,7 +191,6 @@ export const pushchannelerror = (event, { pubkey, error }) => (dispatch) => {
// Receive IPC event for channel status
export const pushchannelstatus = (event, data) => (dispatch) => { // eslint-disable-line
- console.log('PUSH CHANNEL STATUS: ', data)
dispatch(fetchChannels())
}
@@ -209,9 +200,6 @@ export const closeChannel = ({ channel_point, chan_id }) => (dispatch) => {
dispatch(addClosingChanId(chan_id))
const [funding_txid, output_index] = channel_point.split(':')
- console.log('funding_txid: ', funding_txid)
- console.log('output_index: ', output_index)
- console.log('chan_id: ', chan_id)
ipcRenderer.send(
'lnd',
{
@@ -229,43 +217,36 @@ export const closeChannel = ({ channel_point, chan_id }) => (dispatch) => {
// TODO: Decide how to handle streamed updates for closing channels
// Receive IPC event for closeChannel
-export const closeChannelSuccessful = (event, data) => (dispatch) => {
- console.log('PUSH CLOSE CHANNEL SUCCESSFUL: ', data)
+export const closeChannelSuccessful = () => (dispatch) => {
dispatch(fetchChannels())
}
// Receive IPC event for updated closing channel
-export const pushclosechannelupdated = (event, { data, chan_id }) => (dispatch) => {
- console.log('PUSH CLOSE CHANNEL UPDATED: ', data)
- console.log('PUSH CLOSE CHANNEL chan_id: ', chan_id)
+export const pushclosechannelupdated = (event, { chan_id }) => (dispatch) => {
dispatch(fetchChannels())
dispatch(removeClosingChanId(chan_id))
dispatch(closeContactModal())
}
// Receive IPC event for closing channel end
-export const pushclosechannelend = (event, data) => (dispatch) => {
- console.log('PUSH CLOSE CHANNEL END: ', data)
+export const pushclosechannelend = () => (dispatch) => {
dispatch(fetchChannels())
}
// Receive IPC event for closing channel error
export const pushclosechannelerror = (event, { error, chan_id }) => (dispatch) => {
- console.log('PUSH CLOSE CHANNEL END: ', error)
- console.log('PUSH CLOSE CHANNEL chan_id: ', chan_id)
dispatch(setError(error))
dispatch(removeClosingChanId(chan_id))
}
// Receive IPC event for closing channel status
-export const pushclosechannelstatus = (event, data) => (dispatch) => {
- console.log('PUSH CLOSE CHANNEL STATUS: ', data)
+export const pushclosechannelstatus = () => (dispatch) => {
dispatch(fetchChannels())
}
// IPC event for channel graph data
export const channelGraphData = (event, data) => (dispatch, getState) => {
- const info = getState().info
+ const { info } = getState()
const { channelGraphData: { channel_updates } } = data
// if there are any new channel updates
@@ -298,9 +279,7 @@ export const channelGraphData = (event, data) => (dispatch, getState) => {
}
// IPC event for channel graph status
-export const channelGraphStatus = (event, data) => () => {
- console.log('channelGraphStatus: ', data)
-}
+export const channelGraphStatus = () => () => {}
export function toggleFilterPulldown() {
return {
@@ -308,10 +287,10 @@ export function toggleFilterPulldown() {
}
}
-export function changeFilter(filter) {
+export function changeFilter(channelFilter) {
return {
type: CHANGE_CHANNEL_FILTER,
- filter
+ channelFilter
}
}
@@ -342,13 +321,19 @@ const ACTION_HANDLERS = {
[SET_VIEW_TYPE]: (state, { viewType }) => ({ ...state, viewType }),
[TOGGLE_CHANNEL_PULLDOWN]: state => ({ ...state, filterPulldown: !state.filterPulldown }),
- [CHANGE_CHANNEL_FILTER]: (state, { filter }) => ({ ...state, filterPulldown: false, filter }),
+ [CHANGE_CHANNEL_FILTER]: (state, { channelFilter }) => (
+ { ...state, filterPulldown: false, filter: channelFilter }
+ ),
[ADD_LOADING_PUBKEY]: (state, { pubkey }) => ({ ...state, loadingChannelPubkeys: [pubkey, ...state.loadingChannelPubkeys] }),
- [REMOVE_LOADING_PUBKEY]: (state, { pubkey }) => ({ ...state, loadingChannelPubkeys: state.loadingChannelPubkeys.filter(loadingPubkey => loadingPubkey !== pubkey) }),
+ [REMOVE_LOADING_PUBKEY]: (state, { pubkey }) => (
+ { ...state, loadingChannelPubkeys: state.loadingChannelPubkeys.filter(loadingPubkey => loadingPubkey !== pubkey) }
+ ),
[ADD_ClOSING_CHAN_ID]: (state, { chanId }) => ({ ...state, closingChannelIds: [chanId, ...state.closingChannelIds] }),
- [REMOVE_ClOSING_CHAN_ID]: (state, { chanId }) => ({ ...state, closingChannelIds: state.closingChannelIds.filter(closingChanId => closingChanId !== chanId) }),
+ [REMOVE_ClOSING_CHAN_ID]: (state, { chanId }) => (
+ { ...state, closingChannelIds: state.closingChannelIds.filter(closingChanId => closingChanId !== chanId) }
+ ),
[OPEN_CONTACT_MODAL]: (state, { channel }) => ({ ...state, contactModal: { isOpen: true, channel } }),
[CLOSE_CONTACT_MODAL]: state => ({ ...state, contactModal: { isOpen: false, channel: null } })
@@ -414,7 +399,7 @@ channelsSelectors.activeChanIds = createSelector(
channelsSelectors.nonActiveFilters = createSelector(
filtersSelector,
filterSelector,
- (filters, filter) => filters.filter(f => f.key !== filter.key)
+ (filters, channelFilter) => filters.filter(f => f.key !== channelFilter.key)
)
channelsSelectors.channelNodes = createSelector(
@@ -443,7 +428,7 @@ const allChannels = createSelector(
const filteredPendingForcedClosedChannels = pendingForcedClosedChannels.filter(channel => channel.channel.remote_node_pub.includes(searchQuery) || channel.channel.channel_point.includes(searchQuery)) // eslint-disable-line
- return [...filteredActiveChannels, ...filteredPendingOpenChannels, ...filteredPendingClosedChannels, ...filteredPendingForcedClosedChannels, ...filteredNonActiveChannels]
+ return [...filteredActiveChannels, ...filteredPendingOpenChannels, ...filteredPendingClosedChannels, ...filteredPendingForcedClosedChannels, ...filteredNonActiveChannels] // eslint-disable-line
}
)
@@ -456,7 +441,7 @@ export const currentChannels = createSelector(
channelsSelectors.closingPendingChannels,
filterSelector,
channelSearchQuerySelector,
- (allChannelsArr, activeChannelsArr, nonActiveChannelsArr, openChannels, pendingOpenChannels, pendingClosedChannels, filter, searchQuery) => {
+ (allChannelsArr, activeChannelsArr, nonActiveChannelsArr, openChannels, pendingOpenChannels, pendingClosedChannels, channelFilter, searchQuery) => {
// Helper function to deliver correct channel array based on filter
const filteredArray = (filterKey) => {
switch (filterKey) {
@@ -477,7 +462,7 @@ export const currentChannels = createSelector(
}
}
- const channelArray = filteredArray(filter.key)
+ const channelArray = filteredArray(channelFilter.key)
return channelArray.filter(channel => (Object.prototype.hasOwnProperty.call(channel, 'channel') ?
channel.channel.remote_node_pub.includes(searchQuery) || channel.channel.channel_point.includes(searchQuery)
diff --git a/app/reducers/contactsform.js b/app/reducers/contactsform.js
index ca7e9fc6..a1f48a58 100644
--- a/app/reducers/contactsform.js
+++ b/app/reducers/contactsform.js
@@ -80,7 +80,6 @@ contactFormSelectors.showManualForm = createSelector(
if (!searchQuery.length) { return false }
const connectableNodes = filteredNetworkNodes.filter(node => node.addresses.length > 0)
- console.log('connectableNodes: ', connectableNodes)
if (!filteredNetworkNodes.length || !connectableNodes.length) { return true }
diff --git a/app/reducers/lnd.js b/app/reducers/lnd.js
index eaa19de3..6643beb8 100644
--- a/app/reducers/lnd.js
+++ b/app/reducers/lnd.js
@@ -52,12 +52,12 @@ export const lndStdout = (event, line) => (dispatch) => {
if (line.includes('Caught up to height')) {
trimmed = line.slice(line.indexOf('Caught up to height') + 'Caught up to height'.length).trim()
- height = trimmed.split(' ')[0].split(/(\r\n|\n|\r)/gm)[0]
+ height = trimmed.split(' ')[0].split(/(\r\n|\n|\r)/gm)[0] // eslint-disable-line
}
if (line.includes('Catching up block hashes to height')) {
trimmed = line.slice(line.indexOf('Catching up block hashes to height') + 'Catching up block hashes to height'.length).trim()
- height = trimmed.match(/[-]{0,1}[\d.]*[\d]+/g)[0]
+ height = trimmed.match(/[-]{0,1}[\d.]*[\d]+/g)[0] // eslint-disable-line
}
dispatch({ type: RECEIVE_LINE, lndBlockHeight: height })
diff --git a/app/routes/contacts/components/Contacts.js b/app/routes/contacts/components/Contacts.js
index d24346ae..b33f1537 100644
--- a/app/routes/contacts/components/Contacts.js
+++ b/app/routes/contacts/components/Contacts.js
@@ -5,8 +5,6 @@ import Isvg from 'react-inlinesvg'
import { MdSearch } from 'react-icons/lib/md'
import { FaAngleDown, FaRepeat } from 'react-icons/lib/fa'
-import { btc } from 'utils'
-
import ContactModal from 'components/Contacts/ContactModal'
import ContactsForm from 'components/Contacts/ContactsForm'
import OnlineContact from 'components/Contacts/OnlineContact'
@@ -42,15 +40,11 @@ class Contacts extends Component {
searchQuery,
filterPulldown,
filter,
- viewType,
loadingChannelPubkeys,
closingChannelIds
},
currentChannels,
activeChannels,
- nonActiveChannels,
- pendingOpenChannels,
- closingPendingChannels,
fetchChannels,
updateChannelSearchQuery,
@@ -60,12 +54,9 @@ class Contacts extends Component {
openContactsForm,
openContactModal,
- closeContactModal,
contactModalProps,
- contactsFormProps,
-
- peers
+ contactsFormProps
} = this.props
const refreshClicked = () => {
@@ -173,6 +164,7 @@ class Contacts extends Component {
} else if (!channel.active) {
return