tangerine-wallet-browser - Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser)

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix merge conflicts	brunobar79	2018-07-03	5	-3655/+2782
\|\
\| *	npm 6 fresh lock + node 8 (#4675)	Bruno Barbieri	2018-07-03	4	-32479/+32280
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* run npm install with npm 6 and node 8 * npm audit fix --force * bump node version on circleci docker img * bump lodash
\| *	Merge pull request #4692 from MetaMask/improve-e2e-beta-test-startup	Whymarrh Whitby	2018-07-02	1	-5/+11
\| \|\ \| \| \| \| \| \|	Improve checks for closing info page on app installation in e2e beta tests.
\| \| *	Improve checks for closing info page on app installation in e2e beta tests.	Dan	2018-06-29	1	-5/+11
\| \| \|
* \| \|	move hardcoded strings to localization file	brunobar79	2018-07-03	2	-17/+22
\| \| \|
* \| \|	always open connect hardware in full screen mode	brunobar79	2018-07-03	1	-1/+9
\| \| \|
* \| \|	allow to open specific route in fullscreen mode	brunobar79	2018-07-03	1	-2/+5
\| \| \|
* \| \|	fix environment detection regex	brunobar79	2018-07-03	1	-1/+1
\| \| \|
* \| \|	use latest eth-keyring-controller	brunobar79	2018-07-02	2	-3/+4
\| \| \|
* \| \|	fix merge conflicts	brunobar79	2018-07-02	95	-7184/+8625
\|\\| \|
\| * \|	Merge pull request #4687 from snreynolds/i4623-getConvertedCurrency	Dan J Miller	2018-06-30	8	-24/+9
\| \|\ \ \| \| \| \| \| \| \| \|	fixes #4623
\| \| * \|	fixes #4623	Sara Reynolds	2018-06-30	8	-24/+9
\| \| \|/
\| * \|	Merge pull request #4640 from weijiekoh/develop	Dan J Miller	2018-06-30	2	-1/+8
\| \|\ \ \| \| \| \| \| \| \| \|	Fix for #4639: display values of EIP712 typed boolean fields in the signing prompt
\| \| * \|	Fixed lint error	Koh Wei Jie	2018-06-28	1	-1/+1
\| \| \| \|
\| \| * \|	removed stray console.log	Koh Wei Jie	2018-06-22	1	-1/+0
\| \| \| \|
\| \| * \|	fixed blank boolean field for typed signing for old UI	Koh Wei Jie	2018-06-22	1	-1/+5
\| \| \| \|
\| \| * \|	fixed blank boolean field for typed signing for new UI	Koh Wei Jie	2018-06-22	1	-0/+4
\| \| \| \|
\| * \| \|	Merge pull request #4647 from MetaMask/fix-overflow-currency-display	Dan J Miller	2018-06-30	3	-2/+12
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fix issues with scrollbar in currency display.
\| \| * \| \|	Improve attribute syntax in send-amount-row.component.js	Dan J Miller	2018-06-30	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Remove input arrows for send screen amount row on firefox.	Dan	2018-06-29	3	-0/+11
\| \| \| \| \|
\| \| * \| \|	Fix issues with scrollbar in currency display.	Dan	2018-06-29	2	-2/+1
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-ux	Dan Finlay	2018-06-29	3	-0/+11
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Set base estimate for token sends to be updated once recipient address specified
\| \| * \| \|	Set based estimate for token sends to be updated once recipient address ↵	Dan	2018-06-29	3	-0/+11
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	specified.
\| * \| \|	Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-style	Thomas Huang	2018-06-29	2	-7/+26
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Fix style of shapeshift screen in deposit modal.
\| \| * \|	Fix style of shapeshift screen in deposit modal.	Dan	2018-06-22	2	-7/+26
\| \| \|/
\| * \|	Merge pull request #4678 from MetaMask/e2e-beta-tests-upgrade	Dan J Miller	2018-06-29	10	-6749/+7671
\| \|\ \ \| \| \| \| \| \| \| \|	E2e beta tests upgrade
\| \| * \|	Use supersonic instead of httpserver to serve local dapp (e2e beta tests)	Dan	2018-06-28	3	-21/+543
\| \| \| \|
\| \| * \|	Turn off failing e2e beta assertion in firefox until bugs in ↵	Dan	2018-06-28	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	webdriver/geckodriver are resolved.
\| \| * \|	Update condition for backspace in customize gas step of token factory send ↵	Dan	2018-06-28	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test (e2e beta).
\| \| * \|	Update package-lock.json	Dan	2018-06-28	1	-6526/+6601
\| \| \| \|
\| \| * \|	Fix add existing token test (e2e beta tests).	Dan	2018-06-27	1	-3/+1
\| \| \| \|
\| \| * \|	Switch to eth and back before asserting on token balance (e2e beta token tests).	Dan	2018-06-27	1	-1/+2
\| \| \| \|
\| \| * \|	await all clicks in e2e beta tests.	Dan	2018-06-27	1	-9/+11
\| \| \| \|
\| \| * \|	Close popup window for e2e beta token factory send test.	Dan	2018-06-27	1	-2/+3
\| \| \| \|
\| \| * \|	Fix retype seed phrase button.	Dan	2018-06-27	1	-35/+46
\| \| \| \|
\| \| * \|	Disable e2e beta assertion after first token addition because of firefox / ↵	Dan	2018-06-27	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	webdriver bug.
\| \| * \|	Pass correct params to verboseReportOnFailure in beta e2e tests.	Dan	2018-06-27	1	-1/+1
\| \| \| \|
\| \| * \|	Add timeouts to certain beta e2e driver.waits.	Dan	2018-06-27	1	-2/+2
\| \| \| \|
\| \| * \|	Add try catch to deal with false negative timeouts in beta e2e tests.	Dan	2018-06-27	1	-7/+22
\| \| \| \|
\| \| * \|	Wait for element text match in metamask-beta-ui e2e send token test	Dan	2018-06-27	1	-4/+2
\| \| \| \|
\| \| * \|	Use locally served dapp to test contract calls in e2e beta tests	Dan	2018-06-27	6	-174/+131
\| \| \| \|
\| \| * \|	Add extra delay to e2e tests after remix page load.	Dan	2018-06-27	1	-0/+1
\| \| \| \|
\| \| * \|	Fix send token tests in beta ui e2e tests.	Dan	2018-06-27	2	-9/+26
\| \| \| \|
\| \| * \|	Speed up page opening and fix timeout errors on remix page opening in beta ↵	Dan	2018-06-27	2	-13/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	e2e tests.
\| \| * \|	Add delay before regularly failing test.	Dan	2018-06-27	1	-0/+1
\| \| \| \|
\| \| * \|	Fix element located bug in beta e2e contract method call test.	Dan	2018-06-27	1	-1/+1
\| \| \| \|
\| \| * \|	Improve wait for buy modal render after first time flow in beta e2e tests.	Dan	2018-06-27	1	-1/+2
\| \| \| \|
\| \| * \|	Only show the customize gas modal if the estimateGas call is not currently ↵	Dan	2018-06-27	4	-6/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in flight.
\| \| * \|	Update metamask-beta-ui e2e spec to fail on insufficient gas estimation.	Dan	2018-06-27	1	-7/+31
\| \| \| \|
\| \| * \|	Wait for locating of submit buttons before attempting to click in ↵	Dan	2018-06-27	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	metamask.spec.js
\| \| * \|	Update tests to accomodate token list menu additions.	Dan	2018-06-27	1	-1/+2
\| \| \| \|
\| \| * \|	Disable onbeforeunload alert on remix for contract integration tests.	Dan	2018-06-27	1	-0/+1
\| \| \| \|
\| \| * \|	Adds test for hiding tokens.	Dan	2018-06-27	1	-0/+19
\| \| \| \|
\| \| * \|	e2e beta tests for contract deployment and calling a contract method.	Dan	2018-06-27	2	-2/+135
\| \| \| \|
\| \| * \|	Improve reliability of beta e2e tests by using webdriver apis to wait for ↵	Dan	2018-06-27	2	-5/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	certain dom elements.
\| \| * \|	Add test for importing from private key to from-import-beta-ui.spec.js, and ↵	Dan	2018-06-27	2	-125/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove non-import related tests from that file.
\| \| * \|	metamask-beta-ui.spec.js tests custom token send before searched token.	Dan	2018-06-27	1	-38/+43
\| \| \| \|
\| \| * \|	Adds e2e tests for sending tokens from token factory.	Dan	2018-06-27	1	-3/+61
\| \| \| \|
\| \| * \|	Adds e2e tests for sending tokens within metamask.	Dan	2018-06-27	1	-0/+44
\| \| \| \|
\| \| * \|	Adds e2e tests for sending tokens from token factory.	Dan	2018-06-27	1	-3/+61
\| \| \| \|
\| \| * \|	Adds e2e tests for sending tokens within metamask.	Dan	2018-06-27	1	-2/+48
\| \| \| \|
\| * \| \|	Merge pull request #4674 from MetaMask/removeOnlyTests	Thomas Huang	2018-06-29	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Remove .only on test
\| \| * \| \|	Remove .only on test	tmashuang	2018-06-27	1	-1/+1
\| \| \|/ /
\| * \| \|	Merge pull request #4677 from MetaMask/customize-gas-loading-wait	Dan J Miller	2018-06-28	4	-6/+79
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Only show the customize gas modal if the estimateGas call is not currently in flight.
\| \| * \| \|	Only show the customize gas modal if the estimateGas call is not currently ↵	Dan	2018-06-19	4	-6/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in flight.
\| * \| \| \|	Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancements	Dan J Miller	2018-06-28	7	-41/+74
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	[new-ui] Improve ENS input errors and update ens validation on network change
\| \| * \| \|	Remove commented out code in ens-input.	Dan	2018-06-22	1	-1/+0
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' into i4409-i4410-ens-input-enhancements	Dan	2018-06-20	56	-6786/+7086
\| \| \|\ \ \
\| \| * \| \| \|	ENS input in send form shows distinct errors for invalid addresses and ↵	Dan	2018-06-15	7	-22/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	non-existent addresses.
\| \| * \| \| \|	ENS name revalidates on network change.	Dan	2018-06-13	1	-23/+33
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #4627 from TrejGun/gas-fee-display	Dan J Miller	2018-06-27	8	-57/+121
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactor gas-fee-display component
\| \| * \| \| \| \|	fix default import	trejgun	2018-06-23	2	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	lint	trejgun	2018-06-21	2	-3/+13
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	refactor gas-fee-display component	trejgun	2018-06-21	8	-57/+111
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#4622
\| * \| \| \| \| \|	Merge pull request #4649 from hermanjunge/develop	Thomas Huang	2018-06-23	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	License Edit
\| \| * \| \| \| \|	License	Herman Junge	2018-06-23	1	-0/+1
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #4592 from vittominacori/fix/close-popup-bug-#4553	Thomas Huang	2018-06-21	1	-2/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	set an id to the metamask notification popup
\| \| * \| \| \| \|	set the popup id returned by create promise	vittominacori	2018-06-18	1	-3/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	set an id to the metamask notification popup	vittominacori	2018-06-17	1	-1/+2
\| \| \|/ / / /
\| * \| \| \| \|	Merge pull request #4575 from whymarrh/token-amount-overflow	Whymarrh Whitby	2018-06-21	8	-16/+35
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|	Handle token amount overflows
\| \| * \| \| \|	Accept whitespace when matching token balances in e2e tests	Whymarrh Whitby	2018-06-21	2	-7/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Add explicit timeout for add token test	Whymarrh Whitby	2018-06-21	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Scroll large amounts in the send component	Whymarrh Whitby	2018-06-21	2	-4/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Handle large token balances in tx list hero	Whymarrh Whitby	2018-06-21	4	-5/+21
\| \|/ / / /
\| * \| \| \|	Merge pull request #4612 from MetaMask/changelog-4.8.0-fix	Thomas Huang	2018-06-20	1	-1/+0
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|	changelog - remove incorrect entry
\| \| * \| \|	changelog - remove incorrect entry	kumavis	2018-06-20	1	-1/+0
\| \|/ / / \| \| \| \| \| \| \| \|	4.8.0 claimed dapp autoreload was disabled. Actually this was reverted and is still active at this time
\| * \| \|	Merge pull request #4605 from MetaMask/master	Thomas Huang	2018-06-19	2	-7/+11
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Merge Master into Develop
\| \| * \ \	Merge pull request #4603 from MetaMask/v4.8.0	kumavis	2018-06-19	222	-8310/+15077
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	V4.8.0
\| \| \| * \| \|	Update Changelog	Thomas	2018-06-19	1	-6/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'develop' into v4.8.0	Thomas	2018-06-19	23	-62/+283
\| \| \| \|\ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #4602 from MetaMask/notice-controller-fixv4.8.0	Thomas Huang	2018-06-19	1	-3/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	notice controller - properly show new notices for non-new users
\| \| * \| \| \| \|	notice controller - properly show new notices for non-new users	kumavis	2018-06-19	1	-3/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #4582 from MetaMask/fixEmailLink	kumavis	2018-06-19	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix email link in phishing notice
\| \| * \| \| \| \| \|	Fix email link in phishing notice	Thomas	2018-06-15	1	-1/+1
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge pull request #4584 from MetaMask/fix-send-token	kumavis	2018-06-19	12	-21/+142
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|	Add hex-prefix to gas estimate result
\| \| * \| \| \| \|	Update integration tests for newui gas estimation fixes.	Dan	2018-06-19	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	On send screen amount change, updateGas call now includes current to address.	Dan	2018-06-19	6	-4/+37
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Send screen returns simple gas cost if no to address specified when not ↵	Dan	2018-06-19	2	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sending token.
\| \| * \| \| \| \|	Remove leading zeroes from send screen amount row input.	Dan	2018-06-19	1	-1/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix currency-display.js rendering of token amounts.	Dan	2018-06-19	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Revert to updating amount on blur of input change; update gas on blur of ↵	Dan	2018-06-19	2	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	amount input change; validate onchange.
\| \| * \| \| \| \|	Fix unit tests	Alexander Tseung	2018-06-16	1	-3/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Estimate gas limit when the token amount changes. Fix amount input	Alexander Tseung	2018-06-16	4	-16/+18
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update send.utils.js estimateGas tests.	Dan	2018-06-15	2	-5/+20
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add a buffer to new ui gas estimates	Dan	2018-06-15	2	-2/+52
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add hex-prefix to gas estimate result	Alexander Tseung	2018-06-15	2	-4/+4
\| \| \|/ / / /
\| * \| \| \| \|	Merge pull request #4586 from MetaMask/block-idex-phisher	kumavis	2018-06-19	3	-15/+18
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add apparent phishing address to block list
\| \| * \| \| \| \|	lint - fix recipient-blacklist.js	kumavis	2018-06-16	1	-13/+13
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	blacklist - recipient blacklist as js for inline comments	kumavis	2018-06-16	2	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update recipient-blacklist-config.json	kumavis	2018-06-16	1	-0/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add apparent phishing address to block list	Dan Finlay	2018-06-15	1	-0/+1
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	In [this reddit post](https://www.reddit.com/r/Metamask/comments/8r3nsu/help_me_please_somebody_stole_my_ethers/) a user suggests they got some ether stolen after visiting IDEX. Their ether was sent to [this address](https://etherscan.io/address/0x9bcb0a9d99d815bb87ee3191b1399b1bcc46dc77), which is full of comments of people telling similar stories of being phished on IDEX. I think we can safely block this, and probably safe some people some money.
\| * \| \| \| \|	View address of an added token (#4591)	Csaba S	2018-06-19	3	-22/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* adding menu actions for tokens * apply common style
\| * \| \| \| \|	Merge pull request #4585 from MetaMask/ReenableDappReload	Dan Finlay	2018-06-17	3	-1/+67
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Re-enable dapp reload on network change
\| \| * \| \| \|	Re-enable dapp reload on network change	Dan Finlay	2018-06-15	3	-1/+67
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to give devs some time to digest [this blog post](https://medium.com/metamask/breaking-change-no-longer-reloading-pages-on-network-change-4a3e1fd2f5e7) before we making a breaking change to our platform. Makes it easy to re-implement the change.
\| \| \| * /	v4.8.0	Thomas	2018-06-15	2	-8/+10
\| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #4524 from MetaMask/save-brave	Thomas Huang	2018-06-15	2	-3/+18
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Save Brave Fixes #4270
\| \| * \ \	Merge branch 'develop' into save-brave	kumavis	2018-06-15	39	-6789/+6857
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge pull request #4571 from MetaMask/disable-diagnostics	Dan Finlay	2018-06-15	1	-8/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	diagnostics - temporarily disable
\| \| * \| \| \|	diagnostics - temporarily disable	kumavis	2018-06-14	1	-8/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #4566 from MetaMask/notice-phishing	Dan Finlay	2018-06-15	23	-183/+140
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Push new notice on recent phishing incidents
\| \| * \| \| \| \|	test - e2e-beta - from import - handle phishing warning	kumavis	2018-06-14	1	-8/+21
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	test - e2e-beta - separate notice tests into individual tests	kumavis	2018-06-14	1	-1/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	test - e2e - clear phishing warning	kumavis	2018-06-14	2	-1/+7
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	notice-controller - update memStore on boot	kumavis	2018-06-14	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	test - e2e - check for phishing warning	kumavis	2018-06-14	4	-15/+29
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	notices - replace getLatestNotice with getNextNotice	kumavis	2018-06-14	12	-97/+39
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	notices - notices collection is now manually edited	kumavis	2018-06-14	7	-65/+35
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add changelog item.	Kevin Serrano	2018-06-14	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add phishing notice.	Kevin Serrano	2018-06-14	3	-2/+8
\| \| \|/ / / /
\| * \| \| \| \|	Merge pull request #4513 from MetaMask/ValidateEmptyKey	kumavis	2018-06-14	5	-18/+77
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate empty key
\| \| * \ \ \ \	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-06-14	204	-1737/+8267
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	ValidateEmptyKey
\| * \| \| \| \| \|	Merge pull request #4570 from MetaMask/persistence-stream-fix	kumavis	2018-06-14	3	-6/+33
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	background - persistence pipeline - fix persistence bug
\| \| * \| \| \| \| \|	changelog - add note on persistence bug	kumavis	2018-06-14	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	background - persistence pipeline - fix persistence bug	kumavis	2018-06-14	2	-6/+32
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge pull request #4550 from MetaMask/bmd/sign-warning-helplink	bobby dresser	2018-06-14	2	-1/+14
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	add help link to eth_sign warning
\| \| * \| \| \| \|	add help link to eth_sign warning	Bobby Dresser	2018-06-12	2	-1/+14
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge pull request #4560 from MetaMask/nonce-tracker-mutex-fix	Kevin Serrano	2018-06-14	1	-1/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changelog - add note on nonce-lock mutex fix
\| \| * \ \ \ \	Merge branch 'develop' into nonce-tracker-mutex-fix	kumavis	2018-06-13	5	-6532/+6544
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	changelog - add note on nonce-lock mutex fix	kumavis	2018-06-13	1	-0/+1
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	account-import-strategies - ensure privateKey is prefixed before converting ↵	kumavis	2018-06-14	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to buffer
\| \| \| \| * \| \|	test - unit - add assertRejects to test asyncFns	kumavis	2018-06-14	2	-5/+23
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	test - unit - import strategies - properly await async methods	kumavis	2018-06-14	1	-8/+8
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Make account import tests much more specific	Dan Finlay	2018-06-12	3	-6467/+6530
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	However, they no longer seem to work. I'm unclear why this test is failing. The private key being provided should be valid.
\| \| \| \| * \| \|	Improve private key import tests	Dan Finlay	2018-06-08	1	-1/+25
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Improve test formatting	Dan Finlay	2018-06-08	1	-16/+19
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Bump changelog	Dan Finlay	2018-06-06	1	-0/+1
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Add validation for importing empty private key	Dan Finlay	2018-06-06	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously importing an empty string would result in a new empty Keyring object to be constructed, with no notification to the user. Now we render a clear error explaining the mistake.
\| \| \| \| \| * \|	Handle brave throws	Dan Finlay	2018-06-15	1	-3/+11
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	changelog - version fix	kumavis	2018-06-09	1	-2/+0
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	changelog 4270	Jenny Pollack	2018-06-08	1	-0/+3
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Merge branch 'develop' into save-brave	Jenny Pollack	2018-06-08	186	-1530/+8026
\| \| \| \| \| \|\ \
\| \| \| \| \| * \| \|	lint	Jenny Pollack	2018-06-07	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	remove loglevel	Jenny Pollack	2018-06-07	1	-2/+1
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	preferred first languauge - check for Brave	Jenny Pollack	2018-06-07	1	-8/+5
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	first language - add check for brave browser on getAcceptLanguages	Jenny Pollack	2018-06-07	1	-1/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	use latest eth-trezor-keyring	brunobar79	2018-06-26	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	fixes	brunobar79	2018-06-23	3	-6552/+6543
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	point to new version of eth-trezor-keyring	brunobar79	2018-06-23	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	clean up	Bruno	2018-06-13	1	-16/+19
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	fix merge conflicts	Bruno	2018-06-13	12	-125/+146
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of git://github.com/Metamask/metamask-extension into ↵	Bruno	2018-06-13	12	-6576/+6595
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	develop
\| \| * \| \| \| \| \| \|	Merge pull request #4558 from MetaMask/stop-reload-on-network-change	Dan Finlay	2018-06-13	3	-65/+20
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop reload on network change
\| \| \| * \ \ \ \ \ \	Merge branch 'develop' into stop-reload-on-network-change	Erik Marks	2018-06-13	172	-7992/+14314
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge pull request #4557 from MetaMask/nonce-tracker-mutex-fix	kumavis	2018-06-13	4	-40/+47
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \|	Bug: Mutex locks not released on error
\| \| \| * \| \| \| \| \| \|	controllers - transaction - prefer log over console	kumavis	2018-06-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	metamask - ensure all nonce locks are released	kumavis	2018-06-13	4	-17/+18
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	nonce-tracker - wrap nonce calculations in try-catch and release lock on error	kumavis	2018-06-13	1	-22/+28
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge pull request #4556 from MetaMask/WatchTestReload	Dan Finlay	2018-06-13	2	-6468/+6525
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|	Add script for auto-re-running unit tests on changes
\| \| \| * \| \| \| \| \| \|	Add script for auto-re-running tests on change	Dan Finlay	2018-06-13	2	-6468/+6525
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`npm run watch:test:unit` will re-run the unit test suite whenever a file in `app`, `ui`, or `test` changes.
\| \| * \| \| \| \| \| \|	Merge pull request #4554 from whymarrh/fix-e2e-profile-path	Whymarrh Whitby	2018-06-13	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|	Fix temp Chrome profile path used for e2e tests
\| \| \| * \| \| \| \| \|	Fix e2e test Chrome profile paths	Whymarrh Whitby	2018-06-13	1	-1/+1
\| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge pull request #4535 from MetaMask/i4508-fix-gas-edit-confirm-screen	Dan J Miller	2018-06-11	2	-2/+2
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|	Fix gas limit editing on confirm screen
\| \| \| * \| \| \| \|	Access correct property from state in confirm screen components gatherTxMeta()	Dan	2018-06-08	2	-2/+2
\| \| \|/ / / / /
\| \| \| * \| \| \|	update changelog	Erik Marks	2018-06-13	1	-0/+3
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	undo package.json and package-lock.json changes	Erik Marks	2018-06-13	2	-6817/+6539
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	removed auto-reload.js, moved global web3 export to inpage.js	Erik Marks	2018-06-13	2	-43/+16
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	wip	Erik Marks	2018-06-13	4	-6580/+6839
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' of https://github.com/brunobar79/metamask-extension ↵	Bruno	2018-06-13	0	-0/+0
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	into develop
\| \| * \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into develop	Bruno	2018-06-06	67	-317/+841
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into develop	Bruno	2018-05-31	149	-17174/+5990
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into develop	Bruno	2018-05-17	97	-3419/+8695
\| \| \|\ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \|	upgrade eth-trezor-keyring	Bruno	2018-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	move TrezorKeyring to its own package	Bruno	2018-06-13	6	-1383/+53
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	added support for signPersonalMessage	Bruno	2018-06-13	1	-28/+45
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	clean up	Bruno	2018-06-11	1	-92/+21
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	sign transactions is pretty close	Bruno	2018-06-11	1	-49/+77
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	balances working	Bruno	2018-06-11	3	-6/+22
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	add account working	Bruno	2018-06-11	2	-8/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	clean up	Bruno	2018-06-11	2	-8/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	initial trezor support	Bruno	2018-06-10	14	-6478/+8369
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #4523 from MetaMask/i4462-FixResetBug	Dan Finlay	2018-06-08	3	-6/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where reset account would not work.
\| * \| \| \| \| \| \| \| \|	Fix bug where reset account would not work.	Dan Finlay	2018-06-07	3	-6/+12
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4462 Ensures that resetAccount() can work on non-stock providers. I'm unclear how this was ever working, this code hasn't moved in months, but users report it recently breaking. Maybe we only recently pushed it to prod.
* \| \| \| \| \| \| \| \|	Merge pull request #4090 from MetaMask/i3725-refactor-send-component-	Dan J Miller	2018-06-07	163	-1349/+7527
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I3725 Refactor Send Component
\| * \| \| \| \| \| \| \| \|	Bump beta e2e timeouts on faucet page.	Dan	2018-06-07	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into i3725-refactor-send-component-	Dan	2018-06-07	7	-141/+218
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #4385 from MetaMask/ci-test-e2e-beta	kumavis	2018-06-07	6	-141/+217
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	CI - Add e2e-beta tests
\| * \| \| \| \| \| \| \| \|	Improve e2e beta tests by adding appropriate waits.	Dan	2018-06-07	2	-47/+56
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Conditionally close info page in beta e2e tests.	Dan	2018-06-06	2	-4/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'whymarrh/ci-test-e2e-beta' into ci-test-e2e-beta	Dan	2018-06-06	2	-63/+79
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix e2e beta tests to account for add-token updates and actual behaviour of ↵	Dan	2018-06-06	2	-14/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tab openings on installation.
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into ci-test-e2e-beta	Dan	2018-06-06	29	-70/+452
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Adjust delays in new beta e2e tests	Whymarrh Whitby	2018-06-02	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	ci - breakout firefox helpers into scripts	kumavis	2018-06-02	3	-23/+19
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	ci - run e2e:beta tests	kumavis	2018-06-02	1	-4/+53
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #4477 from MetaMask/i3073-block-gravityforms	kumavis	2018-06-07	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Block gravityforms.com from web3 injection
\| * \| \| \| \| \| \| \| \| \|	Block gravityforms.com from web3 injection	Dan Finlay	2018-06-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3073
\| \| \| \| * \| \| \| \| \| \|	Merge branch 'develop' into i3725-refactor-send-component-	Dan	2018-06-07	33	-131/+394
\| \| \| \| \|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4512 from MetaMask/test-metamask-no-diagnostics	Thomas Huang	2018-06-07	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test - metamask-controller - disable diagnostics
\| * \| \| \| \| \| \| \| \| \| \|	test - metamask-controller - disable diagnostics	kumavis	2018-06-06	1	-0/+3
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4414 from scsaba/recipient-blacklist	kumavis	2018-06-07	5	-1/+137
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow sending to ganache default accounts on main net
\| * \| \| \| \| \| \| \| \| \| \|	remove generating blocked accounts and use a config file instead	Csaba Solya	2018-05-31	4	-29/+30
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fix documentation	Csaba Solya	2018-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	adding tests for recipient blacklist checker	Csaba Solya	2018-05-30	3	-5/+83
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	adding transaction controller tests	Csaba Solya	2018-05-30	2	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	initial implementation	Csaba Solya	2018-05-30	2	-1/+41
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui	kumavis	2018-06-07	4	-19/+47
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle errors for null selected address after Importing account (json or private key)
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' into handle-import-account-failure-in-ui	Dan	2018-06-05	23	-60/+366
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into handle-import-account-failure-in-ui	Dan	2018-06-03	47	-282/+458
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix then-catch + error handling in import-account	Dan	2018-05-31	2	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Importing account by json and private key shows error and does not change ↵	Dan	2018-05-31	4	-16/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	account if no selectedAddress comes after import.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4514 from whymarrh/account-label-type-check	kumavis	2018-06-07	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add account type assertion to PreferencesController#setAccountLabel
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Add account type assertion to PreferencesController#setAccountLabel	Whymarrh Whitby	2018-06-06	1	-0/+1
\| \| \|_\|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n - ja improvements	03-26	2018-06-07	7	-18/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4515 from MetaMask/master	Thomas Huang	2018-06-07	2	-2/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \|	Merge Master into Develop
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4511 from MetaMask/v4.7.4	kumavis	2018-06-06	8	-49/+102
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 4.7.4
\| \| * \| \| \| \| \| \| \| \| \| \| \|	4.7.4v4.7.4	kumavis	2018-06-06	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:MetaMask/metamask-extension into v4.7.4	kumavis	2018-06-06	2	-2/+7
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / \| \|/\| / / / / / / / / / / / \| \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4490 from MetaMask/v4.7.3	Thomas Huang	2018-06-05	20	-41/+293
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 4.7.3
\| \| * \| \| \| \| \| \| \| \| \| \| \|	changelog - add note on new modalv4.7.3	kumavis	2018-06-05	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into v4.7.3	kumavis	2018-06-05	3	-3/+3
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	4.7.3	kumavis	2018-06-05	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4507 from whymarrh/fix-account-order	Dan J Miller	2018-06-07	10	-45/+25
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Render accounts in keyring order
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix mock addresses used for integration tests	Whymarrh Whitby	2018-06-06	6	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix account list order for the old UI	Whymarrh Whitby	2018-06-06	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Render the accounts in keyring order	Whymarrh Whitby	2018-06-06	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused identities reducer from UI	Whymarrh Whitby	2018-06-06	2	-22/+0
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4509 from whymarrh/wallet-view-assertion	kumavis	2018-06-06	1	-5/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add explicit selectedAddress assertion to the wallet view
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove selectedIdentity prop from wallet view	Whymarrh Whitby	2018-06-06	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The selectedIdentity property is computed based on the selectedAddress which means that using both the selectedAddress and the selectedIdentity is redundant. In the case of the Array#find call on the set of keyrings, we wouldn't have a situation where one is included and the other isn't. This changeset removes the selectedIdentity from the wallet view because it isn't needed.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Ensure selectedAddress exists when render wallet	Whymarrh Whitby	2018-06-06	1	-0/+4
\| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4506 from MetaMask/diagnostics-multivault	kumavis	2018-06-06	5	-43/+89
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	diagnostics - add multiple vault detection to diagnostics reporting
\| * \| \| \| \| \| \| \| \| \| \| \|	diagnostics - fix reportMultipleKeyrings call	kumavis	2018-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	diagnostics - minor fixes	kumavis	2018-06-06	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	lint - fix diagnostics reporter	kumavis	2018-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	diagnostics - rewrite bug-notifier as diagnostics-reporter	kumavis	2018-06-06	5	-71/+84
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	add multivault detection to diagnostics reporting	kumavis	2018-06-06	1	-0/+33
\|/ / / / / / / / / / / /
\| \| \| \| \| \| \| \| * \| \| \|	Merge branch 'develop' into i3725-refactor-send-component-	Dan	2018-06-05	29	-72/+400
\| \| \| \| \| \| \| \| \|\ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Update hide-token-confirmation-modal.js to use new modalState schema (#4482)	Dan J Miller	2018-06-05	3	-3/+3
\| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55). * Fix modalState props
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4486 from MetaMask/i4475-ClearUnknownIdentities	kumavis	2018-06-05	5	-4/+135
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear unknown identities
\| * \| \| \| \| \| \| \| \| \| \|	Record identity before deleting it	Dan Finlay	2018-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Mock notifier in test	Dan Finlay	2018-06-05	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \|