152419a79b
Merge branch 'master' into i328-MultiVault
2016-10-21 17:58:18 -07:00
7d9e295b75
Change regex in isHex function
2016-10-21 16:39:14 -07:00
d79424e9c0
clean up the isHex function
2016-10-21 16:05:39 -07:00
a462fc82e0
Fix duplicate provider menu item bug
2016-10-21 15:19:16 -07:00
957b7a72b5
Improved simple account generation
2016-10-20 17:29:25 -07:00
55d56f77cf
Began adding first basic keyring
2016-10-20 16:45:58 -07:00
0deed17752
Fix tests
2016-10-20 12:07:53 -07:00
383f8ea7dc
Linted & added salting to vault
2016-10-20 11:33:18 -07:00
e5c95d68f8
Fix state updating after vault creation and unlocking
2016-10-20 11:00:38 -07:00
f090828f99
Commented out useless advanced not on init screen
2016-10-20 09:58:44 -07:00
f14fdf7a25
Change actions reference to keyringController to background
2016-10-20 09:58:33 -07:00
40f175c06f
Linted
2016-10-20 09:50:29 -07:00
aa4746f4c7
Add test and ability for isHex to handle hex strings with hex-prefix
2016-10-19 19:35:44 -07:00
ac7dca22c3
Fix up wording
2016-10-19 17:39:41 -07:00
afbc4c832b
Git merge resolution.
2016-10-19 14:57:30 -07:00
ad3fa24a28
Intermediary commit.
2016-10-19 14:55:08 -07:00
5fb1e492fb
Add valdations to txData param
2016-10-19 14:33:30 -07:00
1481a3ef8e
Initial work on UI side
2016-10-15 10:48:12 -07:00
aace26c4bd
Create callback and Clean-up details
2016-10-13 16:53:32 -07:00
328f8b0cac
fix spelling
2016-10-13 16:22:45 -07:00
67eba9f542
Specify base 10 in bignumber
2016-10-13 16:04:23 -07:00
c400f7c0f6
Fix gasPrice range
2016-10-13 15:10:29 -07:00
cd2c00a318
Add minimal method signatures to new keyring controller
2016-10-12 17:05:39 -07:00
93ed918caa
Remove additional deprecated action
2016-10-12 16:43:35 -07:00
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
229d95956b
Merge branch 'master' into i#495CustomGasField
2016-10-11 16:19:13 -07:00
5d01d50c16
Merge branch 'master' into i721-ScrollAccountList
2016-10-11 16:13:53 -07:00
39f2118d31
Remove logs.
2016-10-11 16:03:52 -07:00
1dc2612f8e
Remove flex class from account list container
2016-10-11 15:59:55 -07:00
5e9bc31c58
Cleanup.
2016-10-11 15:50:02 -07:00
ed03b89e26
Move tos hash logic to build phase. Create dynamic global variables based on build.
2016-10-11 14:32:03 -07:00
3a610f2c06
Merge branch 'master' into i#495CustomGasField
2016-10-10 18:18:07 -07:00
e1b78da3e6
Add custom gas field to send page
2016-10-10 18:17:56 -07:00
0ecf364c5b
Prevent back/login buttons from appearing on the terms of service.
2016-10-07 02:11:03 -07:00
c0d6dcff00
Rewritten to react standards. Way easier.
2016-10-05 02:42:19 -07:00
a59422c01d
Linting.
2016-10-04 21:50:56 -07:00
862adf3a4b
Rename drop menu item to be consistent with naming.
2016-10-04 21:47:17 -07:00
f7714412e5
Add relevant legal links to help page.
2016-10-04 21:46:33 -07:00
9b61978738
Make config page title consistent with menu item.
2016-10-04 21:06:31 -07:00
94bfb5410b
Add links to relevant legal pages on user agreement page.
2016-10-04 21:03:14 -07:00
64d8f91371
Add conditional logic for adding listener.
2016-10-04 20:49:06 -07:00
1158855a15
Add padding to markdown paragraphs.
2016-10-04 18:45:01 -07:00
30a915921e
Merge branch 'master' into tos
2016-10-04 18:40:47 -07:00
991c06e542
Add CSS rules for proper formatting.
2016-10-04 18:39:54 -07:00
3628c5b324
Implemented scroll-to-bottom functionality for button activation.
2016-10-04 17:42:17 -07:00
4eafb7da2f
Merge branch 'master' into SmallerCopiedButton
2016-10-04 13:50:16 -07:00
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
c7d10affd5
Make seed word confirmation button font smaller
...
To avoid formatting glitches on some machines.
2016-10-04 13:04:54 -07:00
1f771f30e4
Space out purchase details on ShapeShift form
2016-09-15 21:18:21 -07:00
ed51b91b4a
Merge branch 'master' into i675-LoadingBuy
2016-09-15 21:05:24 -07:00
4eef2c57cf
Show loading indication when selecting ShapeShift
2016-09-15 20:58:18 -07:00
77ef71448d
Fix CHANGELOG.md and restructure onClick events
2016-09-15 19:35:04 -07:00
3682a2a1f9
linting
2016-09-15 18:25:05 -07:00
dcda841f4d
Merge branch 'master' into tx-viz
2016-09-15 18:16:41 -07:00
9c982a4bd6
add tx-viz link to transaction history
2016-09-15 18:13:13 -07:00
cf484d735f
Clean up some of the code
2016-09-15 14:31:45 -07:00
1325990726
css - smaller balance warning
2016-09-15 13:04:09 -07:00
f0d83813d6
confTx - add insufficient balance warning message
2016-09-15 12:56:40 -07:00
5005fc143b
confTx - show disabled accept btn + add colors
2016-09-15 12:42:35 -07:00
8ea086290b
Merge branch 'master' into i#519buyButtonTxConf
2016-09-15 10:26:02 -07:00
ef0b535d94
Drop the buy button in the confTx view if account does not have enough eth
2016-09-15 10:24:05 -07:00
a0bfdfe409
Do not show user rejection errors within our UI.
2016-09-14 14:34:54 -07:00
19c1b1fd8e
Merge branch 'master' into qrCode
2016-09-13 12:18:19 -07:00
f7794d9949
PendingTxDetails - partially remove imagify support
2016-09-13 10:18:57 -07:00
c477411ce0
Merge branch 'library' of github.com:MetaMask/metamask-plugin into library
2016-09-13 00:37:41 -07:00
8a5007a396
ui - remove unused currentDomain prop
2016-09-12 21:30:04 -07:00
4aa5114019
Remove unused code in qr actions
2016-09-12 17:32:49 -07:00
fc292627e4
Merge branch 'master' into qrCode
2016-09-12 17:30:54 -07:00
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
784856532c
Ensure loading indication covers fox
2016-09-12 14:37:17 -07:00
2caac3c7d7
Fix single account list formatting
2016-09-12 14:27:26 -07:00
0d11eab8cb
Add accounts back to metamask state
2016-09-12 14:22:06 -07:00
c37c050c8a
Revert "Add new eth-lightwallet salting to vault."
2016-09-12 10:34:06 -07:00
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
6d6130e2a6
Camelcase dataset key for react
2016-09-10 11:23:11 -07:00
69aa2ed25f
Merge branch 'master' into FixLogoPasswordFollow
2016-09-09 09:40:35 -07:00
a4e4c85453
Fix fox logo password following
...
The new lightweight svg logo was not following text quite right.
The new `lookAt` method was not using the same logic the module was using internally on mouse movement.
I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like.
2016-09-08 20:31:42 -07:00
7b6c018c39
Show loading indication during unlocking.
2016-09-08 19:53:54 -07:00
4a7eab5b1a
Merge branch 'master' into FixLogoLeak
2016-09-08 15:43:51 -07:00
6c05c221cd
Fix new logo related errors
...
Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method.
Also tuned up the logo to more closely resemble the old behavior.
- Overlaps the title text
- Points nose at cursor, not just front of eyes
- Cursor is more "distant" from fox, to avoid extreme angles on edges.
2016-09-08 15:41:21 -07:00
3f64095eed
Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue
2016-09-08 14:56:19 -07:00
ece1ecb90b
Fix wording in changelog and bug
2016-09-08 14:53:49 -07:00
079c1a8972
Merge branch 'master' into i#589pendingTxsIssue
2016-09-08 13:45:27 -07:00
0d4bfe8038
Remove console.log
2016-09-08 13:44:32 -07:00
7d8491de10
Add to CHANGELOG.md and Remove unnecessary catch
2016-09-08 13:13:43 -07:00
69580480bc
Merge branch 'master' into i#589pendingTxsIssue
2016-09-08 12:56:48 -07:00
6f86c5f8ee
Add network checks for unconfirmed Txs
2016-09-08 12:56:04 -07:00
762bf2f48a
Merge branch 'master' into AddNewLogo
2016-09-08 12:49:57 -07:00
20ae4c2689
Fix logo usage for metamask-logo v2.0.0
...
- No longer need to check for webGL compliance (svg rendered!)
- logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element.
Otherwise, worked with very little effort!!
Fixes #624
2016-09-08 11:22:04 -07:00
ab3b409438
Restore broken variable reference
2016-09-08 11:03:47 -07:00
c42b37a6e7
Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into ModularFiatBalance
2016-09-08 10:57:31 -07:00
c3dbcb5b02
Fix double tooltip
2016-09-08 10:57:10 -07:00
d1e91766da
Merge branch 'master' into ModularFiatBalance
2016-09-08 10:50:05 -07:00
5f8d3085d7
Filter out pending txs based on network from tx history
2016-09-07 20:56:51 -07:00
d6619a25e9
Fix typo
2016-09-07 14:44:56 -07:00
2ca58f5bf7
Merge branch 'master' into ModularFiatBalance
2016-09-06 19:36:40 -07:00
0186e05a0d
Linted
2016-09-06 17:30:38 -07:00
1537e3f5da
Add fiat balances to tx conf view
2016-09-06 17:28:25 -07:00
c46de79c10
Got basic fiat display modularized
2016-09-06 17:08:56 -07:00
90638f95c0
Fix fiat-value
2016-09-06 16:55:52 -07:00
09dd854a96
Nearly finished factoring fiat value into eth-balance
2016-09-06 16:45:06 -07:00
f4e131da0a
Fix capitalization.
2016-09-06 11:04:54 -07:00
f213ca695c
Fix typos and refine wording.
2016-09-06 10:03:10 -07:00
b2ebb6032d
Continuing fiat balance modularization
2016-09-03 14:20:27 -07:00
7b1bbb7a19
Show conf screen after send request
2016-09-01 11:30:42 -07:00
7f947f8ab2
Skip loading indication from send screen
2016-09-01 11:29:17 -07:00
c15eef9425
Make element enumeration Edge compatible
2016-08-29 17:34:29 -07:00
fb6476224f
Add tolerance for failed form persisting
2016-08-29 16:40:57 -07:00
a804629606
Show custom rpc menu item always
2016-08-29 12:36:47 -07:00
62179a37f7
Fix spelling error
2016-08-26 15:08:02 -07:00
ae33586660
make the back button its own function
2016-08-26 11:30:07 -07:00
547894ed39
Merge branch 'master' into i#563forgotPassword
2016-08-25 16:06:54 -07:00
250cf8cc23
Change style on back button to be more like the rest of the app
2016-08-25 16:05:44 -07:00
8b81009a30
Merge branch 'master' into PopupNotifications
2016-08-25 15:42:35 -07:00
6f082dd9e7
Linted
2016-08-25 14:23:41 -07:00
a8e40ffe7a
Persist shapeshift form input values
2016-08-25 14:19:09 -07:00
11c6c63d76
Merge branch 'master' into i#563forgotPassword
2016-08-25 14:17:29 -07:00
483a7fee0a
Add a back button on lock screen to go back to init menu
2016-08-25 14:13:32 -07:00
b39bd5333b
Persist send tx form field values
2016-08-25 14:10:07 -07:00
2026b674c5
Remove log
2016-08-25 14:09:54 -07:00
d81bde9f6c
Make restore vault form persist
2016-08-25 12:18:04 -07:00
6eb09c1a79
Add persistent form class
2016-08-25 12:17:21 -07:00
793ad6b8d8
Merge branch 'master' into PopupNotifications
2016-08-24 16:59:22 -07:00
8c06463e80
Linted
2016-08-24 15:46:31 -07:00
44ff75c7e1
Improve msg signing padding
2016-08-24 15:43:00 -07:00
4f78ae56b2
Fix empty sign message bug
2016-08-24 15:40:40 -07:00
bc43e3d140
Merge branch 'master' into PopupNotifications
2016-08-23 16:02:06 -07:00
65f7656487
Linted
2016-08-23 15:48:16 -07:00
671ca33abb
Close notification on opening main UI
2016-08-23 15:44:50 -07:00
4bceda37a8
Merge branch 'master' into fox-sub
2016-08-23 14:51:09 -07:00
6363a80b49
Linting.
2016-08-23 14:32:12 -07:00
5168232481
Created option to pass in static file for fallback for logo.
2016-08-23 14:11:25 -07:00
4fb49dfb4b
Close popup even if last tx is dismissed from main UI
2016-08-23 11:40:08 -07:00
49ab51d825
Merge branch 'master' into PopupNotifications
2016-08-22 20:06:59 -07:00
5d24621b56
More linting
2016-08-22 17:37:16 -07:00
a9b53530b6
Fix back button hiding on popup
2016-08-22 17:29:47 -07:00
17f3f90d80
Linted
2016-08-22 17:21:54 -07:00
6e1000f361
Merge branch 'master' into PopupNotifications
2016-08-22 15:03:36 -07:00
f57cbe59fc
Removed view more button, added account info button.
...
Also:
- Also fixed bug that caused React warning when rendering the tx history.
- Renamed 'Transactions' to 'History', since it now has more than that.
2016-08-22 14:36:21 -07:00
3d451ddf3e
Merge branch 'master' into i390-TransactionLimit
2016-08-22 11:59:08 -07:00
cec88cc9ac
Merge branch 'master' into fox-sub
2016-08-22 11:58:59 -07:00
edfb0eb968
Fix issue where if given a balance that does not need to be parsed will not be parsed
2016-08-19 17:18:11 -07:00
7a466697d3
Modify logic for component update.
2016-08-19 16:59:04 -07:00
43e28788d7
Create replacement logo for non-webgl
2016-08-19 14:47:49 -07:00
8592ffd855
Merge branch 'master' into i390-TransactionLimit
2016-08-19 07:57:35 -07:00
9cd85aea2f
Merge branch 'master' into shapeshiftTx
2016-08-19 07:50:57 -07:00
e3e5538ddc
Remove "+" from shapeshift tx and change wording in CHANGELOG
2016-08-18 20:24:17 -07:00
fe5fff3248
Change 'View More' to 'Show More'
2016-08-18 17:47:42 -07:00
98dab0ffd2
Make ballance teal for shapeshift tx and add to change log
2016-08-18 16:30:13 -07:00
4f857e297b
Linted
2016-08-18 16:27:25 -07:00
Dan Finlay
Frankie
Kevin Serrano
Frankie
kumavis
Dan Finlay
John Weldon