5346 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chi Kei Chan	0163538d5e	Merge branch 'NewUI-flat' into cb-372	2017-12-07 09:54:56 -08:00
Chi Kei Chan	41d281a527	Merge branch 'NewUI-flat' into cb-372	2017-12-07 09:54:37 -08:00
Chi Kei Chan	e0d0e19c92	Merge pull request #2697 from danjm/MM-333-auto-add-users-to-new-UI ... [NewUI] Auto add users to new ui	2017-12-07 09:47:31 -08:00
Chi Kei Chan	efa894a0c3	Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI	2017-12-07 09:46:55 -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
Kevin Serrano	35be563fbd	Merge pull request #2688 from MetaMask/AddPriceBump ... Add 10% price bump minimum to retry attempts.	2017-12-07 06:57:02 -08:00
vicnaum	553d713636	A more expressive way ... replaced ifs with ? :	2017-12-07 15:30:05 +01: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 Finlay	a2057a8d29	Merge pull request #2684 from MetaMask/RetryTransaction ... Retry transaction	2017-12-07 03:44:56 -05:00
Dan Finlay	706a07d0e9	Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into RetryTransaction	2017-12-07 03:02:20 -05:00
Dan Finlay	c391b25015	Version 3.13.0	2017-12-07 03:01:46 -05:00
Dan	2e9137dddd	Update max amount behaviour to meet new specs.	2017-12-06 21:15:39 -08:00
Chi Kei Chan	373f8b72d0	Merge branch 'master' into NewUI-flat	2017-12-06 21:13:29 -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	b26c975294	Bump changelog	2017-12-06 23:43:50 -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
Dan Finlay	1bd5fc1ba4	Add development state	2017-12-06 22:55:04 -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
vicnaum	7854321fae	Fix for #2644 - Specified Nonce isn't used ... Added nonceSpecified. And a check if nonce was specified - then we should use the specified nonce instead of generating a new one.	2017-12-06 22:49:24 +01:00
Frankie	a78cc013d1	Merge pull request #2670 from danjm/MM-2669-tx-retry-exponential-backoff ... Exponentional backoff on transaction retry in pending-tx-tracker	2017-12-06 15:57:19 -05:00
Dan	3356c15d04	Add tests for exponential backoff code in _resubmitTx	2017-12-06 14:11:14 -03:30
Dan	af8fcb6777	Update resubmitPendingTxs tests.	2017-12-06 14:10:11 -03:30
Dan	f58aae3f2b	firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in _resubmitTx	2017-12-06 13:21:09 -03:30
Dan	ea23da9e75	Correct note for updateTx after block-update event in transaction.js	2017-12-06 13:07:31 -03:30
Dan	871d9fd9fb	Fix undefined latestBlockNumber in _resubmitTx	2017-12-06 13:02:38 -03:30
Dan	ae2a4d78e8	Exponentional backoff on transaction retry in pending-tx-tracker	2017-12-05 17:21:14 -03:30
William Chong	03f86acd60	fix #1398, prevent injecting xml without xml suffix	2017-12-05 19:53:01 +08:00
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	db06e7e649	Css selected in background based on betaUI state.	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	f7ad015f5b	Use newui actions in old-ui	2017-12-04 23:08:23 -03:30
Dan	7f79524070	Add UI selection	2017-12-04 23:08:23 -03:30
Dan	6561e75aa2	Add old-ui directory	2017-12-04 23:06:26 -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	c30b543a80	Merge pull request #2630 from MetaMask/i2624-VersionedNotices ... Versioned notices	2017-11-29 17:25:10 -06:00
Dan Finlay	91817573c9	Bump changelog	2017-11-29 13:54:53 -08:00
Dan Finlay	10459ebaf4	Remove debugger	2017-11-29 13:35:48 -08:00