104 Commits

Author	SHA1	Message	Date
Alexander Tseung	ffda954add	Fix styling of the app spinner	2018-04-30 18:58:37 -07:00
bitpshr	7129d7c0f3	Require loglevel singleton in each module that uses it	2018-04-13 17:56:28 -04:00
Alexander Tseung	bf38aa6f1d	Fix transaction confirmations	2018-04-03 16:59:32 -07:00
Alexander Tseung	35875863d2	Fix merge conflicts. Modify send workflow	2018-04-03 01:03:31 -07:00
Alexander Tseung	516c1869b0	Fix lint errors	2018-04-02 16:24:37 -07:00
Alexander Tseung	ba23843f91	Fix merge conflicts	2018-03-30 16:18:48 -07:00
Alexander Tseung	bdc4a6964a	Fix merge conflicts. Refactor renderPrimary into Home component	2018-03-30 15:07:00 -07:00
Alexander Tseung	ef61ef2ce8	Fix i18n merge conflicts	2018-03-29 09:37:29 -07:00
Dan	0a711f0de0	Removes t from props via metamask-connect and instead places it on context via a provider.	2018-03-29 12:42:38 -02:30
Alexander Tseung	6f367a5a6b	Fix merge conflicts	2018-03-27 00:20:35 -07:00
kumavis	29cc2f8ab9	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-20 13:01:08 -07:00
Dan	3830f49ac5	Take user home if an unapproved tx is dropped while they are viewing.	2018-03-20 15:52:45 -02:30
Dan	5fe0be722b	Handle i18n with redux.	2018-03-15 21:59:45 -02:30
Dan	f38675c9ac	Checks if there is currently a send in progress before redirecting to default in conf-tx	2018-01-31 18:26:26 -08:00
Alexander Tseung	4f1fe1da62	Fix merge conflicts from uat-next	2018-01-31 18:24:20 -08:00
Thomas Huang	a9ecf9c6fc	Merge branch 'master' into uat	2018-01-23 10:55:21 -08:00
frankiebee	8bb57f33b1	add a x close button to gas calc loding screen on conf-tx	2018-01-17 18:47:56 -08:00
frankiebee	d5c311b13e	add a loading spinner to conf-tx view	2018-01-14 13:56:54 -08:00
Alexander Tseung	5d1187c37b	Add route for signature request	2017-12-14 14:11:23 -08:00
Alexander Tseung	e226b10a89	Add react-router to allow use of the browser back button	2017-12-14 12:50:20 -08:00
Dan	56e9f98bd0	More lint fixes	2017-11-02 09:45:59 -02:30
Dan	5a94775b3f	Lint fixes for NewUI-flat.	2017-11-02 00:00:33 -02:30
Dan	ddf11011c9	Signature request fixes.	2017-10-25 17:40:48 -07:00
Dan	78836b0ead	Signature Request	2017-10-25 12:40:16 -07:00
Alexander Tseung	5a93ec0252	Fix loading animation not showing on network change	2017-10-19 21:06:14 -07:00
Chi Kei Chan	c8c773d641	Merge branch 'NewUI-flat' into merge	2017-10-18 22:58:46 -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	5a1d50cd43	Merge branch 'master' into mmn	2017-09-27 22:32:07 -07:00
Chi Kei Chan	6c5865d564	Merge branch 'master' into nm	2017-09-18 11:28:10 -07:00
Dan	5c86194c0a	Show loading on conf-tx until the pending tx is available.	2017-09-14 15:45:18 -07:00
Dan Finlay	a01921758b	Add computed balance to account detail view	2017-09-13 15:06:04 -07:00
Dan Finlay	0ba6493175	Use computed balance for tx confirmation	2017-09-13 14:31:48 -07:00
Kevin Serrano	27ba7f6ed3	Show reject all only when tx count is > 1	2017-09-11 14:12:35 -07:00
Kevin Serrano	41e9904d9b	Convert icon to button.	2017-09-07 15:03:25 -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
Dan	e7b3ef0708	Lint fixes	2017-08-31 04:16:07 -07:00
DavidNinja	399c51c048	cancel all txs	2017-08-14 21:29:21 -07:00
sdtsui	65327dd11f	Cleanup unnecessary pending tx-switching logic	2017-07-29 22:17:56 -07:00
Dan Finlay	0ea6749dbc	Lots of flex rearrangement on account detail view ... Includes removal of ReactCssTransitionGroup for a simpler UI refactor.	2017-07-25 18:25:56 -07:00
Dan Finlay	38dccab12e	Fix reference	2017-07-20 12:54:08 -07:00
Dan Finlay	86d367957f	Move responsive ui into its own folder for easier merges	2017-07-20 12:38:38 -07:00
Dan Finlay	5eb3d5d485	Make folder for responsive UI	2017-07-03 15:39:25 -07:00
Dan Finlay	3e1d648ec0	Merge branch 'master' into gasupdater	2017-06-12 10:26:40 -07:00
frankiebee	bb6e41963d	Dissallow transactions to be sent to 0x0000000000000000000000000000000000000000	2017-06-05 11:48:04 -07:00
Kevin Serrano	2b7d842498	Update gasblocklimit params with every block.	2017-06-02 15:18:14 -07:00
Dan Finlay	31c7daee73	Fix bug where edited gas parameters did not take effect ... Fixes #1407	2017-05-16 23:33:40 -07:00
Dan Finlay	b4e6ea9db7	Fix fiat rendering ... Fixes #1439. When reorganizing fiat-value component to not use global state, had missed its necessary `currentCurrency` parameter. This now passes it in wherever it's used.	2017-05-16 11:36:21 -07:00
Dan Finlay	19db11856b	Remove redux dependency from eth-balance and its dependent tree ... For better unit testability of the conf-tx view.	2017-05-12 12:44:51 -07:00
Thomas Huang	6bdb4c8728	Fix linting warnings	2017-04-26 21:05:45 -07:00