1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

6848 Commits

Author SHA1 Message Date
Dan
d12bb8c14f Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask-extension into i3725-refactor-send-component- 2018-05-31 15:29:17 -02:30
Dan
5091b03e4b Merge branch 'develop' into i3725-refactor-send-component- 2018-05-31 15:28:03 -02:30
Dan J Miller
15f4ce352d
Merge pull request #4386 from MetaMask/i4077-replace-currency-input-with-numeric-input
Replace currency-input.js with NumericInput
2018-05-31 15:09:13 -02:30
Alexander Tseung
cc73d869fe Add new alert modals 2018-05-31 10:37:52 -07:00
Alexander Tseung
f4d833cb09 Change btn-secondary styles to btn-default. Make btn-secondary red warning style buttons 2018-05-31 10:37:52 -07:00
Dan
3745c1ea4f Fix send amount field select in send-new-ui integration test. 2018-05-31 14:53:38 -02:30
Dan
990b69c655 Improve input width calculation in currency-display.js 2018-05-31 13:47:18 -02:30
Dan
704ba54bef Fix send-new-ui gas fee display expectation. 2018-05-31 13:47:09 -02:30
Dan
67c74cd5b6 Fix currency display send integration tests. 2018-05-31 12:07:23 -02:30
Dan
6d8344d0d0 Update amount error on update of send screen. 2018-05-30 20:51:46 -02:30
kumavis
39d22a4ddb
Merge pull request #4419 from MetaMask/deps-bump-keyring-controller
deps - bump eth-keyring-controller for bugfix
2018-05-30 14:57:44 -07:00
kumavis
b69da50095 deps - bump eth-keyring-controller for bugfix 2018-05-30 14:29:14 -07:00
Alexander Tseung
389346913b
Prevent loading screen from overlaying the app bar (#4417) 2018-05-30 10:38:53 -07:00
kumavis
b5c91d240b
Merge pull request #4407 from MetaMask/e2e-test
Adds account in e2e test
2018-05-30 10:12:20 -07:00
Alexander Tseung
d40971e7f3
Fix error handling on incorrect password (#4401) 2018-05-30 09:23:31 -07:00
Dan
5347319dff Fix setting of token balance on account switch in send screen from field. 2018-05-30 13:35:01 -02:30
Thomas
be6776897f Delay before getting address text 2018-05-29 23:07:45 -07:00
kumavis
f5fb06020d
Merge pull request #4402 from MetaMask/danjm-changelog-update-52918
Update changelog
2018-05-29 22:35:47 -07:00
Thomas
54ccf5e930 Merge branch 'develop' into e2e-test 2018-05-29 22:34:17 -07:00
kumavis
77c55ecd83
Merge pull request #4403 from MetaMask/bugfix-keyring-controller
deps - bump eth-keyring-controller + update package-lock
2018-05-29 22:31:58 -07:00
kumavis
73afb263cb ci - job-screens - use e2e funcs 2018-05-29 22:13:58 -07:00
kumavis
4789e981c2
Merge pull request #4374 from MetaMask/test-unit-fail-on-only
test - unit - fail if tests contain a .only call
2018-05-29 21:40:28 -07:00
Alexander Tseung
a19b911feb
Add rpc key to i18n messages (#4375) 2018-05-29 18:31:32 -07:00
Thomas
f90ad6191c Add account 2018-05-29 18:20:54 -07:00
Dan
7f23e017b2 Delete currency-input.js 2018-05-29 22:21:55 -02:30
Dan
2e1d962b1a Remove currency input from input-number 2018-05-29 22:15:21 -02:30
kumavis
d6965c7cdb deps - bump eth-keyring-controller + update package-lock 2018-05-29 17:38:00 -07:00
Dan J Miller
e3cc89cc7b
Update changelog 2018-05-29 21:59:53 -02:30
kumavis
ff6976b8a5
Merge pull request #4399 from MetaMask/merge-master
Pull master changes back into develop
2018-05-29 16:47:30 -07:00
kumavis
4205d92729 Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master 2018-05-29 16:12:36 -07:00
kumavis
219cb83d94
Merge pull request #4394 from MetaMask/MissionStatement
Add mission statement v1
2018-05-29 14:32:05 -07:00
Dan
f33bb3e2fd Stop using external NumericInput component. 2018-05-29 16:25:03 -02:30
kumavis
39069710d1
Merge pull request #4390 from MetaMask/i18n-brave-fix
i18n - getFirstPreferredLangCode - guard against missing i18n api
2018-05-29 11:05:12 -07:00
kumavis
5fc24930a7
Merge pull request #4384 from antonper/master
UI Errors stack cleaned
2018-05-29 11:04:08 -07:00
Alexander Tseung
41e38fe553
Add notification for dropped retry transactions (#4363) 2018-05-29 10:23:06 -07:00
Alexander Tseung
e3c9629130
Fix add-token token list placeholder width (#4365) 2018-05-29 10:03:08 -07:00
Dan Finlay
1333cd470b Mission v2 2018-05-29 09:30:59 -07:00
Dan Finlay
344f0f2eea Add mission statement v1 2018-05-29 09:27:02 -07:00
Alexander Tseung
d1f5d8ccc6
Fix text field labels of first time flow. Add text fields to storybook (#4389) 2018-05-29 09:35:18 -05:00
Dan
ea28c8a437 Replaces currency-input.js with NumericInput 2018-05-29 09:21:54 -02:30
kumavis
c665fe191d
Merge pull request #4393 from MetaMask/newui-unlock-catch
newui - unlock - dont catch errors unrelated to tryUnlockMetamask
2018-05-28 23:52:19 -07:00
kumavis
76c5851df1
Merge pull request #4391 from MetaMask/newui-imported-accounts-select-fix
metamask-controller - update preferences controller addresses after import account
2018-05-28 23:51:59 -07:00
kumavis
a7b7c8f034 newui - unlock - dont catch errors unrelated to tryUnlockMetamask 2018-05-28 23:34:40 -07:00
kumavis
7e87600042
metamask-controller - lint fix 2018-05-28 23:14:38 -07:00
kumavis
09601439e3 metamask-controller - update preferences controller addresses after import account 2018-05-28 23:00:22 -07:00
kumavis
e3ecc94a52
i18n - getFirstPreferredLangCode - guard against missing i18n api
fix for brave
2018-05-28 21:50:23 -07:00
Anton
71a6e97327 cleanErrorStack moved to separate library module
more errors traces cleaned up
2018-05-28 22:57:08 +02:00
kumavis
12492aae60
Merge pull request #4373 from whymarrh/new-ui-e2e
Basic end-to-end (e2e) tests for the new UI
2018-05-28 09:17:22 -07:00
Anton
1d23a5c81b error message fix 2018-05-28 18:08:33 +02:00
Anton
62dc6e20eb Clean up user rejection error message 2018-05-28 17:57:45 +02:00