1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-23 18:41:38 +01:00
Commit Graph

865 Commits

Author SHA1 Message Date
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