1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02:00
Commit Graph

1094 Commits

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