m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code
9,194 Commits 2 Branches 0 Tags 265 MiB
32fffe53f5
Commit Graph

9194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Miller
b481497246 Fix fetch and ethquery mocks in integration tests 2019-05-07 15:27:20 -02:30
Thomas Huang
50f46386ae
Merge pull request #6575 from whymarrh/fix-nock-unit-tests 
Fix nock usages in unit tests
 2019-05-07 09:41:05 -07:00
Whymarrh Whitby
1de7dc9b41 Remove nock#restore call from actions.spec.js 
This call was unmocking all of our HTTP requests, allowing further test cases
to hit the network. Calling nock#restore should not be required.
 2019-05-07 13:48:50 -02:30
Whymarrh Whitby
d730da8caa Use metricsEvent in AmountMaxButton component 2019-05-07 13:48:50 -02:30
Chi Kei Chan
581128503c Allow dragging seed phrase during Confirm Seed Phrase (#6557) 
* Add basic drag and drop functionality

* Refactor seed phrase data structure

* Insert to list when drop

* Save before refactor

* Finish DND

* Fix linter

* update package-lock.json

* Address styling feedbacks

* Add box shadow on hover

* Finish adding unit tests

* Remove describe.only
 2019-05-07 12:33:26 -02:30
Whymarrh Whitby
a58e549c3f Skip null and undefined keys when translating via context (#6543) 
* i18n: Don't translate null or undefined keys

* Add JSDoc for I18nProvider#t context fn
 2019-05-06 15:04:16 -02:30
Dan J Miller
64ae8131de
Adds NPM scripts for running a dapp, and dapp + chain, locally. (#6565) 2019-05-06 12:01:34 -02:30
Whymarrh Whitby
6aa889280d Add suffix to title text only when it exists (#6546) 2019-05-06 10:55:18 -02:30
pldespaigne
2d58cfc7a0 refactor & change html pages 2019-05-04 18:57:19 +02:00
pldespaigne
987e58d103 add rinkeby & goerli 2019-05-04 18:56:45 +02:00
pldespaigne
8cb6bd34e0 update content-hash 2019-05-04 18:56:26 +02:00
kumavis
2845398c3d Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410) 
* Ensure home screen does not render if there are unapproved txs (#6501)

* Ensure that the confirm screen renders before the home screen if there are unapproved txs.

* Only render confirm screen before home screen on mount.

* inpage - revert _metamask api to isEnabled isApproved isUnlocked
 2019-05-03 13:32:05 -04:00
Thomas Huang
2ff522604b
Merge pull request #6545 from whymarrh/tOrKey-ConfirmTransactionBase 
Use tOrKey for actionKey in ConfirmTransactionBase
 2019-05-01 11:39:44 -07:00
Whymarrh Whitby
e6b9b5c5a9 Use tOrKey for actionKey in ConfirmTransactionBase 2019-05-01 00:23:19 -02:30
Whymarrh Whitby
12cfe8e543 Fix binding of this for I18nProvider#tOrKey 2019-05-01 00:23:19 -02:30
Thomas Huang
c7492f4f54 Include token checksum address in prices lookup for token rates (#6526) 2019-04-30 14:19:58 -02:30
Dan J Miller
4fea9d0cc2
Send metrics event from backend for on chain transaction failures (#6500) 
* Send metrics event from backend for on chain transaction failures

* Passes state object to backEndMetaMetricsEvent, and adds getMetaMetricState selector
 2019-04-29 03:48:40 -02:30
Chi Kei Chan
0095889408 Add subheader to all settings subviews (#6502) 
* Add subheader to all settings subviews

* add margin right to subheader
 2019-04-29 03:48:03 -02:30
Dan J Miller
39b7145423
Ensure home screen does not render if there are unapproved txs (#6501) 
* Ensure that the confirm screen renders before the home screen if there are unapproved txs.

* Only render confirm screen before home screen on mount.
 2019-04-27 06:59:55 -02:30
Thomas Huang
7dcc707a43
Merge pull request #6523 from MetaMask/develop 
Update master with 6.4.1 Release
 2019-04-26 11:02:17 -07:00
Dan Finlay
0dac3eb095
Merge pull request #6522 from MetaMask/Version-6.4.1 
Version 6.4.1 RC1
 2019-04-26 10:47:27 -07:00
Dan Finlay
a56fc14122 Version 6.4.1 RC1 2019-04-26 10:28:39 -07:00
Dan Finlay
63e5e689be
Merge pull request #6521 from MetaMask/revert-6435-4byte-registry-fallback 
Revert "Adds 4byte registry fallback to getMethodData()"
 2019-04-26 10:26:55 -07:00
Thomas Huang
608796398e Revert "Adds 4byte registry fallback to getMethodData() (#6435)" 
This reverts commit 09f2a2a547.
 2019-04-26 10:05:38 -07:00
Chi Kei Chan
13605c2b5e
Always show private network when RPC is not whitelisted (#6495) 2019-04-25 13:54:35 -07:00
Chi Kei Chan
429bb5e7aa
Fix button colors on mobile (#6493) 2019-04-24 20:01:41 -07:00
Chi Kei Chan
ec712d5d8f
Set max-width on network dropdown and ellipsis long network name (#6494) 2019-04-24 20:01:24 -07:00
Christian
50fa063c5d add link to design system 
Adding a direct link to the WIP design system file we're building using figma.
 2019-04-24 16:30:50 -07:00
Dan Finlay
87d5be9081
Merge pull request #6484 from MetaMask/develop 
Update master branch with develop (v6.4.0)
 2019-04-24 12:25:39 -07:00
Sneh Koul
6a60562d66 Opens the original webpage from where installation of MetaMask was re… (#6272) 
* Opens the original webpage from where installation of MetaMask was requested

* Asking for dynamic permissions

* code for forwarder/without extra permissions

* Lint fix for onboardingComplete message sending code.
 2019-04-24 10:49:38 -07:00
Thomas Huang
8f7577f7fa
Merge pull request #6471 from MetaMask/Version-6.4.0 
Version 6.4.0
 2019-04-18 11:50:23 -06:00
Dan Finlay
49d77415db Version 6.4.0 RC1 2019-04-18 08:34:24 -06:00
Thomas Huang
4fa9576cc1
Merge pull request #6481 from MetaMask/address-prop-types-errors 
Address prop types errors
 2019-04-18 08:22:45 -06:00
Chi Kei Chan
3519e90ffd Make height consistent on all row in send-content (#6480) 
* Update all send-content row to 54px height

* Remove header subtitle

* Remove tests that check for send screen subheader
 2019-04-18 00:41:04 -02:30
Thomas Huang
ed23801490
Merge pull request #6477 from MetaMask/metrics-screen-button-type 
Update button type on metrics opt-in screen.
 2019-04-17 18:26:43 -06:00
Dan Miller
cca73f33f3 Update button type on metrics opt-in screen. 2019-04-17 21:44:39 -02:30
Dan Miller
8a82e629bf Ensure future tokens add decimals as numbers while supporting numbers and strings in send-asset-row 2019-04-17 21:26:25 -02:30
Dan Miller
8c075b7158 getSeletedAsset to only return symbol strings, not token objects 2019-04-17 20:59:45 -02:30
Thomas Huang
1ba7afe34b
Merge pull request #6475 from chikeichan/send-asset 
Fix PropTypes validation in send-asset-row
 2019-04-17 16:15:56 -06:00
Chi Kei Chan
ed28ca60e0 Fix PropTypes validation in send-asset-row 2019-04-17 13:50:47 -07:00
Chi Kei Chan
d8b536982e
Update confirm to use btn-primary (#6473) 
* Update confirm to use btn-primary

* Remove console

* Fix e2e test
 2019-04-17 13:34:47 -07:00
Chi Kei Chan
931aaeb700 Add token selection to the send screen (#6445) 
* Move send to pages/

* Fix unit tests

* Finish UI

* Integrate asset dropdown to send actions

* Remove console.log

* Hide asset change during edit

* Enable switch from send token to seand eth

* Enable switching from token to eth when editing

* Fix linter

* Fixing test

* Fix unit tests

* Fix linter

* Fix react warning; remove console.log

* fix flat test

* Add metrics

* Address code review comments

* Consistent spacing between send screen form rows.

* Reduce height of gas buttons on send screen.

* Make send screen gas button height dependent on size of contents.
 2019-04-17 16:45:13 -02:30
Whymarrh Whitby
a844eb20da
Merge pull request #6470 from MetaMask/bdresser-patch-1-2 
update publishing.md with dev diagram
 2019-04-17 15:51:53 -02:30
Dan J Miller
7d59e892e3 Update to eth-method-registry@1.2.0 (#6403) 2019-04-17 15:51:21 -02:30
Thomas Huang
83f3e8ab98
Merge pull request #6468 from chikeichan/network-indicator-style-fix 
Fix switcher height when Custom RPC is selected or loading
 2019-04-17 12:42:49 -05:00
Paul Bouchon
0db0a187c8 feature: add Goerli support (#6459) 2019-04-17 15:04:49 -02:30
bobby dresser
e71cac5460
update publishing.md with dev diagram 2019-04-17 10:30:17 -07:00
Chi Kei Chan
597c490928 Fix switcher height when Custom RPC is selected or when network is loading 2019-04-16 23:47:11 -07:00
Thomas Huang
00133d31b1
Merge pull request #6444 from MetaMask/localhost-network-dropdown 
Fixes #6321 & #6421 - Add Localhost 8545 for network dropdown names
 2019-04-16 14:39:00 -05:00
Dan J Miller
09f2a2a547
Adds 4byte registry fallback to getMethodData() (#6435) 
* Get contract method data from 4byte if we can't get it from eth-method-registry

* Clarify token method name fallback code in getMethodData

* Bugfix: don't attempt to translate falsy actionKeys in confirm-transaction-base.component.js

* Rewrite getMethodFrom4Byte with async-await

* Call four byte and method-registry requests in parallel in getMethodData()
 2019-04-16 17:07:47 -02:30