2017 Commits

Author	SHA1	Message	Date
sdtsui	35508a2898	Add wrapper CSS for AccountDetailsModal	2017-08-21 05:58:30 -07:00
sdtsui	3fa7c5dc08	Hook up hideModal action to close icon in EditAccountNameModal	2017-08-21 04:53:39 -07:00
sdtsui	c2636143c3	Hook up selected account label display to main wallet view	2017-08-21 04:51:55 -07:00
sdtsui	d82233b95c	Hook up actions to EditAccountNameModal	2017-08-21 04:46:38 -07:00
sdtsui	80a2cba38e	Enhance global modal to accept styles from different components	2017-08-21 03:53:01 -07:00
sdtsui	66829b7a05	Implement new dropdown design, integrate account balances	2017-08-21 03:27:11 -07:00
sdtsui	18ea874a80	Hook up edit account name modal	2017-08-20 19:39:37 -07:00
sdtsui	beedd5b11e	Remove old design - 'Show QR Code' dropdown menu item from account selection dropdown	2017-08-20 19:29:14 -07:00
sdtsui	73a593b42e	Hook up template for New Account Modal	2017-08-20 19:28:20 -07:00
sdtsui	71b2dd290b	Enhance global modal to handle Buy, Edit, and Details Modals	2017-08-20 19:10:49 -07:00
sdtsui	4e9376ca71	Extend modal implementation and state management to accomodate multiple modal types	2017-08-20 18:32:58 -07:00
sdtsui	e550d36084	Add 'Account Details' dropdown menu item to account options dropdown	2017-08-20 18:10:06 -07:00
sdtsui	7d02c90510	Add 'Add Token' dropdown menu item to account options dropdown	2017-08-20 18:09:09 -07:00
Dan Finlay	98bedfabf9	Fix eth sign formatting	2017-08-17 15:35:17 -07:00
Dan Finlay	343a7e9cce	Transition to home view after tx error	2017-08-16 17:06:21 -07:00
Dan Finlay	9fbdeab3de	Fallback to ethplorer link	2017-08-16 12:55:34 -07:00
Dan Finlay	3b6ee032f5	Remove dead code	2017-08-16 09:52:09 -07:00
Dan Finlay	722d91c866	Remove default tokens	2017-08-16 09:49:23 -07:00
Dan Finlay	b69f5533d9	ReEnable Token List	2017-08-16 09:49:18 -07:00
Kevin Serrano	923415213f	Merge pull request #1916 from MetaMask/fix/account-name-scroll ... Oneliner for account label overflow issue on QubesOS	2017-08-15 14:08:30 -07:00
Kevin Serrano	9c7abacf64	Change cursor type to indicate link.	2017-08-15 12:26:11 -07:00
frankiebee	a8d6e1fe98	fix spelling	2017-08-15 12:16:41 -07:00
frankiebee	176dd6d214	Disable token list	2017-08-15 12:12:57 -07:00
sdtsui	6168efc9cc	Fix overflow issue on QubesOS, flagged by @kumavis	2017-08-15 17:13:11 +02:00
davidp94	f52ef5d496	fix goHome	2017-08-14 21:51:39 -07:00
davidp94	39424cdf45	remove unused action type	2017-08-14 21:35:57 -07:00
DavidNinja	399c51c048	cancel all txs	2017-08-14 21:29:21 -07:00
sdtsui	99be6e17ca	[WiP] Add comments for multiple modals	2017-08-15 05:46:41 +02:00
sdtsui	dbc539ac55	Merge remote-tracking branch 'mm/master' into NewUI-flat	2017-08-14 11:06:14 +02:00
sdtsui	2eadf72fb7	Lint and cleanup all scss	2017-08-14 10:31:27 +02:00
sdtsui	1743ccbdb5	Center account selection dropdown and specify useCssTransition prop	2017-08-14 08:50:49 +02:00
sdtsui	f2f2d35992	Remove unnecessary imports, and account-detail.js	2017-08-14 08:40:25 +02:00
sdtsui	5f775315bd	Reconfigure AccoutSelector dropdown to use new fa-caret-down instead of old icon	2017-08-14 08:40:16 +02:00
sdtsui	88665ba150	Extract dropdown component into components/dropdowns, hook up to app	2017-08-14 08:31:49 +02:00
sdtsui	b900da885e	Fix odd relative position conflict so main icon is rounded - See flyswatter/jazzicon/issues/1	2017-08-14 07:34:57 +02:00
sdtsui	d01a663342	Remove unused code - network dropdown components in app	2017-08-13 22:20:58 +02:00
sdtsui	c60ea60ec9	Remove deprecated feature: main app settings dropdown	2017-08-13 22:16:22 +02:00
sdtsui	4cd33453dc	[WIP] Extract network dropdown into own component	2017-08-13 22:15:21 +02:00
sdtsui	e39c600a45	[WIP] Extract network dropdown out of main app render function	2017-08-13 10:49:41 -07:00
sdtsui	25184a3901	Move global modals into own pod, inside components/modals	2017-08-13 10:24:51 -07:00
sdtsui	9b48e0aa53	Implement infinite scrolls (no lazy loading) for wallet view	2017-08-11 09:17:14 -07:00
sdtsui	9954c95b4a	[WIP] Begin fixing responsive layout with many wallets	2017-08-11 00:42:44 -07:00
sdtsui	f23d8c7393	Allow fullscreen scrolling on mobile view, while retaining in-window scroll for laptop	2017-08-11 00:42:09 -07:00
sdtsui	0fab1b5482	Implement responsive wallet balances	2017-08-11 00:31:06 -07:00
sdtsui	8a39941d9a	Cleanup SCSS and improve organization of color vars	2017-08-10 23:21:39 -07:00
sdtsui	58b61eb1fc	Add UI tweaks, including separation of overflow logic for mobile (full-height) vs laptop (tx-view-only)	2017-08-10 22:47:56 -07:00
sdtsui	7a664a7f72	Improve text positioning on mobile view	2017-08-10 22:16:42 -07:00
sdtsui	3188cc2ef0	Extract scss breakpoints into variables	2017-08-10 22:16:25 -07:00
sdtsui	e31c298288	Implement widescreen layout for tx list	2017-08-10 20:52:22 -07:00
sdtsui	f9432c5982	Move Txs list item styles into classes	2017-08-10 19:55:01 -07:00
sdtsui	d53780bcdc	Add new color for txs - dusty-gray	2017-08-10 19:54:42 -07:00
sdtsui	96b186dfb2	Cleanup txList and txView components	2017-08-10 19:35:10 -07:00
sdtsui	77b72ee33f	Add selectors for txsToRender and conversionRate	2017-08-10 19:35:01 -07:00
sdtsui	9ec8663605	Cleanup stray logs and lint	2017-08-10 17:50:33 -07:00
sdtsui	2346c9b6b9	Add overflow support for all account names in account details	2017-08-10 17:49:12 -07:00
sdtsui	771f9ec124	Fix logic for dropdown components attaching checkmark to correct account	2017-08-10 17:37:55 -07:00
sdtsui	88f4931c6f	Fix text overflow for dropdown components flagged by @frankiebee	2017-08-10 17:37:36 -07:00
Simon Liang	95eda70efe	added logging for account balance	2017-08-10 16:52:26 +08:00
Simon Liang	708d8398f4	reverted my changes	2017-08-10 14:48:05 +08:00
Simon Liang	a3f96951c2	connected wallet view dropdown button with real data	2017-08-10 14:47:17 +08:00
Simon Liang	53c91591b3	redid tx-view and balance-component mapStateToProps logic	2017-08-10 14:43:01 +08:00
Simon Liang	87cb930130	moved the props initialization steps into mapStateToProps	2017-08-10 14:43:01 +08:00
Simon Liang	9d36b25c5f	extracted transaction list	2017-08-10 14:43:01 +08:00
Simon Liang	72df9746fa	removing styling comments	2017-08-10 14:43:01 +08:00
sdtsui	779be75370	[WIP] Position account potions dropdown correctly and hook up to action creators	2017-08-09 21:42:16 -07:00
sdtsui	be116ecfbd	Add new selectors for addresses, identities, and accounts	2017-08-09 21:42:16 -07:00
sdtsui	5f74564deb	Adjust modal styles to match new modal size, from cancel button tweak	2017-08-09 21:42:16 -07:00
sdtsui	50f8535f7b	Switch buy modal 'cancel' from text to button for accessibility	2017-08-09 21:42:16 -07:00
sdtsui	231b8a7542	Vertically center modal in mobile view - @cjeria	2017-08-09 21:42:16 -07:00
sdtsui	cba50818c2	Improve layout of buy buttons by tweaking text styles	2017-08-09 21:42:16 -07:00
Kevin Serrano	45fc1d6ec3	Readd loose label onto accounts.	2017-08-09 17:40:01 -07:00
kumavis	245125eb18	ui - buy eth - formatting and moved network names to config	2017-08-09 12:25:38 -07:00
kumavis	052d338b2b	lint fix	2017-08-09 01:04:42 -07:00
kumavis	897d00efa0	ui - buy eth - add dharma beta to kovan	2017-08-09 01:00:06 -07:00
kumavis	84c3d3c6db	ui - buy button view - refactor	2017-08-09 00:36:18 -07:00
kumavis	0188e7b94d	Merge branch 'master' into NewUI-flat	2017-08-08 23:30:58 -07:00
sdtsui	5e9926b0d0	Fix dropdown z-index value	2017-08-08 19:02:58 -07:00
sdtsui	6be6f56ac5	Add z indicies to settings-variables	2017-08-08 19:01:33 -07:00
sdtsui	67213e7583	Add backdrop styles and box shadow to new global modal defaults	2017-08-08 18:51:06 -07:00
sdtsui	bdf5436c2d	Add minor comments and cleanup for new components	2017-08-08 18:44:20 -07:00
sdtsui	c8893fb9ca	Hook up 'Buy with Fiat', redirect to Coinbase	2017-08-08 18:37:20 -07:00
sdtsui	dc702705bf	Move buy view into its own component - BuyOptions	2017-08-08 18:34:04 -07:00
sdtsui	eab5718a40	Add an additional font-size breakpoint for buy modal on the largest screens	2017-08-08 18:12:50 -07:00
sdtsui	3072d2d178	Add minor positioning tweaks for buy modal, laptop view	2017-08-08 17:57:47 -07:00
sdtsui	b97dcf09ac	Move inline styles out into explicitly named BEM classes	2017-08-08 17:51:06 -07:00
sdtsui	928adae104	Implement modal content for buy flow - mobile view	2017-08-08 17:11:25 -07:00
kumavis	922ecb9149	Merge branch 'master' into greenkeeper/initial	2017-08-08 16:23:14 -07:00
kumavis	7db1f30590	Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout ... Improve layout for legacy buy screen	2017-08-08 15:56:02 -07:00
sdtsui	9d3b5348aa	Fix layout issues flagged by @tmashuang	2017-08-08 15:17:52 -07:00
sdtsui	b6a7281737	Make buy ui more central to the screen	2017-08-08 15:17:24 -07:00
Thomas Huang	67e4855b9d	Updated commonjs require path for redux-logger and redux-thunk modules	2017-08-08 14:15:45 -07:00
sdtsui	922a272e81	Add note for responsive modal styles	2017-08-08 14:05:19 -07:00
sdtsui	29c8f448ca	Hook up global modal to Tx view, Buy button	2017-08-08 13:37:52 -07:00
sdtsui	f72f57dc6c	Implement global modal	2017-08-08 13:37:41 -07:00
sdtsui	aab0fda9ac	Add actions and reducers for global modal	2017-08-08 13:37:16 -07:00
Simon Liang	0db627d979	refactored and added unit test	2017-08-08 20:15:30 +08:00
Simon Liang	e8ade42f2a	extracted balance component and renders to the format, also wired in the account name	2017-08-08 16:49:45 +08:00
frankiebee	f3b42f1e33	Merge branch 'master' into transactionControllerRefractor	2017-08-07 16:24:58 -04:00
kumavis	78aa957e5a	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-07 10:52:08 -07:00
sdtsui	d8fff0fc8c	Opt for calculated values in absolutely positioned caret	2017-08-06 23:12:40 -07:00
sdtsui	0f140c5db5	Improve positioning of caret and add reusable color for wallet view	2017-08-06 22:30:27 -07:00
sdtsui	ba50411bb2	Position account icon, name, and caret	2017-08-06 21:54:42 -07:00
sdtsui	29662ff7b4	Move tx and wallet view styles to component classes	2017-08-06 20:47:59 -07:00
sdtsui	5c7adc911d	Merge branch 'NewUI' into feat/mm-ui-5-merged	2017-08-06 20:24:04 -07:00
sdtsui	02c2106c3b	Merge branch 'master' into feat/mm-ui-5	2017-08-06 19:55:34 -07:00
sdtsui	fd36d95c50	Cleanup before rebase on NewUI - need new version of AccountDropdowns	2017-08-06 19:52:13 -07:00
sdtsui	b3d7abd5d4	Allow clicks on account view to enable sidebar, not just burger	2017-08-06 19:29:51 -07:00
sdtsui	850d2124c8	Refactor account name css - mobile views	2017-08-06 19:26:52 -07:00
sdtsui	7cb031eeb9	Add sidebar click handler to overlay	2017-08-06 19:03:38 -07:00
sdtsui	a7017b824d	Refactor app-header css, including box shadow and z-index	2017-08-06 18:50:23 -07:00
sdtsui	403d9c52b5	Add fine css tweaks to hero balance - laptop	2017-08-06 18:14:48 -07:00
sdtsui	f06a18a09c	Adjust hero balance on mobile	2017-08-06 17:46:18 -07:00
sdtsui	ebf39831c4	Adjust size of buttons for 576-780+px range	2017-08-06 17:13:31 -07:00
sdtsui	dc0f78c1b9	Fix font size of eth display for 576-780px vw	2017-08-06 16:58:45 -07:00
sdtsui	c1b8517959	Normalize sidebar dimensions and adjust hero button responsiveness	2017-08-06 16:37:41 -07:00
sdtsui	802c29c986	Implement hero balance UI, mobile	2017-08-06 15:46:55 -07:00
sdtsui	17de77f24a	Position account display and burger in mobile tx view	2017-08-06 14:56:13 -07:00
sdtsui	c9b33da184	Disable debug styles	2017-08-06 14:25:34 -07:00
sdtsui	966b25573b	Move remaining debug, fonts, reset, and transitions into inverted triangle	2017-08-06 14:03:44 -07:00
sdtsui	f73e4dd604	Move debug and colors to itcss	2017-08-06 13:53:22 -07:00
sdtsui	2eddfec342	Remove output folder	2017-08-06 13:46:11 -07:00
sdtsui	38f53066f3	Remove unncessary sourcemaps from css output/	2017-08-06 13:26:00 -07:00
sdtsui	d46a79df25	Organize app components scss	2017-08-06 13:24:13 -07:00
sdtsui	b65dc85b0a	Organize app components	2017-08-06 13:06:18 -07:00
sdtsui	a0a956d646	Move generic button components and body styles to components and generic, respectively	2017-08-06 13:02:31 -07:00
sdtsui	04d1d86f30	Move old colors intro settings/variables	2017-08-06 12:49:02 -07:00
sdtsui	f0a219294d	Add inverted triangle css (itcss) folder structure	2017-08-06 12:45:21 -07:00
sdtsui	bc73cbdbfe	Cleanup css and gulpfile post-migration	2017-08-06 12:29:26 -07:00
sdtsui	3f222854e4	Migrate from css to scss + autoprefixer	2017-08-06 12:09:17 -07:00
sdtsui	b5251d22a6	Fix integration test failures: unnecessary sandwich-expando event stopPropagation	2017-08-04 23:34:26 -07:00
sdtsui	186bcec4fb	Lint menu-droppo	2017-08-04 13:31:18 -07:00
kumavis	5f8a2ea1e6	Merge pull request #1862 from sdtsui/add-rct ... Re-enable css transitions, only for dropdowns in app header	2017-08-04 13:22:25 -07:00
sdtsui	8cc3ae5988	Cleanup breakpoint css + comment on hackiness	2017-08-04 13:19:06 -07:00
sdtsui	0cd72db2d2	Adds early breakpoint from @frankiebee 's + @kumavis 's CR	2017-08-04 12:57:16 -07:00
sdtsui	4d967ebea9	Bring menu-droppo component into project, remove as a dependency	2017-08-04 11:47:36 -07:00
frankiebee	89a4fef1e4	Merge branch 'master' into transactionControllerRefractor	2017-08-04 14:45:22 -04:00
frankiebee	fa3df576bc	fixed: showing tx-s as errors vs. warning	2017-08-04 14:43:08 -04:00
sdtsui	781ac00eac	Re-enable css transitions for dropdowns in header, needs menu-droppo library update	2017-08-04 11:31:07 -07:00
kumavis	29dcadc346	ui - dropdown - use Object.assign syntax to appease coverage parser	2017-08-03 21:32:08 -07:00
kumavis	5a9257208c	Merge branch 'master' into NewUI	2017-08-03 21:02:01 -07:00
kumavis	17c9fd450f	Merge pull request #1858 from sdtsui/NewUI ... UI Tweaks, Minor Bugfixes, and Dropdown Resizing	2017-08-03 20:59:47 -07:00
sdtsui	777eb865df	Adjust padding of accountSwitcher dropdown	2017-08-03 20:03:48 -07:00
sdtsui	5ddb40f60c	Adjust top and bottom padding of accountSwitcher	2017-08-03 19:23:22 -07:00
sdtsui	baee076348	Lint ui/app	2017-08-03 19:17:46 -07:00
sdtsui	6f14f4b717	Allow new accounts selector to handle clicks	2017-08-03 19:10:37 -07:00
sdtsui	28fd016d12	Increase size of accountSelection dropdown	2017-08-03 19:08:36 -07:00
sdtsui	36d8c3dd39	Increase size of settings dropdown and account settings dropdown	2017-08-03 18:55:11 -07:00
sdtsui	086441e41c	Increase size of network dropdown	2017-08-03 18:50:29 -07:00
sdtsui	10d3a519c8	De-dupe click handler for sandwich-expando	2017-08-03 18:35:10 -07:00
frankiebee	7de58c8709	fix cancelTransaction not reciving a callback	2017-08-03 21:22:08 -04:00
sdtsui	4d6a289629	Add note with previous fa-angle-down for future refactor	2017-08-03 17:50:00 -07:00
sdtsui	aff213e845	Position account switcher icon back in app header	2017-08-03 17:49:23 -07:00
sdtsui	850e9b63d2	Move accountselector menu-droppo up to app-header	2017-08-03 17:17:00 -07:00
sdtsui	ecb09fcc0a	Disable account selection dropdown from account details	2017-08-03 17:08:19 -07:00
sdtsui	67f10d660f	Adjust account checksumAddress location up	2017-08-03 17:03:14 -07:00
Kevin Serrano	24a13d116c	Fix fox positioning.	2017-08-03 16:35:14 -07:00
Kevin Serrano	77908e1181	Fix wonky widths for notices.	2017-08-03 16:30:57 -07:00
Kevin Serrano	b4f621c980	Add maximum width for private key reveal	2017-08-03 16:00:44 -07:00
Kevin Serrano	ce2e9872cf	Remove 100% properties that were messing up sizing.	2017-08-03 15:51:20 -07:00
Kevin Serrano	6176a4b1bf	Add QR functionality	2017-08-03 15:32:44 -07:00
kumavis	da16f39626	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-03 15:05:32 -07:00
kumavis	da7471e095	lint fixes	2017-08-03 14:48:19 -07:00
sdtsui	0171918407	Add rough layout for flat layout tx details, add notes for breakpoints	2017-08-03 01:17:27 -07:00
sdtsui	267d12646c	Implement 'clear buttons' for tx view	2017-08-03 00:43:24 -07:00
sdtsui	6fd1c15a5c	Fix color for large password input	2017-08-03 00:25:25 -07:00
sdtsui	0e631f6ac0	Add notes for @Zanibar, with props.isUnlocked and currentView.name logs	2017-08-03 00:22:41 -07:00
sdtsui	d6779115cd	Fix background color for lock screen	2017-08-03 00:21:19 -07:00
sdtsui	3ed81847d1	Isolate routing logic for isUnlocked, remove stray logs	2017-08-03 00:01:38 -07:00
sdtsui	c7ac20ff65	Finalize sidebar dimensions	2017-08-02 23:14:53 -07:00
sdtsui	01788376d5	Finalize height for main screens, excluding sidebar	2017-08-02 23:07:35 -07:00
sdtsui	c47f81b2e0	Finalize width of main container for all viewports	2017-08-02 22:59:04 -07:00
sdtsui	b523faba13	Make mobile view flush with header	2017-08-02 22:23:48 -07:00
sdtsui	ff7ba83a6c	Add note for styling buttons	2017-08-02 22:09:12 -07:00
sdtsui	b70a399faa	Isolate container component, add refactor notes	2017-08-02 21:53:40 -07:00
sdtsui	41250f9769	Adjust header spacing for 500px and 900px heights	2017-08-02 19:48:33 -07:00
sdtsui	dd4586ee84	Adjust sidebar transition using @cjeria\'s feedback	2017-08-02 19:26:46 -07:00
sdtsui	61b4b1f947	Ensure app-header is rendered in responsive layout	2017-08-02 19:13:17 -07:00
sdtsui	49e3713704	Cleanup send, move send token into separate func to make room for send ETH	2017-08-02 18:24:48 -07:00
sdtsui	c312f34119	Move overlay out of transition area	2017-08-02 17:50:27 -07:00
sdtsui	8a39ef03c2	Hook up css animation	2017-08-02 17:49:04 -07:00
sdtsui	84aba21ae9	Add notes for overlay click action	2017-08-02 14:19:13 -07:00
sdtsui	9ebdc343aa	Implement custom sidebar, with close button	2017-08-02 14:17:58 -07:00
sdtsui	dfa10763e3	Integrate slideout menu with tx view	2017-08-02 13:32:02 -07:00
sdtsui	7767f9f7ad	Hook up responsive sidebar	2017-08-02 13:03:36 -07:00
sdtsui	22b03c62e6	Add burger icon and phone-visible media queries	2017-08-02 12:29:07 -07:00
sdtsui	41c585c796	Make wallet view visible iff vw above 575px	2017-08-02 12:18:29 -07:00
kumavis	4115c25d8f	lint fix	2017-08-01 13:21:02 -07:00
sdtsui	6f4bee4599	Hook up send button to Send Token screen	2017-07-31 23:21:11 -07:00
sdtsui	a7fc512650	Implement mobile-friendly responsive layout with flex wrap	2017-07-31 23:07:58 -07:00
sdtsui	caab0b61cc	Add rough layout for tx list items	2017-07-31 22:00:18 -07:00
sdtsui	ce06fbd36d	Add tx-view content divider component	2017-07-31 21:34:37 -07:00
sdtsui	c7ace5b23d	Add hyperscript for tx-view tabs	2017-07-31 21:27:37 -07:00
sdtsui	c876428044	Add TxView, use width percentages instead of flex-grow for layout	2017-07-31 21:16:07 -07:00
sdtsui	92bd783e0c	Adjust button styles to left align with wallet text	2017-07-31 20:54:04 -07:00
sdtsui	2d5c3394f4	Use DIN OT in wallet view	2017-07-31 20:46:56 -07:00
sdtsui	3797b9921f	Adjust popup size to 545x450; refactor wallet view to fit	2017-07-31 20:22:15 -07:00
sdtsui	0c1aea97c7	Isolate wallet-content-display component	2017-07-30 22:30:55 -07:00
sdtsui	7d4927c975	Add layout for Buy and Send buttons	2017-07-30 22:25:20 -07:00
sdtsui	610d6da8ae	Add hyperscript for wallet display component	2017-07-30 22:10:59 -07:00
sdtsui	0ca50dfb1b	Center account name and dropdowns	2017-07-30 21:53:13 -07:00
sdtsui	ddbf5613b3	Add note for later on isolating components	2017-07-30 21:35:41 -07:00
sdtsui	4cdfd00f58	Add box shadow to main container	2017-07-30 21:35:27 -07:00
sdtsui	cbd53d4601	Add containers for wallet view and dropdown UI	2017-07-30 21:25:32 -07:00
sdtsui	ca1a4b3096	Add layout for main container elements	2017-07-30 20:42:12 -07:00
sdtsui	b15575b453	Remove old header space	2017-07-30 20:02:42 -07:00
sdtsui	dd3766242d	Adjust dimensions of popup.html and app bar to match	2017-07-30 19:52:27 -07:00
sdtsui	a7ab69b940	Adjust button styles for Send Token screen	2017-07-30 16:47:47 -07:00
sdtsui	97cb25c9f1	Adjust copy in send token confirmation screen	2017-07-29 23:11:11 -07:00
sdtsui	9373ba9f38	Move action buttons out of send token container, tweak styles	2017-07-29 23:09:49 -07:00
sdtsui	f368f371c2	Simplify btn-green colors	2017-07-29 23:02:04 -07:00
sdtsui	6a5e73e673	Enhance button and input css reset to protect from user agent stylesheet	2017-07-29 23:00:44 -07:00
sdtsui	689f60d1ce	Add rounded background to total token, with minor styling tweaks	2017-07-29 22:44:39 -07:00
sdtsui	4880ee26d5	Add note to self, for future code cleanup	2017-07-29 22:20:29 -07:00
sdtsui	abc78a1bf9	Add content boxes to pendingTx, prep for reusability	2017-07-29 22:18:26 -07:00
sdtsui	65327dd11f	Cleanup unnecessary pending tx-switching logic	2017-07-29 22:17:56 -07:00
sdtsui	35ff4c195c	[WIP] Isolate form logic from rest of confirmation UI	2017-07-29 20:55:55 -07:00
sdtsui	8ace4710ff	Clean up send screen	2017-07-29 19:46:59 -07:00
sdtsui	25259cc2cd	Center action buttons, add minor style adjustments	2017-07-29 19:37:08 -07:00
sdtsui	9709881679	Center send token content; hook up 'Next' and 'Cancel' buttons	2017-07-29 18:54:21 -07:00
sdtsui	fec3e64d63	Add high-level css layout for Send Token	2017-07-29 18:07:58 -07:00
sdtsui	2a5f2c7f40	Add responsive container; add send token copy	2017-07-29 17:38:29 -07:00
sdtsui	c0483fc230	Add token logo to send screen	2017-07-29 13:31:53 -07:00
sdtsui	8c5be54722	Rearrange header components: closer to redesigned UI	2017-07-29 12:21:10 -07:00
sdtsui	4d7295b05f	Add for use in main header	2017-07-29 12:20:19 -07:00
sdtsui	8e1713e1e0	[WIP] Propose more scaleable color management	2017-07-29 12:07:46 -07:00
sdtsui	4044b58b5a	Fix dropdown behavior - network	2017-07-28 15:55:55 -07:00
sdtsui	34834c108d	Fix dropdown toggle behavior - settings	2017-07-28 15:40:26 -07:00
sdtsui	24d375aaf1	Fix dropdown toggle behavior - account dropdowns	2017-07-28 15:31:07 -07:00
Dan Finlay	d1828b6dc9	Fix react warning	2017-07-27 18:43:09 -07:00
Dan Finlay	a25c4f34c0	Limit max width of seed word conf screen	2017-07-27 18:32:32 -07:00
Dan Finlay	87c26eb5bc	Correct token pluralization for one token	2017-07-27 18:07:42 -07:00
Dan Finlay	f8cadbcb32	Merge branch 'master' into NewUI	2017-07-27 15:10:02 -07:00
Dan Finlay	8ba32d5ea8	Set min gas price to 1 gwei	2017-07-27 14:58:51 -07:00
Dan Finlay	9a1cf2a0d4	Ensure loading indication is full screen	2017-07-27 14:15:56 -07:00
Dan Finlay	56496f1ea0	Fix loading indication placement	2017-07-27 14:13:53 -07:00
Dan Finlay	f884477abb	Remove unused parameter	2017-07-27 14:07:36 -07:00
Dan Finlay	e73c7b907a	Restore support link	2017-07-27 14:00:09 -07:00
Dan Finlay	1d9fea8654	Fix info page formatting	2017-07-27 13:57:01 -07:00
Dan Finlay	21bde25780	Fix spelling	2017-07-27 09:19:03 -07:00
Dan Finlay	c071591adb	Fix custom provider indication	2017-07-26 15:30:41 -07:00
Dan Finlay	bc65484e1b	Remove object spread syntax	2017-07-26 15:11:32 -07:00
Dan Finlay	8fc0a025f6	Set initial scale for mobile.	2017-07-26 14:36:22 -07:00
sdtsui	8006d798ee	Re-center network dropdown	2017-07-26 13:02:08 -07:00
sdtsui	4c0f827946	Make account selection dropdown menu scrollable when too large for view	2017-07-26 12:43:18 -07:00
sdtsui	0fdbb80962	Remove Account Settings item from optionsMenu, unnecessary	2017-07-26 12:31:08 -07:00
kumavis	9d69951dec	logState - dont redundantly log to console	2017-07-26 10:50:06 -07:00
Dan Finlay	0ea6749dbc	Lots of flex rearrangement on account detail view ... Includes removal of ReactCssTransitionGroup for a simpler UI refactor.	2017-07-25 18:25:56 -07:00
Dan Finlay	7a04643d8e	Restore sort order fix	2017-07-24 21:43:34 -07:00
Dan Finlay	a22adec66f	Replace ui with responsive-ui	2017-07-24 17:05:07 -07:00
Dan Finlay	38dccab12e	Fix reference	2017-07-20 12:54:08 -07:00
Dan Finlay	a41e5788cf	Merge branch 'master' into NewUI	2017-07-20 12:39:06 -07:00
Dan Finlay	86d367957f	Move responsive ui into its own folder for easier merges	2017-07-20 12:38:38 -07:00
Dan Finlay	51c5bebdf5	Lowered minimum gas price to 1 gwei	2017-07-19 11:44:00 -07:00
Dan Finlay	a4e567ffc5	Add support page link to help page ... Also adjust github link to be a new bug link, which goes to the new issue page.	2017-07-17 09:57:16 -07:00
tmashuang	5c1ccc657c	Fix spelling	2017-07-05 13:42:15 -07:00
Dan Finlay	52a6b9f103	Reenable Default Token List ... Looks pretty clear to me now that the heavy traffic spike was not this feature, but was the EOS crowdsale. Now that we've mitigated their traffic spike, I think we can safely re-introduce this feature.	2017-07-05 10:30:48 -07:00
Dan Finlay	5eb3d5d485	Make folder for responsive UI	2017-07-03 15:39:25 -07:00
Kevin Serrano	36e0fef854	Merge branch 'master' into i1720-NoSpinnerOnConfig	2017-07-03 15:24:10 -07:00
Dan Finlay	8f65f964ae	Indicate which network is being searched for	2017-07-03 15:12:24 -07:00
Dan Finlay	4e4d6cea40	Add menu carrat next to network searching indicator	2017-07-03 15:06:26 -07:00
Dan Finlay	1503dba5ca	No longer show network spinner on config screen ... The config screen is used to select networks, so we must not block it with network loading indication.	2017-07-03 13:51:39 -07:00
Thomas Huang	7de87154e8	Merge branch 'master' into NoPopularTOkens	2017-06-30 10:55:01 -07:00
Dan Finlay	0c011d0fda	Remove send button ... Some token precisions are not respected by TokenFactory, so it's not sufficient for a default send form. Removing for now.	2017-06-30 10:28:27 -07:00
Dan Finlay	8abd592034	Stop loading popular tokens by default ... Improves performance when loading the token tab.	2017-06-30 10:26:45 -07:00
Kevin Serrano	ca3de2dc74	Merge pull request #1700 from MetaMask/StyleImprovements ... Add padding to token messages	2017-06-29 14:45:00 -07:00
frankiebee	5e8b4e3226	change “ACCEPT” to “SUBMIT”	2017-06-29 12:06:22 -07:00
Dan Finlay	c81a3c649a	Add padding to token messages	2017-06-28 16:36:58 -07:00
Thomas Huang	d2278699da	Merge pull request #1690 from MetaMask/i1669-StateCopyButton ... Add copy state logs button	2017-06-28 10:33:57 -07:00
Dan Finlay	1b8a4395ab	Add copy state logs button	2017-06-28 10:22:51 -07:00
Thomas Huang	bd523102fe	Merge pull request #1634 from MetaMask/i784-SendTokenButton ... Add send token button (link to TokenFactory)	2017-06-28 10:09:58 -07:00
Thomas Huang	ffd3773ef3	Merge pull request #1620 from MetaMask/i1616-AddTokenAdding ... Add ability to add tokens to token list	2017-06-28 10:07:49 -07:00
Dan Finlay	3fde5481ef	Merge pull request #1681 from MetaMask/AddressStripping ... Remove trailing periods and whitespace	2017-06-27 20:56:42 -07:00
Thomas Huang	d5f0ee4f5e	Add Back Button for Import Screen	2017-06-27 18:40:47 -07:00
Dan Finlay	8642feee09	Remove token contract validation step	2017-06-27 15:49:57 -07:00
Dan Finlay	ed08e736d7	Merge pull request #1675 from MetaMask/warning-fixes ... React Warning Fixes	2017-06-27 15:29:26 -07:00
Dan Finlay	40223687ae	Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton	2017-06-27 15:08:29 -07:00
Dan Finlay	78af771c79	Do not allow adding non token addresses	2017-06-27 15:03:35 -07:00
Dan Finlay	5440ed23d6	Support other network links	2017-06-27 14:53:27 -07:00
Dan Finlay	81ec53a814	Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin into i1616-AddTokenAdding	2017-06-27 14:46:06 -07:00
Dan Finlay	5cfce8c45a	Fix token adding bug	2017-06-27 14:45:43 -07:00
Thomas Huang	77054e1fbb	Rename Send to Next	2017-06-27 13:56:51 -07:00
Thomas Huang	a352690661	Remove trailing periods and white space	2017-06-27 12:09:50 -07:00
Kevin Serrano	9962a3068b	Change disabling button as state property.	2017-06-26 15:57:46 -07:00
Kevin Serrano	615b8d05a1	Prevent users from accidentally submitting two transactions by disabling button.	2017-06-26 15:47:53 -07:00
Kevin Serrano	f925a37a9f	Fix react warning for keys on ens address book	2017-06-26 14:01:35 -07:00
Kevin Serrano	31da623c21	Fix react warning on create-vault-complete	2017-06-26 14:01:09 -07:00
Thomas Huang	7628a83fd6	Fix Back Button on Add Token View	2017-06-26 11:47:08 -07:00
Dan Finlay	58e993ff29	Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton	2017-06-24 02:42:03 -04:00
Dan Finlay	b04d1de447	Merge branch 'master' into i784-SendTokenButton	2017-06-23 11:00:58 -04:00
Dan Finlay	06706f6e1b	Merge branch 'master' into i1616-AddTokenAdding	2017-06-23 08:50:44 -04:00
Kevin Serrano	f022c7c714	Merge pull request #1603 from MetaMask/AddTokenList ... Add popular token list	2017-06-22 17:28:10 -07:00
Thomas Huang	2a42925399	Merge pull request #1655 from MetaMask/fix-malito ... Fix broken malito link.	2017-06-21 16:20:25 -07:00
Kevin Serrano	eb7a9d7517	Fix broken malito link.	2017-06-21 15:55:22 -07:00
Dan Finlay	d0294720e2	Make seed confirmation wording scarier	2017-06-20 18:23:49 -07:00
Dan Finlay	027394b205	Reduce token list clutter by only showing held tokens ... We could change this when we allow hiding/removing tokens, but for now, this is a simple and pleasant solution.	2017-06-20 08:58:25 -07:00
Dan Finlay	97ab48ba0d	Fix propagation	2017-06-20 08:01:00 -07:00
Dan Finlay	a2781df8b4	Add better event lifecycle management to token list. ... Token list now renders errors when a token lookup fails. Also now cleans up event listeners when re-initializing the token list.	2017-06-19 19:11:55 -07:00
Dan Finlay	60855b0510	Add send button to TokenFactory ... A simple solution to a temporary token send screen: Linking to EtherScan. Will hold us over until we make our own token send view.	2017-06-19 19:02:13 -07:00
Dan Finlay	48789f2a3d	Add ability to add tokens to token list ... Fiex #1616	2017-06-15 16:22:53 -07:00
Dan Finlay	711a4def86	Make add token screen a fully working form ... Entering the address of a valid HumanStandardToken even auto-fills the other fields!	2017-06-15 15:38:23 -07:00
Dan Finlay	c4f6176820	Merge branch 'AddTokenList' into AddingTokens	2017-06-15 14:00:28 -07:00
Dan Finlay	39c7ed230d	Merge remote-tracking branch 'origin/master' into AddTokenList	2017-06-15 13:44:58 -07:00
Dan Finlay	f87c5f8a14	Remove log	2017-06-15 13:31:37 -07:00
Dan Finlay	0e1e0aa323	Create add token button and template view	2017-06-14 20:55:56 -07:00
Dan Finlay	a80945e730	Hide message on normal loading	2017-06-14 19:36:37 -07:00
Dan Finlay	1ed5804e4d	Multiple loading style improvements ... - When seeking network, show a full screen loading indication + message. - Network menu is still accessible "over" this indication. - Top Menu-Droppo components now slide *under* the menu bar like they should. - Loading indication opacity increased to increase message legibility.	2017-06-14 19:15:50 -07:00
Dan Finlay	68389d5d49	Remove excessive log	2017-06-14 18:12:41 -07:00
Dan Finlay	1814721e80	Add no tokens message	2017-06-14 18:08:03 -07:00
Dan Finlay	96d416c486	Vertically center loading indication	2017-06-14 15:30:47 -07:00
Dan Finlay	6fda78cd2b	Refresh token balance on network change	2017-06-14 15:21:51 -07:00
Dan Finlay	b7b9e0c1ac	Persist selected account tab ... Also improve error handling with token balances.	2017-06-14 14:21:50 -07:00
Kevin Serrano	a8ababe2f4	Add a new warning for file import JSON	2017-06-14 10:13:07 -07:00
Dan Finlay	3df2f2b2d4	Rename history to sent	2017-06-13 18:00:06 -07:00
Dan Finlay	108c4ab2c5	Auto populate token list with popular token balances ... Half implements #175 Things to do: - Add ability to add tokens to the list. - Persist the token tab selection (so it is an implicit preference) - Check what's up with the token-tracker polling, it seems like it is not waiting the interval.	2017-06-13 17:53:42 -07:00
Kevin Serrano	141e66171b	Merge pull request #1600 from MetaMask/i1554-ensSymFix ... ENS symbol renders on proper networks	2017-06-13 14:31:58 -07:00
Kevin Serrano	790712e6fd	Cleanup zero addresses.	2017-06-13 13:38:27 -07:00
Dan Finlay	a741cc4fc4	Merge branch 'master' into AddTokenList	2017-06-12 17:17:16 -07:00
Kevin Serrano	5e03b69892	Fix check icon appearing in inappropriate situations.	2017-06-12 16:56:37 -07:00
frankiebee	d1fa3c6de1	only prefix ethereum address	2017-06-12 14:38:26 -07:00
frankiebee	5668910244	prefix the address with "ethereum:"	2017-06-12 14:05:08 -07:00
Dan Finlay	8af41f1b05	Merge pull request #1574 from MetaMask/internfix ... Wording fix for notice button	2017-06-12 10:37:46 -07:00
Dan Finlay	7057c24471	Merge pull request #1570 from MetaMask/addfaq ... Modify FAQ to be more visible.	2017-06-12 10:36:16 -07:00
Dan Finlay	3e1d648ec0	Merge branch 'master' into gasupdater	2017-06-12 10:26:40 -07:00
Kevin Serrano	2fcf3d8439	Modify wording to new accept.	2017-06-09 10:48:28 -07:00
Kevin Serrano	cb95129fa1	Merge branch 'master' of github.com:nihar97/metamask-plugin into internfix	2017-06-08 16:10:59 -07:00
Kevin Serrano	a37c8f3ed0	Modify FAQ to be more visible.	2017-06-08 16:02:23 -07:00
Dan Finlay	c8f0802a8e	Fix bug that prevented publishing contracts	2017-06-05 15:35:52 -07:00
kumavis	95d20e9b76	Merge pull request #1545 from MetaMask/inValidAddressFix ... Dissallow transactions to be sent to 0x000...	2017-06-05 13:11:20 -07:00
frankiebee	94fedd1fc9	Fix for quick switch on ENS names	2017-06-05 13:00:15 -07:00
frankiebee	ec99bfd553	set the ensResolution to an invalid address if an error ocurs durring look up	2017-06-05 12:37:29 -07:00
frankiebee	0f69a09823	Fix linting error	2017-06-05 12:22:02 -07:00
frankiebee	653319be10	move address check to util.isValidAddress	2017-06-05 12:09:19 -07:00
frankiebee	37fd32025f	Fix punctuation	2017-06-05 12:00:01 -07:00
frankiebee	bb6e41963d	Dissallow transactions to be sent to 0x0000000000000000000000000000000000000000	2017-06-05 11:48:04 -07:00
Dan Finlay	8dc6aa9c4c	Remove dead style code	2017-06-04 22:26:32 -07:00
Dan Finlay	773b36b0de	Move address copying into reusable component ... "copyable" component allows any elements to be wrapped to include: - a tool tip that changes/debounces its label when clicked. - a customizable copyable value. Fixes #1539	2017-06-04 22:22:59 -07:00
Dan Finlay	ec097c8e34	Add copy links to mini tx panels	2017-06-04 22:13:28 -07:00
Kevin Serrano	2b7d842498	Update gasblocklimit params with every block.	2017-06-02 15:18:14 -07:00
Kevin Serrano	51b5e2f6e7	Add max gas limit to UI	2017-05-24 16:18:37 -07:00
Kevin Serrano	9554788c14	Minor cleanup of lint	2017-05-24 11:02:58 -07:00
Kevin Serrano	293d0b4a57	Minor cleanup	2017-05-24 11:02:26 -07:00
Kevin Serrano	10ca3b6467	Fix bug where submit was enabled when invalid params were filled out.	2017-05-24 10:13:43 -07:00
Kevin Serrano	60281f7250	Cleanup code.	2017-05-24 09:55:16 -07:00
Kevin Serrano	31d17c9e25	Fix test, create new value for precision/scale	2017-05-23 14:26:37 -07:00
Kevin Serrano	97d19f0f79	Merge branch 'master' into i1412-decimalizethegas	2017-05-23 10:43:59 -07:00
Kevin Serrano	959038132a	Increase accuracy of our rounding schemes.	2017-05-23 10:43:37 -07:00
Dan Finlay	058b732213	Tolerate nonces of any format	2017-05-22 15:43:20 -07:00
Dan Finlay	954d8bd111	Render txs with no nonce	2017-05-22 14:14:13 -07:00
Dan Finlay	0ef9e8b709	Lint	2017-05-21 14:18:23 -07:00
Dan Finlay	3c90024564	Label the pending tx icon with a tooltip	2017-05-21 14:15:34 -07:00
Dan Finlay	6209224a6c	Add transaction number (nonce) to tx list	2017-05-21 14:09:44 -07:00
Dan Finlay	7e7ceab95e	Fix decimal tolerance	2017-05-17 14:31:06 -07:00
Kevin Serrano	717db41d0b	Modify test, replace clone package.	2017-05-17 14:18:01 -07:00
Dan Finlay	24737ded34	Fix bug where decimals in gas inputs gave strange results	2017-05-17 14:13:05 -07:00
Kevin Serrano	1358966202	Merge branch 'master' into i1412-decimalizethegas	2017-05-17 10:42:15 -07:00
Dan Finlay	31c7daee73	Fix bug where edited gas parameters did not take effect ... Fixes #1407	2017-05-16 23:33:40 -07:00
Kevin Serrano	90bfa3cbcd	Fix merge conflicts.	2017-05-16 16:28:57 -07:00
Kevin Serrano	d8130f1eff	Fix reset button.	2017-05-16 16:20:58 -07:00
Kevin Serrano	53b8d18a5f	Complete transition into BN.	2017-05-16 15:30:22 -07:00
Nihar	5c71149a8f	continue button changed to agree	2017-05-16 14:23:42 -07:00
Dan Finlay	b4e6ea9db7	Fix fiat rendering ... Fixes #1439. When reorganizing fiat-value component to not use global state, had missed its necessary `currentCurrency` parameter. This now passes it in wherever it's used.	2017-05-16 11:36:21 -07:00
kumavis	9560de80a0	Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxForm ... Add test around conf-tx view's gas editing.	2017-05-15 23:25:20 -07:00
kumavis	e28e0acaa8	lint - mandatory dangle ... 😛	2017-05-15 23:21:46 -07:00
kumavis	d5636080cf	ui - send - clean props assignment	2017-05-15 23:12:47 -07:00
Thomas Huang	3367363b12	Remove all traces of testnet	2017-05-15 19:11:16 -07:00
Thomas Huang	4c10e2021a	Change default network to rinkeby	2017-05-15 18:05:11 -07:00
Dan Finlay	6abdec608e	Merge branch 'master' into i1407-FixNonEditingTxForm	2017-05-15 15:36:03 -07:00
Dan Finlay	fc7b4cb4bc	Linted	2017-05-15 15:22:49 -07:00
Dan Finlay	75d9b5619c	Verify updating gas value updates	2017-05-15 15:21:28 -07:00
Dan Finlay	4b341e6a95	Got test failing nearly correctly	2017-05-15 15:07:38 -07:00
Dan Finlay	c4be4c7195	Skip jazzicons in unit tests	2017-05-15 14:35:24 -07:00
Dan Finlay	19db11856b	Remove redux dependency from eth-balance and its dependent tree ... For better unit testability of the conf-tx view.	2017-05-12 12:44:51 -07:00
Kevin Serrano	974368fe08	Prettify JSON	2017-05-11 16:28:11 -07:00
Kevin Serrano	73e1cd2317	Trim currency list.	2017-05-11 12:30:39 -07:00
Dan Finlay	d737bd1633	Break up pending-tx component for better unit testability	2017-05-10 17:26:09 -07:00
kumavis	ac54c7d96b	ens - add mainnet ens support	2017-05-09 11:28:39 -07:00
Kevin Serrano	d61b587f30	Redefine txmeta when submitting.	2017-05-08 16:02:41 -07:00
Kevin Serrano	53a88b319b	Merge branch 'i1381-GasPriceInGwei' of github.com:MetaMask/metamask-plugin into i1381-GasPriceInGwei	2017-05-08 13:58:46 -07:00
Dan Finlay	c7b2f2f2e9	Cleanup	2017-05-08 13:34:01 -07:00
kumavis	68be86abe9	ui - remove web3, use eth-query	2017-05-08 12:29:08 -07:00
Dan Finlay	80d8a4e73e	Input gas in gwei ... Also enforces "safe low gas" minimum recommended by this article by eth-gas-station: https://medium.com/@ethgasstation/the-safe-low-gas-price-fb44fdc85b91 Fixes #1381	2017-05-07 16:51:57 -07:00
Dan Finlay	f17c6b4eef	Fix ens iterated element without key error	2017-05-07 16:44:43 -07:00
Dan Finlay	998128d4df	allow copy(logState()) to copy to clipboard	2017-05-07 15:20:56 -07:00
Kevin Serrano	061f56b207	Fox watches over us again.	2017-05-03 07:21:42 -07:00
Dan Finlay	53cecf77a2	Adjust fox look height	2017-04-30 18:54:57 -07:00
Dan Finlay	89b0d3d403	Make fox look away while typing password ... Inspired by this tweet: https://twitter.com/Aashay/status/858791285976481792	2017-04-30 18:46:27 -07:00
Dan Finlay	d1a1069180	Merge branch 'master' into rinkeby	2017-04-27 14:50:19 -07:00
Thomas Huang	6bdb4c8728	Fix linting warnings	2017-04-26 21:05:45 -07:00
Kevin Serrano	f2bf7326cc	Linting.	2017-04-25 14:44:25 -07:00
Kevin Serrano	242dc1e99f	Add missing changes. Create unique style for rinkeby icon.	2017-04-25 14:39:01 -07:00
Nickyg	d764e46a50	change network name to rinkeby when selected	2017-04-26 02:15:15 +05:30
Nickyg	e9aa37b699	add rinkeby network	2017-04-26 01:40:33 +05:30
Dan Finlay	bce4af2dca	Add placeholder etherscan token icons	2017-04-24 13:55:19 -07:00
frankiebee	79f88398ac	fix spelling	2017-04-24 20:56:31 +02:00
frankiebee	df9e40be63	Css fixes	2017-04-24 12:58:01 +02:00
frankiebee	9ebc5ed33c	make buy button green	2017-04-24 12:36:17 +02:00
frankiebee	1eda55c85a	Fix issue where stopPropagation didnt stop submitting the tx when clicking buy button	2017-04-24 12:35:45 +02:00
Jared Pereira	7f12be6a01	remove updateCoinBaseAmount action	2017-04-24 12:18:54 +04:00
Jared Pereira	5cabd3e02d	remove updateBuyAddress action	2017-04-23 21:45:55 +04:00
Jared Pereira	c1df7dedd9	remove case buyForm	2017-04-23 16:21:04 +04:00
Jared Pereira	7a8496f9da	remove buyButtonDeligator function	2017-04-23 15:28:45 +04:00
Jared Pereira	e543050868	remove extra buyAddress in state	2017-04-23 15:27:17 +04:00
Dan Finlay	40e2450022	Get token list looking ok	2017-04-21 09:01:51 -07:00
Dan Finlay	9bae32e78b	Add functional but ugly and hard-coded token list	2017-04-20 19:10:22 -07:00
frankiebee	ce03b7db51	Initial redo attempt of the buy view to look like vladt's desighn	2017-04-18 23:22:17 +02:00
frankiebee	83811910c8	Create a custom radio list component	2017-04-18 18:20:31 +02:00
Kevin Serrano	088bfd5e8d	Fix account detail transition fix.	2017-04-05 13:38:33 -07:00
kumavis	8b14666348	clean - remove unused extension ref	2017-04-04 22:43:55 -07:00
kumavis	5a91adf7d8	add platforms to mascara + move buyEther window open to ui	2017-04-04 18:23:46 -07:00
kumavis	aa06183c64	ui - use global.platform for extension interaction	2017-03-31 18:04:13 -07:00
kumavis	60a48e713f	ui - move popup auto-close after tx conf to ui entrypoint	2017-03-31 13:32:47 -07:00
kumavis	49d8877fd7	ui - startPopup returns store after boot	2017-03-31 13:20:16 -07:00
kumavis	0ef679388a	ui - reducer - app - code cleanup	2017-03-31 12:38:20 -07:00
kumavis	bd704b1d7e	etc - fix notification-manager ref, remove duplicated test file	2017-03-30 19:05:11 -07:00
kumavis	5036263f88	introduce platform api and rename notifications to notification-manager	2017-03-30 18:33:19 -07:00
kumavis	be88c87b25	extension - prefer extensionizer module	2017-03-30 18:30:24 -07:00
Kevin Serrano	cb34eda6c6	Fix potential formatting issues for seed word display.	2017-03-29 11:51:04 -04:00
Dan Finlay	7b9ac18557	Merge pull request #1268 from MetaMask/kovan-faucet-instructions ... Add Kovan faucet instructions	2017-03-28 14:56:02 -07:00
Dan Finlay	f2587b7e80	Merge pull request #1273 from MetaMask/i1267-seedfix ... Assure that seed words are placed into state tree upon request.	2017-03-28 14:54:04 -07:00
Dan Finlay	a3e08d779e	Merge branch 'master' into kovan-faucet-instructions	2017-03-28 14:50:55 -07:00
Dan Finlay	d1733c1f75	Merge pull request #1272 from MetaMask/hideseedwordsfromlogstate ... Hide seed words from UI State Dump	2017-03-28 14:50:10 -07:00
kumavis	067459da4c	Filter txs by txMeta network value in account detail	2017-03-28 14:39:45 -07:00
Dan Finlay	81d3658343	Improve UI gas calculation logic ... - Now striping hex prefixed gas values, which may have been causing mis-estimation. - Unified calculation logic to be entirely functional. - Greatly simplified how the pending-tx form keeps updated form state. Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value.	2017-03-28 11:52:15 -07:00
Kevin Serrano	a95d96d507	Assure that seed words are placed into state tree upon request.	2017-03-28 11:23:25 -04:00
Kevin Serrano	6af932904d	Remove seedWords from UI state dump.	2017-03-28 10:26:06 -04:00
Kevin Serrano	67892c49a6	Merge branch 'master' into kovan-faucet-instructions	2017-03-27 16:45:04 -04:00
Kevin Serrano	9a8bf5a605	Fix edge case where notice does not require scrollbar.	2017-03-27 16:33:04 -04:00
Kevin Serrano	c1136a6317	Add link to kovan faucet instructions.	2017-03-27 16:05:21 -04:00
Dan Finlay	c15dfccaa4	Merge branch 'master' into kovan-notice	2017-03-24 13:53:45 -07:00
Kevin Serrano	5cd917b0e9	Add personalMessages to function to calculate pending tx index.	2017-03-24 16:39:55 -04:00
Dan Finlay	5cc934f18c	Fix tx selecting bug	2017-03-24 12:50:39 -07:00
Kevin Serrano	1dfcc54381	Remove goHome action causing erratic UI behavior.	2017-03-24 13:57:04 -04:00
Dan Finlay	8e7b5d6a13	Remove unnecessary log	2017-03-24 10:26:50 -07:00
Dan Finlay	0e74cf2cba	Disable accept button when gas limit is too low	2017-03-24 09:45:03 -07:00
Dan Finlay	6a46e9ce06	Make gas calculations on render more consistent	2017-03-23 17:00:59 -07:00
Dan Finlay	9bea31a402	Fix initial tx fee estimation	2017-03-23 16:37:29 -07:00
Dan Finlay	3400ed0955	Fix a couple things ... Sorry apparently the gas fixes weren't in the last commit, but are in this one. As reported in previous commit, fixes a bug where initial estimate is not derived from the network. Also fixes a bug where clicking "reset" does not clear our custom validation warnings.	2017-03-23 16:02:40 -07:00
Dan Finlay	018b1d006f	Make reset button clear errors	2017-03-23 15:14:18 -07:00
Dan Finlay	31c1839ed7	Fix initial gas price estimate	2017-03-23 15:11:52 -07:00
Dan Finlay	612bace17d	Prevent default for reset and reject buttons	2017-03-23 15:01:05 -07:00
Dan Finlay	bda821f144	Override browser default validation message	2017-03-23 14:57:35 -07:00
Dan Finlay	55e8a717e6	Fix some broken refs	2017-03-23 14:55:59 -07:00
Dan Finlay	6b100163e9	Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm	2017-03-23 13:46:09 -07:00
Dan Finlay	e7a3330b98	Combine pending-tx-details component into pending-tx-details ... These were only separated originally so we could make the notification-based TX approval work, which provided its own buttons. This two templates are logically highly coupled, and keeping them working while separate has been difficult at times, and has even required resorting to dubious practices, like using React's `refs` pattern. This combines them into one fairly large component, but I think it's ok, we can still break this up into components, just not the separation that it had previously.	2017-03-23 13:44:09 -07:00
Kevin Serrano	b8500d384b	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	2017-03-23 12:05:42 -07:00
Kevin Serrano	525c32ae60	Enable etherscan linking on Kovan transaction list items.	2017-03-23 11:26:39 -04:00
Kevin Serrano	61a6203808	Reset disabled state for confirm button after every notice.	2017-03-22 21:38:37 -04:00
Dan Finlay	86f9be06eb	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	2017-03-22 16:00:11 -07:00
Kevin Serrano	45cdf6bdea	Merge branch 'master' into i238-kovan	2017-03-22 15:51:52 -07:00
Kevin Serrano	c55c768cde	Merge branch 'master' into hide-password	2017-03-22 15:46:50 -07:00
Kevin Serrano	457611d8f8	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	2017-03-22 15:41:47 -07:00
Kevin Serrano	463eb01d1d	Merge branch 'master' into hide-password	2017-03-22 15:41:24 -07:00
Dan Finlay	9545ef3ba8	Merge branch 'master' into i1193-errorstylefix	2017-03-22 15:39:20 -07:00
Dan Finlay	72e979909c	Merge branch 'master' into i238-kovan	2017-03-22 15:37:33 -07:00
Dan Finlay	18414f5cbd	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	2017-03-22 15:25:15 -07:00
Dan Finlay	77907038ff	Got basic validations working	2017-03-22 15:17:57 -07:00
Kevin Serrano	41e276b036	Hide the password in the private key retrieval screen.	2017-03-22 17:46:51 -04:00
Kevin Serrano	5d14925842	Fix styling of error message.	2017-03-22 16:54:10 -04:00
Kevin Serrano	b26c53452e	Add Kovan test network to our application.	2017-03-22 16:05:04 -04:00
Kevin Serrano	34f3889eb0	Add kovan to drop-menu-item	2017-03-22 16:04:28 -04:00
Kevin Serrano	4757858df0	Add conditional kovan to current network component.	2017-03-22 16:03:51 -04:00
Kevin Serrano	b3dfc4e639	Add kovan conditional to config screen.	2017-03-22 16:03:02 -04:00
Kevin Serrano	4116b37d32	Modify css rule for unused hollow diamond.	2017-03-22 16:01:38 -04:00
Dan Finlay	9f1f0bff1e	Some progress	2017-03-22 10:35:02 -07:00
kumavis	9ac2ce1744	Merge branch 'master' into i1033-spinnerfix	2017-03-22 09:57:15 -07:00
Kevin Serrano	f2e40e85b7	Add one more loading indication.	2017-03-22 12:18:13 -04:00
Kevin Serrano	b0c0c30689	Uncomment lines relating to showing indicator.	2017-03-21 13:38:27 -07:00
Kevin Serrano	605c2a7404	Remove redundant removal of loading indicator. Integrate loading indicator disappear with display warning.	2017-03-21 09:15:12 -07:00
Kevin Serrano	0e43606b16	Adjust private key confirmation style and logic.	2017-03-21 08:53:34 -07:00
Kevin Serrano	889132b16c	Add action to hide loading indication on an incorrect pw.	2017-03-21 06:57:49 -07:00
Dan Finlay	35c05607b0	Improve personal_sign style ... textarea was not resizing the way I'd expected, so made it permanently larger, to accomodate larger messages.	2017-03-16 12:23:12 -07:00
Kevin Serrano	a186e40d17	Merge branch 'master' into i1165-predictive	2017-03-14 17:52:03 -07:00
Kevin Serrano	311b80adf3	Merge branch 'master' into i1211-currencyretention	2017-03-14 17:09:21 -07:00
Kevin Serrano	37ffcfcf0e	Rename variables to proper currency state variables.	2017-03-14 17:06:16 -07:00
Kevin Serrano	fcee7723e9	Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into i1165-predictive	2017-03-14 14:05:28 -07:00
Kevin Serrano	1ec7930c75	Minor change in removing opts object.	2017-03-14 14:04:52 -07:00
kumavis	c759300d4c	Merge branch 'master' into i1165-predictive	2017-03-14 13:11:03 -07:00
Kevin Serrano	b10f370c74	Render config screen from unlock.	2017-03-13 16:43:34 -07:00
Kevin Serrano	e4feb50f6f	Display Custom RPC on lock screen.	2017-03-13 16:41:25 -07:00
Kevin Serrano	2ab86b001d	Add comments.	2017-03-10 09:34:13 -08:00
Kevin Serrano	b34ee4daa1	Allow for adding recently used addresses to address book.	2017-03-09 15:10:27 -08:00
Kevin Serrano	9f6c040554	Create persistence address book.	2017-03-09 13:58:42 -08:00
Kevin Serrano	d270cbc9d2	Create distinct labels and names for addresses.	2017-03-09 13:07:38 -08:00
Kevin Serrano	1ca6fff317	Display owned addresses in datalist.	2017-03-09 11:31:00 -08:00
Dan Finlay	42e4a0621b	Add ENS click to copy ... Also bump ethjs-ens version to get proper error for unregistered names.	2017-03-08 15:38:22 -08:00
Dan Finlay	e3f6c010ab	Get basic ENS working ... & merge master into ENS branch.	2017-03-08 15:19:33 -08:00
Kevin Serrano	6f980cfe10	Add more informative message	2017-03-08 10:46:17 -08:00
Kevin Serrano	21769a008c	Fix typo, switch to log.error	2017-03-08 09:35:31 -08:00
Kevin Serrano	0ee8ca178e	Remove unneeded setrpc method.	2017-03-08 09:08:28 -08:00
Kevin Serrano	cf2268c3d2	Nodeify and promisify calls to background.	2017-03-08 09:06:41 -08:00
Kevin Serrano	e7e024bcdd	Refactor of code into separate reducers and actions.	2017-03-07 16:01:51 -08:00
Kevin Serrano	08ca7dac5a	Merge branch 'master' into i1144-moarrpc	2017-03-07 10:37:31 -08:00
Kevin Serrano	2a98beb878	Break out rpc update and rpclist into two reducers.	2017-03-07 10:25:50 -08:00
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	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	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
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	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
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	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