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
