39c824f2f3
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits
2017-02-28 14:16:27 -08:00
e07e4b7bc7
Linted
2017-02-28 14:13:58 -08:00
486583e203
lint
2017-02-28 14:12:50 -08:00
157dd994f0
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits
2017-02-28 14:09:00 -08:00
da88481560
Remove gasMultiplier txMeta param
...
This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic.
Removed it and the logic that referred to this now-outdated parameter.
2017-02-28 14:08:00 -08:00
acfb6ff0f8
Hide gas options behind an advanced options checkbox.
2017-02-28 14:07:19 -08:00
61a19a028b
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits
2017-02-28 11:37:05 -08:00
45138af6c6
Fix infinite loop bug
2017-02-28 11:36:01 -08:00
666044d417
Add margins to align.
2017-02-28 10:23:47 -08:00
0e817c9e7f
Reorder rows for better table logic
2017-02-27 18:36:43 -08:00
3ddfdfff98
Emit updated tx values on accept click
2017-02-27 18:33:33 -08:00
2e80e8f722
Remove unused function
2017-02-27 18:26:18 -08:00
4370ca0cef
Got gas live re-estimating
2017-02-27 18:19:05 -08:00
2b0e939abd
Align input fields for gas.
2017-02-27 16:55:58 -08:00
98e80e6740
Fix merge conflicts.
2017-02-27 16:35:25 -08:00
5d1a4db5e5
Further styling to get hex component working. Fix some typos.
2017-02-27 16:33:58 -08:00
c4e9354575
Linted
2017-02-27 16:09:46 -08:00
57fec36a7d
Add non-working gas recalculating logic to tx-details view
2017-02-27 16:06:28 -08:00
9e6e3f55b7
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits
2017-02-27 13:54:07 -08:00
a77a5f0ab3
Move input boxes into table and into details component.
2017-02-27 13:53:43 -08:00
462c7ae213
Merge branch 'master' into i765-gaslimits
2017-02-27 12:59:19 -08:00
dfc89d6c6d
Make gasPrice accessible to the UI.
2017-02-24 15:06:55 -08:00
42c2c3df37
Improve pending tx blue dot style
2017-02-23 17:45:37 -08:00
961a83769b
Fix cancel msg signing behavior.
2017-02-23 16:02:58 -08:00
1d1d296a1e
Make personal sign view look nice
2017-02-23 14:40:18 -08:00
4697aca02c
Got personal_sign working
...
Also fixed bug where signing would not close popup.
2017-02-23 14:23:45 -08:00
30e4bdf24b
Merge github.com:MetaMask/metamask-plugin into i765-gaslimits
2017-02-23 14:17:52 -08:00
7ec25526b7
Add alternate UI for pending personal_sign messages
2017-02-23 11:18:49 -08:00
564f920ae0
Add personal sign actions and template
2017-02-22 16:30:09 -08:00
e54b73679c
Notices must be scrolled down to proceed from.
2017-02-20 14:58:24 -08:00
415b9b245c
Fix typo.
2017-02-20 12:59:31 -08:00
6b56d6ba98
Broke hex decimal input into its own component
...
Also added a new state to try to make UI dev mode work again, but it has other issues, like #1128 , that need to be addressed before UI dev mode can be used again.
2017-02-17 12:46:08 -08:00
89af0ef408
Change state to props, add modifiable fields.
2017-02-17 12:08:54 -08:00
3fe8e2b659
Merge branch 'master' into i1089-networkfront
2017-02-15 15:44:14 -08:00
fbabcf6191
Change networks from lock screen.
2017-02-15 15:35:56 -08:00
de6455151e
Revert old style message sighing
2017-02-09 17:32:49 -08:00
ce0c3ed03c
Merge branch 'dev' into messageManagerCleanUp
2017-02-01 12:03:42 -08:00
f9b31fe2c3
rename selectedAccount to selectedAddress
2017-01-30 15:08:31 -08:00
8be68575bb
Clean up message manger includes:
...
Provider egine bump
Remove presence of message manger in keyring controller
Change the status wording fom conf to approved
make Message manager a class
fix messages not being apart of the badge
re write message manger to better reflect controller pattern
2017-01-28 20:28:20 -08:00
9f1884145a
Merge branch 'dev' into i715-AddJsonImport
2017-01-18 17:24:12 -08:00
5d8a3dd99b
Add ability to import v3 JSON wallets
...
There is now a menu item labeled "JSON File" for importing, and it can digest either:
- v1 MyEtherWallet JSON files
- v3 Account files (used by Geth, Mist, and MyEtherWallet).
Fixes #715
2017-01-18 16:45:39 -08:00
0e01abdf71
Merge branch 'master' into Version-3.1.0
2017-01-18 12:25:35 -08:00
e3650b336a
Merge branch 'master' into fixSignedVsSubmitted
2017-01-18 11:30:41 -08:00
460cbb985f
Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block
2017-01-18 11:24:53 -08:00
958cbfbde4
Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu
2017-01-17 13:58:54 -08:00
5dd5619e5d
Merge branch 'master' into dev
2017-01-16 10:55:32 -08:00
5ed52eed68
Clean up code
2017-01-13 10:44:22 -08:00
34081c8cb2
Fix sorting and instances where something could be undefined
2017-01-11 17:02:57 -08:00
576e2ad64d
Fix wording and icon of failed txs
2017-01-11 15:44:21 -08:00
0fae263a9a
Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions
2017-01-11 12:16:37 -08:00
Dan Finlay
Kevin Serrano
Frankie
kumavis
Dan Finlay