Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DaoSettings: update var name #580

Merged
merged 1 commit into from
Jan 21, 2019
Merged

DaoSettings: update var name #580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/apps/Settings/DaoSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ class DaoSettings extends React.Component {
apps: PropTypes.array.isRequired,
daoAddress: DaoAddressType.isRequired,
onOpenApp: PropTypes.func.isRequired,
shorten: PropTypes.bool.isRequired,
shortAddresses: PropTypes.bool.isRequired,
walletNetwork: PropTypes.string.isRequired,
walletWeb3: PropTypes.object,
}
static defaultProps = {
account: '',
apps: [],
onOpenApp: noop,
shorten: false,
shortAddresses: false,
}
handleDepositTestTokens = () => {
const { account, apps, walletWeb3 } = this.props
Expand All @@ -46,7 +46,13 @@ class DaoSettings extends React.Component {
}
}
render() {
const { account, apps, daoAddress, shorten, walletNetwork } = this.props
const {
account,
apps,
daoAddress,
shortAddresses,
walletNetwork,
} = this.props
const enableTransactions = !!account && walletNetwork === network.type
const financeApp = apps.find(({ name }) => name === 'Finance')
const checksummedDaoAddr =
Expand All @@ -62,7 +68,7 @@ class DaoSettings extends React.Component {
<IdentityBadge
entity={checksummedDaoAddr}
networkType={network.type}
shorten={shorten}
shorten={shortAddresses}
/>
<Note>
<strong>Do not send ether or tokens to this address!</strong>
Expand Down Expand Up @@ -130,7 +136,7 @@ class DaoSettings extends React.Component {
<IdentityBadge
entity={checksummedProxyAddress}
networkType={network.type}
shorten={shorten}
shorten={shortAddresses}
/>
</Field>
</li>
Expand All @@ -154,7 +160,7 @@ const ButtonLink = styled(Button).attrs({ mode: 'text' })`
export default props => (
<React.Fragment>
<BreakPoint to="medium">
<DaoSettings {...props} shorten />
<DaoSettings {...props} shortAddresses />
</BreakPoint>
<BreakPoint from="medium">
<DaoSettings {...props} />
Expand Down