1303 Commits

Author	SHA1	Message	Date
Dan Finlay	26ea5993a9	Remove log	2017-03-06 15:36:16 -08:00
Dan Finlay	9bd8c5f723	Render personal_sign messages as utf-8 text ... Calls to `personal_sign` are now: - When hex encoded, preserved as hex encoded, but displayed as utf-8 text. - When not hex encoded, decoded as utf-8 text as hex for signing. - The messages proposed for signing are displayed as UTF-8 text. - When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal. Fixes #1173	2017-03-06 15:04:11 -08:00
Kevin Serrano	72932bdcba	Prevent submission of invalid gas parameters.	2017-03-01 17:03:55 -08:00
Kevin Serrano	0ac1f749fd	Various improvements to gas input.	2017-03-01 14:37:51 -08:00
Dan Finlay	5f378d382e	Only allow numbers in gas inputs	2017-03-01 13:01:23 -08:00
Kevin Serrano	e66035254f	More conflict resolution.	2017-03-01 10:04:25 -08:00
Kevin Serrano	0a3849ec84	Fix merge conflicts.	2017-03-01 10:01:21 -08:00
Dan Finlay	69d4aafc3e	Add ens recognition to send form input ... Attempts to lookup `.eth` addresses on ENS. Is currently failing. I've written an isolation example of the problem here: https://github.com/flyswatter/ens-test	2017-03-01 00:26:36 -08:00
Dan Finlay	6f598570d8	Fix loading indication for conf-tx view	2017-02-28 22:12:31 -08:00
Kevin Serrano	a600ccd4f8	Add reset button to reset gas fields.	2017-02-28 16:36:05 -08:00
Dan Finlay	af66e2b9ac	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 15:46:47 -08:00
Dan Finlay	ddc136a7c2	Add a couple more debug logs	2017-02-28 15:41:20 -08:00
Kevin Serrano	9bffe2d11a	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 15:23:03 -08:00
Kevin Serrano	576cc9eb75	Gas and Gaslimit revert to default if set to 0	2017-02-28 15:21:48 -08:00
Dan Finlay	513a9d72ef	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 14:45:44 -08:00
Dan Finlay	f908aaafbc	Use correct action to update and submit tx	2017-02-28 14:45:21 -08:00
Kevin Serrano	9fb4b4a77f	lints	2017-02-28 14:21:44 -08:00
Kevin Serrano	d21915c605	Remove advanced options for now.	2017-02-28 14:19:32 -08:00
Dan Finlay	39c824f2f3	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 14:16:27 -08:00
Dan Finlay	e07e4b7bc7	Linted	2017-02-28 14:13:58 -08:00
Kevin Serrano	486583e203	lint	2017-02-28 14:12:50 -08:00
Dan Finlay	157dd994f0	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 14:09:00 -08:00
Dan Finlay	da88481560	Remove gasMultiplier txMeta param ... This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter.	2017-02-28 14:08:00 -08:00
Kevin Serrano	acfb6ff0f8	Hide gas options behind an advanced options checkbox.	2017-02-28 14:07:19 -08:00
Kevin Serrano	e925caf3c3	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 13:53:49 -08:00
Dan Finlay	5a74c0fcad	Fix bug that showed conf-tx screen on boot at wrong times	2017-02-28 12:12:18 -08:00
Kevin Serrano	6f2d14fde4	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 12:06:46 -08:00
Dan Finlay	2e16e1eb94	Fixed bug that made send screen sometimes transition to account detail	2017-02-28 12:00:07 -08:00
Kevin Serrano	61a19a028b	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-28 11:37:05 -08:00
Dan Finlay	45138af6c6	Fix infinite loop bug	2017-02-28 11:36:01 -08:00
Kevin Serrano	666044d417	Add margins to align.	2017-02-28 10:23:47 -08:00
Dan Finlay	04df5c1f2d	Fix reference	2017-02-28 10:06:59 -08:00
Dan Finlay	0e817c9e7f	Reorder rows for better table logic	2017-02-27 18:36:43 -08:00
Dan Finlay	3ddfdfff98	Emit updated tx values on accept click	2017-02-27 18:33:33 -08:00
Dan Finlay	2e80e8f722	Remove unused function	2017-02-27 18:26:18 -08:00
Dan Finlay	d844769c92	Add action for updating and approving a tx in one action	2017-02-27 18:26:04 -08:00
Dan Finlay	4370ca0cef	Got gas live re-estimating	2017-02-27 18:19:05 -08:00
Kevin Serrano	2b0e939abd	Align input fields for gas.	2017-02-27 16:55:58 -08:00
Kevin Serrano	98e80e6740	Fix merge conflicts.	2017-02-27 16:35:25 -08:00
Kevin Serrano	5d1a4db5e5	Further styling to get hex component working. Fix some typos.	2017-02-27 16:33:58 -08:00
Dan Finlay	c4e9354575	Linted	2017-02-27 16:09:46 -08:00
Dan Finlay	57fec36a7d	Add non-working gas recalculating logic to tx-details view	2017-02-27 16:06:28 -08:00
Kevin Serrano	9e6e3f55b7	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-27 13:54:07 -08:00
Kevin Serrano	a77a5f0ab3	Move input boxes into table and into details component.	2017-02-27 13:53:43 -08:00
Dan Finlay	462c7ae213	Merge branch 'master' into i765-gaslimits	2017-02-27 12:59:19 -08:00
Dan Finlay	5edb3db969	Merge branch 'master' into i1144-moarrpc	2017-02-27 10:36:48 -08:00
Dan Finlay	ca5cf06ae9	Concatenate custom RPC labels that are too long	2017-02-27 10:25:10 -08:00
Kevin Serrano	dfc89d6c6d	Make gasPrice accessible to the UI.	2017-02-24 15:06:55 -08:00
Dan Finlay	42c2c3df37	Improve pending tx blue dot style	2017-02-23 17:45:37 -08:00
Dan Finlay	961a83769b	Fix cancel msg signing behavior.	2017-02-23 16:02:58 -08:00
Dan Finlay	1d1d296a1e	Make personal sign view look nice	2017-02-23 14:40:18 -08:00
Dan Finlay	4697aca02c	Got personal_sign working ... Also fixed bug where signing would not close popup.	2017-02-23 14:23:45 -08:00
Kevin Serrano	30e4bdf24b	Merge github.com:MetaMask/metamask-plugin into i765-gaslimits	2017-02-23 14:17:52 -08:00
Kevin Serrano	62854398f1	Tested against code to play nice with unit tests.	2017-02-23 13:56:58 -08:00
Dan Finlay	7ec25526b7	Add alternate UI for pending personal_sign messages	2017-02-23 11:18:49 -08:00
Dan Finlay	564f920ae0	Add personal sign actions and template	2017-02-22 16:30:09 -08:00
Kevin Serrano	3be6ee5f6c	Make the UI play nice with empty RPC lists.	2017-02-22 15:32:01 -08:00
Kevin Serrano	1d0f5fb51c	Linto	2017-02-22 15:13:59 -08:00
Kevin Serrano	7a0ce31bd3	Implemented functionality for displaying recent custom RPCs	2017-02-22 15:12:56 -08:00
Kevin Serrano	17a7436602	Connect to actions.	2017-02-21 12:51:56 -08:00
Dan Finlay	05080d1c50	Fix UI Dev Mode for Tx Approval ... The state object had been changed, but our mock states for tx approval were using the old keys. Rather than try to muck about and figure out each and every change, I've re-generated a UI dev state for tx approval, which should help @zanibas on his current project. We can continue adding new dev states as needed from here. If anyone catches a state that doesn't render correctly, it's worth checking if a new snapshot doesn't solve things. Debugged by adding new debugging loggers, and I've left them in place for easier future debugging.	2017-02-20 23:33:21 -08:00
Dan Finlay	9e81a0c8c4	Merge branch 'master' into i1128-noticesdev	2017-02-20 15:42:20 -08:00
Kevin Serrano	e54b73679c	Notices must be scrolled down to proceed from.	2017-02-20 14:58:24 -08:00
Dan Finlay	b2c68c9ea3	Set default log levels	2017-02-20 14:30:58 -08:00
Dan Finlay	8aca5bf4b5	Add debug logging to ui routing logic.	2017-02-20 13:14:12 -08:00
Kevin Serrano	415b9b245c	Fix typo.	2017-02-20 12:59:31 -08:00
Kevin Serrano	c934f96651	Re-enable notices on dev.	2017-02-20 12:59:12 -08:00
Dan Finlay	6b56d6ba98	Broke hex decimal input into its own component ... Also added a new state to try to make UI dev mode work again, but it has other issues, like #1128, that need to be addressed before UI dev mode can be used again.	2017-02-17 12:46:08 -08:00
Kevin Serrano	89af0ef408	Change state to props, add modifiable fields.	2017-02-17 12:08:54 -08:00
Kevin Serrano	3fe8e2b659	Merge branch 'master' into i1089-networkfront	2017-02-15 15:44:14 -08:00
Kevin Serrano	9aa70fbaba	Remove custom RPC option when on lock screen.	2017-02-15 15:37:38 -08:00
Kevin Serrano	fbabcf6191	Change networks from lock screen.	2017-02-15 15:35:56 -08:00
Kevin Serrano	8f72748732	fix debug	2017-02-09 22:58:17 -08:00
Kevin Serrano	8b38719a7c	Prevent notices from opening in test and debug mode.	2017-02-09 22:55:14 -08:00
Kevin Serrano	65c84ac4b2	Delete all code related to disclaimers.	2017-02-09 18:17:50 -08:00
Frankie	de6455151e	Revert old style message sighing	2017-02-09 17:32:49 -08:00
Dan Finlay	b529017149	Remove egregious alert	2017-02-06 16:45:40 -08:00
Dan Finlay	13ee92909c	Mostly got shapeshift tx management into its own controller ... Rendering the list is still having issues, so this isn't done yet.	2017-02-03 20:45:20 -08:00
kumavis	9e4ef45b6a	migration #9 - break out CurrencyController substate	2017-02-02 23:32:24 -08:00
kumavis	99fa9ab13a	migration 7 - break off TransactionManager substate	2017-02-02 20:20:13 -08:00
kumavis	296b278592	actions - dont expect background to provide newState, manually update	2017-02-02 16:46:56 -08:00
Frankie	54b1339f6a	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 13:05:58 -08:00
Frankie	6eb6057118	default a return of an empty array	2017-02-01 12:57:00 -08:00
Frankie	23622632c6	linting	2017-02-01 12:25:52 -08:00
Frankie	7aca279a5f	fix transactions not showing up in history	2017-02-01 12:19:22 -08:00
Frankie	ce0c3ed03c	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 12:03:42 -08:00
Frankie	1b16b46241	code clan up and tests	2017-02-01 11:54:01 -08:00
kumavis	f9b31fe2c3	rename selectedAccount to selectedAddress	2017-01-30 15:08:31 -08:00
Frankie	fdee1e3701	Merge branch 'dev' into messageManagerCleanUp	2017-01-28 22:59:28 -08:00
Frankie	8be68575bb	Clean up message manger includes: ... Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern	2017-01-28 20:28:20 -08:00
kumavis	4dd6ba9c1b	migration 5 - move keyring controller state to substate	2017-01-28 19:19:03 -08:00
kumavis	d7fde88f4b	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into kumavis-refactor2	2017-01-26 22:31:55 -08:00
kumavis	9ab8362843	metamask controller - cleanup remote api	2017-01-26 22:30:12 -08:00
Frankie	583dc100ab	Fix ui overlap	2017-01-26 14:53:42 -08:00
kumavis	70b8e640f0	Merge branch 'dev' into i#1048	2017-01-24 15:39:33 -08:00
kumavis	463a56ff54	background controller - extract KeyringC.placeSeedWords to MetamaskC	2017-01-24 15:33:33 -08:00
kumavis	23c2b0b9a5	Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic ... Fix conf tx balance logic	2017-01-24 15:00:46 -08:00
Frankie	8ed657d5d5	fix base	2017-01-24 14:54:38 -08:00
Frankie	5811f2ab14	Merge pull request #1051 from MetaMask/hotfix1048 ... hotfix - addNewAccount - dont assume hd keyring position	2017-01-24 13:38:24 -08:00
kumavis	745fff0c80	hotfix - dont assume hd keyring position	2017-01-24 13:29:48 -08:00
Frankie	b2623510ae	Fix issue where ConfTx view lets you approve txs when the account has insufficient balance	2017-01-24 13:19:26 -08:00
Frankie	8642ced310	Fix issue where generating a new account would put it in loose keys	2017-01-24 12:06:59 -08:00
Dan Finlay	9f1884145a	Merge branch 'dev' into i715-AddJsonImport	2017-01-18 17:24:12 -08:00
Dan Finlay	5d8a3dd99b	Add ability to import v3 JSON wallets ... There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715	2017-01-18 16:45:39 -08:00
Dan Finlay	9126652f2e	Implement naieve JSON file importing ... Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production.	2017-01-18 16:15:25 -08:00
Dan Finlay	b52346388b	Added new modular private key import system ... Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!	2017-01-18 15:20:48 -08:00
Dan Finlay	0e01abdf71	Merge branch 'master' into Version-3.1.0	2017-01-18 12:25:35 -08:00
Frankie	e3650b336a	Merge branch 'master' into fixSignedVsSubmitted	2017-01-18 11:30:41 -08:00
Frankie	460cbb985f	Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block	2017-01-18 11:24:53 -08:00
Dan Finlay	3572708fda	Fix test to log out despite number of menu items	2017-01-17 16:49:08 -08:00
Dan Finlay	693aa50e7f	Remove outdated reference	2017-01-17 16:35:11 -08:00
Dan Finlay	9ed6381c5d	Remove unused UI files	2017-01-17 16:31:12 -08:00
Dan Finlay	1ff4894b67	Allow importing of private key strings ... Fixes #1021 A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string. Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.	2017-01-17 16:24:45 -08:00
Dan Finlay	958cbfbde4	Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu	2017-01-17 13:58:54 -08:00
Dan Finlay	77bd010543	Add "import account" menu item + template view	2017-01-17 13:47:30 -08:00
Dan Finlay	54c536e72c	Fix message signing UI rendering ... [A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004) removed logic that rendered pending messages for approval. This commit fixes that.	2017-01-16 23:59:25 -08:00
Dan Finlay	5dd5619e5d	Merge branch 'master' into dev	2017-01-16 10:55:32 -08:00
Frankie	6481f9ced4	Dont render conf-tx if their are no txParams to show	2017-01-14 22:59:05 -08:00
Frankie	b72987405e	remove orphaned comment	2017-01-13 11:30:58 -08:00
Frankie	c1656aff19	lint	2017-01-13 10:53:16 -08:00
Frankie	5ed52eed68	Clean up code	2017-01-13 10:44:22 -08:00
Frankie	34081c8cb2	Fix sorting and instances where something could be undefined	2017-01-11 17:02:57 -08:00
Frankie	f9efb0817d	Merge branch 'dev' into integrateTxManagerUI	2017-01-11 16:07:03 -08:00
Frankie	576e2ad64d	Fix wording and icon of failed txs	2017-01-11 15:44:21 -08:00
Dan Finlay	d87a7b2a76	Send update to UI when changing selected account ... Fixes #981	2017-01-11 15:15:37 -08:00
Frankie	0fae263a9a	Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions	2017-01-11 12:16:37 -08:00
Frankie	29060acb72	update coinbase info and view	2017-01-10 12:18:39 -08:00
Kevin Serrano	3a6159080e	quick typo fix.	2017-01-06 14:41:40 -08:00
Kevin Serrano	af61bb9065	Switch order of header and indicator.	2017-01-05 08:31:54 -08:00
Kevin Serrano	b8d312f8b9	Linting.	2017-01-04 15:04:51 -08:00
Kevin Serrano	a8a37e4d40	Make network somewhat more modular, add new network indicator.	2017-01-04 14:30:14 -08:00
Dan Finlay	2c2cdc4475	Convert more actions to new simple pattern	2017-01-03 11:33:15 -08:00
Dan Finlay	10c818abac	Restore missing line	2017-01-03 11:30:27 -08:00
Dan Finlay	013e6a608f	Corrected instances of showWarning to displayWarning	2017-01-03 11:03:25 -08:00
Dan Finlay	8b7b097034	Apply new pattern to repetitive functions	2017-01-03 10:42:09 -08:00
Dan Finlay	3ebf029c04	Update account list after adding account ... Fixed by finally making a function generator for a pattern we use frequently, communicating to the background process. Fixes #961	2017-01-03 10:39:34 -08:00
Dan Finlay	2dbbc0dce7	Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager	2017-01-02 17:32:51 -08:00
Dan Finlay	c05e04c611	Fix rendering of loose accounts	2016-12-23 17:23:33 -08:00
Frankie	fa3e708f34	Merge branch 'dev' into TxManager	2016-12-23 12:48:36 -08:00
Dan Finlay	1f15499046	Show a "LOOSE" warning on accounts not belonging to HD Seed phrase	2016-12-22 17:17:20 -08:00
Dan Finlay	898e96fd6a	Merge pull request #948 from MetaMask/RecoverLostAccounts ... Auto-Recover accounts lost to BIP44 derivation fix	2016-12-22 14:43:43 -08:00
Dan Finlay	d3b2698f34	Rename function to be an action	2016-12-22 14:09:10 -08:00
Frankie	6f7c23fd28	Merge branch 'dev' into TxManager	2016-12-21 14:31:07 -08:00
Frances Pangilinan	6e78494846	First pass at revision requests	2016-12-21 13:41:32 -08:00
Kevin Serrano	aea263a80d	Lint.	2016-12-20 16:45:22 -08:00
Kevin Serrano	572980402d	Validate URIs before entering them in.	2016-12-20 16:41:04 -08:00
Dan Finlay	11c1004a41	Linted	2016-12-20 16:07:24 -08:00
Dan Finlay	931ae5f64a	Make notices confirmation configurable ... - Confirm button will now dismiss the lost accounts array.	2016-12-20 15:24:08 -08:00
Frances Pangilinan	4910e2f9bd	remove network Id 2 from explorer link and Add network Id 3	2016-12-20 13:49:22 -08:00
Dan Finlay	ead8329877	Merge pull request #937 from MetaMask/i900-forgot-password-flow ... I900 forgot password flow	2016-12-19 16:01:01 -08:00
Kevin Serrano	9c8345467c	Modify actions to support better transition.	2016-12-19 15:46:09 -08:00
Kevin Serrano	e9bea92ac3	Lint.	2016-12-19 14:55:52 -08:00
Kevin Serrano	20c043a4c2	Redirect to seed word screen for forgotten passwords.	2016-12-19 14:54:24 -08:00
Dan Finlay	77d2deb176	Merged master into dev	2016-12-19 13:37:27 -08:00
Dan Finlay	a5024aa372	Clean up first notice ... Remove redundant title from notice component. Make link color the same orange as the rest of the UI.	2016-12-16 13:40:32 -08:00
Kevin Serrano	8d0f4c2799	Add date to notices display.	2016-12-16 13:31:12 -08:00
kumavis	4c390a6221	clean - code style	2016-12-16 11:58:15 -08:00
Kevin Serrano	851ba66cdd	Add ability to show notices to user & get confirmation. ... Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.	2016-12-16 10:55:42 -08:00
Kevin Serrano	8819475a2e	Add ability to show notices to user & get confirmation. ... Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.	2016-12-16 10:44:52 -08:00
Dan Finlay	6d13ef691f	Revert "Interface enhancements"	2016-12-16 10:04:57 -08:00
Dan Finlay	83880a5c92	Remove morden testnet provider ... Instances configured to point at Morden will now point at Ropsten.	2016-12-15 16:12:03 -08:00
Luis Iván Cuende	3969526403	Fixed header h1 alignment and network name	2016-12-14 14:35:36 -08:00
Luis Iván Cuende	4a8bc63c8d	Better account details view	2016-12-14 10:03:56 -08:00
Luis Iván Cuende	c65db9290d	Better editable label	2016-12-14 09:38:20 -08:00
Luis Iván Cuende	b8ee336f0d	Better buttons	2016-12-13 23:46:50 -08:00
Luis Iván Cuende	233094e19d	Beautified disclaimer	2016-12-13 23:38:55 -08:00
Dan Finlay	1880cda9b9	Fix vault encrypting & unlocking bug ... This is only a bug in dev, but was committed yesterday. Sometimes the `encrypt` method was being passed values other than the password as the encryption key, leading to un-unlockable vaults. To find this, and avoid it for all time hereafter, I added several more steps to our oft-neglected integration test suite, which now fully initializes a vault, locks it, and unlocks it again, to make sure all of those steps definitely work always.	2016-11-30 19:36:24 -08:00
Dan Finlay	049e351c9d	Add integration tests for logging out and back in	2016-11-30 16:01:51 -08:00
Dan Finlay	549bbfd05f	Made integration test create a first vault	2016-11-30 14:58:40 -08:00
Dan Finlay	85d5b12f8d	Fix tx adding code ... Broken in this commit: bc39cd7b89 Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed.	2016-11-29 12:46:08 -08:00
Dan Finlay	b899119582	Merge branch 'master' into dev	2016-11-23 16:54:27 -08:00
Kevin Serrano	8dd298238d	Cosmetic changes, rename links.	2016-11-23 15:42:17 -08:00
Kevin Serrano	3a503d2ac2	Add link back to unlock.	2016-11-23 15:29:42 -08:00
Kevin Serrano	5a02e58f62	Fix proper behavior for restoring accounts when password forgotten.	2016-11-23 13:49:54 -08:00
Kevin Serrano	5251fb373f	Modify forgot password flow to go back to init screen.	2016-11-23 13:05:02 -08:00
Dan Finlay	1e46d858e9	Fix undefined provider menu item	2016-11-22 16:34:02 -08:00
Dan Finlay	7562d49db7	Linted	2016-11-22 15:56:54 -08:00
kumavis	e14efa8f17	Merge pull request #858 from MetaMask/i842-WaitForSeedWord ... I842 wait for seed word	2016-11-22 16:18:43 -05:00
Dan Finlay	869d731319	Restore ropsten link support	2016-11-22 13:00:13 -08:00
Dan Finlay	0289444fcb	Merge branch 'dev' into i842-WaitForSeedWord	2016-11-22 10:51:48 -08:00
Kevin Serrano	8261cf232d	Merge branch 'dev' into dev-cleanup	2016-11-22 10:50:15 -08:00
Dan Finlay	cffe0c27f3	Merge branch 'master' into new-faucet	2016-11-22 10:31:29 -08:00
Kevin Serrano	17669e4af8	Make ropsten faucet button point at the correct url.	2016-11-22 10:20:59 -08:00
Kevin Serrano	8d2afccdc0	Ropsten has sole access to the faucet.	2016-11-22 10:13:57 -08:00
Kevin Serrano	88ed1f191f	Add to changelog.	2016-11-22 09:45:28 -08:00
Dan Finlay	ea56426b23	Use callback in placeSeedWord method. ... When displaying seed words, we were not using a callback, which had some race condition potential. This is simply a little cleaner and more correct. Fixes #842	2016-11-21 20:08:36 -08:00
Dan Finlay	694f34ae9a	Add temporary morden explorer link support	2016-11-21 19:43:59 -08:00
Dan Finlay	7d38c4ccb6	Add ropsten link support	2016-11-21 19:11:55 -08:00
Dan Finlay	17d63acaed	Fix camel casing on setSelectedAccount action.	2016-11-21 18:16:59 -08:00
Kevin Serrano	1cbab788ec	Change fauceting to become a response of an emit.	2016-11-21 16:46:26 -08:00
Kevin Serrano	f5b0795ac5	change all instances of selectedAddress to selectedAccount.	2016-11-21 16:21:16 -08:00
Kevin Serrano	9123e70434	Remove entropy from encryption and project.	2016-11-21 15:49:03 -08:00
Kevin Serrano	7cf6e372eb	Merge pull request #837 from MetaMask/FixMenuItem ... Fix custom provider menu item	2016-11-21 12:19:54 -08:00
Dan Finlay	6ae2400ef2	Fix custom provider menu item ... The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.	2016-11-21 11:45:31 -08:00
Dan Finlay	7ab9d40820	Merge branch 'dev' into i831-AddRopsten-Dev	2016-11-21 11:03:32 -08:00
Dan Finlay	e8a8302624	Begin adding Ropsten support ... Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831	2016-11-21 10:58:49 -08:00
Kevin Serrano	a07e5826ad	Convert conversion util to pure json.	2016-11-18 16:49:39 -08:00
Kevin Serrano	592b64a19f	Revert one cb to previous state.	2016-11-15 17:13:33 -08:00
Kevin Serrano	5bfb700fa8	Minimize dispatches by using emitters and relying on state updates.	2016-11-15 17:12:13 -08:00
Kevin Serrano	7de6b12aad	Re-enable disclaimer screen. Rename variables to reflect role more clearly.	2016-11-14 16:49:16 -08:00
Kevin Serrano	0c23925c23	Fix lint rules for ternary operator placement.	2016-11-11 15:37:22 -08:00
Kevin Serrano	3828edf6a4	Typo fix.	2016-11-11 10:54:15 -08:00
Kevin Serrano	23263bec7d	Linting to the max.	2016-11-11 10:26:12 -08:00
kumavis	c664b8f11e	Merge branch 'master' into i328-MultiVault	2016-11-11 03:18:33 -05:00
Frankie	b60f51dfc2	lint fix	2016-11-10 22:20:58 -08:00
Frankie	b60992b446	Fix funny looking errors in conf-tx	2016-11-10 22:13:30 -08:00
kumavis	e123e3095b	Merge branch 'master' into i328-MultiVault	2016-11-11 01:01:06 -05:00
kumavis	536cab0687	detect tx error - show warning and fix gasLimit	2016-11-10 21:19:34 -08:00
Frankie	f665b779cb	Merge branch 'master' into i328-MultiVault	2016-11-10 16:53:47 -08:00
Kevin G. Serrano	7b3f1ecc41	Unify warning functions.	2016-11-07 16:02:02 -08:00
Dan Finlay	161ff62fdc	Merge branch 'master' into i328-MultiVault	2016-11-07 15:38:25 -08:00
Dan Finlay	b3cb675a8b	Develop import subviews	2016-11-04 15:32:02 -07:00
Dan Finlay	a7af47db92	Add import account placeholder template	2016-11-04 14:39:53 -07:00
Dan Finlay	bc623bbe34	Linted	2016-11-04 12:32:47 -07:00
Dan Finlay	19f7041ba4	Add account adding subview placeholders	2016-11-04 12:27:26 -07:00
Dan Finlay	2cf2ceae21	Remove unused class	2016-11-04 12:02:20 -07:00
Dan Finlay	1af0d609bd	Convert buy subview to new tab bar component	2016-11-04 12:02:00 -07:00
Dan Finlay	1bbe0ed9e8	Scaffold new account view	2016-11-04 12:01:41 -07:00
Dan Finlay	e3fb7fa7bb	Remove insane actions hash	2016-11-04 10:48:24 -07:00
Kevin Serrano	8f3db0dbc0	Add reveal of seed words.	2016-11-01 22:19:04 -07:00
Dan Finlay	f2bfdd7f8c	Make identicon tolerant of changing state	2016-11-01 17:06:18 -07:00
Dan Finlay	b5f6ef8c01	Fixed bugs related to clearing caches when restoring to a new vault	2016-11-01 17:00:17 -07:00
Dan Finlay	72729060dc	Make forgot password button.	2016-11-01 15:00:28 -07:00
Dan Finlay	498b30bddc	Fix seed phrase restore	2016-11-01 11:51:51 -07:00
Kevin Serrano	db356a181a	Made progress on parity for MultiVault ... - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues.	2016-11-01 11:30:10 -07:00
Kevin Serrano	0643c35936	Linted	2016-10-31 11:38:48 -07:00
Kevin Serrano	96643c222a	Implement seed word confirmation page. ... Remove logs. Move HD render files to ui/app.	2016-10-31 11:35:09 -07:00
Dan Finlay	18cf635735	Fix github link on info page	2016-10-31 09:30:55 -07:00
Kevin Serrano	25c46a1636	Make case condition more consistent. Remove extra action. Fix incorrect display of network.	2016-10-30 16:01:12 -07:00
Kevin Serrano	625c54b7ec	Add focus to password field.	2016-10-30 14:08:14 -07:00
Kevin Serrano	02b0cf2e6d	Add password warning div.	2016-10-30 14:00:04 -07:00
Kevin Serrano	2418197041	Modify first-screen design to match docs.	2016-10-30 13:38:37 -07:00
Kevin Serrano	9b4f3825e7	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault	2016-10-28 16:19:14 -07:00
Kevin Serrano	6eb6968037	Merge branch 'master' into i328-MultiVault	2016-10-28 16:19:03 -07:00
Dan Finlay	6ec471c6dc	Configure BIP44 Keychain as default one	2016-10-28 12:10:35 -07:00
Dan Finlay	ed3814bff8	Fix identicon rendering	2016-10-27 16:16:28 -07:00
Dan Finlay	28eec68f85	Update first screen to match design.	2016-10-27 16:02:34 -07:00
Dan Finlay	b1fb8da3b0	Fix provider menu selection indication	2016-10-25 14:16:04 -07:00
Kevin Serrano	678301a20e	Phase out extra warning screen.	2016-10-25 13:24:03 -07:00
Dan Finlay	152419a79b	Merge branch 'master' into i328-MultiVault	2016-10-21 17:58:18 -07:00
Frankie	7d9e295b75	Change regex in isHex function	2016-10-21 16:39:14 -07:00
Frankie	d79424e9c0	clean up the isHex function	2016-10-21 16:05:39 -07:00
Dan Finlay	a462fc82e0	Fix duplicate provider menu item bug	2016-10-21 15:19:16 -07:00
Dan Finlay	957b7a72b5	Improved simple account generation	2016-10-20 17:29:25 -07:00
Dan Finlay	55d56f77cf	Began adding first basic keyring	2016-10-20 16:45:58 -07:00
Dan Finlay	0deed17752	Fix tests	2016-10-20 12:07:53 -07:00
Dan Finlay	383f8ea7dc	Linted & added salting to vault	2016-10-20 11:33:18 -07:00
Dan Finlay	e5c95d68f8	Fix state updating after vault creation and unlocking	2016-10-20 11:00:38 -07:00
Dan Finlay	f090828f99	Commented out useless advanced not on init screen	2016-10-20 09:58:44 -07:00
Dan Finlay	f14fdf7a25	Change actions reference to keyringController to background	2016-10-20 09:58:33 -07:00
Dan Finlay	40f175c06f	Linted	2016-10-20 09:50:29 -07:00
Frankie	aa4746f4c7	Add test and ability for isHex to handle hex strings with hex-prefix	2016-10-19 19:35:44 -07:00
Frankie	ac7dca22c3	Fix up wording	2016-10-19 17:39:41 -07:00
Kevin Serrano	afbc4c832b	Git merge resolution.	2016-10-19 14:57:30 -07:00
Kevin Serrano	ad3fa24a28	Intermediary commit.	2016-10-19 14:55:08 -07:00
Frankie	5fb1e492fb	Add valdations to txData param	2016-10-19 14:33:30 -07:00
Kevin Serrano	1481a3ef8e	Initial work on UI side	2016-10-15 10:48:12 -07:00
Frankie	aace26c4bd	Create callback and Clean-up details	2016-10-13 16:53:32 -07:00
Frankie	328f8b0cac	fix spelling	2016-10-13 16:22:45 -07:00
Frankie	67eba9f542	Specify base 10 in bignumber	2016-10-13 16:04:23 -07:00
Frankie	c400f7c0f6	Fix gasPrice range	2016-10-13 15:10:29 -07:00
Dan Finlay	cd2c00a318	Add minimal method signatures to new keyring controller	2016-10-12 17:05:39 -07:00
Dan Finlay	93ed918caa	Remove additional deprecated action	2016-10-12 16:43:35 -07:00
Dan Finlay	5c9969e126	Remove opinionated seed word code ... Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work.	2016-10-12 16:31:15 -07:00
Frankie	229d95956b	Merge branch 'master' into i#495CustomGasField	2016-10-11 16:19:13 -07:00
Dan Finlay	5d01d50c16	Merge branch 'master' into i721-ScrollAccountList	2016-10-11 16:13:53 -07:00
Kevin Serrano	39f2118d31	Remove logs.	2016-10-11 16:03:52 -07:00
Dan Finlay	1dc2612f8e	Remove flex class from account list container	2016-10-11 15:59:55 -07:00
Kevin Serrano	5e9bc31c58	Cleanup.	2016-10-11 15:50:02 -07:00
Kevin Serrano	ed03b89e26	Move tos hash logic to build phase. Create dynamic global variables based on build.	2016-10-11 14:32:03 -07:00
Frankie	3a610f2c06	Merge branch 'master' into i#495CustomGasField	2016-10-10 18:18:07 -07:00
Frankie	e1b78da3e6	Add custom gas field to send page	2016-10-10 18:17:56 -07:00
Kevin Serrano	0ecf364c5b	Prevent back/login buttons from appearing on the terms of service.	2016-10-07 02:11:03 -07:00
Kevin Serrano	c0d6dcff00	Rewritten to react standards. Way easier.	2016-10-05 02:42:19 -07:00
Kevin Serrano	a59422c01d	Linting.	2016-10-04 21:50:56 -07:00
Kevin Serrano	862adf3a4b	Rename drop menu item to be consistent with naming.	2016-10-04 21:47:17 -07:00
Kevin Serrano	f7714412e5	Add relevant legal links to help page.	2016-10-04 21:46:33 -07:00
Kevin Serrano	9b61978738	Make config page title consistent with menu item.	2016-10-04 21:06:31 -07:00
Kevin Serrano	94bfb5410b	Add links to relevant legal pages on user agreement page.	2016-10-04 21:03:14 -07:00
Kevin Serrano	64d8f91371	Add conditional logic for adding listener.	2016-10-04 20:49:06 -07:00
Kevin Serrano	1158855a15	Add padding to markdown paragraphs.	2016-10-04 18:45:01 -07:00
Kevin Serrano	30a915921e	Merge branch 'master' into tos	2016-10-04 18:40:47 -07:00
Kevin Serrano	991c06e542	Add CSS rules for proper formatting.	2016-10-04 18:39:54 -07:00
Kevin Serrano	3628c5b324	Implemented scroll-to-bottom functionality for button activation.	2016-10-04 17:42:17 -07:00
Frankie	4eafb7da2f	Merge branch 'master' into SmallerCopiedButton	2016-10-04 13:50:16 -07:00
Dan Finlay	769bd8e2ee	Removed hex prefix from private key export ... For compatibility with Jaxx, MEW, and Geth. Fixes #687	2016-10-04 13:26:51 -07:00
Dan Finlay	c7d10affd5	Make seed word confirmation button font smaller ... To avoid formatting glitches on some machines.	2016-10-04 13:04:54 -07:00
Dan Finlay	1f771f30e4	Space out purchase details on ShapeShift form	2016-09-15 21:18:21 -07:00
Dan Finlay	ed51b91b4a	Merge branch 'master' into i675-LoadingBuy	2016-09-15 21:05:24 -07:00
Dan Finlay	4eef2c57cf	Show loading indication when selecting ShapeShift	2016-09-15 20:58:18 -07:00
Frankie	77ef71448d	Fix CHANGELOG.md and restructure onClick events	2016-09-15 19:35:04 -07:00
Frankie	3682a2a1f9	linting	2016-09-15 18:25:05 -07:00
Frankie	dcda841f4d	Merge branch 'master' into tx-viz	2016-09-15 18:16:41 -07:00
Frankie	9c982a4bd6	add tx-viz link to transaction history	2016-09-15 18:13:13 -07:00
Frankie	cf484d735f	Clean up some of the code	2016-09-15 14:31:45 -07:00
kumavis	1325990726	css - smaller balance warning	2016-09-15 13:04:09 -07:00
kumavis	f0d83813d6	confTx - add insufficient balance warning message	2016-09-15 12:56:40 -07:00
kumavis	5005fc143b	confTx - show disabled accept btn + add colors	2016-09-15 12:42:35 -07:00
Frankie	8ea086290b	Merge branch 'master' into i#519buyButtonTxConf	2016-09-15 10:26:02 -07:00
Frankie	ef0b535d94	Drop the buy button in the confTx view if account does not have enough eth	2016-09-15 10:24:05 -07:00
Dan Finlay	a0bfdfe409	Do not show user rejection errors within our UI.	2016-09-14 14:34:54 -07:00
Frankie	19c1b1fd8e	Merge branch 'master' into qrCode	2016-09-13 12:18:19 -07:00
kumavis	f7794d9949	PendingTxDetails - partially remove imagify support	2016-09-13 10:18:57 -07:00
kumavis	c477411ce0	Merge branch 'library' of github.com:MetaMask/metamask-plugin into library	2016-09-13 00:37:41 -07:00
kumavis	8a5007a396	ui - remove unused currentDomain prop	2016-09-12 21:30:04 -07:00
Frankie	4aa5114019	Remove unused code in qr actions	2016-09-12 17:32:49 -07:00
Frankie	fc292627e4	Merge branch 'master' into qrCode	2016-09-12 17:30:54 -07:00
Frankie	218f380d87	Add qrcode-npm to package.json and swap out Qr Code generator api for node-module	2016-09-12 17:27:14 -07:00
Dan Finlay	784856532c	Ensure loading indication covers fox	2016-09-12 14:37:17 -07:00
Dan Finlay	2caac3c7d7	Fix single account list formatting	2016-09-12 14:27:26 -07:00
Dan Finlay	0d11eab8cb	Add accounts back to metamask state	2016-09-12 14:22:06 -07:00
Frankie	c37c050c8a	Revert "Add new eth-lightwallet salting to vault."	2016-09-12 10:34:06 -07:00
Dan Finlay	c2105c4070	Fix account list formatting when only a single item. ... - Makes account list items no longer flex larger than they should be. - Makes the add account button not flex larger than it should be. - Adds a line under the add account button to define its size.	2016-09-12 08:39:38 -07:00
Dan Finlay	6d6130e2a6	Camelcase dataset key for react	2016-09-10 11:23:11 -07:00
Kevin Serrano	69aa2ed25f	Merge branch 'master' into FixLogoPasswordFollow	2016-09-09 09:40:35 -07:00
Dan Finlay	a4e4c85453	Fix fox logo password following ... The new lightweight svg logo was not following text quite right. The new `lookAt` method was not using the same logic the module was using internally on mouse movement. I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like.	2016-09-08 20:31:42 -07:00
Dan Finlay	7b6c018c39	Show loading indication during unlocking.	2016-09-08 19:53:54 -07:00
Dan Finlay	4a7eab5b1a	Merge branch 'master' into FixLogoLeak	2016-09-08 15:43:51 -07:00
Dan Finlay	6c05c221cd	Fix new logo related errors ... Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method. Also tuned up the logo to more closely resemble the old behavior. - Overlaps the title text - Points nose at cursor, not just front of eyes - Cursor is more "distant" from fox, to avoid extreme angles on edges.	2016-09-08 15:41:21 -07:00
Frankie	3f64095eed	Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue	2016-09-08 14:56:19 -07:00
Frankie	ece1ecb90b	Fix wording in changelog and bug	2016-09-08 14:53:49 -07:00
Frankie	079c1a8972	Merge branch 'master' into i#589pendingTxsIssue	2016-09-08 13:45:27 -07:00
Frankie	0d4bfe8038	Remove console.log	2016-09-08 13:44:32 -07:00
Frankie	7d8491de10	Add to CHANGELOG.md and Remove unnecessary catch	2016-09-08 13:13:43 -07:00
Frankie	69580480bc	Merge branch 'master' into i#589pendingTxsIssue	2016-09-08 12:56:48 -07:00
Frankie	6f86c5f8ee	Add network checks for unconfirmed Txs	2016-09-08 12:56:04 -07:00
Dan Finlay	762bf2f48a	Merge branch 'master' into AddNewLogo	2016-09-08 12:49:57 -07:00
Dan Finlay	20ae4c2689	Fix logo usage for metamask-logo v2.0.0 ... - No longer need to check for webGL compliance (svg rendered!) - logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element. Otherwise, worked with very little effort!! Fixes #624	2016-09-08 11:22:04 -07:00
Dan Finlay	ab3b409438	Restore broken variable reference	2016-09-08 11:03:47 -07:00
Dan Finlay	c42b37a6e7	Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into ModularFiatBalance	2016-09-08 10:57:31 -07:00
Dan Finlay	c3dbcb5b02	Fix double tooltip	2016-09-08 10:57:10 -07:00
Dan Finlay	d1e91766da	Merge branch 'master' into ModularFiatBalance	2016-09-08 10:50:05 -07:00
Frankie	5f8d3085d7	Filter out pending txs based on network from tx history	2016-09-07 20:56:51 -07:00
John Weldon	d6619a25e9	Fix typo	2016-09-07 14:44:56 -07:00
Dan Finlay	2ca58f5bf7	Merge branch 'master' into ModularFiatBalance	2016-09-06 19:36:40 -07:00
Dan Finlay	0186e05a0d	Linted	2016-09-06 17:30:38 -07:00
Dan Finlay	1537e3f5da	Add fiat balances to tx conf view	2016-09-06 17:28:25 -07:00
Dan Finlay	c46de79c10	Got basic fiat display modularized	2016-09-06 17:08:56 -07:00
Dan Finlay	90638f95c0	Fix fiat-value	2016-09-06 16:55:52 -07:00
Dan Finlay	09dd854a96	Nearly finished factoring fiat value into eth-balance	2016-09-06 16:45:06 -07:00
Kevin Serrano	f4e131da0a	Fix capitalization.	2016-09-06 11:04:54 -07:00
Kevin Serrano	f213ca695c	Fix typos and refine wording.	2016-09-06 10:03:10 -07:00
Dan Finlay	b2ebb6032d	Continuing fiat balance modularization	2016-09-03 14:20:27 -07:00
Dan Finlay	7b1bbb7a19	Show conf screen after send request	2016-09-01 11:30:42 -07:00
Dan Finlay	7f947f8ab2	Skip loading indication from send screen	2016-09-01 11:29:17 -07:00
Dan Finlay	c15eef9425	Make element enumeration Edge compatible	2016-08-29 17:34:29 -07:00
Dan Finlay	fb6476224f	Add tolerance for failed form persisting	2016-08-29 16:40:57 -07:00
Dan Finlay	a804629606	Show custom rpc menu item always	2016-08-29 12:36:47 -07:00
Dan Finlay	62179a37f7	Fix spelling error	2016-08-26 15:08:02 -07:00
Frankie	ae33586660	make the back button its own function	2016-08-26 11:30:07 -07:00
Frankie	547894ed39	Merge branch 'master' into i#563forgotPassword	2016-08-25 16:06:54 -07:00
Frankie	250cf8cc23	Change style on back button to be more like the rest of the app	2016-08-25 16:05:44 -07:00
Dan Finlay	8b81009a30	Merge branch 'master' into PopupNotifications	2016-08-25 15:42:35 -07:00
Dan Finlay	6f082dd9e7	Linted	2016-08-25 14:23:41 -07:00
Dan Finlay	a8e40ffe7a	Persist shapeshift form input values	2016-08-25 14:19:09 -07:00
Frankie	11c6c63d76	Merge branch 'master' into i#563forgotPassword	2016-08-25 14:17:29 -07:00
Frankie	483a7fee0a	Add a back button on lock screen to go back to init menu	2016-08-25 14:13:32 -07:00
Dan Finlay	b39bd5333b	Persist send tx form field values	2016-08-25 14:10:07 -07:00
Dan Finlay	2026b674c5	Remove log	2016-08-25 14:09:54 -07:00
Dan Finlay	d81bde9f6c	Make restore vault form persist	2016-08-25 12:18:04 -07:00
Dan Finlay	6eb09c1a79	Add persistent form class	2016-08-25 12:17:21 -07:00
Dan Finlay	793ad6b8d8	Merge branch 'master' into PopupNotifications	2016-08-24 16:59:22 -07:00
Dan Finlay	8c06463e80	Linted	2016-08-24 15:46:31 -07:00
Dan Finlay	44ff75c7e1	Improve msg signing padding	2016-08-24 15:43:00 -07:00
Dan Finlay	4f78ae56b2	Fix empty sign message bug	2016-08-24 15:40:40 -07:00
Dan Finlay	bc43e3d140	Merge branch 'master' into PopupNotifications	2016-08-23 16:02:06 -07:00
Dan Finlay	65f7656487	Linted	2016-08-23 15:48:16 -07:00
Dan Finlay	671ca33abb	Close notification on opening main UI	2016-08-23 15:44:50 -07:00
Kevin Serrano	4bceda37a8	Merge branch 'master' into fox-sub	2016-08-23 14:51:09 -07:00
Kevin Serrano	6363a80b49	Linting.	2016-08-23 14:32:12 -07:00
Kevin Serrano	5168232481	Created option to pass in static file for fallback for logo.	2016-08-23 14:11:25 -07:00
Dan Finlay	4fb49dfb4b	Close popup even if last tx is dismissed from main UI	2016-08-23 11:40:08 -07:00
Dan Finlay	49ab51d825	Merge branch 'master' into PopupNotifications	2016-08-22 20:06:59 -07:00
Dan Finlay	5d24621b56	More linting	2016-08-22 17:37:16 -07:00
Dan Finlay	a9b53530b6	Fix back button hiding on popup	2016-08-22 17:29:47 -07:00
Dan Finlay	17f3f90d80	Linted	2016-08-22 17:21:54 -07:00
Dan Finlay	6e1000f361	Merge branch 'master' into PopupNotifications	2016-08-22 15:03:36 -07:00
Dan Finlay	f57cbe59fc	Removed view more button, added account info button. ... Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that.	2016-08-22 14:36:21 -07:00
Dan Finlay	3d451ddf3e	Merge branch 'master' into i390-TransactionLimit	2016-08-22 11:59:08 -07:00
Kevin Serrano	cec88cc9ac	Merge branch 'master' into fox-sub	2016-08-22 11:58:59 -07:00
Frankie	edfb0eb968	Fix issue where if given a balance that does not need to be parsed will not be parsed	2016-08-19 17:18:11 -07:00
Kevin Serrano	7a466697d3	Modify logic for component update.	2016-08-19 16:59:04 -07:00
Kevin Serrano	43e28788d7	Create replacement logo for non-webgl	2016-08-19 14:47:49 -07:00
Dan Finlay	8592ffd855	Merge branch 'master' into i390-TransactionLimit	2016-08-19 07:57:35 -07:00
Dan Finlay	9cd85aea2f	Merge branch 'master' into shapeshiftTx	2016-08-19 07:50:57 -07:00
Frankie	e3e5538ddc	Remove "+" from shapeshift tx and change wording in CHANGELOG	2016-08-18 20:24:17 -07:00
Dan Finlay	fe5fff3248	Change 'View More' to 'Show More'	2016-08-18 17:47:42 -07:00
Frankie	98dab0ffd2	Make ballance teal for shapeshift tx and add to change log	2016-08-18 16:30:13 -07:00
Dan Finlay	4f857e297b	Linted	2016-08-18 16:27:25 -07:00
Dan Finlay	bd9d89826c	Added view more button to transaction list ... Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.	2016-08-18 16:23:12 -07:00
Kevin Serrano	683651e75d	Lint and changelog.	2016-08-18 16:01:40 -07:00
Kevin Serrano	4cebf12bb5	Fix rounding issues.	2016-08-18 15:59:37 -07:00
Frankie	3525dc0801	Create a ShapeShift tx in tx History	2016-08-18 15:20:26 -07:00
Frankie	23aeb1c5c1	Add api Public key	2016-08-18 12:20:24 -07:00
Frankie	efa61f2cf8	Merge branch 'master' into shapeshiftTx	2016-08-18 11:06:32 -07:00
Frankie	752d16f6c0	WIP: ShapeShift tx	2016-08-18 11:04:28 -07:00
Dan Finlay	dfaac78e39	Linted	2016-08-16 17:50:51 -07:00
Dan Finlay	a167bbc5a0	MVP Popup Notifications Working ... I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both. In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways: - Hide the menu bar - Hide the back button from the notifications view. - When confirming the last tx, close the window.	2016-08-16 17:32:54 -07:00
Dan Finlay	030bdec27a	Unify notification and popup ui files	2016-08-16 16:46:44 -07:00
Dan Finlay	4ba90969ee	Merge branch 'master' into PopupNotifications	2016-08-16 15:41:11 -07:00
Dan Finlay	5479509618	Set up MVP for popup-based notifications.	2016-08-16 15:39:40 -07:00
Kevin Serrano	666f3cd66c	Added compliance for tests and properly accounts for N/A conversions.	2016-08-16 15:11:40 -07:00
Kevin Serrano	121af0c4b9	Lint.	2016-08-16 14:51:55 -07:00
Kevin Serrano	5afaebe602	Remove logs.	2016-08-16 14:49:53 -07:00
Kevin Serrano	0b052e94cc	Hide conversions when API fails.	2016-08-16 14:49:21 -07:00
Kevin Serrano	3814bf8f5d	Change account list balance rendering.	2016-08-16 14:13:03 -07:00
Kevin Serrano	6cee99f0ba	Remove console logs.	2016-08-16 14:08:14 -07:00
Kevin Serrano	3b27fe1356	Add recent conversion date.	2016-08-16 14:07:42 -07:00
Kevin Serrano	6041ba1ed2	Add fallback to API failure.	2016-08-16 14:07:06 -07:00
Kevin Serrano	da2527ddb4	Remove react-select as dependency.	2016-08-16 13:23:28 -07:00
Kevin Serrano	58e3042a3b	Remove logging. Clean up duplicate entries in currency list.	2016-08-16 13:21:16 -07:00
Kevin Serrano	7d1b2db87e	linting and ignoring.	2016-08-16 10:48:31 -07:00
Kevin Serrano	009784c79b	Divided eth components for tx and account detail.	2016-08-16 10:34:29 -07:00
Kevin Serrano	6895d330ff	Merge master.	2016-08-15 10:50:53 -07:00
Frankie	2ef4cbaa89	Add margin to "go to test faucet" button and show more of the address on qr code page	2016-08-14 21:41:08 -07:00
Dan Finlay	e826eb932c	Remove ethereum classic provider ... Fixes #542	2016-08-14 18:41:05 -07:00
Frankie	99a788a6f0	Add multi message capability to Qr view for market info	2016-08-12 17:43:24 -07:00
Frankie	b72c00a6c1	Add a to test faucet button	2016-08-12 16:12:40 -07:00
Frankie	632465b213	Merge branch 'master' into buyForm	2016-08-12 15:47:03 -07:00
Frankie	b4c9a52259	Change buy forms so that they are their own view and add Qr-code	2016-08-12 15:41:59 -07:00
kumavis	8943e86470	Merge branch 'master' into CustomRpcLoadingBug	2016-08-11 20:53:15 -07:00
Dan Finlay	20cfd1c9f3	Add network indicator class to loading image	2016-08-11 19:44:41 -07:00
Kevin Serrano	041538e89e	UI logging supressed for production.	2016-08-11 19:04:50 -07:00
Kevin Serrano	2b0c6953e2	Create global variable that changes ui logging.	2016-08-11 18:58:23 -07:00
Kevin Serrano	b8856d765d	Setting defaults to production.	2016-08-11 15:42:21 -07:00
Kevin Serrano	b3def32f7a	Cosmetic difference.	2016-08-11 14:22:48 -07:00
Kevin Serrano	ec2641a8c9	Remove stray console.log	2016-08-11 14:21:44 -07:00
Kevin Serrano	0056844335	Take out unused dependency.	2016-08-11 14:20:26 -07:00
Kevin Serrano	bf384da6f3	Remove comments.	2016-08-11 14:12:55 -07:00
Kevin Serrano	ad468c1880	Merge branch 'master' into logging-fix	2016-08-11 14:07:49 -07:00
Kevin Serrano	804e8df87f	Lint	2016-08-11 14:03:51 -07:00
Kevin Serrano	9904b4ef5a	Add ability to hide logging messages in production.	2016-08-11 13:59:14 -07:00
Frankie	2fc26fb264	Even out some of the margins	2016-08-10 18:53:11 -07:00
Frankie	c8b2826441	Fix typo for copyButton	2016-08-10 15:07:10 -07:00
Frankie	4ace425a9c	Fix merge mess	2016-08-10 14:41:40 -07:00
Frankie	ba1edc429b	Merge branch 'master' into buyForm	2016-08-10 13:48:34 -07:00
Frankie	9c6dd9ef49	Create "buy form" add shape shift	2016-08-10 13:43:01 -07:00
Kevin Serrano	abfc5632ef	Fix ether warning checkbox.	2016-08-10 10:54:55 -07:00
Kevin Serrano	cb0c1f25ba	Did not previously call functions before!	2016-08-09 16:49:15 -07:00
Kevin Serrano	637d3978b7	Fix default value. Add loading indication for async.	2016-08-09 16:33:58 -07:00
Kevin Serrano	8acb3e6007	Enable full listing of supported currencies by Cryptonator.	2016-08-09 09:48:08 -07:00
Kevin Serrano	fd37f5db65	Add fix for zero balance shorten.	2016-08-07 17:23:35 -07:00
Kevin Serrano	260de6532c	Get fiat numbers rendering on tooltip. Need to find way to create line breaks.	2016-08-05 12:18:44 -07:00
Kevin Serrano	be76b05726	Holding off on select formatting for now. Renamed keys for options.	2016-08-04 23:27:30 -07:00
Kevin Serrano	ccd85d19e3	Create default values for metamask state for conversion. Fix config files for ui dev.	2016-08-04 19:09:42 -07:00
Kevin Serrano	92fb827923	currency now selectable and save-able.	2016-08-04 14:04:04 -07:00
Kevin Serrano	479abadaa7	Merge branch 'master' into usd-conversion	2016-08-04 13:26:03 -07:00
Kevin Serrano	31b38e820b	Fix typos with missing apostrophe	2016-08-04 11:14:39 -07:00
Frankie	f8ac9ca522	Fix issue with dropdown menu	2016-08-03 19:43:54 -07:00
Dan Finlay	c7691b7e64	Fix reference in drop menu item	2016-07-29 12:22:39 -07:00
Dan Finlay	8a4d8eca64	Fix network name reference ... When adding the classic network to the menu, I left a reference to a property that is not always existent, so we needed a fallback for it.	2016-07-29 12:19:15 -07:00
Dan Finlay	c805963a22	Linted	2016-07-28 11:10:54 -07:00
Dan Finlay	5feff0b1f5	Add missing reference for provider	2016-07-28 11:04:02 -07:00
Dan Finlay	51535ab0cc	Fix margin on provider checkmarks	2016-07-28 10:54:00 -07:00
Dan Finlay	9b43ec2278	Add eth classic to provider menu	2016-07-28 10:53:51 -07:00
Kevin Serrano	cf14eb4043	Merge branch 'master' into droppo-fix	2016-07-27 15:32:12 +09:00
Kevin Serrano	3a4744dec1	Fix menu droppo issues caused by Chrome 52.	2016-07-27 15:31:30 +09:00
Dan Finlay	2368c2993d	Add platform specific builds and zip tasks (#486) ... * Add platform specific folders to dist folder * Remove gulp hacks * Add platform specific bundling dev and dist tasks now build into platform-specific folders within the `dist` folder. Added tasks `gulp zip` and `gulp dist`. `zip` builds the platform-specific folders into platform-specific bundles within the `dist` folder. `dist` builds and then zips all at once. * Fix chrome bundle zipping * Fix broken reference in eth warning * Fix but where web3.eth.accounts are not available in firefox. * Bump changelog	2016-07-26 15:15:40 -07:00
Kevin Serrano	950e7d3dcc	Merge branch 'master' into usd-conversion	2016-07-26 06:39:40 +09:00
Kevin Serrano	86832e6feb	Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.	2016-07-22 11:15:47 -07:00
Kevin Serrano	22528002e1	Linting!	2016-07-22 10:15:39 -07:00
Dan Finlay	5b4e2ffeac	Add mock dev mode	2016-07-21 18:08:35 -07:00
Kevin Serrano	716e65424d	Add date access throughout the data flow.	2016-07-21 14:08:26 -07:00
Frankie	fcd523abe4	Buy button (#474) ... * WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension	2016-07-21 13:41:10 -07:00
Kevin Serrano	7b85802a0f	Merge branch 'master' into usd-conversion	2016-07-21 11:30:57 -07:00
Dan Finlay	6658bea8d4	Implement some cross-browser practices (#473) ... * Add mozilla plugin key to manifest * Move all chrome references into platform-checking module Addresses #453 * Add chrome global back to linter blacklist * Add tests	2016-07-21 10:45:32 -07:00
Kevin Serrano	4a9d5b1c25	Add data field to pass up parameters up to reducer.	2016-07-21 10:15:34 -07:00
Kevin Serrano	491b9cddc5	Add fiat actions to metamask controllere and actions.	2016-07-21 09:30:58 -07:00
Kevin Serrano	2bdda0848f	Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into FixReopeningBug	2016-07-18 12:20:31 -07:00
Kevin Serrano	96cd087c97	Readd string to conform to tests. Will discuss later.	2016-07-18 12:06:27 -07:00
Kevin Serrano	2fc2731479	Remove unused None string.	2016-07-18 11:47:27 -07:00
Kevin Serrano	41aad32b19	Merge branch 'master' of https://github.com/AustP/metamask-plugin into AustP-master	2016-07-18 11:32:29 -07:00
Aust	c1859a24ee	Add eslint config to pass tests	2016-07-18 10:38:27 -06:00
Aust	061633bf67	Make zero balance display 0. Fixes #449	2016-07-18 09:54:06 -06:00
Thibaut SCHAEFFER	71250f0048	Fix typo	2016-07-18 11:08:00 +02:00
Dan Finlay	203a56fb92	Add ui state logging function ... Now from the UI console, you can always call `logState()`, and it will print the state stringified into the console, ready to drop into the ui dev mode states folder, or other inspection. This should make it easier to diagnose user bugs in the future.	2016-07-15 17:51:37 -07:00
Dan Finlay	c4812b3452	Triage a strange undefined balance error	2016-07-15 17:47:58 -07:00
kumavis	97e38b4983	new tx - calculate estimatedGas and show thing in tx-details (#441) ... * new tx - calculate estimatedGas and show thing in tx-details * Bump changelog	2016-07-13 23:39:44 -07:00
Frankie	dbc9008295	Fix eth balance tooltip to show 6 decimals (#440) ... * Fix tooltip to show to the 6 decimal place on balances ovr 0... * Change font size for balance component in tx-list so it fits the notation * Add to change log * Linting * change log	2016-07-13 15:46:36 -07:00
Frankie	617ab9d178	Move fox logo with filled in eyes into design folder (#433) ... * Move fox logo with filled in eyes into design folder * Crop fox * Crop fox properly * Gah Crop fox properly	2016-07-13 11:19:41 -07:00
kumavis	4cf83b582e	Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBug	2016-07-12 00:12:44 -07:00
Dan Finlay	57da5a8198	Merge branch 'master' into FixSvgIcons	2016-07-11 20:55:58 -07:00
Dan Finlay	e21a48da83	Linted	2016-07-11 20:53:26 -07:00
Kevin Serrano	d7e6b752a3	Integrate changes back into eth-balance	2016-07-11 17:44:00 -07:00
Kevin Serrano	6a61591dad	Move shorten balance to util. Add as property of generateBalance object output.	2016-07-11 16:31:12 -07:00
Kevin Serrano	37f21cf18f	Remove unused functions. Readd if necessary.	2016-07-11 16:01:52 -07:00
Dan Finlay	66e079f1c7	Fix imageification of recipient	2016-07-11 15:49:13 -07:00
Dan Finlay	7b3f0ad43d	Fix main dropdown animation	2016-07-11 11:33:12 -07:00
Kevin Serrano	40d2b7fe71	lint	2016-07-08 17:39:15 -07:00
Kevin Serrano	20bfb60fd2	Implement alternate shortening scheme.	2016-07-08 17:27:13 -07:00
kumavis	58ee3e1227	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ui-fixth-width-tx-history	2016-07-07 17:39:48 -07:00
kumavis	d2eab80e09	eth-balance fix	2016-07-07 17:34:30 -07:00
kumavis	501ffba6f2	lint - dingle dangle comma tangle	2016-07-07 17:00:24 -07:00
kumavis	03430e8473	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle	2016-07-07 16:56:20 -07:00
kumavis	7dc67a9257	notif - add support for forward carrat	2016-07-07 16:54:35 -07:00
Kevin Serrano	86b7cc6637	Resolve merge conflict.	2016-07-07 16:33:06 -07:00
Kevin Serrano	9a9c1f2cd4	Pass the linters.	2016-07-07 16:30:52 -07:00
Kevin Serrano	1c1d6241ed	Remove reducer console log.	2016-07-07 16:29:31 -07:00
Kevin Serrano	5343404d0d	Add new component for tx-history to avoid messing with other styles. Add fixed width specifically to this style.	2016-07-07 16:27:37 -07:00
Kevin Serrano	570d560932	Modified test views again. Added fixed length to center tx information.	2016-07-07 15:39:19 -07:00
kumavis	11fd281a33	ui - remove doubled eth-balance	2016-07-07 15:29:46 -07:00
Dan Finlay	33150cc721	Fixed eth_balance style, completing partial merge	2016-07-07 15:22:10 -07:00
kumavis	ac808e681f	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle	2016-07-07 15:04:53 -07:00
Kevin Serrano	432221625c	Remove logging for states.	2016-07-07 13:50:57 -07:00
Kevin Serrano	ecb0f9767b	Add new test state with tx history. Fix alignment issue with transaction history text.	2016-07-07 13:48:52 -07:00
kumavis	f71956b2ab	lint fix	2016-07-07 13:45:06 -07:00
kumavis	0bb8b8cacc	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle	2016-07-07 13:41:32 -07:00
Dan Finlay	3cd502a163	Restore button naming consistency	2016-07-07 13:22:38 -07:00
Dan Finlay	e8efe84320	Add nickname rendering for recipient address	2016-07-07 13:21:45 -07:00
Dan Finlay	306035f575	Linted	2016-07-07 12:41:07 -07:00
Dan Finlay	468c1ffa42	Refined tx confirmation button styles	2016-07-07 12:39:40 -07:00
Frankie	cd8ae4b5ff	Change function name to generateBalanceObject	2016-07-07 12:39:07 -07:00
Dan Finlay	2a204624f5	Implement tx confirmation style refinements	2016-07-07 12:27:34 -07:00
Dan Finlay	97b60caac0	Add configurable params to eth-balance	2016-07-07 12:27:18 -07:00
Frankie	0a6560bd5d	Add method to deal with small decimals and create the object for eth-balance component	2016-07-07 12:13:38 -07:00
Dan Finlay	1e92e7e9d4	Make mini account panel labels fully configurable	2016-07-07 11:50:01 -07:00
Dan Finlay	21f17214be	Remove formatBalance.formatted references	2016-07-07 11:39:24 -07:00
Dan Finlay	a02f43fb7f	Merge branch 'master' into ConfirmationStyle	2016-07-07 11:38:11 -07:00
Frankie	2cc44df584	Revert back to original formatBalance	2016-07-07 11:20:02 -07:00
Dan Finlay	c2655bef5a	Correct data length calculation	2016-07-06 23:38:07 -07:00
Dan Finlay	5faa64817c	Update gas cost	2016-07-06 23:16:04 -07:00
Dan Finlay	3bcf44509e	Fix sender balance rendering in pending tx details	2016-07-06 23:11:47 -07:00
Dan Finlay	a1fdf28a7b	Merge branch 'master' into ConfirmationStyle	2016-07-06 22:56:07 -07:00
Dan Finlay	9e0d9b88cc	Linted	2016-07-06 22:51:28 -07:00
Dan Finlay	ce463f3aff	Fixed up pending-tx-details	2016-07-06 22:48:02 -07:00
Dan Finlay	7481f7c3df	Fleshed out pending tx view	2016-07-06 21:32:36 -07:00
Kevin Serrano	acdd40e3be	Fix dropdown z-index issue.	2016-07-06 20:11:49 -07:00
Frankie	8834548b01	Handle to small of balances with "<0.00001"	2016-07-06 19:17:32 -07:00
Dan Finlay	689bd58d81	Merged latest balance formatting code	2016-07-06 18:06:28 -07:00
Dan Finlay	15afbe5b1f	Merge branch 'master' into ConfirmationStyle	2016-07-06 17:59:00 -07:00
Dan Finlay	7058dc4ee3	Began reworking tx conf view	2016-07-06 17:58:46 -07:00
Frankie	53eefc1efc	Add a postion option for tool tip	2016-07-06 17:12:33 -07:00
Frankie	9d577ea023	Add decimal hendeling to ETH balance	2016-07-06 17:04:09 -07:00
Dan Finlay	fb5dbd23a9	Merge pull request #387 from MetaMask/ui-formatting ... Ui formatting for account details	2016-07-06 11:00:32 -07:00
Frankie	8d67a820a9	Add light and ultraLight fonts	2016-07-05 15:39:51 -07:00
Dan Finlay	2c89cd722e	Simplify empty account balance rendering	2016-07-05 15:16:40 -07:00
Kevin Serrano	3ca20bd8a3	Move account balance down a row. Adjusted positioning of buttons.	2016-07-05 12:04:15 -07:00
Dan Finlay	71df05c5ff	Put network status checkmarks at end of row	2016-07-01 15:04:38 -07:00
Dan Finlay	287222df25	Linted	2016-07-01 10:32:54 -07:00
Dan Finlay	51a5e66cbb	Move main drop-down state to component state	2016-07-01 10:25:19 -07:00
Dan Finlay	6ec387b675	Formatted dev mode better	2016-06-30 23:50:20 -07:00
Dan Finlay	7f9200b1bf	Added some basic styles	2016-06-30 23:15:45 -07:00
kumavis	5a917431d8	disclaimer - render via react-markdown	2016-06-30 21:46:19 -07:00
Dan Finlay	cd21a4b699	Remove scroll fixing from ui preview	2016-06-30 21:32:50 -07:00
Dan Finlay	a0a676c3e2	Remove old disclaimer	2016-06-30 21:24:14 -07:00
Dan Finlay	d33d4f0654	Merge branch 'master' into FrankieDisclaimer	2016-06-30 21:22:39 -07:00
kumavis	d4e400e5e5	Merge pull request #378 from MetaMask/UiDev ... Ui dev	2016-06-30 21:20:40 -07:00
Dan Finlay	aa21c83470	Add new user agreement	2016-06-30 20:54:51 -07:00
Dan Finlay	2843459fcf	Make info page not chrome dependent	2016-06-30 18:23:05 -07:00
Dan Finlay	e55938ed15	First simple version of ui mocker	2016-06-30 18:22:16 -07:00