Browse Source

Merge pull request #466 from LN-Zap/feature/testnet-prefix-channel-balance

Feature/testnet prefix channel balance
renovate/lint-staged-8.x
Ben Woosley 7 years ago
committed by GitHub
parent
commit
1178a9dcc3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      app/components/Contacts/Network.js
  2. 1
      app/routes/app/containers/AppContainer.js

10
app/components/Contacts/Network.js

@ -57,7 +57,9 @@ class Network extends Component {
suggestedNodesProps, suggestedNodesProps,
network network,
currencyName
} = this.props } = this.props
const refreshClicked = () => { const refreshClicked = () => {
@ -151,7 +153,7 @@ class Network extends Component {
<section> <section>
<h2>My Network</h2> <h2>My Network</h2>
<span className={styles.channelAmount}> <span className={styles.channelAmount}>
{btc.satoshisToBtc(balance.channelBalance)}BTC ${usdAmount {btc.satoshisToBtc(balance.channelBalance)} {currencyName} ${usdAmount
? usdAmount.toLocaleString() ? usdAmount.toLocaleString()
: ''} : ''}
</span> </span>
@ -357,7 +359,9 @@ Network.propTypes = {
changeFilter: PropTypes.func.isRequired, changeFilter: PropTypes.func.isRequired,
updateChannelSearchQuery: PropTypes.func.isRequired, updateChannelSearchQuery: PropTypes.func.isRequired,
setSelectedChannel: PropTypes.func.isRequired, setSelectedChannel: PropTypes.func.isRequired,
closeChannel: PropTypes.func.isRequired closeChannel: PropTypes.func.isRequired,
currencyName: PropTypes.string.isRequired
} }
export default Network export default Network

1
app/routes/app/containers/AppContainer.js

@ -313,6 +313,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
nonActiveFilters: stateProps.nonActiveFilters, nonActiveFilters: stateProps.nonActiveFilters,
ticker: stateProps.ticker, ticker: stateProps.ticker,
network: stateProps.info.network, network: stateProps.info.network,
currencyName: stateProps.currencyName,
fetchChannels: dispatchProps.fetchChannels, fetchChannels: dispatchProps.fetchChannels,
openContactsForm: dispatchProps.openContactsForm, openContactsForm: dispatchProps.openContactsForm,

Loading…
Cancel
Save