Commit Graph

935 Commits

Author SHA1 Message Date
Chi Kei Chan 03685c64b8 Network dropdown update 2017-10-17 22:42:56 -07:00
Chi Kei Chan 085551b7e6 New Account modal 2017-10-17 22:38:07 -07:00
Chi Kei Chan 5ee6e4d3b3 wip 2017-10-17 22:38:00 -07:00
Dan ac43872c1a Enable send-v2 functionality. 2017-10-17 21:10:09 -04:00
Alexander Tseung 7caa914223 Fix Import Account link not hiding sidebar 2017-10-16 01:43:27 -04:00
Dan a9244f5e42 Customize Gas connected to state 2017-10-15 23:09:05 -04:00
Dan Finlay 06094c914b Move etherscan link logic into module 2017-10-14 11:23:44 -04:00
Alexander Tseung 3fd9c8b57f Fix cursor on unclickable transactions (#2356) 2017-10-13 14:14:26 -07:00
Alexander Tseung b149cceda0 Fix exception thrown when tokens is null (#2355) 2017-10-13 13:34:28 -07:00
Alexander Tseung a84014eff8 Fix Localhost 8545 option in network dropdown (#2357) 2017-10-13 13:25:33 -07:00
Alexander Tseung 54a61a4021 Fix styling for Accept buttons in notices (#2358) 2017-10-13 13:24:17 -07:00
Alexander Tseung 222a203353 Fix click to copy for private key not working (#2360) 2017-10-13 13:23:10 -07:00
Dan J Miller 803eaaf968 [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from state (#2364)
* Adds memo field to send-v2.

* Vertical align transaction with flexbox.

* Customize Gas UI

* Remove internal state from InputNumber and fix use in gastooltip.

* Move customize-gas-modal to its own folder and minor cleanup

* Create send container, get account info from state, and make currency display more reusable

* Adjusts send-v2 and container for send-token. Dynamically getting suggested gas prices.
2017-10-13 13:19:22 -07:00
Chi Kei Chan 81f62a7443 Adding Account Dropdown V2 2017-10-13 02:11:01 -04:00
Chi Kei Chan 57179d2b05 Various styling fixes 2017-10-12 18:46:18 -04:00
Dan 7ec77e0b45 Refactor amount input: dynamic input width with vanilla js. 2017-10-12 11:09:05 -07:00
Dan 2898914a54 Send v2 amount unit moves correctly. 2017-10-12 11:09:05 -07:00
Dan ea7926c211 Adds amount and gas field to sendV2. 2017-10-12 11:09:05 -07:00
Dan fbab0f3a1f Send v2 to autocomplete. 2017-10-10 18:19:15 -07:00
Chi Kei Chan d4343fe7e5 Fix recipient on send token 2017-10-10 14:36:13 -07:00
Chi Kei Chan c221f5ce79 Confirm Token and Confirm Contract v2 2017-10-10 14:30:20 -07:00
Chi Kei Chan 119c2b2423 Confirm eth v2 2017-10-10 14:16:57 -07:00
Dan 71d6463984 Refactor 'rendersingleidentity' to a stand alone account-list-item component. 2017-10-09 18:24:14 -07:00
Dan 80463072b5 UI for readonly from component. From dropdown opening and closing. Mockdata. 2017-10-09 18:24:14 -07:00
Dan Finlay f18615a82a Merge pull request #2296 from MetaMask/precision-fix
Fix precision to account for small wei increase.
2017-10-09 14:15:09 -07:00
Dan 49aa6e73ea Edit account modal shows and allows editing of name from props, not just placeholder. 2017-10-08 17:45:59 -07:00
Sergey Ukustov 53bb4bebb1 More appropriate styling 2017-10-07 23:25:40 +03:00
Kevin Serrano e6a618b82d
Fix precision to account for small wei increase. 2017-10-05 15:26:03 -07:00
Dan Finlay c5b7880f05 Merge branch 'master' into SignTypedData 2017-10-05 11:55:23 -07:00
Kevin Serrano 27c72ee565
Revert to normal balances. 2017-10-04 12:10:01 -07:00
Chi Kei Chan bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Dan ac4868170f Enables remove token and ensures add/remove update the list without need for refresh. 2017-10-03 15:46:01 -07:00
Dan 45dbd017e6 Add needed iterator in tx-list and path to account in selectors. 2017-10-02 18:09:45 -07:00
Dan d206f183f5 Hide token confirmation modal ui 2017-10-02 18:09:09 -07:00
kumavis 2113d83489 ui - tx history - simplify error+warning display code 2017-10-02 15:39:44 -07:00
Dan 47ebcbb2ed Token menu ui. 2017-10-01 19:02:21 -07:00
Dan ff64fe98dd Shapeshift deposit tx modal. 2017-10-01 18:58:57 -07:00
Dan 7c4d8c4562 Enables the old shapeshift UI within new ui. 2017-10-01 18:58:57 -07:00
Sergey Ukustov 82d1f39198 Respect code style 2017-09-29 19:53:03 +03:00
Sergey Ukustov c2b8dada91 Add eth_signTypedData handler 2017-09-29 19:40:46 +03:00
Chi Kei Chan 67ee5b21e6 Query for gas estimates 2017-09-28 17:39:53 -07:00
Chi Kei Chan 4f106854ba Hide ShapeShift and Fix Modal Stylings 2017-09-28 16:34:42 -07:00
Chi Kei Chan 06292107d7 Always set currency to USD on app mount 2017-09-28 16:13:53 -07:00
Dan 66ed4dfaa3 Ensure sent token value is recognized as hex. 2017-09-28 15:55:18 -07:00
Dan b55a40c7f1 Close sidebar on token selection. 2017-09-28 15:54:04 -07:00
Dan a4838b1c57 Close mobile sidebar when selecting 'Add token' from account options dropdown. 2017-09-28 15:54:04 -07:00
Chi Kei Chan 5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
Dan deee689426 Use font-awesome icons for create and import account. 2017-09-27 18:08:49 -07:00
Dan c2ccd6e90e Makes styling fixes to account dropdown. 2017-09-27 18:08:49 -07:00
Dan 10345a12c2 Keep privateKey out of state and clear it after closing export private key modal. 2017-09-27 18:06:26 -07:00
Dan 01816e1b22 Adds a back button to export private key modal; connects account details to same modal. 2017-09-27 18:06:26 -07:00
kumavis 15b2823e54 Merge branch 'master' into new-currency-test 2017-09-27 16:04:51 -07:00
Chi Kei Chan c77029ea90 Implement Confirm Deploy Contract screen 2017-09-26 19:21:04 -07:00
Dan 39365f2cc4 Update the correct values in state when estimates are received. 2017-09-26 18:43:26 -07:00
Dan 541b69dda9 Gets gas and price estimates when send components mount. 2017-09-26 18:43:26 -07:00
Kevin Serrano 88ddedfb5a
Account for undefined currencies. 2017-09-26 10:09:50 -07:00
Chi Kei Chan bdd1e58e55 Return null if transaction.key is shapeshift 2017-09-26 09:15:14 -07:00
Dan 7102772c3a Connect export key modal to state and enable actions. 2017-09-26 09:05:29 -07:00
Chi Kei Chan 0d4433ed58 Merge branch 'NewUI-flat' into MM-57-use-gas-estimator 2017-09-25 19:55:56 -07:00
Dan 56697ea9a4 Select all in to and from of send screens, instead of clearing on focus. 2017-09-25 18:30:56 -07:00
Dan eae40e0544 Able to change selections in to and from fields of send and send token. 2017-09-25 18:30:56 -07:00
Dan 2c474b0d6e Export private key modal body ui. 2017-09-25 18:29:43 -07:00
Dan fc3e071ad6 Send token now estimates gas and price. 2017-09-25 22:09:10 -02:30
Dan a1d87b821b Update send token to handle errors onBlur events and prevent clicking send until all errors handled 2017-09-25 21:45:51 -02:30
Dan 171d38c8db Handles errors with to field and renders warnings from backend in send token. 2017-09-25 21:19:30 -02:30
Dan 0eeba3771c Exports private key modal opens from dropdown. 2017-09-23 17:33:50 -07:00
Chi Kei Chan e1077836ce Add Confirm Send token screen 2017-09-22 14:38:17 -07:00
Dan 13f22ff6b0 get identities from getState() instead of passing from caller, only set new account label if label set. 2017-09-22 14:35:51 -07:00
Dan a1d72a59fe New account modal now allows for addition of account name. 2017-09-22 14:35:51 -07:00
Dan e325e5e2f5 Default class params to empty string in readonly-input 2017-09-22 14:23:57 -07:00
Dan 48867d95fe ReadOnlyInput component. 2017-09-22 14:23:57 -07:00
Dan Finlay f9d2f523c6 Merge branch 'master' into AddBalanceController 2017-09-22 14:12:41 -07:00
Dan fe37dd7ecd Open account details modal on buy -> direct deposit. 2017-09-22 12:16:31 -07:00
Chi Kei Chan 83cda2b82e Refactor Confirmation Tx to render different screen 2017-09-21 22:25:16 -07:00
Chi Kei Chan 3ec2f53463 Integrate Add Token 2017-09-21 18:44:52 -07:00
Dan 24fd16b1be Abstract account modal. 2017-09-21 16:45:18 -07:00
Dan 39afbea7aa Confirm screen shows amount plus gas in total field 2017-09-21 16:43:29 -07:00
Dan 97810acb53 Handles errors with to field and renders warnings from backend in send token. 2017-09-21 16:41:52 -07:00
Chi Kei Chan e7f1fc4436 Buy Modal Styling 2017-09-19 18:49:35 -07:00
Chi Kei Chan a67d3ecd46 Merge branch 'master' into NewUI-flat 2017-09-18 18:13:15 -07:00
Kevin Serrano bd8428e9ed
Comply with current currency API and add additional styling. 2017-09-18 16:09:01 -07:00
Chi Kei Chan 190330db92 Merge branch 'master' into NewUI-flat 2017-09-18 11:41:46 -07:00
Chi Kei Chan 162a3827c7 Fix Merge Problems; update yarn lock 2017-09-18 11:34:07 -07:00
Chi Kei Chan 6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
Dan Finlay 545cbbebb9 Merge branch 'master' into fix-tooltip 2017-09-18 11:20:00 -07:00
Dan 54bbf8d859 Handle transaction totals in WEI in tx-list, send and pending. 2017-09-15 16:23:23 -07:00
Dan b0f1fba2e5 Ensures that new accounts are only created from the modal, and not when clicking 'Create New Account' 2017-09-15 16:19:48 -07:00
Dan 095d327140 Adds USD to token list. 2017-09-15 16:16:41 -07:00
Dan ab77142c90 Show dollar sign before USD on account details page. 2017-09-15 16:10:34 -07:00
Chi Kei Chan 93a1089e08 Show token tx properly 2017-09-14 01:09:57 -07:00
Chi Kei Chan d722c1045f Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate 2017-09-13 19:57:33 -07:00
Dan 6bd71d6937 Fix send and pending. 2017-09-13 16:30:39 -07:00
Dan Finlay c17c657693 Merge branch 'master' into AddBalanceController 2017-09-13 15:11:03 -07:00
Dan Finlay 0ba6493175 Use computed balance for tx confirmation 2017-09-13 14:31:48 -07:00
Dan ca46bd200b Stop setting 'currentCurrency' and use local state for active currency in send.js 2017-09-13 14:25:20 -07:00
Dan a5ab91e572 Enables Cancel button in confirmation screen. 2017-09-13 14:24:48 -07:00
Dan 55d62190e3 Fixes the saving of transactions in send and display in tx-list with conversion utility. 2017-09-13 14:22:58 -07:00
Dan 6fa1cd6225 Reapply conversion utility changes and fix calls to utility in pending-tx. 2017-09-13 14:22:30 -07:00
Kevin Serrano a22a2586ab
Haha silly me, only when gas is estimated and not explicit. 2017-09-13 13:24:16 -07:00
Kevin Serrano 6e725b123b
Lower warning threshold for high tx fee to account for fluctuating blockGasLimits 2017-09-13 12:22:08 -07:00
Kevin Serrano 06153dd47d
Add warning of higher failure risk since app proposed gasLimit. 2017-09-13 12:17:42 -07:00
Chi Kei Chan 8f31b05ac5 Add token exchange rates 2017-09-13 01:25:39 -07:00
Chi Kei Chan 8b5f2a95df Improve styling in Confirmation Screen; Show decoded send token data 2017-09-12 23:04:01 -07:00
Chi Kei Chan b64471833f Revert "Overhaul currency conversion utility and update calls to utility in pending-tx."
This reverts commit 080890a46e.
2017-09-12 23:04:01 -07:00
Kevin Serrano 962794d025
fixed position of tooltips to avoid overflow. 2017-09-12 16:15:56 -07:00
Dan 080890a46e Overhaul currency conversion utility and update calls to utility in pending-tx. 2017-09-12 16:05:59 -07:00
Dan J Miller 492507aa94 [NewUI] Color tx-list-item text depending on transaction status. (#2050)
* Color tx-list-item text depending on transaction status.

* Handle css change of text colour with scss instead on inline styles, add classnames package and helper function.

* Refactored to use classnames with component property className.
2017-09-12 14:59:33 -07:00
Chi Kei Chan 7eb6dae418 Added signTokenTx; Adding token confirmation screen 2017-09-12 02:22:23 -07:00
Chi Kei Chan 836bf2e1a3 Add frontend validation to send-token 2017-09-11 23:18:54 -07:00
Dan J Miller 1e83835ba8 [New-UI] Confirm Screen restyle and connect to state (#2042)
* Adds utility for converting currencies (WIP)

* Implements confirm screen

* Style tweaks.

* Confirm screen total ammount now uses real data.

* Confirm screen total ammount now uses real data.

* Replace content divider with sibling css.

* Replace section divider with scss.
2017-09-11 22:19:05 -07:00
Chi Kei Chan 062e67bff8 Add buttons; handle back; add yarn.lock 2017-09-11 22:14:09 -07:00
Dan 8342c20b58 Cleaner css for circle icon. 2017-09-11 19:16:43 -07:00
Dan 6beb1b33bb Replace checkmark with font-awesome equivalent. 2017-09-11 19:16:43 -07:00
Dan 99047e3ef4 Adds title, divider and descriptive text to network dropdown. 2017-09-11 19:16:43 -07:00
Dan 6a3c59e409 Highlighted circle icons for the network menu. 2017-09-11 19:16:43 -07:00
Kevin Serrano 213af0cd6c
Fix typo. 2017-09-11 16:52:35 -07:00
Kevin Serrano aa021b9209
Add some styling. 2017-09-11 16:40:45 -07:00
Kevin Serrano fa1ec5dcd1
Move function as util function. 2017-09-11 16:22:20 -07:00
Kevin Serrano 3a7d4a5d4e
Basic private key download file functionality. 2017-09-11 16:13:28 -07:00
Kevin Serrano 27ba7f6ed3
Show reject all only when tx count is > 1 2017-09-11 14:12:35 -07:00
Kevin Serrano 2e18dd27a4
Merge github.com:MetaMask/metamask-extension into rejectallunapproved 2017-09-11 13:58:46 -07:00
Chi Kei Chan 663cb758b3 Style send token screen 2017-09-11 00:45:06 -07:00
Dan 5a8433b6ce New account modal top right close button working. 2017-09-08 10:56:56 -07:00
Dan ab4005cab8 Tweak styles in new-account-modal. 2017-09-08 10:56:56 -07:00
Kevin Serrano 54fb8e8cef
Add cursor on hover on loading. Change some wording. 2017-09-07 16:26:31 -07:00
Kevin Serrano 8d7f78c1a5
Add caret to indicate network is dropdown. 2017-09-07 16:18:32 -07:00
Kevin Serrano 41e9904d9b
Convert icon to button. 2017-09-07 15:03:25 -07:00
Kevin Serrano 3a87a30912
Fold submit and buy ether into one button slot 2017-09-07 13:55:59 -07:00
Kevin Serrano 69c7fe24b3
Place object property retrieval inside try-catch 2017-09-07 12:17:36 -07:00
Kevin Serrano f0ab4ce52d
Change expected type to array. 2017-09-07 11:51:04 -07:00
Chi Kei Chan ca69fa5d91 Re-enable Contract tx list item 2017-09-07 11:38:21 -07:00
Chi Kei Chan 687d2f755d Fix css merge conflicts 2017-09-07 11:25:31 -07:00
Dan a0ca3fab77 Modify readonly value in for input in qr-code. 2017-09-07 10:26:21 -07:00
Dan c4eb2fb3ea Account-detail address is a readonly input. 2017-09-07 10:26:21 -07:00
Dan 1d5a725ffb Close button in account-details-modal working. 2017-09-07 10:26:21 -07:00
Dan 61b965fe14 Touch up style of account-details-modal. 2017-09-07 10:26:21 -07:00
Dan 7fb1c6836d Modify status copy for status === 'unapproved' 2017-09-07 10:25:56 -07:00
Dan eabbfb8319 Link user from transaction list to etherscan if they have a transaction hash. 2017-09-07 10:25:56 -07:00
Dan 17b5afb8de Create tx-list-item component. 2017-09-07 10:25:56 -07:00
Dan 6d3b3d4203 Show confirm transaction screen when clicking a pending transaction in the list. 2017-09-07 10:25:56 -07:00
Chi Kei Chan 8b919758e5 Send Token screen partial UI 2017-09-07 04:24:03 -07:00
Chi Kei Chan 983fa2a117 Add Contract Tx List Item; Update Token Tx on select 2017-09-07 03:14:53 -07:00
Chi Kei Chan 14b2f3e391 Show token balance and identicon 2017-09-06 23:03:23 -07:00
Chi Kei Chan f1fb9e10a0 Adding Token transaction detail screen 2017-09-06 03:17:49 -07:00
Chi Kei Chan 690ddf5ed7 Fix token list 2017-09-06 00:36:52 -07:00
Chi Kei Chan 06b2a04a42 Implement tokens list UI 2017-09-06 00:36:31 -07:00
Kevin Serrano 3e2bd19881
Merge branch 'master' into readd-loose 2017-09-05 15:48:15 -07:00
Dan Finlay 90272e252f Make eth_sign deprecation warning more useful
Link to descriptive article that demonstrates the new preferred method.
2017-09-05 11:44:26 -07:00
Kevin Serrano e647337a8a
Resolve merge conflict from master 2017-09-05 09:03:44 -07:00
Dan 7d6ad48f15 Touch up transaction list item styles, remove main-content scroll bars, align buttons with main-content.. 2017-09-04 18:46:14 -07:00