Skip to content

Commit

Permalink
Merge 0274968 into 4b5094a
Browse files Browse the repository at this point in the history
  • Loading branch information
AquiGorka committed May 10, 2019
2 parents 4b5094a + 0274968 commit 8576d72
Show file tree
Hide file tree
Showing 4 changed files with 227 additions and 228 deletions.
3 changes: 2 additions & 1 deletion apps/finance/app/package.json
Expand Up @@ -7,10 +7,11 @@
"@aragon/api": "^1.0.0",
"@aragon/api-react": "^1.0.0-beta.2",
"@aragon/templates-tokens": "^1.2.0",
"@aragon/ui": "^0.34.0",
"@aragon/ui": "^0.37.0",
"@babel/polyfill": "^7.0.0",
"bn.js": "^4.11.8",
"date-fns": "2.0.0-alpha.22",
"downloadjs": "^1.4.7",
"lodash.throttle": "^4.1.1",
"prop-types": "^15.7.2",
"qrcode.react": "^0.8.0",
Expand Down
6 changes: 5 additions & 1 deletion apps/finance/app/src/App.js
Expand Up @@ -113,7 +113,11 @@ class App extends React.Component {
)}
{transactions.length > 0 && (
<SpacedBlock>
<Transfers transactions={transactions} tokens={tokens} />
<Transfers
dao={proxyAddress}
transactions={transactions}
tokens={tokens}
/>
</SpacedBlock>
)}
{balances.length === 0 && transactions.length === 0 && (
Expand Down

0 comments on commit 8576d72

Please sign in to comment.