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

2474 Commits

Author SHA1 Message Date
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
b014133fdc development - screens - use localhost for network 2018-03-30 11:16:08 -07:00
kumavis
5f1f345a5d network - use providerType for localhost 2018-03-30 10:59:39 -07:00
kumavis
fcdfd48057 development - screenshotter - capture screens across all locales 2018-03-30 00:48:37 -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
ad603da2e7 Stopping wrapping provider children in div; stop wrapping old-ui in provider. 2018-03-29 20:16:45 -02:30
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
085e7d7dec ui - fix typo in settings 2018-03-28 23:19:07 -07:00
kumavis
ac4cb3444d ui - add guard against unset locale 2018-03-28 23:11:41 -07:00
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
kumavis
8760dc6bda ui - use relative url for i18n-helper fetching locales 2018-03-28 21:53:08 -07:00
kumavis
f7b4c9621f ui - css - use relative path for fonts 2018-03-28 14:42:58 -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
kumavis
00952c899b
Merge pull request #3745 from danjm/i3723-fix-long-token-ammounts 
Long token amounts in wallet are truncated with ellipsis.
 2018-03-27 19:08:41 -07:00
kumavis
cdf5183f87
Merge pull request #3742 from danjm/i3705-prefix-to-address-with-0x 
Prefixes to addresses with 0x before sending.
 2018-03-27 19:08:22 -07:00
kumavis
c84f0ac7bc
Merge pull request #3741 from MetaMask/i3692-addtoken-address-undefined 
Prevent users from adding custom token if decimals is an empty string.
 2018-03-27 19:07:23 -07:00
kumavis
ff26042b0c ui - actions - fix log for background call 2018-03-27 18:21:46 -07:00
kumavis
1a5eccdfc0 ui - settings - fix for currentLocale 2018-03-27 18:21:22 -07:00
kumavis
e3881143cb ui - settings - derrive locales from index 2018-03-27 18:10:13 -07:00
Dan
8e6ab7df05 Checking for sufficient balance in confirm ether screen; includes error messages for user. 2018-03-27 22:38:04 -02:30
Dan
2053cac691 Don't query for undefined. 2018-03-27 21:35:12 -02:30
Dan
be2254b880 Remove comments and console.logs 2018-03-27 10:37:45 -02:30
Dan
d2bd5687e8 Merge branch 'master' into i18n-translator-redux 2018-03-27 10:17:48 -02:30
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
Dan
252d692282 Prefixes to addresses with 0x before sending. 2018-03-27 04:41:23 -02:30
Dan
f2ab3a06b1 Long token amounts in wallet are truncated with ellipsis. 2018-03-27 04:40:46 -02:30
Dan
91f91d92fe Prevent users from adding custom token if decimals is an empty string. 2018-03-27 03:11:55 -02:30
Thomas Huang
e001c0900b
Merge pull request #3680 from danjm/i3517-popup-newui-onboarding 
Popup uses new ui onboarding when in beta.
 2018-03-26 14:55:50 -07:00
Thomas Huang
b0fae2ca39
Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate 
Updates Add token screen to latest design.
 2018-03-26 14:55:30 -07:00
Dan
1779cff65b Merge branch 'master' into i3326-addtokenscreendesignupdate 2018-03-26 16:51:02 -02:30
Thomas Huang
a6af5fad96
Merge pull request #3695 from danjm/i3379-signtypedata-overflow 
Signed type data notification handles long messages.
 2018-03-26 12:11:16 -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
c710fb8f50 Use new header on add token confirmation screen. 2018-03-25 15:17:10 -02:30
Dan
fa022e0883 Updates Add token screen to latest design. 2018-03-24 01:13:43 -02:30
Dan
0d71dd7ca0 i18n helper fetchLocale handles 404 gracefully 2018-03-23 14:31:15 -02:30
Dan
08e67c4e4a Default current locale in metamask reducer to empty string. 2018-03-23 14:29:59 -02:30
Dan
11a30378d7 Memoize t function in metamask-connect 2018-03-23 14:21:32 -02:30
Dan
07f4839600 Signed type data notification handles long messages. 2018-03-22 16:49:07 -02:30
Dan
6393c38117 Pop uses new ui onboarding when in beta. 2018-03-22 14:29:18 -02:30
Dan
a0df4b6892 Correct proptypes for t in new-account/create-form.js 2018-03-22 12:36:13 -02:30
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
3c144302d6 Remove console.logs 2018-03-21 22:57:09 -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
kumavis
fd3e240dd9
Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplates 
I3571 complete i18n templates
 2018-03-20 12:40:16 -07:00
kumavis
1ab165b6d7
Merge pull request #3632 from MetaMask/retry-tx-refractor 
Retry tx refractor
 2018-03-20 12:11:50 -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
Dan
3830f49ac5 Take user home if an unapproved tx is dropped while they are viewing. 2018-03-20 15:52:45 -02:30
Thomas
4fc68ca208 Add i18n in settings/info 2018-03-20 10:56:35 -07:00
kumavis
5d316d9a4e
Merge pull request #3623 from MetaMask/i#3554 
new-ui - dont exclude `txParams.data` when editing and updating txParams
 2018-03-20 10:44:48 -07:00
Thomas
7a8e080245 Started on Tx list i18n 2018-03-20 10:29:22 -07:00
Thomas
cffaf44714 i18n Import flow 2018-03-20 09:49:12 -07:00
Dan
49e3ada382 Fix styling regression from master merge. 2018-03-20 13:28:59 -02:30
Dan
36b371283c Improve responsiveness of gas price row on confirm screen. 2018-03-20 12:41:03 -02:30
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
Alexander Tseung
4af1003b0e Fix Account Names being cropped (#3626) 2018-03-20 09:02:20 -02:30
Thomas
85a612b34d I18n add-token.js 2018-03-20 02:34:12 -07:00
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
frankiebee
faa4ffe163 new-ui - dont exclude txParams.data when editing and updating txParams 2018-03-19 14:32:58 -07:00
Dan Finlay
f5b0d56b9d Add send screen template 2018-03-19 12:38:14 -07:00
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 Finlay
293ca6c9a6 Add template for settings and info 2018-03-19 12:03:35 -07:00
Dan Finlay
2e7d4db2de Add recover and backup tempaltes 2018-03-19 11:43:22 -07:00
Dan Finlay
17371bb7ec Add login templates 2018-03-19 11:30:45 -07:00
Dan Finlay
e504bc6215 Add connecting indication templates 2018-03-19 11:28:02 -07:00
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
Dan
98f934fb53 Delete commented out code from i18n implementation that used globals. 2018-03-19 13:38:22 -02:30
Dan
3191f2aa5e Delete old i18n helper files. 2018-03-19 13:37:07 -02:30
Dan
a51e8f6a16 Fetch localeMessages in front end only. 2018-03-19 13:36:16 -02:30
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
Alexander Tseung
7fb27cf0c7
Update margins for consistency in first time flow (#3588) 2018-03-16 08:50:21 -07:00
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
eb5a84975b ui - settings - add option to set current locale 2018-03-14 17:11:41 -07:00
kumavis
34aeef50a0 i18n - load locales manually 2018-03-14 16:32:35 -07:00
Thomas Huang
e2efc91aee
Merge pull request #3558 from MetaMask/fix-two-translations 
Fix translations whose substitutions params were not in arrays.
 2018-03-14 13:00:42 -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 Finlay
fae6a44bac
Grammar correction 2018-03-14 09:34:25 -07:00
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
kumavis
a52ef7a06a ui - lint fix 2018-03-13 14:41:54 -07:00
kumavis
34fe88af8f
Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characters 
improved verification of restore from seed phrase
 2018-03-13 14:39:59 -07:00
Thomas
9bb7fa365d Remove windows.h from i18n.js 2018-03-13 11:15:10 -07:00
Thomas
b1871bf32d Add closing parens to appName 2018-03-13 11:04:41 -07:00
Thomas Huang
1d2cb46eff
Merge branch 'master' into i18n 2018-03-13 11:00:52 -07:00
kumavis
572234e383
Merge branch 'master' into i3033-responsive-newui-onboarding 2018-03-13 10:46:14 -07:00
kumavis
1fa5cec2ec
Merge pull request #3470 from danjm/newui-onboarding-fonts 
Change fonts in new-ui onboarding to Roboto, with weight 400.
 2018-03-13 10:44:08 -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
Dan
70f33d4747 Left align create password. 2018-03-12 20:17:44 -02:30
Thomas
23a8e24a1b Add loglevel and window.log to i18n.js 2018-03-12 11:40:03 -07:00
Alexander Tseung
08542c18e1
Update deposit ether styling (#3510) 2018-03-12 19:25:12 +01:00
Dan
0dad6db973 Styling fixes to welcome; hide network component on create password; shown welcoem in popup. 2018-03-12 14:33:45 -02:30
Thomas
208b3bc4c1 Add i18n back into JsonImportSubview 2018-03-12 08:07:12 -07: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
ab1b39f554
Remove de-selected token from selectedTokens hash instead of setting to null (#3494) 2018-03-09 16:31:53 +01:00
Alexander Tseung
d84341f323
Add empty object default value for tokenData (#3493) 2018-03-09 16:31:17 +01:00
Alexander Tseung
4b2e52795d
Explicitly define state in import account from json component (#3491) 2018-03-09 16:30:31 +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
91c890041c Add welcome screen to new-ui browser first time flow. 2018-03-08 14:21:54 -03:30
Alexander Tseung
cbb65cc493
Fix flashing to Log in screen after logging in or restoring from seed phrase (#3466) 2018-03-08 16:29:29 +01:00
Dan
09dae760bc Correct caps of Send button on main screen. 2018-03-07 22:47:29 -03:30
Dan
6c400c2e92 Update first time flow button fonts, and first-time-flow default font, to Roboto. 2018-03-07 22:37:53 -03:30
Dan Finlay
f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification 
Add seed phrase verification script into background process
 2018-03-07 16:47:13 -08:00
Dan J Miller
ca047b1ea0
Update network colours for better accessibility. (#3469) 2018-03-07 15:22:10 -03:30
Dan
b8dec68271 Make new-ui create password screen responsive. 2018-03-07 12:47:33 -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
kumavis
8e0131cbb5
Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording 
Replace Lock wording with Log Out / Log In
 2018-03-06 17:12:32 -08:00
Dan
9d215bab0f Merge branch 'master' into i18n 2018-03-06 20:45:45 -03:30
Dan Finlay
f06bca1151 Implemented feedback to make i18n work on mac 2018-03-06 15:32:35 -08:00
Dan Finlay
9762a73041
Merge pull request #3433 from danjm/i3087-shapeshift-split-undefined 
Shapeshift form handles 'market info unavailable' errors.
 2018-03-06 15:07:51 -08:00
Dan Finlay
52b4876cf9
Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit 
Gracefully handle null token balance in new ui send.
 2018-03-06 15:05:43 -08:00
Dan Finlay
31e7d9263f
Merge pull request #3444 from danjm/i3348-minus-not-a-number 
Prevent user from selecting max amount until gas is estimated.
 2018-03-06 15:05:25 -08:00
Dan Finlay
cb4ad60800 Merge branch 'master' into i2475-UnifyLogInWording 2018-03-06 14:57:01 -08:00
Dan Finlay
b87687110d Replace Lock wording with Log Out / Log In 
Fixes #2475
 2018-03-06 14:51:26 -08:00
Dan J Miller
5ac330a89e
Default add-token decimal value to string (#3451) 2018-03-06 15:15:26 -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
Alexander Tseung
5f8a632fec
Fix seed phrase validation clearing form (#3417) 
* Fix seed phrase validation clearing form

* Make new ui import seed error feedback live, and allow newlines with and without carriage returns.
 2018-03-06 09:14:57 -08:00
Dan
462d57cb6a Gracefully handle null token balance in new ui send. 2018-03-06 00:23:29 -03:30
criw
b393b54e35 FIX #3440 improved verification of restore from seed phrase 2018-03-06 04:43:12 +01:00
Dan
68604b53dd Prevent user from selecting max amount until there is an estimated gas total. 2018-03-05 23:12:06 -03:30
Dan J Miller
1bd18cebd7
Fixes shapeshift coin selection dropdown. (#3416) 2018-03-05 13:33:46 -03:30
Csaba Solya
2b86d65d0c verify seedwords on log in 2018-03-03 22:08:10 +01:00
Thomas Huang
d3a0a27c0c
Merge branch 'master' into ImportAccountMessageV2 2018-03-02 18:26:52 -08:00
Thomas
ee254b4f6f Import Account disclaimer 2018-03-02 18:24:09 -08:00
Thomas
6f8077f587 Swap color scheme for import account label 2018-03-02 18:23:27 -08:00
Dan J Miller
0d97ff2210
Fix NewUI reveal seed flow. (#3410) 2018-03-02 22:44:05 -03:30
Dan J Miller
0c163dcb32
Allow adding 0 balance tokens in old ui and editing custom token info in new (#3395) 
* Shows tokens with 0 balance in old ui; goHome after adding tokens.

* Allow users to edit custom token info when not autofilled. (New UI add token screen).
 2018-03-02 19:07:25 -03:30
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
Kevin Serrano
923c702164
Merge pull request #3356 from MetaMask/cdn-minimization 
Check in all font files locally.
 2018-03-01 12:30:03 -08:00
Dan
94a60fe4a9 Correct ttf format name to 'truetype' 2018-03-01 16:36:27 -03:30
kumavis
46d94a241c
Merge pull request #3359 from MetaMask/token-check-url 
[new-ui] add token - check for logo url before trying to use
 2018-02-28 14:55:42 -08:00
kumavis
40537f9290 add token - check for logo url before trying to use 2018-02-28 14:04:32 -08:00
Kevin Serrano
d45116824c
Check in all font files locally. 2018-02-28 13:03:46 -08:00
kumavis
6c472b73eb
Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvements 
[NewUI] Onboarding flow style improvements
 2018-02-28 12:40:14 -08:00
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
Thomas
50f20358c1 Add import account disclaimer 2018-02-27 12:01:09 -08:00
Dan
0739d3507b Adds beta label to Metamask name in full screen app bar. 2018-02-27 14:13:05 -03:30
Dan
def369ba07 Move beta warning to app header. 2018-02-27 14:13:05 -03:30
Dan
746c3e5f18 Body width container in first time flow is consistent with app bar. 2018-02-27 14:12:45 -03:30
frankiebee
b24d949ca4 fix feature flags being undefined 2018-02-26 10:55:30 -08:00
Thomas Huang
84c023ba40 Use same logic for downloading state logs in the old/uat 2018-02-20 19:52:32 -08:00
Dan
66f55f954e Render loading inside notice screen, and don't set isLoading from unMarkPasswordForgotten. 2018-02-20 20:52:41 -03:30
Dan Finlay
a1b72e5252 Try fixing notice screen synchronous state call 2018-02-20 13:51:06 -08:00
Dan
c26e0d555b Fix Import Existing DEN in popup New UI first time flow. 2018-02-19 22:46:18 -03:30
Dan J Miller
81eb5c8796
Ensures that mascara initialize screen is not shown in popup. (#3279) 2018-02-16 19:21:16 -03:30
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 J Miller
170c7602b7
[NewUI] Adds the mascara first time flow to betaUI extension (#3257) 
* Adds the mascara first time flow to the extension when opened in browser.

* Fix tests after addition of mascara first time flow to new ui.
 2018-02-16 06:15:09 -03:30
Dan J Miller
eb61f69f92
Merge pull request #3231 from danjm/MM-744-restore-from-seed-fix 
[NewUI] Only open a new window on restore from seed if in extension view.
 2018-02-13 15:32:29 -03:30
Dan
5e9dc74a59 Remove isInBrowser method and use environment-type.js 2018-02-13 15:20:24 -03:30
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
b5b16e4ce0 Only open a new window on restore from seed if in extension view. 2018-02-13 15:19:53 -03:30
Dan Finlay
96d40ee618
Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screens 
[NewUI] Try beta link on unlock and privacy screens.
 2018-02-13 19:28:49 +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
Dan J Miller
e4c83466be Send screen style updates. (#3234) 2018-02-12 22:39:15 -08:00
Dan J Miller
fe2ed68f11 Remove chrome focus outline for mouse users. (#3230) 2018-02-12 09:45:53 -08:00
Alexander Tseung
72ffa2c3f5 Fix react-router related exceptions 2018-02-09 12:05:27 -08:00
Alexander Tseung
ef0bbb291d Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 21:46:19 -08:00
Dan
bb79fb354b Try beta link on unlock and privacy screens. 2018-02-08 22:47:32 -03:30
Alexander Tseung
7f70943fa2
Fix exception thrown in selected token tx list with shapeshift txs (#3215) 2018-02-08 17:37:22 -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
Dan J Miller
f39222c9af
Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019 
[NewUI] Merge uat to uatnext feb072019
 2018-02-08 12:20:04 -03:30
Alexander Tseung
e9c2c0eec1
Make blockies icon round to match identicons (#3205) 2018-02-07 18:46:27 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan J Miller
7f151b861c
[NewUI] Opens to full screen when restoring from seed. (#3201) 
* Opens to full screen when restoring from seed.

* Remove redundant parameter in actions.markPasswordForgotten call.
 2018-02-07 21:08:55 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
8b90b1d1b1 Remove accessing PropTypes from main React package 2018-02-06 22:03:37 -08:00
Alexander Tseung
9db0a32dac
Update modal header design on send screen (#3196) 2018-02-06 21:07:00 -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
Thomas
10e75dc4dd Scrollable Settings screen for Firefox 2018-02-01 14:53:43 -08:00
Alexander Tseung
2fd9e58e61 Fix lint errors 2018-02-01 14:13:08 -08:00
Dan
f38675c9ac Checks if there is currently a send in progress before redirecting to default in conf-tx 2018-01-31 18:26:26 -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
Frankie
0b4e3c5d6a
Merge pull request #3161 from MetaMask/AddResetExplanation 
Add reset explanation
 2018-01-31 14:49:29 -08:00
Dan Finlay
86d56419f4 Add explanation of account resetting 2018-01-31 14:31:56 -08:00
Dan Finlay
4f61029177 Remove unused file 2018-01-31 14:20:59 -08:00
Frankie
1a93b1ade2
Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs 
Set address to default with empty string, add test validation.
 2018-01-31 14:18:47 -08:00
Dan J Miller
971112d413 [NewUI] Updates capitalization and alignment for the import account screen. (#3122) 
* Updates capitalization and alignment for the import account screen.

* Align elements in import form.
 2018-01-31 13:41:13 -08:00
Dan J Miller
8378445112 [NewUI] Set default new account name as placeholder, but not value (#3121) 
* Set default new account name as placehold, and not value, in new account create screen.

* Set new account number in create-form.js in constructor.
 2018-01-31 13:40:14 -08:00
Bruno Barbieri
e6fda855a5 added reset account feature 2018-01-31 03:33:15 -05:00
Dan Finlay
11a944719f Add warning when importing no valid file 
Fixes #3089
 2018-01-30 15:11:05 -08:00
Thomas
c2cef0f815 Set address to default with empty string, add test validation. 2018-01-30 13:26:37 -08:00
Dan J Miller
100642c0ea Fix bug stemming from erroneously persistant unlock failure error message. (#3123) 2018-01-29 18:44:43 -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
f673c2a8a4 pass linter, update ui test 2018-01-28 00:20:56 -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
Thomas Huang
a9ecf9c6fc
Merge branch 'master' into uat 2018-01-23 10:55:21 -08:00
Nick Doiron
bad70eb1b3 first steps to i18n 2018-01-22 23:48:03 -10:00
Thomas
ce0de5feed String interpolate version in settings 2018-01-22 16:09:23 -08:00
Chi Kei Chan
338ebe5f40
Merge pull request #3049 from chikeichan/newmaster 
Merge master to uat
 2018-01-19 15:58:26 -08:00
Dan
c554e52e82 Get version from manifest instead of hard coding in New UI info page. 2018-01-19 15:31:11 -08: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
853e7f8420 Fix lint errors 2018-01-17 18:50:18 -08:00
frankiebee
8bb57f33b1 add a x close button to gas calc loding screen on conf-tx 2018-01-17 18:47:56 -08:00
Alexander Tseung
f8bf8cb527 Update popout to fullscreen icon 2018-01-17 17:56:18 -08:00
Dan
fdaf6eacb2 Show now tokens by default and improve search on add token screen. 2018-01-17 13:52:59 -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
Chi Kei Chan
b80ed2c451
Merge pull request #3007 from alextsg/uat-master-011618 
[NewUI] Merge master into uat branch
 2018-01-17 13:48:16 -08:00
Thomas
8c792ba3ee Add network-indicator classname to network loading spinner 2018-01-17 10:51:23 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -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
Dan J Miller
668aab11d1 Vertically centers the text of the new ui modal header. (#2987) 2018-01-16 12:15:18 -08:00
Dan J Miller
d7a1019a2c Adding one or more tokens sets the selected token before returning the user to the main screen. (#2995) 2018-01-16 12:14:03 -08:00
Dan Finlay
003b4a721c
Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight 2018-01-16 10:15:11 -08:00
Thomas Huang
27ca48b369
Merge pull request #2984 from MetaMask/RenameLockToLogout 
Rename lock to log out
 2018-01-16 09:48:23 -08:00
Dan
a4fd4f013f Restore display of all unconfirmed transactions. 2018-01-15 18:32:25 -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 Finlay
0121892141
Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight 2018-01-15 16:15:50 -08:00
Dan Finlay
58be1742e1 Rename lock to log out 
Fixes #2475
 2018-01-15 16:04:49 -08:00
Frankie
f18ed8bfd4
Merge branch 'master' into open-popup 2018-01-15 15:25:14 -08:00
Dan Finlay
85b2012106
Merge pull request #2964 from alextsg/cb-505c 
[NewUI] Move blockies option to the bottom of Settings
 2018-01-15 13:55:43 -08:00
Dan J Miller
aa833a0928 [NewUI] Place all users of extension into old UI (disable auto adding). (#2946) 
* Place all users of extension into old UI (disable auto adding).

* Fix lint errors.
 2018-01-15 13:23:44 -08:00
Alexander Tseung
27cbfa44c3 Move blockies option to the bottom of Settings 2018-01-14 21:39:40 -08:00
frankiebee
d5c311b13e add a loading spinner to conf-tx view 2018-01-14 13:56:54 -08:00
Alexander Tseung
b42baacdf4 Fix confirm Add Token button order 2018-01-12 17:07:10 -08:00
Alexander Tseung
dce6dcf437 Fix Add Token button order, styling 2018-01-12 17:07:10 -08:00
Dan
2bc85ea72f Fix input box padding and select highlight in new account create and import page. 2018-01-12 13:42:51 -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
Alexander Tseung
bdcee058dc Fix styling in initialization 2018-01-12 13:39:26 -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
Dan Finlay
429db74508 Use https 2018-01-12 11:03:03 -08:00
Alexander Tseung
0f4bfcb02e Fix token balance color 2018-01-11 17:12:58 -08:00
Alexander Tseung
b35e4e0264 Fix lint errors 2018-01-11 17:06:30 -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
Dan J Miller
7c97b2f37c Fix padding of a hovered tx-list-item (#2859) 2018-01-11 09:21:41 -08:00
tmashuang
be604391d0 Add max height for Firefox addon overflow and hide horizontal scroll 2018-01-10 21:56:07 -08:00
tmashuang
60a52b2608 Add one px to address for Firefox clipping 2018-01-10 21:54:43 -08:00
Alexander Tseung
208e94d3bf Update main view styling 2018-01-10 21:09:09 -08:00
Dan Finlay
e5b34b3d04
Update support links for helpscout 2018-01-09 14:09:29 -08:00
kumavis
096fb226a6
Merge pull request #2855 from abitrolly/patch-2 
info.js  Remove width element to fix email layout
 2018-01-09 07:25:24 -08:00
Kevin Serrano
0cf5c22178
Merge pull request #2851 from MetaMask/i2812-seedworderrorfix 
Fix condition where failing seed word checks would infinite-spin future attempts.
 2018-01-08 11:43:43 -08:00
kumavis
ade1c404bd ui - fix font path name 2018-01-08 09:44:11 -08:00
Anatoli Babenia
5312ed9a20
info.js Remove width element to fix email layout 2018-01-04 17:10:40 +03:00
Kevin Serrano
20aa135ad8
Add fix for infinite spinner for incorrect seed phrase. 2018-01-03 16:06:46 -08:00
Alexander Tseung
be398500de
Merge pull request #2848 from MetaMask/NewUI-flat 
[NewUI] Merge NewUI-flat into uat
 2018-01-03 13:24:17 -08:00
Alexander Tseung
a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
oosthuizenr
1da385f78b
fix comment 2018-01-02 21:29:26 +02:00
Renier Oosthuizen
4a598fc7ac Fixes #2834 2018-01-02 21:07:48 +02:00
Kevin Serrano
e682fb05fc
Add frontend validation to ensure that ether inputs are valid. 2017-12-27 18:22:10 -08:00
Kevin Serrano
92eb16fc11
Add frontend validation to check if send ether input is a valid number. 2017-12-27 17:36:56 -08:00
Kevin Serrano
3e562f1a1e
Add backend fix for util in normalizeethstringtowei. 2017-12-27 17:31:38 -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
Alexander Tseung
a218008adf
Track usage of old and new UI (#2794) 
[NewUI] Track usage of old and new UI
 2017-12-22 10:43:02 -08:00
Dan J Miller
4acd48966e [NewUI] Fixes tests and sends user to NewUI after registering. (#2788) 
* Fixes tests and sends user to NewUI after registering.

* Karma config?

* Empty commit

* Remove unneeded json state mock file.
 2017-12-21 19:03:01 -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
e7e1b7a951 Clone transaction while editing instead of mutating object from state. 2017-12-20 17:37:18 -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 J Miller
bccbf14b39 [NewUI] Hide UI toggle in mascara (#2772) 
* Hides old-UI on mascara.

* Improve code clarity in select-app.js
 2017-12-20 10:22:50 -08:00
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
d9ea2df6c2 Add route for Mascara confirm seed 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