1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 21:00:13 +01:00
Commit Graph

474 Commits

Author SHA1 Message Date
Dan Finlay
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
Kevin Serrano
acfb6ff0f8
Hide gas options behind an advanced options checkbox. 2017-02-28 14:07:19 -08:00
Kevin Serrano
61a19a028b
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-28 11:37:05 -08:00
Dan Finlay
45138af6c6 Fix infinite loop bug 2017-02-28 11:36:01 -08:00
Kevin Serrano
666044d417
Add margins to align. 2017-02-28 10:23:47 -08:00
Dan Finlay
0e817c9e7f Reorder rows for better table logic 2017-02-27 18:36:43 -08:00
Dan Finlay
3ddfdfff98 Emit updated tx values on accept click 2017-02-27 18:33:33 -08:00
Dan Finlay
2e80e8f722 Remove unused function 2017-02-27 18:26:18 -08:00
Dan Finlay
4370ca0cef Got gas live re-estimating 2017-02-27 18:19:05 -08:00
Kevin Serrano
2b0e939abd
Align input fields for gas. 2017-02-27 16:55:58 -08:00
Kevin Serrano
98e80e6740
Fix merge conflicts. 2017-02-27 16:35:25 -08:00
Kevin Serrano
5d1a4db5e5
Further styling to get hex component working. Fix some typos. 2017-02-27 16:33:58 -08:00
Dan Finlay
c4e9354575 Linted 2017-02-27 16:09:46 -08:00
Dan Finlay
57fec36a7d Add non-working gas recalculating logic to tx-details view 2017-02-27 16:06:28 -08:00
Kevin Serrano
9e6e3f55b7
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-27 13:54:07 -08:00
Kevin Serrano
a77a5f0ab3
Move input boxes into table and into details component. 2017-02-27 13:53:43 -08:00
Dan Finlay
462c7ae213 Merge branch 'master' into i765-gaslimits 2017-02-27 12:59:19 -08:00
Kevin Serrano
dfc89d6c6d
Make gasPrice accessible to the UI. 2017-02-24 15:06:55 -08:00
Dan Finlay
42c2c3df37 Improve pending tx blue dot style 2017-02-23 17:45:37 -08:00
Dan Finlay
961a83769b Fix cancel msg signing behavior. 2017-02-23 16:02:58 -08:00
Dan Finlay
1d1d296a1e Make personal sign view look nice 2017-02-23 14:40:18 -08:00
Dan Finlay
4697aca02c Got personal_sign working
Also fixed bug where signing would not close popup.
2017-02-23 14:23:45 -08:00
Kevin Serrano
30e4bdf24b
Merge github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-23 14:17:52 -08:00
Dan Finlay
7ec25526b7 Add alternate UI for pending personal_sign messages 2017-02-23 11:18:49 -08:00
Dan Finlay
564f920ae0 Add personal sign actions and template 2017-02-22 16:30:09 -08:00
Kevin Serrano
e54b73679c
Notices must be scrolled down to proceed from. 2017-02-20 14:58:24 -08:00
Kevin Serrano
415b9b245c
Fix typo. 2017-02-20 12:59:31 -08:00
Dan Finlay
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
Kevin Serrano
89af0ef408
Change state to props, add modifiable fields. 2017-02-17 12:08:54 -08:00
Kevin Serrano
3fe8e2b659 Merge branch 'master' into i1089-networkfront 2017-02-15 15:44:14 -08:00
Kevin Serrano
fbabcf6191
Change networks from lock screen. 2017-02-15 15:35:56 -08:00
Frankie
de6455151e Revert old style message sighing 2017-02-09 17:32:49 -08:00
Frankie
ce0c3ed03c Merge branch 'dev' into messageManagerCleanUp 2017-02-01 12:03:42 -08:00
kumavis
f9b31fe2c3 rename selectedAccount to selectedAddress 2017-01-30 15:08:31 -08:00
Frankie
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
Dan Finlay
9f1884145a Merge branch 'dev' into i715-AddJsonImport 2017-01-18 17:24:12 -08:00
Dan Finlay
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
Dan Finlay
0e01abdf71 Merge branch 'master' into Version-3.1.0 2017-01-18 12:25:35 -08:00
Frankie
e3650b336a Merge branch 'master' into fixSignedVsSubmitted 2017-01-18 11:30:41 -08:00
Frankie
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
Dan Finlay
958cbfbde4 Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu 2017-01-17 13:58:54 -08:00
Dan Finlay
5dd5619e5d Merge branch 'master' into dev 2017-01-16 10:55:32 -08:00
Frankie
5ed52eed68 Clean up code 2017-01-13 10:44:22 -08:00
Frankie
34081c8cb2 Fix sorting and instances where something could be undefined 2017-01-11 17:02:57 -08:00
Frankie
576e2ad64d Fix wording and icon of failed txs 2017-01-11 15:44:21 -08:00
Frankie
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
Frankie
29060acb72 update coinbase info and view 2017-01-10 12:18:39 -08:00
Kevin Serrano
b8d312f8b9
Linting. 2017-01-04 15:04:51 -08:00
Kevin Serrano
a8a37e4d40
Make network somewhat more modular, add new network indicator. 2017-01-04 14:30:14 -08:00
Dan Finlay
2dbbc0dce7 Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager 2017-01-02 17:32:51 -08:00
Dan Finlay
c05e04c611 Fix rendering of loose accounts 2016-12-23 17:23:33 -08:00
Frankie
fa3e708f34 Merge branch 'dev' into TxManager 2016-12-23 12:48:36 -08:00
Frankie
6f7c23fd28 Merge branch 'dev' into TxManager 2016-12-21 14:31:07 -08:00
Frances Pangilinan
6e78494846 First pass at revision requests 2016-12-21 13:41:32 -08:00
Dan Finlay
11c1004a41 Linted 2016-12-20 16:07:24 -08:00
Frances Pangilinan
4910e2f9bd remove network Id 2 from explorer link and Add network Id 3 2016-12-20 13:49:22 -08:00
Dan Finlay
77d2deb176 Merged master into dev 2016-12-19 13:37:27 -08:00
Dan Finlay
6d13ef691f Revert "Interface enhancements" 2016-12-16 10:04:57 -08:00
Dan Finlay
83880a5c92 Remove morden testnet provider
Instances configured to point at Morden will now point at Ropsten.
2016-12-15 16:12:03 -08:00
Luis Iván Cuende
4a8bc63c8d
Better account details view 2016-12-14 10:03:56 -08:00
Luis Iván Cuende
c65db9290d
Better editable label 2016-12-14 09:38:20 -08:00
Dan Finlay
85d5b12f8d Fix tx adding code
Broken in this commit:
bc39cd7b89

Synchronous methods were added to an `async.waterfall` array.

This commit also removes the delegate call checking, since we concluded it was misinformed.
2016-11-29 12:46:08 -08:00
Dan Finlay
b899119582 Merge branch 'master' into dev 2016-11-23 16:54:27 -08:00
Kevin Serrano
8261cf232d
Merge branch 'dev' into dev-cleanup 2016-11-22 10:50:15 -08:00
Kevin Serrano
17669e4af8
Make ropsten faucet button point at the correct url. 2016-11-22 10:20:59 -08:00
Kevin Serrano
8d2afccdc0
Ropsten has sole access to the faucet. 2016-11-22 10:13:57 -08:00
Kevin Serrano
88ed1f191f
Add to changelog. 2016-11-22 09:45:28 -08:00
Kevin Serrano
f5b0795ac5
change all instances of selectedAddress to selectedAccount. 2016-11-21 16:21:16 -08:00
Dan Finlay
7ab9d40820 Merge branch 'dev' into i831-AddRopsten-Dev 2016-11-21 11:03:32 -08:00
Dan Finlay
e8a8302624 Begin adding Ropsten support
Ropsten links will still not work until Etherscan publishes their ropsten link format.

At that time we will need to update ui/lib/account-link.js

Otherwise, fixes #831
2016-11-21 10:58:49 -08:00
Kevin Serrano
0c23925c23
Fix lint rules for ternary operator placement. 2016-11-11 15:37:22 -08:00
Kevin Serrano
23263bec7d
Linting to the max. 2016-11-11 10:26:12 -08:00
kumavis
c664b8f11e Merge branch 'master' into i328-MultiVault 2016-11-11 03:18:33 -05:00
Frankie
b60992b446 Fix funny looking errors in conf-tx 2016-11-10 22:13:30 -08:00
kumavis
e123e3095b Merge branch 'master' into i328-MultiVault 2016-11-11 01:01:06 -05:00
kumavis
536cab0687 detect tx error - show warning and fix gasLimit 2016-11-10 21:19:34 -08:00
Frankie
f665b779cb Merge branch 'master' into i328-MultiVault 2016-11-10 16:53:47 -08:00
Kevin G. Serrano
7b3f1ecc41
Unify warning functions. 2016-11-07 16:02:02 -08:00
Dan Finlay
bc623bbe34 Linted 2016-11-04 12:32:47 -07:00
Dan Finlay
1af0d609bd Convert buy subview to new tab bar component 2016-11-04 12:02:00 -07:00
Dan Finlay
1bbe0ed9e8 Scaffold new account view 2016-11-04 12:01:41 -07:00
Dan Finlay
f2bfdd7f8c Make identicon tolerant of changing state 2016-11-01 17:06:18 -07:00
Kevin Serrano
25c46a1636
Make case condition more consistent. Remove extra action. Fix incorrect display of network. 2016-10-30 16:01:12 -07:00
Kevin Serrano
9b4f3825e7
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-10-28 16:19:14 -07:00
Dan Finlay
ed3814bff8 Fix identicon rendering 2016-10-27 16:16:28 -07:00
Dan Finlay
b1fb8da3b0 Fix provider menu selection indication 2016-10-25 14:16:04 -07:00
Frankie
aace26c4bd Create callback and Clean-up details 2016-10-13 16:53:32 -07:00
Frankie
67eba9f542 Specify base 10 in bignumber 2016-10-13 16:04:23 -07:00
Frankie
c400f7c0f6 Fix gasPrice range 2016-10-13 15:10:29 -07:00
Frankie
3a610f2c06 Merge branch 'master' into i#495CustomGasField 2016-10-10 18:18:07 -07:00
Frankie
e1b78da3e6 Add custom gas field to send page 2016-10-10 18:17:56 -07:00
Dan Finlay
769bd8e2ee Removed hex prefix from private key export
For compatibility with Jaxx, MEW, and Geth.

Fixes #687
2016-10-04 13:26:51 -07:00
Dan Finlay
1f771f30e4 Space out purchase details on ShapeShift form 2016-09-15 21:18:21 -07:00
Dan Finlay
ed51b91b4a Merge branch 'master' into i675-LoadingBuy 2016-09-15 21:05:24 -07:00
Dan Finlay
4eef2c57cf Show loading indication when selecting ShapeShift 2016-09-15 20:58:18 -07:00
Frankie
77ef71448d Fix CHANGELOG.md and restructure onClick events 2016-09-15 19:35:04 -07:00
Frankie
3682a2a1f9 linting 2016-09-15 18:25:05 -07:00
Frankie
dcda841f4d Merge branch 'master' into tx-viz 2016-09-15 18:16:41 -07:00
Frankie
9c982a4bd6 add tx-viz link to transaction history 2016-09-15 18:13:13 -07:00
Frankie
cf484d735f Clean up some of the code 2016-09-15 14:31:45 -07:00
kumavis
1325990726 css - smaller balance warning 2016-09-15 13:04:09 -07:00
kumavis
f0d83813d6 confTx - add insufficient balance warning message 2016-09-15 12:56:40 -07:00
kumavis
5005fc143b confTx - show disabled accept btn + add colors 2016-09-15 12:42:35 -07:00
Frankie
ef0b535d94 Drop the buy button in the confTx view if account does not have enough eth 2016-09-15 10:24:05 -07:00
Frankie
19c1b1fd8e Merge branch 'master' into qrCode 2016-09-13 12:18:19 -07:00
kumavis
f7794d9949 PendingTxDetails - partially remove imagify support 2016-09-13 10:18:57 -07:00
Frankie
218f380d87 Add qrcode-npm to package.json and swap out Qr Code generator api for node-module 2016-09-12 17:27:14 -07:00
Frankie
c37c050c8a Revert "Add new eth-lightwallet salting to vault." 2016-09-12 10:34:06 -07:00
Dan Finlay
6d6130e2a6 Camelcase dataset key for react 2016-09-10 11:23:11 -07:00
Dan Finlay
a4e4c85453 Fix fox logo password following
The new lightweight svg logo was not following text quite right.

The new `lookAt` method was not using the same logic the module was using internally on mouse movement.

I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like.
2016-09-08 20:31:42 -07:00
Dan Finlay
6c05c221cd Fix new logo related errors
Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method.

Also tuned up the logo to more closely resemble the old behavior.
- Overlaps the title text
- Points nose at cursor, not just front of eyes
- Cursor is more "distant" from fox, to avoid extreme angles on edges.
2016-09-08 15:41:21 -07:00
Dan Finlay
762bf2f48a Merge branch 'master' into AddNewLogo 2016-09-08 12:49:57 -07:00
Dan Finlay
20ae4c2689 Fix logo usage for metamask-logo v2.0.0
- No longer need to check for webGL compliance (svg rendered!)
- logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element.

Otherwise, worked with very little effort!!

Fixes #624
2016-09-08 11:22:04 -07:00
Dan Finlay
ab3b409438 Restore broken variable reference 2016-09-08 11:03:47 -07:00
Dan Finlay
c3dbcb5b02 Fix double tooltip 2016-09-08 10:57:10 -07:00
Dan Finlay
2ca58f5bf7 Merge branch 'master' into ModularFiatBalance 2016-09-06 19:36:40 -07:00
Dan Finlay
0186e05a0d Linted 2016-09-06 17:30:38 -07:00
Dan Finlay
1537e3f5da Add fiat balances to tx conf view 2016-09-06 17:28:25 -07:00
Dan Finlay
c46de79c10 Got basic fiat display modularized 2016-09-06 17:08:56 -07:00
Dan Finlay
90638f95c0 Fix fiat-value 2016-09-06 16:55:52 -07:00
Dan Finlay
09dd854a96 Nearly finished factoring fiat value into eth-balance 2016-09-06 16:45:06 -07:00
Kevin Serrano
f4e131da0a Fix capitalization. 2016-09-06 11:04:54 -07:00
Kevin Serrano
f213ca695c Fix typos and refine wording. 2016-09-06 10:03:10 -07:00
Dan Finlay
b2ebb6032d Continuing fiat balance modularization 2016-09-03 14:20:27 -07:00
Dan Finlay
62179a37f7 Fix spelling error 2016-08-26 15:08:02 -07:00
Dan Finlay
a8e40ffe7a Persist shapeshift form input values 2016-08-25 14:19:09 -07:00
Dan Finlay
8c06463e80 Linted 2016-08-24 15:46:31 -07:00
Dan Finlay
44ff75c7e1 Improve msg signing padding 2016-08-24 15:43:00 -07:00
Kevin Serrano
4bceda37a8 Merge branch 'master' into fox-sub 2016-08-23 14:51:09 -07:00
Kevin Serrano
6363a80b49 Linting. 2016-08-23 14:32:12 -07:00
Kevin Serrano
5168232481 Created option to pass in static file for fallback for logo. 2016-08-23 14:11:25 -07:00
Dan Finlay
5d24621b56 More linting 2016-08-22 17:37:16 -07:00
Dan Finlay
17f3f90d80 Linted 2016-08-22 17:21:54 -07:00
Dan Finlay
f57cbe59fc Removed view more button, added account info button.
Also:
- Also fixed bug that caused React warning when rendering the tx history.
- Renamed 'Transactions' to 'History', since it now has more than that.
2016-08-22 14:36:21 -07:00
Dan Finlay
3d451ddf3e Merge branch 'master' into i390-TransactionLimit 2016-08-22 11:59:08 -07:00
Kevin Serrano
cec88cc9ac Merge branch 'master' into fox-sub 2016-08-22 11:58:59 -07:00
Frankie
edfb0eb968 Fix issue where if given a balance that does not need to be parsed will not be parsed 2016-08-19 17:18:11 -07:00
Kevin Serrano
7a466697d3 Modify logic for component update. 2016-08-19 16:59:04 -07:00
Kevin Serrano
43e28788d7 Create replacement logo for non-webgl 2016-08-19 14:47:49 -07:00
Dan Finlay
8592ffd855 Merge branch 'master' into i390-TransactionLimit 2016-08-19 07:57:35 -07:00
Dan Finlay
9cd85aea2f Merge branch 'master' into shapeshiftTx 2016-08-19 07:50:57 -07:00
Frankie
e3e5538ddc Remove "+" from shapeshift tx and change wording in CHANGELOG 2016-08-18 20:24:17 -07:00
Dan Finlay
fe5fff3248 Change 'View More' to 'Show More' 2016-08-18 17:47:42 -07:00
Frankie
98dab0ffd2 Make ballance teal for shapeshift tx and add to change log 2016-08-18 16:30:13 -07:00
Dan Finlay
4f857e297b Linted 2016-08-18 16:27:25 -07:00
Dan Finlay
bd9d89826c Added view more button to transaction list
Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.
2016-08-18 16:23:12 -07:00
Kevin Serrano
4cebf12bb5 Fix rounding issues. 2016-08-18 15:59:37 -07:00
Frankie
3525dc0801 Create a ShapeShift tx in tx History 2016-08-18 15:20:26 -07:00
Frankie
23aeb1c5c1 Add api Public key 2016-08-18 12:20:24 -07:00
Frankie
efa61f2cf8 Merge branch 'master' into shapeshiftTx 2016-08-18 11:06:32 -07:00
Frankie
752d16f6c0 WIP: ShapeShift tx 2016-08-18 11:04:28 -07:00
Kevin Serrano
666f3cd66c Added compliance for tests and properly accounts for N/A conversions. 2016-08-16 15:11:40 -07:00
Kevin Serrano
121af0c4b9 Lint. 2016-08-16 14:51:55 -07:00
Kevin Serrano
5afaebe602 Remove logs. 2016-08-16 14:49:53 -07:00
Kevin Serrano
0b052e94cc Hide conversions when API fails. 2016-08-16 14:49:21 -07:00
Kevin Serrano
6041ba1ed2 Add fallback to API failure. 2016-08-16 14:07:06 -07:00
Kevin Serrano
7d1b2db87e linting and ignoring. 2016-08-16 10:48:31 -07:00
Kevin Serrano
009784c79b Divided eth components for tx and account detail. 2016-08-16 10:34:29 -07:00
Kevin Serrano
6895d330ff Merge master. 2016-08-15 10:50:53 -07:00
Frankie
2ef4cbaa89 Add margin to "go to test faucet" button and show more of the address on qr code page 2016-08-14 21:41:08 -07:00
Dan Finlay
e826eb932c Remove ethereum classic provider
Fixes #542
2016-08-14 18:41:05 -07:00
Frankie
99a788a6f0 Add multi message capability to Qr view for market info 2016-08-12 17:43:24 -07:00
Frankie
b72c00a6c1 Add a to test faucet button 2016-08-12 16:12:40 -07:00
Frankie
632465b213 Merge branch 'master' into buyForm 2016-08-12 15:47:03 -07:00
Frankie
b4c9a52259 Change buy forms so that they are their own view and add Qr-code 2016-08-12 15:41:59 -07:00
Dan Finlay
20cfd1c9f3 Add network indicator class to loading image 2016-08-11 19:44:41 -07:00
Frankie
2fc26fb264 Even out some of the margins 2016-08-10 18:53:11 -07:00
Frankie
c8b2826441 Fix typo for copyButton 2016-08-10 15:07:10 -07:00
Frankie
ba1edc429b Merge branch 'master' into buyForm 2016-08-10 13:48:34 -07:00
Frankie
9c6dd9ef49 Create "buy form" add shape shift 2016-08-10 13:43:01 -07:00
Kevin Serrano
637d3978b7 Fix default value. Add loading indication for async. 2016-08-09 16:33:58 -07:00
Kevin Serrano
260de6532c Get fiat numbers rendering on tooltip. Need to find way to create line breaks. 2016-08-05 12:18:44 -07:00
Dan Finlay
c7691b7e64 Fix reference in drop menu item 2016-07-29 12:22:39 -07:00
Dan Finlay
8a4d8eca64 Fix network name reference
When adding the classic network to the menu, I left a reference to a property that is not always existent, so we needed a fallback for it.
2016-07-29 12:19:15 -07:00
Dan Finlay
9b43ec2278 Add eth classic to provider menu 2016-07-28 10:53:51 -07:00
Dan Finlay
6658bea8d4 Implement some cross-browser practices (#473)
* Add mozilla plugin key to manifest

* Move all chrome references into platform-checking module

Addresses #453

* Add chrome global back to linter blacklist

* Add tests
2016-07-21 10:45:32 -07:00
Dan Finlay
c4812b3452 Triage a strange undefined balance error 2016-07-15 17:47:58 -07:00
kumavis
97e38b4983 new tx - calculate estimatedGas and show thing in tx-details (#441)
* new tx - calculate estimatedGas and show thing in tx-details

* Bump changelog
2016-07-13 23:39:44 -07:00
Frankie
dbc9008295 Fix eth balance tooltip to show 6 decimals (#440)
* Fix tooltip to show to the 6 decimal place on balances ovr 0...

* Change font size for balance component in tx-list so it fits the notation

* Add to change log

* Linting

* change log
2016-07-13 15:46:36 -07:00
Dan Finlay
57da5a8198 Merge branch 'master' into FixSvgIcons 2016-07-11 20:55:58 -07:00
Dan Finlay
e21a48da83 Linted 2016-07-11 20:53:26 -07:00
Kevin Serrano
d7e6b752a3 Integrate changes back into eth-balance 2016-07-11 17:44:00 -07:00
Kevin Serrano
6a61591dad Move shorten balance to util. Add as property of generateBalance object output. 2016-07-11 16:31:12 -07:00
Dan Finlay
66e079f1c7 Fix imageification of recipient 2016-07-11 15:49:13 -07:00
Kevin Serrano
40d2b7fe71 lint 2016-07-08 17:39:15 -07:00
Kevin Serrano
20bfb60fd2 Implement alternate shortening scheme. 2016-07-08 17:27:13 -07:00
kumavis
58ee3e1227 Merge branch 'master' of github.com:MetaMask/metamask-plugin into ui-fixth-width-tx-history 2016-07-07 17:39:48 -07:00
kumavis
d2eab80e09 eth-balance fix 2016-07-07 17:34:30 -07:00
kumavis
501ffba6f2 lint - dingle dangle comma tangle 2016-07-07 17:00:24 -07:00
kumavis
03430e8473 Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle 2016-07-07 16:56:20 -07:00
kumavis
7dc67a9257 notif - add support for forward carrat 2016-07-07 16:54:35 -07:00
Kevin Serrano
86b7cc6637 Resolve merge conflict. 2016-07-07 16:33:06 -07:00
Kevin Serrano
9a9c1f2cd4 Pass the linters. 2016-07-07 16:30:52 -07:00
Kevin Serrano
5343404d0d Add new component for tx-history to avoid messing with other styles. Add fixed width specifically to this style. 2016-07-07 16:27:37 -07:00
Kevin Serrano
570d560932 Modified test views again. Added fixed length to center tx information. 2016-07-07 15:39:19 -07:00
kumavis
11fd281a33 ui - remove doubled eth-balance 2016-07-07 15:29:46 -07:00
Dan Finlay
33150cc721 Fixed eth_balance style, completing partial merge 2016-07-07 15:22:10 -07:00
kumavis
ac808e681f Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle 2016-07-07 15:04:53 -07:00
Kevin Serrano
ecb0f9767b Add new test state with tx history. Fix alignment issue with transaction history text. 2016-07-07 13:48:52 -07:00
kumavis
f71956b2ab lint fix 2016-07-07 13:45:06 -07:00