1065 Commits

Author	SHA1	Message	Date
Dan	66422cd083	Force gas min has correct precision and is set when editing gas if max.	2018-03-14 22:29:43 -02:30
Dan	a4c6a5e92e	Ensure changes from customize gas modal opened from confirm screen are captured for non-tx transactions.	2018-03-14 17:10:59 -02:30
Dan	fb838da734	Revert 'Set txMeta.time to reflect time of tx approval.'	2018-03-14 17:07:09 -02:30
Dan	798988597b	Merge branch 'master' into retry-tx-refractor	2018-03-14 00:02:27 -02:30
Dan	cc267d6c81	Fix more lint errors.	2018-03-13 23:56:45 -02:30
Dan	c37684d7bd	Remove unnecessary addition of nonce to state.	2018-03-13 23:49:10 -02:30
Dan	e94a14ef8a	Make token confirmations compatible.	2018-03-13 23:44:05 -02:30
Dan	0d33aed20e	Fix tx-list-item submitted check.	2018-03-13 23:29:47 -02:30
Dan	c52253bb0e	Use correct name for submittedTime field in tx-list.js	2018-03-13 21:57:23 -02:30
Dan	46ded45b81	Use correct var name in new-ui showRetryButton	2018-03-13 21:38:08 -02:30
Dan	8c7988978f	Undefined check in showRetryButton	2018-03-13 21:32:22 -02:30
Dan	e293b6349c	Styling for dropped.	2018-03-13 21:15:35 -02:30
Dan	d6e4d2e80d	Use new submittedTime field to correctly show retry button in old and new ui.	2018-03-13 21:15:35 -02:30
Thomas Huang	1d2cb46eff	Merge branch 'master' into i18n	2018-03-13 11:00:52 -07:00
kumavis	c1387cdc54	Merge pull request #3495 from alextsg/cb-290 ... Increase tap areas for menu buttons on mobile	2018-03-13 10:42:59 -07:00
Thomas	b45ea44aa5	Add missing opening parens to pag-container__subtitle	2018-03-13 10:28:33 -07:00
Thomas Huang	829b0a8926	Merge branch 'master' into i18n	2018-03-13 10:21:03 -07:00
Dan	179066fe6b	Set txMeta.time to reflect time of tx approval.	2018-03-13 03:26:37 -02:30
Dan	e6d1ce56e7	Improve phrasing of copy.	2018-03-13 03:11:45 -02:30
Dan	f805a2eb73	Fix gas calculation and nonce / forceGasMin state setting errors; retry button shows on correct tx.	2018-03-13 03:09:38 -02:30
Alexander Tseung	08542c18e1	Update deposit ether styling (#3510)	2018-03-12 19:25:12 +01:00
Thomas Huang	b7c7083a11	Merge branch 'master' into i18n	2018-03-12 10:50:55 -04:00
Alexander Tseung	a07550d2ab	Increase tap areas for menu buttons on mobile	2018-03-09 18:50:00 +01:00
Alexander Tseung	d84341f323	Add empty object default value for tokenData (#3493)	2018-03-09 16:31:17 +01:00
Dan	c1ff927fa0	Lint fixes.	2018-03-09 10:00:37 -03:30
Dan	81e72147ef	Merge branch 'master' into retry-tx-refractor	2018-03-09 02:07:27 -03:30
Dan	2d6b378bf8	Adds inline opening of gas customization to confirm-send-ether screen.	2018-03-09 02:03:36 -03:30
Dan	5433d2fe3a	Retry transaction logic added to tx-list-item, confirm-send-ether, customize-gas-modal, and dependents.	2018-03-09 00:19:26 -03:30
Dan	6cee76b3e7	Add html and css for responsive retry button.	2018-03-08 16:12:25 -03:30
Dan	09dae760bc	Correct caps of Send button on main screen.	2018-03-07 22:47:29 -03:30
Dan J Miller	ca047b1ea0	Update network colours for better accessibility. (#3469)	2018-03-07 15:22:10 -03:30
Dan Finlay	abe8bc19a8	Merge branch 'master' into i18n	2018-03-06 20:13:53 -08:00
Dan	2420ad2477	Correct merge conflict resolution errors.	2018-03-06 22:26:13 -03:30
kumavis	6a9ca29244	Merge branch 'master' into ImportAccountMessageV2	2018-03-06 17:13:57 -08:00
Dan	9d215bab0f	Merge branch 'master' into i18n	2018-03-06 20:45:45 -03:30
Dan Finlay	a4bd7992cd	Merge branch 'master' into ImportAccountMessageV2	2018-03-06 10:32:47 -08:00
Dan	376ffb758f	Shapeshift form handles market info unavailable errors.	2018-03-06 13:49:41 -03:30
Dan J Miller	1bd18cebd7	Fixes shapeshift coin selection dropdown. (#3416)	2018-03-05 13:33:46 -03:30
Thomas Huang	d3a0a27c0c	Merge branch 'master' into ImportAccountMessageV2	2018-03-02 18:26:52 -08:00
Alexander Tseung	f22dfd4ae8	Fix network menu for custom URLs (#3366)	2018-03-01 17:42:10 -03:30
Alexander Tseung	ace4f0d998	Fix exception thrown when styleOverride is not present (#3364)	2018-03-01 17:41:35 -03:30
kumavis	28c6347cdd	Merge pull request #3340 from danjm/i3338-contract-published-terminology ... [NewUI] Replace 'Contract Published' label with 'Contract Deployment'	2018-02-28 11:16:55 -08:00
Dan	78f6a48664	Define event locally in onClickOutside method in account-dropdowns.js	2018-02-28 13:18:37 -03:30
Dan	2b9af0734b	Replace 'Contract Published' with 'Contract Deployment' for clearer indication of contract tx state.	2018-02-27 20:09:02 -03:30
Thomas	7aa324bdf6	Remove committed out merge code	2018-02-27 12:06:24 -08:00
Thomas	ac2e92fa54	Change Loose label to Imported	2018-02-27 12:02:48 -08:00
Dan Finlay	a1b72e5252	Try fixing notice screen synchronous state call	2018-02-20 13:51:06 -08:00
kumavis	4e8d9fef84	Merge pull request #3200 from alextsg/cb-703 ... [NewUI] Remove accessing PropTypes from main React package	2018-02-16 16:11:36 +00:00
Dan Finlay	ee1197192f	Merge pull request #3209 from danjm/MM-634-newui-reset-account ... [NewUI] Add reset account button to new UI.	2018-02-13 19:50:19 +01:00
Dan J Miller	35c762da47	Updates the styling of confirm send ether and token screens. (#3235)	2018-02-12 22:51:05 -08:00