m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 08:09:15 +01:00
Code
1,301 Commits 2 Branches 0 Tags 265 MiB
80847739b2
Commit Graph

474 Commits

Author SHA1 Message Date
Frankie
617ab9d178 Move fox logo with filled in eyes into design folder (#433) 
* Move fox logo with filled in eyes into design folder

* Crop fox

* Crop fox properly

* Gah Crop fox properly
 2016-07-13 11:19:41 -07:00
kumavis
4cf83b582e Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBug 2016-07-12 00:12:44 -07:00
Dan Finlay
57da5a8198 Merge branch 'master' into FixSvgIcons 2016-07-11 20:55:58 -07:00
Dan Finlay
e21a48da83 Linted 2016-07-11 20:53:26 -07:00
Kevin Serrano
d7e6b752a3 Integrate changes back into eth-balance 2016-07-11 17:44:00 -07:00
Kevin Serrano
6a61591dad Move shorten balance to util. Add as property of generateBalance object output. 2016-07-11 16:31:12 -07:00
Kevin Serrano
37f21cf18f Remove unused functions. Readd if necessary. 2016-07-11 16:01:52 -07:00
Dan Finlay
66e079f1c7 Fix imageification of recipient 2016-07-11 15:49:13 -07:00
Dan Finlay
7b3f0ad43d Fix main dropdown animation 2016-07-11 11:33:12 -07:00
Kevin Serrano
40d2b7fe71 lint 2016-07-08 17:39:15 -07:00
Kevin Serrano
20bfb60fd2 Implement alternate shortening scheme. 2016-07-08 17:27:13 -07:00
kumavis
58ee3e1227 Merge branch 'master' of github.com:MetaMask/metamask-plugin into ui-fixth-width-tx-history 2016-07-07 17:39:48 -07:00
kumavis
d2eab80e09 eth-balance fix 2016-07-07 17:34:30 -07:00
kumavis
501ffba6f2 lint - dingle dangle comma tangle 2016-07-07 17:00:24 -07:00
kumavis
03430e8473 Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle 2016-07-07 16:56:20 -07:00
kumavis
7dc67a9257 notif - add support for forward carrat 2016-07-07 16:54:35 -07:00
Kevin Serrano
86b7cc6637 Resolve merge conflict. 2016-07-07 16:33:06 -07:00
Kevin Serrano
9a9c1f2cd4 Pass the linters. 2016-07-07 16:30:52 -07:00
Kevin Serrano
1c1d6241ed Remove reducer console log. 2016-07-07 16:29:31 -07:00
Kevin Serrano
5343404d0d Add new component for tx-history to avoid messing with other styles. Add fixed width specifically to this style. 2016-07-07 16:27:37 -07:00
Kevin Serrano
570d560932 Modified test views again. Added fixed length to center tx information. 2016-07-07 15:39:19 -07:00
kumavis
11fd281a33 ui - remove doubled eth-balance 2016-07-07 15:29:46 -07:00
Dan Finlay
33150cc721 Fixed eth_balance style, completing partial merge 2016-07-07 15:22:10 -07:00
kumavis
ac808e681f Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle 2016-07-07 15:04:53 -07:00
Kevin Serrano
432221625c Remove logging for states. 2016-07-07 13:50:57 -07:00
Kevin Serrano
ecb0f9767b Add new test state with tx history. Fix alignment issue with transaction history text. 2016-07-07 13:48:52 -07:00
kumavis
f71956b2ab lint fix 2016-07-07 13:45:06 -07:00
kumavis
0bb8b8cacc Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle 2016-07-07 13:41:32 -07:00
Dan Finlay
3cd502a163 Restore button naming consistency 2016-07-07 13:22:38 -07:00
Dan Finlay
e8efe84320 Add nickname rendering for recipient address 2016-07-07 13:21:45 -07:00
Dan Finlay
306035f575 Linted 2016-07-07 12:41:07 -07:00
Dan Finlay
468c1ffa42 Refined tx confirmation button styles 2016-07-07 12:39:40 -07:00
Frankie
cd8ae4b5ff Change function name to generateBalanceObject 2016-07-07 12:39:07 -07:00
Dan Finlay
2a204624f5 Implement tx confirmation style refinements 2016-07-07 12:27:34 -07:00
Dan Finlay
97b60caac0 Add configurable params to eth-balance 2016-07-07 12:27:18 -07:00
Frankie
0a6560bd5d Add method to deal with small decimals and create the object for eth-balance component 2016-07-07 12:13:38 -07:00
Dan Finlay
1e92e7e9d4 Make mini account panel labels fully configurable 2016-07-07 11:50:01 -07:00
Dan Finlay
21f17214be Remove formatBalance.formatted references 2016-07-07 11:39:24 -07:00
Dan Finlay
a02f43fb7f Merge branch 'master' into ConfirmationStyle 2016-07-07 11:38:11 -07:00
Frankie
2cc44df584 Revert back to original formatBalance 2016-07-07 11:20:02 -07:00
Dan Finlay
c2655bef5a Correct data length calculation 2016-07-06 23:38:07 -07:00
Dan Finlay
5faa64817c Update gas cost 2016-07-06 23:16:04 -07:00
Dan Finlay
3bcf44509e Fix sender balance rendering in pending tx details 2016-07-06 23:11:47 -07:00
Dan Finlay
a1fdf28a7b Merge branch 'master' into ConfirmationStyle 2016-07-06 22:56:07 -07:00
Dan Finlay
9e0d9b88cc Linted 2016-07-06 22:51:28 -07:00
Dan Finlay
ce463f3aff Fixed up pending-tx-details 2016-07-06 22:48:02 -07:00
Dan Finlay
7481f7c3df Fleshed out pending tx view 2016-07-06 21:32:36 -07:00
Kevin Serrano
acdd40e3be Fix dropdown z-index issue. 2016-07-06 20:11:49 -07:00
Frankie
8834548b01 Handle to small of balances with "<0.00001" 2016-07-06 19:17:32 -07:00
Dan Finlay
689bd58d81 Merged latest balance formatting code 2016-07-06 18:06:28 -07:00
Dan Finlay
15afbe5b1f Merge branch 'master' into ConfirmationStyle 2016-07-06 17:59:00 -07:00
Dan Finlay
7058dc4ee3 Began reworking tx conf view 2016-07-06 17:58:46 -07:00
Frankie
53eefc1efc Add a postion option for tool tip 2016-07-06 17:12:33 -07:00
Frankie
9d577ea023 Add decimal hendeling to ETH balance 2016-07-06 17:04:09 -07:00
Dan Finlay
fb5dbd23a9 Merge pull request #387 from MetaMask/ui-formatting 
Ui formatting for account details
 2016-07-06 11:00:32 -07:00
Frankie
8d67a820a9 Add light and ultraLight fonts 2016-07-05 15:39:51 -07:00
Dan Finlay
2c89cd722e Simplify empty account balance rendering 2016-07-05 15:16:40 -07:00
Kevin Serrano
3ca20bd8a3 Move account balance down a row. Adjusted positioning of buttons. 2016-07-05 12:04:15 -07:00
Dan Finlay
71df05c5ff Put network status checkmarks at end of row 2016-07-01 15:04:38 -07:00
Dan Finlay
287222df25 Linted 2016-07-01 10:32:54 -07:00
Dan Finlay
51a5e66cbb Move main drop-down state to component state 2016-07-01 10:25:19 -07:00
Dan Finlay
6ec387b675 Formatted dev mode better 2016-06-30 23:50:20 -07:00
Dan Finlay
7f9200b1bf Added some basic styles 2016-06-30 23:15:45 -07:00
kumavis
5a917431d8 disclaimer - render via react-markdown 2016-06-30 21:46:19 -07:00
Dan Finlay
cd21a4b699 Remove scroll fixing from ui preview 2016-06-30 21:32:50 -07:00
Dan Finlay
a0a676c3e2 Remove old disclaimer 2016-06-30 21:24:14 -07:00
Dan Finlay
d33d4f0654 Merge branch 'master' into FrankieDisclaimer 2016-06-30 21:22:39 -07:00
kumavis
d4e400e5e5 Merge pull request #378 from MetaMask/UiDev 
Ui dev
 2016-06-30 21:20:40 -07:00
Dan Finlay
aa21c83470 Add new user agreement 2016-06-30 20:54:51 -07:00
Dan Finlay
2843459fcf Make info page not chrome dependent 2016-06-30 18:23:05 -07:00
Dan Finlay
e55938ed15 First simple version of ui mocker 2016-06-30 18:22:16 -07:00
Frankie
1b1bb92fd3 Merge branch 'master' into compactLayout 2016-06-30 14:56:10 -07:00
Frankie
42cd0b69e7 Implemt new account layout 2016-06-30 14:53:24 -07:00
Dan Finlay
179d176dc1 Fix broken action reference 2016-06-30 11:30:31 -07:00
Frankie
5252504e3f WIP: Working on new layout 2016-06-30 11:15:32 -07:00
kumavis
41598a32a6 Merge branch 'master' of github.com:MetaMask/metamask-plugin into networkIndication 2016-06-29 17:12:08 -07:00
Frankie
94768175bf Merge branch 'master' into networkIndication 2016-06-29 16:33:43 -07:00
Frankie
0b3737edb4 Add to change log 2016-06-29 16:31:27 -07:00
Dan Finlay
2880f8631c Unify tooltip styles 
Made a local tooltip component for replicating our tooltip styles wherever we use tooltips.

Applied that tooltip to other items that had tooltips.
 2016-06-29 16:21:38 -07:00
Frankie
e0daea35a9 Add network name to indicator and some css fixes 
-also fix custom net work bug in drop down where it
thinks local:8545 is custom.
 2016-06-29 16:12:19 -07:00
Dan Finlay
2b5c42d27f Merge branch 'master' into CopyTxHash 2016-06-29 15:58:31 -07:00
Dan Finlay
78e6ed22be Add tooltip to copy button 2016-06-29 15:57:59 -07:00
Kevin Serrano
3ae479f5ac Unify wording for transaction options (#369) 
* Unify wording for transaction options.

* Modify changelog.

* Fix wording and spacing.
 2016-06-29 15:44:37 -07:00
Frankie
2c36c17238 Add ✓ charchter to indicate active network 2016-06-29 15:04:16 -07:00
Dan Finlay
7f92a8da06 Use clipboard icon for copy button 2016-06-29 14:39:25 -07:00
Dan Finlay
fb92b8a5fe Add copy button to transaction list 2016-06-29 14:12:58 -07:00
Dan Finlay
5c57169219 Replace manual copy buttons with new CopyButton component 2016-06-29 14:11:31 -07:00
Dan Finlay
441a7eec28 Add CopyButton component 2016-06-29 14:11:12 -07:00
Frankie
ce03356f5f Remove missused action 2016-06-28 19:10:27 -07:00
Frankie
dbae676858 Make it so that when you click the custom rpc url it closes the dropdown menu 2016-06-28 18:47:17 -07:00
Frankie
f3119d40f5 fix lint 2016-06-28 18:06:10 -07:00
Frankie
af999e2bee Merge branch 'master' into networkDropdownFix 2016-06-28 17:59:22 -07:00
Frankie
56cbd7d9ea Add custom to drop down menu 2016-06-28 17:57:53 -07:00
Kevin Serrano
e4956c3123 Modify network icons to reflect current design. (#355) 
* Modify network icons to reflect current design.

* Switch icons around.
 2016-06-28 16:15:26 -07:00
Kevin Serrano
c6187b080a Fix out-of-place positioning of pending tx badges. (#354) 2016-06-28 14:25:22 -07:00
kumavis
19f9d6566b Merge branch 'master' into pr/351 
# Conflicts:
#	CHANGELOG.md
#	app/scripts/lib/notifications.js
 2016-06-28 13:14:38 -07:00
kumavis
57aca116ed Merge branch 'master' into FixSomeFormatting 
# Conflicts:
#	CHANGELOG.md
#	app/scripts/lib/notifications.js
 2016-06-28 13:11:50 -07:00
Kevin Serrano
1cd17af2ad Second layer of 20 character check modified. 2016-06-28 13:10:57 -07:00
Kevin Serrano
661d9bffb3 Changelog update and reduce allowed characters from 30 to 20. 2016-06-28 13:10:29 -07:00
Kevin Serrano
4be704097f Merge branch 'master' into title-truncate 2016-06-28 13:08:43 -07:00
Kevin Serrano
f9540cf48c Wallet name now is properly truncated. 2016-06-28 13:07:46 -07:00
kumavis
2fd03a60fb Merge pull request #344 from Zanibas/character-limit 
Character limit implemented for wallet names
 2016-06-28 13:02:34 -07:00
Frankie
16566ee7db Move clearNotifications to popup.js 2016-06-28 12:57:06 -07:00
Kevin Serrano
abcf762184 Code style fix. 2016-06-28 12:49:17 -07:00
Kevin Serrano
697e8c0768 Truncate account name further. 2016-06-28 12:48:03 -07:00
Frankie
c115203063 fix for linting 2016-06-28 12:08:30 -07:00
Frankie
c548a1225b Merge branch 'master' into i340+1 2016-06-28 12:07:48 -07:00
Frankie
4f4c5048bf fix #341 close notifications when oppening pop up 2016-06-28 11:57:33 -07:00
Dan Finlay
6a87259016 Simplify send ether button to send. 2016-06-28 11:50:42 -07:00
Dan Finlay
9f5b62752e Fix formatting on terms & conditions page 2016-06-28 11:38:29 -07:00
Kevin Serrano
39a758d7c3 Merge changelog. 2016-06-28 11:37:11 -07:00
Kevin Serrano
a69882df72 Additional length check just in case. 2016-06-28 11:34:30 -07:00
Kevin Serrano
86a1eaadf1 Enforce 30 character limit on wallet name. 2016-06-28 11:30:55 -07:00
Kevin Serrano
204cb7f1ed Change color of failure to yellow. Change pending to ellipsis. (#338) 
* Change color of failure to yellow. Change pending to ellipsis.

* Modify changelog.
 2016-06-28 09:33:11 -07:00
Frankie
3d9bedaeea Fix it so you cant send a negitavie amount of ETH 2016-06-27 17:07:45 -07:00
Kevin Serrano
8c7511e9da Add alt titles to most critical icons 
We can change most of these later to a more "elegant" solution, but from the user perspective, having these tooltips is comforting imo.
 2016-06-27 11:55:05 -07:00
Frankie
ab55fefa1a Merge branch 'master' into uiFixes 2016-06-24 18:02:28 -07:00
Frankie
ef743499cb Fix for the mailto link 2016-06-24 17:59:58 -07:00
kumavis
770528d538 clean - appease the linting machine 2016-06-24 17:27:42 -07:00
kumavis
d7d440b2c2 svg notif now work for msg signatures 2016-06-24 17:22:27 -07:00
Frankie
4200eeeeed Fix editable button so that it dosent float above the drop down menue 2016-06-24 15:13:48 -07:00
kumavis
86fdcca2ec Merge branch 'master' of github.com:MetaMask/metamask-plugin into conf-tx-refactor 2016-06-24 12:49:02 -07:00
kumavis
eb1b9d027f breakout pending-tx-details 2016-06-24 12:48:52 -07:00
kumavis
c8b6da2593 identicon - default to imageify 2016-06-24 12:07:08 -07:00
kumavis
02dd1669e7 send-tx remove account select button 2016-06-24 11:44:18 -07:00
kumavis
ac2269b16e Merge pull request #312 from MetaMask/svg-notif 
initial svg notifications
 2016-06-23 17:55:10 -07:00
kumavis
2468949cb5 some legit linting fixes 2016-06-23 16:53:45 -07:00
kumavis
be25f4da06 pending-tx pass the identicon pref on 2016-06-23 16:43:10 -07:00
kumavis
d293ef0494 account-panel combine panel into account-panel 2016-06-23 16:28:57 -07:00
kumavis
e96a53385f accounts - rename account list item so it doesnt overlap 2016-06-23 16:18:47 -07:00
kumavis
7eb89613cc icon-factory - overhaul to provide svg or imagified el 2016-06-23 16:09:25 -07:00
kumavis
cc7dbace38 tx-conf add non-interactive mode for notification 2016-06-23 15:25:33 -07:00
kumavis
2495c6ea54 svg notifications - remove unneeded deps and clean code 2016-06-23 15:13:24 -07:00
Dan Finlay
a106887a6f Add fox logo back to left of menu 
Re-centered metamask h1 manually.
 2016-06-23 14:56:33 -07:00
Dan Finlay
4ebb9f631e Moved account change button to menu bar 2016-06-23 14:39:50 -07:00
kumavis
2a3660fe60 Merge branch 'master' of github.com:MetaMask/metamask-plugin into svg-notif 2016-06-23 14:01:16 -07:00
kumavis
122576a790 initial svg notifications 2016-06-22 19:28:11 -07:00
Frankie
973aa4fd15 close #309 2016-06-22 16:35:34 -07:00
Frankie
a5c782d69c Remove redundant network option buttons from settings page 2016-06-22 16:19:56 -07:00
Frankie
f0e6411277 Swap out Transat font for Montserrat 2016-06-22 15:35:52 -07:00
Frankie
ea564e51fc Fix for lint err 2016-06-21 15:30:18 -07:00
Frankie
cf663f1104 Fix conflict 2016-06-21 15:04:00 -07:00
Dan Finlay
8fde8a8921 Manually linted 2016-06-21 13:56:04 -07:00
Frankie
265725c6ed Change the copy to cliboard icon 2016-06-21 13:40:02 -07:00
Dan Finlay
ab15b4c825 Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLint 2016-06-21 13:19:44 -07:00
Dan Finlay
a08c3bc01b Auto linted 2016-06-21 13:18:32 -07:00
Frankie
5d349083f0 Change export icon to key 2016-06-21 13:10:28 -07:00
Zac Mitton
bd6ee81d09 tweek 2016-06-21 10:52:41 -05:00
Zac Mitton
9132f08507 added a failing case and fixed it by refactoring everything to strings 2016-06-20 18:46:29 -04:00
Dan Finlay
281ed1c2bb Fix tx approval address formatting 2016-06-16 18:37:39 -07:00
Dan Finlay
69f628dbe2 Preserve disclaimer line breaks 2016-06-16 17:11:13 -07:00
Dan Finlay
79999109e2 Added some real text to top of disclaimer 2016-06-16 17:05:38 -07:00
Dan Finlay
9e7a9e6837 Increase disclaimer scroll box height 2016-06-16 16:57:56 -07:00
Dan Finlay
1f0de5588d Remove dead code 2016-06-16 16:55:45 -07:00
Dan Finlay
2835112dbf Conditionally display disclaimer 2016-06-16 16:55:32 -07:00
Dan Finlay
93fa97f86a Add disclaimer component 2016-06-16 16:55:22 -07:00
Dan Finlay
f5fa0d3fa5 Improved template to not be invisible 2016-06-16 16:49:10 -07:00
Dan Finlay
08ecbcf242 Create disclaimer approval reducer 2016-06-16 16:41:57 -07:00
Dan Finlay
c5d334d372 Fix disclaimer approving action 2016-06-16 16:40:55 -07:00
Dan Finlay
af48b94f6f Add disclaimer consent action 2016-06-16 15:58:45 -07:00
Dan Finlay
825bb4494b Add placeholder disclaimer file 2016-06-16 15:51:57 -07:00
Dan Finlay
f6d1da7793 Improve template 2016-06-16 15:51:39 -07:00
Dan Finlay
58bad49c57 Resize images for chrome store acceptance 2016-06-16 10:30:28 -07:00
Zac Mitton
7aa09894df icon fox eyes changed to navy blue everywhere 2016-06-15 14:40:57 -04:00
Zac Mitton
0ac8ba0216 screenshots and promos for chrome store round 1 2016-06-15 11:58:32 -04:00
Dan Finlay
92f8d1b2ca Merge pull request #286 from MetaMask/FixSpinner 
Made network spinner clickable
 2016-06-14 15:26:33 -07:00
Dan Finlay
9417b92e44 Let account address take more space in account list 2016-06-14 15:24:47 -07:00
Dan Finlay
c8706b5d6f Made network spinner clickable 
Opens network menu, for when network is unreachable.

Fixes #279
 2016-06-14 15:00:25 -07:00
Dan Finlay
d6ebae8c4f Show more address in detail view 2016-06-14 14:29:08 -07:00
Dan Finlay
6f07acc4be Center main account icon 2016-06-14 13:29:53 -07:00
Dan Finlay
a04815555f Merge pull request #283 from MetaMask/RewordLock 
Reword lock menu item
 2016-06-14 13:05:57 -07:00
Dan Finlay
789b1db34c Remove unused class 2016-06-14 13:01:04 -07:00
Dan Finlay
e0f8628486 Rename Lock Account to simply Lock 2016-06-14 12:59:34 -07:00
Dan Finlay
e76a628a5b Insert vlad icons into UI 2016-06-14 12:43:43 -07:00
Frankie
e9208be096 Size export confirmation input 2016-06-12 13:36:34 -04:00
Frankie
ff2f5cd58a Change name-label css bug 2016-06-12 12:40:30 -04:00
Frankie
88ed93afd9 Remove qr code icon and reorder to have clipboard first 2016-06-12 12:40:30 -04:00
Frankie
7d8bf31e82 Fix edit text 
and edit label alighment
 2016-06-12 12:38:51 -04:00
Frankie
1987296af0 Add spacing in line items 2016-06-08 19:08:55 -04:00
Frankie
03e9ff6e42 Mend CHANGE.log 2016-06-08 17:12:25 -04:00
Frankie
e9407777cc Style up the info screen 2016-06-08 16:43:05 -04:00
Frankie
702dc3b216 Add icons to left side of links, as well as the metmask version and styling 2016-06-08 15:40:42 -04:00
Dan Finlay
d5c378b09a Cache identicons 
Fixes #197

Also as a side effect, by creating this `iconFactory.cache` object, we have a convenient place for specifying stock icons for known contracts!

We can just hard-code image addresses in the `ui/lib/icon-factory.js` cache instantiation, and those values will be injected into the identicon image tag `src` attributes.
 2016-06-06 14:05:13 -07:00
Frankie
2c2fcd60bf Merge branch 'master' into uiFixes 2016-06-06 10:20:05 -04:00
Frankie
f59ca7a6bf Add css to resize and alighn input for editable lable 2016-06-06 10:09:21 -04:00
Frankie
217dd9c95e Fix label size for edit label 2016-06-06 03:30:26 -04:00
Frankie
40338571fa Add edit label 2016-06-06 03:14:10 -04:00
Dan Finlay
b1a4c19ddb Make morden sail blue 2016-06-03 18:26:26 -07:00
Dan Finlay
b9007ee843 Add provider menu on clicking network status indicator. 
Also simplifies network status icons.
 2016-06-03 17:49:54 -07:00
Dan Finlay
5560ebba26 Clicking network status indicator reveals provider menu 2016-06-03 17:09:18 -07:00
Dan Finlay
b2b4b4dd25 Merge branch 'master' into display_network 2016-06-03 15:21:24 -07:00
Dan Finlay
d49ef1a2e5 Blockchain status now updates on availability change 2016-06-03 15:18:20 -07:00
Dan Finlay
2422c78ce2 Add network loading indication 2016-06-03 13:58:09 -07:00
Dan Finlay
d86d7b9ac7 Differentiate icon name from hover text 2016-06-03 13:08:49 -07:00
Dan Finlay
3170e094c5 Some minor linting 2016-06-03 12:59:59 -07:00
Dan Finlay
acc00b84ea Make hover text more human friendly 2016-06-03 12:58:14 -07:00
Dan Finlay
66f06844ac Remove metamask logo from header 2016-06-03 12:58:00 -07:00
Frankie
d90943dc61 Change chevron-down to fa-plus 2016-06-03 13:31:36 -04:00
kumavis
6dec937c2a Merge pull request #242 from MetaMask/HashFix 
provider-engine hooked wallet - checkSum addresses not recognized
 2016-06-02 19:06:46 -07:00
Dan Finlay
272bea31b5 Fix hashed address validation 2016-06-02 18:42:09 -07:00