diff --git a/app/api/index.js b/app/api/index.js index 5d0b1bd3..86d630a4 100644 --- a/app/api/index.js +++ b/app/api/index.js @@ -11,7 +11,8 @@ export function requestTicker(id) { } export function requestTickers(ids) { - return axios.all(ids.map(id => requestTicker(id))) + return axios + .all(ids.map(id => requestTicker(id))) .then(axios.spread((btcTicker, ltcTicker) => ({ btcTicker: btcTicker[0], ltcTicker: ltcTicker[0] }))) } diff --git a/app/components/Activity/ActivityModal.js b/app/components/Activity/ActivityModal.js index 54ccd7b8..11ab91b8 100644 --- a/app/components/Activity/ActivityModal.js +++ b/app/components/Activity/ActivityModal.js @@ -25,7 +25,9 @@ const ActivityModal = ({ INVOICE: InvoiceModal } - if (!modalType) { return null } + if (!modalType) { + return null + } const SpecificModal = MODAL_COMPONENTS[modalType] return ( @@ -35,13 +37,7 @@ const ActivityModal = ({ - + ) } diff --git a/app/components/Activity/Countdown.js b/app/components/Activity/Countdown.js index 8ac26986..7ced66a2 100644 --- a/app/components/Activity/Countdown.js +++ b/app/components/Activity/Countdown.js @@ -34,7 +34,8 @@ class Countdown extends React.Component { const convertTwoDigits = n => (n > 9 ? n : `0${n}`.slice(-2)) const now = new Date().getTime() - const distance = (this.props.countDownDate * 1000) - now + const countDownSeconds = this.props.countDownDate * 1000 + const distance = countDownSeconds - now if (distance <= 0) { this.setState({ expired: true }) @@ -56,32 +57,22 @@ class Countdown extends React.Component { } render() { - const { - days, - hours, - minutes, - seconds, - expired - } = this.state + const { days, hours, minutes, seconds, expired } = this.state - if (expired) { return Expired } - if (!days && !hours && !minutes && !seconds) { return } + if (expired) { + return Expired + } + if (!days && !hours && !minutes && !seconds) { + return + } return ( Expires in - - {days > 0 && `${days}:`} - - - {hours > 0 && `${hours}:`} - - - {minutes > 0 && `${minutes}:`} - - - {seconds >= 0 && `${seconds}`} - + {days > 0 && `${days}:`} + {hours > 0 && `${hours}:`} + {minutes > 0 && `${minutes}:`} + {seconds >= 0 && `${seconds}`} ) } diff --git a/app/components/Activity/InvoiceModal.js b/app/components/Activity/InvoiceModal.js index e796d719..a78e6f12 100644 --- a/app/components/Activity/InvoiceModal.js +++ b/app/components/Activity/InvoiceModal.js @@ -20,20 +20,14 @@ const InvoiceModal = ({ ticker, currentTicker, - toggleCurrencyProps: { - setActivityModalCurrencyFilters, - showCurrencyFilters, - currencyName, - currentCurrencyFilters, - onCurrencyFilterClick - } + toggleCurrencyProps: { setActivityModalCurrencyFilters, showCurrencyFilters, currencyName, currentCurrencyFilters, onCurrencyFilterClick } }) => { const copyPaymentRequest = () => { copy(invoice.payment_request) showNotification('Noice', 'Successfully copied to clipboard') } - const countDownDate = (parseInt(invoice.creation_date, 10) + parseInt(invoice.expiry, 10)) + const countDownDate = parseInt(invoice.creation_date, 10) + parseInt(invoice.expiry, 10) return (
@@ -42,11 +36,11 @@ const InvoiceModal = ({

Payment Request

@@ -58,22 +52,24 @@ const InvoiceModal = ({
setActivityModalCurrencyFilters(!showCurrencyFilters)}> - {currencyName} + {currencyName} + + +
    - { - currentCurrencyFilters.map(filter => -
  • onCurrencyFilterClick(filter.key)}>{filter.name}
  • ) - } + {currentCurrencyFilters.map(filter => ( +
  • onCurrencyFilterClick(filter.key)}> + {filter.name} +
  • + ))}

- {invoice.creation_date * 1000} -

-

- {!invoice.settled && 'Not Paid'} + {invoice.creation_date * 1000}

+

{!invoice.settled && 'Not Paid'}

diff --git a/app/components/Activity/PaymentModal.js b/app/components/Activity/PaymentModal.js index 01cfed78..265699d5 100644 --- a/app/components/Activity/PaymentModal.js +++ b/app/components/Activity/PaymentModal.js @@ -19,13 +19,7 @@ const PaymentModal = ({ ticker, currentTicker, - toggleCurrencyProps: { - setActivityModalCurrencyFilters, - showCurrencyFilters, - currencyName, - currentCurrencyFilters, - onCurrencyFilterClick - } + toggleCurrencyProps: { setActivityModalCurrencyFilters, showCurrencyFilters, currencyName, currentCurrencyFilters, onCurrencyFilterClick } }) => (
@@ -51,19 +45,22 @@ const PaymentModal = ({
setActivityModalCurrencyFilters(!showCurrencyFilters)}> - {currencyName} + {currencyName} + + +
    - { - currentCurrencyFilters.map(filter => -
  • onCurrencyFilterClick(filter.key)}>{filter.name}
  • ) - } + {currentCurrencyFilters.map(filter => ( +
  • onCurrencyFilterClick(filter.key)}> + {filter.name} +
  • + ))}
-
- {payment.creation_date * 1000} + {payment.creation_date * 1000}