Commit Graph

417 Commits

Author SHA1 Message Date
Nicolas Gotchac b44e7bb292 Extract CSS to file in production builds (#3783)
* Extract CSS to file if production build

* Use DAPPS_URL for testing purposes + better assets in Webpack

* Delete comments
2016-12-10 23:55:57 +01:00
Nicolas Gotchac e5c73b29d8 'contract/write' to 'contract/develop' 2016-12-10 22:42:49 +01:00
Nicolas Gotchac 9dbccfda2f Fix padding bottom // Status bar fixed 2016-12-10 22:22:14 +01:00
Jaco Greeff 173a88804a Status page updates (#3774)
* Allow Page to create optional Actionbar

* Typo

* Display last block.timestamp

* Remove unnneeded console.log

* Re-do git mv

* git mv

* Force build changes

* Resolving case sensitivity issues

* Swapped to margin at bottom
2016-12-10 22:21:32 +01:00
Nicolas Gotchac 7401358543 PR grumbles 2016-12-10 22:15:56 +01:00
Nicolas Gotchac 70eab0da03 PR grumbles 2016-12-10 20:29:22 +01:00
Nicolas Gotchac ef93262311 See addresses outside address book + Save them 2016-12-10 15:19:05 +01:00
Nicolas Gotchac 65f586ed14 Fix tab bar active style 2016-12-10 14:32:54 +01:00
Nicolas Gotchac 81c5085b35 Don't create new Contracts instance if already exists 2016-12-10 14:31:20 +01:00
Nicolas Gotchac 13607d48be Better use of Tab Bar 2016-12-10 14:26:35 +01:00
Nicolas Gotchac 591d086f42 Better use of React-Router (maintaining old routes) 2016-12-10 14:19:15 +01:00
Nicolas Gotchac 51b9034a5e Don't show addresses while loading balances (fix flash of unsorted) 2016-12-10 12:44:48 +01:00
Nicolas Gotchac 0d9b1882a3 Treat tabs as real link (enable Ctrl+Click for new Tab) 2016-12-10 01:56:38 +01:00
Nicolas Gotchac f6564dcc2f Fix dapps separation 2016-12-10 01:32:39 +01:00
Nicolas Gotchac b9c04fcd00 Fixes to the Wallet UI (#3787)
* Correct number of transactions for contracts

* Remove daily limit info if set to 0

* Hide tx count for contracts
2016-12-10 01:26:47 +01:00
Nicolas Gotchac 6655e7e3c0 Add support for wallets without getOwner() interface (#3779)
* Make Wallet Mist compatible #3282

* Owners icons on load

* Fix oversized logo on load

* Don't fetch registry twice (even when pending)

* Better logging...

* Better contract view : show if no events // show loading events

* Better decimal typed input

* PR grumble
2016-12-10 01:26:28 +01:00
Jaco Greeff a73e0a987e Merge branch 'master' into jg-test-ui 2016-12-09 18:34:58 +01:00
Jaco Greeff ffd8314a11 Be lenient around invalid owners map (#3764)
* Be lenient around invalid owners map

* Filter invalid owners before render
2016-12-09 17:52:25 +01:00
Jannis R bc33231f7c
merge master into jr-use-badge-reg 2016-12-09 16:53:14 +01:00
Jannis R eb1429237b
merge master into jr-email-verification 2016-12-09 16:52:44 +01:00
Jaco Greeff befcc9cc1a Cleanups (#3742)
* Remove unused file

* Combine tx checks into single file

* Move UI components into UI

* DRY links

* Unused rollup config

* Cleanup util paths

* Revert "Move UI components into UI"

This reverts commit 3379e61246cde635c296d31322b71e63395a5cd4.

* Re-apply ~/util/tx move

* Cleanup unused styles
2016-12-09 13:44:10 +01:00
Jannis R 3dc943e854
merge master into jr-use-badge-reg 2016-12-09 13:14:35 +01:00
Jaco Greeff a133e41e16 Merge branch 'master' into jg-test-ui 2016-12-09 09:53:55 +01:00
Jaco Greeff f9a24f3c8e Update babel, fix CI build due to breaking changes (#3754)
* Update babel to latest version

* Re-add circular deps plugin

* Bump for build

* Fixes for babel build
2016-12-09 02:33:12 +01:00
Nicolas Gotchac 09334ca3bd Small fixes to contract (#3751)
* Fix contracts execution will fallback function

* Fix contract execute modal

* Working execute from Contract

* Don't dupliacet events

* Gas * 1.2 in wallet confirmations
2016-12-09 01:21:51 +01:00
Jannis R 1ac3421f33
step to select verification method 2016-12-09 00:39:15 +01:00
Jannis R 1672cbad7b
factor out SMS-specific logic 2016-12-09 00:39:15 +01:00
Jannis R b5b529f8c2
modals/SMSVerification -> modals/Verification 2016-12-09 00:39:15 +01:00
Jannis R e536290892
fix linting issues 2016-12-09 00:38:44 +01:00
Jannis R a84cd9143f
show certifications in accounts list 2016-12-09 00:36:27 +01:00
Jannis R 5862f2a9eb
Certifications: read dappsUrl from state 2016-12-09 00:34:59 +01:00
Jannis R e1c5796a5c
fetch certifications in account view 2016-12-09 00:34:59 +01:00
Jaco Greeff 96d4569cf3 Update test describe paths 2016-12-08 17:31:41 +01:00
Jaco Greeff a1fb1240a7 Properly delete addresses/contracts in addressbook (#3739)
* Remove previously market addresses at startup

* Remove meta.deleted checks

* Remove artifact from code move
2016-12-08 15:54:23 +01:00
Nicolas Gotchac d38da1f3b4 Display Wallet Owners in Accounts list (#3741) 2016-12-08 15:53:46 +01:00
Nicolas Gotchac 715761a714 Edit Multisig Wallet settings (#3740)
* WIP Sending tokens in multi-sig wallet

* Working Token transfer for multi-sig wallet #3282

* Add operation hash to transfer modal

* Add existing wallet from address #3282

* Wallet delete redirect to Wallets/Accounts #3282

* Rightly check balance in Transfer // Get all accounts balances #3282

* Fix linting

* Better Header UI for Wallet

* Use the `~` webpack alias

* Use Webpack `~` alias

* Add `ETH` format to number typed input

* Fix wallet creation hint && eth input type

* Update dailylimit #3282

* Fix too long copied message

* WIP Wallet settings modification #3282

* WIP edit contract parameters #3282

* Edit Wallet parameters #3282

* Don't show wallets if none

* Fix Transfer for Wallet #3282

* Optimized version of contract code

* Fix wrong max in Wallet creation // Round gas in API
2016-12-08 15:53:29 +01:00
Nicolas Gotchac 8dbd56888d Add functionalities to multi-sig wallet (#3729)
* WIP Sending tokens in multi-sig wallet

* Working Token transfer for multi-sig wallet #3282

* Add operation hash to transfer modal

* Add existing wallet from address #3282

* Wallet delete redirect to Wallets/Accounts #3282

* Rightly check balance in Transfer // Get all accounts balances #3282

* Fix linting

* Better Header UI for Wallet

* Use the `~` webpack alias

* Use Webpack `~` alias
2016-12-07 12:47:44 +01:00
Nicolas Gotchac bec3539651 First draft of the MultiSig Wallet (#3700)
* Wallet Creation Modal #3282

* Name and description to Wallet #3282

* Add Wallet to the Account Page and Wallet Page #3282

* Fix Linting

* Crete MobX store for Transfer modal

* WIP Wallet Redux Store

* Basic Details for Wallet #3282

* Fixing linting

* Refactoring Transfer store for Wallet

* Working wallet init transfer #3282

* Optional gas in MethodDecoding + better input

* Show confirmations for Wallet #3282

* Order confirmations

* Method Decoding selections

* MultiSig txs and confirm pending #3282

* MultiSig Wallet Revoke #3282

* Confirmations and Txs Update #3282

* Feedback for Confirmations #3282

* Merging master fixes...

* Remove unused CSS
2016-12-06 09:37:59 +01:00
Nicolas Gotchac 52b4ce0dd7 Use Webpack Aliases (#3711)
* Adds aliases to Webpack Build

* Use `ui` Webpack alias

* Use `views` alias

* Use `modals` aliase

* Use `providers` aliase

* Use `contracts` aliase

* Use '~' aliase

* from `ui` to from `~/ui`

* from  to from

* from `modals` to from `~/modals`

* from `providers` to from `~/redux/providers`

* from `contracts` to from `~/contracts`

* Updated Webpack App config
2016-12-05 11:47:13 +01:00
Jaco Greeff fbd3738096 Merge branch 'master' into jg-signer-decoding 2016-12-02 15:27:56 +01:00
Jaco Greeff b8b9086dae React library update (#3704)
* Update React & MaterialUI

* Adjust TabBar layouts for new MUI
2016-12-02 15:21:25 +01:00
Nicolas Gotchac c892a4f7ae Refactoring Transfer Modal (#3705)
* Better Token Select in Transfer > Details

* Better Autocomplete

* Crete MobX store for Transfer modal

* Remove unused var

* Update Webpack Conf

* Small changes...

* Optional gas in MethodDecoding + better input

* New Contract `getAll` method // TxList Row component

* Method Decoding selections

* Rename `getAll` to `getAllLogs`
2016-12-02 15:21:01 +01:00
Jaco Greeff bd2e2b630c Fix extra scrollbars in dapps (#3706)
* Fix extra scrollbars in dapps

* Dapps list padding

* spelling

* lint

* Height overflow fix
2016-12-02 15:10:38 +01:00
Jaco Greeff 2dd2004ed5 Merge branch 'master' into jg-signer-decoding
# Conflicts:
#	js/src/views/Signer/components/RequestFinished/requestFinished.js
2016-12-02 11:21:17 +01:00
Jannis R 9512794c7f
prevent status bar overlapping 2016-12-01 19:08:19 +01:00
Nicolas Gotchac d5c630c1d2 Fix padding bottom needed after fixed status 2016-12-01 18:45:59 +01:00
Gav Wood 9053e2f27b Merge pull request #3692 from ethcore/jr-fixed-status
fix status bar to bottom of the screen
2016-12-01 01:09:29 +00:00
Gav Wood c630fc5c1c Merge pull request #3642 from ethcore/confirmation
Splitting serialization of signTransaction and sendTransaction confirmation requests
2016-12-01 01:09:07 +00:00
Jannis Redmann 784dcaff7c implement basic badges/certifications/flair (#3665)
* sms verification: Certifications component

* sms verification: actions & reducers for certifications

* sms verification: put Certifications component into place

* sms verification: show certification icons

* sms verification: show certification titles

* sms verification: default icon for certifications

* sms verificaiton: lint issue 👕, fix testnet detection

The sms verification store got created when `isTestnet` (from the
Redux state) was still `undefined`.

* move certification helpers into middleware file

* connect Certifications to Redux

* don't pass certifications as prop

* move default certification icon into assets

* separate file for BadgeReg.sol

* don't pass certifications as prop

* Fix import name

* make BadgeReg a class

* make certifications middleware a class

* Certifications: pass in certifications of account
2016-11-30 21:39:06 +01:00
Jannis R 60a8aabe19
differentiate Snackbar from background 2016-11-30 17:58:18 +01:00
Jannis R 890f880a89
status bar: beautify enode icon 2016-11-30 17:46:50 +01:00
Jannis R f9f91837c2
rework status bar layout
- floats -> Flexbox
- align to content width
2016-11-30 17:46:48 +01:00
Jannis R cce195a98b
fix status bar to bottom of the screen 2016-11-30 17:45:54 +01:00
Jannis Redmann f1b3463015 Merge #3680 from ethcore/jg-container-title
Simplify Container title rendering
2016-11-30 11:42:23 +01:00
Jaco Greeff 7f1391c7a2 Safari UI fixes (#3678)
* Minimum content height for overlay

* Fix Safari TabBar clicks

* Fix extra vertical scrollbar on Chrome

* Swap to em heights
2016-11-30 00:01:42 +01:00
Jaco Greeff 7e2a072a2b Remove finished rendering completely 2016-11-29 16:59:44 +01:00
Jaco Greeff 0ddd33c643 Trim unused components 2016-11-29 16:55:59 +01:00
Jaco Greeff efd4e6f96a Pass MethodDecoding as to/destination view 2016-11-29 16:37:25 +01:00
Jaco Greeff 907606ab69 Merge branch 'master' into jg-container-title 2016-11-29 13:54:30 +01:00
Jannis Redmann e667d33778 make Modal always scrollable (#3667) 2016-11-29 13:50:22 +01:00
Jaco Greeff 5e8f6f271d Display local/completed transactions (#3630)
* Initial fetch of local transactions

* Container allows for title specification

* Introduce TxList component

* Display local transactions in signer list

* Simplify

* Pass only hashes from calling components

* Simplify no pending display

* Render pending blocks at the top

* Get rid of time for 0 blocks

* Indeed sort Pending to the top

* Allow retrieval of pending transactions

* setTimeout with clearTimeout
2016-11-29 13:50:09 +01:00
Jaco Greeff b6efd6b1fd DRY-er Container with title 2016-11-29 11:58:00 +01:00
Tomasz Drwięga 1a6ee533ed Addressing tiny grumbles 2016-11-29 11:52:55 +01:00
Nicolas Gotchac d78de18385 Merge branch 'master' into ng-webpack-update 2016-11-28 17:56:47 +01:00
Jannis Redmann 5f570edf3b update SMS verification (#3579)
* add isTestnet helper

* sms verification: use different port on testnet

* subscribeToEvent helper

* sms verification: await Puzzled event

* sms verification: bugfixes 🐛, move awaitPuzzle

* sms verification: check upfront if code is valid

* sms verification: more helpful phone input label

* isTestnet helper -> redux state
2016-11-28 17:39:55 +01:00
Jannis Redmann 2b178d8233 simplify tx confirmations display (#3559)
* Hash component

* DRY code by using Hash component

* TxHash component: show hash inline

* TxHash component: less verbose confirmations display

* TxHash component: rename ui/Hash to ui/ShortenedHash

* signer: center message in TransactionFinished

* style fixes
2016-11-28 17:39:32 +01:00
Nicolas Gotchac eec99ebad8 Fixes overflow in Signer tx data #3138 (#3657) 2016-11-28 17:18:27 +01:00
Nicolas Gotchac 6be08d8ce4 Fixed tab bar not updating #3631 (#3653) 2016-11-28 16:13:02 +01:00
Nicolas Gotchac 3675095201 Merge branch 'master' into ng-webpack-update 2016-11-28 13:02:03 +01:00
Tomasz Drwięga 8686339b0c Fixing UI to support both send and signTransaction 2016-11-28 12:14:14 +01:00
Nicolas Gotchac f77afd072b Updated ESLINT and fixing linting issues 2016-11-25 19:48:06 +01:00
Nicolas Gotchac 8392090861 WIP - Webpack 2 building 2016-11-25 19:32:58 +01:00
Gav Wood a51066bdca Merge pull request #3618 from ethcore/jg-list-accounts
Use accountsInfo instead of eth_accounts for first check
2016-11-25 18:46:07 +01:00
Gav Wood b274d082c3 Merge pull request #3619 from ethcore/ng-copy-clip-fix
Fix Copy to Clipboard Snackbar
2016-11-25 18:45:49 +01:00
Jaco Greeff e95ef0160f Signer layouts to flexbox (#3600)
* Use variables for signer form widths

* Simplify signer layouts with flex

* Fix styling issues with Signer
2016-11-25 17:20:16 +01:00
Nicolas Gotchac 807790ce95 Merge branch 'master' into ng-webpack-update 2016-11-25 17:17:06 +01:00
Jaco Greeff 6d6e942d9d Add dappreg link to apps list (#3568)
* Fix rendering when contract is empty

* Add registration dapp to app list
2016-11-25 16:46:57 +01:00
Nicolas Gotchac 08c507daaa Smarter balance fetching (#3605)
* Smarter dApps Manifest fetching...

* Fetching only visible accounts (and don't delete other balances) #3590

* Moved balances action into BalancesActions #3590

* Fetch balances for accounts and contracts #3590

* Add balances to contract/address/account views #3590

* Fix transaction not fetching on first load

* Remove console.warn

* Fix pending tokens not showing #3154

* Fix tokens image update

* Remove unused name in Header

* Separate Tokens and ETH fetching #3590

* Remove unused isTest

* Fetch Tokens Balance via Filter #3590

* Fix linting

* Fix updating tokens image (#3590)

* Fix contract balances

* Improved Status

* Fixing secureApi issues...

* Fetch all tokens every 2 minutes (for safety) #3590

* PR changes fix

* Fix Account error
2016-11-25 16:46:35 +01:00
Nicolas Gotchac 9fdab84305 Merge pull request #3597 from ethcore/jg-iframe-sandbox
Dapp iframe allow forms, allow target=_blank
2016-11-25 16:31:32 +01:00
Nicolas Gotchac 9b21c96e3a Fix Copy to Clipboard Snackbar 2016-11-25 15:52:23 +01:00
Jaco Greeff 2958546653 Use accountsInfo instead of eth_accounts for first check 2016-11-25 15:19:14 +01:00
Nicolas Gotchac 24bdf1cb98 Use webpack hot/dev middlewares 2016-11-25 13:14:30 +01:00
Gav Wood 46e5a84bc5 Merge pull request #3540 from ethcore/delete-accounts
Real deleting accounts
2016-11-24 17:16:26 +01:00
Jaco Greeff 30526da094 Allow forms, allow target=_blank 2016-11-24 11:46:27 +01:00
Jaco Greeff e9eebb3088 Optimise multi-balance fetching (one set) 2016-11-23 12:32:50 +01:00
Jaco Greeff 59f4252011 Merge branch 'master' into jg-signer-api-queries-2 2016-11-22 17:31:27 +01:00
Jaco Greeff d8cb32d49b Typo 2016-11-22 17:31:25 +01:00
Gav Wood 490b39cc85 Merge pull request #3555 from ethcore/ng-fast-ui
Faster UI - React Tweaks
2016-11-22 17:05:23 +01:00
Jaco Greeff 609e8912d8 Merge branch 'master' into delete-accounts 2016-11-22 16:19:40 +01:00
Jaco Greeff cce5b217ed Delete account dialog 2016-11-22 16:19:36 +01:00
Jaco Greeff 57ff0e5747 Add visibility specifier (not added between merges) (#3566) 2016-11-22 13:36:23 +01:00
Jaco Greeff a475c2166c Merge branch 'master' into jg-signer-api-queries-2 2016-11-22 09:49:17 +01:00
Jaco Greeff 4c08f7ebba Merge branch 'master' into jg-signer-api-queries-2 2016-11-22 09:48:32 +01:00
Nicolas Gotchac 5735d948f5 [Registry] Clear input and working buttons (#3563)
* onClick to onTouchTap #3556

* onClick to onTouchTap 2 #3556

* Registry dApp clear input + check Signer #3557
2016-11-21 20:44:37 +01:00
Nicolas Gotchac ba8460c65b Fix summary update 2016-11-21 15:54:51 +01:00
Nicolas Gotchac 35fdbf3352 Progressive Accounts List Rendering #3240 2016-11-21 15:45:58 +01:00
Nicolas Gotchac a317e4fdbf Better TabBar #3240 2016-11-21 14:31:06 +01:00
Nicolas Gotchac 47f5a6d005 Merge pull request #3524 from ethcore/jg-signer-api-queries
Don't query chain in Signer, use Redux isTest
2016-11-21 14:16:33 +01:00
Nicolas Gotchac ca5fd0b23d React Perf in dev mode // Smarter background component #3240 2016-11-21 14:14:25 +01:00
Gav Wood 0848a9ec3c
Merge branch 'master' into transactions-propagate 2016-11-20 13:24:08 +01:00
Jaco Greeff 1c4779683f Rename Request{Pending,Finished}Web3 -> Request{Pending,Finished} 2016-11-18 22:30:36 +01:00
Jaco Greeff d1e6b9ec5e Introduce mobx store for component balances 2016-11-18 22:26:52 +01:00
Jaco Greeff 4498fd54a4 Typo slipped through 2016-11-18 21:55:55 +01:00
Gav Wood 80288f8680 Merge pull request #3438 from ethcore/jg-external-dapps
Dapp section & visibility changes
2016-11-19 02:49:41 +08:00
Jaco Greeff 1686d23522 Don't query chain in Signer, use Redux isTest 2016-11-18 19:07:13 +01:00
Jaco Greeff be1e5ae52f Updated overlay size as per comments 2016-11-18 18:20:14 +01:00
Nicolas Gotchac 1c3923c9e8 Smarter Polling #3240
Only refresh statuses when on Status Page for
  some statuses (eg. hashrate)
2016-11-17 20:19:11 +01:00
Jannis R 4ae58f7d33
move nullable PropType helper 2016-11-17 14:31:25 +01:00
Tomasz Drwięga 5c62e38a7c Cleanup 2016-11-17 13:52:09 +01:00
Tomasz Drwięga ff27bbcb4f Simple GUI for local transactions 2016-11-17 10:15:11 +01:00
Jannis R ed2b8e14fc
merge master into sms-verification-modal 2016-11-16 13:29:46 +01:00
Jaco Greeff bbf6d1768d Overal + acceptance in-place 2016-11-16 13:08:08 +01:00
Jaco Greeff d14801f4ea Merge branch 'master' into jg-external-dapps 2016-11-16 12:36:43 +01:00
Jaco Greeff 68efa70977 Update styling 2016-11-16 12:36:27 +01:00
Jaco Greeff 501c7369b0 External app overlay 2016-11-16 12:36:27 +01:00
Gav Wood 9bd6378e42 Typo 2016-11-16 11:37:25 +08:00
Gav Wood b9e9544841 Merge pull request #2866 from ethcore/ng-accounts-backup
Export accounts as JSON or CSV
2016-11-16 11:31:18 +08:00
Gav Wood 130fd3f9c1 Merge pull request #3457 from ethcore/ng-save-sorting
Save sort order in LocalStorage
2016-11-16 11:19:19 +08:00
Gav Wood 53cb033b17 Merge pull request #3450 from ethcore/jg-signer-overflow
Update signer to take care of text overflows
2016-11-16 11:18:20 +08:00
Jaco Greeff 6efdc08044 Queries display IdentityIcons (#3453) 2016-11-15 19:08:16 +01:00
Nicolas Gotchac 22e47a68a3 Save sort order in LocalStorage #3402 2016-11-15 18:39:11 +01:00
Jannis R 7a83fb8595
merge master into sms-verification-modal 2016-11-15 17:04:36 +01:00
Jannis R aa8fc554fe
sms verification: simplify code
- moved the steps into named exports
- moved the store creation into the Accounts component
- fix a linting issue
2016-11-15 17:04:34 +01:00
Nicolas Gotchac 20185e5aac Use signature of functions instead of names (#3448)
* Use signature of functions instead of names #3411

* Fixes contract tests #3448
2016-11-15 15:58:33 +01:00
Jaco Greeff a1ec3146eb Update signer to take care of text overflows 2016-11-15 14:32:29 +01:00
Jaco Greeff 601cef226b Merge branch 'master' into jg-external-dapps 2016-11-15 09:25:42 +01:00
Jaco Greeff 1e155ae548 Render selection inside areas 2016-11-14 21:57:28 +01:00
Nicolas Gotchac b9f3c4b266 Merge branch 'master' into ng-accounts-backup 2016-11-14 20:31:10 +01:00
Nicolas Gotchac 09ec0c1f2f More robust import #2885 2016-11-14 20:26:21 +01:00
Nicolas Gotchac 134622ea3a Adds error handler in Importer // Import AddressBook #2885 2016-11-14 18:34:05 +01:00
Jaco Greeff 5a6e2f89dd Hide external apps by default 2016-11-14 17:02:45 +01:00
Gav Wood 8db3414de9
Merge branch 'master' into sms-verification-modal 2016-11-14 11:56:37 +01:00
Jannis R 4d01fbc4c4
merge master into refactor-copy-to-clipboard 2016-11-14 11:46:58 +01:00
Jaco Greeff 80606cdd7d Load external, builtin & local apps in parallel (#3340) 2016-11-11 16:53:10 +01:00
Nicolas Gotchac 0e4ef539fc Solidity Compiler in UI (#3279)
* Added new Deploy Contract page // Use Brace in React #2276

* Adding Web Wrokers WIP

* Compiling Solidity code // Getting mandatory params #2276

* Working editor and deployment #2276

* WIP : displaying source code

* Added Solidity hightling, editor component in UI

* Re-adding the standard Deploy Modal #2276

* Using MobX in Contract Edition // Save to Localstorage #2276

* User select Solidity version #2276

* Loading Solidity versions and closing worker properly #2276

* Adds export to solidity editor #2276

* Adding Import to Contract Editor #2276

* Persistent Worker => Don't load twice Solidity Code #2276

* UI Fixes

* Editor tweaks

* Added Details with ABI in Contract view

* Adds Save capabilities to contract editor // WIP on Load #3279

* Working Load and Save contracts... #3231

* Adding loader of Snippets // Export with name #3279

* Added snippets / Importing from files and from URL

* Fix wrong ID in saved Contract

* Fix lint

* Fixed Formal errors as warning #3279

* Fixing lint issues

* Use NPM Module for valid URL (fixes linting issue too)

* Don't clobber tests.
2016-11-11 15:00:04 +01:00
Jannis R e9b69bceab
Account Header: use CopyToClipboard 2016-11-10 18:09:54 +01:00
Jaco Greeff a97e68a030 Make transactions load (#3348) 2016-11-10 16:38:47 +01:00
Jannis R 01f14901ce
merge master into sms-verification-modal 2016-11-10 16:23:43 +01:00
Jannis R 2309e53fe6
sms verification: polish UI, linting issues 👕 2016-11-10 13:54:17 +01:00
Tomasz Drwięga 2f98169539 In-browser signing support (#3231)
* Signer RAW confirmations

* Returning address book as eth_accounts

* UI support for in-browser signing

* Post review fixes

* Adding new methods to jsonrpc

* Fixing eth_accounts

* Deterministic accounts ordering
2016-11-10 11:27:05 +01:00
Jaco Greeff 90ff810e36 Handle redirects from /api/content on manifest.json gracefully (#3315)
* Add redirect follow mode to manifest.json

* Remove (now) unused count parameter

* autoRewrite: true for dev mode proxy redirects
2016-11-09 20:05:08 +01:00
Jannis R 89c1d9c25c
merge master into sms-verification-modal 2016-11-09 19:04:31 +01:00
Jaco Greeff 877cfe9b53 Fix signer token updates (#3302)
* Manual bump of package.json (recovery)

* Debug

* Simplify status connections
2016-11-09 18:26:10 +01:00
Jannis R fc76fa9252
sms verification: basic stepper 2016-11-09 16:54:54 +01:00
Jannis R 7cb724bfbe
put SMS verification into action bar 2016-11-09 16:54:54 +01:00
Jaco Greeff 95e03f87fa Remove 127.0.0.1 references (#3303) 2016-11-09 14:01:59 +01:00
Jaco Greeff 6a1b17d5a9 Change to more common focused spelling (#3264) 2016-11-09 11:53:40 +01:00
Jaco Greeff f9dc766ae2 Fix initial token generation (#3289)
* Fix initial token generation

* Remove extra debug info
2016-11-08 23:17:33 +01:00
Jaco Greeff 51aa0e28eb Add secure flag back (#3244) 2016-11-07 20:07:08 +01:00
Jaco Greeff 6ab6c0709d Load network apps manifests as contentHash (no coding) (#3235)
* Add mobx

* Use mobx store for dapps

* Cleanup hidden reads

* Remove (now) unused hidden.js

* _ denotes internal functions

* s/visibleApps/visible/

* AddDapps now use the mobx store as well

* Move modalOpen state to store

* Simplify

* Complete master merge

* Remove extra indirection

* Remove unneeded check

* Readability improvements

* Remove final debug info

* Load network manifests from the network

* Swallow manifest errors

* introduce fetchManifest
2016-11-07 18:08:16 +01:00
Arkadiy Paronyan 108452d082 Fixed some typos (#3236) 2016-11-07 17:42:17 +01:00
Jaco Greeff f0054aa201 Add store for dapps state (#3211)
* Add mobx

* Use mobx store for dapps

* Cleanup hidden reads

* Remove (now) unused hidden.js

* _ denotes internal functions

* s/visibleApps/visible/

* AddDapps now use the mobx store as well

* Move modalOpen state to store

* Simplify

* Complete master merge

* Remove extra indirection

* Remove unneeded check

* Readability improvements

* Remove final debug info
2016-11-07 15:22:46 +01:00
Tomasz Drwięga 9c4979681c Cleaning up polluted namespaces (#3143)
* Renaming ethcore_ to parity_

* Renaming files

* Renaming poluted EthSigning

* Tidy up the namespaces

* Renaming files to match new structure

* Splitting EthSigning into separate traits

* jsapi move ethcore.* -> parity.*

* Move jsonrpc parity definitions

* Update UI API calls for parity interfaces

* Move jsapi signer interfaces from personal to signer

* Update UI to use signer.* where applicable

* Updsate jsapi subscriptions for signer

* Fix dodgy merge.

* Update README.

* Fix some tests.

* Move parity-only personal.* to parity.*

* Update UI for personal -> parity API moves

* Update subscription APIs after personal -> parity move

* personal. generateAuthorizationToken -> parity. generateAuthorizationToken (UI)

* enode, dappsPort & signerPort (UI)

* Update subscription tests (accountsInfo)

* subscription update

* personal -> parity

* Additional error logging on method failures

* move postTransaction to parity

* Additional debug info with method failures

* Fix personal tests.

* Console wrning shows parameters, error object does not

* Include parity_ signing methods.

* Console log http transport info

* Fix failing tests

* Add RPC stubs for parity_accounts.

* Allow some secure built-in dapps

* Use parity_accounts in place of accountsInfo

* Improve error reporting

* Cleanup GHH error handling
2016-11-06 12:51:53 +01:00
Jaco Greeff 458ee4cbad Parity configuration settings, i.e. mode (#3212)
* Add initial page

* Add parity icon

* opacity for parity icon

* Mode selector

* Actually set mode when value changes
2016-11-05 12:08:14 +01:00
Gav Wood 744501c454 Mode improvements for UI (#3109)
* `--mode=off` now works.

* Add Mode::Off as a persistent CLI option.

* "last" not "auto" as default.

* Commit accidentally unsaved file.

* Whitespace

[ci:skip]

* Mode CLI parse fix

* or offline

* Save mode when it gets changed.

* Fix Offline mode

* Fix up mode operations.

* Make passive default, but not overriding.

* Fix test

* Maybe not everyone wants to run an archive node...
2016-11-05 10:38:00 +01:00
Jaco Greeff c2e85dc4d5 Use ethcore_dappsPort when constructing URLs (#3139)
* Upon connect, retrieve the available api ports

* Update dapps to load from dappsPort

* Update dapps summary with dappsPort

* Allow proxy to use dappsPort

* Replace /api/ping with HEAD /

* Dynamic port for available apps

* Retrieve content images with dappsPort

* Fix /

* Transfer token dropdown image fix

* IdentityIcon loads images via contentHash

* Update apps fetch to cater for dev & prod

* DRY up 127.0.0.1:${dappsPort} with ${dappsUrl}
2016-11-04 23:08:12 +01:00
Gav Wood af9de37756 Make the footer a bit less ugly. (#3160)
* Make the footer a bit less ugly.

* Whitespace.
2016-11-04 09:57:21 +01:00
Jannis Redmann c79e3286ca abbreviated enode, `CopyToClipboard` component (#3131)
* show abbreviated enode

* CopyToClipboard component

* CopyToClipboard: improved styling

* put CopyToClipboard into enode status

* Rename CopyToClipboard.js to copyToClipboard.js
2016-11-03 22:22:53 +01:00
Jaco Greeff 2f665ba115 Remove network label from TabBar (#3142) 2016-11-03 20:17:59 +01:00
Jaco Greeff 34e3c1e0c2 Speed up unresponsive Contract events & Account transactions (#3145)
* Don't load method via redux

* Don't redux fetchTransaction (contracts)

* Move isTest to top-level passing

* transaction list with local blocks/transactions

* Combine calls (allows future chunking)

* Progressive loading of transactions

* Cleanups

* Never try tracing
2016-11-03 20:08:35 +01:00
Jaco Greeff 3a1f3c0a80 Optimise contract events display (#3120)
* Adjust to last 25 events

* Adjust event address widths

* Slight column size adjustment
2016-11-03 12:23:53 +01:00
Nicolas Gotchac d99f1b517c Use enode RPC in UI (#3108)
* add enode rpc

* spaces -> tabs

* Added Enode to JSAPI // Use it to display in Status (#3106)

* Added enode to JSON RPC Interfaces #3108
2016-11-03 12:04:25 +01:00
Jannis Redmann 5ae737f307 new InputAddressSelect component (#3071)
* basic address autocomplete

* validate input, propagate changes

* show IdentityIcon in menu

* show IdentityIcon next to input

* refactoring, better variable names, linting

* show default IdentityIcon if search by name

* port #3065 over

* show accounts in the beginning

* show accounts before contacts

* filter deleted accounts

* UX improvements

- limit number of search results shown
- hint text

* only render identity icon if valid address

* UX improvements

- align IdentityIcon
- better hint text

* align label & error with other inputs

This probably needs to be changed soon again. Therefore this ugly hack has been put in place.

* Align component with coding style for app

* Use standard/tested AddressAutocmplete (WIP)

* Address selection & inputs operational

* Update TODOs, remove unused CSS

* only handle input changes when editing

* Simplify

* Cleanup unused modules

* Add contracts to address search

* Updates Address Selector to handle valid input address #3071

* Added Address Selector to contracts read queries
2016-11-03 11:57:43 +01:00
Nicolas Gotchac 391f408653 Sort by ETH balance and contract by date (#3107)
* Added timestamps to contract creation // Sort by date (#3070)

* Added sort by ETH balance (#3070)

* Added timestamp meta to accounts / addresses entry creations (#3107)
2016-11-02 23:09:00 +01:00
Nicolas Gotchac e4c75bde4c Add read-only inputs to UI plus Copy to Clipboard buttons (#3095)
* Adds readOnly prop to Input, convert disabled props to it (#3066)

* WIP

* Adds copy icon to readOnly Input (#3009)

* Added Copy to Clipboard buttons on the UI (#3009)

* copiable to allowCopy props #3095

* Padded copy icons (#3095)

* Fixed password width in account creation

* Copyable value in MethodDecoding
2016-11-02 17:25:34 +01:00
Nicolas Gotchac ed89e1efab Fixing dapps sorting (#3086)
* Fixing dapps sorting (#3076)

* PR Grumble

* PR Grumble #2
2016-11-02 12:58:03 +01:00
Jaco Greeff 274b109f3f Load network dapps (#3078)
* Initial load of network apps

* Load network dapps

* Cleanups

* Update

* Updated

* Fix builtin apps loading
2016-11-02 11:27:28 +01:00
Jaco Greeff efbbe507ee Warp sync status display (#3045)
* Warp sync status display

* Add BlockStatus component (re-usable)
2016-11-01 22:43:22 +01:00
Jaco Greeff 314eb59081 Change contract Execute bool values & query bool value display (#3024)
* Allow for boolean value selection

* Updated

* Explicitly display bool as true/false (string)

* Really fix boolean display
2016-11-01 18:42:36 +01:00
Jaco Greeff 556827400c Update Parity logo (#3036)
* Add new parity logos

* FirstRun logo

* Tabbar logo

* Remove duplicated block image

* Parity favicons

* Remove images to be replaced

* Paritybar logo

* Add favicon

* Adding HTML Loader for Webpack for image linking
2016-11-01 18:12:40 +01:00
Jannis Redmann 145a88d401 settings: replace background patterns (inline) (#3047)
* replace generated background patterns

* move button to overview section

* keep selected background

* show current background pattern
2016-11-01 18:05:10 +01:00
Nicolas Gotchac 6fc89f69c1 Multiple line description for dapps and Masonry like layout (#2905) (#3058) 2016-11-01 17:47:02 +01:00
Nicolas Gotchac 9e7313afc8 Proper order for status logs (#3055) (#3062) 2016-11-01 17:44:59 +01:00
Nicolas Gotchac 84ca3d7a7d Graphical gas price selection (#2898)
* Added gasPriceStatistics

* WIP graph fas price stats (#2142)

* Chart to select gas price in Extra Tx (#2142)

* Gas Selection UI

* Gas Price Selection: better UI (right octiles, point on graph) (#2142)

* Gas Price Selection chart update using D3 (#2142)

* Working UI, more fluid... (#2142)

* Using the new gasPriceHistogram Call: display histogram (#2142)

* Code Clean

* Updated gas Selection explaination

* PR grumble // Gas Price Selector (#2898)

* Fixing linting issues
2016-11-01 15:04:51 +01:00
Jannis Redmann 09c42973f1 fix chain badge padding (#3046) 2016-11-01 14:10:17 +01:00
Jaco Greeff 71662bb219 Remove signer icons (#3039)
* Remove signer icons

* Linting fixes
2016-11-01 11:11:20 +01:00
Jannis Redmann 93400810db fix background of embedded signer (#3026) 2016-10-31 23:37:12 +01:00
Nicolas Gotchac b8bcb8e622 Replace Execute by Query in contract button (#3015) (#3031) 2016-10-31 23:28:26 +01:00
Jaco Greeff ea784d7419 Allow operation when no registry is available (#2980)
* Allow retrieval of native network balances without registry

* Remove debugging address

* Disable dapps when no registry is available
2016-10-31 14:24:33 +01:00
Jaco Greeff 10a6e95d8a Display network status for finished Signer requests (#2983)
* Display confirmation for finished requests

* Update box padding
2016-10-30 12:20:52 +01:00
Jannis Redmann 86c0dbeedc refactor etherscan.io links (#2896)
* use proper querystring builder

* etherscan.txLink helper

* refactor to etherscan.txLink

* etherscan.addressLink helper

* refactor to etherscan.addressLink

* move txLink & addressLink into common file
2016-10-30 09:37:15 +01:00
Nicolas Gotchac 6b2cffd312 Merge branch 'master' into ng-accounts-backup 2016-10-26 18:43:05 +02:00
Jaco Greeff e449477f23 Add mising imgages for local dapps (#2890) 2016-10-26 17:04:48 +02:00
Nicolas Gotchac c05430e25e Fixes signer errors throwing // MaterialUI Update errors too (#2867) (#2876) 2016-10-26 11:56:38 +02:00
Nicolas Gotchac 61f41cdbe2 Add exporting to CSV (#2147) 2016-10-25 18:26:47 +02:00
Nicolas Gotchac 92bdfb1234 Add Export button to Accounts (#2147) 2016-10-25 18:06:05 +02:00
Nicolas Gotchac 2d2e9c4d6e Add Check and Change Password for an Account (#2861)
* Added new RPC endpoints to JSAPI (#2389)

* Added modal in Account Page to test & modify password (#2389)

* Modify hint with password change // Better tabs (#2556)
2016-10-25 17:54:01 +02:00
Jaco Greeff 7eacf07629 Align contract event log l&f with transactions (#2812)
* Event into own component, align with transactions

* Pass value & type through from event log params

* Reformat display columns
2016-10-25 16:02:12 +02:00
Nicolas Gotchac 037a8c7625 Removes event name in unsubscribe API + Tests (#2364) (#2844) 2016-10-25 11:43:24 +02:00
Nicolas Gotchac 1b42e9a9af Added Export Component in Actionbar => export Addressbook (#2153) (#2847) 2016-10-24 18:27:35 +02:00
Nicolas Gotchac 487da9c9c6 Trigger accounts/contracts search on search input change (#2838)
* Styling Chips in search bar (#2766)

* Styling search chips // Add chip on space/comma/... (#2766)

* Update search on input (#2766)

* Fixing search triggers bugs (#2766)

* removed console logs

* Use props instead of weird CSS selectors for Search Bar

* Add tags on space and commas in EditMeta modal (#2766)

* Fixed empty input in EditMeta modal ; tokens input
2016-10-24 16:35:43 +02:00
Jannis Redmann ff347da8d3 fix node log being reversed (#2839) 2016-10-24 15:11:32 +02:00
Jannis Redmann 9500f2b83d merge #2837 from ng-import-case-fix
Fix case error in Dapps import
2016-10-24 13:13:39 +02:00
Nicolas Gotchac 35925db825 Double click on address in account detail view should select it 2016-10-24 13:03:44 +02:00
Jaco Greeff 7e84b078dd Adjust paths to handle CORS changes (#2816)
* Adjust :8080 paths for CORS & development

* No need to redirect, Node takes care of it
2016-10-24 12:21:52 +02:00
Nicolas Gotchac bd040d4cfd Fix case error in Dapps import 2016-10-24 10:28:18 +02:00
Jaco Greeff 3637c6ad9a Adjust network name badge colours (darker) (#2823) 2016-10-22 22:29:47 +02:00
Jannis Redmann bf827a758f fix Signer UI (#2750)
* fix Signer UI

* resolve conflicts
2016-10-22 19:25:30 +02:00
Jaco Greeff a1266fccb7 Make local apps available (Fixes #2771) (#2808) 2016-10-22 15:49:39 +02:00
Nicolas Gotchac 76cded7fa4 Use trace API for decentralized transaction list (#2784)
* Using traces when available to get accounts transactions (#2148)

* Fixed traceMode detection and transactions rendering (#2148)

* [WIP] Use Redux Thunk in main UI => Async Actions (#2148)

* Using Redux for Transaction / Block / Methods... (#2148)

* Use BigNumber comparedTo function to sort txs (#2148)
2016-10-22 09:45:54 +02:00
Jannis Redmann 68efbe32bf fix contract deployments not showing up (#2759)
* fix contract deployments not showing up

I'm really not happy with this.

Since the Signer consists of many, deeply nested, components, which in many cases
just pass props through, it's hard to trace this. `<TransactionPending>` is
supposed to fetch data from Parity (smart component) and pass it on to its (dumb)
children. For that, it needs to know implementation details of them.

* eslint 💄
2016-10-20 16:37:25 +02:00
Jannis Redmann 67f734cb20 fix linting issues (#2758) 2016-10-20 16:09:58 +02:00
Jannis Redmann d2e4bafaa5 refactor signer components (#2691)
* remove TransactionPendingWeb3

* remove TransactionFinishedWeb3

* remove SignRequestWeb3
2016-10-20 11:31:23 +02:00
Jannis Redmann 9b246245bf very basic dapp add/remove interface (#2721)
* refactor dapp loading

* basic modal window

* UI for removing dapps

* button to open modal

* eslint 💄, make dialog scrollable

* Dialog -> ui/Modal

* show dapp hash
2016-10-20 11:22:25 +02:00
Jaco Greeff a71006ebc4 Merge pull request #2731 from ethcore/ng-copy-clipboard-fix
Fixed Snackbar not showing and/or behind transactions (#2730)
2016-10-19 18:04:18 +02:00
Nicolas Gotchac c50ef499b3 Fixed Snackbar not showing and/or behind transactions (#2730) 2016-10-19 16:58:14 +02:00
Jannis R dd51c7ef42
dapps: show errors 2016-10-19 16:40:39 +02:00
Jannis R c4b60b8552
fix styling 2016-10-19 14:03:33 +02:00
Jannis R 6c6ad6d660
node logs: break lines 2016-10-19 13:36:08 +02:00
Nicolas Gotchac dd89ecea43 Add 'Copy to Clipboard' icon in Accounts Header (#2167) (#2716) 2016-10-19 13:24:22 +02:00
Jannis Redmann cf170418d5 merge #2720 from ng-ui-tags-fixes
Sort tags when displaying ; use AND for search results
2016-10-19 13:21:54 +02:00
Jaco Greeff b9a4e42bbe allow-same-origin for iframe (#2711) 2016-10-19 13:18:58 +02:00
Nicolas Gotchac 749e1e44b9 Use Array.prototype.some instead of `filter` then `length` 2016-10-19 13:15:01 +02:00
Nicolas Gotchac 88eb72468e Use AND instead of OR for tags search // Sort tags when displayed (#2719) 2016-10-19 13:01:06 +02:00
Nicolas Gotchac cc10f412dc Allow tags for Accounts, Addresses and Contracts (#2712)
* Added tag to the editMeta Modal (#2643)

* Added Tags to ui and to contract/address/account Header (#2643)

* Added tags to summary (#2643)

* Added Search capabilities to contracts/address book/accounts from tokens
(#2643)

* fixes eslint

* Using Chips/Tokens for search (#2643)

* Add search tokens, clickable from List (#2643)

* Add sort capabilities to Accounts / Addresses / Contracts (#2643)

* Fixes formatting issues + state updates after component unmount bug
(#2643)

* Remove unused import

* Small fixes for PR #2697

* Added default sort order for Contracts/Addresses/Accounts

* Using official `material-ui-chip-input` NPM package

* Removed LESS from webpack
2016-10-19 11:51:02 +02:00
Jaco Greeff 3c0b02ffe6 Apply UI PRs after master merge (#2690) 2016-10-18 16:44:09 +02:00
Jaco Greeff 1e6a2cb378 Initial new UI source code import (#2607)
* address -> name mappings

* expanding, loading all coin details

* send use only actual BasicCoin tokens registered (any reg)

* sending token & accounts

* form styling updates

* send form layout in place

* coin send working as expected

* api subscriptions on multiple addresses

* bring in events

* simplify

* basic events display in-place, functionally complete

* basic functionality in-place

* fix horrible event address issue

* rwork display of events slightly

* test TLA availability

* table for owner -> tokens

* fix signature lookup address

* fix signature lookup address

* basic overview styling

* txhash links

* page layout adjustments

* background import

* adjust colors

* no global registration, simplify color selection

* updated styling

* connection dialog for "busy connecting"

* initial token connection - WIP

* init token updates take place

* basic test for manual token

* rework connection display

* allow updates of the secure token

* first stab at making the build build

* update runner tags

* fix linting issues

* skip tests requiring network (should be e2e, TODO)

* re-enable javascript tag/runner

* release push does the trick

* push to any branch, CI name

* javscript-test runner as well

* swap dependencies build requires test

* revert stages swap

* retrieve images associated with tokens

* remove js build deps order

* null image when hash = 0x0

* 6x64 images (hashes for registries)

* don't pass tokens as prop to IdentityIcon

* check images against content hash pictures

* cleanup signer after connection changes

* fix naming typo

* display unknownImages for balances (not available as content hash)

* unknownImage for transfer dialog

* basic githubhint layout

* single input for commit/filename

* ethcore_hashContent call

* lookup hash

* registration in place

* fixes

* events is using a proper table

* pass value through as-is

* stop wrongly using main app IdentityIcon

* NEVER export class instance functions

* alignment back to normal

* typo  in definition

* set & get images working (mostly)

* show content retrieval info

* set exitcode via ||

* use javascript:latest images

* disable npm progress bar

* rename phase I

* rename phase II

* only send build output to GitHub on major branches

* also run the build step as part of the test (until comprehensive)

* ci-specific build (no webpack progress)

* allow for account creation via recovery phrase

* display account uuid (where available), closes #2546

* connection dialog now shows up in dapps as well, closes #2538

* token images show up as expected

* IdentityName component added and deployed

* fix padding tests

* adjust tests to map to stricter 0x-prefixed hex

* render names via common component for the address -> name

* split lint into seperate script (early exit)

* test phases changed to lint, test & pack

* pack part of test phase

* remove files marked for deletion (cleanup)

* Signer cleanups, start moving in the direction of the rest

* add personal signer methods

* basic signer request subscription

* don't poll blockNumber when not connected

* missing return, creating massive ws queue backlogs

* ΞTH -> ETH

* fix failing tests

* registry uses setAddress to actually set addresses now

* bytes mapping operates on lowerCase hex strings

* sha3 ids for each application

* add dappreg to list of contracts

* adjust alignment of queries

* show gas estimation log

* abi with payable for register function

* add key as required

* image retrieval from dappreg

* use proper Image urls

* embed and link apps from Parity, retrieved via /api/apps

* filter apps that has been replaced

* proxy entry for parity-utils

* add basiccoin abi

* add support for fallback abi type

* capture constructor paramaters

* merge master into js

* move images to assets/images/

* add font assets

* import fonts as part of build

* don't inline woff files

* Revert "merge master into js"

This reverts commit cfcfa81bd26f1b3cbc748d3afa1eb5c670b363fe.

* remove unused npm packages

* information on gas estimates (like almost everywhere else)

* don't pass gas & gasPrice to estimation

* display account passwordhint when available

* signer subscriptions based on polling & function trapping

* pending requests retrieved via jsapi

* update signer middleware

* remove all web3 instances

* remove web3 package

* last web3 dependencies removed

* no need to toChecksumAddress - api takes care of it

* expand description for personal_confirmRequest

* Signer conversion from web3 -> parity.js completed

* explicit in no return

* green circle background

* remove generated background

* convert /api/* paths to localhost:8080/api/* paths (hard-coded, temporary)

* change dapps to load from localhost:8080/ui/*

* remove dangling web3 files

* update manager test for signer

* /api/ping -> /

* additional token images

* additional token images

* add missing styles.css for 8180 error pages

* cater for txhash returning null/empty object

* adjust output directories

* Release merge with origin with ours strategy

* additional token images

* cater for development server

* s/localhost/127.0.0.1/ (cater for origin)

* Fix address selection for contract deployment

* Adjust z-index for error overlay

* better text on unique background pattern

* fix signer rejections

* Don't allow gavcoin transfer with no balance

* fix txhash rendering in signer

* remove unnecessary ParityBackground

* script to update js-precompiled

* Redirect from :8080 to :8180

* Remove extra return

* Dapp logo images
2016-10-18 11:52:56 +02:00