Commit Graph

2162 Commits

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