1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 19:10:22 +01:00
Commit Graph

8567 Commits

Author SHA1 Message Date
brunobar79
4dbc0926c6 test 2018-11-14 17:33:10 -05:00
brunobar79
517f6e656a test 2018-11-14 17:10:20 -05:00
brunobar79
59b089b5bb test 2018-11-14 17:01:39 -05:00
brunobar79
b54ed05306 try with custom box 2018-11-14 16:35:01 -05:00
Dan Finlay
22ba0b0c2d Resubmit approved transactions on new block (#5752)
* Add beginning of test

* Resubmit approved transactions on new block

May fix #4343 and related issues, where an error could leave
transactions stranded in the approved state.

* Remove unused test

* Re-approve transactions when retrying approved

* Add retry approved test

* Include approved in pending tx count

* Fix getPendingTxs()

* Linted

* Only throw hash error in submitted state

* Only check submitted txs for block inclusion

* Fix test expectations
2018-11-14 11:34:07 -10:00
brunobar79
b636d72add package-lock.json 2018-11-14 15:46:28 -05:00
brunobar79
18f39ef69e Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-11-14 15:42:45 -05:00
Paul Bouchon
f6e042b7b1 1102: use meta title if it exists before title 2018-11-14 10:43:10 -08:00
Alexander Tseung
46b29a50f0 Show APPROVED status for transactions that have been approved but not submitted 2018-11-13 17:37:01 -08:00
brunobar79
484aa6801e Merge branch 'develop' into trezor-v5 2018-11-13 17:21:15 -05:00
Paul Bouchon
0549782595
Update Balanc3 API (#5744)
* Update balanc3 API used in TokenRatesController

* Remove demo URL and use nativeCurrency when fetching token rates
2018-11-13 14:57:43 -05:00
Bruno Barbieri
3866222285 Update support links to zendesk (#5745)
* Fix loose accounts help link

* Update support site link
2018-11-13 14:42:36 -03:30
Micah Alcorn
bcbc020665 Repair link to reset instructions (#5733) 2018-11-13 13:54:53 -03:30
bobby dresser
da0510809b encourage stackexchange in issue templates (#5737) 2018-11-13 13:54:03 -03:30
PaddyMc
7ce2cf4572 Fixes #3425: Better support for batch transactions (#5437) 2018-11-13 13:49:12 -03:30
Filip Š
d943345151 Slovenian and slovak fixes (#5730)
* Fix Slovenian translation

* Add Slovak translation
2018-11-12 11:15:55 -05:00
Dan Finlay
da1036f2c4 Version 5.0.2 2018-11-09 20:03:18 -08:00
Paul Bouchon
c317624854 EIP-1102: Update publicConfig store concurrently with approval 2018-11-09 18:21:59 -08:00
Thomas Huang
782c2c14d4
Merge pull request #5674 from MetaMask/responsive-e2e-tests
e2e tests for responsive behaviour
2018-11-09 11:01:38 -08:00
Alexander Tseung
83ffb9fafe
Increase number of ETH decimals displayed in the balance view from 3 to 4 (#5710) 2018-11-09 10:17:42 -08:00
Noah I
8bed073f20 1102: Fix inpage listener syntax (#5708) (#5709) 2018-11-09 07:14:32 -05:00
Dan Miller
fd1647965f Moves e2e tests for extension only behaviour to metamask-beta-responsive-ui.spec 2018-11-08 07:59:32 -03:30
Dan Finlay
e53ceb6bc1 Version 5.0.1 (#5694) 2018-11-07 12:07:14 -05:00
Dan J Miller
0dd0d8fc83
Merge pull request #5547 from MetaMask/front-ends-deps-gulp-bundle
Bundle some ui dependencies separately to limit the build size of ui.js
2018-11-07 13:31:56 -03:30
bitpshr
718393f89a Cleanup 2018-11-07 08:47:25 -08:00
bitpshr
a224b71837 1102: use postMessage instead of injected scripts to bypass CSP 2018-11-07 08:47:25 -08:00
bitpshr
1ce3591c8e wip 2018-11-07 08:47:25 -08:00
Thomas Huang
0ab5c1c6e2
Merge pull request #5481 from MetaMask/reducers
tests/Reducers
2018-11-06 20:56:15 -08:00
brunobar79
c651212025 fix merge conflicts 2018-11-06 20:21:19 -05:00
Bruno Barbieri
7f944923d1
Merge pull request #5691 from MetaMask/fix-typo
Fix typo on drizzle test description
2018-11-07 01:39:58 +01:00
brunobar79
62ac993b9a fix typo 2018-11-06 19:22:47 -05:00
Bruno Barbieri
68138e178e
Merge pull request #5689 from MetaMask/reject-cached-approval
EIP-1102: Clear approvals on rejection
2018-11-07 01:21:33 +01:00
brunobar79
6daf749251 update drizzle tests 2018-11-06 19:08:23 -05:00
bitpshr
5272073f4f Revert package-lock.json 2018-11-06 14:54:37 -05:00
bitpshr
896ae0ab89 Fix lint errors 2018-11-06 14:30:50 -05:00
bitpshr
d7b1cacabc Remove injected script tags after use 2018-11-06 14:26:02 -05:00
bitpshr
34d80f21e2 Clear cached approval after rejection 2018-11-06 14:13:27 -05:00
Dan Finlay
7b8a73b01f Version 5.0.0 (#5685) 2018-11-06 11:42:22 -05:00
Whymarrh Whitby
f692123f51 Update the colour of the default image used on Connect Request (#5678) 2018-11-05 15:07:09 -08:00
Whymarrh Whitby
5d928e67c3 Update "Learn more" link on 1102 connect screen (#5677) 2018-11-05 15:07:09 -08:00
bitpshr
b3f428fd1f Move experimental provider augmentation 2018-11-05 15:07:09 -08:00
bitpshr
879997af51 Add experimental RPC method support 2018-11-05 15:07:09 -08:00
Whymarrh Whitby
26ada8a828 Update Connect Request screen design (#5644)
* Parameterize NetworkDisplay background colour

* Update design for login request screen

* Pass siteTitle, siteImage through for calls to ethereum.enable()

* Bring the site images closer together
2018-11-05 15:07:09 -08:00
bitpshr
31cb111d2e Do not modify isApproved when locked 2018-11-05 15:07:09 -08:00
bitpshr
9984f7edeb Mark origins as unapproved if user explicitly locks MetaMask 2018-11-05 15:07:09 -08:00
Paul Bouchon
f557d33718 Enable caching 2018-11-05 15:07:09 -08:00
bitpshr
991e08e346 isApproved should return false 2018-11-05 15:07:09 -08:00
bitpshr
0dad394147 Disable mascara tests 2018-11-05 15:07:09 -08:00
bitpshr
01ff0bd3c0 Increase timeout in Mascara test 2018-11-05 15:07:09 -08:00
bitpshr
72730b3929 Remove internal listeners 2018-11-05 15:07:09 -08:00