Commit Graph

454 Commits

Author SHA1 Message Date
Dan Finlay c42b37a6e7 Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into ModularFiatBalance 2016-09-08 10:57:31 -07:00
Dan Finlay c3dbcb5b02 Fix double tooltip 2016-09-08 10:57:10 -07:00
Dan Finlay d1e91766da Merge branch 'master' into ModularFiatBalance 2016-09-08 10:50:05 -07:00
John Weldon d6619a25e9 Fix typo 2016-09-07 14:44:56 -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 7b1bbb7a19 Show conf screen after send request 2016-09-01 11:30:42 -07:00
Dan Finlay 7f947f8ab2 Skip loading indication from send screen 2016-09-01 11:29:17 -07:00
Dan Finlay a804629606 Show custom rpc menu item always 2016-08-29 12:36:47 -07:00
Dan Finlay 62179a37f7 Fix spelling error 2016-08-26 15:08:02 -07:00
Frankie ae33586660 make the back button its own function 2016-08-26 11:30:07 -07:00
Frankie 547894ed39 Merge branch 'master' into i#563forgotPassword 2016-08-25 16:06:54 -07:00
Frankie 250cf8cc23 Change style on back button to be more like the rest of the app 2016-08-25 16:05:44 -07:00
Dan Finlay 8b81009a30 Merge branch 'master' into PopupNotifications 2016-08-25 15:42:35 -07:00
Dan Finlay a8e40ffe7a Persist shapeshift form input values 2016-08-25 14:19:09 -07:00
Frankie 11c6c63d76 Merge branch 'master' into i#563forgotPassword 2016-08-25 14:17:29 -07:00
Frankie 483a7fee0a Add a back button on lock screen to go back to init menu 2016-08-25 14:13:32 -07:00
Dan Finlay b39bd5333b Persist send tx form field values 2016-08-25 14:10:07 -07:00
Dan Finlay d81bde9f6c Make restore vault form persist 2016-08-25 12:18:04 -07:00
Dan Finlay 793ad6b8d8 Merge branch 'master' into PopupNotifications 2016-08-24 16:59:22 -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
Dan Finlay 4f78ae56b2 Fix empty sign message bug 2016-08-24 15:40:40 -07:00
Dan Finlay bc43e3d140 Merge branch 'master' into PopupNotifications 2016-08-23 16:02:06 -07:00
Dan Finlay 65f7656487 Linted 2016-08-23 15:48:16 -07:00
Dan Finlay 671ca33abb Close notification on opening main UI 2016-08-23 15:44:50 -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 4fb49dfb4b Close popup even if last tx is dismissed from main UI 2016-08-23 11:40:08 -07:00
Dan Finlay 49ab51d825 Merge branch 'master' into PopupNotifications 2016-08-22 20:06:59 -07:00
Dan Finlay 5d24621b56 More linting 2016-08-22 17:37:16 -07:00
Dan Finlay a9b53530b6 Fix back button hiding on popup 2016-08-22 17:29:47 -07:00
Dan Finlay 17f3f90d80 Linted 2016-08-22 17:21:54 -07:00
Dan Finlay 6e1000f361 Merge branch 'master' into PopupNotifications 2016-08-22 15:03:36 -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