2101 Commits

Author	SHA1	Message	Date
frankiebee	e51ba2e75c	Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-extension into retry-tx-refractor	2018-03-15 10:41:55 -07:00
frankiebee	4c947d466c	Merge branch 'master' into retry-tx-refractor	2018-03-15 09:47:25 -07:00
Alexander Tseung	66193c823c	Update Deposit Eth icon (#3569)	2018-03-15 13:50:22 -02:30
frankiebee	cd721f52cb	Merge branch 'master' into retry-tx-refractor	2018-03-15 08:07:16 -07:00
Dan	b0122be3c9	Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not edited.	2018-03-14 22:45:10 -02:30
Dan	66422cd083	Force gas min has correct precision and is set when editing gas if max.	2018-03-14 22:29:43 -02:30
kumavis	eb5a84975b	ui - settings - add option to set current locale	2018-03-14 17:11:41 -07:00
kumavis	34aeef50a0	i18n - load locales manually	2018-03-14 16:32:35 -07:00
Thomas Huang	e2efc91aee	Merge pull request #3558 from MetaMask/fix-two-translations ... Fix translations whose substitutions params were not in arrays.	2018-03-14 13:00:42 -07:00
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 Finlay	fae6a44bac	Grammar correction	2018-03-14 09:34:25 -07:00
Dan	edd5c38492	Fix translations whose substitutions params were not in arrays.	2018-03-14 12:34:13 -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	9bb7fa365d	Remove windows.h from i18n.js	2018-03-13 11:15:10 -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
Thomas	23a8e24a1b	Add loglevel and window.log to i18n.js	2018-03-12 11:40:03 -07:00
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
Dan Finlay	9762a73041	Merge pull request #3433 from danjm/i3087-shapeshift-split-undefined ... Shapeshift form handles 'market info unavailable' errors.	2018-03-06 15:07:51 -08:00
Dan Finlay	52b4876cf9	Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit ... Gracefully handle null token balance in new ui send.	2018-03-06 15:05:43 -08:00
Dan Finlay	31e7d9263f	Merge pull request #3444 from danjm/i3348-minus-not-a-number ... Prevent user from selecting max amount until gas is estimated.	2018-03-06 15:05:25 -08:00
Dan Finlay	cb4ad60800	Merge branch 'master' into i2475-UnifyLogInWording	2018-03-06 14:57:01 -08:00
Dan Finlay	b87687110d	Replace Lock wording with Log Out / Log In ... Fixes #2475	2018-03-06 14:51:26 -08:00
Dan J Miller	5ac330a89e	Default add-token decimal value to string (#3451)	2018-03-06 15:15:26 -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
Alexander Tseung	5f8a632fec	Fix seed phrase validation clearing form (#3417) ... * Fix seed phrase validation clearing form * Make new ui import seed error feedback live, and allow newlines with and without carriage returns.	2018-03-06 09:14:57 -08:00
Dan	462d57cb6a	Gracefully handle null token balance in new ui send.	2018-03-06 00:23:29 -03:30
criw	b393b54e35	FIX #3440 improved verification of restore from seed phrase	2018-03-06 04:43:12 +01:00
Dan	68604b53dd	Prevent user from selecting max amount until there is an estimated gas total.	2018-03-05 23:12:06 -03:30
Dan J Miller	1bd18cebd7	Fixes shapeshift coin selection dropdown. (#3416)	2018-03-05 13:33:46 -03:30
Csaba Solya	2b86d65d0c	verify seedwords on log in	2018-03-03 22:08:10 +01:00
Thomas Huang	d3a0a27c0c	Merge branch 'master' into ImportAccountMessageV2	2018-03-02 18:26:52 -08:00
Thomas	ee254b4f6f	Import Account disclaimer	2018-03-02 18:24:09 -08:00
Thomas	6f8077f587	Swap color scheme for import account label	2018-03-02 18:23:27 -08:00
Dan J Miller	0d97ff2210	Fix NewUI reveal seed flow. (#3410)	2018-03-02 22:44:05 -03:30
Dan J Miller	0c163dcb32	Allow adding 0 balance tokens in old ui and editing custom token info in new (#3395) ... * Shows tokens with 0 balance in old ui; goHome after adding tokens. * Allow users to edit custom token info when not autofilled. (New UI add token screen).	2018-03-02 19:07:25 -03:30
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
Kevin Serrano	923c702164	Merge pull request #3356 from MetaMask/cdn-minimization ... Check in all font files locally.	2018-03-01 12:30:03 -08:00
Dan	94a60fe4a9	Correct ttf format name to 'truetype'	2018-03-01 16:36:27 -03:30
kumavis	46d94a241c	Merge pull request #3359 from MetaMask/token-check-url ... [new-ui] add token - check for logo url before trying to use	2018-02-28 14:55:42 -08:00
kumavis	40537f9290	add token - check for logo url before trying to use	2018-02-28 14:04:32 -08:00
Kevin Serrano	d45116824c	Check in all font files locally.	2018-02-28 13:03:46 -08:00
kumavis	6c472b73eb	Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvements ... [NewUI] Onboarding flow style improvements	2018-02-28 12:40:14 -08:00
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
Thomas	50f20358c1	Add import account disclaimer	2018-02-27 12:01:09 -08:00
Dan	0739d3507b	Adds beta label to Metamask name in full screen app bar.	2018-02-27 14:13:05 -03:30
Dan	def369ba07	Move beta warning to app header.	2018-02-27 14:13:05 -03:30
Dan	746c3e5f18	Body width container in first time flow is consistent with app bar.	2018-02-27 14:12:45 -03:30