Commit Graph

65 Commits

Author SHA1 Message Date
kumavis ee1acf0a7e
Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlist
Fix display of unapprovedMgs in txList; fix txParams undefined errors
2018-03-30 18:36:39 -07:00
Dan 717623e2e3 Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist 2018-03-30 00:00:31 -02:30
kumavis b49ad750dd Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts 2018-03-29 16:54:00 -07:00
Dan Finlay 4d2d3d4430 Increase permitted safe gas limit
Block gas limits have been incredibly stable lately:
https://etherscan.io/chart/gaslimit

And this validation has prevented Aragon's new beta from working:
https://twitter.com/izqui9/status/979373309312815104

Fixes #3790
2018-03-29 12:28:50 -07:00
kumavis 10609493c5 ui - use relative location for images 2018-03-28 22:30:35 -07:00
Dan 21b6a3442d Fix display of unapprovedMessages in txList (old and new ui); includes fix of undefined txParams. 2018-03-28 10:51:16 -02:30
Dan 7c9fcf26ba Stop using navigateTo for external link in settings. 2018-03-27 02:07:31 -02:30
Dan 798988597b Merge branch 'master' into retry-tx-refractor 2018-03-14 00:02:27 -02:30
Dan bf3c5add08 Adds styles for dropped txs in old-ui. 2018-03-13 22:17:08 -02:30
Dan 80a2e59194 Correctly set latest submitted retry with nonces that matches others in old-ui transaction-list-item. 2018-03-13 22:08:27 -02:30
Dan 8c7988978f Undefined check in showRetryButton 2018-03-13 21:32:22 -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
Dan Finlay 26231a42b6
Fix grammar 2018-03-13 15:24:35 -07:00
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
Alexander Tseung 4b2e52795d
Explicitly define state in import account from json component (#3491) 2018-03-09 16:30:31 +01:00
kumavis 6a9ca29244
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 17:13:57 -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 303801d276 Ensure this reference is defined in old-ui info.js (#3450) 2018-03-06 10:45:40 -08:00
criw b393b54e35 FIX #3440 improved verification of restore from seed phrase 2018-03-06 04:43:12 +01:00
Thomas Huang d3a0a27c0c
Merge branch 'master' into ImportAccountMessageV2 2018-03-02 18:26:52 -08:00
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
Thomas Huang cb109a8233 Add retry transaction back into old ui transaction list item (#3381)
* Add retry transaction back into old ui transaction list item

* Update Changelog
2018-03-02 16:38:13 -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
Kevin Serrano d45116824c
Check in all font files locally. 2018-02-28 13:03:46 -08:00
kumavis 8f5817c090
Merge pull request #3339 from danjm/i3336-cancel-button-buy-eth
[Old-UI] Fix cancel button on buy eth screen.
2018-02-28 12:12:12 -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
kumavis b1faa13344
Merge pull request #3350 from danjm/onclick-undefined-sentry-error
[old-ui] Prevent user from switching network in old-ui notification
2018-02-28 11:00:12 -08:00
Dan c4ef9630da Prevent user from switching network in old-ui notification 2018-02-28 14:13:44 -03:30
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
Dan 5de0471fcb Fix cancel button on buy eth screen. 2018-02-27 19:14:23 -03:30
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 b1b9772731 Fix old-ui active notices width. 2018-02-20 21:44:17 -03:30
Dan Finlay 16f9ddc72c Add 8MM gas limit default to send screen 2018-02-20 15:44:04 -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
Thomas Huang ed33f3160a Make oldui compatible with newUI style changes 2018-02-15 12:36:26 -08: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 bb79fb354b Try beta link on unlock and privacy screens. 2018-02-08 22:47:32 -03:30
Dan cd976a2765 Add reset account button to new UI. 2018-02-08 20:23:16 -03:30
Dan d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung 8b90b1d1b1 Remove accessing PropTypes from main React package 2018-02-06 22:03:37 -08:00
Thomas 97ca86733c Merge branch 'master' into uat 2018-01-23 01:12:50 -08:00
Chi Kei Chan ba0762c582
Merge pull request #3005 from alextsg/cb-385
[NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button
2018-01-17 13:49:48 -08:00
Alexander Tseung aa08d1a09d Fix merge conflicts 2018-01-16 18:34:24 -08:00
Alexander Tseung 81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Alexander Tseung 65e9d9efc5 Fix rendering QR code in old UI, hide unnecessary back button 2018-01-16 17:41:42 -08:00