m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 12:47:14 +01:00
Code
8,787 Commits 2 Branches 0 Tags 265 MiB
fc1655eecb
Commit Graph

1807 Commits

Author SHA1 Message Date
Alexander Tseung
34e608e9dc Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 17:06:00 -07:00
Alexander Tseung
bf38aa6f1d Fix transaction confirmations 2018-04-03 16:59:32 -07:00
Dan Finlay
99c22a0835 Linted 2018-04-03 14:00:04 -07:00
Dan Finlay
74049c19fc Internationalize currency 
Fixes #3580
 2018-04-03 13:58:26 -07:00
Alexander Tseung
35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -07:00
Alexander Tseung
516c1869b0 Fix lint errors 2018-04-02 16:24:37 -07:00
kumavis
15ba31897c Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 15:51:15 -07:00
kumavis
98e0fc1ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 14:13:45 -07:00
Dan
7ccf6163fd Adds simulation failure error messages to confirm screen. 2018-04-02 16:29:35 -02:30
Dan
1dc3c51b54 UpdateSendErrors only called when balance defined, recalled if balance updates. 2018-04-02 16:26:19 -02:30
Alexander Tseung
6277a4c46a Refactor onboarding flow 2018-04-02 02:59:49 -07:00
kumavis
9f7b63bb6a
identicon - set blockies height and width to identicon diameter 2018-03-30 21:45:49 -07:00
kumavis
ee1acf0a7e
Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlist 
Fix display of unapprovedMgs in txList; fix txParams undefined errors
 2018-03-30 18:36:39 -07:00
kumavis
2e57c36f36
Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreen 
Checking for sufficient balance in tx confirmation screen
 2018-03-30 18:36:08 -07:00
Alexander Tseung
2fa554a641 Fix conf-tx render 2018-03-30 17:37:24 -07:00
Alexander Tseung
ba23843f91 Fix merge conflicts 2018-03-30 16:18:48 -07:00
Alexander Tseung
bdc4a6964a Fix merge conflicts. Refactor renderPrimary into Home component 2018-03-30 15:07:00 -07:00
kumavis
7dde948c45 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-03-30 13:57:50 -07:00
kumavis
5f1f345a5d network - use providerType for localhost 2018-03-30 10:59:39 -07:00
Dan
2be6f8bae0 Fix lint and tests 2018-03-30 02:19:04 -02:30
Dan
717623e2e3 Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist 2018-03-30 00:00:31 -02:30
Dan
893f82491d Merge branch 'master' into i3471-checkbalanceonconfirmscreen 2018-03-29 23:58:45 -02:30
kumavis
b49ad750dd Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts 2018-03-29 16:54:00 -07:00
Dan
a4594f6838 Show insufficient funds on confirm screen on first render. 2018-03-29 15:30:03 -02:30
Alexander Tseung
ef61ef2ce8 Fix i18n merge conflicts 2018-03-29 09:37:29 -07:00
Dan
0a711f0de0 Removes t from props via metamask-connect and instead places it on context via a provider. 2018-03-29 12:42:38 -02:30
Dan
01e3293b65 Ensure correct address used when rendering transfer transactions. 2018-03-29 10:32:30 -02:30
kumavis
f9b680b09f ui - identicon - use relative link for ether logo 2018-03-28 22:39:45 -07:00
kumavis
10609493c5 ui - use relative location for images 2018-03-28 22:30:35 -07:00
kumavis
cf82e766d4 ui - fix relative url for deposit-ether-modal 2018-03-28 22:21:49 -07:00
Alexander Tseung
58f52b2b8d Fix merge conflicts. Refactor onboarding flow. 2018-03-28 13:23:50 -07:00
Dan
d6ebf5d94e Confirm send token detects if balance is sufficient for gas. 2018-03-28 12:30:03 -02:30
Dan
21b6a3442d Fix display of unapprovedMessages in txList (old and new ui); includes fix of undefined txParams. 2018-03-28 10:51:16 -02:30
kumavis
b324a9c295
Merge branch 'master' into i3471-checkbalanceonconfirmscreen 2018-03-27 19:42:42 -07:00
Dan
74ac3bb2a7 Confirm send token detects if balance is sufficient for gas. 2018-03-27 23:41:20 -02:30
Dan
8e6ab7df05 Checking for sufficient balance in confirm ether screen; includes error messages for user. 2018-03-27 22:38:04 -02:30
Dan
be2254b880 Remove comments and console.logs 2018-03-27 10:37:45 -02:30
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
Dan
4f0881e41b Merge branch 'master' into i18n-translator-redux 2018-03-26 16:13:49 -02:30
Dan Finlay
fe6f22ee69
Merge pull request #3721 from alextsg/cb-944 
Update button styles
 2018-03-26 11:29:04 -07:00
Dan
a109a774a5 Use ens-input component in send-v2 to allow sending to ens names. 2018-03-26 11:40:11 -02:30
Alexander Tseung
cfa2592d78 Update button styles 2018-03-25 22:58:04 -07:00
Dan
d613dfb434 Correct reprice title and subtitle key names. 2018-03-22 01:19:00 -02:30
Dan
ca5bce477e Fix sender-to-recipient export and non-existent translation key. 2018-03-22 00:54:44 -02:30
Dan
3d3bd0eaf0 Correct connect reference in confirm-send-ether, confirm-deploy-contract, network-display. 2018-03-22 00:08:01 -02:30
Dan
a82631791e Lint fixes 2018-03-21 23:48:10 -02:30
Dan
18f8583529 Fix references to undefined 'this.props' 2018-03-21 23:10:28 -02:30
Dan
6cbadc0aa3 Missed modifications of t() in merge resolution. 2018-03-21 22:54:52 -02:30
Dan
be845fd190 Merge branch 'master' into i18n-translator-redux 2018-03-21 22:28:58 -02:30
Dan
d24a0590d3 i18n redux solution doesn't require importing t() and passing state to each t() call; t is just available on props. 2018-03-21 22:11:47 -02:30
kumavis
3e79941658 ui - tx conf - only show special token tx conf screen for token send 2018-03-21 13:12:59 -07:00
kumavis
3595d71c2d Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs 2018-03-21 12:53:28 -07:00
kumavis
e005e9ac51
Merge pull request #3624 from alextsg/cb-941 
Update confirm transaction screen
 2018-03-20 17:15:59 -07:00
Dan J Miller
a69480d78d Gas inputs can be changed by up and down arrows (#3598) 
* Up and down arrows can control gas inputs.

* input-number.js just uses number type.
 2018-03-20 15:50:30 -07:00
kumavis
29cc2f8ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-20 13:01:08 -07:00
Thomas
dd19a93447 Add i18n to tx status 2018-03-20 12:06:59 -07:00
Alexander Tseung
3c1248c816 Update confirm transaction screen 2018-03-20 11:56:12 -07:00
Thomas
d4eb883958 Merge branch 'master' into i3571-CompleteI18nTemplates 2018-03-20 11:35:59 -07:00
Thomas
7a8e080245 Started on Tx list i18n 2018-03-20 10:29:22 -07:00
Dan
d9160ac6da Merge branch 'master' into retry-tx-refractor 2018-03-20 09:27:27 -02:30
Dan
dc92b56f18 Identify token transactions by method names token data, and not just whether they've been add via metamask. 2018-03-20 09:07:23 -02:30
Dan J Miller
5cdaf270f7
Don't block user from setting gas if estimating gas returns errors. (#3627) 2018-03-20 06:47:45 -02:30
Dan
2ddc2cc1fb Lint fixes. 2018-03-19 16:53:06 -02:30
Dan
4d1793b0ec Merge branch 'master' into i18n-translator-redux 2018-03-19 16:40:48 -02:30
Dan
09260f9c5e Fixed t() calls where localeMessages is missing; and fix incorrect connect reference. 2018-03-19 16:39:37 -02:30
Dan
d8788af9b8 Merge branch 'master' into retry-tx-refractor 2018-03-19 15:30:47 -02:30
Dan
5733820024 Merge branch 'master' into i18n-translator-redux 2018-03-19 14:39:04 -02:30
Thomas Huang
424e98f6a8
Merge pull request #3594 from danjm/i3344-improve-currency-input 
Currency input defaults to empty string
 2018-03-19 09:20:04 -07:00
anticlimactic
a1db40047c Remove unused files from ui folder. (#3577) 
* Removed unused UI files. Fixes #3434.

* Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.
 2018-03-19 12:41:24 -02:30
Alexander Tseung
4512243290
Fix styling on confirm-send-ether and confirm-send-token (#3600) 2018-03-16 16:39:00 -07:00
Alexander Tseung
6f749e5576
Update Confirm Contract screen (#3597) 2018-03-16 13:09:49 -07:00
Dan
a348b60735 Currency input defaults to empty string 2018-03-16 15:38:29 -02:30
Dan
5fe0be722b Handle i18n with redux. 2018-03-15 21:59:45 -02:30
frankiebee
e51ba2e75c Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-extension into retry-tx-refractor 2018-03-15 10:41:55 -07:00
frankiebee
4c947d466c Merge branch 'master' into retry-tx-refractor 2018-03-15 09:47:25 -07:00
Alexander Tseung
66193c823c Update Deposit Eth icon (#3569) 2018-03-15 13:50:22 -02:30
frankiebee
cd721f52cb Merge branch 'master' into retry-tx-refractor 2018-03-15 08:07:16 -07:00
Dan
b0122be3c9 Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not edited. 2018-03-14 22:45:10 -02:30
Dan
66422cd083 Force gas min has correct precision and is set when editing gas if max. 2018-03-14 22:29:43 -02:30
kumavis
34aeef50a0 i18n - load locales manually 2018-03-14 16:32:35 -07:00
Dan
a4c6a5e92e Ensure changes from customize gas modal opened from confirm screen are captured for non-tx transactions. 2018-03-14 17:10:59 -02:30
Dan
fb838da734 Revert 'Set txMeta.time to reflect time of tx approval.' 2018-03-14 17:07:09 -02:30
Dan
edd5c38492 Fix translations whose substitutions params were not in arrays. 2018-03-14 12:34:13 -02:30
Dan
798988597b Merge branch 'master' into retry-tx-refractor 2018-03-14 00:02:27 -02:30
Dan
cc267d6c81 Fix more lint errors. 2018-03-13 23:56:45 -02:30
Dan
c37684d7bd Remove unnecessary addition of nonce to state. 2018-03-13 23:49:10 -02:30
Dan
e94a14ef8a Make token confirmations compatible. 2018-03-13 23:44:05 -02:30
Dan
0d33aed20e Fix tx-list-item submitted check. 2018-03-13 23:29:47 -02:30
Dan
c52253bb0e Use correct name for submittedTime field in tx-list.js 2018-03-13 21:57:23 -02:30
Dan
46ded45b81 Use correct var name in new-ui showRetryButton 2018-03-13 21:38:08 -02:30
Dan
8c7988978f Undefined check in showRetryButton 2018-03-13 21:32:22 -02:30
Dan
e293b6349c Styling for dropped. 2018-03-13 21:15:35 -02:30
Dan
d6e4d2e80d Use new submittedTime field to correctly show retry button in old and new ui. 2018-03-13 21:15:35 -02:30
Thomas Huang
1d2cb46eff
Merge branch 'master' into i18n 2018-03-13 11:00:52 -07:00
kumavis
c1387cdc54
Merge pull request #3495 from alextsg/cb-290 
Increase tap areas for menu buttons on mobile
 2018-03-13 10:42:59 -07:00
Thomas
b45ea44aa5 Add missing opening parens to pag-container__subtitle 2018-03-13 10:28:33 -07:00
Thomas Huang
829b0a8926
Merge branch 'master' into i18n 2018-03-13 10:21:03 -07:00
Dan
179066fe6b Set txMeta.time to reflect time of tx approval. 2018-03-13 03:26:37 -02:30
Dan
e6d1ce56e7 Improve phrasing of copy. 2018-03-13 03:11:45 -02:30
Dan
f805a2eb73 Fix gas calculation and nonce / forceGasMin state setting errors; retry button shows on correct tx. 2018-03-13 03:09:38 -02:30
Alexander Tseung
08542c18e1
Update deposit ether styling (#3510) 2018-03-12 19:25:12 +01:00
Thomas Huang
b7c7083a11
Merge branch 'master' into i18n 2018-03-12 10:50:55 -04:00
Alexander Tseung
a07550d2ab Increase tap areas for menu buttons on mobile 2018-03-09 18:50:00 +01:00
Alexander Tseung
d84341f323
Add empty object default value for tokenData (#3493) 2018-03-09 16:31:17 +01:00
Dan
c1ff927fa0 Lint fixes. 2018-03-09 10:00:37 -03:30
Dan
81e72147ef Merge branch 'master' into retry-tx-refractor 2018-03-09 02:07:27 -03:30
Dan
2d6b378bf8 Adds inline opening of gas customization to confirm-send-ether screen. 2018-03-09 02:03:36 -03:30
Dan
5433d2fe3a Retry transaction logic added to tx-list-item, confirm-send-ether, customize-gas-modal, and dependents. 2018-03-09 00:19:26 -03:30
Dan
6cee76b3e7 Add html and css for responsive retry button. 2018-03-08 16:12:25 -03:30
Dan
09dae760bc Correct caps of Send button on main screen. 2018-03-07 22:47:29 -03:30
Dan J Miller
ca047b1ea0
Update network colours for better accessibility. (#3469) 2018-03-07 15:22:10 -03:30
Dan Finlay
abe8bc19a8
Merge branch 'master' into i18n 2018-03-06 20:13:53 -08:00
Dan
2420ad2477 Correct merge conflict resolution errors. 2018-03-06 22:26:13 -03:30
kumavis
6a9ca29244
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 17:13:57 -08:00
Dan
9d215bab0f Merge branch 'master' into i18n 2018-03-06 20:45:45 -03:30
Dan Finlay
a4bd7992cd
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 10:32:47 -08:00
Dan
376ffb758f Shapeshift form handles market info unavailable errors. 2018-03-06 13:49:41 -03:30
Dan J Miller
1bd18cebd7
Fixes shapeshift coin selection dropdown. (#3416) 2018-03-05 13:33:46 -03:30
Thomas Huang
d3a0a27c0c
Merge branch 'master' into ImportAccountMessageV2 2018-03-02 18:26:52 -08:00
Alexander Tseung
f22dfd4ae8 Fix network menu for custom URLs (#3366) 2018-03-01 17:42:10 -03:30
Alexander Tseung
ace4f0d998 Fix exception thrown when styleOverride is not present (#3364) 2018-03-01 17:41:35 -03:30
kumavis
28c6347cdd
Merge pull request #3340 from danjm/i3338-contract-published-terminology 
[NewUI] Replace 'Contract Published' label with 'Contract Deployment'
 2018-02-28 11:16:55 -08:00
Dan
78f6a48664 Define event locally in onClickOutside method in account-dropdowns.js 2018-02-28 13:18:37 -03:30
Dan
2b9af0734b Replace 'Contract Published' with 'Contract Deployment' for clearer indication of contract tx state. 2018-02-27 20:09:02 -03:30
Thomas
7aa324bdf6 Remove committed out merge code 2018-02-27 12:06:24 -08:00
Thomas
ac2e92fa54 Change Loose label to Imported 2018-02-27 12:02:48 -08:00
Dan Finlay
a1b72e5252 Try fixing notice screen synchronous state call 2018-02-20 13:51:06 -08:00
kumavis
4e8d9fef84
Merge pull request #3200 from alextsg/cb-703 
[NewUI] Remove accessing PropTypes from main React package
 2018-02-16 16:11:36 +00:00
Dan Finlay
ee1197192f
Merge pull request #3209 from danjm/MM-634-newui-reset-account 
[NewUI] Add reset account button to new UI.
 2018-02-13 19:50:19 +01:00
Dan J Miller
35c762da47 Updates the styling of confirm send ether and token screens. (#3235) 2018-02-12 22:51:05 -08:00
Alexander Tseung
72ffa2c3f5 Fix react-router related exceptions 2018-02-09 12:05:27 -08:00
Alexander Tseung
2240688fd4 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:44:02 -08:00
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -08:00
Dan J Miller
c8c2dfdc0f Fixes shapeshift txs so that they render in tx list. (#3208) 2018-02-08 16:40:15 -08:00
Dan
cd976a2765 Add reset account button to new UI. 2018-02-08 20:23:16 -03:30
Alexander Tseung
e9c2c0eec1
Make blockies icon round to match identicons (#3205) 2018-02-07 18:46:27 -08:00
Alexander Tseung
8b90b1d1b1 Remove accessing PropTypes from main React package 2018-02-06 22:03:37 -08:00
Dan J Miller
9ed3a5512e Fix alignment of ellipsis and address in wallet view. (#3198) 2018-02-06 16:51:32 -08:00
Dan J Miller
d84dc5da42 Remove duplicate token balance on uat next. (#3195) 2018-02-06 10:21:21 -08:00
Alexander Tseung
d452403322
Add functional integration testing to Add Token flow (#3189) 2018-02-05 18:47:46 -08:00
Dan J Miller
d4da419c5b Wallet view supports screen sizes between 576px and 667px (#3193) 2018-02-05 18:31:21 -08:00
Alexander Tseung
2fd9e58e61 Fix lint errors 2018-02-01 14:13:08 -08:00
Alexander Tseung
4f1fe1da62 Fix merge conflicts from uat-next 2018-01-31 18:24:20 -08:00
Alexander Tseung
0c6fef3dec Add create new account routes, fix conflicts from uat updates 2018-01-31 18:08:49 -08:00
Dan J Miller
78bce55858 [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120) 
* Use tooltip for display of helper text in wallet views copy to clipboard feature.

* Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change.

* Remove unnecessary tabIndex attribute from wallet view address element.
 2018-01-31 16:27:35 -08:00
Alexander Tseung
ecc39c5a7a Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 2018-01-29 18:22:52 -08:00
Nick Doiron
abfa74f09a complete i18n across new UI 2018-01-29 15:29:01 -05:00
Nick Doiron
9c133aaab3 get t imported in all files currently using i18n 2018-01-24 19:41:29 -10:00
Nick Doiron
7da52c5997 separate out cross-browser i18n for extensions 2018-01-24 10:10:28 -10:00
Nick Doiron
99898ac775 better organization of locale file; i18n in more view files 2018-01-23 22:14:47 -10:00
Nick Doiron
bad70eb1b3 first steps to i18n 2018-01-22 23:48:03 -10:00
Chi Kei Chan
77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
Alexander Tseung
b05d21b1ba Fix transaction list font sizes, padding 2018-01-18 13:34:57 -08:00
Kevin Serrano
5fff2e19d8
Merge pull request #3024 from alextsg/cb-529 
[NewUI] Update popout to fullscreen icon
 2018-01-18 12:39:09 -08:00
Dan J Miller
4fae461a67 [NewUI] Send screen gas loading fixes (#3027) 
* Allow entering amount, but disable validation of amount, opening of gas customizer or clicking of next, when gas loading in send.

* Fix variable name.
 2018-01-17 20:47:01 -08:00
Alexander Tseung
f8bf8cb527 Update popout to fullscreen icon 2018-01-17 17:56:18 -08:00
Alexander Tseung
40e58d3132 Fix tx-list, confirmation screen styling 2018-01-17 13:50:16 -08:00
Chi Kei Chan
ba0762c582
Merge pull request #3005 from alextsg/cb-385 
[NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button
 2018-01-17 13:49:48 -08:00
Thomas
8c792ba3ee Add network-indicator classname to network loading spinner 2018-01-17 10:51:23 -08:00
Alexander Tseung
65e9d9efc5 Fix rendering QR code in old UI, hide unnecessary back button 2018-01-16 17:41:42 -08:00
Alexander Tseung
ccb80594be Readjust gas fees when switching networks on the send screen 2018-01-16 17:26:34 -08:00
Alexander Tseung
baebf64afd Fix send screen value input 2018-01-15 18:28:21 -08:00
Alexander Tseung
644adeccf6 Fix Hide Token modal styling, popup positioning 2018-01-15 18:26:16 -08:00
Dan
980e1bfcf8 New add account page with create and import options. 2018-01-12 13:42:51 -08:00
Chi Kei Chan
71a308d98b
Merge branch 'uat' into cb-388 2018-01-12 13:41:03 -08:00
Dan J Miller
5c1dcf3e9b [NewUI-flat] New deposit ether modal UI. (#2642) 
* New deposit ether modal.

* New deposit modal full screen on mobile, and other style fixes.

* Hide shapeshift option from deposit modal for now.

* Add shapeshift form to new deposit modal.

* Store recipient address for shapeshift tx in background.

* Use Simpledropdown to achieve desired styling in coin selector.

* Lint fix

* Fix typos and remove dead code.

* Remove storage of shapeshift receiving address from background.

* Fix typos
 2018-01-12 11:48:18 -08:00
Alexander Tseung
b0a6bfdeec Change styling for network dropdown 2018-01-11 16:59:00 -08:00
Alexander Tseung
376e136572 Update styling for buttons, font weights 2018-01-11 16:30:07 -08:00
Alexander Tseung
b8310ac62e Fix logging out of old UI causing infinite spinner (#2914) 2018-01-11 15:49:10 -08:00
Alexander Tseung
208e94d3bf Update main view styling 2018-01-10 21:09:09 -08:00
Alexander Tseung
409d1d30e9
Merge pull request #2799 from MetaMask/NewUI-flat 
Update UAT to version 4.0.5
 2017-12-22 11:40:20 -08:00
Chi Kei Chan
9959aea598
Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 2017-12-20 17:38:28 -08:00
Dan
9ced63584b Add constanst for token transfer function signature. 2017-12-20 17:37:18 -08:00
Dan
5fe3c5aae6 Lint fixes. 2017-12-20 17:37:18 -08:00
Dan
bf4043c59b Adds updateTransaction to background and used it to update after editing in send-v2. 2017-12-20 17:37:18 -08:00
Dan
1f1fc2c49e Canceled, edited transactions show edited amount. 2017-12-20 17:37:18 -08:00
Dan
7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
Dan
109e4e5d96 Hide fiat values on account details screen when eth/token value is 0. 2017-12-20 10:21:36 -08:00
Dan
0feb5b210b Hides the sidebar after the an account menu actions changes the screen behind the sidebar. 2017-12-20 10:17:29 -08:00
Alexander Tseung
5d1187c37b Add route for signature request 2017-12-14 14:11:23 -08:00
Alexander Tseung
706a6b0ad6 Add initialized checks for first time flow routes 2017-12-14 14:11:23 -08:00
Alexander Tseung
ec5e0a711c Fix lint errors 2017-12-14 14:11:23 -08:00
Alexander Tseung
dde39e82b5 Add routes for mascara 2017-12-14 14:11:23 -08:00
Alexander Tseung
e226b10a89 Add react-router to allow use of the browser back button 2017-12-14 12:50:20 -08:00
Thomas Huang
453bfd34e3
Merge pull request #2706 from danjm/MM-fix-buy-cancel-button 
Fixes the cancel button in the buy screen to take the user home.
 2017-12-14 15:06:53 -05:00
Dan J Miller
339eb7d1a6 Fix edit to field bug. (#2738) 2017-12-12 22:24:41 -08:00
Chi Kei Chan
515437a4c9 Fix isMascara and update yarn.lock 2017-12-12 12:22:22 -08:00
Dan
57c91435a7 Substitute isMascara check for explicit check if user is on mobile browser. 2017-12-12 12:14:40 -08:00
Dan
4b654669e6 Hide open in browser button on mobile (but still show on extension); adds a function to detect if viewing with mobile browser. 2017-12-12 12:14:40 -08:00
Dan
05c6789030 Adds button for opening app in main browser window in extension. 2017-12-12 12:14:40 -08:00
Dan Finlay
d110c916a4 Show watched tokens with no balance 2017-12-12 09:47:51 -08:00
Dan
bfec077d79 Fixes the cancel button in the buy screen to take the user home. 2017-12-08 16:18:50 -03:30
Chi Kei Chan
41d281a527
Merge branch 'NewUI-flat' into cb-372 2017-12-07 09:54:37 -08:00
Chi Kei Chan
845aec82b9
Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI 2017-12-07 09:46:28 -08:00
Dan Finlay
c82fd990aa Add 10% price bump to retry attempts. 
Turns out geth requires at least a 10% price bump to replace txs:
9619a61024/core/tx_pool.go (L133)
 2017-12-07 04:02:11 -05:00
Dan
2e9137dddd Update max amount behaviour to meet new specs. 2017-12-06 21:15:39 -08:00
Alexander Tseung
b9f2f8c2a7 Show retry button on submitted transactions greater than 30 seconds, add hover styling 2017-12-07 00:01:11 -05:00
Dan Finlay
73da8a5a4f Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into RetryTransaction 2017-12-06 23:43:11 -05:00
Dan Finlay
0e25129028 Enforce retry tx at minimum gas of previous tx 2017-12-06 23:42:47 -05:00
Alexander Tseung
6b3909547f Fix styling of Retry buton 2017-12-06 23:27:43 -05:00
Alexander Tseung
02736d2d36 Connect to redux for retryTransaction 2017-12-06 22:48:26 -05:00
Alexander Tseung
500fbe450a Add button to retry transaction 2017-12-06 22:35:18 -05:00
Dan Finlay
6ff580584a Add retry background method and action 2017-12-06 22:20:58 -05:00
Dan
9db00fa507 Show user notifications after switch between UIs 2017-12-04 23:36:54 -03:30
Alexander Tseung
7dba114feb Update font weights to 300, remove animation from network dropdown, fix network dropdown not closing from certain click-areas 2017-12-01 14:19:53 -08:00
Thomas Huang
f131468353
Remove useBlockie in props for render 
Removed unused useBlock for Lint validation.
 2017-11-28 13:37:45 -06:00
Jason Clark
a34362b776 Fixes changes requested in pullrequestreview-79088534 2017-11-27 08:11:48 -07:00
Jason Clark
75ef848196 making eslint happy 2017-11-25 15:47:34 -07:00
Jason Clark
bd48d858f4 fixing blockies display issues 2017-11-25 15:11:29 -07:00
Jason Clark
1b89ceb63a swapped out ethereum-blockies lib for MEW blockies library, tightened up identicon.js code 2017-11-25 14:33:42 -07:00
Jason Clark
41be4714c2 tweaking styling 2017-11-24 14:18:46 -07:00
Jason Clark
dc7bd3c628 incremental commit of working blockie component 2017-11-24 13:48:56 -07:00
Clark, Jason (Contractor)
90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
Dan Finlay
28409294c3 Remove unneeded type casting 2017-11-21 03:42:46 +08:00
Dan Finlay
c6713e93ad Fix bug where gas param was not a string 
Prevented sending transactions.

Fixes #2598
 2017-11-21 03:42:46 +08:00
Chi Kei Chan
b944a63ff8
Merge pull request #2591 from MetaMask/NewUI-flat 
Release 4.0.4
 2017-11-15 13:33:47 -08:00
Dan
960cc8abcb Gas customzier does not consider amount when sending tokens. 2017-11-15 15:29:57 -03:30
Dan
bbdb35c35a Use currency input component in input number, to improve input behaviour in gas estimator 2017-11-15 15:00:35 -03:30
Alexander Tseung
59e46e7cb2 Show tokens with zero balance 2017-11-14 16:19:24 -08:00
Dan
9e3f921ba9 Create single action for updating all of send in redux state. 2017-11-14 16:18:00 -08:00
Dan
4671f28476 Allow editing of token transactions. 2017-11-14 16:18:00 -08:00
Dan
0a91671ff6 Fix lint errors. 2017-11-14 16:18:00 -08:00
Dan
34ca7290c5 Allow editing of send ether. 2017-11-14 16:18:00 -08:00
Dan
7eb083bd9f Improve variable name. 2017-11-13 09:52:40 -08:00
Dan
544166437a Deposit button shows link to faucet on testnet networks. 2017-11-13 09:52:40 -08:00
Dan
08d9ecc045 Cursor pointer and hover background on from and to dropdown items. 2017-11-10 14:14:07 -08:00
Dan
a33ced3994 Focus amount input when click anywhere in amount field container 2017-11-10 14:13:29 -08:00
Dan
5a0126f17b Rounding of vals < 0.01 in currency display consistent with master. 2017-11-10 14:12:26 -08:00
Thomas Huang
5120cfdff3 Linting 2017-11-10 14:07:27 -08:00
Dan
62f2aebe1d Network loading does not block network loading. 2017-11-09 11:18:47 -08:00
cjeria
424c1f23c9 darker backdrop style for modal 2017-11-09 11:18:08 -08:00
Dan
d1977225a4 Calculate max amount for send ether based on minimum gas total. 2017-11-07 21:55:12 -03:30
Dan
c156c85eaa Fix amount max for sending token. 2017-11-07 21:47:14 -03:30
Dan
c57d504794 Add currency-input component to correct send amount behaviour and move currency display value state to parent component. 2017-11-07 20:06:26 -03:30
frankiebee
08867874cc Merge remote-tracking branch 'origin/uat' into mascara-first-screen 2017-11-07 12:29:47 -05:00
Dan
8c6e1232e4 Lint fixes. 2017-11-06 16:14:46 -03:30
Dan
716bbf67d7 Set gas price allows for WEI precision. 2017-11-06 16:07:02 -03:30
Dan
b16946723f Insufficient balance warning in gas customizer works for send token 2017-11-06 16:03:05 -03:30
Dan
319779ab08 Adds max amount feature for send-ether 2017-11-06 16:03:04 -03:30
Dan
67bdfe87e3 Token balance in send state; validating sufficient tokens, validation updates on 'from' switching. 2017-11-06 15:57:57 -03:30
Chi Kei Chan
9f70762434
Merge pull request #2530 from MetaMask/uat 
Merge uat into NewUI-flat
 2017-11-02 15:20:29 -07:00
Dan
dc0b3255cf Fixes width of from and to dropdowns in extension and on mobile views. 2017-11-02 15:17:34 -07:00
Dan
56e9f98bd0 More lint fixes 2017-11-02 09:45:59 -02:30
Dan
5a94775b3f Lint fixes for NewUI-flat. 2017-11-02 00:00:33 -02:30
frankiebee
06a931f988 ui - allow optional size for mascot 2017-10-31 14:01:10 -05:00
Dan
c8c918d44e Add utility for getting token data; get token data in tx-list even if token has been removed. 2017-10-27 17:29:12 -07:00
Alexander Tseung
5d8b53bcf4 Provide default new account name 2017-10-27 00:24:07 -07:00
Dan J Miller
3d53716f43 Correct rendering of conversions when conversion rate is a token. (#2498) 2017-10-26 22:55:34 -07:00
Dan
0ed1add110 Clear import error state on logout. 2017-10-26 12:27:09 -07:00
Dan
f9fc6cec3b eth_sign warning color 2017-10-26 12:26:05 -07:00
Dan
220da24f9a Change min gas price to 0.1 GWEI 2017-10-26 12:25:33 -07:00
Chi Kei Chan
5aecce908f Merge branch 'master' into NewUI-flat 2017-10-25 18:49:02 -07:00
Alexander Tseung
22d9e3a7e6 Allow editing account name in account details modal 2017-10-25 18:44:24 -07:00
Chi Kei Chan
fa95303e1e Sign Typed Request styling fixes 2017-10-25 18:05:52 -07:00
Dan
ddf11011c9 Signature request fixes. 2017-10-25 17:40:48 -07:00
Alexander Tseung
39d4fe311f Fix Import an Account link not working in Create Account modal 2017-10-25 16:04:38 -07:00
Dan Finlay
2489caddd4 Merge pull request #2476 from MetaMask/100MweiMinGasPrice 
Reduce minimum gas price to 100 MWEI
 2017-10-25 13:53:03 -07:00
Dan
78836b0ead Signature Request 2017-10-25 12:40:16 -07:00
Dan
f89b766534 Adds revert feature to customize gas modal. 2017-10-25 12:19:29 -07:00
Alexander Tseung
3d8182f5d5 Add Info section 2017-10-25 12:16:47 -07:00
Kevin Serrano
4903f3e71a
Add labels to clarify warning. 2017-10-25 11:52:16 -07:00
Kevin Serrano
e7a22fc62b
Account for non-submitted mins and max 2017-10-25 11:47:40 -07:00
Kevin Serrano
b3b9e16ec0
Add clarifying comment about wei conversion. 2017-10-25 11:40:07 -07:00
Kevin Serrano
7f093f67a7
Cut out intermediary wei steps. 2017-10-25 11:38:32 -07:00
Kevin Serrano
dee172fb3a
Remove unneeded toString conversions. 2017-10-25 11:36:12 -07:00
Kevin Serrano
e1b9734cbf
Move upsize conversions for input warning at front of fn. 2017-10-25 11:35:18 -07:00
Kevin Serrano
cb7d07ebae
Fix mismatched decimal/hex conversion in pending-tx 2017-10-25 11:32:38 -07:00
Chi Kei Chan
2b72b70647 Add GWEI to gas price unit 2017-10-25 01:17:17 -07:00
Chi Kei Chan
0d522139ba Fix gas input styling on mobile view 2017-10-25 01:08:14 -07:00
Chi Kei Chan
7c10cda8a4 Fix alignment on right arrow of confirm tx screens 2017-10-25 00:24:26 -07:00
Chi Kei Chan
6231431894 Change download to show in Export Private Key Modal 2017-10-24 22:48:20 -07:00
Chi Kei Chan
630ab79cc3 Styling and UX changes on sidebar 2017-10-24 20:04:29 -07:00
Chi Kei Chan
301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Chi Kei Chan
3f1ae92bb7 Hide sidebar on add token 2017-10-24 16:55:02 -07:00
Kevin Serrano
1767dceba4 Merge pull request #2422 from watilde/fixes-lint 
Fixes lint warnings
 2017-10-24 16:53:54 -07:00
Chi Kei Chan
7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
Kevin Serrano
242456ba6a
Resolve merge conflict. 2017-10-24 16:44:25 -07:00
Kevin Serrano
98d8275743
Fix for gas price to be lowered. 2017-10-24 16:43:03 -07:00
Dan
ef2b0d8485 Simply logic for rendering matching accounts in to-autocomplete dropdown. 2017-10-24 16:31:04 -07:00
Dan
07c4c92db6 Style dropdown of to-autocomplete. 2017-10-24 16:31:04 -07:00
Dan Finlay
35ca7e83bd Reduce minimum gas price to 100 MWEI 
Also now representing gas price in MWEI, because our current bn inputs actually aren't tolerant of minimums less than 1 unit.
 2017-10-24 15:10:03 -07:00
tmashuang
91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 2017-10-24 08:36:02 -07:00
Chi Kei Chan
6daa834323 Disable network dropdown on conf tx screen 2017-10-24 01:07:51 -07:00
Chi Kei Chan
966e4cfd11 Change clickable area for account detail; change network dot size 2017-10-24 00:54:49 -07:00
Chi Kei Chan
4336794355 Fix styling in private key modal 2017-10-24 00:43:12 -07:00
Chi Kei Chan
2871beebe6 Add "Add Token" button to side bar 2017-10-24 00:29:20 -07:00
Chi Kei Chan
3891cf1af6 Fix clickable area on logout 2017-10-24 00:16:19 -07:00
Chi Kei Chan
4401800a42 Account menu white check mark 2017-10-24 00:13:49 -07:00
Chi Kei Chan
a63373401b New Sidebar uplift 2017-10-23 23:59:21 -07:00
Chi Kei Chan
6d3f261b2f Change LOOSE label to IMPORTED 2017-10-23 23:11:47 -07:00
Dan
e737a9565a Improve customize gas modal error handling 2017-10-23 22:41:30 -07:00
Dan
09d659614e Cleaner implementation of currency-display input. 2017-10-23 22:40:55 -07:00
Chi Kei Chan
0cbaec16f3 Merge pull request #2433 from danjm/NewUI-flat-precision-improvements 
[NewUI] Improves precision of a calculation in send, and in confirm
 2017-10-23 11:50:59 -07:00
Chi Kei Chan
9984c9516a Merge pull request #2434 from danjm/NewUI-flat-clear-send-state 
[NewUI] Clear send state on cancelling and signing.
 2017-10-23 11:49:14 -07:00
Chi Kei Chan
8de0292d66 Merge pull request #2431 from alextsg/nu-2406 
[NewUI] Change all "Buy" to "Deposit"
 2017-10-23 11:48:49 -07:00
Dan
b96ba55229 Clear send state on cancelling and signing. 2017-10-23 16:03:48 -02:30
Dan
b3dad510b7 Improve precision in send and confirm. 2017-10-23 15:53:28 -02:30
Alexander Tseung
bef1405a50 Change all "Buy" to "Deposit" 2017-10-22 22:59:55 -07:00
Alexander Tseung
2c032e0df4 Update settings screen to new UI 2017-10-22 22:40:03 -07:00
Dan Finlay
926abc12b1 Add support for alternative ENS TLDs 
Fixes #2428
 2017-10-22 22:12:12 -07:00
Daijiro Wachi
43b1cb9100 Fix lint warnings 
Fixed warnings:
```md
app/scripts/controllers/computed-balances.js
+ 35:27  warning  Missing space before function parentheses            space-before-function-paren
+ 41:14  warning  'address' is never reassigned. Use 'const' instead   prefer-const
+ 61:9   warning  'updater' is never reassigned. Use 'const' instead   prefer-const
+ 68:11  warning  'newState' is never reassigned. Use 'const' instead  prefer-const

app/scripts/controllers/network.js
+ 104:29  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/createLoggerMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 15:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createOriginMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 9:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createProviderMiddleware.js
+ 5:34  warning  Missing space before function parentheses      space-before-function-paren
+ 13:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/events-proxy.js
+ 1:50  warning  Missing space before function parentheses      space-before-function-paren
+ 31:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/nodeify.js
+ 2:22  warning  Missing space before function parentheses  space-before-function-paren
+ 2:24  warning  Missing space before opening brace         space-before-blocks
+ 5:18  warning  Missing space before function parentheses  space-before-function-paren
+ 5:20  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/pending-balance-calculator.js
+ 16:19  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/pending-tx-tracker.js
+ 85:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 87:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 88:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 90:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 91:11  warning  '||' should be placed at the end of the line  operator-linebreak

app/scripts/lib/port-stream.js
+ 3:22  warning  Missing space before function parentheses  space-before-function-paren
+ 3:24  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/tx-gas-utils.js
+ 84:2  warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-history-helper.js
+ 12:37  warning  Missing space before function parentheses      space-before-function-paren
+ 23:30  warning  Missing space before function parentheses      space-before-function-paren
+ 30:23  warning  Missing space before function parentheses      space-before-function-paren
+ 35:28  warning  Missing space before function parentheses      space-before-function-paren
+ 41:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-manager.js
+ 94:13  warning  'value' is never reassigned. Use 'const' instead  prefer-const

ui/app/reducers.js
+ 45:7  warning  'state' is never reassigned. Use 'const' instead        prefer-const
+ 53:7  warning  'stateString' is never reassigned. Use 'const' instead  prefer-const

ui/lib/tx-helper.js
+ 27:2  warning  Newline required at end of file but not found  eol-last

ui/app/components/account-dropdowns.js
+ 163:1  warning  More than 2 blank lines not allowed  no-multiple-empty-lines

ui/app/components/menu-droppo.js
+ 22:7  warning  'style' is never reassigned. Use 'const' instead  prefer-const

ui/app/components/shapeshift-form.js
+ 135:11  warning  '&&' should be placed at the end of the line  operator-linebreak

ui/app/components/typed-message-renderer.js
+ 35:25  warning  Missing space before function parentheses      space-before-function-paren
+ 42:2   warning  Newline required at end of file but not found  eol-last

mascara/server/index.js
+ 11:42  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 12:36  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 13:33  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 14:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 20:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 21:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 26:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
```
 2017-10-21 21:06:39 +02:00
Chi Kei Chan
ac50db52a9 Fix linter 2017-10-20 21:51:37 -07:00
Chi Kei Chan
8f3b762461 Fix Conversions bugs; Fiat value bugs 2017-10-20 18:26:18 -07:00
Chi Kei Chan
5eb3cf43bf Add resiliency to confirm-send-token 2017-10-20 16:18:25 -07:00
Chi Kei Chan
d6f1f2bcca Merge pull request #2410 from alextsg/nu-2280 
[NewUI] Fix loading animation not showing on network change
 2017-10-20 15:35:26 -07:00
Dan
80025e278b Fixes regression in confirm-send-token 2017-10-20 18:17:13 -02:30
Alexander Tseung
5a93ec0252 Fix loading animation not showing on network change 2017-10-19 21:06:14 -07:00
Chi Kei Chan
79be956be9 Fix network dropdown styles 2017-10-19 14:10:29 -07:00
Chi Kei Chan
0458643f10 various styling fix on mobile 2017-10-19 14:08:58 -07:00
Chi Kei Chan
376ae032fe Fix selectors 2017-10-19 12:47:44 -07:00
Chi Kei Chan
f1c097ab5c Merge branch 'NewUI-flat' into MM-128-get-currentCurrency-from-state 2017-10-19 12:35:39 -07:00
Dan
c2880c4b8f Min and default gas price, limit, total; comments out code for gas slider. 2017-10-19 12:34:34 -07:00
Dan
7362fb8dfc Identicon in send token show who you are sending to, not the token's identicon. 2017-10-19 12:34:14 -07:00
Dan
89af385a35 Fix handling of arithmetic on token gas in confirm-send-token. 2017-10-19 12:34:14 -07:00
Dan
332c7441b6 Get currency from state in account details, send and confirm screens. 2017-10-19 16:30:54 -02:30
Dan
59015cccef Min and default gas price, limit, total; comments out code for gas slider. 2017-10-19 16:26:46 -02:30
Dan
f01d119cc1 Fixes mobile styling. 2017-10-19 11:38:14 -07:00
Chi Kei Chan
c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
Dan
de1da7d1b2 Fix cancel button on send screen. 2017-10-18 20:21:46 -07:00
Dan
60eda592b5 Handling to and amount errors. 2017-10-18 20:21:46 -07:00
Dan
f81226fbe9 Move all of send state to metamask state. 2017-10-18 20:21:46 -07:00
Dan
4f9ac1c4fe Get from and update addressBook in send-v2 2017-10-18 20:21:46 -07:00
Chi Kei Chan
03685c64b8 Network dropdown update 2017-10-17 22:42:56 -07:00
Chi Kei Chan
085551b7e6 New Account modal 2017-10-17 22:38:07 -07:00
Chi Kei Chan
5ee6e4d3b3 wip 2017-10-17 22:38:00 -07:00
Dan
ac43872c1a Enable send-v2 functionality. 2017-10-17 21:10:09 -04:00
Alexander Tseung
7caa914223 Fix Import Account link not hiding sidebar 2017-10-16 01:43:27 -04:00
Dan
a9244f5e42 Customize Gas connected to state 2017-10-15 23:09:05 -04:00
Dan Finlay
06094c914b Move etherscan link logic into module 2017-10-14 11:23:44 -04:00
Alexander Tseung
3fd9c8b57f Fix cursor on unclickable transactions (#2356) 2017-10-13 14:14:26 -07:00
Alexander Tseung
b149cceda0 Fix exception thrown when tokens is null (#2355) 2017-10-13 13:34:28 -07:00
Alexander Tseung
a84014eff8 Fix Localhost 8545 option in network dropdown (#2357) 2017-10-13 13:25:33 -07:00
Alexander Tseung
54a61a4021 Fix styling for Accept buttons in notices (#2358) 2017-10-13 13:24:17 -07:00
Alexander Tseung
222a203353 Fix click to copy for private key not working (#2360) 2017-10-13 13:23:10 -07:00
Dan J Miller
803eaaf968 [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from state (#2364) 
* Adds memo field to send-v2.

* Vertical align transaction with flexbox.

* Customize Gas UI

* Remove internal state from InputNumber and fix use in gastooltip.

* Move customize-gas-modal to its own folder and minor cleanup

* Create send container, get account info from state, and make currency display more reusable

* Adjusts send-v2 and container for send-token. Dynamically getting suggested gas prices.
 2017-10-13 13:19:22 -07:00
Chi Kei Chan
81f62a7443 Adding Account Dropdown V2 2017-10-13 02:11:01 -04:00
Chi Kei Chan
57179d2b05 Various styling fixes 2017-10-12 18:46:18 -04:00
Dan
7ec77e0b45 Refactor amount input: dynamic input width with vanilla js. 2017-10-12 11:09:05 -07:00
Dan
2898914a54 Send v2 amount unit moves correctly. 2017-10-12 11:09:05 -07:00
Dan
ea7926c211 Adds amount and gas field to sendV2. 2017-10-12 11:09:05 -07:00
Dan
fbab0f3a1f Send v2 to autocomplete. 2017-10-10 18:19:15 -07:00
Chi Kei Chan
d4343fe7e5 Fix recipient on send token 2017-10-10 14:36:13 -07:00
Chi Kei Chan
c221f5ce79 Confirm Token and Confirm Contract v2 2017-10-10 14:30:20 -07:00
Chi Kei Chan
119c2b2423 Confirm eth v2 2017-10-10 14:16:57 -07:00
Dan
71d6463984 Refactor 'rendersingleidentity' to a stand alone account-list-item component. 2017-10-09 18:24:14 -07:00
Dan
80463072b5 UI for readonly from component. From dropdown opening and closing. Mockdata. 2017-10-09 18:24:14 -07:00
Dan Finlay
f18615a82a Merge pull request #2296 from MetaMask/precision-fix 
Fix precision to account for small wei increase.
 2017-10-09 14:15:09 -07:00
Dan
49aa6e73ea Edit account modal shows and allows editing of name from props, not just placeholder. 2017-10-08 17:45:59 -07:00
Sergey Ukustov
53bb4bebb1 More appropriate styling 2017-10-07 23:25:40 +03:00
Kevin Serrano
e6a618b82d
Fix precision to account for small wei increase. 2017-10-05 15:26:03 -07:00
Dan Finlay
c5b7880f05 Merge branch 'master' into SignTypedData 2017-10-05 11:55:23 -07:00
Kevin Serrano
27c72ee565
Revert to normal balances. 2017-10-04 12:10:01 -07:00
Chi Kei Chan
bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Dan
ac4868170f Enables remove token and ensures add/remove update the list without need for refresh. 2017-10-03 15:46:01 -07:00
Dan
45dbd017e6 Add needed iterator in tx-list and path to account in selectors. 2017-10-02 18:09:45 -07:00
Dan
d206f183f5 Hide token confirmation modal ui 2017-10-02 18:09:09 -07:00
kumavis
2113d83489 ui - tx history - simplify error+warning display code 2017-10-02 15:39:44 -07:00
Dan
47ebcbb2ed Token menu ui. 2017-10-01 19:02:21 -07:00
Dan
ff64fe98dd Shapeshift deposit tx modal. 2017-10-01 18:58:57 -07:00
Dan
7c4d8c4562 Enables the old shapeshift UI within new ui. 2017-10-01 18:58:57 -07:00
Sergey Ukustov
82d1f39198 Respect code style 2017-09-29 19:53:03 +03:00
Sergey Ukustov
c2b8dada91 Add eth_signTypedData handler 2017-09-29 19:40:46 +03:00
Chi Kei Chan
67ee5b21e6 Query for gas estimates 2017-09-28 17:39:53 -07:00
Chi Kei Chan
4f106854ba Hide ShapeShift and Fix Modal Stylings 2017-09-28 16:34:42 -07:00
Chi Kei Chan
06292107d7 Always set currency to USD on app mount 2017-09-28 16:13:53 -07:00
Dan
66ed4dfaa3 Ensure sent token value is recognized as hex. 2017-09-28 15:55:18 -07:00
Dan
b55a40c7f1 Close sidebar on token selection. 2017-09-28 15:54:04 -07:00
Dan
a4838b1c57 Close mobile sidebar when selecting 'Add token' from account options dropdown. 2017-09-28 15:54:04 -07:00
Chi Kei Chan
5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
Dan
deee689426 Use font-awesome icons for create and import account. 2017-09-27 18:08:49 -07:00
Dan
c2ccd6e90e Makes styling fixes to account dropdown. 2017-09-27 18:08:49 -07:00
Dan
10345a12c2 Keep privateKey out of state and clear it after closing export private key modal. 2017-09-27 18:06:26 -07:00
Dan
01816e1b22 Adds a back button to export private key modal; connects account details to same modal. 2017-09-27 18:06:26 -07:00
kumavis
15b2823e54 Merge branch 'master' into new-currency-test 2017-09-27 16:04:51 -07:00
Chi Kei Chan
c77029ea90 Implement Confirm Deploy Contract screen 2017-09-26 19:21:04 -07:00
Dan
39365f2cc4 Update the correct values in state when estimates are received. 2017-09-26 18:43:26 -07:00
Dan
541b69dda9 Gets gas and price estimates when send components mount. 2017-09-26 18:43:26 -07:00
Kevin Serrano
88ddedfb5a
Account for undefined currencies. 2017-09-26 10:09:50 -07:00
Chi Kei Chan
bdd1e58e55 Return null if transaction.key is shapeshift 2017-09-26 09:15:14 -07:00
Dan
7102772c3a Connect export key modal to state and enable actions. 2017-09-26 09:05:29 -07:00
Chi Kei Chan
0d4433ed58 Merge branch 'NewUI-flat' into MM-57-use-gas-estimator 2017-09-25 19:55:56 -07:00
Dan
56697ea9a4 Select all in to and from of send screens, instead of clearing on focus. 2017-09-25 18:30:56 -07:00
Dan
eae40e0544 Able to change selections in to and from fields of send and send token. 2017-09-25 18:30:56 -07:00
Dan
2c474b0d6e Export private key modal body ui. 2017-09-25 18:29:43 -07:00
Dan
fc3e071ad6 Send token now estimates gas and price. 2017-09-25 22:09:10 -02:30
Dan
a1d87b821b Update send token to handle errors onBlur events and prevent clicking send until all errors handled 2017-09-25 21:45:51 -02:30
Dan
171d38c8db Handles errors with to field and renders warnings from backend in send token. 2017-09-25 21:19:30 -02:30
Dan
0eeba3771c Exports private key modal opens from dropdown. 2017-09-23 17:33:50 -07:00
Chi Kei Chan
e1077836ce Add Confirm Send token screen 2017-09-22 14:38:17 -07:00
Dan
13f22ff6b0 get identities from getState() instead of passing from caller, only set new account label if label set. 2017-09-22 14:35:51 -07:00
Dan
a1d72a59fe New account modal now allows for addition of account name. 2017-09-22 14:35:51 -07:00
Dan
e325e5e2f5 Default class params to empty string in readonly-input 2017-09-22 14:23:57 -07:00
Dan
48867d95fe ReadOnlyInput component. 2017-09-22 14:23:57 -07:00
Dan Finlay
f9d2f523c6 Merge branch 'master' into AddBalanceController 2017-09-22 14:12:41 -07:00
Dan
fe37dd7ecd Open account details modal on buy -> direct deposit. 2017-09-22 12:16:31 -07:00
Chi Kei Chan
83cda2b82e Refactor Confirmation Tx to render different screen 2017-09-21 22:25:16 -07:00
Chi Kei Chan
3ec2f53463 Integrate Add Token 2017-09-21 18:44:52 -07:00
Dan
24fd16b1be Abstract account modal. 2017-09-21 16:45:18 -07:00
Dan
39afbea7aa Confirm screen shows amount plus gas in total field 2017-09-21 16:43:29 -07:00
Dan
97810acb53 Handles errors with to field and renders warnings from backend in send token. 2017-09-21 16:41:52 -07:00
Chi Kei Chan
e7f1fc4436 Buy Modal Styling 2017-09-19 18:49:35 -07:00
Chi Kei Chan
a67d3ecd46 Merge branch 'master' into NewUI-flat 2017-09-18 18:13:15 -07:00
Kevin Serrano
bd8428e9ed
Comply with current currency API and add additional styling. 2017-09-18 16:09:01 -07:00
Chi Kei Chan
190330db92 Merge branch 'master' into NewUI-flat 2017-09-18 11:41:46 -07:00
Chi Kei Chan
162a3827c7 Fix Merge Problems; update yarn lock 2017-09-18 11:34:07 -07:00
Chi Kei Chan
6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
Dan Finlay
545cbbebb9 Merge branch 'master' into fix-tooltip 2017-09-18 11:20:00 -07:00
Dan
54bbf8d859 Handle transaction totals in WEI in tx-list, send and pending. 2017-09-15 16:23:23 -07:00
Dan
b0f1fba2e5 Ensures that new accounts are only created from the modal, and not when clicking 'Create New Account' 2017-09-15 16:19:48 -07:00
Dan
095d327140 Adds USD to token list. 2017-09-15 16:16:41 -07:00
Dan
ab77142c90 Show dollar sign before USD on account details page. 2017-09-15 16:10:34 -07:00
Chi Kei Chan
93a1089e08 Show token tx properly 2017-09-14 01:09:57 -07:00
Chi Kei Chan
d722c1045f Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate 2017-09-13 19:57:33 -07:00
Dan
6bd71d6937 Fix send and pending. 2017-09-13 16:30:39 -07:00
Dan Finlay
c17c657693 Merge branch 'master' into AddBalanceController 2017-09-13 15:11:03 -07:00
Dan Finlay
0ba6493175 Use computed balance for tx confirmation 2017-09-13 14:31:48 -07:00
Dan
ca46bd200b Stop setting 'currentCurrency' and use local state for active currency in send.js 2017-09-13 14:25:20 -07:00
Dan
a5ab91e572 Enables Cancel button in confirmation screen. 2017-09-13 14:24:48 -07:00
Dan
55d62190e3 Fixes the saving of transactions in send and display in tx-list with conversion utility. 2017-09-13 14:22:58 -07:00
Dan
6fa1cd6225 Reapply conversion utility changes and fix calls to utility in pending-tx. 2017-09-13 14:22:30 -07:00
Kevin Serrano
a22a2586ab
Haha silly me, only when gas is estimated and not explicit. 2017-09-13 13:24:16 -07:00
Kevin Serrano
6e725b123b
Lower warning threshold for high tx fee to account for fluctuating blockGasLimits 2017-09-13 12:22:08 -07:00
Kevin Serrano
06153dd47d
Add warning of higher failure risk since app proposed gasLimit. 2017-09-13 12:17:42 -07:00
Chi Kei Chan
8f31b05ac5 Add token exchange rates 2017-09-13 01:25:39 -07:00
Chi Kei Chan
8b5f2a95df Improve styling in Confirmation Screen; Show decoded send token data 2017-09-12 23:04:01 -07:00
Chi Kei Chan
b64471833f Revert "Overhaul currency conversion utility and update calls to utility in pending-tx." 
This reverts commit 080890a46e.
 2017-09-12 23:04:01 -07:00
Kevin Serrano
962794d025
fixed position of tooltips to avoid overflow. 2017-09-12 16:15:56 -07:00
Dan
080890a46e Overhaul currency conversion utility and update calls to utility in pending-tx. 2017-09-12 16:05:59 -07:00
Dan J Miller
492507aa94 [NewUI] Color tx-list-item text depending on transaction status. (#2050) 
* Color tx-list-item text depending on transaction status.

* Handle css change of text colour with scss instead on inline styles, add classnames package and helper function.

* Refactored to use classnames with component property className.
 2017-09-12 14:59:33 -07:00
Chi Kei Chan
7eb6dae418 Added signTokenTx; Adding token confirmation screen 2017-09-12 02:22:23 -07:00
Chi Kei Chan
836bf2e1a3 Add frontend validation to send-token 2017-09-11 23:18:54 -07:00
Dan J Miller
1e83835ba8 [New-UI] Confirm Screen restyle and connect to state (#2042) 
* Adds utility for converting currencies (WIP)

* Implements confirm screen

* Style tweaks.

* Confirm screen total ammount now uses real data.

* Confirm screen total ammount now uses real data.

* Replace content divider with sibling css.

* Replace section divider with scss.
 2017-09-11 22:19:05 -07:00
Chi Kei Chan
062e67bff8 Add buttons; handle back; add yarn.lock 2017-09-11 22:14:09 -07:00
Dan
8342c20b58 Cleaner css for circle icon. 2017-09-11 19:16:43 -07:00
Dan
6beb1b33bb Replace checkmark with font-awesome equivalent. 2017-09-11 19:16:43 -07:00
Dan
99047e3ef4 Adds title, divider and descriptive text to network dropdown. 2017-09-11 19:16:43 -07:00
Dan
6a3c59e409 Highlighted circle icons for the network menu. 2017-09-11 19:16:43 -07:00
Kevin Serrano
213af0cd6c
Fix typo. 2017-09-11 16:52:35 -07:00
Kevin Serrano
aa021b9209
Add some styling. 2017-09-11 16:40:45 -07:00
Kevin Serrano
fa1ec5dcd1
Move function as util function. 2017-09-11 16:22:20 -07:00
Kevin Serrano
3a7d4a5d4e
Basic private key download file functionality. 2017-09-11 16:13:28 -07:00
Kevin Serrano
27ba7f6ed3
Show reject all only when tx count is > 1 2017-09-11 14:12:35 -07:00
Kevin Serrano
2e18dd27a4
Merge github.com:MetaMask/metamask-extension into rejectallunapproved 2017-09-11 13:58:46 -07:00
Chi Kei Chan
663cb758b3 Style send token screen 2017-09-11 00:45:06 -07:00
Dan
5a8433b6ce New account modal top right close button working. 2017-09-08 10:56:56 -07:00
Dan
ab4005cab8 Tweak styles in new-account-modal. 2017-09-08 10:56:56 -07:00
Kevin Serrano
54fb8e8cef
Add cursor on hover on loading. Change some wording. 2017-09-07 16:26:31 -07:00
Kevin Serrano
8d7f78c1a5
Add caret to indicate network is dropdown. 2017-09-07 16:18:32 -07:00
Kevin Serrano
41e9904d9b
Convert icon to button. 2017-09-07 15:03:25 -07:00
Kevin Serrano
3a87a30912
Fold submit and buy ether into one button slot 2017-09-07 13:55:59 -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
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
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
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
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 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
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
3cb51e32c9 Capitalizations via text-transform for main screen transactions. 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
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
Thomas Huang
04011f9ea7 Multiple tokens shows the amount when greater than 1 2017-08-29 17:54:01 -07:00
Dan
c605c9897d Minor clean up. 2017-08-29 16:09:56 -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
dc72c4cc91 Using eth balance component to ensure proper rounding. 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
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
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 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
97a6a8e4f6 Add layout and props for send screen inputs 2017-08-22 12:47:58 -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
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
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
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
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
0fab1b5482 Implement responsive wallet balances 2017-08-11 00:31:06 -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
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
96b186dfb2 Cleanup txList and txView components 2017-08-10 19:35:10 -07:00
sdtsui
9ec8663605 Cleanup stray logs and lint 2017-08-10 17:50:33 -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
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
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
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
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
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
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
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
sdtsui
a7017b824d Refactor app-header css, including box shadow and z-index 2017-08-06 18:50:23 -07:00
sdtsui
403d9c52b5 Add fine css tweaks to hero balance - laptop 2017-08-06 18:14:48 -07:00
sdtsui
dc0f78c1b9 Fix font size of eth display for 576-780px vw 2017-08-06 16:58:45 -07:00
sdtsui
c1b8517959 Normalize sidebar dimensions and adjust hero button responsiveness 2017-08-06 16:37:41 -07:00
sdtsui
802c29c986 Implement hero balance UI, mobile 2017-08-06 15:46:55 -07:00
sdtsui
17de77f24a Position account display and burger in mobile tx view 2017-08-06 14:56:13 -07:00
sdtsui
966b25573b Move remaining debug, fonts, reset, and transitions into inverted triangle 2017-08-06 14:03:44 -07:00
sdtsui
186bcec4fb Lint menu-droppo 2017-08-04 13:31:18 -07:00
sdtsui
4d967ebea9 Bring menu-droppo component into project, remove as a dependency 2017-08-04 11:47:36 -07:00
frankiebee
fa3df576bc fixed: showing tx-s as errors vs. warning 2017-08-04 14:43:08 -04:00
sdtsui
781ac00eac Re-enable css transitions for dropdowns in header, needs menu-droppo library update 2017-08-04 11:31:07 -07:00
kumavis
29dcadc346 ui - dropdown - use Object.assign syntax to appease coverage parser 2017-08-03 21:32:08 -07:00
sdtsui
777eb865df Adjust padding of accountSwitcher dropdown 2017-08-03 20:03:48 -07:00
sdtsui
5ddb40f60c Adjust top and bottom padding of accountSwitcher 2017-08-03 19:23:22 -07:00
sdtsui
baee076348 Lint ui/app 2017-08-03 19:17:46 -07:00
sdtsui
6f14f4b717 Allow new accounts selector to handle clicks 2017-08-03 19:10:37 -07:00
sdtsui
28fd016d12 Increase size of accountSelection dropdown 2017-08-03 19:08:36 -07:00
sdtsui
36d8c3dd39 Increase size of settings dropdown and account settings dropdown 2017-08-03 18:55:11 -07:00
sdtsui
086441e41c Increase size of network dropdown 2017-08-03 18:50:29 -07:00
sdtsui
4d6a289629 Add note with previous fa-angle-down for future refactor 2017-08-03 17:50:00 -07:00
sdtsui
aff213e845 Position account switcher icon back in app header 2017-08-03 17:49:23 -07:00
sdtsui
ecb09fcc0a Disable account selection dropdown from account details 2017-08-03 17:08:19 -07:00
Kevin Serrano
77908e1181
Fix wonky widths for notices. 2017-08-03 16:30:57 -07:00
Kevin Serrano
b4f621c980
Add maximum width for private key reveal 2017-08-03 16:00:44 -07:00
Kevin Serrano
6176a4b1bf
Add QR functionality 2017-08-03 15:32:44 -07:00
kumavis
da16f39626 Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:05:32 -07:00
kumavis
da7471e095 lint fixes 2017-08-03 14:48:19 -07:00
sdtsui
0171918407 Add rough layout for flat layout tx details, add notes for breakpoints 2017-08-03 01:17:27 -07:00
sdtsui
267d12646c Implement 'clear buttons' for tx view 2017-08-03 00:43:24 -07:00
sdtsui
3ed81847d1 Isolate routing logic for isUnlocked, remove stray logs 2017-08-03 00:01:38 -07:00
sdtsui
01788376d5 Finalize height for main screens, excluding sidebar 2017-08-02 23:07:35 -07:00
sdtsui
9ebdc343aa Implement custom sidebar, with close button 2017-08-02 14:17:58 -07:00
sdtsui
dfa10763e3 Integrate slideout menu with tx view 2017-08-02 13:32:02 -07:00
sdtsui
7767f9f7ad Hook up responsive sidebar 2017-08-02 13:03:36 -07:00
sdtsui
22b03c62e6 Add burger icon and phone-visible media queries 2017-08-02 12:29:07 -07:00
sdtsui
41c585c796 Make wallet view visible iff vw above 575px 2017-08-02 12:18:29 -07:00
kumavis
4115c25d8f lint fix 2017-08-01 13:21:02 -07:00
sdtsui
6f4bee4599 Hook up send button to Send Token screen 2017-07-31 23:21:11 -07:00
sdtsui
a7fc512650 Implement mobile-friendly responsive layout with flex wrap 2017-07-31 23:07:58 -07:00
sdtsui
caab0b61cc Add rough layout for tx list items 2017-07-31 22:00:18 -07:00
sdtsui
ce06fbd36d Add tx-view content divider component 2017-07-31 21:34:37 -07:00
sdtsui
c7ace5b23d Add hyperscript for tx-view tabs 2017-07-31 21:27:37 -07:00
sdtsui
c876428044 Add TxView, use width percentages instead of flex-grow for layout 2017-07-31 21:16:07 -07:00
sdtsui
92bd783e0c Adjust button styles to left align with wallet text 2017-07-31 20:54:04 -07:00
sdtsui
3797b9921f Adjust popup size to 545x450; refactor wallet view to fit 2017-07-31 20:22:15 -07:00
sdtsui
0c1aea97c7 Isolate wallet-content-display component 2017-07-30 22:30:55 -07:00
sdtsui
7d4927c975 Add layout for Buy and Send buttons 2017-07-30 22:25:20 -07:00
sdtsui
610d6da8ae Add hyperscript for wallet display component 2017-07-30 22:10:59 -07:00
sdtsui
0ca50dfb1b Center account name and dropdowns 2017-07-30 21:53:13 -07:00
sdtsui
ddbf5613b3 Add note for later on isolating components 2017-07-30 21:35:41 -07:00
sdtsui
cbd53d4601 Add containers for wallet view and dropdown UI 2017-07-30 21:25:32 -07:00
sdtsui
a7ab69b940 Adjust button styles for Send Token screen 2017-07-30 16:47:47 -07:00
sdtsui
97cb25c9f1 Adjust copy in send token confirmation screen 2017-07-29 23:11:11 -07:00
sdtsui
9373ba9f38 Move action buttons out of send token container, tweak styles 2017-07-29 23:09:49 -07:00
sdtsui
f368f371c2 Simplify btn-green colors 2017-07-29 23:02:04 -07:00
sdtsui
689f60d1ce Add rounded background to total token, with minor styling tweaks 2017-07-29 22:44:39 -07:00
sdtsui
4880ee26d5 Add note to self, for future code cleanup 2017-07-29 22:20:29 -07:00
sdtsui
abc78a1bf9 Add content boxes to pendingTx, prep for reusability 2017-07-29 22:18:26 -07:00
sdtsui
35ff4c195c [WIP] Isolate form logic from rest of confirmation UI 2017-07-29 20:55:55 -07:00
sdtsui
2a5f2c7f40 Add responsive container; add send token copy 2017-07-29 17:38:29 -07:00
sdtsui
24d375aaf1 Fix dropdown toggle behavior - account dropdowns 2017-07-28 15:31:07 -07:00
Dan Finlay
87c26eb5bc Correct token pluralization for one token 2017-07-27 18:07:42 -07:00
Dan Finlay
8ba32d5ea8 Set min gas price to 1 gwei 2017-07-27 14:58:51 -07:00
Dan Finlay
9a1cf2a0d4 Ensure loading indication is full screen 2017-07-27 14:15:56 -07:00
Dan Finlay
56496f1ea0 Fix loading indication placement 2017-07-27 14:13:53 -07:00
Dan Finlay
bc65484e1b Remove object spread syntax 2017-07-26 15:11:32 -07:00
Dan Finlay
8fc0a025f6 Set initial scale for mobile. 2017-07-26 14:36:22 -07:00
sdtsui
8006d798ee Re-center network dropdown 2017-07-26 13:02:08 -07:00
sdtsui
4c0f827946 Make account selection dropdown menu scrollable when too large for view 2017-07-26 12:43:18 -07:00
sdtsui
0fdbb80962 Remove Account Settings item from optionsMenu, unnecessary 2017-07-26 12:31:08 -07:00
Dan Finlay
0ea6749dbc Lots of flex rearrangement on account detail view 
Includes removal of ReactCssTransitionGroup for a simpler UI refactor.
 2017-07-25 18:25:56 -07:00
Dan Finlay
a22adec66f Replace ui with responsive-ui 2017-07-24 17:05:07 -07:00
Dan Finlay
a41e5788cf Merge branch 'master' into NewUI 2017-07-20 12:39:06 -07:00
Dan Finlay
86d367957f Move responsive ui into its own folder for easier merges 2017-07-20 12:38:38 -07:00
Dan Finlay
51c5bebdf5 Lowered minimum gas price to 1 gwei 2017-07-19 11:44:00 -07:00
Dan Finlay
52a6b9f103 Reenable Default Token List 
Looks pretty clear to me now that the heavy traffic spike was not this feature, but was the EOS crowdsale. Now that we've mitigated their traffic spike, I think we can safely re-introduce this feature.
 2017-07-05 10:30:48 -07:00
Dan Finlay
5eb3d5d485 Make folder for responsive UI 2017-07-03 15:39:25 -07:00
Dan Finlay
4e4d6cea40 Add menu carrat next to network searching indicator 2017-07-03 15:06:26 -07:00
Thomas Huang
7de87154e8 Merge branch 'master' into NoPopularTOkens 2017-06-30 10:55:01 -07:00
Dan Finlay
0c011d0fda Remove send button 
Some token precisions are not respected by TokenFactory, so it's not sufficient for a default send form. Removing for now.
 2017-06-30 10:28:27 -07:00
Dan Finlay
8abd592034 Stop loading popular tokens by default 
Improves performance when loading the token tab.
 2017-06-30 10:26:45 -07:00
Kevin Serrano
ca3de2dc74 Merge pull request #1700 from MetaMask/StyleImprovements 
Add padding to token messages
 2017-06-29 14:45:00 -07:00
frankiebee
5e8b4e3226 change “ACCEPT” to “SUBMIT” 2017-06-29 12:06:22 -07:00
Dan Finlay
c81a3c649a Add padding to token messages 2017-06-28 16:36:58 -07:00
Thomas Huang
bd523102fe Merge pull request #1634 from MetaMask/i784-SendTokenButton 
Add send token button (link to TokenFactory)
 2017-06-28 10:09:58 -07:00
Thomas Huang
ffd3773ef3 Merge pull request #1620 from MetaMask/i1616-AddTokenAdding 
Add ability to add tokens to token list
 2017-06-28 10:07:49 -07:00
Dan Finlay
ed08e736d7 Merge pull request #1675 from MetaMask/warning-fixes 
React Warning Fixes
 2017-06-27 15:29:26 -07:00
Dan Finlay
40223687ae Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton 2017-06-27 15:08:29 -07:00
Dan Finlay
5440ed23d6 Support other network links 2017-06-27 14:53:27 -07:00
Kevin Serrano
9962a3068b
Change disabling button as state property. 2017-06-26 15:57:46 -07:00
Kevin Serrano
615b8d05a1
Prevent users from accidentally submitting two transactions by disabling button. 2017-06-26 15:47:53 -07:00
Kevin Serrano
f925a37a9f
Fix react warning for keys on ens address book 2017-06-26 14:01:35 -07:00
Dan Finlay
58e993ff29 Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton 2017-06-24 02:42:03 -04:00
Dan Finlay
b04d1de447 Merge branch 'master' into i784-SendTokenButton 2017-06-23 11:00:58 -04:00
Dan Finlay
06706f6e1b Merge branch 'master' into i1616-AddTokenAdding 2017-06-23 08:50:44 -04:00
Dan Finlay
027394b205 Reduce token list clutter by only showing held tokens 
We could change this when we allow hiding/removing tokens, but for now, this is a simple and pleasant solution.
 2017-06-20 08:58:25 -07:00
Dan Finlay
97ab48ba0d Fix propagation 2017-06-20 08:01:00 -07:00
Dan Finlay
a2781df8b4 Add better event lifecycle management to token list. 
Token list now renders errors when a token lookup fails.
Also now cleans up event listeners when re-initializing the token list.
 2017-06-19 19:11:55 -07:00
Dan Finlay
60855b0510 Add send button to TokenFactory 
A simple solution to a temporary token send screen: Linking to EtherScan.

Will hold us over until we make our own token send view.
 2017-06-19 19:02:13 -07:00
Dan Finlay
48789f2a3d Add ability to add tokens to token list 
Fiex #1616
 2017-06-15 16:22:53 -07:00
Dan Finlay
c4f6176820 Merge branch 'AddTokenList' into AddingTokens 2017-06-15 14:00:28 -07:00
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