diff --git a/app/routes/activity/components/components/Invoice/Invoice.js b/app/routes/activity/components/components/Invoice/Invoice.js index bdf617bf..441d05e0 100644 --- a/app/routes/activity/components/components/Invoice/Invoice.js +++ b/app/routes/activity/components/components/Invoice/Invoice.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types' import Moment from 'react-moment' import 'moment-timezone' import { FaBolt, FaClockO } from 'react-icons/lib/fa' -import { btc } from '../../../../../utils' +import { btc } from 'utils' import styles from '../Activity.scss' const Invoice = ({ invoice, ticker, currentTicker, showActivityModal }) => ( diff --git a/app/routes/activity/components/components/Modal/Invoice/Invoice.js b/app/routes/activity/components/components/Modal/Invoice/Invoice.js index 7e605377..b82c464b 100644 --- a/app/routes/activity/components/components/Modal/Invoice/Invoice.js +++ b/app/routes/activity/components/components/Modal/Invoice/Invoice.js @@ -8,8 +8,8 @@ import QRCode from 'qrcode.react' import { MdCheck } from 'react-icons/lib/md' -import CurrencyIcon from '../../../../../../components/CurrencyIcon' -import { btc } from '../../../../../../utils' +import CurrencyIcon from 'components/CurrencyIcon' +import { btc } from 'utils' import styles from './Invoice.scss' diff --git a/app/routes/activity/components/components/Modal/Payment/Payment.js b/app/routes/activity/components/components/Modal/Payment/Payment.js index fec8218d..6b27adf2 100644 --- a/app/routes/activity/components/components/Modal/Payment/Payment.js +++ b/app/routes/activity/components/components/Modal/Payment/Payment.js @@ -4,8 +4,8 @@ import PropTypes from 'prop-types' import Moment from 'react-moment' import 'moment-timezone' -import CurrencyIcon from '../../../../../../components/CurrencyIcon' -import { btc } from '../../../../../../utils' +import CurrencyIcon from 'components/CurrencyIcon' +import { btc } from 'utils' import styles from './Payment.scss' diff --git a/app/routes/activity/components/components/Modal/Transaction/Transaction.js b/app/routes/activity/components/components/Modal/Transaction/Transaction.js index 9b38dc96..80290714 100644 --- a/app/routes/activity/components/components/Modal/Transaction/Transaction.js +++ b/app/routes/activity/components/components/Modal/Transaction/Transaction.js @@ -4,8 +4,8 @@ import PropTypes from 'prop-types' import Moment from 'react-moment' import 'moment-timezone' -import CurrencyIcon from '../../../../../../components/CurrencyIcon' -import { btc } from '../../../../../../utils' +import CurrencyIcon from 'components/CurrencyIcon' +import { btc } from 'utils' import styles from './Transaction.scss' diff --git a/app/routes/activity/components/components/Payment/Payment.js b/app/routes/activity/components/components/Payment/Payment.js index 4b855678..8998fce7 100644 --- a/app/routes/activity/components/components/Payment/Payment.js +++ b/app/routes/activity/components/components/Payment/Payment.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types' import Moment from 'react-moment' import 'moment-timezone' import { FaBolt } from 'react-icons/lib/fa' -import { btc } from '../../../../../utils' +import { btc } from 'utils' import styles from '../Activity.scss' const Payment = ({ payment, ticker, currentTicker, showActivityModal }) => ( diff --git a/app/routes/activity/components/components/Transaction/Transaction.js b/app/routes/activity/components/components/Transaction/Transaction.js index eba080f5..e2d1b993 100644 --- a/app/routes/activity/components/components/Transaction/Transaction.js +++ b/app/routes/activity/components/components/Transaction/Transaction.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types' import Moment from 'react-moment' import 'moment-timezone' import { FaChain } from 'react-icons/lib/fa' -import { btc } from '../../../../../utils' +import { btc } from 'utils' import styles from '../Activity.scss' const Transaction = ({ transaction, ticker, currentTicker, showActivityModal }) => ( diff --git a/app/routes/activity/containers/ActivityContainer.js b/app/routes/activity/containers/ActivityContainer.js index 219ad1a0..b18bf33d 100644 --- a/app/routes/activity/containers/ActivityContainer.js +++ b/app/routes/activity/containers/ActivityContainer.js @@ -1,24 +1,24 @@ import { connect } from 'react-redux' -import { tickerSelectors } from '../../../reducers/ticker' +import { tickerSelectors } from 'reducers/ticker' import { fetchInvoices, searchInvoices, setInvoice, invoiceSelectors -} from '../../../reducers/invoice' +} from 'reducers/invoice' import { setPayment, fetchPayments, paymentSelectors -} from '../../../reducers/payment' -import { fetchTransactions } from '../../../reducers/transaction' +} from 'reducers/payment' +import { fetchTransactions } from 'reducers/transaction' import { showActivityModal, hideActivityModal, changeFilter, toggleFilterPulldown, activitySelectors -} from '../../../reducers/activity' +} from 'reducers/activity' import Activity from '../components/Activity' const mapDispatchToProps = { diff --git a/app/routes/app/components/components/Form/components/Pay/Pay.js b/app/routes/app/components/components/Form/components/Pay/Pay.js index dbf9da89..668894ac 100644 --- a/app/routes/app/components/components/Form/components/Pay/Pay.js +++ b/app/routes/app/components/components/Form/components/Pay/Pay.js @@ -1,9 +1,9 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import { FaBolt, FaChain } from 'react-icons/lib/fa' -import CurrencyIcon from '../../../../../../../components/CurrencyIcon' -import LoadingBolt from '../../../../../../../components/LoadingBolt' -import { btc } from '../../../../../../../utils' +import CurrencyIcon from 'components/CurrencyIcon' +import LoadingBolt from 'components/LoadingBolt' +import { btc } from 'utils' import styles from './Pay.scss' class Pay extends Component { diff --git a/app/routes/app/components/components/Form/components/Request/Request.js b/app/routes/app/components/components/Form/components/Request/Request.js index 0b64ab7f..a92099ec 100644 --- a/app/routes/app/components/components/Form/components/Request/Request.js +++ b/app/routes/app/components/components/Form/components/Request/Request.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import CurrencyIcon from '../../../../../../../components/CurrencyIcon' +import CurrencyIcon from 'components/CurrencyIcon' import styles from './Request.scss' const Request = ({ diff --git a/app/routes/app/components/components/ModalRoot/SuccessfulSendCoins/SuccessfulSendCoins.js b/app/routes/app/components/components/ModalRoot/SuccessfulSendCoins/SuccessfulSendCoins.js index bdccac84..0b6ae9ba 100644 --- a/app/routes/app/components/components/ModalRoot/SuccessfulSendCoins/SuccessfulSendCoins.js +++ b/app/routes/app/components/components/ModalRoot/SuccessfulSendCoins/SuccessfulSendCoins.js @@ -1,8 +1,8 @@ import { shell } from 'electron' import React from 'react' import PropTypes from 'prop-types' -import AnimatedCheckmark from '../../../../../../components/AnimatedCheckmark' -import { btc } from '../../../../../../utils' +import AnimatedCheckmark from 'components/AnimatedCheckmark' +import { btc } from 'utils' import styles from './SuccessfulSendCoins.scss' const SuccessfulSendCoins = ({ amount, addr, txid, hideModal, currentTicker, currency }) => { diff --git a/app/routes/app/containers/AppContainer.js b/app/routes/app/containers/AppContainer.js index 27961910..2559755b 100644 --- a/app/routes/app/containers/AppContainer.js +++ b/app/routes/app/containers/AppContainer.js @@ -1,13 +1,12 @@ import { connect } from 'react-redux' -import App from '../components/App' -import { fetchTicker, setCurrency, tickerSelectors } from '../../../reducers/ticker' -import { fetchBalance } from '../../../reducers/balance' -import { fetchInfo } from '../../../reducers/info' -import { createInvoice, fetchInvoice } from '../../../reducers/invoice' -import { hideModal } from '../../../reducers/modal' -import { payInvoice } from '../../../reducers/payment' -import { sendCoins } from '../../../reducers/transaction' -import { fetchChannels } from '../../../reducers/channels' +import { fetchTicker, setCurrency, tickerSelectors } from 'reducers/ticker' +import { fetchBalance } from 'reducers/balance' +import { fetchInfo } from 'reducers/info' +import { createInvoice, fetchInvoice } from 'reducers/invoice' +import { hideModal } from 'reducers/modal' +import { payInvoice } from 'reducers/payment' +import { sendCoins } from 'reducers/transaction' +import { fetchChannels } from 'reducers/channels' import { setForm, setPaymentType, @@ -17,7 +16,8 @@ import { setPubkey, setPaymentRequest, formSelectors -} from '../../../reducers/form' +} from 'reducers/form' +import App from '../components/App' const mapDispatchToProps = { fetchTicker, diff --git a/app/routes/wallet/components/components/Channels/components/Channel/Channel.js b/app/routes/wallet/components/components/Channels/components/Channel/Channel.js index 3d6c63a5..c74b2570 100644 --- a/app/routes/wallet/components/components/Channels/components/Channel/Channel.js +++ b/app/routes/wallet/components/components/Channels/components/Channel/Channel.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { btc } from '../../../../../../../utils' +import { btc } from 'utils' import styles from './Channel.scss' const Channel = ({ ticker, channel, setChannel, currentTicker }) => ( diff --git a/app/routes/wallet/components/components/Channels/components/ChannelForm/ChannelForm.js b/app/routes/wallet/components/components/Channels/components/ChannelForm/ChannelForm.js index 356edda2..816cf48b 100644 --- a/app/routes/wallet/components/components/Channels/components/ChannelForm/ChannelForm.js +++ b/app/routes/wallet/components/components/Channels/components/ChannelForm/ChannelForm.js @@ -2,8 +2,8 @@ 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 CurrencyIcon from 'components/CurrencyIcon' +import { usd, btc } from 'utils' import styles from './ChannelForm.scss' const ChannelForm = ({ form, setForm, ticker, peers, openChannel, currentTicker }) => { diff --git a/app/routes/wallet/components/components/Channels/components/ClosedPendingChannel/ClosedPendingChannel.js b/app/routes/wallet/components/components/Channels/components/ClosedPendingChannel/ClosedPendingChannel.js index db76117a..b9f1e3d8 100644 --- a/app/routes/wallet/components/components/Channels/components/ClosedPendingChannel/ClosedPendingChannel.js +++ b/app/routes/wallet/components/components/Channels/components/ClosedPendingChannel/ClosedPendingChannel.js @@ -1,7 +1,7 @@ import { shell } from 'electron' import React from 'react' import PropTypes from 'prop-types' -import { btc } from '../../../../../../../utils' +import { btc } from 'utils' import styles from './ClosedPendingChannel.scss' const ClosedPendingChannel = ({ ticker, channel: { channel, closing_txid }, currentTicker, explorerLinkBase }) => ( diff --git a/app/routes/wallet/components/components/Channels/components/OpenPendingChannel/OpenPendingChannel.js b/app/routes/wallet/components/components/Channels/components/OpenPendingChannel/OpenPendingChannel.js index 5f24d26d..f83054b3 100644 --- a/app/routes/wallet/components/components/Channels/components/OpenPendingChannel/OpenPendingChannel.js +++ b/app/routes/wallet/components/components/Channels/components/OpenPendingChannel/OpenPendingChannel.js @@ -1,7 +1,7 @@ import { shell } from 'electron' import React from 'react' import PropTypes from 'prop-types' -import { btc } from '../../../../../../../utils' +import { btc } from 'utils' import styles from './OpenPendingChannel.scss' const OpenPendingChannel = ({ ticker, channel: { channel }, currentTicker, explorerLinkBase }) => ( diff --git a/app/routes/wallet/containers/WalletContainer.js b/app/routes/wallet/containers/WalletContainer.js index 57190abf..fb7879d0 100644 --- a/app/routes/wallet/containers/WalletContainer.js +++ b/app/routes/wallet/containers/WalletContainer.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux' -import { infoSelectors } from '../../../reducers/info' -import { newAddress } from '../../../reducers/address' -import { tickerSelectors } from '../../../reducers/ticker' +import { infoSelectors } from 'reducers/info' +import { newAddress } from 'reducers/address' +import { tickerSelectors } from 'reducers/ticker' import { fetchPeers, setPeer, @@ -9,7 +9,7 @@ import { setPeerForm, connectRequest, disconnectRequest -} from '../../../reducers/peers' +} from 'reducers/peers' import { fetchChannels, fetchPendingChannels, @@ -18,7 +18,7 @@ import { setChannelForm, openChannel, closeChannel -} from '../../../reducers/channels' +} from 'reducers/channels' import Wallet from '../components/Wallet' const mapDispatchToProps = {