Commit Graph

281 Commits

Author SHA1 Message Date
Jannis R
240bab230c
merge master into jr-use-badge-reg 2016-12-14 12:26:18 +01:00
Jaco Greeff
e170134d97 Merge branch 'master' into check-updates 2016-12-12 22:45:12 +01:00
Jaco Greeff
1135674eaa WIP UI (dialog available) 2016-12-12 15:51:36 +01:00
Jannis R
085adbaffd
make showFirstRun in localStorage a bool 2016-12-12 14:15:26 +01:00
Jannis R
723e9e55db
merge master into jr-email-verification 2016-12-12 12:21:06 +01:00
Jannis R
d67a9388ff
merge master into jr-use-badge-reg 2016-12-12 12:13:49 +01:00
Nicolas Gotchac
0cb16ae589 Add store for MethodDecoding (#3821)
* Add Loader to Transactions

* Add Method Decoding Store (better fetching of methods)

* Load locally stored ABI in MethodDecodingStore

* Fixes UI glitches along the way

* Linting

* Add method decoding from User Contracts
2016-12-12 00:38:47 +01:00
Nicolas Gotchac
4dbfcf231d Cache fetched Dapps (#3804)
* Have a singleton DappsFetcher so we don't realod them at each page load

* Better dapps Fetcher : event based listener
  Update on meta change

* Remove dapps fetcher => all in singleton dapps store + utils

* Modify header to Parity
2016-12-11 21:03:40 +01:00
Gav Wood
58b72c521d
Rename ethcore -> parity in licenses. 2016-12-11 19:31:31 +01:00
Gav Wood
17cc2be4b5
Rename ethcore -> parity in license. 2016-12-11 19:30:54 +01:00
Jaco Greeff
929b6ee0f7 Allow editing of gasPrice & gas in Signer (#3777)
* Rework gas display (maintainable)

* Move GasPriceSelector to ui

* Allow opening of gas component (WIP)

* Merge

* Consistency

* Adjust for Signer display

* Set maximum height based on screen size

* Gas editor displays in-place

* Cleanups

* Merge

* Style fixes

* Fixup stash mishap (again)

* Add store test

* Allow edited values to refrect on the display

* Fix properties

* Adjust styling to show different rows

* git mv

* git mv

* Style fixes

* Style updates

* Pass gas & gasPrice with confirmation

* Fix build (case)

* Style fixes

* Basic GasPriceEditor smoketest

* manual move 1

* manual move 2

* manual move 1

* manual move 2

* NODE_ENV=test ace fix

* UI smoketests

* Style

* Format options via formatter

* Initial version

* Re-add even/odd class

* re-add gasLimit to embedded passing

* style

* Updated for passing gas & price to store

* Allow gas/price overrides when none available

* Fix slider value, pass as number
2016-12-11 17:43:51 +01:00
Jaco Greeff
885d6eaa4d i18n string dictionaries (#3532)
* TabBar & Settings -> Views i18n enabled

* Proxy i18n

* Settings i18n

* defaultLocale

* Introduce thin Translate wrapper

* PropTypes util caters for multiples

* Translate & LanguageSelector under ui

* Update location & proptypes

* Add UI Language selector

* German settings pages

* Add German language selection

* Corrected umlaut encoding

* Lint

* Re-apply pre-merge conflict changes

* better German i18n

* Language names in locale language

* i8n -> index

* Allow for development/production operation

* Use Yahoo react-intl (as opposed to react-i18nify)

* Use default messages wih expansions

* Remove non-reused variable definitions

* Use FormattedMessage directly, opens up WebPack & Babel opportunities

* Add flat to flatten

* Extract default messages via babel

* Webpack to aggegrate i18n defaultMessage

* Re-add react-intl after merge

* Update proptype references (merge)

* Strip down external dictionary

* i18n for dapps

* Restore tests submodule

* Allow language changes to reflect

* Style updates
2016-12-11 17:42:35 +01:00
Nicolas Gotchac
13509a9e83 Fix padding in App, again... (#3813) 2016-12-11 16:49:38 +01:00
Nicolas Gotchac
ba3bfcc54d Merge branch 'master' into ng-ui-fixes 2016-12-11 01:26:55 +01:00
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