1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 12:56:01 +01:00
Commit Graph

903 Commits

Author SHA1 Message Date
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
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
frankiebee
f81fdbc34f Merge branch 'master' into mascara 2017-04-02 23:04:55 -07:00
frankiebee
89c924101e Merge branch 'master' into mascara 2017-04-02 22:26:25 -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
frankiebee
a20a237282 Merge branch 'master' into mascara 2017-03-28 18:02:39 -07: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
0d20b54854 Detect tx network from txMeta 2017-03-28 14:23:01 -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
kumavis
e4543bc104 Merge branch 'ropsten-fix-2' of github.com:MetaMask/metamask-plugin into ropsten-fix 2017-03-27 11:04:58 -07:00
kumavis
dca4486a65 block explorer - ropsten
etherscan differentiates between "attacked ropsten" vs "revived ropsten"
https://ropsten.etherscan.io/ is the revived ropsten
2017-03-27 10:57:04 -07:00
kumavis
bd4a68531b block explorer - account link - ropsten
etherscan differentiates between "attacked ropsten" vs "revived ropsten"
https://ropsten.etherscan.io/ is the revived ropsten
2017-03-27 10:55:40 -07: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
frankiebee
8e30acb41a Merge branch 'master' into mascara 2017-03-23 15:44:29 -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
frankiebee
197e6e0b77 WIP: indexdb is at an err state "provider is undefined" 2017-03-23 11:41:32 -07:00