1763 Commits

Author	SHA1	Message	Date
Dan	7915e62d65	Merge branch 'master' into NewUI-flat	2017-12-20 19:16:12 -03:30
Dan J Miller	bccbf14b39	[NewUI] Hide UI toggle in mascara (#2772) ... * Hides old-UI on mascara. * Improve code clarity in select-app.js	2017-12-20 10:22:50 -08:00
Dan	109e4e5d96	Hide fiat values on account details screen when eth/token value is 0.	2017-12-20 10:21:36 -08:00
Dan	0feb5b210b	Hides the sidebar after the an account menu actions changes the screen behind the sidebar.	2017-12-20 10:17:29 -08:00
Thomas Huang	453bfd34e3	Merge pull request #2706 from danjm/MM-fix-buy-cancel-button ... Fixes the cancel button in the buy screen to take the user home.	2017-12-14 15:06:53 -05:00
Dan J Miller	339eb7d1a6	Fix edit to field bug. (#2738)	2017-12-12 22:24:41 -08:00
Dan	4e0485938a	Fix height of login screen	2017-12-12 12:31:52 -08:00
Chi Kei Chan	515437a4c9	Fix isMascara and update yarn.lock	2017-12-12 12:22:22 -08:00
Dan	57c91435a7	Substitute isMascara check for explicit check if user is on mobile browser.	2017-12-12 12:14:40 -08:00
Dan	4b654669e6	Hide open in browser button on mobile (but still show on extension); adds a function to detect if viewing with mobile browser.	2017-12-12 12:14:40 -08:00
Dan	05c6789030	Adds button for opening app in main browser window in extension.	2017-12-12 12:14:40 -08:00
Dan Finlay	d110c916a4	Show watched tokens with no balance	2017-12-12 09:47:51 -08:00
Dan	bfec077d79	Fixes the cancel button in the buy screen to take the user home.	2017-12-08 16:18:50 -03:30
Chi Kei Chan	41d281a527	Merge branch 'NewUI-flat' into cb-372	2017-12-07 09:54:37 -08:00
Chi Kei Chan	845aec82b9	Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI	2017-12-07 09:46:28 -08:00
Kevin Serrano	6553ba132d	Merge pull request #2654 from abitrolly/patch-2 ... Download State Logs with .json extension	2017-12-07 07:41:12 -08:00
Dan Finlay	c82fd990aa	Add 10% price bump to retry attempts. ... Turns out geth requires at least a 10% price bump to replace txs: 9619a61024/core/tx_pool.go (L133)	2017-12-07 04:02:11 -05:00
Dan	2e9137dddd	Update max amount behaviour to meet new specs.	2017-12-06 21:15:39 -08:00
Dan	ec6c3c33bd	Merge branch 'master' into NewUI-flat-merge-with-master	2017-12-06 21:11:52 -08:00
Alexander Tseung	b9f2f8c2a7	Show retry button on submitted transactions greater than 30 seconds, add hover styling	2017-12-07 00:01:11 -05:00
Dan Finlay	73da8a5a4f	Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into RetryTransaction	2017-12-06 23:43:11 -05:00
Dan Finlay	0e25129028	Enforce retry tx at minimum gas of previous tx	2017-12-06 23:42:47 -05:00
Alexander Tseung	6b3909547f	Fix styling of Retry buton	2017-12-06 23:27:43 -05:00
Dan Finlay	31564e0a86	Fix retry action	2017-12-06 23:20:15 -05:00
Dan Finlay	81fb9db1bc	View tx after editing state to unconfirmed	2017-12-06 23:09:32 -05:00
Dan Finlay	97abbc5cbe	Fix action	2017-12-06 22:55:47 -05:00
Alexander Tseung	02736d2d36	Connect to redux for retryTransaction	2017-12-06 22:48:26 -05:00
Alexander Tseung	500fbe450a	Add button to retry transaction	2017-12-06 22:35:18 -05:00
Dan Finlay	6ff580584a	Add retry background method and action	2017-12-06 22:20:58 -05:00
Dan	bd5ce9461e	User is automatically added to new UI if they meet conditions at time of login.	2017-12-06 20:49:45 -03:30
Dan	9db00fa507	Show user notifications after switch between UIs	2017-12-04 23:36:54 -03:30
Dan	730d7f84ca	Update newUI UI for switching back to old UI.	2017-12-04 23:08:51 -03:30
Dan	84321b2d9b	Lint fix	2017-12-04 23:08:23 -03:30
Dan	ce14ee2ffc	New-ui actions accomodates old-ui.	2017-12-04 23:08:23 -03:30
Dan	7f79524070	Add UI selection	2017-12-04 23:08:23 -03:30
Anatoli Babenia	a171b9b847	Download State Logs with .json extension ... That doesn't fix #2095, but at least makes downloaded files syntax-highlighted when opened in editors	2017-12-05 00:46:19 +03:00
Alexander Tseung	7dba114feb	Update font weights to 300, remove animation from network dropdown, fix network dropdown not closing from certain click-areas	2017-12-01 14:19:53 -08:00
Thomas Huang	f131468353	Remove useBlockie in props for render ... Removed unused useBlock for Lint validation.	2017-11-28 13:37:45 -06:00
Jason Clark	a34362b776	Fixes changes requested in pullrequestreview-79088534	2017-11-27 08:11:48 -07:00
Jason Clark	75ef848196	making eslint happy	2017-11-25 15:47:34 -07:00
Jason Clark	bd48d858f4	fixing blockies display issues	2017-11-25 15:11:29 -07:00
Jason Clark	1b89ceb63a	swapped out ethereum-blockies lib for MEW blockies library, tightened up identicon.js code	2017-11-25 14:33:42 -07:00
Jason Clark	41be4714c2	tweaking styling	2017-11-24 14:18:46 -07:00
Jason Clark	dc7bd3c628	incremental commit of working blockie component	2017-11-24 13:48:56 -07:00
Jason Clark	fc46a16a32	toggle wired up to preferences property store	2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)	90fc4812bc	incremental commit	2017-11-23 18:33:44 -07:00
Dan Finlay	597af980dd	Prevent multiple submissions of first time form	2017-11-20 14:03:47 -08:00
Dan Finlay	28409294c3	Remove unneeded type casting	2017-11-21 03:42:46 +08:00
Dan Finlay	c6713e93ad	Fix bug where gas param was not a string ... Prevented sending transactions. Fixes #2598	2017-11-21 03:42:46 +08:00
Chi Kei Chan	e61ba93194	Merge branch 'master' into merge-master	2017-11-15 12:03:13 -08:00