Commit Graph

4276 Commits

Author SHA1 Message Date
Dan Finlay 64717726c4 Reword forgot password to restore seed phrase
This always confuses people, I just finally did it.
2017-09-07 15:27:40 -07:00
Kevin Serrano 13c7b28d40 Merge pull request #1987 from MetaMask/CheckFaq67
Add test for trying to reproduce faq#67
2017-09-07 15:26:29 -07:00
Kevin Serrano 55b07b2b4a
Changelog and attribution. 2017-09-07 15:06:57 -07:00
Kevin Serrano 41e9904d9b
Convert icon to button. 2017-09-07 15:03:25 -07:00
Kevin Serrano 3a87a30912
Fold submit and buy ether into one button slot 2017-09-07 13:55:59 -07:00
Kevin Serrano 34e7bb5015
Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved 2017-09-07 13:20:14 -07:00
Thomas Huang a27a7e22f2 Merge pull request #1893 from MetaMask/readd-loose
Re-add loose label onto accounts.
2017-09-07 12:57:56 -07:00
Kevin Serrano 69c7fe24b3
Place object property retrieval inside try-catch 2017-09-07 12:17:36 -07:00
Kevin Serrano f0ab4ce52d
Change expected type to array. 2017-09-07 11:51:04 -07:00
Chi Kei Chan 272ade0f66 Fix .filter token tx 2017-09-07 11:46:05 -07:00
Chi Kei Chan ca69fa5d91 Re-enable Contract tx list item 2017-09-07 11:38:21 -07:00
Chi Kei Chan 687d2f755d Fix css merge conflicts 2017-09-07 11:25:31 -07:00
Dan a0ca3fab77 Modify readonly value in for input in qr-code. 2017-09-07 10:26:21 -07:00
Dan c4eb2fb3ea Account-detail address is a readonly input. 2017-09-07 10:26:21 -07:00
Dan 1d5a725ffb Close button in account-details-modal working. 2017-09-07 10:26:21 -07:00
Dan b8b0c8c62a Remove highlight on modal 2017-09-07 10:26:21 -07:00
Dan 61b965fe14 Touch up style of account-details-modal. 2017-09-07 10:26:21 -07:00
Dan 7fb1c6836d Modify status copy for status === 'unapproved' 2017-09-07 10:25:56 -07:00
Dan eabbfb8319 Link user from transaction list to etherscan if they have a transaction hash. 2017-09-07 10:25:56 -07:00
Dan 3e6b619bd8 Use ternary operator instead of two conditionals. 2017-09-07 10:25:56 -07:00
Dan 64f8a4d22b Improve tx-list item hover scss. 2017-09-07 10:25:56 -07:00
Dan 17b5afb8de Create tx-list-item component. 2017-09-07 10:25:56 -07:00
Dan 6d3b3d4203 Show confirm transaction screen when clicking a pending transaction in the list. 2017-09-07 10:25:56 -07:00
Dan aa60944e30 Remove default to confirm screen on login. 2017-09-07 10:25:56 -07:00
kumavis 440a42bbc3 inpage - add idRemapMiddleware 2017-09-07 10:08:07 -07:00
Chi Kei Chan b670c8074e Fix font sizes on Send Token 2017-09-07 04:26:29 -07:00
Chi Kei Chan 8b919758e5 Send Token screen partial UI 2017-09-07 04:24:03 -07:00
Chi Kei Chan 983fa2a117 Add Contract Tx List Item; Update Token Tx on select 2017-09-07 03:14:53 -07:00
Chi Kei Chan 14b2f3e391 Show token balance and identicon 2017-09-06 23:03:23 -07:00
Kevin Serrano 7ff5fd8691
Changelog bump 2017-09-06 14:04:17 -07:00
Kevin Serrano 0217984a40
Merge branch 'master' into readd-loose 2017-09-06 13:59:52 -07:00
Kevin Serrano b5f48730cd
Properly update keyring state on new account addition. 2017-09-06 13:59:41 -07:00
kumavis 351db952c5 Merge pull request #2033 from MetaMask/Version-3.9.12
Version 3.9.12
2017-09-06 13:54:47 -07:00
Dan Finlay 5e934994d1 Version 3.9.12 2017-09-06 13:33:30 -07:00
kumavis 47340ca550 Merge pull request #2017 from MetaMask/DevEnviornment
Update redux middleware imports
2017-09-06 13:18:14 -07:00
tmashuang 36a44ef61f Update mock-store dependency 2017-09-06 11:04:17 -07:00
Dan Finlay 88556dce74 Merge pull request #2023 from MetaMask/web3-1.0-fix
inpage - bug fix
2017-09-06 10:33:43 -07:00
Chi Kei Chan f1fb9e10a0 Adding Token transaction detail screen 2017-09-06 03:17:49 -07:00
Chi Kei Chan 690ddf5ed7 Fix token list 2017-09-06 00:36:52 -07:00
Chi Kei Chan bffdde2082 Fix html height 2017-09-06 00:36:44 -07:00
Chi Kei Chan 06b2a04a42 Implement tokens list UI 2017-09-06 00:36:31 -07:00
kumavis ea7e46ed38 inpage - bug fix
prevents mutation of original message object which causes problems with web3 1.0
2017-09-05 16:46:21 -07:00
Kevin Serrano 3e2bd19881
Merge branch 'master' into readd-loose 2017-09-05 15:48:15 -07:00
Dan 562d2fadae Use .entries() instead of .keys(), and use more destructuring, for simpler code. 2017-09-05 13:00:50 -07:00
Dan 78f39bcce6 Send tx working; user is taken to confirm page with correct transaction information. 2017-09-05 13:00:50 -07:00
Kevin Serrano 32c799a135 Merge pull request #2019 from MetaMask/i2016-ImproveSignDeprecationWarning
Make eth_sign deprecation warning more useful
2017-09-05 11:49:48 -07:00
Kevin Serrano ba2d1f8d3e Merge pull request #2018 from MetaMask/i2014-BetterWeb3DeprecationWarning
Make web3 deprecation notice more useful
2017-09-05 11:49:18 -07:00
Dan Finlay 90272e252f Make eth_sign deprecation warning more useful
Link to descriptive article that demonstrates the new preferred method.
2017-09-05 11:44:26 -07:00
Dan Finlay 70a61f8712 Make web3 deprecation notice more useful
Linking to a descriptive & precriptive article on a path forward.
2017-09-05 11:35:33 -07:00
Kevin Serrano e647337a8a
Resolve merge conflict from master 2017-09-05 09:03:44 -07:00