1971 Commits

Author	SHA1	Message	Date
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
kumavis	a52ef7a06a	ui - lint fix	2018-03-13 14:41:54 -07:00
kumavis	34fe88af8f	Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characters ... improved verification of restore from seed phrase	2018-03-13 14:39:59 -07:00
Thomas	b1871bf32d	Add closing parens to appName	2018-03-13 11:04:41 -07:00
Thomas Huang	1d2cb46eff	Merge branch 'master' into i18n	2018-03-13 11:00:52 -07:00
kumavis	572234e383	Merge branch 'master' into i3033-responsive-newui-onboarding	2018-03-13 10:46:14 -07:00
kumavis	1fa5cec2ec	Merge pull request #3470 from danjm/newui-onboarding-fonts ... Change fonts in new-ui onboarding to Roboto, with weight 400.	2018-03-13 10:44:08 -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
Dan	70f33d4747	Left align create password.	2018-03-12 20:17:44 -02:30
Alexander Tseung	08542c18e1	Update deposit ether styling (#3510)	2018-03-12 19:25:12 +01:00
Dan	0dad6db973	Styling fixes to welcome; hide network component on create password; shown welcoem in popup.	2018-03-12 14:33:45 -02:30
Thomas	208b3bc4c1	Add i18n back into JsonImportSubview	2018-03-12 08:07:12 -07: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	ab1b39f554	Remove de-selected token from selectedTokens hash instead of setting to null (#3494)	2018-03-09 16:31:53 +01:00
Alexander Tseung	d84341f323	Add empty object default value for tokenData (#3493)	2018-03-09 16:31:17 +01:00
Alexander Tseung	4b2e52795d	Explicitly define state in import account from json component (#3491)	2018-03-09 16:30:31 +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	91c890041c	Add welcome screen to new-ui browser first time flow.	2018-03-08 14:21:54 -03:30
Alexander Tseung	cbb65cc493	Fix flashing to Log in screen after logging in or restoring from seed phrase (#3466)	2018-03-08 16:29:29 +01:00
Dan	09dae760bc	Correct caps of Send button on main screen.	2018-03-07 22:47:29 -03:30
Dan	6c400c2e92	Update first time flow button fonts, and first-time-flow default font, to Roboto.	2018-03-07 22:37:53 -03:30
Dan Finlay	f4e5dd37b1	Merge pull request #3409 from scsaba/seed-phrase-verification ... Add seed phrase verification script into background process	2018-03-07 16:47:13 -08:00
Dan J Miller	ca047b1ea0	Update network colours for better accessibility. (#3469)	2018-03-07 15:22:10 -03:30
Dan	b8dec68271	Make new-ui create password screen responsive.	2018-03-07 12:47:33 -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
kumavis	8e0131cbb5	Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording ... Replace Lock wording with Log Out / Log In	2018-03-06 17:12:32 -08:00
Dan	9d215bab0f	Merge branch 'master' into i18n	2018-03-06 20:45:45 -03:30
Dan Finlay	f06bca1151	Implemented feedback to make i18n work on mac	2018-03-06 15:32:35 -08:00