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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Increase suggested gas percentile to 65 (#5359)	Dan Finlay	2018-10-05	2	-2/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Increase suggested gas percentile to 65 I keep submitting transactions then waiting a long time. Apparently 50th percentile isn't enough. * Update test for getGasPrice
* \| \| \| \|	Merge pull request #5412 from whymarrh/after-install-steps	Whymarrh Whitby	2018-10-04	1	-9/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't open MetaMask website after install
\| * \| \| \| \|	Don't open metamask.io after install anymore	Whymarrh Whitby	2018-10-02	1	-9/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5419 from whymarrh/remove-copy-contract-address	Whymarrh Whitby	2018-10-04	5	-23/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Remove "Copy Contract Address" from token options
\| * \| \| \| \|	Remove "Copy Contract Address" from token options	Whymarrh Whitby	2018-10-04	5	-23/+2
\| \| \| \| \| \|
* \| \| \| \| \|	fix typos (#5418)	satboy78	2018-10-04	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #5406 from whymarrh/bypass-phishing-warning	Dan Finlay	2018-10-02	6	-4/+116
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Allow users to bypass phishing warning
\| * \| \| \|	Style links on phishing page with an underline	Whymarrh Whitby	2018-10-02	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Style links on phishing page with cursor: pointer;	Whymarrh Whitby	2018-10-02	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Hook MetaMaskController up with phishing detection page	Whymarrh Whitby	2018-10-02	2	-2/+60
\| \| \| \| \|
\| * \| \| \|	Add domain whitelist method to MetaMaskController	Whymarrh Whitby	2018-10-02	1	-0/+11
\| \| \| \| \|
\| * \| \| \|	Add ability to whitelist a blacklisted domain at runtime	Whymarrh Whitby	2018-10-02	2	-0/+37
\| \| \| \| \|
\| * \| \| \|	Update title and copy of phishing warning page	Whymarrh Whitby	2018-10-02	1	-2/+6
\|/ / / /
* \| \| \|	Merge pull request #5409 from MetaMask/provider-fix-url-auth	Thomas Huang	2018-10-02	2	-189/+167
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	bugfix - bump provider for url auth support
\| * \| \| \|	bugfix - bump provider for url auth support	kumavis	2018-10-02	2	-189/+167
\|/ / / /
* \| \| \|	Merge pull request #5329 from whymarrh/confirm-features	Whymarrh Whitby	2018-10-02	13	-25/+260
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add batch reject to confirm screen
\| * \| \| \|	Only use current network txs when calculating "Reject All"	Whymarrh Whitby	2018-10-02	1	-1/+6
\| \| \| \| \|
\| * \| \| \|	Switch page-container__footer-* for header and footer tags	Whymarrh Whitby	2018-10-02	3	-27/+27
\| \| \| \| \|
\| * \| \| \|	Reword batch reject confirm as "Reject All"	Whymarrh Whitby	2018-10-02	2	-1/+4
\| \| \| \| \|
\| * \| \| \|	Confirm rejecting multiple transactions with modal	Whymarrh Whitby	2018-10-02	8	-4/+103
\| \| \| \| \|
\| * \| \| \|	s/Cancel/Reject/ on confirm screen for clarity	Whymarrh Whitby	2018-10-02	2	-1/+8
\| \| \| \| \|
\| * \| \| \|	Add "Cancel All" button to confirm footer	Whymarrh Whitby	2018-10-02	5	-4/+82
\| \| \| \| \|
\| * \| \| \|	Have PageContainerFooter take children node	Whymarrh Whitby	2018-10-02	3	-21/+64
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5380 from whymarrh/send-with-hex-data	Whymarrh Whitby	2018-10-02	15	-29/+87
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Allow sending transactions with hex data and no recipient
\| * \| \| \| \|	Recipient not required on send screen when hex data present	Whymarrh Whitby	2018-10-01	5	-4/+17
\| \| \| \| \| \|
\| * \| \| \| \|	Rework estimateGas logic	Whymarrh Whitby	2018-10-01	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The tests still pass!
\| * \| \| \| \|	Update gas when hex data changes on send screen	Whymarrh Whitby	2018-10-01	9	-14/+56
\| \| \| \| \| \|
\| * \| \| \| \|	Update send.utils.test to with better mocks	Whymarrh Whitby	2018-10-01	1	-5/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Allow sending transactions with hex data and no recipient	Whymarrh Whitby	2018-10-01	1	-2/+2
\| \|/ / / /
* \| \| \| \|	Merge pull request #5400 from whymarrh/dot-only-hunter	Whymarrh Whitby	2018-10-02	2	-8/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Remove dot-only-hunter package
\| * \| \| \|	npm uninstall dot-only-hunter	Whymarrh Whitby	2018-10-01	2	-7/+0
\| \| \| \| \|
\| * \| \| \|	Remove dot-only-hunter from test:unit script	Whymarrh Whitby	2018-10-01	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #5402 from whymarrh/fix-e2e-tests	Whymarrh Whitby	2018-10-01	2	-17/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix e2e tests for adding custom RPC endpoints
\| * \| \| \|	Fix error message shown in assertElementNotPresent e2e helper fn	Whymarrh Whitby	2018-10-01	1	-3/+1
\| \| \| \| \|
\| * \| \| \|	Don't log errors extraneously in e2e tests	Whymarrh Whitby	2018-10-01	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Update e2e tests for adding mutliple custom RPC endpoints	Whymarrh Whitby	2018-10-01	1	-12/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refs 56965b3 Refs #5267 The list of custom RPC endpoints is no longer limited to 3 entries so the test is now to confirm that they _all_ show up.
\| * \| \| \|	Switch string concatenation to template string	Whymarrh Whitby	2018-10-01	1	-1/+1
\|/ / / /
* \| \| \|	Improvement: Reposition customize gas error (#5265)	Sean	2018-10-01	1	-2/+4
\| \| \| \|
* \| \| \|	Merge pull request #5325 from sam-aldis/patch-1	Dan Finlay	2018-10-01	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Debounce was breaking in update
\| * \| \| \|	Debounce was breaking in update	UKJP Design	2018-09-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As found in issue here: https://github.com/MetaMask/metamask-extension/issues/5064 Pinned the version at 1.1.0 until the new version with breaking changes can be intergrated.
* \| \| \| \|	support editable customRPC (#5267)	HackyMiner	2018-09-29	6	-7/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* support editable customRPC #5246 * remove rpcList size restriction
* \| \| \| \|	Merge pull request #5271 from farahbrunache/develop	kumavis	2018-09-28	2	-0/+1241
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	Added Haitian Creole translations
\| * \| \| \|	i18n - ht - fix json formatting	kumavis	2018-09-28	1	-4/+1
\| \| \| \| \|
\| * \| \| \|	i18n - index - fix whitespace	kumavis	2018-09-28	1	-21/+21
\| \| \| \| \|
\| * \| \| \|	fixed quotes in line 749	Farah Brunache	2018-09-21	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	fixed some grammatical errors	Farah Brunache	2018-09-17	1	-15/+13
\| \| \| \| \|
\| * \| \| \|	added Haitian Creole translations	Farah Brunache	2018-09-16	2	-20/+1266
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5383 from MetaMask/Version-4.12.0	Dan Finlay	2018-09-28	3	-15/+64
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Version 4.12.0
\| * \| \| \| \|	Correct changelog datev4.12.0	Dan Finlay	2018-09-28	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix package lock	Dan Finlay	2018-09-28	1	-24/+36
\| \| \| \| \| \|
\| * \| \| \| \|	Version 4.12.0	Dan Finlay	2018-09-28	2	-2/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into Version-4.12.0	Dan Finlay	2018-09-28	3	-5/+38
\|/\| \| \| \| \| \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge pull request #5349 from MetaMask/v4.11.1	Kevin Serrano	2018-09-26	2	-6505/+6523
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Version 4.11.1
\| \| * \| \| \|	remove comment about etherdelta	bobby dresser	2018-09-26	1	-1/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Version 4.11.1	Dan Finlay	2018-09-26	2	-6505/+6524
\| \|/ / / /
\| * \| \| \|	Merge pull request #5346 from MetaMask/v4.11.1	Dan Finlay	2018-09-26	19	-6626/+6956
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	v4.11.1
\| \| * \| \| \|	update package-lock.json	brunobar79	2018-09-26	1	-6450/+6442
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into v4.11.1	Bruno Barbieri	2018-09-25	2	-1/+5
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #5313 from MetaMask/Version-4.11.0v4.11.0	Thomas Huang	2018-09-25	2	-2/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 4.11.0
\| \| * \| \| \| \|	Version 4.11.0	Dan Finlay	2018-09-22	2	-2/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #5079 from MetaMask/v4.9.3	kumavis	2018-08-17	53	-76/+774
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 4.9.3
\| \| \| * \| \| \|	bump to v4.11.1	brunobar79	2018-09-25	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge pull request #5084 from MetaMask/ledger-support-without-provider	Dan Finlay	2018-08-21	18	-194/+532
\| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ledger support (in case of rollback)
* \| \| \| \| \| \|	Update extension badge with correct signTypedData count	Whymarrh Whitby	2018-09-27	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fix tld bug (#5250)	Phyrex Tsai	2018-09-27	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5053 from hahnmichaelf/esdb-support	Thomas Huang	2018-09-27	4	-3/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to ESDB in local phishing.html
\| * \| \| \| \| \| \|	additional lint-test fix	hahnmichaelf	2018-08-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix for lint-test	hahnmichaelf	2018-08-14	3	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixed names	hahnmichaelf	2018-08-14	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Re-added GA script	hahnmichaelf	2018-08-14	2	-1/+20
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	change name	hahnmichaelf	2018-08-14	2	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	base - working. fixes #4774	hahnmichaelf	2018-08-13	4	-21/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Close transaction details modal when clicking speed up	Alexander Tseung	2018-09-27	2	-4/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5367 from dasilvarosa/patch-1	Whymarrh Whitby	2018-09-27	1	-1/+33
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update ledger-logo.svg
\| * \| \| \| \| \| \| \|	Update ledger-logo.svg	David da Silva Rosa	2018-09-26	1	-1/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Noticed the implementation used the old Ledger logo. Simply replaced the .svg without testing, so hope someone can test the extension before merging 😄 .
* \| \| \| \| \| \| \| \|	bugfix: bump version of inpage provider	bitpshr	2018-09-27	2	-27/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	EIP-1102: Add deprecation message (#5353)	Paul Bouchon	2018-09-26	2	-6/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5368 from MetaMask/bugfix-sign-typed-data	kumavis	2018-09-26	2	-178/+164
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	bugfix: update eth_signTypedData_v3 parameter order
\| * \| \| \| \| \| \| \|	bugfix: update eth_signTypedData_v3 parameter order	bitpshr	2018-09-26	2	-178/+164
\|/ / / / / / / /
* \| \| \| \| \| \| \|	deps - eth-block-tracker@4.0.2 for safe-eventemitter (#5363)	kumavis	2018-09-26	2	-44/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5332 from MetaMask/ui-unit-tests	Thomas Huang	2018-09-26	18	-24/+2123
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some Ui tests
\| * \| \| \| \| \| \| \|	Some Ui tests	tmashuang	2018-09-25	18	-24/+2123
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Bugfix: Upgrade json-rpc-engine (#5348)	Paul Bouchon	2018-09-26	3	-31/+246
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Bugfix: bump version of json-rpc-engine * Increase delay * Update lockfile * deps - json-rpc-engine@3.7.4
* \| \| \| \| \| \| \| \|	Merge pull request #5361 from MetaMask/firefox-fixes	kumavis	2018-09-26	4	-61/+2681
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mozilla addon linter + Firefox builds passing
\| * \| \| \| \| \| \| \| \|	add mozilla lint job	brunobar79	2018-09-26	3	-29/+27
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	remove css sourcemaps in prod builds	brunobar79	2018-09-26	1	-1/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add build step to mozilla-lint	Dan Finlay	2018-09-26	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add mozilla linter to dist script instead of main test	Dan Finlay	2018-09-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add mozilla addon linter to test suite	Dan Finlay	2018-09-26	2	-58/+2672
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5351 from MetaMask/fix-gh-pages-job	Bruno Barbieri	2018-09-26	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gh-pages job
\| * \| \| \| \| \| \| \| \|	Fix gh-pages job	Bruno Barbieri	2018-09-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix MetaMask web3 version (#5352)	Esteban Miño	2018-09-26	1	-0/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5340 from whymarrh/fix-first-time-flow-2	Whymarrh Whitby	2018-09-25	1	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix height of first-time-flow container, again
\| * \| \| \| \| \| \| \| \|	Fix height of first-time-flow container, again but different	Whymarrh Whitby	2018-09-25	1	-1/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5337 from whymarrh/eslint-ignore-coverage	Whymarrh Whitby	2018-09-25	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add test coverage dir to eslintignore
\| * \| \| \| \| \| \| \| \|	eslintignore: Add test coverage dir to eslintignore	Whymarrh Whitby	2018-09-25	1	-0/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5282 from MetaMask/tx-cancel-ui	Alexander Tseung	2018-09-25	69	-372/+1218
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal.
\| * \| \| \| \| \| \| \| \|	Fix multiplyCurrencies. Add onClose prop for Modal component. Remove ↵	Alexander Tseung	2018-09-21	10	-58/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hideModal from modal components.
\| * \| \| \| \| \| \| \| \|	Add unit tests	Alexander Tseung	2018-09-20	9	-15/+342
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix integration tests	Alexander Tseung	2018-09-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix unit tests	Alexander Tseung	2018-09-20	1	-5/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add transition effect to TransactionListItemDetails expander	Alexander Tseung	2018-09-20	2	-13/+29
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add TransactionDetails modal	Alexander Tseung	2018-09-20	10	-9/+125
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Switch existing modals from using Notification to Modal. Remove Notification ↵	Alexander Tseung	2018-09-20	38	-323/+518
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	component. Add CancelTransaction modal
\| * \| \| \| \| \| \| \| \|	Add withModalProps HOC	Alexander Tseung	2018-09-20	2	-0/+22
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix Transaction view styles	Alexander Tseung	2018-09-20	3	-3/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add Modal component	Alexander Tseung	2018-09-20	7	-0/+186
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactor ConfirmPageContainerError to ErrorMessage	Alexander Tseung	2018-09-20	8	-18/+14
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5328 from whymarrh/fix-first-time-flow	Whymarrh Whitby	2018-09-25	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Fix height of first-time-flow container
\| * \| \| \| \| \| \| \| \|	Fix height of first-time-flow container	Whymarrh Whitby	2018-09-24	1	-0/+1
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5310 from MetaMask/getPendingNonce-hotfix	Thomas Huang	2018-09-24	2	-1/+15
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Adds getPendingNonce method to provider initialization in metamask-controller.
\| * \| \| \| \| \| \| \|	Adds getPendingNonce method to provider initialization options in ↵	Dan Miller	2018-09-22	2	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	metamask-controller.
* \| \| \| \| \| \| \| \|	Merge pull request #5241 from MetaMask/refactor-settings	Alexander Tseung	2018-09-21	18	-810/+814
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Refactor settings page to use JSX and follow component file folder st…
\| * \| \| \| \| \| \| \|	Fix translation casing	Alexander Tseung	2018-09-21	2	-6/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add Current Conversion Updated string to translations	Alexander Tseung	2018-09-20	2	-1/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Refactor settings page to use JSX and follow component file folder structure	Alexander Tseung	2018-09-20	18	-810/+815
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Remove EAL google analytics link. (#5081)	Dan Finlay	2018-09-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Harry said he's not using this for Ether-Address-Lookup anymore, so removing it.
* \| \| \| \| \| \| \|	Update messages.json (#5280)	Kevin Serrano	2018-09-20	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added some translations for Chinese Traditional via Chainsights!
* \| \| \| \| \| \| \|	Merge pull request #5298 from whymarrh/fix-tx-spinner	Whymarrh Whitby	2018-09-20	5	-24/+23
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Fix loading screen height
\| * \| \| \| \| \| \|	Move main-container wrapper div into its own class	Whymarrh Whitby	2018-09-20	4	-2/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Prevent loading screen from overlaying the app bar	Whymarrh Whitby	2018-09-20	3	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refs #4417 This change is functional copy of 3893469 that solves the problem in a way that doesn't depend on the height of the app bar since the app bar isn't a fixed height in the smaller views.
\| * \| \| \| \| \| \|	Make the LoadingScreen component 100% as tall as its container	Whymarrh Whitby	2018-09-20	1	-10/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove unused loading-overlay--full-screen CSS styles	Whymarrh Whitby	2018-09-20	1	-7/+0
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refs #4417
* \| \| \| \| \| \|	Merge pull request #5290 from MetaMask/i5289-gettokendata	Dan Finlay	2018-09-19	2	-2/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix exception thrown on getTokenData
\| * \| \| \| \| \| \|	Fix exception thrown on getTokenData	Alexander Tseung	2018-09-19	2	-2/+24
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #5268 from lastblocklabs/issue-5231v4.10.0	Dan Finlay	2018-09-18	1	-3/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvement: Allow enter to submit password form
\| * \| \| \| \| \| \|	Improvement: Allow enter to submit password form	Sean Rabaut	2018-09-15	1	-3/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5281 from MetaMask/4.10.0	Dan Finlay	2018-09-18	2	-2/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 4.10.0
\| * \| \| \| \| \| \| \|	Version 4.10.0	tmashuang	2018-09-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Bump Changelog	tmashuang	2018-09-18	1	-1/+10
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #4803 from MetaMask/eip-712	Dan Finlay	2018-09-18	10	-179/+582
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|	EIP-712: Sign typed data
\| * \| \| \| \| \| \|	Merge branch 'develop' into eip-712	Paul Bouchon	2018-09-18	9	-18/+74
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	compute and display checksummed hash in selected-account component (#5255)	Chad Grimaldi	2018-09-16	2	-3/+20
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Improvement: Increase click area for arrows (#5264)	Sean	2018-09-16	2	-6/+18
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5270 from MetaMask/fix-retry	Alexander Tseung	2018-09-16	2	-5/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix speed up functionality
\| * \| \| \| \| \| \| \|	Fix speed up functionality	Alexander Tseung	2018-09-15	2	-5/+12
\|/ / / / / / / /
* \| / / / / / /	EIP-1102: Transitionary API (#5256)	Paul Bouchon	2018-09-15	2	-0/+20
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5261 from lastblocklabs/style-fix-5242	Whymarrh Whitby	2018-09-15	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lower input z-index to prevent overlap - follow up style fix to #5242
\| * \| \| \| \| \| \|	follow up style fix to #5242	chadmg	2018-09-14	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5262 from lastblocklabs/issue-5183-jsonimport	Alexander Tseung	2018-09-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Bug Fix: #5183 history not defined
\| * \| \| \| \| \| \|	Bug Fix: #5183 history not defined	Sean Rabaut	2018-09-14	1	-1/+1
\|/ / / / / / /
\| * \| \| \| \| \|	Update new method namespace from v2 to v3	bitpshr	2018-09-14	4	-9/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update error message for chainId mis-match	bitpshr	2018-09-14	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Implement latest EIP-712 protocol	bitpshr	2018-09-14	10	-179/+582
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5247 from MetaMask/AddDocs	Dan Finlay	2018-09-14	3	-46/+60
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add jsdoc gh-pages script
\| * \| \| \| \| \|	Add jsdoc gh-pages script	Dan Finlay	2018-09-13	3	-46/+60
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5182 from MetaMask/tx-activity	Alexander Tseung	2018-09-13	69	-328/+1449
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Transaction Details to the Transaction List view
\| * \| \| \| \| \| \|	Fix identicon address. Fix styling of New Contract recipient. Fix Activity ↵	Alexander Tseung	2018-09-13	9	-18/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log initial ETH value. Add timestamps to Activity Log events
\| * \| \| \| \| \| \|	Fix tests. Add className to Identicon ethLogos.	Alexander Tseung	2018-09-13	5	-10/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add WEI to getEthConversionFromWeiHex	Alexander Tseung	2018-09-13	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add transaction details to TransactionListItem component	Alexander Tseung	2018-09-13	3	-37/+46
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add TransactionListItemDetails component	Alexander Tseung	2018-09-13	6	-0/+203
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add TransactionBreakdown component	Alexander Tseung	2018-09-13	9	-0/+240
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add tests for TransactionActivityLog. Make changes to rendering events	Alexander Tseung	2018-09-13	10	-42/+349
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Edit styling of cards variant of SenderToRecipient component	Alexander Tseung	2018-09-13	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add HexToDecimal component	Alexander Tseung	2018-09-13	4	-161/+48
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add tests for Card component	Alexander Tseung	2018-09-13	2	-1/+26
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Allow denominations in CurrencyDisplay component	Alexander Tseung	2018-09-13	6	-16/+85
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Allow more than 2 variable substitutions in the translation function	Alexander Tseung	2018-09-13	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add raised type buttons to Button component. Refactor all buttons within app ↵	Alexander Tseung	2018-09-13	18	-94/+180
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to Button components
\| * \| \| \| \| \| \|	Add ActivityLog component	Alexander Tseung	2018-09-13	10	-1/+264
\| \|/ / / / / /
* / / / / / /	increase z-index of send-to input to allow for right-click (#5242)	Chad Grimaldi	2018-09-13	1	-0/+4
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5240 from MetaMask/i5238-account-balance-update	Dan Finlay	2018-09-12	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure account-tracker currentBlockNumber is set on first block update.
\| * \| \| \| \| \|	Ensure account-tracker currentBlockNumber is set on first block update.	Dan Miller	2018-09-11	1	-0/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5237 from whymarrh/update-fx	Dan Finlay	2018-09-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Firefox version for e2e tests
\| * \| \| \| \| \| \|	Update Firefox version for e2e tests	Whymarrh Whitby	2018-09-12	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #5236 from whymarrh/excise-config-manager	Dan Finlay	2018-09-12	13	-490/+76
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Delete ConfigManager class and replace its valid usages
\| * \| \| \| \| \|	Default NoticeController ctor opts to empty obj	Whymarrh Whitby	2018-09-12	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add html reporter to test coverage output	Whymarrh Whitby	2018-09-12	2	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Delete ConfigManager, replacing its usages with PreferencesController	Whymarrh Whitby	2018-09-12	10	-488/+73
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5216 from MetaMask/tx-cancel	Frankie	2018-09-11	4	-2/+98
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add createCancelTransaction method
\| * \| \| \| \| \|	Add createCancelTransaction method	Alexander Tseung	2018-09-11	4	-2/+98
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5223 from whymarrh/tx-error-tooltips	Frankie	2018-09-11	6	-31/+78
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show transaction error message tooltips for statuses
\| * \| \| \| \| \| \|	Show failed tx txMeta.err in tooltips	Whymarrh Whitby	2018-09-09	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Show failed tx RPC error messages in tooltips	Whymarrh Whitby	2018-09-09	2	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changeset displays the error messages attached to txMeta for a failed tx in a tooltip on hover in the tx list view. This will only display for txs with the `txMeta.err.rpc.value` property, not all failed txs.
\| * \| \| \| \| \| \|	Don't render tooltips without titles	Whymarrh Whitby	2018-09-09	1	-0/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rewrite Tooltip component as ES6	Whymarrh Whitby	2018-09-09	3	-30/+55
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Attach the RPC error value to txMeta	Whymarrh Whitby	2018-09-09	1	-0/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #5229 from whymarrh/fix-confirm-seed-words	Dan Finlay	2018-09-11	1	-2/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear old seed words when importing new seed words
\| * \| \| \| \| \| \|	Clear old seed words when importing new seed words	Whymarrh Whitby	2018-09-11	1	-2/+8
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #5228 from ConnorChristie/memory-leaks	Dan Finlay	2018-09-11	3	-8/+12
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Upgrade obs-store and fix memory leaks
\| * \| \| \| \| \|	Upgrade obs-store and fix memory leaks	Connor Christie	2018-09-10	3	-8/+12
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5212 from whymarrh/yo-delete	Whymarrh Whitby	2018-09-07	1	-3/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused .yo-rc.json file
\| * \| \| \| \| \|	Remove unused .yo-rc.json file	Whymarrh Whitby	2018-09-06	1	-3/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5213 from whymarrh/regen-lockfile	Whymarrh Whitby	2018-09-07	1	-48/+125
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Regenerate lockfile
\| * \| \| \| \| \|	Regenerate lockfile	Whymarrh Whitby	2018-09-06	1	-48/+125
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refs #5138
* \| \| \| \| \|	Use correct loading message when connecting to Kovan (#5189)	Eugene Marinelli	2018-09-06	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Use correct loading message when connecting to Kovan * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md
* \| \| \| \| \|	Merge pull request #5206 from whymarrh/fix-send-content-tests	Whymarrh Whitby	2018-09-06	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix assertion of missing child component
\| * \| \| \| \| \|	Fix assertion of missing child component	Whymarrh Whitby	2018-09-06	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5188 from taobun/develop	Dan J Miller	2018-09-05	3	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	edit decimal check in old-ui/
\| * \| \| \| \| \|	fix check valid decimals code in new ui	bunoi	2018-09-05	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	edit decimal check in old-ui/	bunoi	2018-09-03	2	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5167 from MetaMask/fix-watcAsset-images	Dan Finlay	2018-09-05	16	-11/+54
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix images for watched tokens
\| * \| \| \| \| \| \|	add assetImages to development states	Esteban MIno	2018-08-31	3	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	balance components using selectors	Esteban MIno	2018-08-31	3	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix integration test for asset images selectors	Esteban MIno	2018-08-31	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix watched tokens images showing in tx list	Esteban MIno	2018-08-31	4	-4/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix watched asset image rendering on confirm transaction header	Esteban MIno	2018-08-30	2	-1/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix images for watched tokens	Esteban MIno	2018-08-30	8	-4/+28
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5129 from MetaMask/add-sidebar-component	Dan J Miller	2018-09-05	23	-76/+267
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sidebar component
\| * \| \| \| \| \| \| \|	Adds sidebar component and refactors slide in wallet view sidebar to use it.	Dan Miller	2018-08-29	24	-76/+290
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data	Dan J Miller	2018-09-04	11	-4/+77
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds feature flag toggle for the hex data row on the send screen.
\| * \| \| \| \| \| \| \| \|	Adds feature flag toggle for the hex data row on the send screen.	Dan Miller	2018-08-27	11	-4/+77
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5115 from jdetychey/patch-1	Dan J Miller	2018-09-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Typo in "send" translation
\| * \| \| \| \| \| \| \| \| \|	Typo in "send" translation	Jerome de Tychey	2018-08-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	send should be translated as Envoyer instead of Envoyé (which mean sent, not send)
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5191 from eugeneiiim/patch-2	Dan J Miller	2018-09-04	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG.md formatting
\| * \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG.md formatting	Eugene Marinelli	2018-09-04	1	-4/+4
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0	Dan J Miller	2018-09-04	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Update enzyme to the latest version 🚀
\| * \| \| \| \| \| \| \| \| \|	chore(package): update enzyme-adapter-react-15 to version 1.0.6	greenkeeper[bot]	2018-08-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	chore(package): update enzyme to version 3.4.4	greenkeeper[bot]	2018-08-25	1	-1/+1
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5176 from MetaMask/BumpTokenAbi	Dan Finlay	2018-08-31	2	-1/+24
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|	Bump human-standard-token-abi version for DAI support
\| * \| \| \| \| \| \| \| \|	Bump human-standard-token-abi version for DAI support	Dan Finlay	2018-08-31	2	-1/+24
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5155 from MetaMask/i5154-confirm-spinner	Alexander Tseung	2018-08-29	4	-7/+20
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	Fix infinite spinner on failed transactions
\| * \| \| \| \| \| \| \|	Fix infinite spinner on failed transactions	Alexander Tseung	2018-08-29	4	-7/+20
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4606 from MetaMask/WatchTokenFeature	Bruno Barbieri	2018-08-29	24	-6184/+6858
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Add metamask_watchAsset
\| * \| \| \| \| \| \| \|	fix conflicts	Esteban MIno	2018-08-29	123	-2426/+3454
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5121 from MetaMask/i5099-approve	Alexander Tseung	2018-08-28	1	-29/+87
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent token symbol from showing as null in the confirm screen
\| * \| \| \| \| \| \| \| \|	Use eth-contract-metadata data if the token symbol or decimals fail on retrieval	Alexander Tseung	2018-08-23	1	-29/+87
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #4919 from MetaMask/refactor-tx-list	Dan Finlay	2018-08-28	92	-8116/+8102
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	Refactor and Redesign Transaction List
\| * \| \| \| \| \| \| \| \|	Revert changes to tx-list-items.json, and to mock getTransactionCount method ↵	Dan Miller	2018-08-28	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in tx-list-items integration test.
\| * \| \| \| \| \| \| \| \|	Fix tests	Alexander Tseung	2018-08-24	6	-15/+25
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix naming, add eth.getCode check for actions, fix translations for statuses	Alexander Tseung	2018-08-24	24	-97/+85
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Reduce large timeouts	Alexander Tseung	2018-08-24	1	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Increase e2e timeouts for firefox	Alexander Tseung	2018-08-24	1	-7/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change "Outgoing" to "Sent Ether" or "Sent Token"	Alexander Tseung	2018-08-24	4	-8/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix Firefox e2e tests	Alexander Tseung	2018-08-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix integration tests	Alexander Tseung	2018-08-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update package-lock.json	Alexander Tseung	2018-08-24	1	-6126/+6121
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add CurrencyDisplay and TokenCurrencyDisplay components	Alexander Tseung	2018-08-24	14	-74/+425
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix e2e tests	Alexander Tseung	2018-08-24	2	-14/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix integration tests	Alexander Tseung	2018-08-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update retry transaction logic to use network nonce	Alexander Tseung	2018-08-24	3	-12/+46
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix e2e tests	Alexander Tseung	2018-08-24	7	-91/+108
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix integration tests	Alexander Tseung	2018-08-24	14	-28/+47
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix e2e tests	Alexander Tseung	2018-08-24	2	-8/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix shapeshift transactions. Delete unused files	Alexander Tseung	2018-08-24	9	-689/+34
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Show token amounts in TransactionListItem for token transfers	Alexander Tseung	2018-08-24	10	-79/+75
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix tests	Alexander Tseung	2018-08-24	1	-10/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add retry button to TransactionListItem	Alexander Tseung	2018-08-24	11	-50/+175
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Code cleanup	Alexander Tseung	2018-08-24	2	-30/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use css grid for TransactionListItem for responsive layout	Alexander Tseung	2018-08-24	9	-72/+94
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add tOrKey function to I18nProvider	Alexander Tseung	2018-08-24	1	-2/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update package-lock.json	Alexander Tseung	2018-08-24	1	-11/+28
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactor transactions list views. Add redesign components	Alexander Tseung	2018-08-24	40	-381/+936
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Delete unused files	Alexander Tseung	2018-08-24	3	-189/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add withMethodData HOC, add higher-order-component folder	Alexander Tseung	2018-08-24	10	-25/+75
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add TransactionStatus component	Alexander Tseung	2018-08-24	3	-0/+67
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add MenuBar component	Alexander Tseung	2018-08-24	4	-0/+97
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add react-media package to prevent rendering wallet-view twice in the popup view	Alexander Tseung	2018-08-24	2	-1/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactor home screen and remove unused files	Alexander Tseung	2018-08-24	10	-620/+116
\| \| \| \| \| \| \| \| \| \|