Commit Graph

2148 Commits

Author SHA1 Message Date
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 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 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 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 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
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