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

Use TokenBadge from aragonUI #857

Merged
merged 1 commit into from
May 17, 2019
+3 −75
Merged

Use TokenBadge from aragonUI #857

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion apps/token-manager/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"@aragon/api": "^1.0.0",
"@aragon/api-react": "^1.0.0-beta.2",
"@aragon/ui": "^0.34.0",
"@aragon/ui": "^0.38.1",
"bn.js": "^4.11.6",
"prop-types": "^15.7.2",
"react": "^16.8.4",
Expand Down
4 changes: 2 additions & 2 deletions apps/token-manager/app/src/components/SideBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React from 'react'
import styled from 'styled-components'
import { Text, breakpoint, theme } from '@aragon/ui'
import { TokenBadge, Text, breakpoint, theme } from '@aragon/ui'
import { useNetwork } from '@aragon/api-react'
import { formatBalance, stakesPercentages } from '../utils'
import TokenBadge from './TokenBadge'
import You from './You'
import LocalIdentityBadge from './LocalIdentityBadge/LocalIdentityBadge'

Expand Down Expand Up @@ -79,6 +78,7 @@ class SideBar extends React.Component {
address={tokenAddress}
name={tokenName}
symbol={tokenSymbol}
networkType={network.type}
Copy link
Contributor

@AquiGorka AquiGorka May 17, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed with the new badge?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is needed with the new badge yes! But at some point we’ll have providers for the network the tokens in aragonUI, which will make the address the only thing needed on TokenBadge.

/>
</InfoRow>
</ul>
Expand Down
72 changes: 0 additions & 72 deletions apps/token-manager/app/src/components/TokenBadge.js
View file
Open in desktop

This file was deleted.