Commit Graph

719 Commits

Author SHA1 Message Date
Dan Finlay 39c7ed230d Merge remote-tracking branch 'origin/master' into AddTokenList 2017-06-15 13:44:58 -07:00
Dan Finlay 0e1e0aa323 Create add token button and template view 2017-06-14 20:55:56 -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
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 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
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 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
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 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
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 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
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
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
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 be88c87b25 extension - prefer extensionizer module 2017-03-30 18:30:24 -07:00
Dan Finlay a3e08d779e Merge branch 'master' into kovan-faucet-instructions 2017-03-28 14:50:55 -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 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
Dan Finlay 5cc934f18c Fix tx selecting bug 2017-03-24 12:50:39 -07: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
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 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
Dan Finlay 9f1f0bff1e Some progress 2017-03-22 10:35:02 -07:00
Kevin Serrano 0e43606b16 Adjust private key confirmation style and logic. 2017-03-21 08:53:34 -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 37ffcfcf0e Rename variables to proper currency state variables. 2017-03-14 17:06:16 -07:00
Kevin Serrano 1ec7930c75 Minor change in removing opts object. 2017-03-14 14:04:52 -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 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
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
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
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 576cc9eb75
Gas and Gaslimit revert to default if set to 0 2017-02-28 15:21:48 -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 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 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 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
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
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 e54b73679c
Notices must be scrolled down to proceed from. 2017-02-20 14:58:24 -08:00
Kevin Serrano 415b9b245c
Fix typo. 2017-02-20 12:59:31 -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 fbabcf6191
Change networks from lock screen. 2017-02-15 15:35:56 -08:00
Frankie de6455151e Revert old style message sighing 2017-02-09 17:32:49 -08:00
Frankie ce0c3ed03c Merge branch 'dev' into messageManagerCleanUp 2017-02-01 12:03:42 -08:00
kumavis f9b31fe2c3 rename selectedAccount to selectedAddress 2017-01-30 15:08:31 -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
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 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 958cbfbde4 Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu 2017-01-17 13:58:54 -08:00
Dan Finlay 5dd5619e5d Merge branch 'master' into dev 2017-01-16 10:55:32 -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 576e2ad64d Fix wording and icon of failed txs 2017-01-11 15:44:21 -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 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 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
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
Dan Finlay 11c1004a41 Linted 2016-12-20 16:07:24 -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 77d2deb176 Merged master into dev 2016-12-19 13:37:27 -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 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
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 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
Kevin Serrano f5b0795ac5
change all instances of selectedAddress to selectedAccount. 2016-11-21 16:21:16 -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 0c23925c23
Fix lint rules for ternary operator placement. 2016-11-11 15:37:22 -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 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 bc623bbe34 Linted 2016-11-04 12:32:47 -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 f2bfdd7f8c Make identicon tolerant of changing state 2016-11-01 17:06:18 -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 9b4f3825e7
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-10-28 16:19:14 -07:00
Dan Finlay ed3814bff8 Fix identicon rendering 2016-10-27 16:16:28 -07:00
Dan Finlay b1fb8da3b0 Fix provider menu selection indication 2016-10-25 14:16:04 -07:00
Frankie aace26c4bd Create callback and Clean-up details 2016-10-13 16:53:32 -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
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
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 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 ef0b535d94 Drop the buy button in the confTx view if account does not have enough eth 2016-09-15 10:24:05 -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
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
Frankie c37c050c8a Revert "Add new eth-lightwallet salting to vault." 2016-09-12 10:34:06 -07:00
Dan Finlay 6d6130e2a6 Camelcase dataset key for react 2016-09-10 11:23:11 -07:00
Dan Finlay a4e4c85453 Fix fox logo password following
The new lightweight svg logo was not following text quite right.

The new `lookAt` method was not using the same logic the module was using internally on mouse movement.

I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like.
2016-09-08 20:31:42 -07:00
Dan Finlay 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
Dan Finlay 762bf2f48a Merge branch 'master' into AddNewLogo 2016-09-08 12:49:57 -07:00
Dan Finlay 20ae4c2689 Fix logo usage for metamask-logo v2.0.0
- No longer need to check for webGL compliance (svg rendered!)
- logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element.

Otherwise, worked with very little effort!!

Fixes #624
2016-09-08 11:22:04 -07:00
Dan Finlay ab3b409438 Restore broken variable reference 2016-09-08 11:03:47 -07:00
Dan Finlay c3dbcb5b02 Fix double tooltip 2016-09-08 10:57:10 -07:00
Dan Finlay 2ca58f5bf7 Merge branch 'master' into ModularFiatBalance 2016-09-06 19:36:40 -07:00
Dan Finlay 0186e05a0d Linted 2016-09-06 17:30:38 -07:00
Dan Finlay 1537e3f5da Add fiat balances to tx conf view 2016-09-06 17:28:25 -07:00
Dan Finlay c46de79c10 Got basic fiat display modularized 2016-09-06 17:08:56 -07:00
Dan Finlay 90638f95c0 Fix fiat-value 2016-09-06 16:55:52 -07:00
Dan Finlay 09dd854a96 Nearly finished factoring fiat value into eth-balance 2016-09-06 16:45:06 -07:00
Kevin Serrano f4e131da0a Fix capitalization. 2016-09-06 11:04:54 -07:00
Kevin Serrano f213ca695c Fix typos and refine wording. 2016-09-06 10:03:10 -07:00
Dan Finlay b2ebb6032d Continuing fiat balance modularization 2016-09-03 14:20:27 -07:00
Dan Finlay 62179a37f7 Fix spelling error 2016-08-26 15:08:02 -07:00
Dan Finlay a8e40ffe7a Persist shapeshift form input values 2016-08-25 14:19:09 -07:00
Dan Finlay 8c06463e80 Linted 2016-08-24 15:46:31 -07:00
Dan Finlay 44ff75c7e1 Improve msg signing padding 2016-08-24 15:43:00 -07:00
Kevin Serrano 4bceda37a8 Merge branch 'master' into fox-sub 2016-08-23 14:51:09 -07:00
Kevin Serrano 6363a80b49 Linting. 2016-08-23 14:32:12 -07:00
Kevin Serrano 5168232481 Created option to pass in static file for fallback for logo. 2016-08-23 14:11:25 -07:00
Dan Finlay 5d24621b56 More linting 2016-08-22 17:37:16 -07:00
Dan Finlay 17f3f90d80 Linted 2016-08-22 17:21:54 -07:00
Dan Finlay f57cbe59fc Removed view more button, added account info button.
Also:
- Also fixed bug that caused React warning when rendering the tx history.
- Renamed 'Transactions' to 'History', since it now has more than that.
2016-08-22 14:36:21 -07:00
Dan Finlay 3d451ddf3e Merge branch 'master' into i390-TransactionLimit 2016-08-22 11:59:08 -07:00
Kevin Serrano cec88cc9ac Merge branch 'master' into fox-sub 2016-08-22 11:58:59 -07:00
Frankie edfb0eb968 Fix issue where if given a balance that does not need to be parsed will not be parsed 2016-08-19 17:18:11 -07:00
Kevin Serrano 7a466697d3 Modify logic for component update. 2016-08-19 16:59:04 -07:00
Kevin Serrano 43e28788d7 Create replacement logo for non-webgl 2016-08-19 14:47:49 -07:00
Dan Finlay 8592ffd855 Merge branch 'master' into i390-TransactionLimit 2016-08-19 07:57:35 -07:00
Dan Finlay 9cd85aea2f Merge branch 'master' into shapeshiftTx 2016-08-19 07:50:57 -07:00
Frankie e3e5538ddc Remove "+" from shapeshift tx and change wording in CHANGELOG 2016-08-18 20:24:17 -07:00
Dan Finlay fe5fff3248 Change 'View More' to 'Show More' 2016-08-18 17:47:42 -07:00
Frankie 98dab0ffd2 Make ballance teal for shapeshift tx and add to change log 2016-08-18 16:30:13 -07:00
Dan Finlay 4f857e297b Linted 2016-08-18 16:27:25 -07:00
Dan Finlay bd9d89826c Added `view more` button to transaction list
Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.
2016-08-18 16:23:12 -07:00
Kevin Serrano 4cebf12bb5 Fix rounding issues. 2016-08-18 15:59:37 -07:00
Frankie 3525dc0801 Create a ShapeShift tx in tx History 2016-08-18 15:20:26 -07:00
Frankie 23aeb1c5c1 Add api Public key 2016-08-18 12:20:24 -07:00
Frankie efa61f2cf8 Merge branch 'master' into shapeshiftTx 2016-08-18 11:06:32 -07:00
Frankie 752d16f6c0 WIP: ShapeShift tx 2016-08-18 11:04:28 -07:00
Kevin Serrano 666f3cd66c Added compliance for tests and properly accounts for N/A conversions. 2016-08-16 15:11:40 -07:00
Kevin Serrano 121af0c4b9 Lint. 2016-08-16 14:51:55 -07:00
Kevin Serrano 5afaebe602 Remove logs. 2016-08-16 14:49:53 -07:00
Kevin Serrano 0b052e94cc Hide conversions when API fails. 2016-08-16 14:49:21 -07:00