m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-28 05:12:18 +01:00
Code
4,555 Commits 2 Branches 0 Tags 265 MiB
bbe893a0d8
Commit Graph

1509 Commits

Author SHA1 Message Date
Kevin Serrano
34e7bb5015
Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved 2017-09-07 13:20:14 -07:00
Kevin Serrano
69c7fe24b3
Place object property retrieval inside try-catch 2017-09-07 12:17:36 -07:00
Kevin Serrano
f0ab4ce52d
Change expected type to array. 2017-09-07 11:51:04 -07:00
Chi Kei Chan
272ade0f66 Fix .filter token tx 2017-09-07 11:46:05 -07:00
Chi Kei Chan
ca69fa5d91 Re-enable Contract tx list item 2017-09-07 11:38:21 -07:00
Chi Kei Chan
687d2f755d Fix css merge conflicts 2017-09-07 11:25:31 -07:00
Dan
a0ca3fab77 Modify readonly value in for input in qr-code. 2017-09-07 10:26:21 -07:00
Dan
c4eb2fb3ea Account-detail address is a readonly input. 2017-09-07 10:26:21 -07:00
Dan
1d5a725ffb Close button in account-details-modal working. 2017-09-07 10:26:21 -07:00
Dan
b8b0c8c62a Remove highlight on modal 2017-09-07 10:26:21 -07:00
Dan
61b965fe14 Touch up style of account-details-modal. 2017-09-07 10:26:21 -07:00
Dan
7fb1c6836d Modify status copy for status === 'unapproved' 2017-09-07 10:25:56 -07:00
Dan
eabbfb8319 Link user from transaction list to etherscan if they have a transaction hash. 2017-09-07 10:25:56 -07:00
Dan
3e6b619bd8 Use ternary operator instead of two conditionals. 2017-09-07 10:25:56 -07:00
Dan
64f8a4d22b Improve tx-list item hover scss. 2017-09-07 10:25:56 -07:00
Dan
17b5afb8de Create tx-list-item component. 2017-09-07 10:25:56 -07:00
Dan
6d3b3d4203 Show confirm transaction screen when clicking a pending transaction in the list. 2017-09-07 10:25:56 -07:00
Dan
aa60944e30 Remove default to confirm screen on login. 2017-09-07 10:25:56 -07:00
Chi Kei Chan
b670c8074e Fix font sizes on Send Token 2017-09-07 04:26:29 -07:00
Chi Kei Chan
8b919758e5 Send Token screen partial UI 2017-09-07 04:24:03 -07:00
Chi Kei Chan
983fa2a117 Add Contract Tx List Item; Update Token Tx on select 2017-09-07 03:14:53 -07:00
Chi Kei Chan
14b2f3e391 Show token balance and identicon 2017-09-06 23:03:23 -07:00
Chi Kei Chan
f1fb9e10a0 Adding Token transaction detail screen 2017-09-06 03:17:49 -07:00
Chi Kei Chan
690ddf5ed7 Fix token list 2017-09-06 00:36:52 -07:00
Chi Kei Chan
06b2a04a42 Implement tokens list UI 2017-09-06 00:36:31 -07:00
Kevin Serrano
3e2bd19881
Merge branch 'master' into readd-loose 2017-09-05 15:48:15 -07:00
Dan
562d2fadae Use .entries() instead of .keys(), and use more destructuring, for simpler code. 2017-09-05 13:00:50 -07:00
Dan
78f39bcce6 Send tx working; user is taken to confirm page with correct transaction information. 2017-09-05 13:00:50 -07:00
Dan Finlay
90272e252f Make eth_sign deprecation warning more useful 
Link to descriptive article that demonstrates the new preferred method.
 2017-09-05 11:44:26 -07:00
Kevin Serrano
e647337a8a
Resolve merge conflict from master 2017-09-05 09:03:44 -07:00
Kevin Serrano
162aedb30b
Merge branch 'master' into new-currency-test 2017-09-05 09:01:05 -07:00
Dan
6ef483be4a Remove wallet-view scrollbars. 2017-09-04 18:46:14 -07:00
Dan
7d6ad48f15 Touch up transaction list item styles, remove main-content scroll bars, align buttons with main-content.. 2017-09-04 18:46:14 -07:00
Dan
57b3cdf948 Fix styling of buy and send buttons on main screen. 2017-09-04 18:46:14 -07:00
Dan
3cb51e32c9 Capitalizations via text-transform for main screen transactions. 2017-09-04 18:46:14 -07:00
Dan
5d8bf6c86a Adjust left margin in main container. 2017-09-04 18:46:14 -07:00
Chi Kei Chan
75c3009f83 Fix header style; Address comments 2017-09-04 15:57:43 -07:00
Chi Kei Chan
9213789c44 Fix merge conflict 2017-09-04 15:57:43 -07:00
Jacky Chan
b1fc290bed Fix menu style 2017-09-04 15:57:43 -07:00
Dan Finlay
ddd559718f Update support link 2017-09-01 11:01:53 -07:00
Dan
0d6e64bfbe Use flex to ensure network name does not wrap. 2017-09-01 00:12:58 -07:00
Dan
c436b6ffb3 Adjust z-index of header so that it stays in place when scrolling. 2017-09-01 00:12:58 -07:00
Dan
799627189d Fix margin, padding, height for header. 2017-09-01 00:12:58 -07:00
Dan
d5998d3b07 Fixed network font 2017-09-01 00:12:58 -07:00
Dan
5452a26b36 Fixes lint errors and adds stylelint-config-standard to package.json 2017-08-31 04:16:07 -07:00
Dan
e7b3ef0708 Lint fixes 2017-08-31 04:16:07 -07:00
Dan
3ea841e276 Refactor gas-fee-display to include usd and eth fee displays as separate components. 2017-08-30 16:46:24 -07:00
Dan
5a7e4c4e76 Move gas fee to a separate component. 2017-08-30 16:46:24 -07:00
Dan
1485ec7392 Move currency toggle to its own component. 2017-08-30 16:46:24 -07:00
Dan
3ce69e1b65 Clean up send.js and eth-balance.js with es6. 2017-08-30 16:46:24 -07:00
Kevin Serrano
4b058bc7eb Merge branch 'master' into i1986-AddVersionToStateLogs 2017-08-29 18:09:39 -07:00
Thomas Huang
04011f9ea7 Multiple tokens shows the amount when greater than 1 2017-08-29 17:54:01 -07:00
Kevin Serrano
056276af02
integrate infura currency 2017-08-29 16:36:05 -07:00
Dan Finlay
54ce267a9f Add version to state logs 
Fixes #1986
 2017-08-29 11:42:44 -07:00
Dan
c605c9897d Minor clean up. 2017-08-29 16:09:56 -02:30
Dan
5facba89ca Replace Avenir Next with alternative. 2017-08-29 14:16:32 -02:30
Dan
b251d0f675 Center tooltip on small screen size by using flexbox 2017-08-29 13:43:43 -02:30
Dan
cd5861541c Use hex values only in send.js to handle limit and price; GasTooltip accepts and returns values as hex (allows user to enter floats) 2017-08-29 12:26:33 -02:30
Dan
cd351e8aef Move getTaxBN and bnMultiplyByFraction to util.js 2017-08-29 12:26:32 -02:30
Dan
dc72c4cc91 Using eth balance component to ensure proper rounding. 2017-08-29 12:26:32 -02:30
Dan
af6e30b8ba Bind SendTransactionScreen methods to this in constructor. 2017-08-29 12:26:32 -02:30
Dan
43ceeacf0f Refactor for clean handling of tooltip close. 2017-08-29 12:26:31 -02:30
Dan
0a44c82458 Styles and behaviour correct 2017-08-29 12:26:20 -02:30
Dan
b785beb546 Final styling improvements for tooltip; plus a few for send form. 2017-08-25 20:55:03 -02:30
Dan
c9e134a996 Fully connect gas data in send form and tooltip to state; final styling improvements. 
Fully connect gas fields in send form and tooltip to state
 2017-08-25 20:54:04 -02:30
Dan
05e6eaf171 Updating current currency from send form. 2017-08-25 17:31:56 -02:30
Dan
ff247289ae Tooltip closing on click outside. 2017-08-25 17:04:23 -02:30
Dan
e56b8c5055 Refactor tooltip to remove external lib; tooltip now updating gas fee in parent. 2017-08-25 17:04:23 -02:30
Dan
5677fdaf68 Toggling tooltip. 2017-08-25 17:03:41 -02:30
Dan
d990a8eb86 Add 'customize' text to gas input. 2017-08-25 17:03:41 -02:30
Dan J Miller
4076496c8e Patch 3 new account modal (#1962) 
* Account details modal styling changes.

* Tweaking styles.

* New account modal re-styling.

* Tweaks to paddings, margins, font sizes, colors and modal dimensions.

* Replace colour codes with variables.
 2017-08-24 17:31:01 -07:00
Dan J Miller
744b78e9c8 Patch 2 account details modal (#1957) 
* Account details modal styling changes.

* Tweaking styles.
 2017-08-24 17:25:27 -07:00
Dan Finlay
e0ccdcd6fd Remove eth-tx-viz link from tx history icons 2017-08-23 09:40:24 -07:00
Dan J Miller
5b62f10a5f Modify buy and send buttons color, border-radius and various size properties. (#1956) 2017-08-22 16:42:17 -07:00
sdtsui
9d69401041 Hook up showAddToken to dropdown menu item in account options dropdown 2017-08-22 16:25:23 -07:00
sdtsui
18496ad859 Render TxListItem component from real data: address, identicon, status, ETH value 2017-08-22 16:16:56 -07:00
sdtsui
9dce1b6fd5 Remove fake transactions and balances from tx-list and wallet-view, respectively 2017-08-22 15:24:48 -07:00
sdtsui
5893f2fd19 Add data field to send token screen 2017-08-22 15:22:00 -07:00
sdtsui
1528fae9ea [WIP] Successfully sign a hardcoded transaction, hook up remaining inputs and error validation later 2017-08-22 15:13:50 -07:00
sdtsui
3b5749c3bc [WIP] Use hardcoded values for dispatching from signTx 2017-08-22 15:05:23 -07:00
sdtsui
c1fd19393f Remove border and apply background color to gas input 2017-08-22 13:09:27 -07:00
sdtsui
97a6a8e4f6 Add layout and props for send screen inputs 2017-08-22 12:47:58 -07:00
sdtsui
d1bc7111b5 [WIP] - Styling Send Screen - Need to bring in data contract for signTx 2017-08-22 09:03:42 -07:00
sdtsui
5900cc8522 Tweak z-indicies 2017-08-22 08:37:15 -07:00
sdtsui
d193778958 Adjust zIndex and width for send screen 2017-08-21 17:59:08 -07:00
sdtsui
d6116aaf57 [WIP] Tweak Send Screen Styles 2017-08-21 16:59:00 -07:00
sdtsui
b0759ddc18 Hook up send screen action to Send Button in TxView 2017-08-21 12:53:15 -07:00
sdtsui
27b75b67b4 Hook up identicon and buttons to AccountDetailsModal, clean up colors 2017-08-21 12:26:36 -07:00
sdtsui
877faaf096 Integrate old QR component with new modal layout 2017-08-21 10:27:56 -07:00
sdtsui
b836d0483d [WIP] Render a QR code in AccountDetailsModal 2017-08-21 10:06:29 -07:00
sdtsui
fe5817051b [WIP] Aggregate data for QRView 2017-08-21 09:50:22 -07:00
sdtsui
86b71f014a Add wrapper CSS for NewAccountModal 2017-08-21 06:14:28 -07:00
sdtsui
35508a2898 Add wrapper CSS for AccountDetailsModal 2017-08-21 05:58:30 -07:00
sdtsui
3fa7c5dc08 Hook up hideModal action to close icon in EditAccountNameModal 2017-08-21 04:53:39 -07:00
sdtsui
c2636143c3 Hook up selected account label display to main wallet view 2017-08-21 04:51:55 -07:00
sdtsui
d82233b95c Hook up actions to EditAccountNameModal 2017-08-21 04:46:38 -07:00
sdtsui
80a2cba38e Enhance global modal to accept styles from different components 2017-08-21 03:53:01 -07:00
sdtsui
66829b7a05 Implement new dropdown design, integrate account balances 2017-08-21 03:27:11 -07:00
sdtsui
18ea874a80 Hook up edit account name modal 2017-08-20 19:39:37 -07:00
sdtsui
beedd5b11e Remove old design - 'Show QR Code' dropdown menu item from account selection dropdown 2017-08-20 19:29:14 -07:00
sdtsui
73a593b42e Hook up template for New Account Modal 2017-08-20 19:28:20 -07:00
sdtsui
71b2dd290b Enhance global modal to handle Buy, Edit, and Details Modals 2017-08-20 19:10:49 -07:00
sdtsui
4e9376ca71 Extend modal implementation and state management to accomodate multiple modal types 2017-08-20 18:32:58 -07:00
sdtsui
e550d36084 Add 'Account Details' dropdown menu item to account options dropdown 2017-08-20 18:10:06 -07:00
sdtsui
7d02c90510 Add 'Add Token' dropdown menu item to account options dropdown 2017-08-20 18:09:09 -07:00
Dan Finlay
98bedfabf9 Fix eth sign formatting 2017-08-17 15:35:17 -07:00
Dan Finlay
343a7e9cce Transition to home view after tx error 2017-08-16 17:06:21 -07:00
Dan Finlay
9fbdeab3de Fallback to ethplorer link 2017-08-16 12:55:34 -07:00
Dan Finlay
3b6ee032f5 Remove dead code 2017-08-16 09:52:09 -07:00
Dan Finlay
722d91c866 Remove default tokens 2017-08-16 09:49:23 -07:00
Dan Finlay
b69f5533d9 ReEnable Token List 2017-08-16 09:49:18 -07:00
Kevin Serrano
923415213f Merge pull request #1916 from MetaMask/fix/account-name-scroll 
Oneliner for account label overflow issue on QubesOS
 2017-08-15 14:08:30 -07:00
Kevin Serrano
9c7abacf64
Change cursor type to indicate link. 2017-08-15 12:26:11 -07:00
frankiebee
a8d6e1fe98 fix spelling 2017-08-15 12:16:41 -07:00
frankiebee
176dd6d214 Disable token list 2017-08-15 12:12:57 -07:00
sdtsui
6168efc9cc Fix overflow issue on QubesOS, flagged by @kumavis 2017-08-15 17:13:11 +02:00
davidp94
f52ef5d496 fix goHome 2017-08-14 21:51:39 -07:00
davidp94
39424cdf45 remove unused action type 2017-08-14 21:35:57 -07:00
DavidNinja
399c51c048 cancel all txs 2017-08-14 21:29:21 -07:00
sdtsui
99be6e17ca [WiP] Add comments for multiple modals 2017-08-15 05:46:41 +02:00
sdtsui
dbc539ac55 Merge remote-tracking branch 'mm/master' into NewUI-flat 2017-08-14 11:06:14 +02:00
sdtsui
2eadf72fb7 Lint and cleanup all scss 2017-08-14 10:31:27 +02:00
sdtsui
1743ccbdb5 Center account selection dropdown and specify useCssTransition prop 2017-08-14 08:50:49 +02:00
sdtsui
f2f2d35992 Remove unnecessary imports, and account-detail.js 2017-08-14 08:40:25 +02:00
sdtsui
5f775315bd Reconfigure AccoutSelector dropdown to use new fa-caret-down instead of old icon 2017-08-14 08:40:16 +02:00
sdtsui
88665ba150 Extract dropdown component into components/dropdowns, hook up to app 2017-08-14 08:31:49 +02:00
sdtsui
b900da885e Fix odd relative position conflict so main icon is rounded - See flyswatter/jazzicon/issues/1 2017-08-14 07:34:57 +02:00
sdtsui
d01a663342 Remove unused code - network dropdown components in app 2017-08-13 22:20:58 +02:00
sdtsui
c60ea60ec9 Remove deprecated feature: main app settings dropdown 2017-08-13 22:16:22 +02:00
sdtsui
4cd33453dc [WIP] Extract network dropdown into own component 2017-08-13 22:15:21 +02:00
sdtsui
e39c600a45 [WIP] Extract network dropdown out of main app render function 2017-08-13 10:49:41 -07:00
sdtsui
25184a3901 Move global modals into own pod, inside components/modals 2017-08-13 10:24:51 -07:00
sdtsui
9b48e0aa53 Implement infinite scrolls (no lazy loading) for wallet view 2017-08-11 09:17:14 -07:00
sdtsui
9954c95b4a [WIP] Begin fixing responsive layout with many wallets 2017-08-11 00:42:44 -07:00
sdtsui
f23d8c7393 Allow fullscreen scrolling on mobile view, while retaining in-window scroll for laptop 2017-08-11 00:42:09 -07:00
sdtsui
0fab1b5482 Implement responsive wallet balances 2017-08-11 00:31:06 -07:00
sdtsui
8a39941d9a Cleanup SCSS and improve organization of color vars 2017-08-10 23:21:39 -07:00
sdtsui
58b61eb1fc Add UI tweaks, including separation of overflow logic for mobile (full-height) vs laptop (tx-view-only) 2017-08-10 22:47:56 -07:00
sdtsui
7a664a7f72 Improve text positioning on mobile view 2017-08-10 22:16:42 -07:00
sdtsui
3188cc2ef0 Extract scss breakpoints into variables 2017-08-10 22:16:25 -07:00
sdtsui
e31c298288 Implement widescreen layout for tx list 2017-08-10 20:52:22 -07:00
sdtsui
f9432c5982 Move Txs list item styles into classes 2017-08-10 19:55:01 -07:00
sdtsui
d53780bcdc Add new color for txs - dusty-gray 2017-08-10 19:54:42 -07:00
sdtsui
96b186dfb2 Cleanup txList and txView components 2017-08-10 19:35:10 -07:00
sdtsui
77b72ee33f Add selectors for txsToRender and conversionRate 2017-08-10 19:35:01 -07:00
sdtsui
9ec8663605 Cleanup stray logs and lint 2017-08-10 17:50:33 -07:00
sdtsui
2346c9b6b9 Add overflow support for all account names in account details 2017-08-10 17:49:12 -07:00
sdtsui
771f9ec124 Fix logic for dropdown components attaching checkmark to correct account 2017-08-10 17:37:55 -07:00
sdtsui
88f4931c6f Fix text overflow for dropdown components flagged by @frankiebee 2017-08-10 17:37:36 -07:00
Simon Liang
95eda70efe added logging for account balance 2017-08-10 16:52:26 +08:00
Simon Liang
708d8398f4 reverted my changes 2017-08-10 14:48:05 +08:00
Simon Liang
a3f96951c2 connected wallet view dropdown button with real data 2017-08-10 14:47:17 +08:00
Simon Liang
53c91591b3 redid tx-view and balance-component mapStateToProps logic 2017-08-10 14:43:01 +08:00
Simon Liang
87cb930130 moved the props initialization steps into mapStateToProps 2017-08-10 14:43:01 +08:00
Simon Liang
9d36b25c5f extracted transaction list 2017-08-10 14:43:01 +08:00
Simon Liang
72df9746fa removing styling comments 2017-08-10 14:43:01 +08:00
sdtsui
779be75370 [WIP] Position account potions dropdown correctly and hook up to action creators 2017-08-09 21:42:16 -07:00
sdtsui
be116ecfbd Add new selectors for addresses, identities, and accounts 2017-08-09 21:42:16 -07:00
sdtsui
5f74564deb Adjust modal styles to match new modal size, from cancel button tweak 2017-08-09 21:42:16 -07:00
sdtsui
50f8535f7b Switch buy modal 'cancel' from text to button for accessibility 2017-08-09 21:42:16 -07:00
sdtsui
231b8a7542 Vertically center modal in mobile view - @cjeria 2017-08-09 21:42:16 -07:00
sdtsui
cba50818c2 Improve layout of buy buttons by tweaking text styles 2017-08-09 21:42:16 -07:00
Kevin Serrano
45fc1d6ec3
Readd loose label onto accounts. 2017-08-09 17:40:01 -07:00
kumavis
245125eb18 ui - buy eth - formatting and moved network names to config 2017-08-09 12:25:38 -07:00
kumavis
052d338b2b lint fix 2017-08-09 01:04:42 -07:00
kumavis
897d00efa0 ui - buy eth - add dharma beta to kovan 2017-08-09 01:00:06 -07:00
kumavis
84c3d3c6db ui - buy button view - refactor 2017-08-09 00:36:18 -07:00
kumavis
0188e7b94d Merge branch 'master' into NewUI-flat 2017-08-08 23:30:58 -07:00
sdtsui
5e9926b0d0 Fix dropdown z-index value 2017-08-08 19:02:58 -07:00
sdtsui
6be6f56ac5 Add z indicies to settings-variables 2017-08-08 19:01:33 -07:00
sdtsui
67213e7583 Add backdrop styles and box shadow to new global modal defaults 2017-08-08 18:51:06 -07:00
sdtsui
bdf5436c2d Add minor comments and cleanup for new components 2017-08-08 18:44:20 -07:00
sdtsui
c8893fb9ca Hook up 'Buy with Fiat', redirect to Coinbase 2017-08-08 18:37:20 -07:00
sdtsui
dc702705bf Move buy view into its own component - BuyOptions 2017-08-08 18:34:04 -07:00
sdtsui
eab5718a40 Add an additional font-size breakpoint for buy modal on the largest screens 2017-08-08 18:12:50 -07:00
sdtsui
3072d2d178 Add minor positioning tweaks for buy modal, laptop view 2017-08-08 17:57:47 -07:00
sdtsui
b97dcf09ac Move inline styles out into explicitly named BEM classes 2017-08-08 17:51:06 -07:00
sdtsui
928adae104 Implement modal content for buy flow - mobile view 2017-08-08 17:11:25 -07:00
kumavis
922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
kumavis
7db1f30590 Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout 
Improve layout for legacy buy screen
 2017-08-08 15:56:02 -07:00
sdtsui
9d3b5348aa Fix layout issues flagged by @tmashuang 2017-08-08 15:17:52 -07:00
sdtsui
b6a7281737 Make buy ui more central to the screen 2017-08-08 15:17:24 -07:00
Thomas Huang
67e4855b9d Updated commonjs require path for redux-logger and redux-thunk modules 2017-08-08 14:15:45 -07:00
sdtsui
922a272e81 Add note for responsive modal styles 2017-08-08 14:05:19 -07:00
sdtsui
29c8f448ca Hook up global modal to Tx view, Buy button 2017-08-08 13:37:52 -07:00
sdtsui
f72f57dc6c Implement global modal 2017-08-08 13:37:41 -07:00
sdtsui
aab0fda9ac Add actions and reducers for global modal 2017-08-08 13:37:16 -07:00
Simon Liang
0db627d979 refactored and added unit test 2017-08-08 20:15:30 +08:00
Simon Liang
e8ade42f2a extracted balance component and renders to the format, also wired in the account name 2017-08-08 16:49:45 +08:00
frankiebee
f3b42f1e33 Merge branch 'master' into transactionControllerRefractor 2017-08-07 16:24:58 -04:00
kumavis
78aa957e5a Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:08 -07:00
sdtsui
d8fff0fc8c Opt for calculated values in absolutely positioned caret 2017-08-06 23:12:40 -07:00
sdtsui
0f140c5db5 Improve positioning of caret and add reusable color for wallet view 2017-08-06 22:30:27 -07:00
sdtsui
ba50411bb2 Position account icon, name, and caret 2017-08-06 21:54:42 -07:00
sdtsui
29662ff7b4 Move tx and wallet view styles to component classes 2017-08-06 20:47:59 -07:00
sdtsui
5c7adc911d Merge branch 'NewUI' into feat/mm-ui-5-merged 2017-08-06 20:24:04 -07:00
sdtsui
02c2106c3b Merge branch 'master' into feat/mm-ui-5 2017-08-06 19:55:34 -07:00
sdtsui
fd36d95c50 Cleanup before rebase on NewUI - need new version of AccountDropdowns 2017-08-06 19:52:13 -07:00
sdtsui
b3d7abd5d4 Allow clicks on account view to enable sidebar, not just burger 2017-08-06 19:29:51 -07:00
sdtsui
850d2124c8 Refactor account name css - mobile views 2017-08-06 19:26:52 -07:00