Browse Source

fix(currencyName): add currencyName to all activity

renovate/lint-staged-8.x
Jack Mallers 7 years ago
parent
commit
cc3cfbcbdc
  1. 10
      app/routes/activity/components/Activity.js
  2. 6
      app/routes/activity/components/components/Invoice/Invoice.js
  3. 6
      app/routes/activity/components/components/Transaction/Transaction.js

10
app/routes/activity/components/Activity.js

@ -48,7 +48,15 @@ class Activity extends Component {
)
} else if (Object.prototype.hasOwnProperty.call(activity, 'payment_request')) {
// activity is an LN invoice
return <Invoice invoice={activity} ticker={ticker} currentTicker={currentTicker} showActivityModal={showActivityModal} />
return (
<Invoice
invoice={activity}
ticker={ticker}
currentTicker={currentTicker}
showActivityModal={showActivityModal}
currencyName={currencyName}
/>
)
}
// activity is an LN payment
return (

6
app/routes/activity/components/components/Invoice/Invoice.js

@ -10,7 +10,7 @@ import checkmarkIcon from 'icons/check_circle.svg'
import styles from '../Activity.scss'
const Invoice = ({
invoice, ticker, currentTicker, showActivityModal
invoice, ticker, currentTicker, showActivityModal, currencyName
}) => (
<div className={`${styles.container} ${!invoice.settled && styles.unpaid}`} onClick={() => showActivityModal('INVOICE', { invoice })}>
{
@ -39,6 +39,7 @@ const Invoice = ({
currency={ticker.currency}
currentTicker={currentTicker}
/>
<i> {currencyName}</i>
</span>
<span>
<span>
@ -53,7 +54,8 @@ Invoice.propTypes = {
invoice: PropTypes.object.isRequired,
ticker: PropTypes.object.isRequired,
currentTicker: PropTypes.object.isRequired,
showActivityModal: PropTypes.func.isRequired
showActivityModal: PropTypes.func.isRequired,
currencyName: PropTypes.string.isRequired
}
export default Invoice

6
app/routes/activity/components/components/Transaction/Transaction.js

@ -8,7 +8,7 @@ import Value from 'components/Value'
import styles from '../Activity.scss'
const Transaction = ({
transaction, ticker, currentTicker, showActivityModal
transaction, ticker, currentTicker, showActivityModal, currencyName
}) => (
<div className={styles.container} onClick={() => showActivityModal('TRANSACTION', { transaction })}>
<div className={styles.data}>
@ -29,6 +29,7 @@ const Transaction = ({
currency={ticker.currency}
currentTicker={currentTicker}
/>
<i> {currencyName}</i>
</span>
<span className='hint--bottom' data-hint='Transaction fee'>
${btc.convert('sats', 'usd', transaction.amount, currentTicker.price_usd)}
@ -41,7 +42,8 @@ Transaction.propTypes = {
transaction: PropTypes.object.isRequired,
ticker: PropTypes.object.isRequired,
currentTicker: PropTypes.object.isRequired,
showActivityModal: PropTypes.func.isRequired
showActivityModal: PropTypes.func.isRequired,
currencyName: PropTypes.string.isRequired
}
export default Transaction

Loading…
Cancel
Save