Browse Source
Merge pull request #737 from mrfelton/feat/node-public-address
feat(wallet): show node public address if set
renovate/lint-staged-8.x
JimmyMow
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
6 deletions
-
app/components/Wallet/ReceiveModal.scss
-
app/routes/app/containers/AppContainer.js
|
|
|
@ -35,8 +35,8 @@ |
|
|
|
color: $white; |
|
|
|
|
|
|
|
.left { |
|
|
|
width: 25%; |
|
|
|
padding: 30px 40px; |
|
|
|
width: 30%; |
|
|
|
padding: 30px 30px; |
|
|
|
|
|
|
|
.header { |
|
|
|
h2 { |
|
|
|
@ -78,14 +78,14 @@ |
|
|
|
} |
|
|
|
|
|
|
|
.right { |
|
|
|
width: 75%; |
|
|
|
width: 70%; |
|
|
|
min-height: 220px; |
|
|
|
border-left: 1px solid $spaceborder; |
|
|
|
padding: 30px 40px; |
|
|
|
padding: 30px 30px; |
|
|
|
|
|
|
|
.pubkey, |
|
|
|
.address { |
|
|
|
padding: 25px; |
|
|
|
padding: 25px 0; |
|
|
|
|
|
|
|
h4 { |
|
|
|
font-size: 12px; |
|
|
|
|
|
|
|
@ -1,5 +1,6 @@ |
|
|
|
import { withRouter } from 'react-router' |
|
|
|
import { connect } from 'react-redux' |
|
|
|
import get from 'lodash.get' |
|
|
|
|
|
|
|
import { btc } from 'lib/utils' |
|
|
|
|
|
|
|
@ -397,7 +398,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => { |
|
|
|
const receiveModalProps = { |
|
|
|
isOpen: stateProps.address.walletModal, |
|
|
|
network: stateProps.info.network, |
|
|
|
pubkey: stateProps.info.data.identity_pubkey, |
|
|
|
pubkey: get(stateProps.info, 'data.uris[0]') || get(stateProps.info, 'data.identity_pubkey'), |
|
|
|
address: stateProps.address.address, |
|
|
|
alias: stateProps.info.data.alias, |
|
|
|
closeReceiveModal: dispatchProps.closeWalletModal |
|
|
|
|
