Commit Graph

191 Commits

Author SHA1 Message Date
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
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
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
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