diff --git a/app/routes/activity/components/components/Transaction/Transaction.js b/app/routes/activity/components/components/Transaction/Transaction.js
index f50b8752..6e768bfa 100644
--- a/app/routes/activity/components/components/Transaction/Transaction.js
+++ b/app/routes/activity/components/components/Transaction/Transaction.js
@@ -7,31 +7,23 @@ import { btc } from 'utils'
import Value from 'components/Value'
import styles from '../Activity.scss'
-const Transaction = ({
- transaction, ticker, currentTicker, showActivityModal, currencyName
-}) => (
+const Transaction = ({ transaction, ticker, currentTicker, showActivityModal, currencyName }) => (
showActivityModal('TRANSACTION', { transaction })}>
-
- { transaction.amount > 0 ? 'Received' : 'Sent' }
-
+ {transaction.amount > 0 ? 'Received' : 'Sent'}
- {transaction.time_stamp * 1000}
+ {transaction.time_stamp * 1000}
0 ? styles.positive : styles.negative}`}>
-
- 0 ? styles.plus : styles.minus}>{ transaction.amount > 0 ? '+' : '-' }
-
+
+ 0 ? styles.plus : styles.minus}>{transaction.amount > 0 ? '+' : '-'}
+
{currencyName}
-
+
${btc.convert('sats', 'usd', transaction.amount, currentTicker.price_usd)}
diff --git a/app/routes/activity/containers/ActivityContainer.js b/app/routes/activity/containers/ActivityContainer.js
index 8b95074b..1ed441e2 100644
--- a/app/routes/activity/containers/ActivityContainer.js
+++ b/app/routes/activity/containers/ActivityContainer.js
@@ -1,16 +1,8 @@
import { connect } from 'react-redux'
import { setCurrency, tickerSelectors } from 'reducers/ticker'
import { fetchBalance } from 'reducers/balance'
-import {
- fetchInvoices,
- setInvoice,
- invoiceSelectors
-} from 'reducers/invoice'
-import {
- setPayment,
- fetchPayments,
- paymentSelectors
-} from 'reducers/payment'
+import { fetchInvoices, setInvoice, invoiceSelectors } from 'reducers/invoice'
+import { setPayment, fetchPayments, paymentSelectors } from 'reducers/payment'
import { fetchTransactions } from 'reducers/transaction'
import {
showActivityModal,
@@ -108,4 +100,8 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => ({
}
})
-export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(Activity)
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps,
+ mergeProps
+)(Activity)
diff --git a/app/routes/app/components/App.js b/app/routes/app/components/App.js
index 6b49e81f..38c53f79 100644
--- a/app/routes/app/components/App.js
+++ b/app/routes/app/components/App.js
@@ -18,15 +18,7 @@ import styles from './App.scss'
class App extends Component {
componentWillMount() {
- const {
- fetchTicker,
- fetchInfo,
- newAddress,
- fetchChannels,
- fetchSuggestedNodes,
- fetchBalance,
- fetchDescribeNetwork
- } = this.props
+ const { fetchTicker, fetchInfo, newAddress, fetchChannels, fetchSuggestedNodes, fetchBalance, fetchDescribeNetwork } = this.props
// fetch price ticker
fetchTicker()
@@ -65,7 +57,9 @@ class App extends Component {
children
} = this.props
- if (!currentTicker) { return
}
+ if (!currentTicker) {
+ return
+ }
return (
@@ -79,16 +73,9 @@ class App extends Component {
-
- {children}
-
+
{children}
- {
- contactsFormProps.contactsform.isOpen ?
-
- :
-
- }
+ {contactsFormProps.contactsform.isOpen ?
:
}
diff --git a/app/routes/app/containers/AppContainer.js b/app/routes/app/containers/AppContainer.js
index 5f261f49..c83bf419 100644
--- a/app/routes/app/containers/AppContainer.js
+++ b/app/routes/app/containers/AppContainer.js
@@ -40,23 +40,17 @@ import {
import {
openContactsForm,
closeContactsForm,
-
setChannelFormType,
-
openManualForm,
closeManualForm,
-
openSubmitChannelForm,
closeSubmitChannelForm,
-
updateContactFormSearchQuery,
updateManualFormSearchQuery,
updateContactCapacity,
setNode,
-
contactFormSelectors,
updateManualFormErrors,
-
setContactsCurrencyFilters
} from 'reducers/contactsform'
@@ -271,21 +265,26 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
setCurrency: dispatchProps.setCurrency,
setRequestCurrencyFilters: dispatchProps.setRequestCurrencyFilters,
- onRequestSubmit: () => (
+ onRequestSubmit: () =>
dispatchProps.createInvoice(
stateProps.requestform.amount,
stateProps.requestform.memo,
stateProps.ticker.currency,
stateProps.currentTicker.price_usd
)
- )
}
- const formProps = (formType) => {
- if (!formType) { return {} }
+ const formProps = formType => {
+ if (!formType) {
+ return {}
+ }
- if (formType === 'PAY_FORM') { return payFormProps }
- if (formType === 'REQUEST_FORM') { return requestFormProps }
+ if (formType === 'PAY_FORM') {
+ return payFormProps
+ }
+ if (formType === 'REQUEST_FORM') {
+ return requestFormProps
+ }
return {}
}
@@ -367,7 +366,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
setActivityModalCurrencyFilters: dispatchProps.setActivityModalCurrencyFilters,
setCurrencyFilters: dispatchProps.setCurrencyFilters,
- onCurrencyFilterClick: (currency) => {
+ onCurrencyFilterClick: currency => {
dispatchProps.setCurrency(currency)
dispatchProps.setActivityModalCurrencyFilters(false)
}
@@ -404,7 +403,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
setContactsCurrencyFilters: dispatchProps.setContactsCurrencyFilters,
setCurrencyFilters: dispatchProps.setCurrencyFilters,
- onCurrencyFilterClick: (currency) => {
+ onCurrencyFilterClick: currency => {
dispatchProps.updateContactCapacity(btc.convert(stateProps.ticker.currency, currency, stateProps.contactsform.contactCapacity))
dispatchProps.setCurrency(currency)
dispatchProps.setContactsCurrencyFilters(false)
@@ -425,9 +424,13 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
showErrors: stateProps.contactsform.showErrors
}
- const calcChannelFormProps = (formType) => {
- if (formType === 'MANUAL_FORM') { return connectManuallyProps }
- if (formType === 'SUBMIT_CHANNEL_FORM') { return submitChannelFormProps }
+ const calcChannelFormProps = formType => {
+ if (formType === 'MANUAL_FORM') {
+ return connectManuallyProps
+ }
+ if (formType === 'SUBMIT_CHANNEL_FORM') {
+ return submitChannelFormProps
+ }
return {}
}
@@ -438,7 +441,6 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
closeForm: () => dispatchProps.setChannelFormType(null)
}
-
return {
...stateProps,
...dispatchProps,
@@ -464,9 +466,13 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
formProps: formProps(stateProps.form.formType),
// action to close form
closeForm: () => dispatchProps.setFormType(null)
-
-
}
}
-export default withRouter(connect(mapStateToProps, mapDispatchToProps, mergeProps)(App))
+export default withRouter(
+ connect(
+ mapStateToProps,
+ mapDispatchToProps,
+ mergeProps
+ )(App)
+)
diff --git a/app/store/configureStore.dev.js b/app/store/configureStore.dev.js
index ac021841..7c6883cb 100644
--- a/app/store/configureStore.dev.js
+++ b/app/store/configureStore.dev.js
@@ -8,7 +8,7 @@ import ipc from '../reducers/ipc'
const history = createHashHistory()
-const configureStore = (initialState) => {
+const configureStore = initialState => {
// Redux Configuration
const middleware = []
const enhancers = []
@@ -35,9 +35,9 @@ const configureStore = (initialState) => {
/* eslint-disable no-underscore-dangle */
const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({
- // Options: http://zalmoxisus.github.io/redux-devtools-extension/API/Arguments.html
- actionCreators
- })
+ // Options: http://zalmoxisus.github.io/redux-devtools-extension/API/Arguments.html
+ actionCreators
+ })
: compose
/* eslint-enable no-underscore-dangle */
@@ -49,8 +49,7 @@ const configureStore = (initialState) => {
const store = createStore(rootReducer, initialState, enhancer)
if (module.hot) {
- module.hot.accept('../reducers', () =>
- store.replaceReducer(require('../reducers'))) // eslint-disable-line global-require
+ module.hot.accept('../reducers', () => store.replaceReducer(require('../reducers'))) // eslint-disable-line global-require
}
return store
diff --git a/app/utils/blockExplorer.js b/app/utils/blockExplorer.js
index e099d1d3..e7bea0ba 100644
--- a/app/utils/blockExplorer.js
+++ b/app/utils/blockExplorer.js
@@ -1,16 +1,12 @@
import { shell } from 'electron'
-const showTransaction = (network, txid) =>
- shell.openExternal(`${network.explorerUrl}/tx/${txid}`)
+const showTransaction = (network, txid) => shell.openExternal(`${network.explorerUrl}/tx/${txid}`)
-const showBlock = (network, blockHash) =>
- shell.openExternal(`${network.explorerUrl}/block/${blockHash}`)
+const showBlock = (network, blockHash) => shell.openExternal(`${network.explorerUrl}/block/${blockHash}`)
-const showChannelClosing = channel =>
- showTransaction(channel.closing_txid)
+const showChannelClosing = channel => showTransaction(channel.closing_txid)
-const showChannelPoint = channel =>
- showTransaction(channel.channel.channel_point.split(':')[0])
+const showChannelPoint = channel => showTransaction(channel.channel.channel_point.split(':')[0])
export default {
showTransaction,
diff --git a/app/utils/log.js b/app/utils/log.js
index cd79a468..6aae5cff 100644
--- a/app/utils/log.js
+++ b/app/utils/log.js
@@ -47,13 +47,12 @@ const logConfig = name => ({
}
})
-
// Create 2 logs for use in the app.
export const mainLog = debugLogger.config(logConfig('main'))('zap')
export const lndLog = debugLogger.config(logConfig('lnd '))('zap')
let lndLogLevel = null // stored most recent log level for continuity
-export const lndLogGetLevel = (msg) => {
+export const lndLogGetLevel = msg => {
// Define a mapping between log level prefixes and log level names.
const levelMap = {
TRC: 'trace',
diff --git a/app/utils/usd.js b/app/utils/usd.js
index 8a558b37..47cc2f77 100644
--- a/app/utils/usd.js
+++ b/app/utils/usd.js
@@ -3,7 +3,9 @@ export function formatUsd(usd) {
}
export function usdToBtc(usd, rate) {
- if (usd === undefined || usd === null || usd === '') return null
+ if (usd === undefined || usd === null || usd === '') {
+ return null
+ }
return (usd / rate).toFixed(8)
}
diff --git a/test/e2e/e2e.spec.js b/test/e2e/e2e.spec.js
index 55111eb8..0760032c 100644
--- a/test/e2e/e2e.spec.js
+++ b/test/e2e/e2e.spec.js
@@ -27,7 +27,7 @@ describe('main window', function spec() {
expect(title).toBe('Zap')
})
- it('should haven\'t any logs in console of main window', async () => {
+ it("should haven't any logs in console of main window", async () => {
const { client } = this.app
const logs = await client.getRenderProcessLogs()
expect(logs).toHaveLength(0)
diff --git a/test/reducers/balance.spec.js b/test/reducers/balance.spec.js
index 1c07e3c6..ba5f1893 100644
--- a/test/reducers/balance.spec.js
+++ b/test/reducers/balance.spec.js
@@ -1,7 +1,4 @@
-import balanceReducer, {
- GET_BALANCE,
- RECEIVE_BALANCE
-} from '../../app/reducers/balance'
+import balanceReducer, { GET_BALANCE, RECEIVE_BALANCE } from '../../app/reducers/balance'
describe('reducers', () => {
describe('balanceReducer', () => {
diff --git a/test/reducers/info.spec.js b/test/reducers/info.spec.js
index 4cb22497..b7231864 100644
--- a/test/reducers/info.spec.js
+++ b/test/reducers/info.spec.js
@@ -1,7 +1,4 @@
-import infoReducer, {
- GET_INFO,
- RECEIVE_INFO
-} from '../../app/reducers/info'
+import infoReducer, { GET_INFO, RECEIVE_INFO } from '../../app/reducers/info'
describe('reducers', () => {
describe('infoReducer', () => {
diff --git a/test/reducers/ticker.spec.js b/test/reducers/ticker.spec.js
index 3ac6ab40..af032e62 100644
--- a/test/reducers/ticker.spec.js
+++ b/test/reducers/ticker.spec.js
@@ -1,9 +1,4 @@
-import tickerReducer, {
- SET_CURRENCY,
- SET_CRYPTO,
- GET_TICKERS,
- RECIEVE_TICKERS
-} from '../../app/reducers/ticker'
+import tickerReducer, { SET_CURRENCY, SET_CRYPTO, GET_TICKERS, RECIEVE_TICKERS } from '../../app/reducers/ticker'
describe('reducers', () => {
describe('tickerReducer', () => {
diff --git a/test/runTests.js b/test/runTests.js
index 97863a50..6d65ad27 100644
--- a/test/runTests.js
+++ b/test/runTests.js
@@ -2,9 +2,7 @@ const spawn = require('cross-spawn')
const path = require('path')
const s = `\\${path.sep}`
-const pattern = process.argv[2] === 'e2e'
- ? `test${s}e2e${s}.+\\.spec\\.js`
- : `test${s}(?!e2e${s})[^${s}]+${s}.+\\.spec\\.js$`
+const pattern = process.argv[2] === 'e2e' ? `test${s}e2e${s}.+\\.spec\\.js` : `test${s}(?!e2e${s})[^${s}]+${s}.+\\.spec\\.js$`
const result = spawn.sync(path.normalize('./node_modules/.bin/jest'), [pattern], { stdio: 'inherit' })
diff --git a/test/utils/usd.spec.js b/test/utils/usd.spec.js
index 9a05712e..c00f0922 100644
--- a/test/utils/usd.spec.js
+++ b/test/utils/usd.spec.js
@@ -1,7 +1,4 @@
-import {
- formatUsd,
- usdToBtc
-} from '../../app/utils/usd'
+import { formatUsd, usdToBtc } from '../../app/utils/usd'
describe('usd', () => {
describe('formatUsd', () => {
diff --git a/webpack.config.base.js b/webpack.config.base.js
index eebcb2fe..20d55222 100644
--- a/webpack.config.base.js
+++ b/webpack.config.base.js
@@ -10,16 +10,18 @@ export default {
externals: Object.keys(externals || {}),
module: {
- rules: [{
- test: /\.jsx?$/,
- exclude: /node_modules/,
- use: {
- loader: 'babel-loader',
- options: {
- cacheDirectory: true
+ rules: [
+ {
+ test: /\.jsx?$/,
+ exclude: /node_modules/,
+ use: {
+ loader: 'babel-loader',
+ options: {
+ cacheDirectory: true
+ }
}
}
- }]
+ ]
},
output: {
@@ -34,10 +36,7 @@ export default {
*/
resolve: {
extensions: ['.js', '.jsx', '.json'],
- modules: [
- path.join(__dirname, 'app'),
- 'node_modules'
- ]
+ modules: [path.join(__dirname, 'app'), 'node_modules']
},
plugins: [
diff --git a/webpack.config.renderer.dev.dll.js b/webpack.config.renderer.dev.dll.js
index b16dfe06..db9ab9a8 100644
--- a/webpack.config.renderer.dev.dll.js
+++ b/webpack.config.renderer.dev.dll.js
@@ -158,17 +158,11 @@ export default merge.smart(baseConfig, {
},
resolve: {
- modules: [
- 'app'
- ]
+ modules: ['app']
},
entry: {
- renderer: (
- Object
- .keys(dependencies || {})
- .filter(dependency => dependency !== 'font-awesome')
- )
+ renderer: Object.keys(dependencies || {}).filter(dependency => dependency !== 'font-awesome')
},
output: {
diff --git a/webpack.config.renderer.dev.js b/webpack.config.renderer.dev.js
index 41478af6..4757381e 100644
--- a/webpack.config.renderer.dev.js
+++ b/webpack.config.renderer.dev.js
@@ -264,11 +264,7 @@ export default merge.smart(baseConfig, {
},
before() {
if (process.env.START_HOT) {
- spawn(
- 'npm',
- ['run', 'start-main-dev'],
- { shell: true, env: process.env, stdio: 'inherit' }
- )
+ spawn('npm', ['run', 'start-main-dev'], { shell: true, env: process.env, stdio: 'inherit' })
.on('close', code => process.exit(code))
.on('error', spawnError => mainLog.error(spawnError))
}
diff --git a/webpack.config.renderer.prod.js b/webpack.config.renderer.prod.js
index 1e193ba9..9e3f7138 100644
--- a/webpack.config.renderer.prod.js
+++ b/webpack.config.renderer.prod.js
@@ -70,17 +70,19 @@ export default merge.smart(baseConfig, {
{
test: /^((?!\.global).)*\.scss$/,
use: ExtractTextPlugin.extract({
- use: [{
- loader: 'css-loader',
- options: {
- modules: true,
- importLoaders: 1,
- localIdentName: '[name]__[local]__[hash:base64:5]'
+ use: [
+ {
+ loader: 'css-loader',
+ options: {
+ modules: true,
+ importLoaders: 1,
+ localIdentName: '[name]__[local]__[hash:base64:5]'
+ }
+ },
+ {
+ loader: 'sass-loader'
}
- },
- {
- loader: 'sass-loader'
- }]
+ ]
})
},
// WOFF Font